diff --git a/art/indoor/kitchen_bgAssets.png b/art/indoor/kitchen_bgAssets.png new file mode 100644 index 0000000..e7a9c16 Binary files /dev/null and b/art/indoor/kitchen_bgAssets.png differ diff --git a/art/indoor/kitchen_bgAssets.png.import b/art/indoor/kitchen_bgAssets.png.import new file mode 100644 index 0000000..159a9cc --- /dev/null +++ b/art/indoor/kitchen_bgAssets.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://da67c7avarwq2" +path="res://.godot/imported/kitchen_bgAssets.png-26f2820caaada75bd252a5f0e781a1f7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/indoor/kitchen_bgAssets.png" +dest_files=["res://.godot/imported/kitchen_bgAssets.png-26f2820caaada75bd252a5f0e781a1f7.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 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/prefabs/farm/base_field.tscn b/prefabs/farm/base_field.tscn index 55ee78b..f7d7083 100644 --- a/prefabs/farm/base_field.tscn +++ b/prefabs/farm/base_field.tscn @@ -41,6 +41,7 @@ texture = ExtResource("9_wx561") [node name="FieldBehaviour" type="Sprite2D" parent="." node_paths=PackedStringArray("_fieldIndex", "_saveIdHolder", "_fieldSprite", "_maskSprite", "_outlineSprite", "PlantingInteraction", "FieldInteractionArea", "PlantingPlaceholder", "_wateringParticles")] visible = false z_index = -1 +y_sort_enabled = true scale = Vector2(0.9, 1) script = ExtResource("1_qa01x") _fieldIndex = NodePath("..") @@ -70,6 +71,7 @@ texture = ExtResource("3_c014y") texture = ExtResource("5_wx561") [node name="PlantPlaceholder" type="Node2D" parent="FieldBehaviour"] +y_sort_enabled = true [node name="InteractionArea" parent="FieldBehaviour" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("7_2eegd")] position = Vector2(-28.88889, -57) diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index c70b43c..be2050a 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -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"] @@ -82,13 +81,22 @@ [ext_resource type="Script" uid="uid://ca4s0algeij1h" path="res://scripts/CSharp/Common/Savegame/SaveIDProviderTool.cs" id="80_w1kgo"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_wtdui"] +resource_local_to_scene = true shader = ExtResource("13_7p0hq") -shader_parameter/hue_shift = 0.0 +shader_parameter/hue_shift = -0.25399996456499996 shader_parameter/saturation_mult = 0.603 shader_parameter/value_mult = 1.0 shader_parameter/brightness_add = 0.0 shader_parameter/contrast_mult = 1.0 +[sub_resource type="ShaderMaterial" id="ShaderMaterial_065st"] +shader = ExtResource("13_7p0hq") +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") shader_parameter/hue_shift = -0.076 @@ -288,6 +296,7 @@ _followNode = NodePath("../YSorted/Vesna/CharacterBody2D") [node name="ParallaxBackground" type="ParallaxBackground" parent="."] [node name="background color layer" type="ParallaxLayer" parent="ParallaxBackground"] +z_index = -350 position = Vector2(0, -552) motion_scale = Vector2(0.1, 0.1) motion_mirroring = Vector2(2048, 0) @@ -319,6 +328,7 @@ centered = false offset = Vector2(0, -100) [node name="clouds layer" type="ParallaxLayer" parent="ParallaxBackground"] +z_index = -300 position = Vector2(-7, -138) motion_scale = Vector2(0.2, 0.2) motion_mirroring = Vector2(7000, 0) @@ -356,11 +366,13 @@ centered = false offset = Vector2(0, -100) [node name="background layer 3" type="ParallaxLayer" parent="ParallaxBackground"] +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) @@ -473,123 +485,11 @@ scale = Vector2(3, 3.062) texture = ExtResource("11_vbdb2") [node name="background layer 4" type="ParallaxLayer" parent="ParallaxBackground"] +z_index = -200 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") @@ -604,8 +504,31 @@ position = Vector2(7923, 727) scale = Vector2(2.75, 2.75) texture = ExtResource("13_0qu0h") +[node name="background layer 5" type="ParallaxLayer" parent="ParallaxBackground"] +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="JelenaMockupBg02" type="Sprite2D" parent="ParallaxBackground/background layer 5"] +z_index = -200 +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_065st") +position = Vector2(7923, 727) +scale = Vector2(2.75, 2.75) +texture = ExtResource("13_0qu0h") +flip_h = true + [node name="back back trees layer" type="ParallaxLayer" parent="ParallaxBackground"] -visible = false +z_index = -150 position = Vector2(0, -256) motion_scale = Vector2(0.7, 0.7) motion_mirroring = Vector2(9965, 0) @@ -762,7 +685,7 @@ region_enabled = true region_rect = Rect2(358, 523, 345, 289) [node name="back tree bois layer 5" type="ParallaxLayer" parent="ParallaxBackground"] -visible = false +z_index = -100 position = Vector2(28, -28) motion_mirroring = Vector2(10000, 0) @@ -875,17 +798,20 @@ region_enabled = true region_rect = Rect2(1834, -5, 733, 1360) [node name="sunflower field" type="ParallaxLayer" parent="ParallaxBackground"] +z_index = -50 motion_mirroring = Vector2(3779, 0) [node name="Sonnenblumeseamless" type="Sprite2D" parent="ParallaxBackground/sunflower field"] -z_index = -50 -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"] -z_index = -50 -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) @@ -2371,10 +2297,9 @@ position = Vector2(-4659, 2897) position = Vector2(-5016, 3361) [node name="trash" type="Node2D" parent="YSorted"] -visible = false z_index = 1 y_sort_enabled = true -position = Vector2(-204, -5186) +position = Vector2(-569, -42) [node name="trashObject" parent="YSorted/trash" instance=ExtResource("53_ycj14")] z_index = 0 diff --git a/scenes/Babushka_scene_fight_world_room.tscn b/scenes/Babushka_scene_fight_world_room.tscn index 6396ece..ba3a569 100644 --- a/scenes/Babushka_scene_fight_world_room.tscn +++ b/scenes/Babushka_scene_fight_world_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=53 format=3 uid="uid://cacnapfv7w567"] +[gd_scene load_steps=52 format=3 uid="uid://cacnapfv7w567"] [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="1_pi6ua"] [ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_hqa4k"] @@ -25,7 +25,6 @@ [ext_resource type="Shader" uid="uid://xnky830dtfsn" path="res://shader/repeat_texture.gdshader" id="23_2ouqg"] [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="24_ffcio"] [ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="25_3h260"] -[ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/wateringcan.tres" id="26_1bhpp"] [ext_resource type="Shader" uid="uid://braevmqauoek7" path="res://shader/swaying_plant.gdshader" id="27_txtka"] [ext_resource type="Texture2D" uid="uid://dgavbfci8x178" path="res://art/nature/grass/grass-1.png" id="28_ejigw"] [ext_resource type="Texture2D" uid="uid://h2b5aufaaw7w" path="res://art/nature/grass/grass-2.png" id="29_pjemw"] @@ -47,8 +46,8 @@ 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.0 -shader_parameter/contrast_mult = 1.0 +shader_parameter/brightness_add = -0.4369999732574999 +shader_parameter/contrast_mult = 1.138000054055 [sub_resource type="ShaderMaterial" id="ShaderMaterial_q1iw4"] shader = ExtResource("16_0fard") @@ -59,14 +58,15 @@ shader_parameter/brightness_add = 0.0 shader_parameter/contrast_mult = 1.0 [sub_resource type="Gradient" id="Gradient_663j1"] -colors = PackedColorArray(0.348791, 0.400092, 0.435264, 1, 0.219333, 0.251087, 0.329259, 1) +offsets = PackedFloat32Array(0, 0.994302) +colors = PackedColorArray(0.20454055, 0.23990041, 0.2641038, 1, 0.058763355, 0.07233205, 0.105805494, 1) [sub_resource type="FastNoiseLite" id="FastNoiseLite_d5x6a"] [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_d53cn"] -seamless = true -color_ramp = SubResource("Gradient_663j1") noise = SubResource("FastNoiseLite_d5x6a") +color_ramp = SubResource("Gradient_663j1") +seamless = true [sub_resource type="ShaderMaterial" id="ShaderMaterial_k0jkw"] shader = ExtResource("23_2ouqg") @@ -74,8 +74,7 @@ shader_parameter/tiling_scale = Vector2(7.79, 5.2) shader_parameter/noise = SubResource("NoiseTexture2D_d53cn") [sub_resource type="Gradient" id="Gradient_eryax"] -offsets = PackedFloat32Array(0, 0.743902, 1) -colors = PackedColorArray(0.22, 0.1078, 0.16764, 1, 0.443137, 0.4, 0.360784, 1, 0.6, 0.4853, 0.414, 1) +colors = PackedColorArray(0.10571728, 0.039839525, 0.07500812, 1, 0.2610917, 0.24536225, 0.33510962, 1) [sub_resource type="FastNoiseLite" id="FastNoiseLite_wgikv"] frequency = 0.0296 @@ -84,9 +83,9 @@ fractal_gain = 0.795 domain_warp_enabled = true [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_pjpt5"] -seamless = true -color_ramp = SubResource("Gradient_eryax") noise = SubResource("FastNoiseLite_wgikv") +color_ramp = SubResource("Gradient_eryax") +seamless = true [sub_resource type="ShaderMaterial" id="ShaderMaterial_yvxfs"] shader = ExtResource("27_txtka") @@ -125,7 +124,7 @@ motion_scale = Vector2(0.1, 0.1) motion_mirroring = Vector2(2048, 0) [node name="Sprite2D2" type="Sprite2D" parent="ParallaxBackground/background color layer"] -modulate = Color(0.5607, 0.89, 0.675955, 1) +modulate = Color(0.11449895, 0.25957486, 0.33625737, 1) z_index = -500 position = Vector2(4096, 0) scale = Vector2(2, 2) @@ -134,7 +133,7 @@ centered = false offset = Vector2(0, -100) [node name="Sprite2D3" type="Sprite2D" parent="ParallaxBackground/background color layer"] -modulate = Color(0.5607, 0.89, 0.675955, 1) +modulate = Color(0.11449895, 0.25957486, 0.33625737, 1) z_index = -500 scale = Vector2(2, 2) texture = ExtResource("2_hqa4k") @@ -142,7 +141,7 @@ centered = false offset = Vector2(0, -100) [node name="Sprite2D4" type="Sprite2D" parent="ParallaxBackground/background color layer"] -modulate = Color(0.5607, 0.89, 0.675955, 1) +modulate = Color(0.11449895, 0.25957486, 0.33625737, 1) z_index = -500 position = Vector2(8192, 0) scale = Vector2(2, 2) @@ -151,6 +150,7 @@ centered = false offset = Vector2(0, -100) [node name="clouds layer" type="ParallaxLayer" parent="ParallaxBackground"] +modulate = Color(0.26657522, 0.2665752, 0.2665752, 1) position = Vector2(-7, -138) motion_scale = Vector2(0.2, 0.2) motion_mirroring = Vector2(7000, 0) @@ -188,6 +188,7 @@ centered = false offset = Vector2(0, -100) [node name="background layer 3" type="ParallaxLayer" parent="ParallaxBackground"] +modulate = Color(0, 0.42227474, 0.4229499, 1) position = Vector2(18, -713) motion_scale = Vector2(0.25, 0.25) motion_mirroring = Vector2(5424, 0) @@ -442,7 +443,7 @@ motion_scale = Vector2(0.7, 0.7) motion_mirroring = Vector2(9965, 0) [node name="hills" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] -modulate = Color(0.345703, 0.360648, 0.242876, 1) +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) position = Vector2(993, 1576) scale = Vector2(5, 5) texture = ExtResource("7_x3yi1") @@ -450,7 +451,7 @@ centered = false offset = Vector2(-200, -80) [node name="hills 1" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] -modulate = Color(0.345703, 0.360648, 0.242876, 1) +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) position = Vector2(5961, 1582) scale = Vector2(5, 5) texture = ExtResource("8_kcbkm") @@ -458,6 +459,7 @@ centered = false offset = Vector2(-200, -80) [node name="tree" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(3017.3, 536.15) scale = Vector2(1.7, 1.7) @@ -466,6 +468,7 @@ region_enabled = true region_rect = Rect2(770, 3, 304, 979) [node name="tree2" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(1807.5, 1408) scale = Vector2(1.7, 1.7) @@ -474,6 +477,7 @@ region_enabled = true region_rect = Rect2(399, 420, 228, 493) [node name="tree4" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(3321.3, 600.15) scale = Vector2(1.7, 1.7) @@ -482,6 +486,7 @@ region_enabled = true region_rect = Rect2(1770, -4, 289, 930) [node name="tree11" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(460, 622) scale = Vector2(1.7, 1.7) @@ -490,6 +495,7 @@ region_enabled = true region_rect = Rect2(1770, -4, 289, 930) [node name="tree5" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(5081.3, 696.15) scale = Vector2(1.7, 1.7) @@ -498,6 +504,7 @@ region_enabled = true region_rect = Rect2(2283, 2, 186, 840) [node name="tree10" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(8470, 694) scale = Vector2(1.7, 1.7) @@ -506,6 +513,7 @@ region_enabled = true region_rect = Rect2(2283, 2, 186, 840) [node name="tree3" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(6596.8, 1566.35) scale = Vector2(1.7, 1.7) @@ -514,6 +522,7 @@ region_enabled = true region_rect = Rect2(399, 420, 228, 493) [node name="tree8" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(8110.6, 758.5) scale = Vector2(1.7, 1.7) @@ -522,6 +531,7 @@ region_enabled = true region_rect = Rect2(1770, -4, 289, 930) [node name="tree9" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(10240, 850) scale = Vector2(1.7, 1.7) @@ -530,6 +540,7 @@ region_enabled = true region_rect = Rect2(2283, 2, 186, 840) [node name="tree6" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(5641.3, 1168.15) scale = Vector2(1.7, 1.7) @@ -538,6 +549,7 @@ region_enabled = true region_rect = Rect2(2609, 434, 304, 467) [node name="tree7" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(5161.3, 608.15) scale = Vector2(1.7, 1.7) @@ -546,6 +558,7 @@ region_enabled = true region_rect = Rect2(3111, -4, 167, 949) [node name="bush" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(3239.5, 1288) texture = ExtResource("19_edja8") @@ -553,6 +566,7 @@ region_enabled = true region_rect = Rect2(149, 15, 464, 478) [node name="bush2" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(1791.5, 1448) texture = ExtResource("19_edja8") @@ -561,6 +575,7 @@ region_enabled = true region_rect = Rect2(130, 0, 201, 278) [node name="bush3" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(1255.5, 1392) texture = ExtResource("19_edja8") @@ -569,6 +584,7 @@ region_enabled = true region_rect = Rect2(0, 604, 248, 228) [node name="bush4" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(5471.5, 1432) texture = ExtResource("19_edja8") @@ -577,6 +593,7 @@ region_enabled = true region_rect = Rect2(1837, 651, 139, 180) [node name="bush5" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(5007.5, 1312) texture = ExtResource("19_edja8") @@ -584,6 +601,7 @@ region_enabled = true region_rect = Rect2(1368, 673, 186, 136) [node name="bush6" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] +modulate = Color(0.15348598, 0.1618683, 0.098344676, 1) material = SubResource("ShaderMaterial_q1iw4") position = Vector2(3583.5, 1248) scale = Vector2(0.575, 0.575) @@ -597,7 +615,7 @@ position = Vector2(28, -28) motion_mirroring = Vector2(10000, 0) [node name="tree" type="Sprite2D" parent="ParallaxBackground/back tree bois layer 5"] -modulate = Color(0.674561, 0.721424, 0.744786, 1) +modulate = Color(0.2821873, 0.32191858, 0.34160244, 1) z_index = 1 position = Vector2(1483.7, 800) scale = Vector2(1.6, 1.6) @@ -606,7 +624,7 @@ region_enabled = true region_rect = Rect2(-2, -5, 911, 1386) [node name="tree2" type="Sprite2D" parent="ParallaxBackground/back tree bois layer 5"] -modulate = Color(0.674561, 0.721424, 0.744786, 1) +modulate = Color(0.2821873, 0.32191858, 0.34160244, 1) z_index = 1 position = Vector2(771.7, 664) scale = Vector2(1.6, 1.6) @@ -615,7 +633,7 @@ region_enabled = true region_rect = Rect2(0, 4, 604, 1363) [node name="tree3" type="Sprite2D" parent="ParallaxBackground/back tree bois layer 5"] -modulate = Color(0.674561, 0.721424, 0.744786, 1) +modulate = Color(0.2821873, 0.32191858, 0.34160244, 1) z_index = 1 position = Vector2(1763.7, 728) scale = Vector2(1.6, 1.6) @@ -624,7 +642,7 @@ region_enabled = true region_rect = Rect2(626, -4, 711, 1519) [node name="tree12" type="Sprite2D" parent="ParallaxBackground/back tree bois layer 5"] -modulate = Color(0.674561, 0.721424, 0.744786, 1) +modulate = Color(0.2821873, 0.32191858, 0.34160244, 1) z_index = 1 position = Vector2(9464, 731) scale = Vector2(1.6, 1.6) @@ -633,7 +651,7 @@ region_enabled = true region_rect = Rect2(626, -4, 711, 1519) [node name="tree4" type="Sprite2D" parent="ParallaxBackground/back tree bois layer 5"] -modulate = Color(0.674561, 0.721424, 0.744786, 1) +modulate = Color(0.2821873, 0.32191858, 0.34160244, 1) z_index = 1 position = Vector2(2939.7, 752) scale = Vector2(1.8, 1.8) @@ -642,7 +660,7 @@ region_enabled = true region_rect = Rect2(1504, -2, 402, 1124) [node name="tree5" type="Sprite2D" parent="ParallaxBackground/back tree bois layer 5"] -modulate = Color(0.674561, 0.721424, 0.744786, 1) +modulate = Color(0.2821873, 0.32191858, 0.34160244, 1) z_index = 1 position = Vector2(3683.7, 800) scale = Vector2(1.8, 1.8) @@ -651,7 +669,7 @@ region_enabled = true region_rect = Rect2(927, -1, 736, 1294) [node name="tree6" type="Sprite2D" parent="ParallaxBackground/back tree bois layer 5"] -modulate = Color(0.674561, 0.721424, 0.744786, 1) +modulate = Color(0.2821873, 0.32191858, 0.34160244, 1) z_index = 1 position = Vector2(115.7, 608) scale = Vector2(1.8, 1.8) @@ -660,7 +678,7 @@ region_enabled = true region_rect = Rect2(1834, -5, 733, 1360) [node name="tree7" type="Sprite2D" parent="ParallaxBackground/back tree bois layer 5"] -modulate = Color(0.674561, 0.721424, 0.744786, 1) +modulate = Color(0.2821873, 0.32191858, 0.34160244, 1) z_index = 1 position = Vector2(6259.7, 728) scale = Vector2(1.6, 1.6) @@ -669,7 +687,7 @@ region_enabled = true region_rect = Rect2(626, -4, 711, 1519) [node name="tree8" type="Sprite2D" parent="ParallaxBackground/back tree bois layer 5"] -modulate = Color(0.674561, 0.721424, 0.744786, 1) +modulate = Color(0.2821873, 0.32191858, 0.34160244, 1) z_index = 1 position = Vector2(7435.7, 752) scale = Vector2(1.8, 1.8) @@ -678,7 +696,7 @@ region_enabled = true region_rect = Rect2(1504, -2, 402, 1124) [node name="tree11" type="Sprite2D" parent="ParallaxBackground/back tree bois layer 5"] -modulate = Color(0.674561, 0.721424, 0.744786, 1) +modulate = Color(0.2821873, 0.32191858, 0.34160244, 1) z_index = 1 position = Vector2(9092, 636) scale = Vector2(1.8, 1.8) @@ -687,7 +705,7 @@ region_enabled = true region_rect = Rect2(1504, -2, 402, 1124) [node name="tree9" type="Sprite2D" parent="ParallaxBackground/back tree bois layer 5"] -modulate = Color(0.674561, 0.721424, 0.744786, 1) +modulate = Color(0.2821873, 0.32191858, 0.34160244, 1) z_index = 1 position = Vector2(8179.7, 800) scale = Vector2(1.8, 1.8) @@ -696,7 +714,7 @@ region_enabled = true region_rect = Rect2(927, -1, 736, 1294) [node name="tree10" type="Sprite2D" parent="ParallaxBackground/back tree bois layer 5"] -modulate = Color(0.674561, 0.721424, 0.744786, 1) +modulate = Color(0.2821873, 0.32191858, 0.34160244, 1) z_index = 1 position = Vector2(4611.7, 608) scale = Vector2(1.8, 1.8) @@ -734,6 +752,7 @@ texture = SubResource("NoiseTexture2D_pjpt5") layer = 1 [node name="fg1" type="ParallaxLayer" parent="ParalaxForeground"] +modulate = Color(0.12842685, 0.3583113, 0.5046753, 1) position = Vector2(-897, -245) motion_scale = Vector2(1.2, 1.2) motion_mirroring = Vector2(8192, 0) @@ -759,13 +778,11 @@ 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")] position = Vector2(8202, 1950) _hoe = ExtResource("25_3h260") -_wateringCan = ExtResource("26_1bhpp") [node name="CharacterBody2D" parent="YSorted/Vesna" index="0"] y_sort_enabled = true @@ -776,12 +793,11 @@ y_sort_enabled = true [node name="Animated Sprites" parent="YSorted/Vesna/CharacterBody2D/visuals" index="0"] y_sort_enabled = true animation = &"diagonal item" +frame = 0 frame_progress = 0.0 -[node name="WateringCanUI" parent="YSorted/Vesna/CharacterBody2D" index="2" node_paths=PackedStringArray("_stages")] -_stages = [null, null, null, null, null, null] - [node name="ForestVisuals" type="Node2D" parent="YSorted"] +modulate = Color(0.44591373, 0.17877698, 0.19915006, 1) y_sort_enabled = true position = Vector2(-60, -250) @@ -864,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) @@ -1062,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) @@ -1093,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) @@ -1104,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) @@ -1135,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) @@ -1177,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) @@ -1232,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) @@ -1313,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) @@ -1335,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) @@ -1568,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) @@ -1670,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) @@ -1751,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) @@ -1981,6 +1997,7 @@ region_rect = Rect2(1483.92, 1280.2, 1139.55, 367.598) polygon = PackedVector2Array(6564, 1921, 8663, 1938, 15008, 1914, 15121, 2882, 15601, 3074, 15636, 3574, 14122, 3569, 12930, 3737, 11502, 3599, 9887, 3658, 7936, 3924, 7712, 2967, 6529, 2914, 4412, 2953, 3919, 4843, 7970, 4459, 16532, 4289, 16365, 821, 4540, 1141, 4392, 2845, 6329, 2832) [node name="Paths" type="Node2D" parent="YSorted"] +modulate = Color(0.3553136, 0.35531354, 0.35531357, 1) y_sort_enabled = true [node name="Path0" type="Node2D" parent="YSorted/Paths" node_paths=PackedStringArray("closedVariant", "nextRoomVariant")] @@ -2109,6 +2126,7 @@ polygon = PackedVector2Array(664, -692, -812, -717, -1033, 505, 380, 465) y_sort_enabled = true [node name="Visuals" type="Node2D" parent="YSorted/Paths/Path1/PathVariants/OpenToFightRoom"] +modulate = Color(0.36281085, 0.22439209, 0.544261, 1) y_sort_enabled = true [node name="bush14" type="Sprite2D" parent="YSorted/Paths/Path1/PathVariants/OpenToFightRoom/Visuals"] @@ -2134,6 +2152,7 @@ position = Vector2(-335, 18) shape = SubResource("RectangleShape2D_ir2xa") [node name="EnemyGroupSpawns" type="Node2D" parent="YSorted"] +modulate = Color(0.3411854, 0.3401263, 0.29648906, 1) position = Vector2(11116, 2546) [node name="Spawn1" type="Node2D" parent="YSorted/EnemyGroupSpawns"] diff --git a/scenes/Babushka_scene_indoor_common_room.tscn b/scenes/Babushka_scene_indoor_common_room.tscn index 81ce0cd..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,15 +207,19 @@ _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 -[node name="IndoorTest" type="Node2D"] +[node name="Common Room" type="Node2D"] 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_farm_outside_2d.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 new file mode 100644 index 0000000..4895ee3 --- /dev/null +++ b/scenes/Babushka_scene_indoor_kitchen.tscn @@ -0,0 +1,282 @@ +[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"] +[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="31_jyyyu"] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_a2ood"] +resource_local_to_scene = true +size = Vector2(4757.2813, 1086) + +[sub_resource type="CircleShape2D" id="CircleShape2D_yd2gv"] +resource_local_to_scene = true +radius = 300.0 + +[node name="Kitchen" type="Node2D"] +z_index = 1 +y_sort_enabled = true +script = ExtResource("1_ftmt4") +_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn") + +[node name="Foreground" type="Node" parent="."] + +[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(-2461.1406, -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(-2863.5, -1165) +shape = SubResource("RectangleShape2D_a2ood") + +[node name="Background" type="Node2D" parent="."] +z_index = -100 + +[node name="Ceiling" type="Sprite2D" parent="Background"] +z_index = -100 +position = Vector2(-2453, -1419) +scale = Vector2(2, 2) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(0, 1749.6222, 3840, 358.11316) + +[node name="WallUpper" type="Sprite2D" parent="Background"] +z_index = -100 +position = Vector2(-2469, -969) +scale = Vector2(26, 2) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(1405.1335, 120.67705, 306.53345, 90.03079) + +[node name="Wall" type="Sprite2D" parent="Background"] +z_index = -100 +position = Vector2(-2460, -262) +scale = Vector2(31, 8) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(1755, 119, 254, 160) + +[node name="WallDecoration" type="Sprite2D" parent="Background"] +z_index = -20 +position = Vector2(-4498, -300) +scale = Vector2(1.5, 1.5) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185) + +[node name="WallDecoration2" type="Sprite2D" parent="Background/WallDecoration"] +position = Vector2(356, 0) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185) + +[node name="WallDecoration3" type="Sprite2D" parent="Background/WallDecoration"] +position = Vector2(732, 0) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185) + +[node name="WallDecoration4" type="Sprite2D" parent="Background/WallDecoration"] +position = Vector2(1110.6666, -3.5) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185) + +[node name="WallDecoration12" type="Sprite2D" parent="Background/WallDecoration"] +z_index = -50 +position = Vector2(-1123.3334, 0) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185) + +[node name="WallDecoration13" type="Sprite2D" parent="Background/WallDecoration"] +z_index = -50 +position = Vector2(-747.3334, 0) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185) + +[node name="WallDecoration14" type="Sprite2D" parent="Background/WallDecoration"] +z_index = -50 +position = Vector2(-368.66675, -3.5) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185) + +[node name="WallDecoration5" type="Sprite2D" parent="Background/WallDecoration"] +position = Vector2(1486.6666, -3.5) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185) + +[node name="WallDecoration6" type="Sprite2D" parent="Background/WallDecoration"] +position = Vector2(1854, 6) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185) + +[node name="WallDecoration7" type="Sprite2D" parent="Background/WallDecoration"] +position = Vector2(2230, 6) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185) + +[node name="WallDecoration8" type="Sprite2D" parent="Background/WallDecoration"] +position = Vector2(2608.6665, 2.5) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185) + +[node name="WallDecoration9" type="Sprite2D" parent="Background/WallDecoration"] +position = Vector2(2984.6665, 2.5) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185) + +[node name="WallDecoration10" type="Sprite2D" parent="Background/WallDecoration"] +position = Vector2(3333.9998, 2.6666667) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185) + +[node name="WallDecoration11" type="Sprite2D" parent="Background/WallDecoration"] +position = Vector2(3698, 2.6666667) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185) + +[node name="Floor" type="Sprite2D" parent="Background"] +z_index = -10 +position = Vector2(-2431, 670) +scale = Vector2(2, 1) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(0, 2246, 3840, 912) + +[node name="Room01DoorL" type="Sprite2D" parent="Background"] +position = Vector2(-4000, -221) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(92, 458, 641, 1050) + +[node name="CommonRoomDoor" parent="Background/Room01DoorL" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("7_6mpmc")] +_spritesToOutline = [NodePath("..")] +_id = 0 + +[node name="CollisionShape3D" parent="Background/Room01DoorL/CommonRoomDoor/Area2D" index="0"] +shape = SubResource("CircleShape2D_yd2gv") + +[node name="BackwallCollider" type="StaticBody2D" parent="Background"] +position = Vector2(-4368, 40) +scale = Vector2(2, 2) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Background/BackwallCollider"] +position = Vector2(950, -419) +shape = SubResource("RectangleShape2D_a2ood") + +[node name="Vesna" parent="." instance=ExtResource("25_58hm8")] +y_sort_enabled = false +position = Vector2(-1971, 319) + +[node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")] +position = Vector2(-1534, -29) +offset = Vector2(0, -200) +zoom = Vector2(0.5, 0.5) +limit_left = -4500 +limit_top = -1050 +limit_right = 500 +limit_bottom = 1150 +editor_draw_limits = true +script = ExtResource("30_wqpex") +_followNode = NodePath("../Vesna/CharacterBody2D") + +[node name="CanvasLayer" parent="." instance=ExtResource("31_jyyyu")] + +[node name="BackItems" type="Node2D" parent="."] + +[node name="cupboard" type="Sprite2D" parent="BackItems"] +z_index = -10 +position = Vector2(-2071, 114) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(1359, 440, 1591, 401) + +[node name="wallshelf" type="Sprite2D" parent="BackItems"] +z_index = -10 +position = Vector2(-1708, -335) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(3037, 440, 701, 170) + +[node name="wallshelf2" type="Sprite2D" parent="BackItems/wallshelf"] +z_index = -10 +position = Vector2(-700, 0) +texture = ExtResource("2_qsw8g") +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 + +[node name="Stove" type="Sprite2D" parent="FrontItems"] +position = Vector2(-2482, 926) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(823, 1105, 734, 420) + +[node name="Fireleft" type="Sprite2D" parent="FrontItems/Stove"] +position = Vector2(-189, -238) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(928.24866, 976.94073, 145.9801, 78.52728) + +[node name="FireRight" type="Sprite2D" parent="FrontItems/Stove"] +position = Vector2(191, -240) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(1278.6433, 986.7815, 213.37354, 67.61841) + +[node name="Firetoggle" parent="FrontItems/Stove" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("7_6mpmc")] +_spritesToOutline = [NodePath("..")] + +[node name="Counter" type="Sprite2D" parent="FrontItems"] +position = Vector2(-1388, 921) +texture = ExtResource("2_qsw8g") +region_enabled = true +region_rect = Rect2(1599, 1107, 1351, 418) + +[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"] + +[editable path="Background/Room01DoorL/CommonRoomDoor"] +[editable path="Vesna"] diff --git a/scenes/Babushka_scene_outside_beets.tscn b/scenes/Babushka_scene_outside_beets.tscn index b3d54d8..3e31110 100644 --- a/scenes/Babushka_scene_outside_beets.tscn +++ b/scenes/Babushka_scene_outside_beets.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=98 format=3 uid="uid://b3ibx4resa1f3"] +[gd_scene load_steps=99 format=3 uid="uid://b3ibx4resa1f3"] [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_6krrk"] [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="2_4ktoi"] @@ -42,6 +42,7 @@ [ext_resource type="PackedScene" uid="uid://dpbbroif2tnil" path="res://prefabs/interactions/generic_item_on_ground_2d.tscn" id="43_dr6bm"] [ext_resource type="Texture2D" uid="uid://ct7ea8ikor5rf" path="res://art/nature/grass/grass-3.png" id="43_g8k4k"] [ext_resource type="Texture2D" uid="uid://d3dwl6ph0pu1d" path="res://art/nature/grass/grass-6.png" id="44_jgrpl"] +[ext_resource type="Texture2D" uid="uid://dmo21h14toxfu" path="res://art/indoor/indoor outdoor/domovoi.png" id="44_njxly"] [ext_resource type="Texture2D" uid="uid://blb3agipyxnal" path="res://art/farm/farming/farmobjekte/zaun/fence_door.png" id="47_xfjh2"] [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="52_gwhnv"] [ext_resource type="AudioStream" uid="uid://dku1rq5cocisg" path="res://audio/Music/Farming_90BPM_69Bars.wav" id="53_2tfpr"] @@ -125,10 +126,6 @@ shader_parameter/tiling_scale = Vector2(10, 1) [sub_resource type="RectangleShape2D" id="RectangleShape2D_0qu0h"] size = Vector2(374, 295.995) -[sub_resource type="CircleShape2D" id="CircleShape2D_34r5t"] -resource_local_to_scene = true -radius = 300.0 - [sub_resource type="ShaderMaterial" id="ShaderMaterial_2vojv"] shader = ExtResource("17_lwdq7") shader_parameter/hue_shift = 0.0 @@ -227,6 +224,10 @@ size = Vector2(707.116, 604.111) resource_local_to_scene = true radius = 294.02722 +[sub_resource type="CircleShape2D" id="CircleShape2D_34r5t"] +resource_local_to_scene = true +radius = 300.0 + [sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ceriq"] loop = false stream_count = 1 @@ -881,6 +882,7 @@ texture = SubResource("NoiseTexture2D_e5alv") [node name="Fence" type="Node2D" parent="."] [node name="Back Fence left" type="Sprite2D" parent="Fence"] +z_index = -50 texture_repeat = 2 material = SubResource("ShaderMaterial_0sfl7") position = Vector2(1332.5, 1680) @@ -897,6 +899,7 @@ position = Vector2(-204.073, 76) shape = SubResource("RectangleShape2D_2vojv") [node name="Back Fence middle" type="Sprite2D" parent="Fence"] +z_index = -50 texture_repeat = 2 material = SubResource("ShaderMaterial_0sfl7") position = Vector2(7501.01, 1680) @@ -972,15 +975,6 @@ position = Vector2(-33, 554) [node name="FarmingControls" parent="YSorted/Vesna" index="1" node_paths=PackedStringArray("_camera")] _camera = NodePath("../../../Camera2D") -[node name="GenericItemOnGround" parent="YSorted/Vesna" instance=ExtResource("43_dr6bm")] -position = Vector2(2527, 232) - -[node name="SpawnWithItem" parent="YSorted/Vesna/GenericItemOnGround" index="0"] -_blueprint = ExtResource("30_dr6bm") - -[node name="CollisionShape3D" parent="YSorted/Vesna/GenericItemOnGround/PickupInteractionArea/Area2D" index="0"] -shape = SubResource("CircleShape2D_34r5t") - [node name="Brünnen" type="Sprite2D" parent="YSorted"] z_index = 1 y_sort_enabled = true @@ -1013,6 +1007,8 @@ position = Vector2(-60, 122) position = Vector2(-8213, 84) [node name="greenery" type="Node2D" parent="YSorted/Farm visuals/Static"] +z_index = 1 +y_sort_enabled = true [node name="left side" type="Node2D" parent="YSorted/Farm visuals/Static/greenery"] @@ -1395,6 +1391,16 @@ offset = Vector2(0, -50) region_enabled = true region_rect = Rect2(1464, 419, 144, 115) +[node name="bush4" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +z_index = -6 +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(5684, 2035) +scale = Vector2(2, 2) +texture = ExtResource("20_4unvh") +offset = Vector2(0, -50) +region_enabled = true +region_rect = Rect2(1837, 651, 139, 180) + [node name="Sonnenblume8" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] z_index = 1 y_sort_enabled = true @@ -1745,10 +1751,14 @@ scale = Vector2(0.1, 8.7) texture = ExtResource("26_bwvai") [node name="FieldParent" type="Node2D" parent="YSorted/Farm visuals"] +z_index = 1 +y_sort_enabled = true position = Vector2(53, 20) scale = Vector2(1, 0.993819) [node name="BaseField" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(651, 2630.26) scale = Vector2(1, 1.00622) metadata/SaveID = "b3b47e69-6115-4405-8da6-508b783823d2" @@ -1757,7 +1767,11 @@ metadata/SaveID = "b3b47e69-6115-4405-8da6-508b783823d2" visible = true metadata/SaveID = "7a8210bf-479d-4b4c-9758-98d23e59d5d7" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 2 _field = NodePath("../..") _daysWatered = 6 @@ -1769,6 +1783,8 @@ visible = false shape = SubResource("CircleShape2D_qavgq") [node name="BaseField2" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(1226, 3098.15) scale = Vector2(1, 1.00622) Payload = 1 @@ -1778,7 +1794,11 @@ metadata/SaveID = "f536efd3-3da8-4ef5-a520-570220e6c19f" visible = true metadata/SaveID = "a1d8a0a2-c51c-4410-83c3-0edb31cbf2de" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField2/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField2/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 2 _field = NodePath("../..") _daysWatered = 6 @@ -1790,6 +1810,8 @@ visible = false shape = SubResource("CircleShape2D_njxly") [node name="BaseField3" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(1782, 2606.11) scale = Vector2(1, 1.00622) Payload = 2 @@ -1799,7 +1821,11 @@ metadata/SaveID = "14ce64d5-8a4d-43b9-a8ff-3a57725c4dc8" visible = true metadata/SaveID = "79a65532-cb2b-4268-8eb0-8c41a3935cbb" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 2 _field = NodePath("../..") _daysWatered = 5 @@ -1811,6 +1837,8 @@ visible = false shape = SubResource("CircleShape2D_54ty3") [node name="BaseField4" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(2559, 2624.22) scale = Vector2(1, 1.00622) Payload = 3 @@ -1821,7 +1849,11 @@ visible = true FieldState = 3 metadata/SaveID = "13fa64a3-01dc-4fd8-822e-0839c0da3163" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField4/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField4/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 2 _field = NodePath("../..") _daysWatered = 7 @@ -1833,6 +1865,8 @@ visible = false shape = SubResource("CircleShape2D_gbxtf") [node name="BaseField5" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(3305, 2624.22) scale = Vector2(1, 1.00622) Payload = 4 @@ -1843,7 +1877,11 @@ visible = true FieldState = 3 metadata/SaveID = "414ecdb9-f3c4-4fb9-81bd-6ca575784f78" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField5/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField5/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 2 _field = NodePath("../..") _daysWatered = 6 @@ -1855,6 +1893,8 @@ visible = false shape = SubResource("CircleShape2D_6krrk") [node name="BaseField6" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(4033, 2618.18) scale = Vector2(1, 1.00622) Payload = 5 @@ -1865,7 +1905,11 @@ visible = true FieldState = 3 metadata/SaveID = "b235febb-b231-4f8c-94e9-1f9d9f115b08" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField6/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField6/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 1 _field = NodePath("../..") _daysWatered = 5 @@ -1877,6 +1921,8 @@ visible = false shape = SubResource("CircleShape2D_4ktoi") [node name="BaseField7" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(4755, 2630.26) scale = Vector2(1, 1.00622) Payload = 6 @@ -1887,7 +1933,11 @@ visible = true FieldState = 3 metadata/SaveID = "9ccdba91-812a-4c13-9ee0-12472e174fc9" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField7/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField7/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 2 _field = NodePath("../..") _daysWatered = 6 @@ -1899,6 +1949,8 @@ visible = false shape = SubResource("CircleShape2D_aaup4") [node name="BaseField8" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(4418, 3226.95) scale = Vector2(1, 1.00622) Payload = 7 @@ -1909,7 +1961,11 @@ visible = true FieldState = 3 metadata/SaveID = "da44e54a-0b76-4888-ad8b-782a9d146fa3" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField8/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField8/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 2 _field = NodePath("../..") _daysWatered = 6 @@ -1921,6 +1977,8 @@ visible = false shape = SubResource("CircleShape2D_v10dc") [node name="BaseField9" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(5317, 3208.83) scale = Vector2(1, 1.00622) Payload = 8 @@ -1930,6 +1988,9 @@ metadata/SaveID = "0de8dc13-5851-4471-be35-309cd6687ebc" visible = true metadata/SaveID = "9919b294-04a1-4a16-9783-38c8aa0e291c" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField9/FieldBehaviour" index="1"] +z_index = 1 + [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField9" index="7"] visible = false @@ -1992,6 +2053,23 @@ _id = 0 [node name="CollisionShape3D" parent="YSorted/RakeGenericPickup/PickupInteractionArea/Area2D" index="0"] shape = SubResource("CircleShape2D_hpgl7") +[node name="domovoi" type="Sprite2D" parent="YSorted"] +modulate = Color(0.8982765, 0.818879, 0.7068166, 1) +z_index = -10 +position = Vector2(10542, 2026) +texture = ExtResource("44_njxly") +region_enabled = true +region_rect = Rect2(65, 149, 223, 375) + +[node name="WateringCan" parent="YSorted" instance=ExtResource("43_dr6bm")] +position = Vector2(5220, 2108) + +[node name="SpawnWithItem" parent="YSorted/WateringCan" index="0"] +_blueprint = ExtResource("30_dr6bm") + +[node name="CollisionShape3D" parent="YSorted/WateringCan/PickupInteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_34r5t") + [node name="CanvasLayer" parent="." instance=ExtResource("52_gwhnv")] [node name="Inventory" parent="CanvasLayer" index="1"] @@ -2074,8 +2152,6 @@ script = ExtResource("59_njxly") [connection signal="tree_entered" from="SceneNameSetter" to="SceneNameSetter" method="Set"] [editable path="YSorted/Vesna"] -[editable path="YSorted/Vesna/GenericItemOnGround"] -[editable path="YSorted/Vesna/GenericItemOnGround/PickupInteractionArea"] [editable path="YSorted/Brünnen/InteractionArea"] [editable path="YSorted/Farm visuals/FieldParent/BaseField"] [editable path="YSorted/Farm visuals/FieldParent/BaseField/FieldActivator/InteractionArea"] @@ -2098,4 +2174,6 @@ script = ExtResource("59_njxly") [editable path="YSorted/Blocker/BackToFarm"] [editable path="YSorted/RakeGenericPickup"] [editable path="YSorted/RakeGenericPickup/PickupInteractionArea"] +[editable path="YSorted/WateringCan"] +[editable path="YSorted/WateringCan/PickupInteractionArea"] [editable path="CanvasLayer"]