diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index c21a792..216d241 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="1_7wfwe"] [ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_7b2ri"] -[ext_resource type="PackedScene" uid="uid://bm21nqepnwaik" path="res://scenes/IndoorTest2.tscn" id="2_taxvr"] +[ext_resource type="PackedScene" uid="uid://bm21nqepnwaik" path="res://scenes/Babushka_scene_indoor_common_room.tscn" id="2_taxvr"] [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="3_p4qqi"] [ext_resource type="Texture2D" uid="uid://be1nofeo7an0" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud2.png" id="3_r34wi"] [ext_resource type="Texture2D" uid="uid://o6vnf7n7qp8o" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud6.png" id="4_xh22q"] diff --git a/scenes/IndoorTest2.tscn b/scenes/Babushka_scene_indoor_common_room.tscn similarity index 81% rename from scenes/IndoorTest2.tscn rename to scenes/Babushka_scene_indoor_common_room.tscn index f4f1641..e2616ec 100644 --- a/scenes/IndoorTest2.tscn +++ b/scenes/Babushka_scene_indoor_common_room.tscn @@ -1,22 +1,23 @@ -[gd_scene load_steps=23 format=3 uid="uid://bm21nqepnwaik"] - -[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_aivb2"] -[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="2_a2ood"] -[ext_resource type="Texture2D" uid="uid://waqmjrxduxfq" path="res://art/indoor/room export/Room_01_walls.png" id="3_a2ood"] -[ext_resource type="Texture2D" uid="uid://cnhsxxps2cw5" path="res://art/indoor/room export/Room_01_table.png" id="3_je1cl"] -[ext_resource type="Texture2D" uid="uid://blg50is4kuh2f" path="res://art/indoor/room export/Room_01_chair.png" id="4_hjjhl"] -[ext_resource type="Texture2D" uid="uid://bqwhptcgg5ons" path="res://art/indoor/room export/Room_01_dorr_R.png" id="5_8o6or"] -[ext_resource type="Texture2D" uid="uid://dhvi5404cqioa" path="res://art/indoor/room export/Room_01_window.png" id="6_j5d18"] -[ext_resource type="Texture2D" uid="uid://404glx32r1w8" path="res://art/indoor/room export/Room_01_bench.png" id="7_ciwvv"] -[ext_resource type="Texture2D" uid="uid://cop1vjvhwlsec" path="res://art/indoor/room export/Room_01_shelf.png" id="8_8o6or"] -[ext_resource type="Texture2D" uid="uid://vyk63d0pgqm5" path="res://art/indoor/room export/Room_01_dioor L.png" id="8_wuntg"] -[ext_resource type="Texture2D" uid="uid://b2rj7wkyu6ehy" path="res://art/indoor/room export/Room_01_pechka.png" id="9_aivb2"] -[ext_resource type="Texture2D" uid="uid://bpi35nxbhput8" path="res://art/indoor/room export/Room_01_pechkaDoor.png" id="10_835kg"] -[ext_resource type="Texture2D" uid="uid://tyypifpte0pb" path="res://art/indoor/room export/Room_01_chugun.png" id="11_atjbs"] -[ext_resource type="Texture2D" uid="uid://x7trh4dgsvoe" path="res://art/indoor/room export/Room_01_assets.png" id="13_j5d18"] -[ext_resource type="Texture2D" uid="uid://ckvytnpi8gcxq" path="res://art/eyes_atlas.png" id="14_j5d18"] -[ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="15_ciwvv"] -[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="17_835kg"] +[gd_scene load_steps=24 format=3 uid="uid://bm21nqepnwaik"] + +[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_3vr4f"] +[ext_resource type="Texture2D" uid="uid://cnhsxxps2cw5" path="res://art/indoor/room export/Room_01_table.png" id="2_ubg3a"] +[ext_resource type="Texture2D" uid="uid://blg50is4kuh2f" path="res://art/indoor/room export/Room_01_chair.png" id="3_gpagp"] +[ext_resource type="Texture2D" uid="uid://x7trh4dgsvoe" path="res://art/indoor/room export/Room_01_assets.png" id="4_27bwy"] +[ext_resource type="Texture2D" uid="uid://waqmjrxduxfq" path="res://art/indoor/room export/Room_01_walls.png" id="5_sndxu"] +[ext_resource type="Texture2D" uid="uid://bqwhptcgg5ons" path="res://art/indoor/room export/Room_01_dorr_R.png" id="6_blyw3"] +[ext_resource type="Texture2D" uid="uid://vyk63d0pgqm5" path="res://art/indoor/room export/Room_01_dioor L.png" id="7_yd2gv"] +[ext_resource type="Texture2D" uid="uid://b2rj7wkyu6ehy" path="res://art/indoor/room export/Room_01_pechka.png" id="8_ofqcg"] +[ext_resource type="Texture2D" uid="uid://dhvi5404cqioa" path="res://art/indoor/room export/Room_01_window.png" id="9_aoesu"] +[ext_resource type="Texture2D" uid="uid://bpi35nxbhput8" path="res://art/indoor/room export/Room_01_pechkaDoor.png" id="10_xcryd"] +[ext_resource type="Texture2D" uid="uid://tyypifpte0pb" path="res://art/indoor/room export/Room_01_chugun.png" id="11_as3nm"] +[ext_resource type="Texture2D" uid="uid://cop1vjvhwlsec" path="res://art/indoor/room export/Room_01_shelf.png" id="12_bu2a1"] +[ext_resource type="Texture2D" uid="uid://404glx32r1w8" path="res://art/indoor/room export/Room_01_bench.png" id="13_rongr"] +[ext_resource type="Texture2D" uid="uid://ckvytnpi8gcxq" path="res://art/eyes_atlas.png" id="14_d7yky"] +[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="15_7a68a"] +[ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="16_dhsxs"] +[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="17_k0k8c"] +[ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="18_dw4nn"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_a2ood"] resource_local_to_scene = true @@ -113,14 +114,14 @@ radius = 300.0 [node name="IndoorTest" type="Node2D"] y_sort_enabled = true -script = ExtResource("1_aivb2") +script = ExtResource("1_3vr4f") [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") +texture = ExtResource("2_ubg3a") offset = Vector2(0, -200) region_enabled = true region_rect = Rect2(1012, 1743, 1470, 417) @@ -128,7 +129,7 @@ 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") +texture = ExtResource("3_gpagp") offset = Vector2(216, -1064) region_enabled = true region_rect = Rect2(1534, 1976, 379, 184) @@ -136,7 +137,7 @@ 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") +texture = ExtResource("3_gpagp") offset = Vector2(184, -1056) region_enabled = true region_rect = Rect2(1534, 1976, 379, 184) @@ -145,7 +146,7 @@ region_rect = Rect2(1534, 1976, 379, 184) z_index = 1 y_sort_enabled = true position = Vector2(-1904, 1192) -texture = ExtResource("13_j5d18") +texture = ExtResource("4_27bwy") offset = Vector2(0, -800) region_enabled = true region_rect = Rect2(2093, 49, 421, 630) @@ -180,14 +181,14 @@ shape = SubResource("RectangleShape2D_a2ood") z_index = -100 position = Vector2(4992, -487) scale = Vector2(2, 2) -texture = ExtResource("3_a2ood") +texture = ExtResource("5_sndxu") 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") +texture = ExtResource("5_sndxu") flip_h = true region_rect = Rect2(111, 292, 3323, 2160) @@ -200,56 +201,56 @@ shape = SubResource("RectangleShape2D_a2ood") [node name="Room01DorrR" type="Sprite2D" parent="BackWall"] z_index = -50 position = Vector2(936, -216) -texture = ExtResource("5_8o6or") +texture = ExtResource("6_blyw3") region_enabled = true region_rect = Rect2(3161, 313, 679, 1050) [node name="Room01DioorL" type="Sprite2D" parent="BackWall"] z_index = -50 position = Vector2(-3296, 48) -texture = ExtResource("8_wuntg") +texture = ExtResource("7_yd2gv") region_enabled = true region_rect = Rect2(0, 0, 3840, 2160) [node name="Room01Pechka" type="Sprite2D" parent="BackWall"] z_index = -80 position = Vector2(-224, -392) -texture = ExtResource("9_aivb2") +texture = ExtResource("8_ofqcg") region_enabled = true region_rect = Rect2(2236, 0, 724, 1392) [node name="Room01Window2" type="Sprite2D" parent="BackWall"] z_index = -50 position = Vector2(-3192, -344) -texture = ExtResource("6_j5d18") +texture = ExtResource("9_aoesu") region_enabled = true region_rect = Rect2(1020, 338, 607, 757) [node name="Room01Window3" type="Sprite2D" parent="BackWall"] z_index = -50 position = Vector2(-1792, -336) -texture = ExtResource("6_j5d18") +texture = ExtResource("9_aoesu") region_enabled = true region_rect = Rect2(1020, 338, 607, 757) [node name="Room01PechkaDoor" type="Sprite2D" parent="BackWall"] z_index = -50 position = Vector2(-248, -96) -texture = ExtResource("10_835kg") +texture = ExtResource("10_xcryd") region_enabled = true region_rect = Rect2(2360, 864, 356, 251) [node name="Room01Chugun" type="Sprite2D" parent="BackWall"] z_index = -40 position = Vector2(16, -560) -texture = ExtResource("11_atjbs") +texture = ExtResource("11_as3nm") region_enabled = true region_rect = Rect2(2469, 459, 247, 131) [node name="Room01Shelf" type="Sprite2D" parent="BackWall"] z_index = -50 position = Vector2(-880, -416) -texture = ExtResource("8_8o6or") +texture = ExtResource("12_bu2a1") region_enabled = true region_rect = Rect2(1846, 471, 348, 490) @@ -257,7 +258,7 @@ region_rect = Rect2(1846, 471, 348, 490) z_index = -10 y_sort_enabled = true position = Vector2(-3240, 224) -texture = ExtResource("7_ciwvv") +texture = ExtResource("13_rongr") flip_h = true region_enabled = true region_rect = Rect2(1156, 1185, 940, 189) @@ -265,7 +266,7 @@ region_rect = Rect2(1156, 1185, 940, 189) [node name="Bench2" type="Sprite2D" parent="BackWall"] z_index = -10 position = Vector2(-1824, 224) -texture = ExtResource("7_ciwvv") +texture = ExtResource("13_rongr") region_enabled = true region_rect = Rect2(1156, 1185, 940, 189) @@ -275,7 +276,7 @@ region_rect = Rect2(1156, 1185, 940, 189) z_index = -10 y_sort_enabled = true position = Vector2(-177, 554.5) -texture = ExtResource("13_j5d18") +texture = ExtResource("4_27bwy") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2244, 763, 274, 91) @@ -284,7 +285,7 @@ region_rect = Rect2(2244, 763, 274, 91) z_index = -10 y_sort_enabled = true position = Vector2(335, 474.5) -texture = ExtResource("13_j5d18") +texture = ExtResource("4_27bwy") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(3157, 688, 118.519, 221) @@ -293,7 +294,7 @@ region_rect = Rect2(3157, 688, 118.519, 221) z_index = -10 y_sort_enabled = true position = Vector2(-857, -37.5) -texture = ExtResource("13_j5d18") +texture = ExtResource("4_27bwy") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2748, 432, 174, 191) @@ -303,7 +304,7 @@ z_index = -10 y_sort_enabled = true position = Vector2(-425, -77.5) rotation = -0.0663225 -texture = ExtResource("13_j5d18") +texture = ExtResource("4_27bwy") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2624, 435, 49, 76) @@ -314,7 +315,7 @@ y_sort_enabled = true position = Vector2(47.5969, 6.18) rotation = -0.0663225 scale = Vector2(1e-05, 1e-05) -texture = ExtResource("13_j5d18") +texture = ExtResource("4_27bwy") offset = Vector2(43.3898, 128.128) region_enabled = true region_rect = Rect2(3362, 139, 101, 269) @@ -331,7 +332,7 @@ playback_auto_capture = false z_index = -10 y_sort_enabled = true position = Vector2(287, -157.5) -texture = ExtResource("13_j5d18") +texture = ExtResource("4_27bwy") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2964, 137, 321, 213) @@ -339,7 +340,7 @@ region_rect = Rect2(2964, 137, 321, 213) [node name="herb 1" type="Sprite2D" parent="BackWall/Room assets/herbsline"] y_sort_enabled = true position = Vector2(-72, 136) -texture = ExtResource("13_j5d18") +texture = ExtResource("4_27bwy") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2600, 165, 127, 199) @@ -347,7 +348,7 @@ region_rect = Rect2(2600, 165, 127, 199) [node name="herb 2" type="Sprite2D" parent="BackWall/Room assets/herbsline"] y_sort_enabled = true position = Vector2(64, 80) -texture = ExtResource("13_j5d18") +texture = ExtResource("4_27bwy") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2761, 161, 135, 199) @@ -357,37 +358,38 @@ visible = false z_index = -10 position = Vector2(32, -72) scale = Vector2(0.4, 0.4) -texture = ExtResource("14_j5d18") +texture = ExtResource("14_d7yky") region_enabled = true region_rect = Rect2(2647, 15, 286, 183) [node name="offerings" type="Node2D" parent="BackWall/Room assets"] [node name="apple" type="Sprite2D" parent="BackWall/Room assets/offerings"] +z_index = -1 position = Vector2(229.5, 331.5) -texture = ExtResource("13_j5d18") +texture = ExtResource("4_27bwy") region_enabled = true region_rect = Rect2(2822, 764, 93, 87) [node name="bread" type="Sprite2D" parent="BackWall/Room assets/offerings"] -z_index = -1 +z_index = -2 position = Vector2(157.5, 339.5) -texture = ExtResource("13_j5d18") +texture = ExtResource("4_27bwy") region_enabled = true region_rect = Rect2(2951, 783, 155, 78) [node name="plate" type="Sprite2D" parent="BackWall/Room assets/offerings"] z_index = -20 position = Vector2(189.5, 659.5) -texture = ExtResource("13_j5d18") +texture = ExtResource("4_27bwy") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2576, 802, 219, 64) -[node name="Vesna" parent="." instance=ExtResource("2_a2ood")] +[node name="Vesna" parent="." instance=ExtResource("15_7a68a")] position = Vector2(-1464, 136) -[node name="Yeli" parent="." instance=ExtResource("15_ciwvv")] +[node name="Yeli" parent="." instance=ExtResource("16_dhsxs")] position = Vector2(-2912, 432) [node name="CollisionShape3D" parent="Yeli/InteractionArea/Area2D" index="0"] @@ -401,9 +403,21 @@ _timelinesToPlay = PackedStringArray("yeli_intro_05") position = Vector2(-576, 368) [node name="dialogic_toggle" type="Node2D" parent="Yeli"] -script = ExtResource("17_835kg") +script = ExtResource("17_k0k8c") metadata/_custom_type_script = "uid://cvkw4qd2hxksi" +[node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")] +position = Vector2(-1534, -26) +offset = Vector2(0, -200) +zoom = Vector2(0.5, 0.5) +limit_left = -6300 +limit_top = -1050 +limit_right = 1400 +limit_bottom = 1150 +editor_draw_limits = true +script = ExtResource("18_dw4nn") +_followNode = NodePath("../Vesna/CharacterBody2D") + [connection signal="timelineEnded" from="Yeli/dialogic_toggle" to="." method="Quit"] [editable path="Vesna"]