From fd9a667498356eb5fa4009184f932091a193bc88 Mon Sep 17 00:00:00 2001 From: Bryce Date: Mon, 9 Mar 2026 14:21:08 -0700 Subject: [PATCH] progress --- Game.tscn | 1 + scenes/kq4_002_meadow/kq4_002_meadow.tscn | 18 +++++++-------- .../kq4_003_fountain_pool.tscn | 4 +++- .../kq4_026_river_meadow.gd | 6 ----- .../kq4_026_river_meadow.tscn | 22 +++++-------------- 5 files changed, 17 insertions(+), 34 deletions(-) diff --git a/Game.tscn b/Game.tscn index d34d076..c876863 100644 --- a/Game.tscn +++ b/Game.tscn @@ -154,6 +154,7 @@ scale = Vector2(0.75, 0.75) layer = 10 [node name="Panel" type="Panel" parent="NarratorOverlay" unique_id=987654322] +visible = false anchors_preset = 7 anchor_left = 0.5 anchor_top = 1.0 diff --git a/scenes/kq4_002_meadow/kq4_002_meadow.tscn b/scenes/kq4_002_meadow/kq4_002_meadow.tscn index 71d104f..4dc2ca2 100644 --- a/scenes/kq4_002_meadow/kq4_002_meadow.tscn +++ b/scenes/kq4_002_meadow/kq4_002_meadow.tscn @@ -9,9 +9,9 @@ [ext_resource type="Resource" path="res://scenes/kq4_002_meadow/boulder_polygon.tres" id="7_boulder"] [sub_resource type="NavigationPolygon" id="NavigationPolygon_ppo6b"] -vertices = PackedVector2Array(366.85156, 1243.1484, -140.97656, 1182.2422, -76.0625, 588.09375, -30.171875, 216.07031, 1221.4063, 226.97656, 1994.1406, 468.39844, 2011.7969, 1321.9766, 1052.7422, 1419.8672, -76.0625, 588.0781) -polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3), PackedInt32Array(3, 4, 5, 6, 7, 0), PackedInt32Array(3, 2, 8)]) -outlines = Array[PackedVector2Array]([PackedVector2Array(-39, 206, 1223, 217, 2004, 461, 2022, 1331, 1052, 1430, 365, 1253, -152, 1191, -86, 587)]) +vertices = PackedVector2Array(1221.9297, 226.99219, 2136.8594, 413.5078, 2017.6563, 560.7031, 1417.5703, 653.1797, -76.0625, 588.0781, -30.171875, 216.07031, 1577.5, 766.1875, 2086.5781, 731.78906, 2013.0625, 1321.8516, 1052.7422, 1419.8672, 1414.8203, 666.8906, 366.85156, 1243.1484, -76.0625, 588.09375, -140.97656, 1182.2422) +polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3, 4, 5), PackedInt32Array(6, 7, 8, 9), PackedInt32Array(4, 10, 6, 9, 11, 12), PackedInt32Array(11, 13, 12), PackedInt32Array(4, 3, 10)]) +outlines = Array[PackedVector2Array]([PackedVector2Array(-39, 206, 1223, 217, 2155, 407, 2023, 570, 1426, 662, 1580, 756, 2098, 721, 2022, 1331, 1052, 1430, 365, 1253, -152, 1191, -86, 587)]) [node name="background" type="Node2D" unique_id=657573819] y_sort_enabled = true @@ -23,7 +23,7 @@ texture = ExtResource("2_ko8f1") centered = false [node name="StartScalePoint" type="Node2D" parent="." unique_id=1640687858] -position = Vector2(1476, 742) +position = Vector2(1292, 367) script = ExtResource("3_abc") target_scale = 0.25 @@ -44,7 +44,7 @@ position = Vector2(194, 819) position = Vector2(910, -213) polygon = PackedVector2Array(-108, 454, -87, 649, 376, 658, 348, 381) appear_at_node = "kq4_002_meadow" -target = "uid://10p7miv0a14l7" +target = "uid://dtay26ehvtu2m" label = "River Meadow" [node name="entrance" parent="kq4_026_river_meadow" index="0"] @@ -55,16 +55,16 @@ position = Vector2(174, 519) [node name="kq4_003_fountain_pool" parent="." unique_id=1916756563 instance=ExtResource("4_abc")] position = Vector2(1766, 74) -polygon = PackedVector2Array(-108, 454, -87, 649, 376, 658, 348, 381) +polygon = PackedVector2Array(-79, 729, -86, 873, 261, 904, 249, 694) appear_at_node = "kq4_002_meadow" target = "uid://151dbn9bybiwx" label = "Fountain Pool" [node name="entrance" parent="kq4_003_fountain_pool" index="0"] -position = Vector2(24, 565) +position = Vector2(0, 822) [node name="exit" parent="kq4_003_fountain_pool" index="1"] -position = Vector2(293, 554) +position = Vector2(227, 790) [node name="kq4_008_back_of_fishermans_shack" parent="." unique_id=990092106 instance=ExtResource("4_abc")] position = Vector2(910, 542) @@ -97,7 +97,6 @@ color = Color(0.7, 0.7, 0.7, 0.25) polygon = PackedVector2Array(2532.0513, 969.2308, 2111.5386, 1026.9231, 1935.8975, 984.6154, 1848.718, 906.4103, 1991.0258, 802.56415, 2505.1282, 576.9231) script = ExtResource("5_setpiece") label = "Bush" -priority = null points_resource = ExtResource("6_bush") [node name="boulder" type="Polygon2D" parent="." unique_id=987654321] @@ -106,7 +105,6 @@ color = Color(0.7, 0.7, 0.7, 0.25) polygon = PackedVector2Array(1267, 1247, 885, 1278, 380, 1187, 382, 1153, 606, 971, 912, 854, 1023, 877, 1179, 1009) script = ExtResource("5_setpiece") label = "Boulder" -priority = null points_resource = ExtResource("7_boulder") [connection signal="interacted" from="kq4_026_river_meadow" to="." method="_on_river_meadow_interacted"] diff --git a/scenes/kq4_003_fountain_pool/kq4_003_fountain_pool.tscn b/scenes/kq4_003_fountain_pool/kq4_003_fountain_pool.tscn index 4646578..82fadc7 100644 --- a/scenes/kq4_003_fountain_pool/kq4_003_fountain_pool.tscn +++ b/scenes/kq4_003_fountain_pool/kq4_003_fountain_pool.tscn @@ -86,9 +86,10 @@ position = Vector2(151, 615) [node name="kq4_027_forest_path" parent="." unique_id=1810021557 instance=ExtResource("4_6r684")] position = Vector2(500, 100) -polygon = PackedVector2Array(122, 279, -87, 649, 688, 583, 650, 277) +polygon = PackedVector2Array(349, 278, 398, 417, 593, 411, 650, 277) appear_at_node = "kq4_003_fountain_pool" target = "uid://1fpyosj18xls7" +label = "Forest Path" [node name="entrance" parent="kq4_027_forest_path" index="0"] position = Vector2(207, 489) @@ -136,6 +137,7 @@ script = ExtResource("6_n67q9") label = "Stairs" [node name="Fg" type="Sprite2D" parent="." unique_id=1431047880] +visible = false scale = Vector2(1.163, 1.179) texture = ExtResource("5_cu368") centered = false diff --git a/scenes/kq4_026_river_meadow/kq4_026_river_meadow.gd b/scenes/kq4_026_river_meadow/kq4_026_river_meadow.gd index d7cdc85..adb39f7 100644 --- a/scenes/kq4_026_river_meadow/kq4_026_river_meadow.gd +++ b/scenes/kq4_026_river_meadow/kq4_026_river_meadow.gd @@ -21,9 +21,3 @@ func _on_room_looked() -> void: start_main_script(ScriptBuilder.init( ScriptBuilder.say(ego, "A cold river carves its way through this lush flowery meadow.") ).build(self, "_on_script_complete")) - - -func _on_meadow_looked() -> void: - start_main_script(ScriptBuilder.init( - ScriptBuilder.say(ego, "Wildflowers dot the meadow along the banks of the flowing river.") - ).build(self, "_on_script_complete")) diff --git a/scenes/kq4_026_river_meadow/kq4_026_river_meadow.tscn b/scenes/kq4_026_river_meadow/kq4_026_river_meadow.tscn index 0239e02..f945e4f 100644 --- a/scenes/kq4_026_river_meadow/kq4_026_river_meadow.tscn +++ b/scenes/kq4_026_river_meadow/kq4_026_river_meadow.tscn @@ -1,11 +1,9 @@ -[gd_scene format=3 uid="uid://10p7miv0a14l7"] +[gd_scene format=3 uid="uid://dtay26ehvtu2m"] -[ext_resource type="Script" uid="uid://kx1zaj92qsq7" path="res://scenes/kq4_026_river_meadow/kq4_026_river_meadow.gd" id="1_abc"] -[ext_resource type="Texture2D" uid="uid://1yls50w1d6hp7" path="res://scenes/kq4_026_river_meadow/pic_026_visual.png" id="2_abc"] +[ext_resource type="Script" uid="uid://kx10aka2qsq7" path="res://scenes/kq4_026_river_meadow/kq4_026_river_meadow.gd" id="1_abc"] +[ext_resource type="Texture2D" uid="uid://dr5lmofiyx76m" path="res://scenes/kq4_026_river_meadow/pic_026_visual.png" id="2_abc"] [ext_resource type="Script" uid="uid://xmphq3i0wbg3" path="res://ScalePoint_.gd" id="3_abc"] [ext_resource type="PackedScene" uid="uid://c4vc1wx7k6cw" path="res://TransitionPiece.tscn" id="4_abc"] -[ext_resource type="Resource" uid="uid://15uzkxkukgxc" path="res://scenes/kq4_026_river_meadow/meadow_polygon_0.tres" id="5_meadow"] -[ext_resource type="Script" uid="uid://bounwnqg34t5k" path="res://SetPiece_.gd" id="6_setpiece"] [sub_resource type="NavigationPolygon" id="NavigationPolygon_ppo6b"] vertices = PackedVector2Array(366.85156, 1243.1484, -140.97656, 1182.2422, -76.0625, 588.09375, -30.171875, 216.07031, 1221.4063, 226.97656, 1994.1406, 468.39844, 2011.7969, 1321.9766, 1052.7422, 1419.8672, -76.0625, 588.0781) @@ -45,6 +43,7 @@ polygon = PackedVector2Array(-108, 454, -87, 649, 376, 658, 348, 381) appear_at_node = "kq4_026_river_meadow" target = "uid://2yy1t1lic39gp" label = "Meadow" +priority = 1 [node name="entrance" parent="kq4_020_meadow" index="0"] position = Vector2(133, 643) @@ -65,8 +64,6 @@ position = Vector2(24, 565) [node name="exit" parent="kq4_027_forest_path" index="1"] position = Vector2(293, 554) -[connection signal="interacted" from="kq4_027_forest_path" to="." method="_on_forest_path_interacted"] - [node name="kq4_002_meadow" parent="." unique_id=990092106 instance=ExtResource("4_abc")] position = Vector2(910, 542) polygon = PackedVector2Array(-108, 454, -87, 649, 376, 658, 348, 381) @@ -93,19 +90,10 @@ position = Vector2(506, 555) position = Vector2(-64, 534) [connection signal="interacted" from="kq4_020_meadow" to="." method="_on_meadow_20_interacted"] +[connection signal="interacted" from="kq4_027_forest_path" to="." method="_on_forest_path_interacted"] [connection signal="interacted" from="kq4_002_meadow" to="." method="_on_meadow_2_interacted"] [connection signal="interacted" from="kq4_025_beach_at_river_delta" to="." method="_on_beach_at_river_delta_interacted"] -[node name="meadow" type="Polygon2D" parent="." groups=["set-piece"]] -scale = Vector2(6, 6) -color = Color(0.5, 0.5, 0.5, 0.25) -polygon = PackedVector2Array(317, 189, 0, 189, 160, 169, 262, 57, 0, 163, 0, 43, 316, 19) -script = ExtResource("6_setpiece") -label = "River Meadow" -points_resource = ExtResource("5_meadow") - -[connection signal="looked" from="meadow" to="." method="_on_meadow_looked"] - [editable path="kq4_020_meadow"] [editable path="kq4_027_forest_path"] [editable path="kq4_002_meadow"]