From 7467ec56d9951b0db5658cba65a6c494c0f45c2c Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Sat, 28 Jun 2025 17:37:39 +0200 Subject: [PATCH] Fixed ordering issues in indoor scene --- scenes/IndoorTest2.tscn | 163 ++++++++++++++++++++++++---------------- 1 file changed, 99 insertions(+), 64 deletions(-) diff --git a/scenes/IndoorTest2.tscn b/scenes/IndoorTest2.tscn index 7cb3afa..f4f1641 100644 --- a/scenes/IndoorTest2.tscn +++ b/scenes/IndoorTest2.tscn @@ -27,7 +27,7 @@ length = 0.001 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("Room assets/hand:scale") +tracks/0/path = NodePath("BackWall/Room assets/hand:scale") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { @@ -51,7 +51,7 @@ tracks/1/keys = { tracks/2/type = "value" tracks/2/imported = false tracks/2/enabled = false -tracks/2/path = NodePath("Room assets/eyes:visible") +tracks/2/path = NodePath("BackWall/Room assets/eyes:visible") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { @@ -67,7 +67,7 @@ length = 4.0 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("Room assets/hand:scale") +tracks/0/path = NodePath("BackWall/Room assets/hand:scale") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { @@ -91,7 +91,7 @@ tracks/1/keys = { tracks/2/type = "value" tracks/2/imported = false tracks/2/enabled = true -tracks/2/path = NodePath("Room assets/eyes:visible") +tracks/2/path = NodePath("BackWall/Room assets/eyes:visible") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { @@ -115,6 +115,65 @@ radius = 300.0 y_sort_enabled = true script = ExtResource("1_aivb2") +[node name="Foreground" type="Node" parent="."] + +[node name="Table" type="Sprite2D" parent="Foreground"] +y_sort_enabled = true +position = Vector2(-1888, 1112) +texture = ExtResource("3_je1cl") +offset = Vector2(0, -200) +region_enabled = true +region_rect = Rect2(1012, 1743, 1470, 417) + +[node name="Chair" type="Sprite2D" parent="Foreground"] +y_sort_enabled = true +position = Vector2(-3032, 2096) +texture = ExtResource("4_hjjhl") +offset = Vector2(216, -1064) +region_enabled = true +region_rect = Rect2(1534, 1976, 379, 184) + +[node name="Chair2" type="Sprite2D" parent="Foreground"] +y_sort_enabled = true +position = Vector2(-1064, 2064) +texture = ExtResource("4_hjjhl") +offset = Vector2(184, -1056) +region_enabled = true +region_rect = Rect2(1534, 1976, 379, 184) + +[node name="Samowar" type="Sprite2D" parent="Foreground"] +z_index = 1 +y_sort_enabled = true +position = Vector2(-1904, 1192) +texture = ExtResource("13_j5d18") +offset = Vector2(0, -800) +region_enabled = true +region_rect = Rect2(2093, 49, 421, 630) + +[node name="FrontCollider" type="StaticBody2D" parent="Foreground"] +position = Vector2(-4344, 3056) +scale = Vector2(2, 2) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Foreground/FrontCollider"] +position = Vector2(950, -419) +shape = SubResource("RectangleShape2D_a2ood") + +[node name="SideColliderLeft" type="StaticBody2D" parent="."] +position = Vector2(-4344, 3056) +scale = Vector2(2, 2) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="SideColliderLeft"] +position = Vector2(-2892, -1168) +shape = SubResource("RectangleShape2D_a2ood") + +[node name="SideColliderRight" type="StaticBody2D" parent="."] +position = Vector2(10992, 2856) +scale = Vector2(2, 2) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="SideColliderRight"] +position = Vector2(-2892, -1168) +shape = SubResource("RectangleShape2D_a2ood") + [node name="BackWall" type="Node" parent="."] [node name="Room01Walls2" type="Sprite2D" parent="BackWall"] @@ -194,93 +253,65 @@ texture = ExtResource("8_8o6or") region_enabled = true region_rect = Rect2(1846, 471, 348, 490) -[node name="Vesna" parent="." instance=ExtResource("2_a2ood")] -position = Vector2(-1464, 136) - -[node name="Animated Sprites" parent="Vesna/CharacterBody2D/visuals" index="0"] -z_index = 50 - -[node name="Table" type="Sprite2D" parent="."] +[node name="Bench" type="Sprite2D" parent="BackWall"] +z_index = -10 y_sort_enabled = true -position = Vector2(-2120, 1728) -texture = ExtResource("3_je1cl") -offset = Vector2(192, -848) -region_enabled = true -region_rect = Rect2(1012, 1743, 1470, 417) - -[node name="Chair" type="Sprite2D" parent="."] -position = Vector2(-3000, 2056) -texture = ExtResource("4_hjjhl") -offset = Vector2(216, -1064) -region_enabled = true -region_rect = Rect2(1534, 1976, 379, 184) - -[node name="Chair2" type="Sprite2D" parent="."] -position = Vector2(-1160, 2048) -texture = ExtResource("4_hjjhl") -offset = Vector2(184, -1056) -region_enabled = true -region_rect = Rect2(1534, 1976, 379, 184) - -[node name="Bench" type="Sprite2D" parent="."] position = Vector2(-3240, 224) texture = ExtResource("7_ciwvv") flip_h = true region_enabled = true region_rect = Rect2(1156, 1185, 940, 189) -[node name="Bench2" type="Sprite2D" parent="."] +[node name="Bench2" type="Sprite2D" parent="BackWall"] +z_index = -10 position = Vector2(-1824, 224) texture = ExtResource("7_ciwvv") region_enabled = true region_rect = Rect2(1156, 1185, 940, 189) -[node name="Room assets" type="Node" parent="."] - -[node name="Samowar" type="Sprite2D" parent="Room assets"] -y_sort_enabled = true -position = Vector2(-2000, 696) -texture = ExtResource("13_j5d18") -offset = Vector2(0, -296) -region_enabled = true -region_rect = Rect2(2093, 49, 421, 630) +[node name="Room assets" type="Node" parent="BackWall"] -[node name="wood" type="Sprite2D" parent="Room assets"] +[node name="wood" type="Sprite2D" parent="BackWall/Room assets"] +z_index = -10 y_sort_enabled = true -position = Vector2(-176, 560) +position = Vector2(-177, 554.5) texture = ExtResource("13_j5d18") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2244, 763, 274, 91) -[node name="Domovoi" type="Sprite2D" parent="Room assets"] +[node name="Domovoi" type="Sprite2D" parent="BackWall/Room assets"] +z_index = -10 y_sort_enabled = true -position = Vector2(336, 480) +position = Vector2(335, 474.5) texture = ExtResource("13_j5d18") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(3157, 688, 118.519, 221) -[node name="vase" type="Sprite2D" parent="Room assets"] +[node name="vase" type="Sprite2D" parent="BackWall/Room assets"] +z_index = -10 y_sort_enabled = true -position = Vector2(-856, -32) +position = Vector2(-857, -37.5) texture = ExtResource("13_j5d18") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2748, 432, 174, 191) -[node name="candle" type="Sprite2D" parent="Room assets"] +[node name="candle" type="Sprite2D" parent="BackWall/Room assets"] +z_index = -10 y_sort_enabled = true -position = Vector2(-424, -72) +position = Vector2(-425, -77.5) rotation = -0.0663225 texture = ExtResource("13_j5d18") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2624, 435, 49, 76) -[node name="hand" type="Sprite2D" parent="Room assets"] +[node name="hand" type="Sprite2D" parent="BackWall/Room assets"] +z_index = -10 y_sort_enabled = true -position = Vector2(48.5969, 11.68) +position = Vector2(47.5969, 6.18) rotation = -0.0663225 scale = Vector2(1e-05, 1e-05) texture = ExtResource("13_j5d18") @@ -288,23 +319,24 @@ offset = Vector2(43.3898, 128.128) region_enabled = true region_rect = Rect2(3362, 139, 101, 269) -[node name="SpiritAnimation" type="AnimationPlayer" parent="Room assets/hand"] +[node name="SpiritAnimation" type="AnimationPlayer" parent="BackWall/Room assets/hand"] active = false -root_node = NodePath("../../..") +root_node = NodePath("../../../..") libraries = { &"": SubResource("AnimationLibrary_ciwvv") } playback_auto_capture = false -[node name="herbsline" type="Sprite2D" parent="Room assets"] +[node name="herbsline" type="Sprite2D" parent="BackWall/Room assets"] +z_index = -10 y_sort_enabled = true -position = Vector2(288, -152) +position = Vector2(287, -157.5) texture = ExtResource("13_j5d18") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2964, 137, 321, 213) -[node name="herb 1" type="Sprite2D" parent="Room assets/herbsline"] +[node name="herb 1" type="Sprite2D" parent="BackWall/Room assets/herbsline"] y_sort_enabled = true position = Vector2(-72, 136) texture = ExtResource("13_j5d18") @@ -312,7 +344,7 @@ offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2600, 165, 127, 199) -[node name="herb 2" type="Sprite2D" parent="Room assets/herbsline"] +[node name="herb 2" type="Sprite2D" parent="BackWall/Room assets/herbsline"] y_sort_enabled = true position = Vector2(64, 80) texture = ExtResource("13_j5d18") @@ -320,30 +352,31 @@ offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2761, 161, 135, 199) -[node name="eyes" type="Sprite2D" parent="Room assets"] +[node name="eyes" type="Sprite2D" parent="BackWall/Room assets"] visible = false +z_index = -10 position = Vector2(32, -72) scale = Vector2(0.4, 0.4) texture = ExtResource("14_j5d18") region_enabled = true region_rect = Rect2(2647, 15, 286, 183) -[node name="offerings" type="Node2D" parent="Room assets"] +[node name="offerings" type="Node2D" parent="BackWall/Room assets"] -[node name="apple" type="Sprite2D" parent="Room assets/offerings"] +[node name="apple" type="Sprite2D" parent="BackWall/Room assets/offerings"] position = Vector2(229.5, 331.5) texture = ExtResource("13_j5d18") region_enabled = true region_rect = Rect2(2822, 764, 93, 87) -[node name="bread" type="Sprite2D" parent="Room assets/offerings"] +[node name="bread" type="Sprite2D" parent="BackWall/Room assets/offerings"] z_index = -1 position = Vector2(157.5, 339.5) texture = ExtResource("13_j5d18") region_enabled = true region_rect = Rect2(2951, 783, 155, 78) -[node name="plate" type="Sprite2D" parent="Room assets/offerings"] +[node name="plate" type="Sprite2D" parent="BackWall/Room assets/offerings"] z_index = -20 position = Vector2(189.5, 659.5) texture = ExtResource("13_j5d18") @@ -351,8 +384,10 @@ offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2576, 802, 219, 64) +[node name="Vesna" parent="." instance=ExtResource("2_a2ood")] +position = Vector2(-1464, 136) + [node name="Yeli" parent="." instance=ExtResource("15_ciwvv")] -visible = false position = Vector2(-2912, 432) [node name="CollisionShape3D" parent="Yeli/InteractionArea/Area2D" index="0"]