transition work

2026-04-09 10:32:30 -07:00
parent 5e9fb9251e
commit 5f144fb5d7
7 changed files with 64 additions and 39 deletions
--- a/scenes/kq4_002_meadow/kq4_002_meadow.tscn
+++ b/scenes/kq4_002_meadow/kq4_002_meadow.tscn
@@ -6,7 +6,7 @@
 [ext_resource type="PackedScene" uid="uid://c4vc1wx7k6cw" path="res://TransitionPiece.tscn" id="4_abc"]
 [ext_resource type="Script" uid="uid://bounwnqg34t5k" path="res://SetPiece_.gd" id="5_setpiece"]
 [ext_resource type="Resource" uid="uid://dt1wrhd0optmu" path="res://scenes/kq4_002_meadow/bush_polygon.tres" id="6_bush"]
-[ext_resource type="Resource" path="res://scenes/kq4_002_meadow/boulder_polygon.tres" id="7_boulder"]
+[ext_resource type="Resource" uid="uid://d8mtk2txsucm" path="res://scenes/kq4_002_meadow/boulder_polygon.tres" id="7_boulder"]

 [sub_resource type="NavigationPolygon" id="NavigationPolygon_ppo6b"]
 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)
@@ -41,6 +41,7 @@ navigation_polygon = SubResource("NavigationPolygon_ppo6b")
 position = Vector2(194, 819)

 [node name="kq4_026_river_meadow" parent="." unique_id=484638394 instance=ExtResource("4_abc")]
+z_index = 1
 position = Vector2(910, -213)
 polygon = PackedVector2Array(-108, 454, -87, 649, 376, 658, 348, 381)
 appear_at_node = "kq4_002_meadow"
--- a/scenes/kq4_004_ogres_cottage/kq4_004_ogres_cottage.gd
+++ b/scenes/kq4_004_ogres_cottage/kq4_004_ogres_cottage.gd
@@ -39,3 +39,7 @@ func _on_room_looked() -> void:
 	start_main_script(ScriptBuilder.init(
 		ScriptBuilder.narrate("You stand before the ogre's cottage.")
 	).build(self, "_on_script_complete"))
+
+
+func _on_kq_4_049_ogres_cottage_interacted() -> void:
+	$kq4_049_ogres_cottage.default_script(self)
--- a/scenes/kq4_004_ogres_cottage/kq4_004_ogres_cottage.tscn
+++ b/scenes/kq4_004_ogres_cottage/kq4_004_ogres_cottage.tscn
@@ -101,6 +101,19 @@ script = ExtResource("6_setpiece")
 label = "Door"
 points_resource = ExtResource("5_door")

+[node name="kq4_049_ogres_cottage" parent="." unique_id=1803864206 instance=ExtResource("4_67nph")]
+scale = Vector2(0.783, 0.78)
+polygon = PackedVector2Array(951.4688, 758.97437, 985.95154, 1091.0256, 1227.3309, 1070.5128, 1219.6681, 729.4872)
+appear_at_node = &"kq4_004_ogres_cottage_exterior"
+target = "uid://c5h5n8dreoa8k"
+label = "Door"
+
+[node name="entrance" parent="kq4_049_ogres_cottage" index="0"]
+position = Vector2(923.3717, 1105.1283)
+
+[node name="exit" parent="kq4_049_ogres_cottage" index="1"]
+position = Vector2(1265.645, 1019.2308)
+
 [node name="cottage" type="Polygon2D" parent="." unique_id=1102644229 groups=["set-piece"]]
 scale = Vector2(0.783, 0.78)
 color = Color(0.5, 0.5, 0.5, 0.25)
@@ -120,6 +133,7 @@ label = "Window"
 [connection signal="interacted" from="kq4_010_forest_path" to="." method="_on_forest_path_interacted"]
 [connection signal="interacted" from="kq4_005_forest_grove" to="." method="_on_forest_grove_interacted"]
 [connection signal="looked" from="door" to="." method="_on_door_looked"]
+[connection signal="interacted" from="kq4_049_ogres_cottage" to="." method="_on_kq_4_049_ogres_cottage_interacted"]
 [connection signal="looked" from="cottage" to="." method="_on_cottage_looked"]
 [connection signal="looked" from="window" to="." method="_on_window_looked"]

@@ -127,3 +141,4 @@ label = "Window"
 [editable path="kq4_003_fountain_pool"]
 [editable path="kq4_010_forest_path"]
 [editable path="kq4_005_forest_grove"]
