Fixed ordering issues in indoor scene

project.godot

@@ -13,6 +13,7 @@ config_version=5
 config/name="Babushka"
 run/main_scene="uid://bopv10dqm1knc"
 config/features=PackedStringArray("4.4", "C#", "Forward Plus")
+run/max_fps=120
 boot_splash/fullsize=false
 boot_splash/image="uid://utam4axkvutc"
 config/icon="uid://b2smanpdo1y5e"

scenes/Babushka_scene_farm_outside_2d.tscn

@@ -454,13 +454,13 @@ texture = ExtResource("14_d53cn")
 [node name="JelenaMockupBg02" type="Sprite2D" parent="ParallaxBackground/background layer 4"]
 material = SubResource("ShaderMaterial_wtdui")
 position = Vector2(2668, 726)
-scale = Vector2(1.3, 1.3)
+scale = Vector2(2.75, 2.75)
 texture = ExtResource("13_0qu0h")
 
 [node name="JelenaMockupBg03" type="Sprite2D" parent="ParallaxBackground/background layer 4"]
 material = SubResource("ShaderMaterial_wtdui")
 position = Vector2(7965, 728)
-scale = Vector2(1.3, 1.3)
+scale = Vector2(2.75, 2.75)
 texture = ExtResource("13_0qu0h")
 
 [node name="back back trees layer" type="ParallaxLayer" parent="ParallaxBackground"]
@@ -839,6 +839,8 @@ material = SubResource("ShaderMaterial_2vojv")
 position = Vector2(7237, 3307)
 texture = ExtResource("21_ualyd")
 offset = Vector2(0, -800)
+region_enabled = true
+region_rect = Rect2(0, 0, 1504, 1686)
 
 [node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Brünnen"]
 collision_mask = 4

scenes/Babushka_scene_startMenu.tscn

@@ -19,14 +19,24 @@ grow_vertical = 2
 texture = ExtResource("1_qerdf")
 expand_mode = 2
 stretch_mode = 6
+metadata/_edit_use_anchors_ = true
 
 [node name="Start" type="Button" parent="CanvasLayer/TextureRect"]
-layout_mode = 0
-offset_left = 571.0
-offset_top = 559.0
-offset_right = 617.0
-offset_bottom = 590.0
+custom_minimum_size = Vector2(100, 30)
+layout_mode = 1
+anchors_preset = 7
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+offset_left = -76.0
+offset_top = -98.0
+offset_right = 24.0
+offset_bottom = -67.0
+grow_horizontal = 2
+grow_vertical = 0
 scale = Vector2(2, 2)
 text = "Start"
+icon_alignment = 1
 
 [connection signal="pressed" from="CanvasLayer/TextureRect/Start" to="." method="LoadScene"]

scenes/IndoorTest2.tscn

@@ -20,14 +20,14 @@
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_a2ood"]
 resource_local_to_scene = true
-size = Vector2(7680, 1336)
+size = Vector2(3836, 1086)
 
 [sub_resource type="Animation" id="Animation_j5d18"]
 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,16 +115,78 @@ 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"]
 z_index = -100
-position = Vector2(-1072, -264)
+position = Vector2(4992, -487)
+scale = Vector2(2, 2)
 texture = ExtResource("3_a2ood")
 offset = Vector2(-2768, 264)
 
 [node name="wall 1" type="Sprite2D" parent="BackWall"]
 z_index = -100
+position = Vector2(-4368, 40)
+scale = Vector2(2, 2)
 texture = ExtResource("3_a2ood")
 flip_h = true
 region_rect = Rect2(111, 292, 3323, 2160)
@@ -132,129 +194,124 @@ region_rect = Rect2(111, 292, 3323, 2160)
 [node name="StaticBody2D" type="StaticBody2D" parent="BackWall/wall 1"]
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="BackWall/wall 1/StaticBody2D"]
-position = Vector2(-1912, -396)
+position = Vector2(950, -419)
 shape = SubResource("RectangleShape2D_a2ood")
 
 [node name="Room01DorrR" type="Sprite2D" parent="BackWall"]
 z_index = -50
-position = Vector2(-744, 16)
+position = Vector2(936, -216)
 texture = ExtResource("5_8o6or")
+region_enabled = true
+region_rect = Rect2(3161, 313, 679, 1050)
 
 [node name="Room01DioorL" type="Sprite2D" parent="BackWall"]
 z_index = -50
-position = Vector2(-3288, 8)
+position = Vector2(-3296, 48)
 texture = ExtResource("8_wuntg")
+region_enabled = true
+region_rect = Rect2(0, 0, 3840, 2160)
 
 [node name="Room01Pechka" type="Sprite2D" parent="BackWall"]
 z_index = -80
