diff --git a/dialog/Scene1_farm_outside/yeli_intro_05.dtl b/dialog/Scene1_farm_outside/yeli_intro_05.dtl index e1037f1..39183e5 100644 --- a/dialog/Scene1_farm_outside/yeli_intro_05.dtl +++ b/dialog/Scene1_farm_outside/yeli_intro_05.dtl @@ -1,7 +1,7 @@ [quest_complete quest_resource="res://resources/quests/demo/7_talk_yeli_inside_1.tres"] join Yeli right Yeli: Thank you for your help out there. -Yeli: You must be tired. Please rest. I prepared a bed for you. It's in the room to the left. +Yeli: You must be tired. Please rest. I prepared a bed for you. It's the door in the middle. Yeli: There is nothing interesting to see here. leave Yeli [quest_activate quest_resource="res://resources/quests/demo/8_goto_bed.tres"] diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index dbc5e32..be2050a 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=119 format=3 uid="uid://gigb28qk8t12"] +[gd_scene load_steps=118 format=3 uid="uid://gigb28qk8t12"] [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="1_7wfwe"] [ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_7b2ri"] @@ -21,7 +21,6 @@ [ext_resource type="Texture2D" uid="uid://dldk8n51ag8fh" path="res://art/nature/baum märz 2025/backtreebois team brandon.png" id="13_d53cn"] [ext_resource type="Shader" uid="uid://xnky830dtfsn" path="res://shader/repeat_texture.gdshader" id="13_kt1wx"] [ext_resource type="Texture2D" uid="uid://bmjjfd5ngptxe" path="res://art/nature/baum märz 2025/backtreebois team kennedy.png" id="14_1uen0"] -[ext_resource type="Texture2D" uid="uid://dv2jepy2el544" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/tree11.png" id="14_d53cn"] [ext_resource type="Texture2D" uid="uid://451bkvxcxab7" path="res://art/nature/baum märz 2025/gräser und büsche.png" id="14_mrwmr"] [ext_resource type="Texture2D" uid="uid://btea6eyucsyxj" path="res://art/farm/farming/farmobjekte/zaun/tilable fence middle part.png" id="20_if5vh"] [ext_resource type="Texture2D" uid="uid://3ed3dgq3irn2" path="res://art/farm/farming/farmobjekte/zaun/tilable fence end part2.png" id="21_if5vh"] @@ -90,13 +89,13 @@ shader_parameter/value_mult = 1.0 shader_parameter/brightness_add = 0.0 shader_parameter/contrast_mult = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_w1kgo"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_065st"] shader = ExtResource("13_7p0hq") -shader_parameter/hue_shift = -0.17599996086000003 -shader_parameter/saturation_mult = 0.73600003496 -shader_parameter/value_mult = 0.8490000403275 -shader_parameter/brightness_add = 0.038000049304999894 -shader_parameter/contrast_mult = 1.0 +shader_parameter/hue_shift = -0.18299996119249995 +shader_parameter/saturation_mult = 0.8530000405175 +shader_parameter/value_mult = 1.0 +shader_parameter/brightness_add = 4.7499999933364734e-08 +shader_parameter/contrast_mult = 0.9630000457425 [sub_resource type="ShaderMaterial" id="ShaderMaterial_8ey8m"] shader = ExtResource("13_7p0hq") @@ -279,7 +278,7 @@ metadata/_custom_type_script = "uid://be54lnb6gg81f" [node name="BabushkaSceneFarmOutside2d" type="Node2D"] script = ExtResource("34_e5b7x") -_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_kitchen.tscn", "res://scenes/Babushka_scene_outside_beets.tscn") +_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn", "res://scenes/Babushka_scene_outside_beets.tscn") [node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")] position = Vector2(3180, 1961) @@ -367,13 +366,13 @@ centered = false offset = Vector2(0, -100) [node name="background layer 3" type="ParallaxLayer" parent="ParallaxBackground"] -visible = false z_index = -250 position = Vector2(18, -713) motion_scale = Vector2(0.25, 0.25) motion_mirroring = Vector2(5424, 0) [node name="Kenney assets" type="Node2D" parent="ParallaxBackground/background layer 3"] +modulate = Color(0.56078434, 0.89411765, 0.8235294, 1) position = Vector2(0, -39) scale = Vector2(1.2, 1.2) @@ -491,119 +490,6 @@ position = Vector2(0, -82) motion_scale = Vector2(0.5, 0.5) motion_mirroring = Vector2(10480, 0) -[node name="Kenney Assets" type="Node2D" parent="ParallaxBackground/background layer 4"] -visible = false - -[node name="hills" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.525643, 0.556909, 0.560815, 1) -position = Vector2(0, 1420) -scale = Vector2(4, 4) -texture = ExtResource("7_sbyqw") -centered = false -offset = Vector2(-200, -80) - -[node name="hills 1" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.525643, 0.556909, 0.560815, 1) -position = Vector2(3999, 1420) -scale = Vector2(4, 4) -texture = ExtResource("8_kt1wx") -centered = false -offset = Vector2(-200, -80) - -[node name="tree" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(128, 784) -scale = Vector2(5.11066, 3.99823) -texture = ExtResource("14_d53cn") - -[node name="tree2" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(976, 952) -scale = Vector2(3.7465, 2.76803) -texture = ExtResource("14_d53cn") - -[node name="tree9" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(1160, 976) -scale = Vector2(3.7465, 2.76803) -texture = ExtResource("14_d53cn") -flip_h = true - -[node name="tree3" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(1368, 800) -scale = Vector2(3.7465, 2.76803) -texture = ExtResource("14_d53cn") - -[node name="tree4" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(2328, 880) -scale = Vector2(3.7465, 2.76803) -texture = ExtResource("14_d53cn") - -[node name="tree5" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(3112, 944) -scale = Vector2(3.7465, 2.76803) -texture = ExtResource("14_d53cn") - -[node name="tree6" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(4248, 960) -scale = Vector2(3.7465, 2.76803) -texture = ExtResource("14_d53cn") - -[node name="tree10" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(5376, 848) -scale = Vector2(3.7465, 2.76803) -texture = ExtResource("14_d53cn") -flip_h = true - -[node name="tree11" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(5624, 976) -scale = Vector2(2.93619, 1.96107) -texture = ExtResource("14_d53cn") - -[node name="tree12" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(5856.97, 753.531) -scale = Vector2(3.3702, 3.05266) -texture = ExtResource("14_d53cn") - -[node name="tree13" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(6888, 912) -scale = Vector2(3.3702, 3.05266) -texture = ExtResource("14_d53cn") -flip_h = true - -[node name="tree14" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(7088.48, 752.766) -scale = Vector2(3.69909, 3.46732) -texture = ExtResource("14_d53cn") - -[node name="tree15" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(7224, 888) -scale = Vector2(3.1922, 3.25497) -texture = ExtResource("14_d53cn") - -[node name="tree7" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(4392, 1152) -scale = Vector2(2.55123, 1.88928) -texture = ExtResource("14_d53cn") -flip_h = true - -[node name="tree8" type="Sprite2D" parent="ParallaxBackground/background layer 4/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(2944, 992) -scale = Vector2(3.008, 2.76803) -texture = ExtResource("14_d53cn") - [node name="JelenaMockupBg02" type="Sprite2D" parent="ParallaxBackground/background layer 4"] z_index = -200 material = SubResource("ShaderMaterial_wtdui") @@ -619,298 +505,27 @@ scale = Vector2(2.75, 2.75) texture = ExtResource("13_0qu0h") [node name="background layer 5" type="ParallaxLayer" parent="ParallaxBackground"] -z_index = -190 -position = Vector2(8685, -127) -scale = Vector2(-1, 1) +z_index = -200 +position = Vector2(0, -82) motion_scale = Vector2(0.5, 0.5) +motion_offset = Vector2(1000, 0) motion_mirroring = Vector2(10480, 0) -[node name="Kenney Assets" type="Node2D" parent="ParallaxBackground/background layer 5"] -visible = false - -[node name="hills" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.525643, 0.556909, 0.560815, 1) -position = Vector2(0, 1420) -scale = Vector2(4, 4) -texture = ExtResource("7_sbyqw") -centered = false -offset = Vector2(-200, -80) - -[node name="hills 1" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.525643, 0.556909, 0.560815, 1) -position = Vector2(3999, 1420) -scale = Vector2(4, 4) -texture = ExtResource("8_kt1wx") -centered = false -offset = Vector2(-200, -80) - -[node name="tree" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(128, 784) -scale = Vector2(5.11066, 3.99823) -texture = ExtResource("14_d53cn") - -[node name="tree2" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(976, 952) -scale = Vector2(3.7465, 2.76803) -texture = ExtResource("14_d53cn") - -[node name="tree9" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(1160, 976) -scale = Vector2(3.7465, 2.76803) -texture = ExtResource("14_d53cn") -flip_h = true - -[node name="tree3" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(1368, 800) -scale = Vector2(3.7465, 2.76803) -texture = ExtResource("14_d53cn") - -[node name="tree4" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(2328, 880) -scale = Vector2(3.7465, 2.76803) -texture = ExtResource("14_d53cn") - -[node name="tree5" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(3112, 944) -scale = Vector2(3.7465, 2.76803) -texture = ExtResource("14_d53cn") - -[node name="tree6" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(4248, 960) -scale = Vector2(3.7465, 2.76803) -texture = ExtResource("14_d53cn") - -[node name="tree10" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(5376, 848) -scale = Vector2(3.7465, 2.76803) -texture = ExtResource("14_d53cn") -flip_h = true - -[node name="tree11" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(5624, 976) -scale = Vector2(2.93619, 1.96107) -texture = ExtResource("14_d53cn") - -[node name="tree12" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(5856.97, 753.531) -scale = Vector2(3.3702, 3.05266) -texture = ExtResource("14_d53cn") - -[node name="tree13" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(6888, 912) -scale = Vector2(3.3702, 3.05266) -texture = ExtResource("14_d53cn") -flip_h = true - -[node name="tree14" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(7088.48, 752.766) -scale = Vector2(3.69909, 3.46732) -texture = ExtResource("14_d53cn") - -[node name="tree15" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(7224, 888) -scale = Vector2(3.1922, 3.25497) -texture = ExtResource("14_d53cn") - -[node name="tree7" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(4392, 1152) -scale = Vector2(2.55123, 1.88928) -texture = ExtResource("14_d53cn") -flip_h = true - -[node name="tree8" type="Sprite2D" parent="ParallaxBackground/background layer 5/Kenney Assets"] -modulate = Color(0.431357, 0.282353, 0.415717, 1) -position = Vector2(2944, 992) -scale = Vector2(3.008, 2.76803) -texture = ExtResource("14_d53cn") - [node name="JelenaMockupBg02" type="Sprite2D" parent="ParallaxBackground/background layer 5"] z_index = -200 -material = SubResource("ShaderMaterial_w1kgo") +material = SubResource("ShaderMaterial_065st") position = Vector2(2668, 726) scale = Vector2(2.75, 2.75) texture = ExtResource("13_0qu0h") +flip_h = true [node name="JelenaMockupBg03" type="Sprite2D" parent="ParallaxBackground/background layer 5"] z_index = -200 -material = SubResource("ShaderMaterial_w1kgo") +material = SubResource("ShaderMaterial_065st") position = Vector2(7923, 727) scale = Vector2(2.75, 2.75) texture = ExtResource("13_0qu0h") - -[node name="back back trees layer2" type="ParallaxLayer" parent="ParallaxBackground"] -modulate = Color(0.5019608, 0.8509804, 0.6627451, 1) -z_index = -160 -position = Vector2(17801, -387) -rotation = -3.1415927 -scale = Vector2(1, -1) -motion_scale = Vector2(0.5, 0.6) -motion_mirroring = Vector2(9965, 0) - -[node name="hills" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -modulate = Color(0.345703, 0.360648, 0.242876, 1) -position = Vector2(993, 1576) -scale = Vector2(5, 5) -texture = ExtResource("7_sbyqw") -centered = false -offset = Vector2(-200, -80) - -[node name="hills 1" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -modulate = Color(0.345703, 0.360648, 0.242876, 1) -position = Vector2(5961, 1582) -scale = Vector2(5, 5) -texture = ExtResource("8_kt1wx") -centered = false -offset = Vector2(-200, -80) - -[node name="tree" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(3017.3, 536.15) -scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") -region_enabled = true -region_rect = Rect2(770, 3, 304, 979) - -[node name="tree2" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(1807.5, 1408) -scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") -region_enabled = true -region_rect = Rect2(399, 420, 228, 493) - -[node name="tree4" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(3321.3, 600.15) -scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") -region_enabled = true -region_rect = Rect2(1770, -4, 289, 930) - -[node name="tree11" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(460, 622) -scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") -region_enabled = true -region_rect = Rect2(1770, -4, 289, 930) - -[node name="tree5" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(5081.3, 696.15) -scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") -region_enabled = true -region_rect = Rect2(2283, 2, 186, 840) - -[node name="tree10" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(8470, 694) -scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") -region_enabled = true -region_rect = Rect2(2283, 2, 186, 840) - -[node name="tree3" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(6596.8, 1566.35) -scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") -region_enabled = true -region_rect = Rect2(399, 420, 228, 493) - -[node name="tree8" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(8110.6, 758.5) -scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") -region_enabled = true -region_rect = Rect2(1770, -4, 289, 930) - -[node name="tree9" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(10240, 850) -scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") -region_enabled = true -region_rect = Rect2(2283, 2, 186, 840) - -[node name="tree6" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(5641.3, 1168.15) -scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") -region_enabled = true -region_rect = Rect2(2609, 434, 304, 467) - -[node name="tree7" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(5161.3, 608.15) -scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") -region_enabled = true -region_rect = Rect2(3111, -4, 167, 949) - -[node name="bush" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(3239.5, 1288) -texture = ExtResource("14_mrwmr") -region_enabled = true -region_rect = Rect2(149, 15, 464, 478) - -[node name="bush2" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(1791.5, 1448) -texture = ExtResource("14_mrwmr") flip_h = true -region_enabled = true -region_rect = Rect2(130, 0, 201, 278) - -[node name="bush3" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(1255.5, 1392) -texture = ExtResource("14_mrwmr") -flip_h = true -region_enabled = true -region_rect = Rect2(0, 604, 248, 228) - -[node name="bush4" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(5471.5, 1432) -texture = ExtResource("14_mrwmr") -flip_h = true -region_enabled = true -region_rect = Rect2(1837, 651, 139, 180) - -[node name="bush5" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(5007.5, 1312) -texture = ExtResource("14_mrwmr") -region_enabled = true -region_rect = Rect2(1368, 673, 186, 136) - -[node name="bush6" type="Sprite2D" parent="ParallaxBackground/back back trees layer2"] -material = SubResource("ShaderMaterial_8ey8m") -position = Vector2(3583.5, 1248) -scale = Vector2(0.575, 0.575) -texture = ExtResource("14_mrwmr") -flip_h = true -region_enabled = true -region_rect = Rect2(358, 523, 345, 289) [node name="back back trees layer" type="ParallaxLayer" parent="ParallaxBackground"] z_index = -150 @@ -1187,12 +802,16 @@ z_index = -50 motion_mirroring = Vector2(3779, 0) [node name="Sonnenblumeseamless" type="Sprite2D" parent="ParallaxBackground/sunflower field"] -position = Vector2(1892, 1863) +modulate = Color(1, 1, 1, 0.7921569) +position = Vector2(0, 1863) texture = ExtResource("23_d77e7") +offset = Vector2(1892, 0) [node name="Sonnenblumeseamless2" type="Sprite2D" parent="ParallaxBackground/sunflower field"] -position = Vector2(9411, 1863) +modulate = Color(1, 1, 1, 0.7921569) +position = Vector2(0, 1863) texture = ExtResource("23_d77e7") +offset = Vector2(9450, 0) [node name="ground layer" type="ParallaxLayer" parent="ParallaxBackground"] position = Vector2(80, 208) diff --git a/scenes/Babushka_scene_fight_world_room.tscn b/scenes/Babushka_scene_fight_world_room.tscn index dd83750..ba3a569 100644 --- a/scenes/Babushka_scene_fight_world_room.tscn +++ b/scenes/Babushka_scene_fight_world_room.tscn @@ -46,7 +46,7 @@ shader = ExtResource("16_0fard") shader_parameter/hue_shift = 0.0 shader_parameter/saturation_mult = 0.603 shader_parameter/value_mult = 1.0 -shader_parameter/brightness_add = -0.43699997325749995 +shader_parameter/brightness_add = -0.4369999732574999 shader_parameter/contrast_mult = 1.138000054055 [sub_resource type="ShaderMaterial" id="ShaderMaterial_q1iw4"] @@ -778,7 +778,6 @@ region_enabled = true region_rect = Rect2(0, 0, 1405.76, 1244) [node name="YSorted" type="Node2D" parent="."] -z_index = 1 y_sort_enabled = true [node name="Vesna" parent="YSorted" instance=ExtResource("24_ffcio")] @@ -881,10 +880,9 @@ region_rect = Rect2(1699, 76, 280, 230) [node name="bush4" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/left side"] modulate = Color(0.8428, 0.8771, 0.98, 1) material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(16878, 2099) +position = Vector2(16912, 1803) scale = Vector2(2, 2) texture = ExtResource("19_edja8") -offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(0, 604, 248, 228) @@ -1079,10 +1077,9 @@ position = Vector2(13188, 30) [node name="bush" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/right side"] y_sort_enabled = true material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(4360, 2049) +position = Vector2(4383, 1691) scale = Vector2(2, 2) texture = ExtResource("19_edja8") -offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1110,10 +1107,10 @@ region_rect = Rect2(130, 0, 201, 278) [node name="bush7" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/right side"] y_sort_enabled = true material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(5051, 2217) +position = Vector2(5060, 1855) scale = Vector2(2, 2) texture = ExtResource("19_edja8") -offset = Vector2(0, -237) +offset = Vector2(-4.5, -56) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1121,20 +1118,20 @@ region_rect = Rect2(1368, 673, 186, 136) modulate = Color(0.8428, 0.8771, 0.98, 1) y_sort_enabled = true material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(4008, 2250) +position = Vector2(4015, 1894) scale = Vector2(2, 2) texture = ExtResource("19_edja8") -offset = Vector2(0, -237) +offset = Vector2(-3.5, -59) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) [node name="bush9" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/right side"] y_sort_enabled = true material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(5325, 2263) +position = Vector2(5324.6553, 1847.6593) scale = Vector2(-1.86739, 2.34145) texture = ExtResource("19_edja8") -offset = Vector2(0, -237) +offset = Vector2(-0.18457031, -59.61389) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1152,20 +1149,20 @@ region_rect = Rect2(1699, 76, 280, 230) [node name="bush4" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/right side"] y_sort_enabled = true material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(7361, 2026) +position = Vector2(7369, 1881) scale = Vector2(2, 2) texture = ExtResource("19_edja8") -offset = Vector2(0, -172) +offset = Vector2(-4, -99.5) region_enabled = true region_rect = Rect2(0, 604, 248, 228) [node name="bush10" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/right side"] y_sort_enabled = true material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(7757, 2032) +position = Vector2(7747, 1840) scale = Vector2(2, 2) texture = ExtResource("19_edja8") -offset = Vector2(0, -172) +offset = Vector2(5, -76) region_enabled = true region_rect = Rect2(1837, 651, 139, 180) @@ -1194,20 +1191,20 @@ region_rect = Rect2(1837, 651, 139, 180) [node name="bush11" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/right side"] y_sort_enabled = true material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(8981, 2112) +position = Vector2(9010, 1845) scale = Vector2(2, 2) texture = ExtResource("19_edja8") -offset = Vector2(0, -172) +offset = Vector2(-14.5, -38.5) region_enabled = true region_rect = Rect2(1464, 419, 144, 115) [node name="bush12" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/right side"] y_sort_enabled = true material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(9208, 2026) +position = Vector2(9267, 1881) scale = Vector2(2, 2) texture = ExtResource("19_edja8") -offset = Vector2(0, -172) +offset = Vector2(-29.5, -99.5) region_enabled = true region_rect = Rect2(1699, 76, 280, 230) @@ -1249,40 +1246,39 @@ region_rect = Rect2(130, 0, 201, 278) modulate = Color(0.8428, 0.8771, 0.98, 1) y_sort_enabled = true material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(3348, 2074) +position = Vector2(3343, 1522.0002) scale = Vector2(-2.40318, 3.59175) texture = ExtResource("19_edja8") -offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(130, 0, 201, 278) [node name="bush17" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/right side"] y_sort_enabled = true material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(9556, 2071) +position = Vector2(9542.094, 1883.9717) scale = Vector2(-2.40318, 3.59175) texture = ExtResource("19_edja8") -offset = Vector2(0, -172) +offset = Vector2(-5.786621, -119.928345) region_enabled = true region_rect = Rect2(130, 0, 201, 278) [node name="bush18" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/right side"] y_sort_enabled = true material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(9887, 2216) +position = Vector2(9879.163, 1914.8691) scale = Vector2(-1.87764, 2.59175) texture = ExtResource("19_edja8") -offset = Vector2(0, -172) +offset = Vector2(-4.173828, -55.811768) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) [node name="bush19" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/right side"] y_sort_enabled = true material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(10074, 2216) +position = Vector2(10073, 1998) scale = Vector2(1.53273, 1.82378) texture = ExtResource("19_edja8") -offset = Vector2(0, -172) +offset = Vector2(0.65234375, -52.468018) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1330,10 +1326,10 @@ region_rect = Rect2(1368, 673, 186, 136) [node name="bush26" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/right side"] y_sort_enabled = true material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(10963, 3651) +position = Vector2(10960.999, 3436) scale = Vector2(1.41694, 1.75208) texture = ExtResource("19_edja8") -offset = Vector2(0, -172) +offset = Vector2(1.4121094, -49.288696) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1352,10 +1348,10 @@ region_rect = Rect2(0, 604, 248, 228) z_index = 1 y_sort_enabled = true material = SubResource("ShaderMaterial_yvxfs") -position = Vector2(10963, 3820) +position = Vector2(10960.506, 3678.0952) scale = Vector2(-1.93815, 1.5875) texture = ExtResource("19_edja8") -offset = Vector2(0, -172) +offset = Vector2(-1.2871094, -82.611084) region_enabled = true region_rect = Rect2(1837, 651, 139, 180) @@ -1585,9 +1581,10 @@ region_rect = Rect2(332, 194, 179, 154) [node name="grass3" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/grass"] modulate = Color(0.954868, 0.882599, 0.798501, 1) z_index = -5 -position = Vector2(18189, 1960) +position = Vector2(18274, 1857) scale = Vector2(5.77602, 3.87779) texture = ExtResource("30_cmmg6") +offset = Vector2(-14.715942, 26.561523) region_enabled = true region_rect = Rect2(7, 4, 256, 220) @@ -1687,10 +1684,11 @@ region_rect = Rect2(7, 4, 267, 239) [node name="grass40" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/grass"] z_index = -5 -position = Vector2(23915, 3644) +position = Vector2(24144.207, 3443.7068) rotation = 3.40339 scale = Vector2(5.52625, 5.81879) texture = ExtResource("29_pjemw") +offset = Vector2(30.682373, -43.44397) region_enabled = true region_rect = Rect2(317, 219, 185, 159) @@ -1768,9 +1766,10 @@ region_rect = Rect2(29, 204, 219, 159) [node name="grass52" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/grass"] modulate = Color(0.856076, 0.855033, 0.937369, 1) z_index = -5 -position = Vector2(23634, 2698) +position = Vector2(23751, 2994) scale = Vector2(5.35495, 4.49236) texture = ExtResource("29_pjemw") +offset = Vector2(-21.848877, -65.88965) region_enabled = true region_rect = Rect2(29, 204, 219, 159) diff --git a/scenes/Babushka_scene_indoor_common_room.tscn b/scenes/Babushka_scene_indoor_common_room.tscn index ed4fc55..5b5f74e 100644 --- a/scenes/Babushka_scene_indoor_common_room.tscn +++ b/scenes/Babushka_scene_indoor_common_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=40 format=3 uid="uid://bm21nqepnwaik"] +[gd_scene load_steps=41 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"] @@ -30,16 +30,13 @@ [ext_resource type="AudioStream" uid="uid://r2f6xmjvyyjv" path="res://audio/sfx/Animals/SFX_Cat_Purr_01.wav" id="21_ytap8"] [ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="22_tggq2"] [ext_resource type="Resource" uid="uid://cbpurnewhyefa" path="res://resources/quests/beetRoot.tres" id="22_yd2gv"] +[ext_resource type="Texture2D" uid="uid://da67c7avarwq2" path="res://art/indoor/kitchen_bgAssets.png" id="23_d7yky"] [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="24_yd2gv"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_a2ood"] resource_local_to_scene = true size = Vector2(3836, 1086) -[sub_resource type="CircleShape2D" id="CircleShape2D_yd2gv"] -resource_local_to_scene = true -radius = 300.0 - [sub_resource type="CircleShape2D" id="CircleShape2D_gpagp"] resource_local_to_scene = true radius = 300.0 @@ -210,6 +207,10 @@ _data = { &"hand_stretch": SubResource("Animation_8o6or") } +[sub_resource type="CircleShape2D" id="CircleShape2D_yd2gv"] +resource_local_to_scene = true +radius = 300.0 + [sub_resource type="CircleShape2D" id="CircleShape2D_wuntg"] resource_local_to_scene = true radius = 400.0 @@ -218,7 +219,7 @@ radius = 400.0 z_index = 1 y_sort_enabled = true script = ExtResource("1_3vr4f") -_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_vesnas_room.tscn", "res://scenes/Babushka_scene_indoor_kitchen.tscn") +_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_vesnas_room.tscn", "res://scenes/Babushka_scene_indoor_kitchen.tscn", "res://scenes/Babushka_scene_farm_outside_2d.tscn") [node name="Foreground" type="Node" parent="."] @@ -304,34 +305,6 @@ region_rect = Rect2(111, 292, 3323, 2160) position = Vector2(950, -419) shape = SubResource("RectangleShape2D_a2ood") -[node name="Room01DorrR" type="Sprite2D" parent="BackWall"] -z_index = -50 -position = Vector2(936, -216) -texture = ExtResource("6_blyw3") -region_enabled = true -region_rect = Rect2(3161, 313, 679, 1050) - -[node name="OutsideDoor" parent="BackWall/Room01DorrR" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] -position = Vector2(-7, 248) -scale = Vector2(1.5, 1.5) -_spritesToOutline = [NodePath("..")] -_id = 1 - -[node name="Room01DoorL" type="Sprite2D" parent="BackWall"] -z_index = -50 -position = Vector2(-3296, 48) -texture = ExtResource("7_yd2gv") -region_enabled = true -region_rect = Rect2(0, 0, 3840, 2160) - -[node name="VesnasRoomDoor" parent="BackWall/Room01DoorL" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] -position = Vector2(-1559, -16) -_spritesToOutline = [NodePath("..")] -_id = 0 - -[node name="CollisionShape3D" parent="BackWall/Room01DoorL/VesnasRoomDoor/Area2D" index="0"] -shape = SubResource("CircleShape2D_yd2gv") - [node name="Room01Pechka" type="Sprite2D" parent="BackWall"] z_index = -80 position = Vector2(-224, -392) @@ -341,14 +314,14 @@ region_rect = Rect2(2236, 0, 724, 1392) [node name="Room01Window2" type="Sprite2D" parent="BackWall"] z_index = -50 -position = Vector2(-3192, -344) +position = Vector2(-5870, -408) 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) +position = Vector2(-3931, -397) texture = ExtResource("9_aoesu") region_enabled = true region_rect = Rect2(1020, 338, 607, 757) @@ -374,46 +347,39 @@ 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("12_bu2a1") -region_enabled = true -region_rect = Rect2(1846, 471, 348, 490) - [node name="Bench" type="Sprite2D" parent="BackWall"] z_index = -10 y_sort_enabled = true -position = Vector2(-3240, 224) +position = Vector2(-5070, 1051) texture = ExtResource("13_rongr") flip_h = true region_enabled = true region_rect = Rect2(1156, 1185, 940, 189) -[node name="Bench2" type="Sprite2D" parent="BackWall"] +[node name="Katze" type="Sprite2D" parent="BackWall/Bench"] z_index = -10 -position = Vector2(-1824, 224) -texture = ExtResource("13_rongr") -region_enabled = true -region_rect = Rect2(1156, 1185, 940, 189) - -[node name="Katze" type="Sprite2D" parent="BackWall"] -z_index = -10 -position = Vector2(-4051, 332) +position = Vector2(61, -87) scale = Vector2(2, 2) texture = ExtResource("15_sndxu") offset = Vector2(-8, -126) -[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="BackWall/Katze"] +[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="BackWall/Bench/Katze"] stream = SubResource("AudioStreamRandomizer_b6vf7") bus = &"SFX" script = ExtResource("22_tggq2") -[node name="InteractionArea" parent="BackWall/Katze" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] +[node name="InteractionArea" parent="BackWall/Bench/Katze" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] position = Vector2(-6.5, -44) scale = Vector2(0.5, 0.5) _spritesToOutline = [NodePath("..")] +[node name="Bench2" type="Sprite2D" parent="BackWall"] +z_index = -10 +position = Vector2(-2906, 243) +texture = ExtResource("13_rongr") +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"] @@ -434,19 +400,10 @@ offset = Vector2(-14.6475, -97.651) region_enabled = true region_rect = Rect2(3157, 688, 118.519, 221) -[node name="vase" type="Sprite2D" parent="BackWall/Room assets"] -z_index = -10 -y_sort_enabled = true -position = Vector2(-857, -37.5) -texture = ExtResource("4_27bwy") -offset = Vector2(0, -296) -region_enabled = true -region_rect = Rect2(2748, 432, 174, 191) - [node name="candle" type="Sprite2D" parent="BackWall/Room assets"] z_index = -10 y_sort_enabled = true -position = Vector2(-425, -77.5) +position = Vector2(-852, -187) rotation = -0.0663225 texture = ExtResource("4_27bwy") offset = Vector2(0, -296) @@ -534,6 +491,66 @@ offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2576, 802, 219, 64) +[node name="Doors" type="Node2D" parent="BackWall"] + +[node name="Door_Kitchen" type="Sprite2D" parent="BackWall/Doors"] +z_index = -50 +position = Vector2(923, -221) +texture = ExtResource("6_blyw3") +region_enabled = true +region_rect = Rect2(3161, 313, 679, 1050) + +[node name="KitchendoorInteraction" parent="BackWall/Doors/Door_Kitchen" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] +position = Vector2(-7, 248) +scale = Vector2(1.5, 1.5) +_spritesToOutline = [NodePath("..")] +_id = 1 + +[node name="Door_Outside" type="Sprite2D" parent="BackWall/Doors"] +z_index = -50 +position = Vector2(-4917, -226) +texture = ExtResource("23_d7yky") +region_enabled = true +region_rect = Rect2(3009, 666, 679, 1050) + +[node name="OutsideDoor" parent="BackWall/Doors/Door_Outside" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] +position = Vector2(-7, 248) +scale = Vector2(1.5, 1.5) +_spritesToOutline = [NodePath("..")] +_id = 2 + +[node name="Door_Bedroom" type="Sprite2D" parent="BackWall/Doors"] +z_index = -50 +position = Vector2(-1620, -259) +texture = ExtResource("7_yd2gv") +region_enabled = true +region_rect = Rect2(0, 165, 763, 1224) + +[node name="VesnasRoomDoor" parent="BackWall/Doors/Door_Bedroom" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] +position = Vector2(2, 233) +_spritesToOutline = [NodePath("..")] +_id = 0 + +[node name="CollisionShape3D" parent="BackWall/Doors/Door_Bedroom/VesnasRoomDoor/Area2D" index="0"] +shape = SubResource("CircleShape2D_yd2gv") + +[node name="Shelf" type="Sprite2D" parent="BackWall"] +z_index = -50 +position = Vector2(-880, -416) +texture = ExtResource("12_bu2a1") +region_enabled = true +region_rect = Rect2(1846, 471, 348, 490) + +[node name="vase" type="Sprite2D" parent="BackWall/Shelf"] +visible = false +z_index = -10 +y_sort_enabled = true +position = Vector2(23, 378.5) +texture = ExtResource("4_27bwy") +offset = Vector2(0, -296) +region_enabled = true +region_rect = Rect2(2748, 432, 174, 191) + [node name="Vesna" parent="." instance=ExtResource("15_7a68a")] y_sort_enabled = false position = Vector2(-920, 319) @@ -541,18 +558,18 @@ position = Vector2(-920, 319) [node name="Yeli" parent="." instance=ExtResource("16_dhsxs")] z_index = 0 y_sort_enabled = false -position = Vector2(-1395, 16) +position = Vector2(-2841, 198) _timelinesToPlay = PackedStringArray("yeli_intro_05") [node name="InteractionArea" parent="Yeli" index="0"] -position = Vector2(-373, -63) +position = Vector2(0, -63) [node name="CollisionShape3D" parent="Yeli/InteractionArea/Area2D" index="0"] position = Vector2(-225.99994, 33) shape = SubResource("CircleShape2D_wuntg") [node name="AnimatedSprite" parent="Yeli/TalkingControl" index="0"] -position = Vector2(-576, 368) +position = Vector2(-224, 373) [node name="CollisionShape2D" parent="Yeli/AnimatableBody2D" index="0"] position = Vector2(-565, 464) @@ -580,15 +597,16 @@ _followNode = NodePath("../Vesna/CharacterBody2D") [node name="CanvasLayer" parent="." instance=ExtResource("24_yd2gv")] -[connection signal="InteractedTool" from="BackWall/Room01DorrR/OutsideDoor" to="." method="LoadSceneAtIndex"] -[connection signal="InteractedTool" from="BackWall/Room01DoorL/VesnasRoomDoor" to="." method="LoadSceneAtIndex"] [connection signal="Interacted" from="BackWall/Room01PechkaDoor/InteractionArea" to="BackWall/Room01PechkaDoor/InteractionArea" method="ToggleActive"] [connection signal="Interacted" from="BackWall/Room01PechkaDoor/InteractionArea" to="BackWall/Room assets/hand" method="PlayAnimation"] -[connection signal="Interacted" from="BackWall/Katze/InteractionArea" to="BackWall/Katze/AudioStreamPlayer2D" method="PlayOneShot"] +[connection signal="Interacted" from="BackWall/Bench/Katze/InteractionArea" to="BackWall/Bench/Katze/AudioStreamPlayer2D" method="PlayOneShot"] +[connection signal="InteractedTool" from="BackWall/Doors/Door_Kitchen/KitchendoorInteraction" to="." method="LoadSceneAtIndex"] +[connection signal="InteractedTool" from="BackWall/Doors/Door_Outside/OutsideDoor" to="." method="LoadSceneAtIndex"] +[connection signal="InteractedTool" from="BackWall/Doors/Door_Bedroom/VesnasRoomDoor" to="." method="LoadSceneAtIndex"] [connection signal="timelineEnded" from="Yeli/dialogic_toggle" to="Yeli/Beetroot Quest trigger" method="Trigger"] -[editable path="BackWall/Room01DoorL/VesnasRoomDoor"] [editable path="BackWall/Room01PechkaDoor/InteractionArea"] +[editable path="BackWall/Doors/Door_Bedroom/VesnasRoomDoor"] [editable path="Vesna"] [editable path="Yeli"] [editable path="Yeli/InteractionArea"] diff --git a/scenes/Babushka_scene_indoor_kitchen.tscn b/scenes/Babushka_scene_indoor_kitchen.tscn index 6832761..4895ee3 100644 --- a/scenes/Babushka_scene_indoor_kitchen.tscn +++ b/scenes/Babushka_scene_indoor_kitchen.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=9 format=3 uid="uid://bvp5ju36h1vl2"] +[gd_scene load_steps=10 format=3 uid="uid://bvp5ju36h1vl2"] [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_ftmt4"] [ext_resource type="Texture2D" uid="uid://da67c7avarwq2" path="res://art/indoor/kitchen_bgAssets.png" id="2_qsw8g"] +[ext_resource type="Texture2D" uid="uid://x7trh4dgsvoe" path="res://art/indoor/room export/Room_01_assets.png" id="5_3wvmt"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="7_6mpmc"] [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="25_58hm8"] [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="30_wqpex"] @@ -9,7 +10,7 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_a2ood"] resource_local_to_scene = true -size = Vector2(3836, 1086) +size = Vector2(4757.2813, 1086) [sub_resource type="CircleShape2D" id="CircleShape2D_yd2gv"] resource_local_to_scene = true @@ -19,7 +20,7 @@ radius = 300.0 z_index = 1 y_sort_enabled = true script = ExtResource("1_ftmt4") -_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_farm_outside_2d.tscn", "res://scenes/Babushka_scene_indoor_common_room.tscn") +_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn") [node name="Foreground" type="Node" parent="."] @@ -36,7 +37,7 @@ position = Vector2(-4344, 3056) scale = Vector2(2, 2) [node name="CollisionShape2D" type="CollisionShape2D" parent="SideColliderLeft"] -position = Vector2(-2892, -1168) +position = Vector2(-2461.1406, -1168) shape = SubResource("RectangleShape2D_a2ood") [node name="SideColliderRight" type="StaticBody2D" parent="."] @@ -44,7 +45,7 @@ position = Vector2(10992, 2856) scale = Vector2(2, 2) [node name="CollisionShape2D" type="CollisionShape2D" parent="SideColliderRight"] -position = Vector2(-2892, -1168) +position = Vector2(-2863.5, -1165) shape = SubResource("RectangleShape2D_a2ood") [node name="Background" type="Node2D" parent="."] @@ -171,18 +172,6 @@ texture = ExtResource("2_qsw8g") region_enabled = true region_rect = Rect2(0, 2246, 3840, 912) -[node name="Room01DorrR" type="Sprite2D" parent="Background"] -position = Vector2(-250, -216) -texture = ExtResource("2_qsw8g") -region_enabled = true -region_rect = Rect2(3009, 666, 679, 1050) - -[node name="OutsideDoor" parent="Background/Room01DorrR" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("7_6mpmc")] -position = Vector2(-7, 248) -scale = Vector2(1.5, 1.5) -_spritesToOutline = [NodePath("..")] -_id = 0 - [node name="Room01DoorL" type="Sprite2D" parent="Background"] position = Vector2(-4000, -221) texture = ExtResource("2_qsw8g") @@ -191,7 +180,7 @@ region_rect = Rect2(92, 458, 641, 1050) [node name="CommonRoomDoor" parent="Background/Room01DoorL" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("7_6mpmc")] _spritesToOutline = [NodePath("..")] -_id = 1 +_id = 0 [node name="CollisionShape3D" parent="Background/Room01DoorL/CommonRoomDoor/Area2D" index="0"] shape = SubResource("CircleShape2D_yd2gv") @@ -246,6 +235,15 @@ flip_h = true region_enabled = true region_rect = Rect2(3037, 440, 701, 170) +[node name="vase" type="Sprite2D" parent="BackItems/wallshelf"] +z_index = -10 +y_sort_enabled = true +position = Vector2(42, 124) +texture = ExtResource("5_3wvmt") +offset = Vector2(0, -296) +region_enabled = true +region_rect = Rect2(2748, 432, 174, 191) + [node name="FrontItems" type="Node2D" parent="."] z_index = 50 @@ -276,7 +274,6 @@ texture = ExtResource("2_qsw8g") region_enabled = true region_rect = Rect2(1599, 1107, 1351, 418) -[connection signal="InteractedTool" from="Background/Room01DorrR/OutsideDoor" to="." method="LoadSceneAtIndex"] [connection signal="InteractedTool" from="Background/Room01DoorL/CommonRoomDoor" to="." method="LoadSceneAtIndex"] [connection signal="Interacted" from="FrontItems/Stove/Firetoggle" to="FrontItems/Stove/Fireleft" method="hide"] [connection signal="Interacted" from="FrontItems/Stove/Firetoggle" to="FrontItems/Stove/FireRight" method="hide"]