+[editable path="kq4_049_ogres_cottage"]
--- a/scenes/kq4_008_back_of_fishermans_shack/kq4_008_back_of_fishermans_shack.tscn
+++ b/scenes/kq4_008_back_of_fishermans_shack/kq4_008_back_of_fishermans_shack.tscn
@@ -5,8 +5,8 @@
 [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="Script" uid="uid://bounwnqg34t5k" path="res://SetPiece_.gd" id="5_setpiece"]
-[ext_resource type="Resource" path="res://scenes/kq4_008_back_of_fishermans_shack/cottage_polygon.tres" id="6_cottage"]
-[ext_resource type="Resource" path="res://scenes/kq4_008_back_of_fishermans_shack/window_polygon.tres" id="7_window"]
+[ext_resource type="Resource" uid="uid://w0ydnt3i4mpp" path="res://scenes/kq4_008_back_of_fishermans_shack/cottage_polygon.tres" id="6_cottage"]
+[ext_resource type="Resource" uid="uid://ifakcj20t0tl" path="res://scenes/kq4_008_back_of_fishermans_shack/window_polygon.tres" id="7_window"]

 [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)
@@ -41,6 +41,7 @@ navigation_polygon = SubResource("NavigationPolygon_ppo6b")
 position = Vector2(194, 819)

 [node name="kq4_009_shady_wooded_area" parent="." unique_id=484638394 instance=ExtResource("4_abc")]
+z_index = 4
 position = Vector2(1766, 74)
 polygon = PackedVector2Array(-108, 454, -87, 649, 376, 658, 348, 381)
 appear_at_node = "kq4_008_back_of_fishermans_shack"
@@ -54,8 +55,9 @@ position = Vector2(24, 565)
 position = Vector2(293, 554)

 [node name="kq4_002_meadow" parent="." unique_id=1117747814 instance=ExtResource("4_abc")]
+z_index = 2
 position = Vector2(910, -213)
-polygon = PackedVector2Array(-108, 454, -87, 649, 376, 658, 348, 381)
+polygon = PackedVector2Array(-631, 454, -539, 610, 376, 658, 769, 610, 748, 475, 348, 381, -594, 362)
 appear_at_node = "kq4_008_back_of_fishermans_shack"
 target = "uid://1489d4oh9twtu"
 label = "Meadow"
@@ -68,7 +70,7 @@ position = Vector2(174, 519)

 [node name="kq4_007_fishermans_shack" parent="." unique_id=1117747816 instance=ExtResource("4_abc")]
 position = Vector2(-200, 74)
-polygon = PackedVector2Array(-108, 454, -87, 649, 376, 658, 348, 381)
+polygon = PackedVector2Array(-108, 454, -57, 1141, 314, 1080, 376, 658, 148, 697)
 appear_at_node = "kq4_008_back_of_fishermans_shack"
 target = "uid://yj4t7thmkoct"
 label = "Fisherman's Shack"
@@ -81,7 +83,7 @@ position = Vector2(300, 554)

 [node name="kq4_014_green_meadow" parent="." unique_id=990092107 instance=ExtResource("4_abc")]
 position = Vector2(910, 542)
-polygon = PackedVector2Array(-108, 454, -87, 649, 376, 658, 348, 381)
+polygon = PackedVector2Array(-815, 515, -769, 691, 944, 642, 706, 385)
 appear_at_node = "kq4_008_back_of_fishermans_shack"
 target = "uid://tkeyuep0ivo6"
 label = "Green Meadow"
--- a/scenes/kq4_049_ogres_cottage/kq4_049_ogres_cottage.gd
+++ b/scenes/kq4_049_ogres_cottage/kq4_049_ogres_cottage.gd
@@ -10,8 +10,7 @@ func _on_bedroom_interacted() -> void:


 func _on_kitchen_interacted() -> void:
-	# Room 050 doesn't exist yet - this will be wired when room 050 is created
-	push_warning("Room 050 (Kitchen) not yet created. Cannot transition.")
+	$kq4_050_ogress_kitchen.default_script(self)


 func _on_closet_interacted() -> void:
--- a/scenes/kq4_049_ogres_cottage/kq4_049_ogres_cottage.tscn
+++ b/scenes/kq4_049_ogres_cottage/kq4_049_ogres_cottage.tscn
@@ -1,7 +1,7 @@
-[gd_scene format=3 uid="uid://1cxd7kvarvjr5"]
+[gd_scene format=3 uid="uid://c5h5n8dreoa8k"]