-position = Vector2(-752, 0)
+position = Vector2(-224, -392)
 texture = ExtResource("9_aivb2")
+region_enabled = true
+region_rect = Rect2(2236, 0, 724, 1392)
 
 [node name="Room01Window2" type="Sprite2D" parent="BackWall"]
 z_index = -50
-position = Vector2(-2952, 16)
+position = Vector2(-3192, -344)
 texture = ExtResource("6_j5d18")
+region_enabled = true
+region_rect = Rect2(1020, 338, 607, 757)
 
 [node name="Room01Window3" type="Sprite2D" parent="BackWall"]
 z_index = -50
-position = Vector2(-944, -8)
+position = Vector2(-1792, -336)
 texture = ExtResource("6_j5d18")
+region_enabled = true
+region_rect = Rect2(1020, 338, 607, 757)
 
 [node name="Room01PechkaDoor" type="Sprite2D" parent="BackWall"]
 z_index = -50
-position = Vector2(-710, 0)
+position = Vector2(-248, -96)
 texture = ExtResource("10_835kg")
+region_enabled = true
+region_rect = Rect2(2360, 864, 356, 251)
 
 [node name="Room01Chugun" type="Sprite2D" parent="BackWall"]
 z_index = -40
-position = Vector2(-736, 8)
+position = Vector2(16, -560)
 texture = ExtResource("11_atjbs")
+region_enabled = true
+region_rect = Rect2(2469, 459, 247, 131)
 
 [node name="Room01Shelf" type="Sprite2D" parent="BackWall"]
 z_index = -50
-position = Vector2(-832, 56)
+position = Vector2(-880, -416)
 texture = ExtResource("8_8o6or")
+region_enabled = true
+region_rect = Rect2(1846, 471, 348, 490)
 
-[node name="Player2d" parent="." instance=ExtResource("2_a2ood")]
-position = Vector2(-1464, 136)
-
-[node name="CharacterBody2D" parent="Player2d" index="0"]
-_speed = 500.0
-
-[node name="Animated Sprites" parent="Player2d/CharacterBody2D/visuals" index="0"]
-z_index = 50
-
-[node name="Room01Table" type="Sprite2D" parent="."]
+[node name="Bench" type="Sprite2D" parent="BackWall"]
+z_index = -10
 y_sort_enabled = true
-position = Vector2(-2056, 888)
-texture = ExtResource("3_je1cl")
-offset = Vector2(192, -848)
-
-[node name="Room01Chair" type="Sprite2D" parent="."]
-position = Vector2(-2792, 1096)
-texture = ExtResource("4_hjjhl")
-offset = Vector2(216, -1064)
-
-[node name="Room01Chair2" type="Sprite2D" parent="."]
-position = Vector2(-1304, 1080)
-texture = ExtResource("4_hjjhl")
-offset = Vector2(184, -1056)
-
-[node name="Room01Bench" type="Sprite2D" parent="."]
-position = Vector2(-3280, 24)
+position = Vector2(-3240, 224)
 texture = ExtResource("7_ciwvv")
 flip_h = true
-
-[node name="Room01Bench2" type="Sprite2D" parent="."]
-position = Vector2(-784, 40)
-texture = ExtResource("7_ciwvv")
-
-[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(2085, 40, 446, 654)
+region_rect = Rect2(1156, 1185, 940, 189)
 
-[node name="wood" type="Sprite2D" parent="Room assets"]
+[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="BackWall"]
+
+[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, 131, 221)
+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(-712, 72)
+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(-272, -56)
+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")
@@ -262,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(440, -168)
+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")
@@ -286,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")
@@ -294,31 +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"]
-visible = false
+[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")
@@ -326,21 +384,28 @@ 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")]
 position = Vector2(-2912, 432)
 
 [node name="CollisionShape3D" parent="Yeli/InteractionArea/Area2D" index="0"]
+position = Vector2(-205.348, 131.907)
 shape = SubResource("CircleShape2D_wuntg")
 
 [node name="TalkingControl" parent="Yeli" index="1"]
 _timelinesToPlay = PackedStringArray("yeli_intro_05")
 
+[node name="AnimatedSprite" parent="Yeli/TalkingControl" index="0"]
+position = Vector2(-576, 368)
+
 [node name="dialogic_toggle" type="Node2D" parent="Yeli"]
 script = ExtResource("17_835kg")
 metadata/_custom_type_script = "uid://cvkw4qd2hxksi"
 
 [connection signal="timelineEnded" from="Yeli/dialogic_toggle" to="." method="Quit"]
 
-[editable path="Player2d"]
+[editable path="Vesna"]
 [editable path="Yeli"]
 [editable path="Yeli/InteractionArea"]