-[ext_resource type="Script" path="res://scenes/kq4_049_ogres_cottage/kq4_049_ogres_cottage.gd" id="1_script"]
-[ext_resource type="Texture2D" path="res://scenes/kq4_049_ogres_cottage/049_caption_1_761402739_generated.png" id="2_texture"]
+[ext_resource type="Script" uid="uid://dharqsywd4uc0" path="res://scenes/kq4_049_ogres_cottage/kq4_049_ogres_cottage.gd" id="1_script"]
+[ext_resource type="Texture2D" uid="uid://cja6l4a353jqg" path="res://scenes/kq4_049_ogres_cottage/049_caption_1_761402739_generated.png" id="2_texture"]
 [ext_resource type="Script" uid="uid://xmphq3i0wbg3" path="res://ScalePoint_.gd" id="3_scale"]
 [ext_resource type="PackedScene" uid="uid://c4vc1wx7k6cw" path="res://TransitionPiece.tscn" id="4_transition"]

@@ -39,62 +39,66 @@ position = Vector2(194, 819)

 [node name="kq4_004_ogres_cottage_exterior" parent="." unique_id=484638394 instance=ExtResource("4_transition")]
 position = Vector2(910, -213)
-polygon = PackedVector2Array(-108, 454, -87, 649, 376, 658, 348, 381)
+polygon = PackedVector2Array(-703, 472, -696, 1033, -462, 953, -471, 562)
 appear_at_node = "kq4_049_ogres_cottage"
 target = "uid://1nxmm3b1kcdm1"
 label = "Ogre's Cottage Exterior"

 [node name="entrance" parent="kq4_004_ogres_cottage_exterior" index="0"]
-position = Vector2(133, 643)
+position = Vector2(-422, 967)

 [node name="exit" parent="kq4_004_ogres_cottage_exterior" index="1"]
-position = Vector2(174, 519)
+position = Vector2(-781, 953)

 [node name="kq4_048_ogres_bedroom" parent="." unique_id=1956756567 instance=ExtResource("4_transition")]
 position = Vector2(1766, 74)
-polygon = PackedVector2Array(-108, 454, -87, 649, 376, 658, 348, 381)
+polygon = PackedVector2Array(-1219, 554, -1103, 644, -363, 231, -466, 16)
 appear_at_node = "kq4_049_ogres_cottage"
 target = "uid://t4eqmtnaduxt"
 label = "Ogres' Bedroom"

 [node name="entrance" parent="kq4_048_ogres_bedroom" index="0"]
-position = Vector2(24, 565)
+position = Vector2(-1157, 661)

 [node name="exit" parent="kq4_048_ogres_bedroom" index="1"]
-position = Vector2(293, 554)
+position = Vector2(-498, 200)

-[node name="kq4_050_kitchen" parent="." unique_id=1966756568 instance=ExtResource("4_transition")]
+[node name="kq4_050_ogress_kitchen" parent="." unique_id=1966756568 instance=ExtResource("4_transition")]
 position = Vector2(910, 542)
-polygon = PackedVector2Array(-108, 454, -87, 649, 376, 658, 348, 381)
+polygon = PackedVector2Array(556, 243, 843, 288, 861, -188, 673, -152)
 appear_at_node = "kq4_049_ogres_cottage"
 target = "uid://is2m5yb1l52f"
 label = "Kitchen"

-[node name="entrance" parent="kq4_050_kitchen" index="0"]
-position = Vector2(118, 514)
+[node name="entrance" parent="kq4_050_ogress_kitchen" index="0"]
+position = Vector2(580, 196)

-[node name="exit" parent="kq4_050_kitchen" index="1"]
-position = Vector2(151, 615)
+[node name="exit" parent="kq4_050_ogress_kitchen" index="1"]
+position = Vector2(792, 205)

 [node name="kq4_051_closet" parent="." unique_id=1976756569 instance=ExtResource("4_transition")]
 position = Vector2(-108, 542)
-polygon = PackedVector2Array(-108, 454, -87, 649, 376, 658, 348, 381)
+polygon = PackedVector2Array(1387, -168, 1344, 200, 1632, 136, 1616, -183)
 appear_at_node = "kq4_049_ogres_cottage"
 target = "uid://2buzfd0sba7mg"
 label = "Closet"

 [node name="entrance" parent="kq4_051_closet" index="0"]
-position = Vector2(506, 555)
+position = Vector2(1459, 255)

 [node name="exit" parent="kq4_051_closet" index="1"]
-position = Vector2(-64, 534)
+position = Vector2(1459, 59)
+
+[node name="kq4_049_ogres_cottage" parent="." unique_id=174473811 instance=ExtResource("4_transition")]
+appear_at_node = &"kq4_049_ogres_cottage"
+target = "uid://dhie3qsi5333g"

 [connection signal="interacted" from="kq4_004_ogres_cottage_exterior" to="." method="_on_cottage_exterior_interacted"]
 [connection signal="interacted" from="kq4_048_ogres_bedroom" to="." method="_on_bedroom_interacted"]
-[connection signal="interacted" from="kq4_050_kitchen" to="." method="_on_kitchen_interacted"]
+[connection signal="interacted" from="kq4_050_ogress_kitchen" to="." method="_on_kitchen_interacted"]
 [connection signal="interacted" from="kq4_051_closet" to="." method="_on_closet_interacted"]

 [editable path="kq4_004_ogres_cottage_exterior"]
 [editable path="kq4_048_ogres_bedroom"]
-[editable path="kq4_050_kitchen"]
-[editable path="kq4_051_closet"]
+[editable path="kq4_050_ogress_kitchen"]
+[editable path="kq4_051_closet"]
--- a/scenes/kq4_050_ogress_kitchen/kq4_050_ogress_kitchen.tscn
+++ b/scenes/kq4_050_ogress_kitchen/kq4_050_ogress_kitchen.tscn
@@ -1,14 +1,14 @@
 [gd_scene format=3 uid="uid://is2m5yb1l52f"]

-[ext_resource type="Script" path="res://scenes/kq4_050_ogress_kitchen/kq4_050_ogress_kitchen.gd" id="1_script"]
-[ext_resource type="Texture2D" path="res://scenes/kq4_050_ogress_kitchen/050_caption_1_1404019769_generated.png" id="2_texture"]
+[ext_resource type="Script" uid="uid://82q4b4a5mvi3" path="res://scenes/kq4_050_ogress_kitchen/kq4_050_ogress_kitchen.gd" id="1_script"]
+[ext_resource type="Texture2D" uid="uid://c5mru12wtjpvq" path="res://scenes/kq4_050_ogress_kitchen/050_caption_1_1404019769_generated.png" id="2_texture"]
 [ext_resource type="Script" uid="uid://xmphq3i0wbg3" path="res://ScalePoint_.gd" id="3_scale"]
 [ext_resource type="PackedScene" uid="uid://c4vc1wx7k6cw" path="res://TransitionPiece.tscn" id="4_transition"]

 [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(1351.0078, 958.9531, 1894.1406, 1074.4922, 17.6875, 1030.5313, 426.78906, 913.03125, 603.60156, 765.34375, 1150.75, 667.03906, 656.1797, 670.9922, 599.40625, 752.46875, 357.2578, 736.5078, 415.1875, 680.8281)
+polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3), PackedInt32Array(0, 3, 4, 5), PackedInt32Array(6, 5, 4, 7), PackedInt32Array(7, 8, 9, 6)])
+outlines = Array[PackedVector2Array]([PackedVector2Array(656, 661, 1156, 657, 1357, 950, 2001, 1087, -48, 1039, 422, 904, 592, 762, 334, 745, 411, 671)])

 [node name="background" type="Node2D" unique_id=657573819]
 y_sort_enabled = true
@@ -39,17 +39,17 @@ position = Vector2(194, 819)

 [node name="kq4_049_ogres_cottage" parent="." unique_id=484638394 instance=ExtResource("4_transition")]
 position = Vector2(1766, 74)
-polygon = PackedVector2Array(-108, 454, -87, 649, 376, 658, 348, 381)
+polygon = PackedVector2Array(-1526, 264, -1448, 805, -1104, 690, -1074, 242)
 appear_at_node = "kq4_050_ogress_kitchen"
-target = "uid://1cxd7kvarvjr5"
+target = "uid://c5h5n8dreoa8k"
 label = "Ogre's Cottage"

 [node name="entrance" parent="kq4_049_ogres_cottage" index="0"]
-position = Vector2(24, 565)
+position = Vector2(-999, 732)

 [node name="exit" parent="kq4_049_ogres_cottage" index="1"]
-position = Vector2(293, 554)
+position = Vector2(-1264, 624)

 [connection signal="interacted" from="kq4_049_ogres_cottage" to="." method="_on_cottage_interacted"]

-[editable path="kq4_049_ogres_cottage"]
+[editable path="kq4_049_ogres_cottage"]