diff --git a/art/fightworld_background.png b/art/fightworld_background.png new file mode 100644 index 0000000..ca6d2a2 Binary files /dev/null and b/art/fightworld_background.png differ diff --git a/art/fightworld_background.png.import b/art/fightworld_background.png.import new file mode 100644 index 0000000..75cf198 --- /dev/null +++ b/art/fightworld_background.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ciaabo8kcx2hw" +path="res://.godot/imported/fightworld_background.png-be6589f7fa4be8e56ee338eabec1ff36.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/fightworld_background.png" +dest_files=["res://.godot/imported/fightworld_background.png-be6589f7fa4be8e56ee338eabec1ff36.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/art/indoor/.Babushka_bg_01.png-autosave.kra b/art/indoor/.Babushka_bg_01.png-autosave.kra new file mode 100644 index 0000000..3743b1f Binary files /dev/null and b/art/indoor/.Babushka_bg_01.png-autosave.kra differ diff --git a/art/indoor/indoor outdoor/domovoi_single.png b/art/indoor/indoor outdoor/domovoi_single.png new file mode 100644 index 0000000..03ba1be Binary files /dev/null and b/art/indoor/indoor outdoor/domovoi_single.png differ diff --git a/art/indoor/indoor outdoor/domovoi_single.png.import b/art/indoor/indoor outdoor/domovoi_single.png.import new file mode 100644 index 0000000..800cf52 --- /dev/null +++ b/art/indoor/indoor outdoor/domovoi_single.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dfp3tpx3fjges" +path="res://.godot/imported/domovoi_single.png-54325e2fb332bab49d527581994f50c7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/indoor/indoor outdoor/domovoi_single.png" +dest_files=["res://.godot/imported/domovoi_single.png-54325e2fb332bab49d527581994f50c7.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/art/indoor/vesna_indoor_bed.png b/art/indoor/vesna_indoor_bed.png new file mode 100644 index 0000000..4d21d48 Binary files /dev/null and b/art/indoor/vesna_indoor_bed.png differ diff --git a/art/indoor/vesna_indoor_bed.png.import b/art/indoor/vesna_indoor_bed.png.import new file mode 100644 index 0000000..9c226f8 --- /dev/null +++ b/art/indoor/vesna_indoor_bed.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://s1yoemhrupwe" +path="res://.godot/imported/vesna_indoor_bed.png-82be6dfddfce8701f4d35f6270cb0cdb.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/indoor/vesna_indoor_bed.png" +dest_files=["res://.godot/imported/vesna_indoor_bed.png-82be6dfddfce8701f4d35f6270cb0cdb.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/art/indoor/vesna_indoor_door.png b/art/indoor/vesna_indoor_door.png new file mode 100644 index 0000000..a8ece1c Binary files /dev/null and b/art/indoor/vesna_indoor_door.png differ diff --git a/art/indoor/vesna_indoor_door.png.import b/art/indoor/vesna_indoor_door.png.import new file mode 100644 index 0000000..fa96ec5 --- /dev/null +++ b/art/indoor/vesna_indoor_door.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dnlhlf1mx01h5" +path="res://.godot/imported/vesna_indoor_door.png-480faae15ccfa0c6172c753cd0b4d6a0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/indoor/vesna_indoor_door.png" +dest_files=["res://.godot/imported/vesna_indoor_door.png-480faae15ccfa0c6172c753cd0b4d6a0.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/Characters/Domovoi.dch b/dialog/Characters/Domovoi.dch index a6e0b5d..8243429 100644 --- a/dialog/Characters/Domovoi.dch +++ b/dialog/Characters/Domovoi.dch @@ -19,12 +19,22 @@ }, "style": "NPC_narrative" }, -&"default_portrait": "", +&"default_portrait": "default", &"description": "Yeli's Domovoi", &"display_name": "Domovoi", &"mirror": false, &"nicknames": [""], &"offset": Vector2(0, 0), -&"portraits": {}, +&"portraits": { +"default": { +"export_overrides": { +"image": "\"res://art/indoor/indoor outdoor/domovoi_single.png\"" +}, +"mirror": false, +"offset": Vector2(0, -300), +"scale": 1.0, +"scene": "" +} +}, &"scale": 1.0 } \ No newline at end of file diff --git a/dialog/Characters/semi_cat.dch b/dialog/Characters/semi_cat.dch index c5ed272..3de2733 100644 --- a/dialog/Characters/semi_cat.dch +++ b/dialog/Characters/semi_cat.dch @@ -1,19 +1,29 @@ { "@path": "res://addons/dialogic/Resources/character.gd", "@subpath": NodePath(""), -"_translation_id": "16", -"color": Color(1, 1, 1, 1), -"custom_info": { +&"_translation_id": "16", +&"color": Color(1, 1, 1, 1), +&"custom_info": { "sound_mood_default": "", "sound_moods": {}, "style": "" }, -"default_portrait": "", -"description": "", -"display_name": "Semi Cat", +&"default_portrait": "side", +&"description": "", +&"display_name": "Black Cat", +&"mirror": false, +&"nicknames": [""], +&"offset": Vector2(0, 0), +&"portraits": { +"side": { +"export_overrides": { +"image": "\"res://art/animals/katze.png\"" +}, "mirror": false, -"nicknames": [""], -"offset": Vector2(0, 0), -"portraits": {}, -"scale": 1.0 +"offset": Vector2(0, -300), +"scale": 1.5, +"scene": "" +} +}, +&"scale": 1.0 } \ No newline at end of file diff --git a/dialog/cat.dtl b/dialog/cat.dtl new file mode 100644 index 0000000..a263399 --- /dev/null +++ b/dialog/cat.dtl @@ -0,0 +1,5 @@ +join vesna (half side) left +join semi_cat right +vesna: (pets) +semi_cat: mrau! +[end_timeline] diff --git a/dialog/cat.dtl.uid b/dialog/cat.dtl.uid new file mode 100644 index 0000000..19974e5 --- /dev/null +++ b/dialog/cat.dtl.uid @@ -0,0 +1 @@ +uid://clwlhu4lpmyqm diff --git a/dialog/disclaimer.dtl b/dialog/disclaimer.dtl index 5969dcd..7cc996a 100644 --- a/dialog/disclaimer.dtl +++ b/dialog/disclaimer.dtl @@ -2,7 +2,7 @@ join vesna left vesna: Hello! join Yeli (_side) right Yeli (_frontal): Welcome to Babushka! -vesna (half side): We are Cozy Raven. This is our first showcase. +vesna (half side): We are Cozy Raven. This is a preview showcase. Yeli (_part_side): Many of the lofty, idealist, dreamy things that we wanted to implement are still in the backlog, waiting for their turn. vesna (front): But alas! The deadlines loomed, the bugs were strong with this one, and our days only have 24 hours. Yeli (_frontal): So please be kind when you test this demo. We poured our hearts and our love for the slavic folklore into this one and will continue to do so. diff --git a/dialog/quests/beetroot/quest3_beets_end.dtl b/dialog/quests/beetroot/quest3_beets_end.dtl index c67accf..b53f5cd 100644 --- a/dialog/quests/beetroot/quest3_beets_end.dtl +++ b/dialog/quests/beetroot/quest3_beets_end.dtl @@ -1,9 +1,9 @@ join Yeli right join vesna left Yeli (_part_side): Wow! So many? -Yeli (_part_side): Good job! Put it in the kettle! +Yeli (_frontal): Good job! Put it in the kettle! [wait_input] Yeli (_part_side): Mmmh! This will be something. -Yeli (_part_side): Thank you! I can take everything else from here. +Yeli (_frontal): Thank you! I can take everything else from here. Yeli (_part_side): See you for dinner! [end_timeline] diff --git a/dialog/quests/forest/quest5_forest_end.dtl b/dialog/quests/forest/quest5_forest_end.dtl index 27cfc4f..43b7b58 100644 --- a/dialog/quests/forest/quest5_forest_end.dtl +++ b/dialog/quests/forest/quest5_forest_end.dtl @@ -1,4 +1,4 @@ -join Chuga left +join Chuga center Chuga: I believe you’ve seen enough for today. Chuga: And yes, you too. Chuga: Thank you for playing! diff --git a/dialog/quests/forest/quest5_forest_start.dtl b/dialog/quests/forest/quest5_forest_start.dtl index b8ddf8e..3e0679b 100644 --- a/dialog/quests/forest/quest5_forest_start.dtl +++ b/dialog/quests/forest/quest5_forest_start.dtl @@ -2,7 +2,7 @@ join vesna left join Chuga right Chuga: Look who it is! -vesna: Your name was Chuga, right? I want to go to the forest! +vesna (half side): Your name was Chuga, right? I want to go to the forest! Chuga: To the forest? After everything the others told you? vesna: Will you let me through? Chuga: Will I? diff --git a/dialog/quests/tomatoes/quest2_tomatoes_interim.dtl b/dialog/quests/tomatoes/quest2_tomatoes_interim.dtl index 6860ab8..16bc28b 100644 --- a/dialog/quests/tomatoes/quest2_tomatoes_interim.dtl +++ b/dialog/quests/tomatoes/quest2_tomatoes_interim.dtl @@ -1,9 +1,9 @@ -join Yeli center -join vesna center +join Yeli left +join vesna right [quest_complete quest_resource="res://resources/quests/demo/5_talk_yeli_3.tres"] Yeli (_part_side): Great! Now I need you to plant some tomatoes! label plant tomatoes -Yeli (_part_side): Use the hoe to break up the soil. Then plant the seeds and water the fields. +Yeli (_frontal): Use the hoe to break up the soil. Then plant the seeds and water the fields. Yeli (_part_side): Got it? - Of course! - Wait … How do I plant the tomatoes again? diff --git a/dialog/quests/tomatoes/quest2_tomatoes_start.dtl b/dialog/quests/tomatoes/quest2_tomatoes_start.dtl index c3e9f03..8448c4d 100644 --- a/dialog/quests/tomatoes/quest2_tomatoes_start.dtl +++ b/dialog/quests/tomatoes/quest2_tomatoes_start.dtl @@ -2,11 +2,11 @@ join Yeli right join vesna left [quest_complete quest_resource="res://resources/quests/demo/3_talk_yeli_2.tres"] Yeli (_part_side): Thank you, my child! Your Yeli is not so agile anymore. -vesna: But you’re diligent! You’ve started with the preparation for dinner. -Yeli (_part_side): Indeed, I have. +vesna (half side): But you’re diligent! You’ve started with the preparation for dinner. +Yeli (_frontal): Indeed, I have. Yeli (_part_side): But, oh my, those ducks messed up the tomatos. -Yeli (_part_side): Oh, would you like to assist me? -vesna: What do I have to do? +Yeli (_frontal): Oh, would you like to assist me? +vesna (front): What do I have to do? Yeli (_part_side): First, take the hoe and watering can over there! Then come back to me! [quest_activate quest_resource="res://resources/quests/demo/4_collect_tools.tres"] [end_timeline] diff --git a/dialog/testing/domovoi_tut.dtl b/dialog/testing/domovoi_tut.dtl new file mode 100644 index 0000000..232d9c1 --- /dev/null +++ b/dialog/testing/domovoi_tut.dtl @@ -0,0 +1,8 @@ +join Domovoi right +join vesna (half side) left +vesna: Hello? +... +vesna: Is someone home? +(No answer.) +vesna: Hmpf! +[end_timeline] diff --git a/dialog/testing/domovoi_tut.dtl.uid b/dialog/testing/domovoi_tut.dtl.uid new file mode 100644 index 0000000..3976afe --- /dev/null +++ b/dialog/testing/domovoi_tut.dtl.uid @@ -0,0 +1 @@ +uid://cc1hkf45dtrnj diff --git a/export_presets.cfg b/export_presets.cfg index 7a58afc..30c3c11 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -9,7 +9,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="_builds/Babushka_win_0_5/Babushka.exe" +export_path="_builds/Babushka_showcase_6a/Babushka.exe" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" @@ -26,6 +26,7 @@ debug/export_console_wrapper=1 binary_format/embed_pck=false texture_format/s3tc_bptc=true texture_format/etc2_astc=false +shader_baker/enabled=false binary_format/architecture="x86_64" codesign/enable=false codesign/timestamp=true @@ -79,7 +80,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="_builds/Babushka_linux_0_5/Babushka.x86_64" +export_path="_builds/Babushka_showcase_lux_06a/Babushka.x86_64" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" @@ -96,6 +97,7 @@ debug/export_console_wrapper=1 binary_format/embed_pck=false texture_format/s3tc_bptc=true texture_format/etc2_astc=false +shader_baker/enabled=false binary_format/architecture="x86_64" ssh_remote_deploy/enabled=false ssh_remote_deploy/host="user@host_ip" diff --git a/prefabs/Interactables/trash_object.tscn b/prefabs/Interactables/trash_object.tscn index a5fc1bf..0a9b58f 100644 --- a/prefabs/Interactables/trash_object.tscn +++ b/prefabs/Interactables/trash_object.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=17 format=3 uid="uid://sbf12hin4kes"] +[gd_scene load_steps=18 format=3 uid="uid://sbf12hin4kes"] [ext_resource type="Texture2D" uid="uid://bylgmr0skwtrs" path="res://art/farm/farming/farmobjekte/broken tools atlas.png" id="1_k4ca3"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="2_gcgfd"] +[ext_resource type="Script" uid="uid://c2cgj153m05sp" path="res://scripts/CSharp/Common/Interactables/TrashObject.cs" id="2_u7jgg"] [ext_resource type="AudioStream" uid="uid://be6g8b3v3u1ai" path="res://audio/sfx/Kitchen/SFX_Cooking_Knife_PickUp_01.wav" id="3_ktmp7"] [ext_resource type="AudioStream" uid="uid://cgjsajsdrrn0j" path="res://audio/sfx/Kitchen/SFX_Cooking_Knife_PutDown_01.wav" id="4_ic616"] [ext_resource type="AudioStream" uid="uid://br4drgupled6c" path="res://audio/sfx/Kitchen/SFX_Cooking_Pot_01.wav" id="5_dx175"] @@ -29,13 +30,15 @@ stream_7/stream = ExtResource("10_aqih4") stream_8/stream = ExtResource("11_kb03l") stream_9/stream = ExtResource("12_kka6u") -[node name="trashObject" type="Sprite2D"] +[node name="trashObject" type="Sprite2D" groups=["Saveable"]] z_index = 1 y_sort_enabled = true texture = ExtResource("1_k4ca3") offset = Vector2(1, -215) region_enabled = true region_rect = Rect2(44, 479, 356, 503) +script = ExtResource("2_u7jgg") +metadata/SaveID = "" [node name="InteractionArea" parent="." node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("2_gcgfd")] position = Vector2(0, -172) @@ -51,6 +54,6 @@ script = ExtResource("13_wswkg") script = ExtResource("14_dx175") _eventResources = Array[Object]([ExtResource("15_u7jgg")]) -[connection signal="Interacted" from="InteractionArea" to="." method="queue_free"] +[connection signal="Interacted" from="InteractionArea" to="." method="Collect"] [connection signal="Interacted" from="InteractionArea" to="AudioStreamPlayer2D" method="PlayOneShot"] [connection signal="Interacted" from="InteractionArea" to="PickupAnimationEventRaiser" method="RaiseEvents"] diff --git a/prefabs/SaveSystem/save_system.tscn b/prefabs/SaveSystem/save_system.tscn new file mode 100644 index 0000000..89b6e8c --- /dev/null +++ b/prefabs/SaveSystem/save_system.tscn @@ -0,0 +1,12 @@ +[gd_scene load_steps=3 format=3 uid="uid://7pvvop5hfl01"] + +[ext_resource type="Script" uid="uid://iquhbkr7pqeg" path="res://scripts/CSharp/Common/Savegame/SaveCheats.cs" id="1_vcrak"] +[ext_resource type="Script" uid="uid://ca4s0algeij1h" path="res://scripts/CSharp/Common/Savegame/SaveIDProviderTool.cs" id="2_q0tmy"] + +[node name="SaveSystem" type="Node"] + +[node name="SaveGameCheat" type="Node" parent="."] +script = ExtResource("1_vcrak") + +[node name="SaveIDProvider" type="Node" parent="."] +script = ExtResource("2_q0tmy") diff --git a/scenes/SceneTransition.tscn b/prefabs/UI/SceneTransition.tscn similarity index 100% rename from scenes/SceneTransition.tscn rename to prefabs/UI/SceneTransition.tscn diff --git a/prefabs/characters/Vesna.tscn b/prefabs/characters/Vesna.tscn index b8070d8..0c92a50 100644 --- a/prefabs/characters/Vesna.tscn +++ b/prefabs/characters/Vesna.tscn @@ -2123,9 +2123,6 @@ frame = 7 frame_progress = 0.229832 offset = Vector2(0, -450) -[node name="DetectionCross" parent="CharacterBody2D" instance=ExtResource("466_e04c3")] -position = Vector2(0, -200) - [node name="PlantCreatedEventListener" type="Node" parent="CharacterBody2D"] script = ExtResource("467_8hbu5") _eventResources = Array[Object]([ExtResource("468_t1d6r")]) @@ -2175,6 +2172,9 @@ scrollable = false script = ExtResource("472_kduih") _wateringCanFillStateNode = NodePath("../WateringCanFillState") +[node name="DetectionCross" parent="CharacterBody2D" instance=ExtResource("466_e04c3")] +position = Vector2(0, -260) + [node name="FarmingControls" type="Node2D" parent="." node_paths=PackedStringArray("_movingPlayer")] script = ExtResource("817_6nrw3") _sceneKeyProvider = ExtResource("471_83c4i") diff --git a/prefabs/characters/Yeli.tscn b/prefabs/characters/Yeli.tscn index 2201092..b62e8be 100644 --- a/prefabs/characters/Yeli.tscn +++ b/prefabs/characters/Yeli.tscn @@ -247,9 +247,9 @@ script = ExtResource("50_a7v1a") [connection signal="Talking" from="." to="Dialogic starter" method="open"] [connection signal="Interacted" from="InteractionArea" to="." method="StartTalking"] -[connection signal="Interacted" from="InteractionArea" to="InteractionArea" method="ToggleActive"] [connection signal="timelineEnded" from="Dialogic starter" to="." method="StopTalking"] -[connection signal="timelineEnded" from="Dialogic starter" to="InteractionArea" method="ToggleActive"] +[connection signal="timelineEnded" from="Dialogic starter" to="InteractionArea" method="SetActiveTrue"] +[connection signal="timelineStarted" from="Dialogic starter" to="InteractionArea" method="SetActiveFalse"] [connection signal="timelineEnded" from="DialogicToggle" to="." method="ToggleTalking"] [connection signal="timelineStarted" from="DialogicToggle" to="SFX/AudioStreamPlayer" method="PlayOneShot"] diff --git a/prefabs/farm/animals/duck.tscn b/prefabs/farm/animals/duck.tscn index b503a3d..c9b269c 100644 --- a/prefabs/farm/animals/duck.tscn +++ b/prefabs/farm/animals/duck.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=25 format=3 uid="uid://muuxxgvx33fp"] +[gd_scene load_steps=24 format=3 uid="uid://muuxxgvx33fp"] [ext_resource type="Script" uid="uid://7m1rt7agb6rm" path="res://scripts/CSharp/Common/Temp/MVPDuck.cs" id="1_54k4r"] [ext_resource type="Texture2D" uid="uid://hvchk6t0xe7j" path="res://art/animals/Ente.png" id="1_cgxhx"] -[ext_resource type="Resource" uid="uid://tt3d166mntmi" path="res://resources/low code/farming/var_sceneNameProvider.tres" id="2_fdf3t"] [ext_resource type="AudioStream" uid="uid://qv0aubjeyi0u" path="res://audio/sfx/Animals/SFX_Duck_Quack_01.wav" id="3_kjie1"] [ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="3_rdn2q"] [ext_resource type="AudioStream" uid="uid://da84l8e44scwh" path="res://audio/sfx/Animals/SFX_Duck_Quack_02.wav" id="4_54k4r"] @@ -143,7 +142,6 @@ viewport_path = NodePath("SubViewport") z_index = 1 y_sort_enabled = true script = ExtResource("1_54k4r") -_sceneKeyProvider = ExtResource("2_fdf3t") _transferDelayMs = 1000 _animationPlayer = NodePath("AnimationPlayer") diff --git a/prefabs/farm/base_field.tscn b/prefabs/farm/base_field.tscn index f7d7083..71163d3 100644 --- a/prefabs/farm/base_field.tscn +++ b/prefabs/farm/base_field.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=25 format=3 uid="uid://b1d2e7ely6hyw"] +[gd_scene load_steps=26 format=3 uid="uid://b1d2e7ely6hyw"] [ext_resource type="Script" uid="uid://j2mhvb45egej" path="res://scripts/CSharp/Low Code/Variables/VariableNode.cs" id="1_4mg73"] [ext_resource type="Script" uid="uid://bdffon388rkty" path="res://scripts/CSharp/Common/Farming/FieldBehaviour2D.cs" id="1_qa01x"] @@ -23,6 +23,7 @@ [ext_resource type="Texture2D" uid="uid://l5ym7gi82l1b" path="res://art/ui/UI/Watercan-ui/Tropfen-ui-6.png" id="21_4mg73"] [ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="21_68xcd"] [ext_resource type="Script" uid="uid://dlbjjgbs0n4b0" path="res://scripts/CSharp/Common/Farming/FieldActivator.cs" id="22_57jmp"] +[ext_resource type="PackedScene" uid="uid://7pvvop5hfl01" path="res://prefabs/SaveSystem/save_system.tscn" id="24_avqr3"] [sub_resource type="CircleShape2D" id="CircleShape2D_57jmp"] resource_local_to_scene = true @@ -38,7 +39,7 @@ z_index = 1 scale = Vector2(1.3499999, 1.5) texture = ExtResource("9_wx561") -[node name="FieldBehaviour" type="Sprite2D" parent="." node_paths=PackedStringArray("_fieldIndex", "_saveIdHolder", "_fieldSprite", "_maskSprite", "_outlineSprite", "PlantingInteraction", "FieldInteractionArea", "PlantingPlaceholder", "_wateringParticles")] +[node name="FieldBehaviour" type="Sprite2D" parent="." node_paths=PackedStringArray("_fieldIndex", "_saveIdHolder", "_fieldSprite", "_maskSprite", "_outlineSprite", "PlantingInteraction", "PlantingPlaceholder", "_wateringParticles")] visible = false z_index = -1 y_sort_enabled = true @@ -56,7 +57,6 @@ _maskTexture = Array[Texture2D]([ExtResource("2_w8caw"), ExtResource("3_c014y"), Tilled = ExtResource("5_wx561") Watered = ExtResource("6_7m4xq") PlantingInteraction = NodePath("InteractionArea") -FieldInteractionArea = NodePath("InteractionArea") PlantingPlaceholder = NodePath("PlantPlaceholder") ItemRepository = ExtResource("7_w8caw") _wateringParticles = NodePath("../pouring water vfx") @@ -74,11 +74,11 @@ texture = ExtResource("5_wx561") y_sort_enabled = true [node name="InteractionArea" parent="FieldBehaviour" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("7_2eegd")] +process_mode = 4 position = Vector2(-28.88889, -57) scale = Vector2(1.1111112, 1) _active = false _spritesToOutline = [NodePath("../../OutlineSprite")] -_showLabel = false [node name="PlantCreationEventRaiser" type="Node" parent="."] script = ExtResource("9_teirr") @@ -115,10 +115,11 @@ scale_amount_max = 0.8 color = Color(0.400601, 0.62444, 0.791217, 1) hue_variation_max = 0.4 -[node name="FieldActivator" type="Node2D" parent="." node_paths=PackedStringArray("_field", "_activatorArea")] +[node name="FieldActivator" type="Node2D" parent="." node_paths=PackedStringArray("_field", "_activatorArea", "_saveIdHolder")] script = ExtResource("22_57jmp") _field = NodePath("../FieldBehaviour") _activatorArea = NodePath("InteractionArea") +_saveIdHolder = NodePath("..") [node name="InteractionArea" parent="FieldActivator" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("7_2eegd")] _spritesToOutline = [NodePath("../../OutlineSprite")] @@ -129,6 +130,8 @@ shape = SubResource("CircleShape2D_57jmp") [node name="Marker2D" type="Marker2D" parent="."] gizmo_extents = 157.0 +[node name="SaveSystem" parent="." instance=ExtResource("24_avqr3")] + [connection signal="Planted" from="FieldBehaviour" to="PlantCreationEventRaiser" method="RaiseEvents"] [connection signal="Interacted" from="FieldBehaviour/InteractionArea" to="FieldBehaviour" method="Farm"] [connection signal="ItemInstanceActivated" from="InventoryListener Seeds" to="FieldBehaviour" method="ActivatedSeedInInventory"] @@ -138,3 +141,4 @@ gizmo_extents = 157.0 [connection signal="Interacted" from="FieldActivator/InteractionArea" to="FieldActivator/InteractionArea" method="ToggleActive"] [editable path="FieldActivator/InteractionArea"] +[editable path="SaveSystem"] diff --git a/prefabs/farm/plants/base_plant.tscn b/prefabs/farm/plants/base_plant.tscn index f20e3ab..0247eda 100644 --- a/prefabs/farm/plants/base_plant.tscn +++ b/prefabs/farm/plants/base_plant.tscn @@ -136,6 +136,7 @@ _useOutline = false shape = SubResource("CircleShape2D_vjw4j") [node name="ReadyPlantInventoryItem" parent="." instance=ExtResource("6_gdrin")] +process_mode = 4 position = Vector2(0, 2.3) IsActive = false _saveToDisk = false diff --git a/prefabs/fight/fight_scene_switcher.tscn b/prefabs/fight/fight_scene_switcher.tscn index f97f04b..fd8482d 100644 --- a/prefabs/fight/fight_scene_switcher.tscn +++ b/prefabs/fight/fight_scene_switcher.tscn @@ -4,6 +4,6 @@ [node name="FightSceneSwitcher" type="Node"] script = ExtResource("1_5dt1r") -_fightRoomScenePath = "res://scenes/Babushka_scene_fight_world_room.tscn" -_fightHappeningScene = "res://scenes/Babushka_scene_fight_happening.tscn" -_nightEndScene = "res://scenes/Babushka_scene_indoor_vesnas_room.tscn" +_fightRoomScenePath = "res://scenes/scene_fight_world_room.tscn" +_fightHappeningScene = "res://scenes/scene_fight_happening.tscn" +_nightEndScene = "res://scenes/scene_credits.tscn" diff --git a/prefabs/interactions/detection_cross.tscn b/prefabs/interactions/detection_cross.tscn index 5814bea..3dfe0e2 100644 --- a/prefabs/interactions/detection_cross.tscn +++ b/prefabs/interactions/detection_cross.tscn @@ -1,12 +1,21 @@ -[gd_scene load_steps=3 format=3 uid="uid://pflu0uaig7vv"] +[gd_scene load_steps=4 format=3 uid="uid://pflu0uaig7vv"] [ext_resource type="Script" uid="uid://ccc6m6c5khd2x" path="res://scripts/CSharp/Common/CharacterControls/DetectionCross.cs" id="1_va8tx"] [ext_resource type="PackedScene" uid="uid://dugr6ff1g7hi0" path="res://prefabs/interactions/detector.tscn" id="2_8hh05"] -[node name="DetectionCross" type="Node2D" node_paths=PackedStringArray("_detector")] +[sub_resource type="RectangleShape2D" id="RectangleShape2D_va8tx"] + +[node name="DetectionCross" type="Node2D" node_paths=PackedStringArray("_collider", "_shapeCast2D")] script = ExtResource("1_va8tx") -_detector = NodePath("detector") -_xOffset = 400.0 -_yOffset = 300.0 +_collider = NodePath("detector") +_shapeCast2D = NodePath("ShapeCast2D") +_xOffset = 200.0 +_yOffset = 200.0 + +[node name="detector" parent="." node_paths=PackedStringArray("_shapeCast2D") instance=ExtResource("2_8hh05")] +_shapeCast2D = NodePath("../ShapeCast2D") -[node name="detector" parent="." instance=ExtResource("2_8hh05")] +[node name="ShapeCast2D" type="ShapeCast2D" parent="."] +shape = SubResource("RectangleShape2D_va8tx") +target_position = Vector2(200, 0) +collide_with_areas = true diff --git a/prefabs/interactions/detector.tscn b/prefabs/interactions/detector.tscn index 967829b..33c4be5 100644 --- a/prefabs/interactions/detector.tscn +++ b/prefabs/interactions/detector.tscn @@ -1,14 +1,16 @@ -[gd_scene load_steps=3 format=3 uid="uid://dugr6ff1g7hi0"] +[gd_scene load_steps=4 format=3 uid="uid://dugr6ff1g7hi0"] [ext_resource type="Script" uid="uid://c3pd60biootsx" path="res://scripts/CSharp/Common/CharacterControls/Detector.cs" id="1_6pib0"] +[ext_resource type="Resource" uid="uid://clwqh3w5aqi5e" path="res://resources/low code/interactables/var_interactableToTrigger.tres" id="2_3fanv"] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_qwv4c"] -size = Vector2(100, 400) +[sub_resource type="CircleShape2D" id="CircleShape2D_6pib0"] +radius = 300.0 [node name="detector" type="Area2D"] collision_layer = 4 script = ExtResource("1_6pib0") +_itemToTriggerResource = ExtResource("2_3fanv") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource("RectangleShape2D_qwv4c") +shape = SubResource("CircleShape2D_6pib0") debug_color = Color(0.9459047, 7.2196126e-06, 0.5925879, 0.41960785) diff --git a/prefabs/interactions/interaction_area_2d.tscn b/prefabs/interactions/interaction_area_2d.tscn index fb04b7f..36e121c 100644 --- a/prefabs/interactions/interaction_area_2d.tscn +++ b/prefabs/interactions/interaction_area_2d.tscn @@ -1,8 +1,10 @@ -[gd_scene load_steps=6 format=3 uid="uid://cqc72e4hq6bcd"] +[gd_scene load_steps=8 format=3 uid="uid://cqc72e4hq6bcd"] [ext_resource type="Script" uid="uid://ckp413wrub5fm" path="res://scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs" id="1_5ajrf"] +[ext_resource type="Resource" uid="uid://clwqh3w5aqi5e" path="res://resources/low code/interactables/var_interactableToTrigger.tres" id="2_o1drf"] [ext_resource type="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/simple_interactable_outline.tres" id="2_qoey7"] [ext_resource type="Script" uid="uid://cp2q4k62sjo6h" path="res://scripts/CSharp/Common/CharacterControls/DetectableInteractionArea.cs" id="3_2wrrq"] +[ext_resource type="Script" uid="uid://pqemey80frcq" path="res://scripts/CSharp/Low Code/Variables/VariableListener.cs" id="4_gj2nu"] [sub_resource type="CircleShape2D" id="CircleShape2D_npluf"] resource_local_to_scene = true @@ -11,15 +13,17 @@ radius = 150.0 [sub_resource type="Theme" id="Theme_5ajrf"] default_font_size = 30 -[node name="InteractionArea" type="Node2D" node_paths=PackedStringArray("_area", "_label")] +[node name="InteractionArea" type="Node2D" node_paths=PackedStringArray("_selectionChangeListener", "_area", "_label")] script = ExtResource("1_5ajrf") +_selectionChangeListener = NodePath("SelectionListener") _area = NodePath("Area2D") _label = NodePath("Area2D/CanvasLayer/MarginContainer/Label") _outlineMaterial = ExtResource("2_qoey7") -[node name="Area2D" type="Area2D" parent="."] +[node name="Area2D" type="Area2D" parent="." node_paths=PackedStringArray("interactionArea2D")] collision_mask = 4 script = ExtResource("3_2wrrq") +interactionArea2D = NodePath("..") [node name="CollisionShape3D" type="CollisionShape2D" parent="Area2D"] shape = SubResource("CircleShape2D_npluf") @@ -51,5 +55,8 @@ text = "[E]" horizontal_alignment = 2 vertical_alignment = 2 -[connection signal="area_entered" from="Area2D" to="." method="OnPlayerEntered"] -[connection signal="area_exited" from="Area2D" to="." method="OnPlayerExited"] +[node name="SelectionListener" type="Node" parent="."] +script = ExtResource("4_gj2nu") +_variableResources = Array[Object]([ExtResource("2_o1drf")]) + +[connection signal="NewEventPayload" from="SelectionListener" to="Area2D" method="InteractionAreaSelectionChanged"] diff --git a/project.godot b/project.godot index 66ef019..e672a84 100644 --- a/project.godot +++ b/project.godot @@ -25,7 +25,7 @@ buses/default_bus_layout="uid://b6dwkmkyb0axk" [autoload] -SceneTransition="*res://scenes/SceneTransition.tscn" +SceneTransition="*res://prefabs/UI/SceneTransition.tscn" Dialogic="*res://addons/dialogic/Core/DialogicGameHandler.gd" InventoryManager="*res://scripts/CSharp/Common/Inventory/InventoryManager.cs" InputService="*res://scripts/CSharp/Common/Services/InputService.cs" @@ -48,7 +48,9 @@ directories/dch_directory={ "vesna": "res://dialog/Characters/vesna.dch" } directories/dtl_directory={ +"cat": "res://dialog/cat.dtl", "disclaimer": "res://dialog/disclaimer.dtl", +"domovoi_tut": "res://dialog/testing/domovoi_tut.dtl", "quest1_ducks_end": "res://dialog/quests/ducks/quest1_ducks_end.dtl", "quest1_ducks_start": "res://dialog/quests/ducks/quest1_ducks_start.dtl", "quest2_tomatoes_end": "res://dialog/quests/tomatoes/quest2_tomatoes_end.dtl", @@ -176,6 +178,7 @@ directories/tres_directory={ "unselected_stylebox": "res://addons/dialogic/Editor/Events/styles/unselected_stylebox.tres", "var_ColorTestValue": "res://resources/low code/test/var_ColorTestValue.tres", "var_Counter": "res://resources/low code/test/var_Counter.tres", +"var_interactableToTrigger": "res://resources/low code/interactables/var_interactableToTrigger.tres", "var_sceneNameProvider": "res://resources/low code/farming/var_sceneNameProvider.tres", "var_wateredFieldPosition": "res://resources/low code/farming/var_wateredFieldPosition.tres", "vesna_style": "res://addons/dialogic/vesna_style.tres", @@ -186,8 +189,8 @@ directories/tres_directory={ [display] -window/size/viewport_width=1980 -window/size/viewport_height=1020 +window/size/viewport_width=1920 +window/size/viewport_height=1080 window/stretch/mode="viewport" window/stretch/aspect="keep_height" diff --git a/resources/low code/interactables/var_interactableToTrigger.tres b/resources/low code/interactables/var_interactableToTrigger.tres new file mode 100644 index 0000000..f2242f8 --- /dev/null +++ b/resources/low code/interactables/var_interactableToTrigger.tres @@ -0,0 +1,8 @@ +[gd_resource type="Resource" script_class="VariableResource" load_steps=2 format=3 uid="uid://clwqh3w5aqi5e"] + +[ext_resource type="Script" uid="uid://dtvx2cakx0bey" path="res://scripts/CSharp/Low Code/Variables/VariableResource.cs" id="1_casar"] + +[resource] +script = ExtResource("1_casar") +Payload = null +metadata/_custom_type_script = "uid://dtvx2cakx0bey" diff --git a/scenes/Babushka_scene_bootstrap.tscn b/scenes/Babushka_scene_bootstrap.tscn deleted file mode 100644 index cc284e0..0000000 --- a/scenes/Babushka_scene_bootstrap.tscn +++ /dev/null @@ -1,23 +0,0 @@ -[gd_scene load_steps=5 format=3 uid="uid://bopv10dqm1knc"] - -[ext_resource type="PackedScene" uid="uid://c6wnoif01ltld" path="res://scenes/Babushka_scene_startMenu.tscn" id="1_15ton"] -[ext_resource type="Script" uid="uid://bbp0dyddwdbl8" path="res://scripts/CSharp/Common/Savegame/WindowSettingsSync.cs" id="2_d3jfo"] -[ext_resource type="Script" uid="uid://iquhbkr7pqeg" path="res://scripts/CSharp/Common/Savegame/SaveCheats.cs" id="4_ocsjo"] -[ext_resource type="Script" uid="uid://ca4s0algeij1h" path="res://scripts/CSharp/Common/Savegame/SaveIDProviderTool.cs" id="5_iyo8m"] - -[node name="BabushkaSceneBootstrap" type="Node2D"] - -[node name="BabushkaSceneStartMenu" parent="." instance=ExtResource("1_15ton")] - -[node name="SceneParent" type="Node" parent="."] - -[node name="WindowSettings" type="Node" parent="."] -script = ExtResource("2_d3jfo") - -[node name="SaveSystem" type="Node" parent="."] - -[node name="SaveGameCheat" type="Node" parent="SaveSystem"] -script = ExtResource("4_ocsjo") - -[node name="SaveIDProvider" type="Node" parent="SaveSystem"] -script = ExtResource("5_iyo8m") diff --git a/scenes/scene_bootstrap.tscn b/scenes/scene_bootstrap.tscn new file mode 100644 index 0000000..a116d5c --- /dev/null +++ b/scenes/scene_bootstrap.tscn @@ -0,0 +1,16 @@ +[gd_scene load_steps=4 format=3 uid="uid://bopv10dqm1knc"] + +[ext_resource type="PackedScene" uid="uid://c6wnoif01ltld" path="res://scenes/scene_startMenu.tscn" id="1_15ton"] +[ext_resource type="Script" uid="uid://bbp0dyddwdbl8" path="res://scripts/CSharp/Common/Savegame/WindowSettingsSync.cs" id="2_d3jfo"] +[ext_resource type="PackedScene" uid="uid://7pvvop5hfl01" path="res://prefabs/SaveSystem/save_system.tscn" id="3_s8cy4"] + +[node name="BabushkaSceneBootstrap" type="Node2D"] + +[node name="BabushkaSceneStartMenu" parent="." instance=ExtResource("1_15ton")] + +[node name="SceneParent" type="Node" parent="."] + +[node name="WindowSettings" type="Node" parent="."] +script = ExtResource("2_d3jfo") + +[node name="SaveSystem" parent="." instance=ExtResource("3_s8cy4")] diff --git a/scenes/Babushka_scene_credits.tscn b/scenes/scene_credits.tscn similarity index 99% rename from scenes/Babushka_scene_credits.tscn rename to scenes/scene_credits.tscn index 2c8a056..9a68afb 100644 --- a/scenes/Babushka_scene_credits.tscn +++ b/scenes/scene_credits.tscn @@ -11,7 +11,7 @@ [node name="BabushkaSceneCredits" type="Node2D"] script = ExtResource("1_f5860") -_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_startMenu.tscn") +_sceneNamesToLoad = PackedStringArray("res://scenes/scene_bootstrap.tscn") [node name="Sprite2D" type="Sprite2D" parent="."] position = Vector2(1030, 483) diff --git a/scenes/Babushka_scene_disclaimer.tscn b/scenes/scene_disclaimer.tscn similarity index 94% rename from scenes/Babushka_scene_disclaimer.tscn rename to scenes/scene_disclaimer.tscn index c050fcd..121915c 100644 --- a/scenes/Babushka_scene_disclaimer.tscn +++ b/scenes/scene_disclaimer.tscn @@ -8,7 +8,7 @@ [node name="BabushkaSceneDisclaimer" type="Node2D"] script = ExtResource("1_5otdq") -_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_farm_outside_2d.tscn") +_sceneNamesToLoad = PackedStringArray("res://scenes/scene_farm_outside_2d.tscn") [node name="CanvasLayer" type="CanvasLayer" parent="."] diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/scene_farm_outside_2d.tscn similarity index 83% rename from scenes/Babushka_scene_farm_outside_2d.tscn rename to scenes/scene_farm_outside_2d.tscn index 08045be..e8bc817 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/scene_farm_outside_2d.tscn @@ -1,89 +1,88 @@ -[gd_scene load_steps=119 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"] -[ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="3_p4qqi"] -[ext_resource type="Texture2D" uid="uid://be1nofeo7an0" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud2.png" id="3_r34wi"] -[ext_resource type="Texture2D" uid="uid://o6vnf7n7qp8o" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud6.png" id="4_xh22q"] -[ext_resource type="Texture2D" uid="uid://cc0o84q5u437k" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud7.png" id="5_k3wpj"] -[ext_resource type="Texture2D" uid="uid://cqdb0iqhlk5st" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud8.png" id="5_r0vdg"] -[ext_resource type="Texture2D" uid="uid://cydc6feouwxys" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/hills1.png" id="7_sbyqw"] -[ext_resource type="Texture2D" uid="uid://vt1gtr2trvwt" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/hills2.png" id="8_kt1wx"] -[ext_resource type="Texture2D" uid="uid://b6k4vrgj745k" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/tree03.png" id="9_ubx8m"] -[ext_resource type="Texture2D" uid="uid://dchn4jd4d7q3w" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/tree01.png" id="10_d53cn"] -[ext_resource type="Texture2D" uid="uid://8ai3me0j0wi" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/tree04.png" id="11_1uen0"] -[ext_resource type="Texture2D" uid="uid://dxrc50i65wuc4" path="res://art/mockups/Jelena 2d/jelena_mockup_bg01.png" id="11_vbdb2"] -[ext_resource type="Texture2D" uid="uid://bleimj6jr1jka" path="res://art/general/rectangle.png" id="12_6b2nr"] -[ext_resource type="Texture2D" uid="uid://g83vpep7rwwd" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/tree12.png" id="12_mrwmr"] -[ext_resource type="Texture2D" uid="uid://d0e8a7qsfkhy3" path="res://art/mockups/Jelena 2d/jelena_mockup_bg_02.png" id="13_0qu0h"] -[ext_resource type="Texture2D" uid="uid://bqoyk3fsrmu1x" path="res://art/nature/baum märz 2025/back back trees.png" id="13_1uen0"] -[ext_resource type="Shader" uid="uid://do5og8uubh2m5" path="res://shader/HSV.gdshader" id="13_7p0hq"] -[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://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"] -[ext_resource type="Texture2D" uid="uid://dg7rlugnq0t45" path="res://art/farm/farming/farmobjekte/brünnen.png" id="21_ualyd"] -[ext_resource type="Texture2D" uid="uid://bcw6oeovkmiup" path="res://art/nature/baum märz 2025/sonnenblumeseamless.png" id="23_d77e7"] -[ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="24_wtdui"] -[ext_resource type="PackedScene" uid="uid://dpbbroif2tnil" path="res://prefabs/interactions/generic_item_on_ground_2d.tscn" id="25_hukxv"] -[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="27_klb81"] -[ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="28_6b2nr"] -[ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/wateringcan.tres" id="28_ipqaa"] -[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="32_2nee2"] -[ext_resource type="Script" uid="uid://boehox1ydbcnx" path="res://scripts/CSharp/Common/Farming/WellBehaviour.cs" id="32_lbnqo"] -[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="34_e5b7x"] -[ext_resource type="Resource" uid="uid://d1uuxp1lp4aro" path="res://resources/items/tomato_seed.tres" id="35_64mdn"] -[ext_resource type="Texture2D" uid="uid://65e44yde224q" path="res://art/farm/Babushka_house_01.png" id="36_e5b7x"] -[ext_resource type="Resource" uid="uid://duq7tshxv6uhp" path="res://resources/items/beet_seed.tres" id="36_fv1t2"] -[ext_resource type="Resource" uid="uid://0mnsr4anoaiq" path="res://resources/items/beet.tres" id="36_q1g8e"] -[ext_resource type="AudioStream" uid="uid://cfqg50am0swb7" path="res://audio/Music/Farming_90BPM_69Bars_Loop.wav" id="37_8ey8m"] -[ext_resource type="AudioStream" uid="uid://dku1rq5cocisg" path="res://audio/Music/Farming_90BPM_69Bars.wav" id="37_di1ed"] -[ext_resource type="Shader" uid="uid://braevmqauoek7" path="res://shader/swaying_plant.gdshader" id="37_taxvr"] -[ext_resource type="Texture2D" uid="uid://bq2wojyy4ptva" path="res://art/nature/baum märz 2025/sonnenblume7.png" id="38_2rjny"] -[ext_resource type="AudioStream" uid="uid://fsiypqhql67w" path="res://audio/sfx/Farming/SFX_GettingWater_01.wav" id="39_di1ed"] -[ext_resource type="Texture2D" uid="uid://ccy6bwunhfvrf" path="res://art/farm/Babushka_house_frontDoor.png" id="39_lbnqo"] -[ext_resource type="AudioStream" uid="uid://foyw26hq1qp5" path="res://audio/sfx/Farming/SFX_GettingWater_02.wav" id="40_ceriq"] -[ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="40_w3jkj"] -[ext_resource type="Texture2D" uid="uid://dgavbfci8x178" path="res://art/nature/grass/grass-1.png" id="41_apj51"] -[ext_resource type="Script" uid="uid://clxb3n668oud3" path="res://scripts/CSharp/Common/Audio/AudioDebugger.cs" id="42_1nkjm"] -[ext_resource type="Texture2D" uid="uid://b644ofy7fml5w" path="res://art/nature/grass/grass-5.png" id="42_loeum"] -[ext_resource type="AudioStream" uid="uid://vcftvrpi6c7k" path="res://audio/sfx/Farming/SFX_Harke_03_Solo.wav" id="42_wtw65"] -[ext_resource type="AudioStream" uid="uid://bxh5m04vdo0sr" path="res://audio/sfx/Farming/SFX_Harke_04_Solo.wav" id="43_1nkjm"] -[ext_resource type="Texture2D" uid="uid://badnnid7dgnpk" path="res://art/nature/grass/grass-4.png" id="43_i36hd"] -[ext_resource type="Texture2D" uid="uid://h2b5aufaaw7w" path="res://art/nature/grass/grass-2.png" id="44_uxa2m"] -[ext_resource type="AudioStream" uid="uid://dapsknn486aee" path="res://audio/sfx/Farming/SFX_WateringPlants_01.wav" id="45_lbk0f"] -[ext_resource type="Texture2D" uid="uid://ct7ea8ikor5rf" path="res://art/nature/grass/grass-3.png" id="45_lwk6t"] -[ext_resource type="AudioStream" uid="uid://dnyne8wov50so" path="res://audio/sfx/Farming/SFX_WateringPlants_02.wav" id="46_2rjny"] -[ext_resource type="Texture2D" uid="uid://d3dwl6ph0pu1d" path="res://art/nature/grass/grass-6.png" id="46_ycj14"] -[ext_resource type="Texture2D" uid="uid://lvhbicmwqab5" path="res://art/farm/tilable grounds/böden/fruchtbarer wilder trockender boden.png" id="47_loeum"] -[ext_resource type="AudioStream" uid="uid://c43a6x43jkikl" path="res://audio/sfx/Farming/SFX_GettingWater_Well_01_Reverb.wav" id="49_d77e7"] -[ext_resource type="Texture2D" uid="uid://blb3agipyxnal" path="res://art/farm/farming/farmobjekte/zaun/fence_door.png" id="49_i36hd"] -[ext_resource type="Script" uid="uid://l6iq8rpym5io" path="res://scripts/CSharp/Common/Util/Counter.cs" id="49_uxa2m"] -[ext_resource type="Script" uid="uid://dnipeibppjirs" path="res://scripts/CSharp/Common/NPC/DialogicOverlayStarter.cs" id="51_uxa2m"] -[ext_resource type="Script" uid="uid://d2486x6upmwqq" path="res://scripts/GdScript/dialogic_starter.gd" id="52_lwk6t"] -[ext_resource type="PackedScene" uid="uid://sbf12hin4kes" path="res://prefabs/Interactables/trash_object.tscn" id="53_ycj14"] -[ext_resource type="PackedScene" uid="uid://muuxxgvx33fp" path="res://prefabs/farm/animals/duck.tscn" id="62_i36hd"] -[ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="66_2065p"] -[ext_resource type="Resource" uid="uid://cm8kftow8br00" path="res://resources/quests/demo/1_talk_yeli_1.tres" id="67_tm0yg"] -[ext_resource type="Script" uid="uid://c741nyedy26mx" path="res://scripts/CSharp/Common/QuestBehaviour/DetectInventoryContains.cs" id="68_hux6i"] -[ext_resource type="Resource" uid="uid://d2swjixbnqkbw" path="res://resources/quests/demo/4_collect_tools.tres" id="68_lbnqo"] -[ext_resource type="Script" uid="uid://be54lnb6gg81f" path="res://scripts/CSharp/Common/Inventory/ItemInstance.cs" id="69_4rgbr"] -[ext_resource type="Resource" uid="uid://5t8g0firdif0" path="res://resources/quests/demo/5_talk_yeli_3.tres" id="69_l4wxt"] -[ext_resource type="Script" uid="uid://bhbldab74vmhy" path="res://scripts/CSharp/Common/QuestBehaviour/DetectFieldWork.cs" id="74_fv1t2"] -[ext_resource type="Resource" uid="uid://h05jgxqtq37m" path="res://resources/quests/demo/6_till_and_water.tres" id="75_l7ekk"] -[ext_resource type="Script" uid="uid://dfpyjxivcuidr" path="res://scripts/CSharp/Low Code/Variables/VariableSetter.cs" id="76_l7ekk"] -[ext_resource type="Resource" uid="uid://byjqeukpibkvi" path="res://resources/quests/demo/7_talk_yeli_inside_1.tres" id="76_xcwle"] -[ext_resource type="Script" uid="uid://dih1b0opgc3f7" path="res://scripts/GdScript/dialogic_start_specific.gd" id="77_l7ekk"] -[ext_resource type="Resource" uid="uid://tt3d166mntmi" path="res://resources/low code/farming/var_sceneNameProvider.tres" id="77_xcwle"] -[ext_resource type="PackedScene" uid="uid://b1d2e7ely6hyw" path="res://prefabs/farm/base_field.tscn" id="78_xcwle"] -[ext_resource type="Script" uid="uid://iquhbkr7pqeg" path="res://scripts/CSharp/Common/Savegame/SaveCheats.cs" id="79_065st"] -[ext_resource type="Script" uid="uid://ca4s0algeij1h" path="res://scripts/CSharp/Common/Savegame/SaveIDProviderTool.cs" id="80_w1kgo"] +[gd_scene load_steps=118 format=3 uid="uid://gigb28qk8t12"] + +[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_rjrpk"] +[ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="2_gqhco"] +[ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="3_6y2po"] +[ext_resource type="Texture2D" uid="uid://be1nofeo7an0" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud2.png" id="4_xb1bn"] +[ext_resource type="Texture2D" uid="uid://o6vnf7n7qp8o" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud6.png" id="5_rkqnp"] +[ext_resource type="Texture2D" uid="uid://cc0o84q5u437k" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud7.png" id="6_xlgv7"] +[ext_resource type="Texture2D" uid="uid://cqdb0iqhlk5st" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud8.png" id="7_h2ihy"] +[ext_resource type="Texture2D" uid="uid://cydc6feouwxys" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/hills1.png" id="8_3ir18"] +[ext_resource type="Texture2D" uid="uid://vt1gtr2trvwt" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/hills2.png" id="9_5ytoh"] +[ext_resource type="Texture2D" uid="uid://b6k4vrgj745k" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/tree03.png" id="10_gr3c5"] +[ext_resource type="Texture2D" uid="uid://dchn4jd4d7q3w" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/tree01.png" id="11_621bx"] +[ext_resource type="Texture2D" uid="uid://8ai3me0j0wi" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/tree04.png" id="12_rq3q5"] +[ext_resource type="Texture2D" uid="uid://g83vpep7rwwd" path="res://art/mockups/Kenney_Backgrounds/PNG/Flat/tree12.png" id="13_l6npm"] +[ext_resource type="Texture2D" uid="uid://bleimj6jr1jka" path="res://art/general/rectangle.png" id="14_luuil"] +[ext_resource type="Texture2D" uid="uid://dxrc50i65wuc4" path="res://art/mockups/Jelena 2d/jelena_mockup_bg01.png" id="15_b8grg"] +[ext_resource type="Shader" uid="uid://do5og8uubh2m5" path="res://shader/HSV.gdshader" id="16_nkvxa"] +[ext_resource type="Texture2D" uid="uid://d0e8a7qsfkhy3" path="res://art/mockups/Jelena 2d/jelena_mockup_bg_02.png" id="17_r34n5"] +[ext_resource type="Texture2D" uid="uid://bqoyk3fsrmu1x" path="res://art/nature/baum märz 2025/back back trees.png" id="18_iyoue"] +[ext_resource type="Texture2D" uid="uid://451bkvxcxab7" path="res://art/nature/baum märz 2025/gräser und büsche.png" id="19_hr4d5"] +[ext_resource type="Texture2D" uid="uid://dldk8n51ag8fh" path="res://art/nature/baum märz 2025/backtreebois team brandon.png" id="20_r3q4b"] +[ext_resource type="Texture2D" uid="uid://bmjjfd5ngptxe" path="res://art/nature/baum märz 2025/backtreebois team kennedy.png" id="21_fcqqx"] +[ext_resource type="Texture2D" uid="uid://bcw6oeovkmiup" path="res://art/nature/baum märz 2025/sonnenblumeseamless.png" id="22_ojjmc"] +[ext_resource type="Shader" uid="uid://xnky830dtfsn" path="res://shader/repeat_texture.gdshader" id="23_tb03g"] +[ext_resource type="Texture2D" uid="uid://btea6eyucsyxj" path="res://art/farm/farming/farmobjekte/zaun/tilable fence middle part.png" id="24_3k5tr"] +[ext_resource type="Texture2D" uid="uid://3ed3dgq3irn2" path="res://art/farm/farming/farmobjekte/zaun/tilable fence end part2.png" id="25_l6ca2"] +[ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="26_vnhck"] +[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="27_6aw34"] +[ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="28_421o4"] +[ext_resource type="Texture2D" uid="uid://dg7rlugnq0t45" path="res://art/farm/farming/farmobjekte/brünnen.png" id="29_plceh"] +[ext_resource type="Script" uid="uid://boehox1ydbcnx" path="res://scripts/CSharp/Common/Farming/WellBehaviour.cs" id="30_p7w3o"] +[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="31_8uout"] +[ext_resource type="PackedScene" uid="uid://dpbbroif2tnil" path="res://prefabs/interactions/generic_item_on_ground_2d.tscn" id="32_cw83k"] +[ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/wateringcan.tres" id="33_71yd8"] +[ext_resource type="Resource" uid="uid://d1uuxp1lp4aro" path="res://resources/items/tomato_seed.tres" id="34_a38hy"] +[ext_resource type="Resource" uid="uid://duq7tshxv6uhp" path="res://resources/items/beet_seed.tres" id="35_ibl7m"] +[ext_resource type="PackedScene" uid="uid://b1d2e7ely6hyw" path="res://prefabs/farm/base_field.tscn" id="36_ouwjd"] +[ext_resource type="Texture2D" uid="uid://65e44yde224q" path="res://art/farm/Babushka_house_01.png" id="37_fyuxq"] +[ext_resource type="Texture2D" uid="uid://ccy6bwunhfvrf" path="res://art/farm/Babushka_house_frontDoor.png" id="38_vmji2"] +[ext_resource type="Shader" uid="uid://braevmqauoek7" path="res://shader/swaying_plant.gdshader" id="39_imsal"] +[ext_resource type="Texture2D" uid="uid://bq2wojyy4ptva" path="res://art/nature/baum märz 2025/sonnenblume7.png" id="40_a3gjv"] +[ext_resource type="Texture2D" uid="uid://dgavbfci8x178" path="res://art/nature/grass/grass-1.png" id="41_cl67n"] +[ext_resource type="Texture2D" uid="uid://h2b5aufaaw7w" path="res://art/nature/grass/grass-2.png" id="42_fay77"] +[ext_resource type="Texture2D" uid="uid://b644ofy7fml5w" path="res://art/nature/grass/grass-5.png" id="43_hh1cx"] +[ext_resource type="Texture2D" uid="uid://badnnid7dgnpk" path="res://art/nature/grass/grass-4.png" id="44_yuh84"] +[ext_resource type="Texture2D" uid="uid://ct7ea8ikor5rf" path="res://art/nature/grass/grass-3.png" id="45_admq8"] +[ext_resource type="Texture2D" uid="uid://d3dwl6ph0pu1d" path="res://art/nature/grass/grass-6.png" id="46_t1riv"] +[ext_resource type="Texture2D" uid="uid://lvhbicmwqab5" path="res://art/farm/tilable grounds/böden/fruchtbarer wilder trockender boden.png" id="47_gvk0h"] +[ext_resource type="Texture2D" uid="uid://blb3agipyxnal" path="res://art/farm/farming/farmobjekte/zaun/fence_door.png" id="48_d2s14"] +[ext_resource type="Script" uid="uid://l6iq8rpym5io" path="res://scripts/CSharp/Common/Util/Counter.cs" id="49_p0fhe"] +[ext_resource type="PackedScene" uid="uid://muuxxgvx33fp" path="res://prefabs/farm/animals/duck.tscn" id="50_6330x"] +[ext_resource type="Script" uid="uid://dnipeibppjirs" path="res://scripts/CSharp/Common/NPC/DialogicOverlayStarter.cs" id="51_s8nrv"] +[ext_resource type="Script" uid="uid://d2486x6upmwqq" path="res://scripts/GdScript/dialogic_starter.gd" id="52_tsaxb"] +[ext_resource type="PackedScene" uid="uid://sbf12hin4kes" path="res://prefabs/Interactables/trash_object.tscn" id="53_j4nx2"] +[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="54_233a1"] +[ext_resource type="AudioStream" uid="uid://dku1rq5cocisg" path="res://audio/Music/Farming_90BPM_69Bars.wav" id="55_6ddtl"] +[ext_resource type="Script" uid="uid://clxb3n668oud3" path="res://scripts/CSharp/Common/Audio/AudioDebugger.cs" id="56_njkty"] +[ext_resource type="AudioStream" uid="uid://cfqg50am0swb7" path="res://audio/Music/Farming_90BPM_69Bars_Loop.wav" id="57_o8j03"] +[ext_resource type="AudioStream" uid="uid://vcftvrpi6c7k" path="res://audio/sfx/Farming/SFX_Harke_03_Solo.wav" id="58_sn2cf"] +[ext_resource type="AudioStream" uid="uid://bxh5m04vdo0sr" path="res://audio/sfx/Farming/SFX_Harke_04_Solo.wav" id="59_aw7i6"] +[ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="60_2ir8f"] +[ext_resource type="AudioStream" uid="uid://dapsknn486aee" path="res://audio/sfx/Farming/SFX_WateringPlants_01.wav" id="61_gpvgy"] +[ext_resource type="AudioStream" uid="uid://dnyne8wov50so" path="res://audio/sfx/Farming/SFX_WateringPlants_02.wav" id="62_kbppk"] +[ext_resource type="AudioStream" uid="uid://fsiypqhql67w" path="res://audio/sfx/Farming/SFX_GettingWater_01.wav" id="63_oaryj"] +[ext_resource type="AudioStream" uid="uid://foyw26hq1qp5" path="res://audio/sfx/Farming/SFX_GettingWater_02.wav" id="64_kauc1"] +[ext_resource type="AudioStream" uid="uid://c43a6x43jkikl" path="res://audio/sfx/Farming/SFX_GettingWater_Well_01_Reverb.wav" id="65_vo1ei"] +[ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="66_knv57"] +[ext_resource type="Resource" uid="uid://cm8kftow8br00" path="res://resources/quests/demo/1_talk_yeli_1.tres" id="67_mitsp"] +[ext_resource type="Script" uid="uid://c741nyedy26mx" path="res://scripts/CSharp/Common/QuestBehaviour/DetectInventoryContains.cs" id="68_88mf7"] +[ext_resource type="Script" uid="uid://be54lnb6gg81f" path="res://scripts/CSharp/Common/Inventory/ItemInstance.cs" id="69_3budu"] +[ext_resource type="Resource" uid="uid://d2swjixbnqkbw" path="res://resources/quests/demo/4_collect_tools.tres" id="70_hvxcl"] +[ext_resource type="Resource" uid="uid://5t8g0firdif0" path="res://resources/quests/demo/5_talk_yeli_3.tres" id="71_wriss"] +[ext_resource type="Script" uid="uid://bhbldab74vmhy" path="res://scripts/CSharp/Common/QuestBehaviour/DetectFieldWork.cs" id="72_6nxqt"] +[ext_resource type="Resource" uid="uid://h05jgxqtq37m" path="res://resources/quests/demo/6_till_and_water.tres" id="73_yl1wy"] +[ext_resource type="Resource" uid="uid://byjqeukpibkvi" path="res://resources/quests/demo/7_talk_yeli_inside_1.tres" id="74_7c6h2"] +[ext_resource type="Script" uid="uid://dih1b0opgc3f7" path="res://scripts/GdScript/dialogic_start_specific.gd" id="75_e32l6"] +[ext_resource type="Script" uid="uid://dfpyjxivcuidr" path="res://scripts/CSharp/Low Code/Variables/VariableSetter.cs" id="76_kgbl3"] +[ext_resource type="Resource" uid="uid://tt3d166mntmi" path="res://resources/low code/farming/var_sceneNameProvider.tres" id="77_kls32"] +[ext_resource type="Script" uid="uid://iquhbkr7pqeg" path="res://scripts/CSharp/Common/Savegame/SaveCheats.cs" id="78_prj30"] +[ext_resource type="Script" uid="uid://ca4s0algeij1h" path="res://scripts/CSharp/Common/Savegame/SaveIDProviderTool.cs" id="79_m37ba"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_wtdui"] resource_local_to_scene = true -shader = ExtResource("13_7p0hq") +shader = ExtResource("16_nkvxa") shader_parameter/hue_shift = -0.25399996456499996 shader_parameter/saturation_mult = 0.603 shader_parameter/value_mult = 1.0 @@ -91,7 +90,7 @@ shader_parameter/brightness_add = 0.0 shader_parameter/contrast_mult = 1.0 [sub_resource type="ShaderMaterial" id="ShaderMaterial_065st"] -shader = ExtResource("13_7p0hq") +shader = ExtResource("16_nkvxa") shader_parameter/hue_shift = -0.18299996119249995 shader_parameter/saturation_mult = 0.8530000405175 shader_parameter/value_mult = 1.0 @@ -99,7 +98,7 @@ 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 = ExtResource("16_nkvxa") shader_parameter/hue_shift = -0.076 shader_parameter/saturation_mult = 0.939 shader_parameter/value_mult = 0.401 @@ -117,7 +116,7 @@ color_ramp = SubResource("Gradient_kt1wx") seamless = true [sub_resource type="ShaderMaterial" id="ShaderMaterial_ubx8m"] -shader = ExtResource("13_kt1wx") +shader = ExtResource("23_tb03g") shader_parameter/tiling_scale = Vector2(7.79, 5.2) shader_parameter/noise = SubResource("NoiseTexture2D_d53cn") @@ -138,7 +137,7 @@ seamless = true [sub_resource type="ShaderMaterial" id="ShaderMaterial_0sfl7"] resource_local_to_scene = true -shader = ExtResource("13_kt1wx") +shader = ExtResource("23_tb03g") shader_parameter/tiling_scale = Vector2(10, 1) [sub_resource type="RectangleShape2D" id="RectangleShape2D_2vojv"] @@ -146,14 +145,14 @@ resource_local_to_scene = true size = Vector2(725.109, 456) [sub_resource type="ShaderMaterial" id="ShaderMaterial_p4qqi"] -shader = ExtResource("13_kt1wx") +shader = ExtResource("23_tb03g") shader_parameter/tiling_scale = Vector2(5, 1) [sub_resource type="RectangleShape2D" id="RectangleShape2D_vbdb2"] size = Vector2(727.467, 216) [sub_resource type="ShaderMaterial" id="ShaderMaterial_ualyd"] -shader = ExtResource("13_kt1wx") +shader = ExtResource("23_tb03g") shader_parameter/tiling_scale = Vector2(10, 1) [sub_resource type="RectangleShape2D" id="RectangleShape2D_0qu0h"] @@ -163,7 +162,7 @@ size = Vector2(374, 295.995) size = Vector2(353, 296) [sub_resource type="ShaderMaterial" id="ShaderMaterial_2vojv"] -shader = ExtResource("13_7p0hq") +shader = ExtResource("16_nkvxa") shader_parameter/hue_shift = 0.0 shader_parameter/saturation_mult = 1.0 shader_parameter/value_mult = 1.0 @@ -188,7 +187,7 @@ radius = 200.0 [sub_resource type="ShaderMaterial" id="ShaderMaterial_lhtpe"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_bcdgk"] -shader = ExtResource("37_taxvr") +shader = ExtResource("39_imsal") shader_parameter/speed = 1.0 shader_parameter/minStrength = 0.05 shader_parameter/maxStrength = 0.326 @@ -200,7 +199,7 @@ shader_parameter/heightOffset = 0.51 shader_parameter/offset = 100.0 [sub_resource type="ShaderMaterial" id="ShaderMaterial_618my"] -shader = ExtResource("37_taxvr") +shader = ExtResource("39_imsal") shader_parameter/speed = 1.0 shader_parameter/minStrength = 0.05 shader_parameter/maxStrength = 0.157 @@ -212,19 +211,19 @@ shader_parameter/heightOffset = 0.0 shader_parameter/offset = 0.0 [sub_resource type="ShaderMaterial" id="ShaderMaterial_apj51"] -shader = ExtResource("13_kt1wx") +shader = ExtResource("23_tb03g") shader_parameter/tiling_scale = Vector2(5, 5) [sub_resource type="ShaderMaterial" id="ShaderMaterial_loeum"] -shader = ExtResource("13_kt1wx") +shader = ExtResource("23_tb03g") shader_parameter/tiling_scale = Vector2(1, 20) [sub_resource type="ShaderMaterial" id="ShaderMaterial_i36hd"] -shader = ExtResource("13_kt1wx") +shader = ExtResource("23_tb03g") shader_parameter/tiling_scale = Vector2(1, 25) [sub_resource type="ShaderMaterial" id="ShaderMaterial_lwk6t"] -shader = ExtResource("13_7p0hq") +shader = ExtResource("16_nkvxa") shader_parameter/hue_shift = 0.0 shader_parameter/saturation_mult = 0.871 shader_parameter/value_mult = 1.0 @@ -239,7 +238,7 @@ resource_local_to_scene = true radius = 339.17 [sub_resource type="ShaderMaterial" id="ShaderMaterial_uxa2m"] -shader = ExtResource("13_7p0hq") +shader = ExtResource("16_nkvxa") shader_parameter/hue_shift = 0.0 shader_parameter/saturation_mult = 0.753 shader_parameter/value_mult = 1.0 @@ -249,37 +248,37 @@ shader_parameter/contrast_mult = 1.0 [sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ceriq"] loop = false stream_count = 1 -stream_0 = ExtResource("37_di1ed") +stream_0 = ExtResource("55_6ddtl") [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_ceriq"] streams_count = 2 -stream_0/stream = ExtResource("42_wtw65") -stream_1/stream = ExtResource("43_1nkjm") +stream_0/stream = ExtResource("58_sn2cf") +stream_1/stream = ExtResource("59_aw7i6") [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_p4qqi"] streams_count = 2 -stream_0/stream = ExtResource("45_lbk0f") -stream_1/stream = ExtResource("46_2rjny") +stream_0/stream = ExtResource("61_gpvgy") +stream_1/stream = ExtResource("62_kbppk") [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_618my"] streams_count = 3 -stream_0/stream = ExtResource("39_di1ed") -stream_1/stream = ExtResource("40_ceriq") -stream_2/stream = ExtResource("49_d77e7") +stream_0/stream = ExtResource("63_oaryj") +stream_1/stream = ExtResource("64_kauc1") +stream_2/stream = ExtResource("65_vo1ei") [sub_resource type="Resource" id="Resource_y820s"] -script = ExtResource("69_4rgbr") -blueprint = ExtResource("28_ipqaa") +script = ExtResource("69_3budu") +blueprint = ExtResource("33_71yd8") metadata/_custom_type_script = "uid://be54lnb6gg81f" [sub_resource type="Resource" id="Resource_50loj"] -script = ExtResource("69_4rgbr") -blueprint = ExtResource("28_6b2nr") +script = ExtResource("69_3budu") +blueprint = ExtResource("28_421o4") metadata/_custom_type_script = "uid://be54lnb6gg81f" [node name="BabushkaSceneFarmOutside2d" type="Node2D"] -script = ExtResource("34_e5b7x") -_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn", "res://scenes/Babushka_scene_outside_beets.tscn") +script = ExtResource("1_rjrpk") +_sceneNamesToLoad = PackedStringArray("res://scenes/scene_indoor_common_room.tscn", "res://scenes/scene_outside_beets.tscn") [node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")] position = Vector2(3180, 1961) @@ -291,7 +290,7 @@ limit_top = -800 limit_right = 16000 limit_bottom = 4700 editor_draw_limits = true -script = ExtResource("3_p4qqi") +script = ExtResource("2_gqhco") _followNode = NodePath("../YSorted/Vesna/CharacterBody2D") [node name="ParallaxBackground" type="ParallaxBackground" parent="."] @@ -307,7 +306,7 @@ modulate = Color(0.5607, 0.89, 0.675955, 1) z_index = -500 position = Vector2(4096, 0) scale = Vector2(2, 2) -texture = ExtResource("2_7b2ri") +texture = ExtResource("3_6y2po") centered = false offset = Vector2(0, -100) @@ -315,7 +314,7 @@ offset = Vector2(0, -100) modulate = Color(0.5607, 0.89, 0.675955, 1) z_index = -500 scale = Vector2(2, 2) -texture = ExtResource("2_7b2ri") +texture = ExtResource("3_6y2po") centered = false offset = Vector2(0, -100) @@ -324,7 +323,7 @@ modulate = Color(0.5607, 0.89, 0.675955, 1) z_index = -500 position = Vector2(8192, 0) scale = Vector2(2, 2) -texture = ExtResource("2_7b2ri") +texture = ExtResource("3_6y2po") centered = false offset = Vector2(0, -100) @@ -338,7 +337,7 @@ motion_mirroring = Vector2(7000, 0) z_index = -400 position = Vector2(792, 400) scale = Vector2(2, 2) -texture = ExtResource("3_r34wi") +texture = ExtResource("4_xb1bn") centered = false offset = Vector2(0, -100) @@ -346,7 +345,7 @@ offset = Vector2(0, -100) z_index = -400 position = Vector2(2656, 272) scale = Vector2(2, 2) -texture = ExtResource("4_xh22q") +texture = ExtResource("5_rkqnp") centered = false offset = Vector2(0, -100) @@ -354,7 +353,7 @@ offset = Vector2(0, -100) z_index = -400 position = Vector2(3240, 488) scale = Vector2(2, 2) -texture = ExtResource("5_k3wpj") +texture = ExtResource("6_xlgv7") centered = false offset = Vector2(0, -100) @@ -362,7 +361,7 @@ offset = Vector2(0, -100) z_index = -400 position = Vector2(5461, 185) scale = Vector2(2, 2) -texture = ExtResource("5_r0vdg") +texture = ExtResource("7_h2ihy") centered = false offset = Vector2(0, -100) @@ -382,7 +381,7 @@ modulate = Color(0.709819, 0.713726, 0.717632, 1) z_index = -300 position = Vector2(0, 1420) scale = Vector2(3, 3) -texture = ExtResource("7_sbyqw") +texture = ExtResource("8_3ir18") centered = false offset = Vector2(0, -100) @@ -391,7 +390,7 @@ modulate = Color(0.709819, 0.713726, 0.717632, 1) z_index = -300 position = Vector2(2999, 1420) scale = Vector2(3, 3) -texture = ExtResource("8_kt1wx") +texture = ExtResource("9_5ytoh") centered = false offset = Vector2(0, -100) @@ -400,90 +399,90 @@ modulate = Color(0.651194, 0.592081, 0.635554, 1) z_index = -300 position = Vector2(376, 1136) scale = Vector2(2.33333, 1.64286) -texture = ExtResource("9_ubx8m") +texture = ExtResource("10_gr3c5") [node name="tree2" type="Sprite2D" parent="ParallaxBackground/background layer 3/Kenney assets"] modulate = Color(0.651194, 0.592081, 0.635554, 1) z_index = -300 position = Vector2(312, 1160) scale = Vector2(2.33333, 1.64286) -texture = ExtResource("9_ubx8m") +texture = ExtResource("10_gr3c5") [node name="tree3" type="Sprite2D" parent="ParallaxBackground/background layer 3/Kenney assets"] modulate = Color(0.651194, 0.592081, 0.635554, 1) z_index = -300 position = Vector2(216, 1072) scale = Vector2(1.46078, 0.957947) -texture = ExtResource("10_d53cn") +texture = ExtResource("11_621bx") [node name="tree4" type="Sprite2D" parent="ParallaxBackground/background layer 3/Kenney assets"] modulate = Color(0.651194, 0.592081, 0.635554, 1) z_index = -300 position = Vector2(104, 1128) scale = Vector2(2.33333, 1.64286) -texture = ExtResource("9_ubx8m") +texture = ExtResource("10_gr3c5") [node name="tree5" type="Sprite2D" parent="ParallaxBackground/background layer 3/Kenney assets"] modulate = Color(0.651194, 0.592081, 0.635554, 1) z_index = -300 position = Vector2(1640, 1088) scale = Vector2(2.33333, 1.64286) -texture = ExtResource("9_ubx8m") +texture = ExtResource("10_gr3c5") [node name="tree6" type="Sprite2D" parent="ParallaxBackground/background layer 3/Kenney assets"] modulate = Color(0.651194, 0.592081, 0.635554, 1) z_index = -300 position = Vector2(2456, 1256) scale = Vector2(2.33333, 1.64286) -texture = ExtResource("9_ubx8m") +texture = ExtResource("10_gr3c5") [node name="tree7" type="Sprite2D" parent="ParallaxBackground/background layer 3/Kenney assets"] modulate = Color(0.651194, 0.592081, 0.635554, 1) z_index = -300 position = Vector2(2392, 1288) scale = Vector2(2.33333, 1.64286) -texture = ExtResource("9_ubx8m") +texture = ExtResource("10_gr3c5") [node name="tree8" type="Sprite2D" parent="ParallaxBackground/background layer 3/Kenney assets"] modulate = Color(0.651194, 0.592081, 0.635554, 1) z_index = -300 position = Vector2(2568, 1200) scale = Vector2(1.33805, 0.991627) -texture = ExtResource("11_1uen0") +texture = ExtResource("12_rq3q5") [node name="tree9" type="Sprite2D" parent="ParallaxBackground/background layer 3/Kenney assets"] modulate = Color(0.651194, 0.592081, 0.635554, 1) z_index = -300 position = Vector2(3376, 1224) scale = Vector2(2.33333, 1.64286) -texture = ExtResource("9_ubx8m") +texture = ExtResource("10_gr3c5") [node name="tree10" type="Sprite2D" parent="ParallaxBackground/background layer 3/Kenney assets"] modulate = Color(0.651194, 0.592081, 0.635554, 1) z_index = -300 position = Vector2(3488, 1248) scale = Vector2(0.939717, 0.72619) -texture = ExtResource("12_mrwmr") +texture = ExtResource("13_l6npm") [node name="tree11" type="Sprite2D" parent="ParallaxBackground/background layer 3/Kenney assets"] modulate = Color(0.651194, 0.592081, 0.635554, 1) z_index = -300 position = Vector2(4912, 1078.25) scale = Vector2(2.33333, 1.64286) -texture = ExtResource("9_ubx8m") +texture = ExtResource("10_gr3c5") [node name="Sprite2D" type="Sprite2D" parent="ParallaxBackground/background layer 3/Kenney assets"] modulate = Color(0.584268, 0.659007, 0.690272, 1) z_index = -300 position = Vector2(3069.17, 2218.33) scale = Vector2(12, 3) -texture = ExtResource("12_6b2nr") +texture = ExtResource("14_luuil") [node name="JelenaMockupBg01" type="Sprite2D" parent="ParallaxBackground/background layer 3"] visible = false position = Vector2(3552, 1296) scale = Vector2(3, 3.062) -texture = ExtResource("11_vbdb2") +texture = ExtResource("15_b8grg") [node name="background layer 4" type="ParallaxLayer" parent="ParallaxBackground"] z_index = -200 @@ -496,14 +495,14 @@ z_index = -200 material = SubResource("ShaderMaterial_wtdui") position = Vector2(2668, 726) scale = Vector2(2.75, 2.75) -texture = ExtResource("13_0qu0h") +texture = ExtResource("17_r34n5") [node name="JelenaMockupBg03" type="Sprite2D" parent="ParallaxBackground/background layer 4"] z_index = -200 material = SubResource("ShaderMaterial_wtdui") position = Vector2(7923, 727) scale = Vector2(2.75, 2.75) -texture = ExtResource("13_0qu0h") +texture = ExtResource("17_r34n5") [node name="background layer 5" type="ParallaxLayer" parent="ParallaxBackground"] z_index = -200 @@ -517,7 +516,7 @@ z_index = -200 material = SubResource("ShaderMaterial_065st") position = Vector2(2668, 726) scale = Vector2(2.75, 2.75) -texture = ExtResource("13_0qu0h") +texture = ExtResource("17_r34n5") flip_h = true [node name="JelenaMockupBg03" type="Sprite2D" parent="ParallaxBackground/background layer 5"] @@ -525,7 +524,7 @@ z_index = -200 material = SubResource("ShaderMaterial_065st") position = Vector2(7923, 727) scale = Vector2(2.75, 2.75) -texture = ExtResource("13_0qu0h") +texture = ExtResource("17_r34n5") flip_h = true [node name="back back trees layer" type="ParallaxLayer" parent="ParallaxBackground"] @@ -538,7 +537,7 @@ motion_mirroring = Vector2(9965, 0) modulate = Color(0.345703, 0.360648, 0.242876, 1) position = Vector2(993, 1576) scale = Vector2(5, 5) -texture = ExtResource("7_sbyqw") +texture = ExtResource("8_3ir18") centered = false offset = Vector2(-200, -80) @@ -546,7 +545,7 @@ offset = Vector2(-200, -80) modulate = Color(0.345703, 0.360648, 0.242876, 1) position = Vector2(5961, 1582) scale = Vector2(5, 5) -texture = ExtResource("8_kt1wx") +texture = ExtResource("9_5ytoh") centered = false offset = Vector2(-200, -80) @@ -554,7 +553,7 @@ offset = Vector2(-200, -80) material = SubResource("ShaderMaterial_8ey8m") position = Vector2(3017.3, 536.15) scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") +texture = ExtResource("18_iyoue") region_enabled = true region_rect = Rect2(770, 3, 304, 979) @@ -562,7 +561,7 @@ region_rect = Rect2(770, 3, 304, 979) material = SubResource("ShaderMaterial_8ey8m") position = Vector2(1807.5, 1408) scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") +texture = ExtResource("18_iyoue") region_enabled = true region_rect = Rect2(399, 420, 228, 493) @@ -570,7 +569,7 @@ region_rect = Rect2(399, 420, 228, 493) material = SubResource("ShaderMaterial_8ey8m") position = Vector2(3321.3, 600.15) scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") +texture = ExtResource("18_iyoue") region_enabled = true region_rect = Rect2(1770, -4, 289, 930) @@ -578,7 +577,7 @@ region_rect = Rect2(1770, -4, 289, 930) material = SubResource("ShaderMaterial_8ey8m") position = Vector2(460, 622) scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") +texture = ExtResource("18_iyoue") region_enabled = true region_rect = Rect2(1770, -4, 289, 930) @@ -586,7 +585,7 @@ region_rect = Rect2(1770, -4, 289, 930) material = SubResource("ShaderMaterial_8ey8m") position = Vector2(5081.3, 696.15) scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") +texture = ExtResource("18_iyoue") region_enabled = true region_rect = Rect2(2283, 2, 186, 840) @@ -594,7 +593,7 @@ region_rect = Rect2(2283, 2, 186, 840) material = SubResource("ShaderMaterial_8ey8m") position = Vector2(8470, 694) scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") +texture = ExtResource("18_iyoue") region_enabled = true region_rect = Rect2(2283, 2, 186, 840) @@ -602,7 +601,7 @@ region_rect = Rect2(2283, 2, 186, 840) material = SubResource("ShaderMaterial_8ey8m") position = Vector2(6596.8, 1566.35) scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") +texture = ExtResource("18_iyoue") region_enabled = true region_rect = Rect2(399, 420, 228, 493) @@ -610,7 +609,7 @@ region_rect = Rect2(399, 420, 228, 493) material = SubResource("ShaderMaterial_8ey8m") position = Vector2(8110.6, 758.5) scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") +texture = ExtResource("18_iyoue") region_enabled = true region_rect = Rect2(1770, -4, 289, 930) @@ -618,7 +617,7 @@ region_rect = Rect2(1770, -4, 289, 930) material = SubResource("ShaderMaterial_8ey8m") position = Vector2(10240, 850) scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") +texture = ExtResource("18_iyoue") region_enabled = true region_rect = Rect2(2283, 2, 186, 840) @@ -626,7 +625,7 @@ region_rect = Rect2(2283, 2, 186, 840) material = SubResource("ShaderMaterial_8ey8m") position = Vector2(5641.3, 1168.15) scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") +texture = ExtResource("18_iyoue") region_enabled = true region_rect = Rect2(2609, 434, 304, 467) @@ -634,21 +633,21 @@ region_rect = Rect2(2609, 434, 304, 467) material = SubResource("ShaderMaterial_8ey8m") position = Vector2(5161.3, 608.15) scale = Vector2(1.7, 1.7) -texture = ExtResource("13_1uen0") +texture = ExtResource("18_iyoue") region_enabled = true region_rect = Rect2(3111, -4, 167, 949) [node name="bush" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] material = SubResource("ShaderMaterial_8ey8m") position = Vector2(3239.5, 1288) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") region_enabled = true region_rect = Rect2(149, 15, 464, 478) [node name="bush2" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] material = SubResource("ShaderMaterial_8ey8m") position = Vector2(1791.5, 1448) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") flip_h = true region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -656,7 +655,7 @@ region_rect = Rect2(130, 0, 201, 278) [node name="bush3" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] material = SubResource("ShaderMaterial_8ey8m") position = Vector2(1255.5, 1392) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") flip_h = true region_enabled = true region_rect = Rect2(0, 604, 248, 228) @@ -664,7 +663,7 @@ region_rect = Rect2(0, 604, 248, 228) [node name="bush4" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] material = SubResource("ShaderMaterial_8ey8m") position = Vector2(5471.5, 1432) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") flip_h = true region_enabled = true region_rect = Rect2(1837, 651, 139, 180) @@ -672,7 +671,7 @@ region_rect = Rect2(1837, 651, 139, 180) [node name="bush5" type="Sprite2D" parent="ParallaxBackground/back back trees layer"] material = SubResource("ShaderMaterial_8ey8m") position = Vector2(5007.5, 1312) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -680,7 +679,7 @@ region_rect = Rect2(1368, 673, 186, 136) material = SubResource("ShaderMaterial_8ey8m") position = Vector2(3583.5, 1248) scale = Vector2(0.575, 0.575) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") flip_h = true region_enabled = true region_rect = Rect2(358, 523, 345, 289) @@ -695,7 +694,7 @@ modulate = Color(0.674561, 0.721424, 0.744786, 1) z_index = 1 position = Vector2(1483.7, 800) scale = Vector2(1.6, 1.6) -texture = ExtResource("13_d53cn") +texture = ExtResource("20_r3q4b") region_enabled = true region_rect = Rect2(-2, -5, 911, 1386) @@ -704,7 +703,7 @@ modulate = Color(0.674561, 0.721424, 0.744786, 1) z_index = 1 position = Vector2(771.7, 664) scale = Vector2(1.6, 1.6) -texture = ExtResource("14_1uen0") +texture = ExtResource("21_fcqqx") region_enabled = true region_rect = Rect2(0, 4, 604, 1363) @@ -713,7 +712,7 @@ modulate = Color(0.674561, 0.721424, 0.744786, 1) z_index = 1 position = Vector2(1763.7, 728) scale = Vector2(1.6, 1.6) -texture = ExtResource("14_1uen0") +texture = ExtResource("21_fcqqx") region_enabled = true region_rect = Rect2(626, -4, 711, 1519) @@ -722,7 +721,7 @@ modulate = Color(0.674561, 0.721424, 0.744786, 1) z_index = 1 position = Vector2(9464, 731) scale = Vector2(1.6, 1.6) -texture = ExtResource("14_1uen0") +texture = ExtResource("21_fcqqx") region_enabled = true region_rect = Rect2(626, -4, 711, 1519) @@ -731,7 +730,7 @@ modulate = Color(0.674561, 0.721424, 0.744786, 1) z_index = 1 position = Vector2(2939.7, 752) scale = Vector2(1.8, 1.8) -texture = ExtResource("14_1uen0") +texture = ExtResource("21_fcqqx") region_enabled = true region_rect = Rect2(1504, -2, 402, 1124) @@ -740,7 +739,7 @@ modulate = Color(0.674561, 0.721424, 0.744786, 1) z_index = 1 position = Vector2(3683.7, 800) scale = Vector2(1.8, 1.8) -texture = ExtResource("13_d53cn") +texture = ExtResource("20_r3q4b") region_enabled = true region_rect = Rect2(927, -1, 736, 1294) @@ -749,7 +748,7 @@ modulate = Color(0.674561, 0.721424, 0.744786, 1) z_index = 1 position = Vector2(115.7, 608) scale = Vector2(1.8, 1.8) -texture = ExtResource("13_d53cn") +texture = ExtResource("20_r3q4b") region_enabled = true region_rect = Rect2(1834, -5, 733, 1360) @@ -758,7 +757,7 @@ modulate = Color(0.674561, 0.721424, 0.744786, 1) z_index = 1 position = Vector2(6259.7, 728) scale = Vector2(1.6, 1.6) -texture = ExtResource("14_1uen0") +texture = ExtResource("21_fcqqx") region_enabled = true region_rect = Rect2(626, -4, 711, 1519) @@ -767,7 +766,7 @@ modulate = Color(0.674561, 0.721424, 0.744786, 1) z_index = 1 position = Vector2(7435.7, 752) scale = Vector2(1.8, 1.8) -texture = ExtResource("14_1uen0") +texture = ExtResource("21_fcqqx") region_enabled = true region_rect = Rect2(1504, -2, 402, 1124) @@ -776,7 +775,7 @@ modulate = Color(0.674561, 0.721424, 0.744786, 1) z_index = 1 position = Vector2(9092, 636) scale = Vector2(1.8, 1.8) -texture = ExtResource("14_1uen0") +texture = ExtResource("21_fcqqx") region_enabled = true region_rect = Rect2(1504, -2, 402, 1124) @@ -785,7 +784,7 @@ modulate = Color(0.674561, 0.721424, 0.744786, 1) z_index = 1 position = Vector2(8179.7, 800) scale = Vector2(1.8, 1.8) -texture = ExtResource("13_d53cn") +texture = ExtResource("20_r3q4b") region_enabled = true region_rect = Rect2(927, -1, 736, 1294) @@ -794,7 +793,7 @@ modulate = Color(0.674561, 0.721424, 0.744786, 1) z_index = 1 position = Vector2(4611.7, 608) scale = Vector2(1.8, 1.8) -texture = ExtResource("13_d53cn") +texture = ExtResource("20_r3q4b") region_enabled = true region_rect = Rect2(1834, -5, 733, 1360) @@ -805,13 +804,13 @@ motion_mirroring = Vector2(3779, 0) [node name="Sonnenblumeseamless" type="Sprite2D" parent="ParallaxBackground/sunflower field"] modulate = Color(1, 1, 1, 0.7921569) position = Vector2(0, 1863) -texture = ExtResource("23_d77e7") +texture = ExtResource("22_ojjmc") offset = Vector2(1892, 0) [node name="Sonnenblumeseamless2" type="Sprite2D" parent="ParallaxBackground/sunflower field"] modulate = Color(1, 1, 1, 0.7921569) position = Vector2(0, 1863) -texture = ExtResource("23_d77e7") +texture = ExtResource("22_ojjmc") offset = Vector2(9450, 0) [node name="ground layer" type="ParallaxLayer" parent="ParallaxBackground"] @@ -833,7 +832,7 @@ texture_repeat = 2 material = SubResource("ShaderMaterial_0sfl7") position = Vector2(-1261.5, 1680) scale = Vector2(12.7339, 1) -texture = ExtResource("20_if5vh") +texture = ExtResource("24_3k5tr") [node name="StaticBody2D" type="StaticBody2D" parent="Fence/Back Fence left"] collision_layer = 2 @@ -848,7 +847,7 @@ texture_repeat = 2 material = SubResource("ShaderMaterial_0sfl7") position = Vector2(7501.01, 1680) scale = Vector2(9.49518, 1) -texture = ExtResource("20_if5vh") +texture = ExtResource("24_3k5tr") [node name="StaticBody2D" type="StaticBody2D" parent="Fence/Back Fence middle"] collision_layer = 2 @@ -863,7 +862,7 @@ texture_repeat = 2 material = SubResource("ShaderMaterial_p4qqi") position = Vector2(13811.2, 1691) scale = Vector2(5.95672, 1) -texture = ExtResource("20_if5vh") +texture = ExtResource("24_3k5tr") [node name="StaticBody2D" type="StaticBody2D" parent="Fence/Back fence right"] collision_layer = 2 @@ -879,7 +878,7 @@ texture_repeat = 2 material = SubResource("ShaderMaterial_0sfl7") position = Vector2(5040, 4056) scale = Vector2(30, 1) -texture = ExtResource("20_if5vh") +texture = ExtResource("24_3k5tr") [node name="StaticBody2D" type="StaticBody2D" parent="Fence/Fence2"] collision_layer = 2 @@ -896,7 +895,7 @@ position = Vector2(-5816, 2880) rotation = 1.5708 scale = Vector2(3.25, 1) skew = 1.309 -texture = ExtResource("21_if5vh") +texture = ExtResource("25_l6ca2") [node name="EndLeft2" type="Sprite2D" parent="Fence"] texture_repeat = 2 @@ -905,7 +904,7 @@ position = Vector2(-4161, 2486) rotation = 1.5708 scale = Vector2(2.37, 1) skew = 1.309 -texture = ExtResource("21_if5vh") +texture = ExtResource("25_l6ca2") [node name="EndRight" type="Sprite2D" parent="Fence"] texture_repeat = 2 @@ -914,7 +913,7 @@ position = Vector2(15888, 2880) rotation = 1.5708 scale = Vector2(3.2, 1) skew = -1.309 -texture = ExtResource("21_if5vh") +texture = ExtResource("25_l6ca2") flip_h = true [node name="EndLeftCollider" type="StaticBody2D" parent="Fence"] @@ -954,14 +953,14 @@ shape = SubResource("RectangleShape2D_klb81") z_index = 1 y_sort_enabled = true -[node name="Yeli" parent="YSorted" instance=ExtResource("24_wtdui")] -position = Vector2(6403, 3362) +[node name="Yeli" parent="YSorted" instance=ExtResource("26_vnhck")] +position = Vector2(6385, 3356) _timelinesToPlay = PackedStringArray("yeli_quest_select") -[node name="Vesna" parent="YSorted" instance=ExtResource("1_7wfwe")] +[node name="Vesna" parent="YSorted" instance=ExtResource("27_6aw34")] z_index = 1 position = Vector2(9322, 2018) -_hoe = ExtResource("28_6b2nr") +_hoe = ExtResource("28_421o4") [node name="FarmingControls" parent="YSorted/Vesna" index="1" node_paths=PackedStringArray("_camera", "_fieldParent")] _camera = NodePath("../../../Camera2D") @@ -972,11 +971,11 @@ z_index = 1 y_sort_enabled = true material = SubResource("ShaderMaterial_2vojv") position = Vector2(7237, 3307) -texture = ExtResource("21_ualyd") +texture = ExtResource("29_plceh") offset = Vector2(0, -800) region_enabled = true region_rect = Rect2(0, 0, 1504, 1686) -script = ExtResource("32_lbnqo") +script = ExtResource("30_p7w3o") _interactionArea = NodePath("InteractionArea") [node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Well"] @@ -986,7 +985,8 @@ collision_mask = 4 position = Vector2(145.5, -224) shape = SubResource("RectangleShape2D_0sfl7") -[node name="InteractionArea" parent="YSorted/Well" instance=ExtResource("27_klb81")] +[node name="InteractionArea" parent="YSorted/Well" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("31_8uout")] +_spritesToOutline = [NodePath("..")] _id = 1 metadata/SaveID = "b8f7b7fe-e057-4974-ba12-9134722998de" @@ -994,16 +994,14 @@ metadata/SaveID = "b8f7b7fe-e057-4974-ba12-9134722998de" position = Vector2(146, -130) shape = SubResource("CircleShape2D_p6n74") -[node name="CanGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")] +[node name="CanGenericPickup" parent="YSorted" instance=ExtResource("32_cw83k")] position = Vector2(8192, 3507) metadata/SaveID = "5a823507-8107-40ce-8b32-6d0f81a3c44e" [node name="SpawnWithItem" parent="YSorted/CanGenericPickup" index="0"] -_blueprint = ExtResource("28_ipqaa") +_blueprint = ExtResource("33_71yd8") -[node name="PickupInteractionArea" parent="YSorted/CanGenericPickup" index="3" node_paths=PackedStringArray("_spritesToOutline")] -_outlineMaterial = null -_spritesToOutline = [] +[node name="PickupInteractionArea" parent="YSorted/CanGenericPickup" index="3"] metadata/SaveID = "0c006f5c-c472-4f89-908b-d8f34503ba37" [node name="CollisionShape3D" parent="YSorted/CanGenericPickup/PickupInteractionArea/Area2D" index="0"] @@ -1012,28 +1010,26 @@ shape = SubResource("CircleShape2D_2065p") [node name="Icon" parent="YSorted/CanGenericPickup" index="4"] offset = Vector2(0, -50) -[node name="RakeGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")] +[node name="RakeGenericPickup" parent="YSorted" instance=ExtResource("32_cw83k")] position = Vector2(8391, 2060) metadata/SaveID = "e13886b1-2131-4072-bc06-7d8abb19357b" [node name="SpawnWithItem" parent="YSorted/RakeGenericPickup" index="0"] -_blueprint = ExtResource("28_6b2nr") +_blueprint = ExtResource("28_421o4") -[node name="PickupInteractionArea" parent="YSorted/RakeGenericPickup" index="3" node_paths=PackedStringArray("_spritesToOutline")] -_outlineMaterial = null -_spritesToOutline = [] +[node name="PickupInteractionArea" parent="YSorted/RakeGenericPickup" index="3"] metadata/SaveID = "c148aa78-114b-4770-a040-8498483edb1d" [node name="CollisionShape3D" parent="YSorted/RakeGenericPickup/PickupInteractionArea/Area2D" index="0"] shape = SubResource("CircleShape2D_tm0yg") -[node name="SeedPickup" parent="YSorted" instance=ExtResource("25_hukxv")] +[node name="SeedPickup" parent="YSorted" instance=ExtResource("32_cw83k")] position = Vector2(9927, 2257) _finiteSupply = 3 metadata/SaveID = "e1bbe13f-0622-42b8-97f3-87a8af369dc0" [node name="SpawnWithItem" parent="YSorted/SeedPickup" index="0"] -_blueprint = ExtResource("35_64mdn") +_blueprint = ExtResource("34_a38hy") [node name="PickupInteractionArea" parent="YSorted/SeedPickup" index="3"] metadata/SaveID = "ad152c51-3631-42c1-9aa4-4df896b35d8c" @@ -1044,31 +1040,13 @@ shape = SubResource("CircleShape2D_tm0yg") [node name="Icon" parent="YSorted/SeedPickup" index="4"] scale = Vector2(1, 1) -[node name="BeetPickup" parent="YSorted" instance=ExtResource("25_hukxv")] -position = Vector2(5787, 2269) -_finiteSupply = 3 -metadata/SaveID = "e1bbe13f-0622-42b8-97f3-87a8af369dc0" - -[node name="SpawnWithItem" parent="YSorted/BeetPickup" index="0"] -_blueprint = ExtResource("36_q1g8e") - -[node name="PickupInteractionArea" parent="YSorted/BeetPickup" index="3" node_paths=PackedStringArray("_spritesToOutline")] -_spritesToOutline = [NodePath("../../SeedPickup/Icon")] -metadata/SaveID = "ad152c51-3631-42c1-9aa4-4df896b35d8c" - -[node name="CollisionShape3D" parent="YSorted/BeetPickup/PickupInteractionArea/Area2D" index="0"] -shape = SubResource("CircleShape2D_tm0yg") - -[node name="Icon" parent="YSorted/BeetPickup" index="4"] -scale = Vector2(1, 1) - -[node name="SeedPickup2" parent="YSorted" instance=ExtResource("25_hukxv")] +[node name="SeedPickup2" parent="YSorted" instance=ExtResource("32_cw83k")] position = Vector2(10705, 2257) _finiteSupply = 3 metadata/SaveID = "77972c50-63a7-461a-bc7d-6fa46333bc5c" [node name="SpawnWithItem" parent="YSorted/SeedPickup2" index="0"] -_blueprint = ExtResource("36_fv1t2") +_blueprint = ExtResource("35_ibl7m") [node name="PickupInteractionArea" parent="YSorted/SeedPickup2" index="3"] metadata/SaveID = "09e115e7-1d21-485a-be3e-b3fff9c83e78" @@ -1084,71 +1062,71 @@ position = Vector2(0, -200) [node name="right" type="Node2D" parent="YSorted/FieldParent"] -[node name="BaseField" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")] +[node name="BaseField" parent="YSorted/FieldParent/right" instance=ExtResource("36_ouwjd")] position = Vector2(8807, 3061) metadata/SaveID = "533e356b-386b-49c9-beb1-4484f2a5164f" -[node name="BaseField2" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")] +[node name="BaseField2" parent="YSorted/FieldParent/right" instance=ExtResource("36_ouwjd")] position = Vector2(9335, 3562) Payload = 1 metadata/SaveID = "79084490-9e12-4153-9ae8-6162b5348c37" -[node name="BaseField3" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")] +[node name="BaseField3" parent="YSorted/FieldParent/right" instance=ExtResource("36_ouwjd")] position = Vector2(9854, 3071) Payload = 2 metadata/SaveID = "7332aadf-2583-468b-889c-ccbad96137f8" -[node name="BaseField4" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")] +[node name="BaseField4" parent="YSorted/FieldParent/right" instance=ExtResource("36_ouwjd")] position = Vector2(10361, 3536) Payload = 3 metadata/SaveID = "493f7b1f-3d01-4d66-b668-6014ef9b3c15" -[node name="BaseField5" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")] +[node name="BaseField5" parent="YSorted/FieldParent/right" instance=ExtResource("36_ouwjd")] position = Vector2(10948, 3025) Payload = 4 metadata/SaveID = "ba9d21eb-7c31-4459-bd90-ae23e9a09eb1" -[node name="BaseField6" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")] +[node name="BaseField6" parent="YSorted/FieldParent/right" instance=ExtResource("36_ouwjd")] position = Vector2(11296, 3607) Payload = 5 metadata/SaveID = "e6a3367e-afe1-4c5d-abd9-153cc365dce0" -[node name="BaseField7" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")] +[node name="BaseField7" parent="YSorted/FieldParent/right" instance=ExtResource("36_ouwjd")] position = Vector2(11869, 3026) Payload = 6 metadata/SaveID = "08de526f-e22f-42a4-a3f9-549d2dc15b5d" -[node name="BaseField8" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")] +[node name="BaseField8" parent="YSorted/FieldParent/right" instance=ExtResource("36_ouwjd")] position = Vector2(12353, 3554) Payload = 7 metadata/SaveID = "9fd46633-8028-48e6-9176-ffe8c7a26a2e" -[node name="BaseField9" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")] +[node name="BaseField9" parent="YSorted/FieldParent/right" instance=ExtResource("36_ouwjd")] position = Vector2(12828, 2999) Payload = 8 metadata/SaveID = "82e139eb-47f4-4ce4-962f-f72d22f9fe45" -[node name="BaseField10" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")] +[node name="BaseField10" parent="YSorted/FieldParent/right" instance=ExtResource("36_ouwjd")] position = Vector2(13285, 3536) Payload = 9 metadata/SaveID = "03ff923a-614a-4fc9-8865-f5290ec16169" -[node name="BaseField11" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")] +[node name="BaseField11" parent="YSorted/FieldParent/right" instance=ExtResource("36_ouwjd")] position = Vector2(13733, 2990) Payload = 10 metadata/SaveID = "1347c031-e8c0-44f9-9d42-80084ae9bc29" -[node name="BaseField12" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")] +[node name="BaseField12" parent="YSorted/FieldParent/right" instance=ExtResource("36_ouwjd")] position = Vector2(14261, 3474) Payload = 11 metadata/SaveID = "c0b02859-bd5c-4780-8ca7-80b4234ee1d7" -[node name="BaseField13" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")] +[node name="BaseField13" parent="YSorted/FieldParent/right" instance=ExtResource("36_ouwjd")] position = Vector2(14753, 2982) Payload = 12 metadata/SaveID = "bee82b2a-a437-4d3a-b003-dac55dfd24aa" -[node name="BaseField14" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")] +[node name="BaseField14" parent="YSorted/FieldParent/right" instance=ExtResource("36_ouwjd")] position = Vector2(15201, 3519) Payload = 13 metadata/SaveID = "4750a191-6902-46d4-9b2e-964c1aa0a29c" @@ -1156,62 +1134,62 @@ metadata/SaveID = "4750a191-6902-46d4-9b2e-964c1aa0a29c" [node name="left" type="Node2D" parent="YSorted/FieldParent"] position = Vector2(-8661, -143) -[node name="BaseField" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")] +[node name="BaseField" parent="YSorted/FieldParent/left" instance=ExtResource("36_ouwjd")] position = Vector2(8807, 3061) Payload = 14 metadata/SaveID = "b44ef2e7-898a-40d0-975b-ba75d7df4601" -[node name="BaseField2" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")] +[node name="BaseField2" parent="YSorted/FieldParent/left" instance=ExtResource("36_ouwjd")] position = Vector2(9227, 3562) Payload = 15 metadata/SaveID = "5705ba02-f444-4f2b-b527-b95578132b87" -[node name="BaseField3" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")] +[node name="BaseField3" parent="YSorted/FieldParent/left" instance=ExtResource("36_ouwjd")] position = Vector2(9756, 3111) Payload = 16 metadata/SaveID = "bca9073b-0b2f-4371-a645-a37aa04f4e23" -[node name="BaseField4" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")] +[node name="BaseField4" parent="YSorted/FieldParent/left" instance=ExtResource("36_ouwjd")] position = Vector2(10322, 3536) Payload = 17 metadata/SaveID = "f636a1ef-016d-4361-9b6e-1d59262a8c04" -[node name="BaseField5" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")] +[node name="BaseField5" parent="YSorted/FieldParent/left" instance=ExtResource("36_ouwjd")] position = Vector2(10810, 3055) Payload = 18 metadata/SaveID = "d074a30d-3f52-4788-879a-4ea8c5818c32" -[node name="BaseField6" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")] +[node name="BaseField6" parent="YSorted/FieldParent/left" instance=ExtResource("36_ouwjd")] position = Vector2(11266, 3607) Payload = 19 metadata/SaveID = "8296a15c-be4a-4127-b0f7-8a330dd2a843" -[node name="BaseField7" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")] +[node name="BaseField7" parent="YSorted/FieldParent/left" instance=ExtResource("36_ouwjd")] position = Vector2(11741, 3026) Payload = 20 metadata/SaveID = "02468d9f-0120-42ff-806d-0aaa351f055c" -[node name="BaseField8" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")] +[node name="BaseField8" parent="YSorted/FieldParent/left" instance=ExtResource("36_ouwjd")] position = Vector2(12255, 3593) Payload = 21 metadata/SaveID = "803f7df5-23a8-424a-8389-08371ea80101" -[node name="BaseField9" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")] +[node name="BaseField9" parent="YSorted/FieldParent/left" instance=ExtResource("36_ouwjd")] position = Vector2(12690, 3019) Payload = 22 metadata/SaveID = "88efb617-5e57-4b16-8ceb-c45c56463690" -[node name="BaseField10" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")] +[node name="BaseField10" parent="YSorted/FieldParent/left" instance=ExtResource("36_ouwjd")] position = Vector2(13216, 3556) Payload = 23 metadata/SaveID = "ca6c1e3d-2c4e-4977-a89e-55d265f65faf" -[node name="BaseField11" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")] +[node name="BaseField11" parent="YSorted/FieldParent/left" instance=ExtResource("36_ouwjd")] position = Vector2(13684, 3000) Payload = 24 metadata/SaveID = "262fbec5-597d-432e-8dd0-50d53fd51b59" -[node name="BaseField12" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")] +[node name="BaseField12" parent="YSorted/FieldParent/left" instance=ExtResource("36_ouwjd")] position = Vector2(14143, 3523) Payload = 25 metadata/SaveID = "05389ea3-d19b-42fc-8bf0-b0755437ec10" @@ -1227,7 +1205,7 @@ y_sort_enabled = true material = SubResource("ShaderMaterial_lhtpe") position = Vector2(5986, 1718.25) scale = Vector2(4.5, 3.725) -texture = ExtResource("36_e5b7x") +texture = ExtResource("37_fyuxq") [node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Farm visuals/Static/House Mockup"] collision_layer = 2 @@ -1237,16 +1215,17 @@ collision_mask = 6 position = Vector2(-252.56, 231.32) polygon = PackedVector2Array(247.227, 43.5123, 44.7822, 43.5123, -87.2178, 45.123, -104.329, -55.2797, -154.107, -73.5347, -160.107, -380.38, -175.44, -400.783, -63.44, -512.461, 97.8934, -541.991, 261.671, -599.172, 374.782, -526.421, 502.338, -526.421, 637.893, -396.488, 598.56, -360.783, 596.338, -58.2327, 528.782, -58.2327, 501.449, 45.9283) -[node name="EnterHouseInteraction" parent="YSorted/Farm visuals/Static" instance=ExtResource("27_klb81")] +[node name="EnterHouseInteraction" parent="YSorted/Farm visuals/Static" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("31_8uout")] position = Vector2(5834, 2354) scale = Vector2(2.425, 2.425) +_spritesToOutline = [NodePath("DoorSprite")] _id = 0 metadata/SaveID = "5a93071f-c1ab-4b4b-b74e-a6324d44ddf8" [node name="DoorSprite" type="Sprite2D" parent="YSorted/Farm visuals/Static/EnterHouseInteraction"] position = Vector2(0.412364, -33.1959) scale = Vector2(1.8649, 1.54554) -texture = ExtResource("39_lbnqo") +texture = ExtResource("38_vmji2") [node name="greenery" type="Node2D" parent="YSorted/Farm visuals/Static"] @@ -1257,7 +1236,7 @@ modulate = Color(1, 0.86, 0.86, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(4313, 2633) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1266,7 +1245,7 @@ region_rect = Rect2(130, 0, 201, 278) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(4310, 3636) scale = Vector2(-2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1277,7 +1256,7 @@ z_index = 2 material = SubResource("ShaderMaterial_bcdgk") position = Vector2(2612, 4022) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1287,7 +1266,7 @@ modulate = Color(1, 0.86, 0.86, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(2761, 2280) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1296,7 +1275,7 @@ region_rect = Rect2(1368, 673, 186, 136) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(3006, 2280) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1306,7 +1285,7 @@ modulate = Color(0.8428, 0.8771, 0.98, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(3117, 2280) scale = Vector2(-1.86739, 2.34145) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1315,7 +1294,7 @@ region_rect = Rect2(1368, 673, 186, 136) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(4590, 2971) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -196) region_enabled = true region_rect = Rect2(1699, 76, 280, 230) @@ -1325,7 +1304,7 @@ modulate = Color(0.8428, 0.8771, 0.98, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(7300, 2912) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(0, 604, 248, 228) @@ -1334,7 +1313,7 @@ region_rect = Rect2(0, 604, 248, 228) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(7757, 2032) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1837, 651, 139, 180) @@ -1343,7 +1322,7 @@ region_rect = Rect2(1837, 651, 139, 180) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(8891, 2100) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1464, 419, 144, 115) @@ -1353,7 +1332,7 @@ modulate = Color(1, 0.86, 0.86, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(9170, 2052) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1699, 76, 280, 230) @@ -1363,7 +1342,7 @@ modulate = Color(0.8428, 0.8771, 0.98, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(8145, 4141) scale = Vector2(-2.82886, 2.51195) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1699, 76, 280, 230) @@ -1373,7 +1352,7 @@ z_index = 2 material = SubResource("ShaderMaterial_bcdgk") position = Vector2(8925, 4194) scale = Vector2(-5.54387, 3.80466) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1384,7 +1363,7 @@ z_index = 2 material = SubResource("ShaderMaterial_bcdgk") position = Vector2(7757, 4194) scale = Vector2(3.21806, 3.18583) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1394,7 +1373,7 @@ modulate = Color(0.8428, 0.8771, 0.98, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(3803, 2142) scale = Vector2(-2.40318, 3.59175) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1403,7 +1382,7 @@ region_rect = Rect2(130, 0, 201, 278) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(9556, 2071) scale = Vector2(-2.40318, 3.59175) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1412,7 +1391,7 @@ region_rect = Rect2(130, 0, 201, 278) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(9887, 2216) scale = Vector2(-1.87764, 2.59175) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1422,7 +1401,7 @@ modulate = Color(0.8428, 0.8771, 0.98, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(10074, 2216) scale = Vector2(1.53273, 1.82378) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1431,7 +1410,7 @@ region_rect = Rect2(1368, 673, 186, 136) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(10217, 2026) scale = Vector2(-1.93815, 1.5875) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1837, 651, 139, 180) @@ -1440,7 +1419,7 @@ region_rect = Rect2(1837, 651, 139, 180) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(10721, 2026) scale = Vector2(-1.93815, 1.5875) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1837, 651, 139, 180) @@ -1450,7 +1429,7 @@ modulate = Color(0.8428, 0.8771, 0.98, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(13292, 2026) scale = Vector2(-1.93815, 1.5875) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1837, 651, 139, 180) @@ -1459,7 +1438,7 @@ region_rect = Rect2(1837, 651, 139, 180) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(12369, 2026) scale = Vector2(-1.93815, 1.5875) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1469,7 +1448,7 @@ modulate = Color(1, 0.86, 0.86, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(13458, 2026) scale = Vector2(1.41694, 1.75208) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1478,7 +1457,7 @@ region_rect = Rect2(1368, 673, 186, 136) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(13687, 1938) scale = Vector2(1.40272, 1.38546) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(0, 604, 248, 228) @@ -1489,7 +1468,7 @@ y_sort_enabled = true material = SubResource("ShaderMaterial_bcdgk") position = Vector2(15022, 3301) scale = Vector2(-1.93815, 1.5875) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1837, 651, 139, 180) @@ -1499,7 +1478,7 @@ modulate = Color(1, 0.86, 0.86, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(7053, 2891) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -50) region_enabled = true region_rect = Rect2(1464, 419, 144, 115) @@ -1510,7 +1489,7 @@ y_sort_enabled = true material = SubResource("ShaderMaterial_618my") position = Vector2(7197, 2834) scale = Vector2(0.373695, 0.388829) -texture = ExtResource("38_2rjny") +texture = ExtResource("40_a3gjv") offset = Vector2(0, -800) region_enabled = true region_rect = Rect2(0, 0, 1440, 1576) @@ -1521,7 +1500,7 @@ y_sort_enabled = true material = SubResource("ShaderMaterial_618my") position = Vector2(6909, 2932) scale = Vector2(0.373695, 0.388829) -texture = ExtResource("38_2rjny") +texture = ExtResource("40_a3gjv") offset = Vector2(0, -800) region_enabled = true region_rect = Rect2(1659, 479, 809, 1097) @@ -1533,7 +1512,7 @@ position = Vector2(13188, 30) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(4697, 2112) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1542,7 +1521,7 @@ region_rect = Rect2(130, 0, 201, 278) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(3008, 3136) scale = Vector2(-2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1551,7 +1530,7 @@ region_rect = Rect2(130, 0, 201, 278) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(5757, 4296) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1560,7 +1539,7 @@ region_rect = Rect2(130, 0, 201, 278) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(5051, 2217) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1570,7 +1549,7 @@ modulate = Color(0.8428, 0.8771, 0.98, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(4008, 2250) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1579,7 +1558,7 @@ region_rect = Rect2(1368, 673, 186, 136) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(5325, 2263) scale = Vector2(-1.86739, 2.34145) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -237) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1589,7 +1568,7 @@ modulate = Color(0.8428, 0.8771, 0.98, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(1909, 3074) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -196) region_enabled = true region_rect = Rect2(1699, 76, 280, 230) @@ -1598,7 +1577,7 @@ region_rect = Rect2(1699, 76, 280, 230) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(7361, 2026) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(0, 604, 248, 228) @@ -1607,7 +1586,7 @@ region_rect = Rect2(0, 604, 248, 228) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(7757, 2032) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1837, 651, 139, 180) @@ -1616,7 +1595,7 @@ region_rect = Rect2(1837, 651, 139, 180) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(8981, 2112) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1464, 419, 144, 115) @@ -1625,7 +1604,7 @@ region_rect = Rect2(1464, 419, 144, 115) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(9208, 2026) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1699, 76, 280, 230) @@ -1635,7 +1614,7 @@ z_index = 2 material = SubResource("ShaderMaterial_bcdgk") position = Vector2(8145, 4141) scale = Vector2(-2.82886, 2.51195) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1699, 76, 280, 230) @@ -1645,7 +1624,7 @@ z_index = 2 material = SubResource("ShaderMaterial_bcdgk") position = Vector2(8925, 4194) scale = Vector2(-5.54387, 3.80466) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1656,7 +1635,7 @@ z_index = 2 material = SubResource("ShaderMaterial_bcdgk") position = Vector2(7763, 4164) scale = Vector2(3.21806, 3.18583) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1666,7 +1645,7 @@ modulate = Color(0.8428, 0.8771, 0.98, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(3803, 2142) scale = Vector2(-2.40318, 3.59175) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1675,7 +1654,7 @@ region_rect = Rect2(130, 0, 201, 278) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(9556, 2071) scale = Vector2(-2.40318, 3.59175) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(130, 0, 201, 278) @@ -1684,7 +1663,7 @@ region_rect = Rect2(130, 0, 201, 278) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(9887, 2216) scale = Vector2(-1.87764, 2.59175) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1693,7 +1672,7 @@ region_rect = Rect2(1368, 673, 186, 136) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(10074, 2216) scale = Vector2(1.53273, 1.82378) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1702,7 +1681,7 @@ region_rect = Rect2(1368, 673, 186, 136) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(10217, 2026) scale = Vector2(-1.93815, 1.5875) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1837, 651, 139, 180) @@ -1711,7 +1690,7 @@ region_rect = Rect2(1837, 651, 139, 180) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(10721, 2026) scale = Vector2(-1.93815, 1.5875) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1837, 651, 139, 180) @@ -1721,7 +1700,7 @@ modulate = Color(0.8428, 0.8771, 0.98, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(10802, 2596) scale = Vector2(-1.93815, 1.5875) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1837, 651, 139, 180) @@ -1730,7 +1709,7 @@ region_rect = Rect2(1837, 651, 139, 180) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(10802, 2779) scale = Vector2(-1.93815, 1.5875) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1739,7 +1718,7 @@ region_rect = Rect2(1368, 673, 186, 136) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(10963, 3651) scale = Vector2(1.41694, 1.75208) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1368, 673, 186, 136) @@ -1749,7 +1728,7 @@ modulate = Color(0.8428, 0.8771, 0.98, 1) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(10831, 3016) scale = Vector2(1.40272, 1.38546) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(0, 604, 248, 228) @@ -1760,7 +1739,7 @@ y_sort_enabled = true material = SubResource("ShaderMaterial_bcdgk") position = Vector2(10963, 3820) scale = Vector2(-1.93815, 1.5875) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1837, 651, 139, 180) @@ -1771,7 +1750,7 @@ y_sort_enabled = true material = SubResource("ShaderMaterial_bcdgk") position = Vector2(10831, 2250) scale = Vector2(-1.93815, 1.5875) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1464, 419, 144, 115) @@ -1780,7 +1759,7 @@ region_rect = Rect2(1464, 419, 144, 115) material = SubResource("ShaderMaterial_bcdgk") position = Vector2(6758, 1838) scale = Vector2(2, 2) -texture = ExtResource("14_mrwmr") +texture = ExtResource("19_hr4d5") offset = Vector2(0, -50) region_enabled = true region_rect = Rect2(1464, 419, 144, 115) @@ -1791,7 +1770,7 @@ y_sort_enabled = true material = SubResource("ShaderMaterial_618my") position = Vector2(5146, 1935) scale = Vector2(0.373695, 0.388829) -texture = ExtResource("38_2rjny") +texture = ExtResource("40_a3gjv") offset = Vector2(0, -800) region_enabled = true region_rect = Rect2(0, 0, 1440, 1576) @@ -1803,7 +1782,7 @@ modulate = Color(0.856076, 0.855033, 0.937369, 1) z_index = -5 position = Vector2(2879, 1946) scale = Vector2(5.77602, 3.87779) -texture = ExtResource("41_apj51") +texture = ExtResource("41_cl67n") region_enabled = true region_rect = Rect2(42, 16, 176, 163) @@ -1812,7 +1791,7 @@ modulate = Color(0.954868, 0.882599, 0.798501, 1) z_index = -5 position = Vector2(3739, 2056) scale = Vector2(5.77602, 3.87779) -texture = ExtResource("41_apj51") +texture = ExtResource("41_cl67n") region_enabled = true region_rect = Rect2(332, 194, 179, 154) @@ -1820,7 +1799,7 @@ region_rect = Rect2(332, 194, 179, 154) z_index = -5 position = Vector2(3016, 2562) scale = Vector2(5.77602, 3.87779) -texture = ExtResource("41_apj51") +texture = ExtResource("41_cl67n") region_enabled = true region_rect = Rect2(22, 226, 197, 145) @@ -1828,7 +1807,7 @@ region_rect = Rect2(22, 226, 197, 145) z_index = -5 position = Vector2(3608, 2790.07) scale = Vector2(5.58376, 4.48372) -texture = ExtResource("41_apj51") +texture = ExtResource("41_cl67n") region_enabled = true region_rect = Rect2(22, 226, 197, 145) @@ -1837,7 +1816,7 @@ modulate = Color(0.856076, 0.855033, 0.937369, 1) z_index = -5 position = Vector2(3058, 3301) scale = Vector2(5.58376, 4.48372) -texture = ExtResource("41_apj51") +texture = ExtResource("41_cl67n") region_enabled = true region_rect = Rect2(305, 25, 186, 153) @@ -1846,7 +1825,7 @@ modulate = Color(0.78, 0.78, 0.78, 1) z_index = -5 position = Vector2(4804, 3178) scale = Vector2(5.58376, 2.56212) -texture = ExtResource("41_apj51") +texture = ExtResource("41_cl67n") region_enabled = true region_rect = Rect2(305, 25, 186, 153) @@ -1854,7 +1833,7 @@ region_rect = Rect2(305, 25, 186, 153) z_index = -5 position = Vector2(4310, 3499) scale = Vector2(5.58376, 4.48372) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(364, 32, 148, 153) @@ -1862,7 +1841,7 @@ region_rect = Rect2(364, 32, 148, 153) z_index = -5 position = Vector2(5187.9, 3245) scale = Vector2(7.28513, 4.2484) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(364, 32, 148, 153) @@ -1870,7 +1849,7 @@ region_rect = Rect2(364, 32, 148, 153) z_index = -5 position = Vector2(5510, 3499) scale = Vector2(7.28513, 6.16997) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(364, 32, 148, 153) @@ -1879,7 +1858,7 @@ modulate = Color(0.78, 0.78, 0.78, 1) z_index = -5 position = Vector2(6049, 3233.5) scale = Vector2(7.28513, 4.43792) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(364, 32, 148, 153) @@ -1888,7 +1867,7 @@ modulate = Color(0.954868, 0.882599, 0.798501, 1) z_index = -5 position = Vector2(6417, 3499) scale = Vector2(7.28513, 6.16997) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(29, 204, 219, 159) @@ -1896,7 +1875,7 @@ region_rect = Rect2(29, 204, 219, 159) z_index = -5 position = Vector2(7052, 3274.76) scale = Vector2(7.28513, 4.46234) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(29, 204, 219, 159) @@ -1905,7 +1884,7 @@ modulate = Color(0.856076, 0.855033, 0.937369, 1) z_index = -5 position = Vector2(7473, 3724) scale = Vector2(7.28513, 6.16997) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(29, 204, 219, 159) @@ -1914,7 +1893,7 @@ z_index = -5 position = Vector2(7662, 2562) rotation = 1.57079 scale = Vector2(7.28513, 6.16997) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(29, 204, 219, 159) @@ -1922,7 +1901,7 @@ region_rect = Rect2(29, 204, 219, 159) position = Vector2(7757, 3423) rotation = 1.57079 scale = Vector2(7.28513, 6.16997) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(29, 204, 219, 159) @@ -1931,7 +1910,7 @@ z_index = -5 position = Vector2(3702, 3398) rotation = 2.09439 scale = Vector2(5.58376, 4.48372) -texture = ExtResource("41_apj51") +texture = ExtResource("41_cl67n") region_enabled = true region_rect = Rect2(305, 25, 186, 153) @@ -1940,7 +1919,7 @@ modulate = Color(0.78, 0.78, 0.78, 1) z_index = -5 position = Vector2(8846.24, 1965) scale = Vector2(8.56132, 4.49734) -texture = ExtResource("41_apj51") +texture = ExtResource("41_cl67n") region_enabled = true region_rect = Rect2(332, 194, 179, 154) @@ -1949,7 +1928,7 @@ modulate = Color(0.954868, 0.882599, 0.798501, 1) z_index = -5 position = Vector2(18165, 1966) scale = Vector2(5.77602, 3.87779) -texture = ExtResource("42_loeum") +texture = ExtResource("43_hh1cx") region_enabled = true region_rect = Rect2(7, 4, 256, 220) @@ -1958,7 +1937,7 @@ modulate = Color(0.856076, 0.855033, 0.937369, 1) z_index = -5 position = Vector2(19442, 1960) scale = Vector2(5.77602, 3.87779) -texture = ExtResource("42_loeum") +texture = ExtResource("43_hh1cx") region_enabled = true region_rect = Rect2(7, 59, 257, 157) @@ -1966,7 +1945,7 @@ region_rect = Rect2(7, 59, 257, 157) z_index = -5 position = Vector2(16670, 1998.41) scale = Vector2(9.30275, 4.60296) -texture = ExtResource("43_i36hd") +texture = ExtResource("44_yuh84") region_enabled = true region_rect = Rect2(147, 255, 218, 128) @@ -1974,7 +1953,7 @@ region_rect = Rect2(147, 255, 218, 128) z_index = -5 position = Vector2(15759.5, 2214.79) scale = Vector2(6.8578, 6.10617) -texture = ExtResource("43_i36hd") +texture = ExtResource("44_yuh84") region_enabled = true region_rect = Rect2(147, 255, 218, 128) @@ -1982,7 +1961,7 @@ region_rect = Rect2(147, 255, 218, 128) z_index = -5 position = Vector2(15980, 2942) scale = Vector2(6.8578, 6.10617) -texture = ExtResource("43_i36hd") +texture = ExtResource("44_yuh84") region_enabled = true region_rect = Rect2(307, 48, 183, 193) @@ -1990,7 +1969,7 @@ region_rect = Rect2(307, 48, 183, 193) z_index = -5 position = Vector2(14537, 2465) scale = Vector2(5.22018, 6.29687) -texture = ExtResource("43_i36hd") +texture = ExtResource("44_yuh84") region_enabled = true region_rect = Rect2(147, 255, 218, 128) @@ -1999,7 +1978,7 @@ modulate = Color(0.78, 0.78, 0.78, 1) z_index = -5 position = Vector2(14537, 3031) scale = Vector2(5.22018, 6.29687) -texture = ExtResource("43_i36hd") +texture = ExtResource("44_yuh84") region_enabled = true region_rect = Rect2(147, 255, 218, 128) @@ -2008,7 +1987,7 @@ modulate = Color(0.856076, 0.855033, 0.937369, 1) z_index = -5 position = Vector2(14537, 3570) scale = Vector2(5.1948, 5.15362) -texture = ExtResource("43_i36hd") +texture = ExtResource("44_yuh84") region_enabled = true region_rect = Rect2(307, 48, 183, 193) @@ -2016,7 +1995,7 @@ region_rect = Rect2(307, 48, 183, 193) z_index = -5 position = Vector2(15217, 3630) scale = Vector2(5.1948, 5.15362) -texture = ExtResource("43_i36hd") +texture = ExtResource("44_yuh84") region_enabled = true region_rect = Rect2(7, 4, 267, 239) @@ -2025,7 +2004,7 @@ z_index = -5 position = Vector2(23646, 2340) rotation = 1.57079 scale = Vector2(5.77602, 3.87779) -texture = ExtResource("43_i36hd") +texture = ExtResource("44_yuh84") region_enabled = true region_rect = Rect2(7, 4, 267, 239) @@ -2034,7 +2013,7 @@ z_index = -5 position = Vector2(23915, 3644) rotation = 3.40339 scale = Vector2(5.52625, 5.81879) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(317, 219, 185, 159) @@ -2042,7 +2021,7 @@ region_rect = Rect2(317, 219, 185, 159) z_index = -5 position = Vector2(20549, 1942) scale = Vector2(5.77602, 3.87779) -texture = ExtResource("43_i36hd") +texture = ExtResource("44_yuh84") region_enabled = true region_rect = Rect2(147, 255, 218, 128) @@ -2051,7 +2030,7 @@ modulate = Color(0.954868, 0.882599, 0.798501, 1) z_index = -5 position = Vector2(21558, 1984) scale = Vector2(5.77602, 6.94382) -texture = ExtResource("45_lwk6t") +texture = ExtResource("45_admq8") region_enabled = true region_rect = Rect2(21, 222, 491, 89) @@ -2060,7 +2039,7 @@ modulate = Color(0.856076, 0.855033, 0.937369, 1) z_index = -5 position = Vector2(22676, 1938) scale = Vector2(5.77602, 3.87779) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(29, 204, 219, 159) @@ -2068,7 +2047,7 @@ region_rect = Rect2(29, 204, 219, 159) z_index = -5 position = Vector2(15381, 3152) scale = Vector2(5.77602, 3.87779) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(16, 17, 290, 183) @@ -2077,7 +2056,7 @@ modulate = Color(0.78, 0.78, 0.78, 1) z_index = -5 position = Vector2(13784.1, 1946) scale = Vector2(7.39612, 3.87779) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(317, 219, 185, 159) @@ -2085,7 +2064,7 @@ region_rect = Rect2(317, 219, 185, 159) z_index = -5 position = Vector2(14417, 2026) scale = Vector2(5.5153, 4.20665) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(16, 17, 290, 183) @@ -2093,7 +2072,7 @@ region_rect = Rect2(16, 17, 290, 183) z_index = -5 position = Vector2(15774, 3374) scale = Vector2(4.53474, 4.07413) -texture = ExtResource("42_loeum") +texture = ExtResource("43_hh1cx") region_enabled = true region_rect = Rect2(22, 72, 489, 274) @@ -2102,7 +2081,7 @@ modulate = Color(0.856076, 0.855033, 0.937369, 1) z_index = -5 position = Vector2(12847, 1946) scale = Vector2(5.91724, 3.87779) -texture = ExtResource("44_uxa2m") +texture = ExtResource("42_fay77") region_enabled = true region_rect = Rect2(29, 204, 219, 159) @@ -2110,7 +2089,7 @@ region_rect = Rect2(29, 204, 219, 159) z_index = -5 position = Vector2(10546.9, 2035.5) scale = Vector2(5.38464, 7.05479) -texture = ExtResource("45_lwk6t") +texture = ExtResource("45_admq8") region_enabled = true region_rect = Rect2(32, 32, 445, 73) @@ -2118,7 +2097,7 @@ region_rect = Rect2(32, 32, 445, 73) z_index = -5 position = Vector2(10321, 1770) scale = Vector2(5.38464, 7.05479) -texture = ExtResource("45_lwk6t") +texture = ExtResource("45_admq8") region_enabled = true region_rect = Rect2(21, 222, 491, 89) @@ -2127,7 +2106,7 @@ modulate = Color(0.954868, 0.882599, 0.798501, 1) z_index = -5 position = Vector2(7291, 2809) scale = Vector2(3, 3) -texture = ExtResource("46_ycj14") +texture = ExtResource("46_t1riv") region_enabled = true region_rect = Rect2(14, 38, 295, 165) @@ -2136,7 +2115,7 @@ modulate = Color(0.856076, 0.855033, 0.937369, 1) z_index = -5 position = Vector2(7798.25, 1896.75) scale = Vector2(3.76102, 3.55455) -texture = ExtResource("42_loeum") +texture = ExtResource("43_hh1cx") region_enabled = true region_rect = Rect2(14, 38, 295, 165) @@ -2145,7 +2124,7 @@ z_index = -5 position = Vector2(4310, 2676) rotation = -1.57079 scale = Vector2(3, 4.88) -texture = ExtResource("45_lwk6t") +texture = ExtResource("45_admq8") region_enabled = true region_rect = Rect2(21, 222, 491, 89) @@ -2156,7 +2135,7 @@ z_index = -6 material = SubResource("ShaderMaterial_apj51") position = Vector2(5864, 2051) scale = Vector2(4.5, 3) -texture = ExtResource("47_loeum") +texture = ExtResource("47_gvk0h") [node name="fieldBorder" type="Node2D" parent="YSorted/Farm visuals/Static"] @@ -2166,7 +2145,7 @@ material = SubResource("ShaderMaterial_loeum") position = Vector2(11132, 2252) rotation = 1.5708 scale = Vector2(0.1, 8.7) -texture = ExtResource("21_if5vh") +texture = ExtResource("25_l6ca2") [node name="leftSideBottom" type="Sprite2D" parent="YSorted/Farm visuals/Static/fieldBorder"] z_index = -3 @@ -2174,7 +2153,7 @@ material = SubResource("ShaderMaterial_loeum") position = Vector2(11159, 3443) rotation = 1.5708 scale = Vector2(0.1, 8.7) -texture = ExtResource("21_if5vh") +texture = ExtResource("25_l6ca2") [node name="rightSideTop" type="Sprite2D" parent="YSorted/Farm visuals/Static/fieldBorder"] z_index = -3 @@ -2182,7 +2161,7 @@ material = SubResource("ShaderMaterial_i36hd") position = Vector2(20164, 2282) rotation = 1.5708 scale = Vector2(0.1, 10.8) -texture = ExtResource("21_if5vh") +texture = ExtResource("25_l6ca2") [node name="rightSideBottom" type="Sprite2D" parent="YSorted/Farm visuals/Static/fieldBorder"] z_index = -3 @@ -2190,7 +2169,7 @@ material = SubResource("ShaderMaterial_i36hd") position = Vector2(20124, 3453) rotation = 1.5708 scale = Vector2(0.1, 10.8) -texture = ExtResource("21_if5vh") +texture = ExtResource("25_l6ca2") [node name="Blocker" type="Node2D" parent="YSorted"] @@ -2199,7 +2178,7 @@ material = SubResource("ShaderMaterial_lwk6t") position = Vector2(3788, 1563) rotation = -0.0963081 scale = Vector2(0.903, 0.96) -texture = ExtResource("49_i36hd") +texture = ExtResource("48_d2s14") [node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Blocker/Fence Door2"] collision_layer = 2 @@ -2209,7 +2188,7 @@ collision_mask = 4 position = Vector2(-106.663, 182.891) shape = SubResource("RectangleShape2D_ycj14") -[node name="InteractionArea" parent="YSorted/Blocker" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("27_klb81")] +[node name="InteractionArea" parent="YSorted/Blocker" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("31_8uout")] position = Vector2(11234, 1850) _spritesToOutline = [NodePath("Fence Door")] _id = 1 @@ -2223,7 +2202,7 @@ material = SubResource("ShaderMaterial_uxa2m") position = Vector2(1, -271) rotation = -3.13727 scale = Vector2(0.905, -0.925) -texture = ExtResource("49_i36hd") +texture = ExtResource("48_d2s14") [node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Blocker/InteractionArea/Fence Door"] collision_layer = 2 @@ -2236,24 +2215,24 @@ shape = SubResource("RectangleShape2D_2vojv") [node name="ducks" type="Node2D" parent="YSorted"] z_index = 1 y_sort_enabled = true -script = ExtResource("49_uxa2m") +script = ExtResource("49_p0fhe") _goal = 6 -[node name="Duck2" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")] +[node name="Duck2" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("50_6330x")] z_index = 0 y_sort_enabled = false position = Vector2(4374, 2652) _penTarget = NodePath("../../pen/penSlot1") metadata/SaveID = "348bd0e3-1da5-4f10-84ab-b0444e99d541" -[node name="Duck3" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")] +[node name="Duck3" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("50_6330x")] z_index = 0 y_sort_enabled = false position = Vector2(9259, 3194) _penTarget = NodePath("../../pen/penSlot2") metadata/SaveID = "94c8a740-2745-4162-91e7-66f36b8681e0" -[node name="Duck4" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")] +[node name="Duck4" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("50_6330x")] z_index = 0 y_sort_enabled = false position = Vector2(13441, 3612) @@ -2262,7 +2241,7 @@ scale = Vector2(1, -1) _penTarget = NodePath("../../pen/penSlot3") metadata/SaveID = "b3508312-eb61-4520-8349-e49e0e5328d3" -[node name="Duck5" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")] +[node name="Duck5" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("50_6330x")] z_index = 0 y_sort_enabled = false position = Vector2(15330, 2487) @@ -2271,14 +2250,14 @@ scale = Vector2(1, -1) _penTarget = NodePath("../../pen/penSlot4") metadata/SaveID = "b73895c2-6366-4c7e-b5e2-23f3dc9485f2" -[node name="Duck6" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")] +[node name="Duck6" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("50_6330x")] z_index = 0 y_sort_enabled = false position = Vector2(232, 2862) _penTarget = NodePath("../../pen/penSlot5") metadata/SaveID = "a963b9d2-862f-458b-be2c-9a54ec1bde90" -[node name="Duck7" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")] +[node name="Duck7" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("50_6330x")] z_index = 0 y_sort_enabled = false position = Vector2(2409, 3958) @@ -2288,12 +2267,12 @@ _penTarget = NodePath("../../pen/penSlot6") metadata/SaveID = "748aff78-10eb-4a4e-bb6d-a8ee25d472d1" [node name="DialogicToggle" type="Node2D" parent="YSorted/ducks"] -script = ExtResource("51_uxa2m") +script = ExtResource("51_s8nrv") _timelinesToPlay = PackedStringArray("quest1_ducks_end") _startOnReady = false [node name="dialogic starter" type="Node2D" parent="YSorted/ducks"] -script = ExtResource("52_lwk6t") +script = ExtResource("52_tsaxb") [node name="pen" type="Node2D" parent="YSorted"] @@ -2320,87 +2299,76 @@ z_index = 1 y_sort_enabled = true position = Vector2(-569, -42) -[node name="trashObject" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +[node name="trashObject" parent="YSorted/trash" instance=ExtResource("53_j4nx2")] z_index = 0 y_sort_enabled = false position = Vector2(1269, 3170) +metadata/SaveID = "f6bf35b0-a145-4a8d-a946-38dc6ee53507" -[node name="trashObject2" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +[node name="trashObject2" parent="YSorted/trash" instance=ExtResource("53_j4nx2")] z_index = 0 y_sort_enabled = false position = Vector2(3183, 2369) offset = Vector2(1, -50) region_rect = Rect2(207, 1184, 149, 142) +metadata/SaveID = "1b175e9c-f4a6-4b30-b024-95ab1a6c4ec7" -[node name="InteractionArea" parent="YSorted/trash/trashObject2" index="0" node_paths=PackedStringArray("_spritesToOutline")] -position = Vector2(-9, -46) -_spritesToOutline = [] -metadata/SaveID = "549bbcf4-ea57-4b8f-80b1-b13ca648559b" - -[node name="trashObject3" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +[node name="trashObject3" parent="YSorted/trash" instance=ExtResource("53_j4nx2")] z_index = 0 y_sort_enabled = false position = Vector2(4724, 3519) offset = Vector2(1, -50) region_rect = Rect2(400, 1053, 163, 141) +metadata/SaveID = "28770149-73d5-45bd-b760-6e84a07c59b8" -[node name="InteractionArea" parent="YSorted/trash/trashObject3" index="0" node_paths=PackedStringArray("_spritesToOutline")] -position = Vector2(-13, -53) -_spritesToOutline = [] -metadata/SaveID = "29874314-50c1-4a21-9494-18f936d6e097" - -[node name="trashObject4" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +[node name="trashObject4" parent="YSorted/trash" instance=ExtResource("53_j4nx2")] z_index = 0 y_sort_enabled = false position = Vector2(5385, 3391) offset = Vector2(1, -50) region_rect = Rect2(1048, 1092, 348, 106) +metadata/SaveID = "1cbdfeb5-68d4-4489-896e-7879e7baa26f" -[node name="InteractionArea" parent="YSorted/trash/trashObject4" index="0" node_paths=PackedStringArray("_spritesToOutline")] -position = Vector2(0, -59) -_spritesToOutline = [] -metadata/SaveID = "7ccaa831-5526-40ed-8ca3-31ba2ad929a6" - -[node name="trashObject5" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +[node name="trashObject5" parent="YSorted/trash" instance=ExtResource("53_j4nx2")] z_index = 0 y_sort_enabled = false position = Vector2(8051, 2541) offset = Vector2(1, -50) region_rect = Rect2(531, 1207, 176, 167) +metadata/SaveID = "b6bdce90-0b79-45c8-a2d1-3078a58d3314" -[node name="trashObject6" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +[node name="trashObject6" parent="YSorted/trash" instance=ExtResource("53_j4nx2")] z_index = 0 y_sort_enabled = false position = Vector2(9629, 3312) offset = Vector2(1, -50) region_rect = Rect2(207, 1184, 149, 142) +metadata/SaveID = "391ab18e-e9a5-4a52-bf3b-c30b7dde60f3" -[node name="trashObject7" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +[node name="trashObject7" parent="YSorted/trash" instance=ExtResource("53_j4nx2")] z_index = 0 y_sort_enabled = false position = Vector2(12050, 3391) +metadata/SaveID = "e4a2eaa4-6f91-4d12-ae2e-161442a0c71e" -[node name="trashObject8" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +[node name="trashObject8" parent="YSorted/trash" instance=ExtResource("53_j4nx2")] z_index = 0 y_sort_enabled = false position = Vector2(14589, 2505) rotation = 1.77025 region_rect = Rect2(629, 81, 227, 829) +metadata/SaveID = "cbd5b6e3-a2da-4d3f-a6d0-209ec433755b" -[node name="trashObject9" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +[node name="trashObject9" parent="YSorted/trash" instance=ExtResource("53_j4nx2")] z_index = 0 y_sort_enabled = false position = Vector2(15322, 3472) rotation = 1.77025 offset = Vector2(0, 0) region_rect = Rect2(1048, 1092, 348, 106) +metadata/SaveID = "9db3ecb6-5392-4545-bb06-f701579460ea" -[node name="InteractionArea" parent="YSorted/trash/trashObject9" index="0" node_paths=PackedStringArray("_spritesToOutline")] -position = Vector2(22.40873, 25.05658) -_spritesToOutline = [] -metadata/SaveID = "7bf227d6-3844-41e9-a9cd-524052aced3b" - -[node name="CanvasLayer" parent="." instance=ExtResource("32_2nee2")] +[node name="CanvasLayer" parent="." instance=ExtResource("54_233a1")] [node name="Inventory" parent="CanvasLayer" index="1"] size_flags_horizontal = 6 @@ -2434,34 +2402,34 @@ max_distance = 1000000.0 bus = &"Music" area_mask = 33 playback_type = 1 -script = ExtResource("42_1nkjm") +script = ExtResource("56_njkty") [node name="Background Music loop" type="AudioStreamPlayer2D" parent="Audio"] position = Vector2(4002, 2030) -stream = ExtResource("37_8ey8m") +stream = ExtResource("57_o8j03") max_distance = 1000000.0 bus = &"Music" area_mask = 33 playback_type = 1 -script = ExtResource("42_1nkjm") +script = ExtResource("56_njkty") [node name="Background Music loop2" type="AudioStreamPlayer2D" parent="Audio"] position = Vector2(4002, 2030) -stream = ExtResource("37_8ey8m") +stream = ExtResource("57_o8j03") max_distance = 1000000.0 bus = &"Music" area_mask = 33 playback_type = 1 -script = ExtResource("42_1nkjm") +script = ExtResource("56_njkty") [node name="Background Music loop2" type="AudioStreamPlayer2D" parent="Audio/Background Music loop2"] position = Vector2(4002, 2030) -stream = ExtResource("37_8ey8m") +stream = ExtResource("57_o8j03") max_distance = 1000000.0 bus = &"Music" area_mask = 33 playback_type = 1 -script = ExtResource("42_1nkjm") +script = ExtResource("56_njkty") [node name="SFX" type="Node" parent="Audio"] @@ -2469,64 +2437,63 @@ script = ExtResource("42_1nkjm") stream = SubResource("AudioStreamRandomizer_ceriq") max_distance = 20000000.0 playback_type = 2 -script = ExtResource("40_w3jkj") +script = ExtResource("60_2ir8f") [node name="Watering SFX" type="AudioStreamPlayer2D" parent="Audio/SFX"] stream = SubResource("AudioStreamRandomizer_p4qqi") max_distance = 20000000.0 playback_type = 2 -script = ExtResource("40_w3jkj") +script = ExtResource("60_2ir8f") [node name="FillWater SFX2" type="AudioStreamPlayer2D" parent="Audio/SFX"] stream = SubResource("AudioStreamRandomizer_618my") max_distance = 20000000.0 playback_type = 2 -script = ExtResource("40_w3jkj") +script = ExtResource("60_2ir8f") [node name="SpecialQuestTrigger" type="Node" parent="."] [node name="QuestInstantStart" type="Node" parent="SpecialQuestTrigger"] [node name="QuestTrigger" type="Node" parent="SpecialQuestTrigger/QuestInstantStart"] -script = ExtResource("66_2065p") -questResource = ExtResource("67_tm0yg") +script = ExtResource("66_knv57") +questResource = ExtResource("67_mitsp") toStatus = 1 makeActive = true [node name="ToolsCollectedTrigger" type="Node" parent="SpecialQuestTrigger"] -script = ExtResource("68_hux6i") +script = ExtResource("68_88mf7") _itemsToContain = Array[Resource]([SubResource("Resource_y820s"), SubResource("Resource_50loj")]) -_onAvailableQuest = ExtResource("68_lbnqo") -_toNextQuest = ExtResource("69_l4wxt") +_onAvailableQuest = ExtResource("70_hvxcl") +_toNextQuest = ExtResource("71_wriss") [node name="FieldWorkTrigger" type="Node" parent="SpecialQuestTrigger"] -script = ExtResource("74_fv1t2") -_onAvailableQuest = ExtResource("75_l7ekk") -_toNextQuest = ExtResource("76_xcwle") +script = ExtResource("72_6nxqt") +_onAvailableQuest = ExtResource("73_yl1wy") +_toNextQuest = ExtResource("74_7c6h2") [node name="StartDialog" type="Node" parent="SpecialQuestTrigger/FieldWorkTrigger"] -script = ExtResource("77_l7ekk") +script = ExtResource("75_e32l6") timeline = "quest2_tomatoes_end" [node name="SceneNameSetter" type="Node" parent="."] -script = ExtResource("76_l7ekk") -_variableResource = ExtResource("77_xcwle") +script = ExtResource("76_kgbl3") +_variableResource = ExtResource("77_kls32") _payloadToSet = "farmOutside" [node name="SaveSystem" type="Node" parent="."] [node name="SaveGameCheat" type="Node" parent="SaveSystem"] -script = ExtResource("79_065st") +script = ExtResource("78_prj30") [node name="SaveIDProvider" type="Node" parent="SaveSystem"] -script = ExtResource("80_w1kgo") +script = ExtResource("79_m37ba") [connection signal="FilledWateringCan" from="YSorted/Vesna" to="Audio/SFX/FillWater SFX2" method="PlayOneShot"] [connection signal="InteractedTool" from="YSorted/Well/InteractionArea" to="YSorted/Vesna" method="TryFillWateringCan"] [connection signal="SuccessfulPickUp" from="YSorted/CanGenericPickup" to="YSorted/Vesna" method="HandlePickUp"] [connection signal="SuccessfulPickUp" from="YSorted/RakeGenericPickup" to="YSorted/Vesna" method="HandlePickUp"] [connection signal="SuccessfulPickUp" from="YSorted/SeedPickup" to="YSorted/Vesna" method="HandlePickUp"] -[connection signal="SuccessfulPickUp" from="YSorted/BeetPickup" to="YSorted/Vesna" method="HandlePickUp"] [connection signal="SuccessfulPickUp" from="YSorted/SeedPickup2" to="YSorted/Vesna" method="HandlePickUp"] [connection signal="InteractedTool" from="YSorted/Farm visuals/Static/EnterHouseInteraction" to="." method="LoadSceneAtIndex"] [connection signal="InteractedTool" from="YSorted/Blocker/InteractionArea" to="." method="LoadSceneAtIndex"] @@ -2551,13 +2518,7 @@ script = ExtResource("80_w1kgo") [editable path="YSorted/RakeGenericPickup/PickupInteractionArea"] [editable path="YSorted/SeedPickup"] [editable path="YSorted/SeedPickup/PickupInteractionArea"] -[editable path="YSorted/BeetPickup"] -[editable path="YSorted/BeetPickup/PickupInteractionArea"] [editable path="YSorted/SeedPickup2"] [editable path="YSorted/SeedPickup2/PickupInteractionArea"] [editable path="YSorted/Blocker/InteractionArea"] -[editable path="YSorted/trash/trashObject2"] -[editable path="YSorted/trash/trashObject3"] -[editable path="YSorted/trash/trashObject4"] -[editable path="YSorted/trash/trashObject9"] [editable path="CanvasLayer"] diff --git a/scenes/Babushka_scene_fight_happening.tscn b/scenes/scene_fight_happening.tscn similarity index 97% rename from scenes/Babushka_scene_fight_happening.tscn rename to scenes/scene_fight_happening.tscn index 183a8b2..3809071 100644 --- a/scenes/Babushka_scene_fight_happening.tscn +++ b/scenes/scene_fight_happening.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://cjshlwk8ajpnp"] +[gd_scene load_steps=21 format=3 uid="uid://cjshlwk8ajpnp"] [ext_resource type="Script" uid="uid://cnhpnn8o0gybd" path="res://scripts/CSharp/Common/Fight/FightHappeningSceneSetup.cs" id="1_fiutj"] [ext_resource type="Script" uid="uid://c76mhhqyk4lgh" path="res://scripts/CSharp/Common/Fight/FightHappening.cs" id="1_gsk03"] @@ -13,6 +13,7 @@ [ext_resource type="Script" uid="uid://byf2ywov34g0x" path="res://scripts/CSharp/Common/Fight/UI/ActionSelectUiSetup.cs" id="8_bkwsr"] [ext_resource type="Script" uid="uid://bwm0nhvt1083k" path="res://scripts/CSharp/Common/Fight/FightMinigameHandler.cs" id="8_falfe"] [ext_resource type="Script" uid="uid://d2ugtb3dalrg3" path="res://scripts/CSharp/Common/Fight/FightHappeningStateDebugger.cs" id="8_tv7cl"] +[ext_resource type="Texture2D" uid="uid://ciaabo8kcx2hw" path="res://art/fightworld_background.png" id="9_f4y3h"] [ext_resource type="Script" uid="uid://2f7rqk50gtdg" path="res://scripts/CSharp/Common/Fight/SwitchSceneOnFightEnd.cs" id="10_qqd8u"] [ext_resource type="Script" uid="uid://6nniwfxye8ss" path="res://scripts/CSharp/Common/Fight/UsedItemIndicatorVisual.cs" id="14_b4ll5"] [ext_resource type="Script" uid="uid://71mdwp2m4rta" path="res://scripts/CSharp/Common/Fight/UI/HealButtonVisual.cs" id="14_oy2wu"] @@ -39,6 +40,7 @@ script = ExtResource("4_v5rv6") useHealItemIndicator = NodePath("../../UseItemIndicator") [node name="Camera2D" type="Camera2D" parent="."] +scale = Vector2(0.71911293, 0.6664279) [node name="FightSetup" type="Node2D" parent="."] script = ExtResource("1_fiutj") @@ -58,6 +60,11 @@ _positionDistanceFromCenter = PackedFloat32Array(300, 550, 800) [node name="EnvironmentVisuals" type="Node2D" parent="."] +[node name="background" type="Sprite2D" parent="EnvironmentVisuals"] +z_index = -100 +scale = Vector2(3, 3) +texture = ExtResource("9_f4y3h") + [node name="MinigameHandler" type="Node2D" parent="." node_paths=PackedStringArray("_minigameController")] script = ExtResource("8_falfe") _minigameController = NodePath("Minigame") diff --git a/scenes/Babushka_scene_fight_world_room.tscn b/scenes/scene_fight_world_room.tscn similarity index 99% rename from scenes/Babushka_scene_fight_world_room.tscn rename to scenes/scene_fight_world_room.tscn index ce9ae55..06386b8 100644 --- a/scenes/Babushka_scene_fight_world_room.tscn +++ b/scenes/scene_fight_world_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=52 format=3 uid="uid://cacnapfv7w567"] +[gd_scene load_steps=53 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"] diff --git a/scenes/Babushka_scene_forest_fight_1_2d.tscn b/scenes/scene_forest_fight_1_2d.tscn similarity index 100% rename from scenes/Babushka_scene_forest_fight_1_2d.tscn rename to scenes/scene_forest_fight_1_2d.tscn diff --git a/scenes/Babushka_scene_indoor_common_room.tscn b/scenes/scene_indoor_common_room.tscn similarity index 78% rename from scenes/Babushka_scene_indoor_common_room.tscn rename to scenes/scene_indoor_common_room.tscn index 5b5f74e..0da2e2c 100644 --- a/scenes/Babushka_scene_indoor_common_room.tscn +++ b/scenes/scene_indoor_common_room.tscn @@ -1,37 +1,39 @@ -[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"] -[ext_resource type="Texture2D" uid="uid://blg50is4kuh2f" path="res://art/indoor/room export/Room_01_chair.png" id="3_gpagp"] -[ext_resource type="Texture2D" uid="uid://x7trh4dgsvoe" path="res://art/indoor/room export/Room_01_assets.png" id="4_27bwy"] -[ext_resource type="Texture2D" uid="uid://waqmjrxduxfq" path="res://art/indoor/room export/Room_01_walls.png" id="5_sndxu"] -[ext_resource type="Texture2D" uid="uid://bqwhptcgg5ons" path="res://art/indoor/room export/Room_01_dorr_R.png" id="6_blyw3"] -[ext_resource type="Texture2D" uid="uid://vyk63d0pgqm5" path="res://art/indoor/room export/Room_01_dioor L.png" id="7_yd2gv"] -[ext_resource type="Texture2D" uid="uid://b2rj7wkyu6ehy" path="res://art/indoor/room export/Room_01_pechka.png" id="8_ofqcg"] -[ext_resource type="Texture2D" uid="uid://dhvi5404cqioa" path="res://art/indoor/room export/Room_01_window.png" id="9_aoesu"] -[ext_resource type="Texture2D" uid="uid://bpi35nxbhput8" path="res://art/indoor/room export/Room_01_pechkaDoor.png" id="10_xcryd"] -[ext_resource type="Texture2D" uid="uid://tyypifpte0pb" path="res://art/indoor/room export/Room_01_chugun.png" id="11_as3nm"] -[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="11_gpagp"] -[ext_resource type="Texture2D" uid="uid://cop1vjvhwlsec" path="res://art/indoor/room export/Room_01_shelf.png" id="12_bu2a1"] -[ext_resource type="Texture2D" uid="uid://404glx32r1w8" path="res://art/indoor/room export/Room_01_bench.png" id="13_rongr"] -[ext_resource type="Texture2D" uid="uid://ckvytnpi8gcxq" path="res://art/eyes_atlas.png" id="14_d7yky"] -[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="15_7a68a"] -[ext_resource type="Script" uid="uid://31p67cdowuw4" path="res://scripts/CSharp/Common/Animation/AnimationStarter.cs" id="15_27bwy"] -[ext_resource type="Texture2D" uid="uid://c4q12jiligcl7" path="res://art/animals/katze.png" id="15_sndxu"] -[ext_resource type="AudioStream" uid="uid://cohyenfo1rtxh" path="res://audio/sfx/Animals/SFX_Cat_Meow_01.wav" id="16_d7yky"] -[ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="16_dhsxs"] -[ext_resource type="AudioStream" uid="uid://b2cmf5ie7cwka" path="res://audio/sfx/Animals/SFX_Cat_Meow_02.wav" id="17_7a68a"] -[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="17_k0k8c"] -[ext_resource type="AudioStream" uid="uid://cttisejnt2l8f" path="res://audio/sfx/Animals/SFX_Cat_Meow_03.wav" id="18_dhsxs"] -[ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="18_dw4nn"] -[ext_resource type="AudioStream" uid="uid://cbmagiou0n0t3" path="res://audio/sfx/Animals/SFX_Cat_Meow_04.wav" id="19_k0k8c"] -[ext_resource type="AudioStream" uid="uid://bk1bj01fokjp7" path="res://audio/sfx/Animals/SFX_Cat_Meow_05.wav" id="20_dw4nn"] -[ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="21_blyw3"] -[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"] +[gd_scene load_steps=43 format=3 uid="uid://bm21nqepnwaik"] + +[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_3al6t"] +[ext_resource type="Texture2D" uid="uid://cnhsxxps2cw5" path="res://art/indoor/room export/Room_01_table.png" id="2_ufnxe"] +[ext_resource type="Texture2D" uid="uid://blg50is4kuh2f" path="res://art/indoor/room export/Room_01_chair.png" id="3_pejp6"] +[ext_resource type="Texture2D" uid="uid://x7trh4dgsvoe" path="res://art/indoor/room export/Room_01_assets.png" id="4_nc3ef"] +[ext_resource type="Texture2D" uid="uid://waqmjrxduxfq" path="res://art/indoor/room export/Room_01_walls.png" id="5_cpb5b"] +[ext_resource type="Texture2D" uid="uid://b2rj7wkyu6ehy" path="res://art/indoor/room export/Room_01_pechka.png" id="6_ecq66"] +[ext_resource type="Texture2D" uid="uid://dhvi5404cqioa" path="res://art/indoor/room export/Room_01_window.png" id="7_8mqg7"] +[ext_resource type="Texture2D" uid="uid://bpi35nxbhput8" path="res://art/indoor/room export/Room_01_pechkaDoor.png" id="8_bv3pn"] +[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="9_qaiit"] +[ext_resource type="Texture2D" uid="uid://tyypifpte0pb" path="res://art/indoor/room export/Room_01_chugun.png" id="10_rj4v5"] +[ext_resource type="Texture2D" uid="uid://404glx32r1w8" path="res://art/indoor/room export/Room_01_bench.png" id="11_7ohth"] +[ext_resource type="Texture2D" uid="uid://c4q12jiligcl7" path="res://art/animals/katze.png" id="12_dckqa"] +[ext_resource type="AudioStream" uid="uid://cohyenfo1rtxh" path="res://audio/sfx/Animals/SFX_Cat_Meow_01.wav" id="13_65rkx"] +[ext_resource type="AudioStream" uid="uid://b2cmf5ie7cwka" path="res://audio/sfx/Animals/SFX_Cat_Meow_02.wav" id="14_mse84"] +[ext_resource type="AudioStream" uid="uid://cttisejnt2l8f" path="res://audio/sfx/Animals/SFX_Cat_Meow_03.wav" id="15_26mhc"] +[ext_resource type="AudioStream" uid="uid://cbmagiou0n0t3" path="res://audio/sfx/Animals/SFX_Cat_Meow_04.wav" id="16_vt5fp"] +[ext_resource type="AudioStream" uid="uid://bk1bj01fokjp7" path="res://audio/sfx/Animals/SFX_Cat_Meow_05.wav" id="17_n8vep"] +[ext_resource type="AudioStream" uid="uid://r2f6xmjvyyjv" path="res://audio/sfx/Animals/SFX_Cat_Purr_01.wav" id="18_3oexm"] +[ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="19_a2xrf"] +[ext_resource type="Script" uid="uid://31p67cdowuw4" path="res://scripts/CSharp/Common/Animation/AnimationStarter.cs" id="20_lkkn4"] +[ext_resource type="Script" uid="uid://dnipeibppjirs" path="res://scripts/CSharp/Common/NPC/DialogicOverlayStarter.cs" id="20_pejp6"] +[ext_resource type="Texture2D" uid="uid://ckvytnpi8gcxq" path="res://art/eyes_atlas.png" id="21_m0gmu"] +[ext_resource type="Script" uid="uid://d2486x6upmwqq" path="res://scripts/GdScript/dialogic_starter.gd" id="21_nc3ef"] +[ext_resource type="Texture2D" uid="uid://bqwhptcgg5ons" path="res://art/indoor/room export/Room_01_dorr_R.png" id="22_ahl31"] +[ext_resource type="Texture2D" uid="uid://da67c7avarwq2" path="res://art/indoor/kitchen_bgAssets.png" id="23_hgs5o"] +[ext_resource type="Texture2D" uid="uid://vyk63d0pgqm5" path="res://art/indoor/room export/Room_01_dioor L.png" id="24_t86aa"] +[ext_resource type="Texture2D" uid="uid://cop1vjvhwlsec" path="res://art/indoor/room export/Room_01_shelf.png" id="25_0pvxk"] +[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="26_yq173"] +[ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="27_pfr1s"] +[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="28_l3q6o"] +[ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="29_6elg7"] +[ext_resource type="Resource" uid="uid://cbpurnewhyefa" path="res://resources/quests/beetRoot.tres" id="30_pd0e4"] +[ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="31_x6an5"] +[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="32_i4hb6"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_a2ood"] resource_local_to_scene = true @@ -43,12 +45,12 @@ radius = 300.0 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_b6vf7"] streams_count = 6 -stream_0/stream = ExtResource("16_d7yky") -stream_1/stream = ExtResource("17_7a68a") -stream_2/stream = ExtResource("18_dhsxs") -stream_3/stream = ExtResource("19_k0k8c") -stream_4/stream = ExtResource("20_dw4nn") -stream_5/stream = ExtResource("21_ytap8") +stream_0/stream = ExtResource("13_65rkx") +stream_1/stream = ExtResource("14_mse84") +stream_2/stream = ExtResource("15_26mhc") +stream_3/stream = ExtResource("16_vt5fp") +stream_4/stream = ExtResource("17_n8vep") +stream_5/stream = ExtResource("18_3oexm") [sub_resource type="Animation" id="Animation_j5d18"] length = 0.001 @@ -218,8 +220,8 @@ radius = 400.0 [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_indoor_kitchen.tscn", "res://scenes/Babushka_scene_farm_outside_2d.tscn") +script = ExtResource("1_3al6t") +_sceneNamesToLoad = PackedStringArray("res://scenes/scene_indoor_vesnas_room.tscn", "res://scenes/scene_indoor_kitchen.tscn", "res://scenes/scene_farm_outside_2d.tscn") [node name="Foreground" type="Node" parent="."] @@ -227,7 +229,7 @@ _sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_vesnas z_index = 2 y_sort_enabled = true position = Vector2(-1888, 1112) -texture = ExtResource("2_ubg3a") +texture = ExtResource("2_ufnxe") offset = Vector2(0, -200) region_enabled = true region_rect = Rect2(1012, 1743, 1470, 417) @@ -236,7 +238,7 @@ region_rect = Rect2(1012, 1743, 1470, 417) z_index = 3 y_sort_enabled = true position = Vector2(-3032, 2096) -texture = ExtResource("3_gpagp") +texture = ExtResource("3_pejp6") offset = Vector2(216, -1064) region_enabled = true region_rect = Rect2(1534, 1976, 379, 184) @@ -244,7 +246,7 @@ region_rect = Rect2(1534, 1976, 379, 184) [node name="Chair2" type="Sprite2D" parent="Foreground"] y_sort_enabled = true position = Vector2(-1064, 2064) -texture = ExtResource("3_gpagp") +texture = ExtResource("3_pejp6") offset = Vector2(184, -1056) region_enabled = true region_rect = Rect2(1534, 1976, 379, 184) @@ -253,7 +255,7 @@ region_rect = Rect2(1534, 1976, 379, 184) z_index = 1 y_sort_enabled = true position = Vector2(-1904, 1192) -texture = ExtResource("4_27bwy") +texture = ExtResource("4_nc3ef") offset = Vector2(0, -800) region_enabled = true region_rect = Rect2(2093, 49, 421, 630) @@ -288,14 +290,14 @@ shape = SubResource("RectangleShape2D_a2ood") z_index = -100 position = Vector2(4992, -487) scale = Vector2(2, 2) -texture = ExtResource("5_sndxu") +texture = ExtResource("5_cpb5b") offset = Vector2(-2768, 264) [node name="wall 1" type="Sprite2D" parent="BackWall"] z_index = -100 position = Vector2(-4368, 40) scale = Vector2(2, 2) -texture = ExtResource("5_sndxu") +texture = ExtResource("5_cpb5b") flip_h = true region_rect = Rect2(111, 292, 3323, 2160) @@ -308,32 +310,32 @@ shape = SubResource("RectangleShape2D_a2ood") [node name="Room01Pechka" type="Sprite2D" parent="BackWall"] z_index = -80 position = Vector2(-224, -392) -texture = ExtResource("8_ofqcg") +texture = ExtResource("6_ecq66") region_enabled = true region_rect = Rect2(2236, 0, 724, 1392) [node name="Room01Window2" type="Sprite2D" parent="BackWall"] z_index = -50 position = Vector2(-5870, -408) -texture = ExtResource("9_aoesu") +texture = ExtResource("7_8mqg7") region_enabled = true region_rect = Rect2(1020, 338, 607, 757) [node name="Room01Window3" type="Sprite2D" parent="BackWall"] z_index = -50 position = Vector2(-3931, -397) -texture = ExtResource("9_aoesu") +texture = ExtResource("7_8mqg7") region_enabled = true region_rect = Rect2(1020, 338, 607, 757) [node name="Room01PechkaDoor" type="Sprite2D" parent="BackWall"] z_index = -50 position = Vector2(-240, -100) -texture = ExtResource("10_xcryd") +texture = ExtResource("8_bv3pn") region_enabled = true region_rect = Rect2(2360, 864, 356, 251) -[node name="InteractionArea" parent="BackWall/Room01PechkaDoor" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] +[node name="InteractionArea" parent="BackWall/Room01PechkaDoor" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")] position = Vector2(0, -3) _spritesToOutline = [NodePath("..")] @@ -343,7 +345,7 @@ shape = SubResource("CircleShape2D_gpagp") [node name="Room01Chugun" type="Sprite2D" parent="BackWall"] z_index = -40 position = Vector2(16, -560) -texture = ExtResource("11_as3nm") +texture = ExtResource("10_rj4v5") region_enabled = true region_rect = Rect2(2469, 459, 247, 131) @@ -351,32 +353,40 @@ region_rect = Rect2(2469, 459, 247, 131) z_index = -10 y_sort_enabled = true position = Vector2(-5070, 1051) -texture = ExtResource("13_rongr") +texture = ExtResource("11_7ohth") flip_h = true region_enabled = true region_rect = Rect2(1156, 1185, 940, 189) [node name="Katze" type="Sprite2D" parent="BackWall/Bench"] -z_index = -10 +z_index = 15 position = Vector2(61, -87) scale = Vector2(2, 2) -texture = ExtResource("15_sndxu") +texture = ExtResource("12_dckqa") offset = Vector2(-8, -126) [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="BackWall/Bench/Katze"] stream = SubResource("AudioStreamRandomizer_b6vf7") bus = &"SFX" -script = ExtResource("22_tggq2") +script = ExtResource("19_a2xrf") -[node name="InteractionArea" parent="BackWall/Bench/Katze" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] +[node name="InteractionArea" parent="BackWall/Bench/Katze" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")] position = Vector2(-6.5, -44) scale = Vector2(0.5, 0.5) _spritesToOutline = [NodePath("..")] +[node name="dialogic overlay starter" type="Node2D" parent="BackWall/Bench/Katze"] +script = ExtResource("20_pejp6") +_timelinesToPlay = PackedStringArray("cat") +_startOnReady = false + +[node name="dialogic starter" type="Node" parent="BackWall/Bench/Katze/dialogic overlay starter"] +script = ExtResource("21_nc3ef") + [node name="Bench2" type="Sprite2D" parent="BackWall"] z_index = -10 position = Vector2(-2906, 243) -texture = ExtResource("13_rongr") +texture = ExtResource("11_7ohth") region_enabled = true region_rect = Rect2(1156, 1185, 940, 189) @@ -386,7 +396,7 @@ region_rect = Rect2(1156, 1185, 940, 189) z_index = -10 y_sort_enabled = true position = Vector2(-177, 554.5) -texture = ExtResource("4_27bwy") +texture = ExtResource("4_nc3ef") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2244, 763, 274, 91) @@ -395,7 +405,7 @@ region_rect = Rect2(2244, 763, 274, 91) z_index = -10 y_sort_enabled = true position = Vector2(336.487, 275.616) -texture = ExtResource("4_27bwy") +texture = ExtResource("4_nc3ef") offset = Vector2(-14.6475, -97.651) region_enabled = true region_rect = Rect2(3157, 688, 118.519, 221) @@ -405,7 +415,7 @@ z_index = -10 y_sort_enabled = true position = Vector2(-852, -187) rotation = -0.0663225 -texture = ExtResource("4_27bwy") +texture = ExtResource("4_nc3ef") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2624, 435, 49, 76) @@ -416,11 +426,11 @@ y_sort_enabled = true position = Vector2(-101, -6) rotation = -0.0663225 scale = Vector2(1e-05, 1e-05) -texture = ExtResource("4_27bwy") +texture = ExtResource("4_nc3ef") offset = Vector2(43.3898, 128.128) region_enabled = true region_rect = Rect2(3362, 139, 101, 269) -script = ExtResource("15_27bwy") +script = ExtResource("20_lkkn4") _animationPlayer = NodePath("SpiritAnimation") _animationName = "hand_stretch" _repeatable = false @@ -436,7 +446,7 @@ playback_auto_capture = false z_index = -10 y_sort_enabled = true position = Vector2(287, -157.5) -texture = ExtResource("4_27bwy") +texture = ExtResource("4_nc3ef") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2964, 137, 321, 213) @@ -444,7 +454,7 @@ region_rect = Rect2(2964, 137, 321, 213) [node name="herb 1" type="Sprite2D" parent="BackWall/Room assets/herbsline"] y_sort_enabled = true position = Vector2(-72, 136) -texture = ExtResource("4_27bwy") +texture = ExtResource("4_nc3ef") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2600, 165, 127, 199) @@ -452,7 +462,7 @@ region_rect = Rect2(2600, 165, 127, 199) [node name="herb 2" type="Sprite2D" parent="BackWall/Room assets/herbsline"] y_sort_enabled = true position = Vector2(64, 80) -texture = ExtResource("4_27bwy") +texture = ExtResource("4_nc3ef") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2761, 161, 135, 199) @@ -462,7 +472,7 @@ visible = false z_index = -10 position = Vector2(-169, -80) scale = Vector2(0.4, 0.4) -texture = ExtResource("14_d7yky") +texture = ExtResource("21_m0gmu") region_enabled = true region_rect = Rect2(2647, 15, 286, 183) @@ -472,21 +482,21 @@ position = Vector2(-205, -8) [node name="apple" type="Sprite2D" parent="BackWall/Room assets/offerings"] z_index = -1 position = Vector2(229.5, 331.5) -texture = ExtResource("4_27bwy") +texture = ExtResource("4_nc3ef") region_enabled = true region_rect = Rect2(2822, 764, 93, 87) [node name="bread" type="Sprite2D" parent="BackWall/Room assets/offerings"] z_index = -2 position = Vector2(157.5, 339.5) -texture = ExtResource("4_27bwy") +texture = ExtResource("4_nc3ef") region_enabled = true region_rect = Rect2(2951, 783, 155, 78) [node name="plate" type="Sprite2D" parent="BackWall/Room assets/offerings"] z_index = -20 position = Vector2(189.5, 659.5) -texture = ExtResource("4_27bwy") +texture = ExtResource("4_nc3ef") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2576, 802, 219, 64) @@ -496,11 +506,11 @@ region_rect = Rect2(2576, 802, 219, 64) [node name="Door_Kitchen" type="Sprite2D" parent="BackWall/Doors"] z_index = -50 position = Vector2(923, -221) -texture = ExtResource("6_blyw3") +texture = ExtResource("22_ahl31") 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")] +[node name="KitchendoorInteraction" parent="BackWall/Doors/Door_Kitchen" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")] position = Vector2(-7, 248) scale = Vector2(1.5, 1.5) _spritesToOutline = [NodePath("..")] @@ -509,11 +519,11 @@ _id = 1 [node name="Door_Outside" type="Sprite2D" parent="BackWall/Doors"] z_index = -50 position = Vector2(-4917, -226) -texture = ExtResource("23_d7yky") +texture = ExtResource("23_hgs5o") 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")] +[node name="OutsideDoor" parent="BackWall/Doors/Door_Outside" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")] position = Vector2(-7, 248) scale = Vector2(1.5, 1.5) _spritesToOutline = [NodePath("..")] @@ -522,11 +532,11 @@ _id = 2 [node name="Door_Bedroom" type="Sprite2D" parent="BackWall/Doors"] z_index = -50 position = Vector2(-1620, -259) -texture = ExtResource("7_yd2gv") +texture = ExtResource("24_t86aa") 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")] +[node name="VesnasRoomDoor" parent="BackWall/Doors/Door_Bedroom" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")] position = Vector2(2, 233) _spritesToOutline = [NodePath("..")] _id = 0 @@ -537,7 +547,7 @@ shape = SubResource("CircleShape2D_yd2gv") [node name="Shelf" type="Sprite2D" parent="BackWall"] z_index = -50 position = Vector2(-880, -416) -texture = ExtResource("12_bu2a1") +texture = ExtResource("25_0pvxk") region_enabled = true region_rect = Rect2(1846, 471, 348, 490) @@ -546,16 +556,16 @@ visible = false z_index = -10 y_sort_enabled = true position = Vector2(23, 378.5) -texture = ExtResource("4_27bwy") +texture = ExtResource("4_nc3ef") offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2748, 432, 174, 191) -[node name="Vesna" parent="." instance=ExtResource("15_7a68a")] +[node name="Vesna" parent="." instance=ExtResource("26_yq173")] y_sort_enabled = false -position = Vector2(-920, 319) +position = Vector2(-4473, 319) -[node name="Yeli" parent="." instance=ExtResource("16_dhsxs")] +[node name="Yeli" parent="." instance=ExtResource("27_pfr1s")] z_index = 0 y_sort_enabled = false position = Vector2(-2841, 198) @@ -575,11 +585,11 @@ position = Vector2(-224, 373) position = Vector2(-565, 464) [node name="dialogic_toggle" type="Node2D" parent="Yeli"] -script = ExtResource("17_k0k8c") +script = ExtResource("28_l3q6o") [node name="Beetroot Quest trigger" type="Node2D" parent="Yeli"] -script = ExtResource("21_blyw3") -questResource = ExtResource("22_yd2gv") +script = ExtResource("29_6elg7") +questResource = ExtResource("30_pd0e4") toStatus = 1 makeActive = true @@ -592,14 +602,18 @@ limit_top = -1050 limit_right = 1400 limit_bottom = 1150 editor_draw_limits = true -script = ExtResource("18_dw4nn") +script = ExtResource("31_x6an5") _followNode = NodePath("../Vesna/CharacterBody2D") -[node name="CanvasLayer" parent="." instance=ExtResource("24_yd2gv")] +[node name="CanvasLayer" parent="." instance=ExtResource("32_i4hb6")] [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/Bench/Katze/InteractionArea" to="BackWall/Bench/Katze/AudioStreamPlayer2D" method="PlayOneShot"] +[connection signal="Interacted" from="BackWall/Bench/Katze/InteractionArea" to="BackWall/Bench/Katze/dialogic overlay starter" method="ToggleDialogue"] +[connection signal="Dialogue" from="BackWall/Bench/Katze/dialogic overlay starter" to="BackWall/Bench/Katze/dialogic overlay starter/dialogic starter" method="open"] +[connection signal="timelineEnded" from="BackWall/Bench/Katze/dialogic overlay starter/dialogic starter" to="BackWall/Bench/Katze/InteractionArea" method="SetActiveTrue"] +[connection signal="timelineStarted" from="BackWall/Bench/Katze/dialogic overlay starter/dialogic starter" to="BackWall/Bench/Katze/InteractionArea" method="SetActiveFalse"] [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"] diff --git a/scenes/Babushka_scene_indoor_kitchen.tscn b/scenes/scene_indoor_kitchen.tscn similarity index 98% rename from scenes/Babushka_scene_indoor_kitchen.tscn rename to scenes/scene_indoor_kitchen.tscn index 4895ee3..69bfa56 100644 --- a/scenes/Babushka_scene_indoor_kitchen.tscn +++ b/scenes/scene_indoor_kitchen.tscn @@ -20,7 +20,7 @@ radius = 300.0 z_index = 1 y_sort_enabled = true script = ExtResource("1_ftmt4") -_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn") +_sceneNamesToLoad = PackedStringArray("res://scenes/scene_indoor_common_room.tscn") [node name="Foreground" type="Node" parent="."] @@ -53,7 +53,7 @@ z_index = -100 [node name="Ceiling" type="Sprite2D" parent="Background"] z_index = -100 -position = Vector2(-2453, -1419) +position = Vector2(-2453, -1303) scale = Vector2(2, 2) texture = ExtResource("2_qsw8g") region_enabled = true @@ -61,7 +61,7 @@ region_rect = Rect2(0, 1749.6222, 3840, 358.11316) [node name="WallUpper" type="Sprite2D" parent="Background"] z_index = -100 -position = Vector2(-2469, -969) +position = Vector2(-2469, -975) scale = Vector2(26, 2) texture = ExtResource("2_qsw8g") region_enabled = true diff --git a/scenes/Babushka_scene_indoor_vesnas_room.tscn b/scenes/scene_indoor_vesnas_room.tscn similarity index 81% rename from scenes/Babushka_scene_indoor_vesnas_room.tscn rename to scenes/scene_indoor_vesnas_room.tscn index ebae355..385acf5 100644 --- a/scenes/Babushka_scene_indoor_vesnas_room.tscn +++ b/scenes/scene_indoor_vesnas_room.tscn @@ -1,11 +1,13 @@ -[gd_scene load_steps=16 format=3 uid="uid://ceaa2qj2bmw43"] +[gd_scene load_steps=18 format=3 uid="uid://ceaa2qj2bmw43"] [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_c6eln"] [ext_resource type="Texture2D" uid="uid://cugtxcfuds31r" path="res://art/indoor/Babushka_bg_01.png" id="2_j25a2"] [ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="8_j25a2"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="8_phqdf"] [ext_resource type="Resource" uid="uid://csj15gnlx1jmx" path="res://resources/quests/demo/8_goto_bed.tres" id="9_heyef"] +[ext_resource type="Texture2D" uid="uid://s1yoemhrupwe" path="res://art/indoor/vesna_indoor_bed.png" id="10_hryl5"] [ext_resource type="Script" uid="uid://puw74w6lmcvl" path="res://scripts/CSharp/Common/Fight/NightStarter.cs" id="10_j25a2"] +[ext_resource type="Texture2D" uid="uid://dnlhlf1mx01h5" path="res://art/indoor/vesna_indoor_door.png" id="11_axs81"] [ext_resource type="Script" uid="uid://jg4jryfus3bw" path="res://scripts/CSharp/Common/DayAndNight/DayAndNightHelper.cs" id="11_heyef"] [ext_resource type="Texture2D" uid="uid://cop1vjvhwlsec" path="res://art/indoor/room export/Room_01_shelf.png" id="13_11fdt"] [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="18_3gevq"] @@ -30,7 +32,7 @@ radius = 509.071 [node name="VesnasRoom" type="Node2D"] y_sort_enabled = true script = ExtResource("1_c6eln") -_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn", "res://scenes/Babushka_scene_fight_world_room.tscn") +_sceneNamesToLoad = PackedStringArray("res://scenes/scene_indoor_common_room.tscn", "res://scenes/scene_fight_world_room.tscn") [node name="Colliders" type="Node2D" parent="."] position = Vector2(1297, 5292) @@ -102,8 +104,9 @@ _followNode = NodePath("../Vesna/CharacterBody2D") [node name="CanvasLayer" parent="." instance=ExtResource("24_xwo8y")] -[node name="BedInteraction" parent="." instance=ExtResource("8_phqdf")] +[node name="BedInteraction" parent="." node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("8_phqdf")] position = Vector2(-1415, 489) +_spritesToOutline = [NodePath("Bedsprite")] _id = 1 [node name="CollisionShape3D" parent="BedInteraction/Area2D" index="0"] @@ -115,13 +118,30 @@ script = ExtResource("8_j25a2") questResource = ExtResource("9_heyef") toStatus = 2 -[node name="DoorInteraction" parent="." instance=ExtResource("8_phqdf")] +[node name="Bedsprite" type="Sprite2D" parent="BedInteraction"] +z_index = -99 +position = Vector2(4925, -967) +scale = Vector2(2, 2) +texture = ExtResource("10_hryl5") +offset = Vector2(-2768, 264) +region_rect = Rect2(36.702454, 566.3165, 492.73346, 422.25665) + +[node name="DoorInteraction" parent="." node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("8_phqdf")] position = Vector2(777, 201) +_spritesToOutline = [NodePath("Doorsprite")] _id = 0 [node name="CollisionShape3D" parent="DoorInteraction/Area2D" index="0"] shape = SubResource("CircleShape2D_2spkc") +[node name="Doorsprite" type="Sprite2D" parent="DoorInteraction"] +z_index = -99 +position = Vector2(5559, -961) +scale = Vector2(2, 2) +texture = ExtResource("11_axs81") +offset = Vector2(-2768, 264) +region_rect = Rect2(1517.5891, 258.72107, 356.62732, 741.81134) + [node name="NightStarter" type="Node" parent="."] script = ExtResource("10_j25a2") _sceneIndexToLoad = 1 diff --git a/scenes/Babushka_scene_outside_beets.tscn b/scenes/scene_outside_beets.tscn similarity index 96% rename from scenes/Babushka_scene_outside_beets.tscn rename to scenes/scene_outside_beets.tscn index 3e31110..d2e3825 100644 --- a/scenes/Babushka_scene_outside_beets.tscn +++ b/scenes/scene_outside_beets.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=99 format=3 uid="uid://b3ibx4resa1f3"] +[gd_scene load_steps=100 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,7 +42,9 @@ [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="Script" uid="uid://dnipeibppjirs" path="res://scripts/CSharp/Common/NPC/DialogicOverlayStarter.cs" id="44_m6p1o"] [ext_resource type="Texture2D" uid="uid://dmo21h14toxfu" path="res://art/indoor/indoor outdoor/domovoi.png" id="44_njxly"] +[ext_resource type="Script" uid="uid://d2486x6upmwqq" path="res://scripts/GdScript/dialogic_starter.gd" id="45_1ly1s"] [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"] @@ -201,10 +203,6 @@ radius = 325.2599 resource_local_to_scene = true radius = 325.2599 -[sub_resource type="CircleShape2D" id="CircleShape2D_4pibb"] -resource_local_to_scene = true -radius = 325.2599 - [sub_resource type="CircleShape2D" id="CircleShape2D_dr6bm"] resource_local_to_scene = true radius = 335.72162 @@ -251,7 +249,7 @@ stream_2/stream = ExtResource("63_td2xu") [node name="BabushkaSceneBeets" type="Node2D"] script = ExtResource("1_6krrk") -_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_farm_outside_2d.tscn") +_sceneNamesToLoad = PackedStringArray("res://scenes/scene_farm_outside_2d.tscn") [node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")] position = Vector2(3180, 1961) @@ -1241,7 +1239,6 @@ region_enabled = true region_rect = Rect2(0, 604, 248, 228) [node name="bush23" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] -z_index = 1 y_sort_enabled = true material = SubResource("ShaderMaterial_bcdgk") position = Vector2(15022, 3301) @@ -1253,7 +1250,7 @@ region_rect = Rect2(1837, 651, 139, 180) [node name="bush24" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] modulate = Color(0.8428, 0.8771, 0.98, 1) -z_index = 2 +z_index = -1 y_sort_enabled = true material = SubResource("ShaderMaterial_bcdgk") position = Vector2(15973, 3380) @@ -1374,6 +1371,7 @@ region_enabled = true region_rect = Rect2(130, 0, 201, 278) [node name="bush17" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +z_index = 3 material = SubResource("ShaderMaterial_bcdgk") position = Vector2(5599, 3799) scale = Vector2(-2.40318, 3.59175) @@ -1402,13 +1400,13 @@ 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 +z_index = -5 y_sort_enabled = true material = SubResource("ShaderMaterial_618my") -position = Vector2(5146, 1935) +position = Vector2(5187.001, 1864.0001) scale = Vector2(0.373695, 0.388829) texture = ExtResource("38_0bsmo") -offset = Vector2(0, -800) +offset = Vector2(-109.7168, -617.4004) region_enabled = true region_rect = Rect2(0, 0, 1440, 1576) @@ -1765,6 +1763,7 @@ metadata/SaveID = "b3b47e69-6115-4405-8da6-508b783823d2" [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField" index="1"] visible = true +FieldState = 1 metadata/SaveID = "7a8210bf-479d-4b4c-9758-98d23e59d5d7" [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField/FieldBehaviour" index="1"] @@ -1777,6 +1776,7 @@ _field = NodePath("../..") _daysWatered = 6 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1792,6 +1792,7 @@ metadata/SaveID = "f536efd3-3da8-4ef5-a520-570220e6c19f" [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField2" index="1"] visible = true +FieldState = 1 metadata/SaveID = "a1d8a0a2-c51c-4410-83c3-0edb31cbf2de" [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField2/FieldBehaviour" index="1"] @@ -1804,6 +1805,7 @@ _field = NodePath("../..") _daysWatered = 6 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField2" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField2/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1819,6 +1821,7 @@ metadata/SaveID = "14ce64d5-8a4d-43b9-a8ff-3a57725c4dc8" [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField3" index="1"] visible = true +FieldState = 1 metadata/SaveID = "79a65532-cb2b-4268-8eb0-8c41a3935cbb" [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldBehaviour" index="1"] @@ -1826,11 +1829,15 @@ 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 +_state = 3 _field = NodePath("../..") _daysWatered = 5 +[node name="InteractionArea" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldBehaviour" index="2"] +_active = true + [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField3" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1846,7 +1853,7 @@ metadata/SaveID = "6872ce5d-6f42-47d7-97e2-a7214ff3b08c" [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField4" index="1"] visible = true -FieldState = 3 +FieldState = 1 metadata/SaveID = "13fa64a3-01dc-4fd8-822e-0839c0da3163" [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField4/FieldBehaviour" index="1"] @@ -1854,11 +1861,12 @@ 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 +_state = 3 _field = NodePath("../..") _daysWatered = 7 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField4" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField4/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1874,7 +1882,7 @@ metadata/SaveID = "f163c38d-9ee0-4844-9def-479833febb4e" [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField5" index="1"] visible = true -FieldState = 3 +FieldState = 1 metadata/SaveID = "414ecdb9-f3c4-4fb9-81bd-6ca575784f78" [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField5/FieldBehaviour" index="1"] @@ -1887,6 +1895,7 @@ _field = NodePath("../..") _daysWatered = 6 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField5" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField5/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1902,7 +1911,7 @@ metadata/SaveID = "da691381-ee82-4f86-abf3-dda2c9f19337" [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField6" index="1"] visible = true -FieldState = 3 +FieldState = 1 metadata/SaveID = "b235febb-b231-4f8c-94e9-1f9d9f115b08" [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField6/FieldBehaviour" index="1"] @@ -1915,6 +1924,7 @@ _field = NodePath("../..") _daysWatered = 5 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField6" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField6/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1930,7 +1940,7 @@ metadata/SaveID = "8116fa8b-b164-4d39-a1ed-6cd476d18f94" [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField7" index="1"] visible = true -FieldState = 3 +FieldState = 1 metadata/SaveID = "9ccdba91-812a-4c13-9ee0-12472e174fc9" [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField7/FieldBehaviour" index="1"] @@ -1943,6 +1953,7 @@ _field = NodePath("../..") _daysWatered = 6 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField7" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField7/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1958,7 +1969,7 @@ metadata/SaveID = "5298f423-4c3b-45b5-94fb-d4aef36bac21" [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField8" index="1"] visible = true -FieldState = 3 +FieldState = 1 metadata/SaveID = "da44e54a-0b76-4888-ad8b-782a9d146fa3" [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField8/FieldBehaviour" index="1"] @@ -1971,6 +1982,7 @@ _field = NodePath("../..") _daysWatered = 6 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField8" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField8/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1979,23 +1991,28 @@ 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) +position = Vector2(5368, 3226.9458) scale = Vector2(1, 1.00622) -Payload = 8 -metadata/SaveID = "0de8dc13-5851-4471-be35-309cd6687ebc" +Payload = 7 +metadata/SaveID = "" [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField9" index="1"] visible = true -metadata/SaveID = "9919b294-04a1-4a16-9783-38c8aa0e291c" +FieldState = 1 +metadata/SaveID = "da44e54a-0b76-4888-ad8b-782a9d146fa3" [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"] +process_mode = 4 visible = false +[node name="InteractionArea" parent="YSorted/Farm visuals/FieldParent/BaseField9/FieldActivator" index="0" node_paths=PackedStringArray("_spritesToOutline")] +_spritesToOutline = [NodePath("../../../BaseField8/OutlineSprite")] + [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField9/FieldActivator/InteractionArea/Area2D" index="0"] -shape = SubResource("CircleShape2D_4pibb") +shape = SubResource("CircleShape2D_v10dc") [node name="Blocker" type="Node2D" parent="YSorted"] @@ -2005,7 +2022,7 @@ _spritesToOutline = [NodePath("Fence Door2")] _id = 0 [node name="CollisionShape3D" parent="YSorted/Blocker/BackToFarm/Area2D" index="0"] -position = Vector2(-37, -208) +position = Vector2(-37, -303) shape = SubResource("CircleShape2D_dr6bm") [node name="Fence Door2" type="Sprite2D" parent="YSorted/Blocker/BackToFarm"] @@ -2061,6 +2078,17 @@ texture = ExtResource("44_njxly") region_enabled = true region_rect = Rect2(65, 149, 223, 375) +[node name="InteractionArea" parent="YSorted/domovoi" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("31_xcb8u")] +_spritesToOutline = [NodePath("..")] + +[node name="dialogic overlay starter" type="Node2D" parent="YSorted/domovoi"] +script = ExtResource("44_m6p1o") +_timelinesToPlay = PackedStringArray("domovoi_tut") +_startOnReady = false + +[node name="dialogic starter" type="Node" parent="YSorted/domovoi/dialogic overlay starter"] +script = ExtResource("45_1ly1s") + [node name="WateringCan" parent="YSorted" instance=ExtResource("43_dr6bm")] position = Vector2(5220, 2108) @@ -2148,6 +2176,10 @@ script = ExtResource("59_njxly") [connection signal="FilledWateringCan" from="YSorted/Vesna" to="Audio/SFX/FillWater SFX2" method="PlayOneShot"] [connection signal="InteractedTool" from="YSorted/Brünnen/InteractionArea" to="YSorted/Vesna" method="TryFillWateringCan"] [connection signal="InteractedTool" from="YSorted/Blocker/BackToFarm" to="." method="LoadSceneAtIndex"] +[connection signal="Interacted" from="YSorted/domovoi/InteractionArea" to="YSorted/domovoi/dialogic overlay starter" method="ToggleDialogue"] +[connection signal="Dialogue" from="YSorted/domovoi/dialogic overlay starter" to="YSorted/domovoi/dialogic overlay starter/dialogic starter" method="open"] +[connection signal="timelineEnded" from="YSorted/domovoi/dialogic overlay starter/dialogic starter" to="YSorted/domovoi/InteractionArea" method="SetActiveTrue"] +[connection signal="timelineStarted" from="YSorted/domovoi/dialogic overlay starter/dialogic starter" to="YSorted/domovoi/InteractionArea" method="SetActiveFalse"] [connection signal="finished" from="Audio/Background Music Ramp up" to="Audio/Background Music loop" method="PlayFromOffset"] [connection signal="tree_entered" from="SceneNameSetter" to="SceneNameSetter" method="Set"] @@ -2155,22 +2187,31 @@ script = ExtResource("59_njxly") [editable path="YSorted/Brünnen/InteractionArea"] [editable path="YSorted/Farm visuals/FieldParent/BaseField"] [editable path="YSorted/Farm visuals/FieldParent/BaseField/FieldActivator/InteractionArea"] +[editable path="YSorted/Farm visuals/FieldParent/BaseField/SaveSystem"] [editable path="YSorted/Farm visuals/FieldParent/BaseField2"] [editable path="YSorted/Farm visuals/FieldParent/BaseField2/FieldActivator/InteractionArea"] +[editable path="YSorted/Farm visuals/FieldParent/BaseField2/SaveSystem"] [editable path="YSorted/Farm visuals/FieldParent/BaseField3"] [editable path="YSorted/Farm visuals/FieldParent/BaseField3/FieldActivator/InteractionArea"] +[editable path="YSorted/Farm visuals/FieldParent/BaseField3/SaveSystem"] [editable path="YSorted/Farm visuals/FieldParent/BaseField4"] [editable path="YSorted/Farm visuals/FieldParent/BaseField4/FieldActivator/InteractionArea"] +[editable path="YSorted/Farm visuals/FieldParent/BaseField4/SaveSystem"] [editable path="YSorted/Farm visuals/FieldParent/BaseField5"] [editable path="YSorted/Farm visuals/FieldParent/BaseField5/FieldActivator/InteractionArea"] +[editable path="YSorted/Farm visuals/FieldParent/BaseField5/SaveSystem"] [editable path="YSorted/Farm visuals/FieldParent/BaseField6"] [editable path="YSorted/Farm visuals/FieldParent/BaseField6/FieldActivator/InteractionArea"] +[editable path="YSorted/Farm visuals/FieldParent/BaseField6/SaveSystem"] [editable path="YSorted/Farm visuals/FieldParent/BaseField7"] [editable path="YSorted/Farm visuals/FieldParent/BaseField7/FieldActivator/InteractionArea"] +[editable path="YSorted/Farm visuals/FieldParent/BaseField7/SaveSystem"] [editable path="YSorted/Farm visuals/FieldParent/BaseField8"] [editable path="YSorted/Farm visuals/FieldParent/BaseField8/FieldActivator/InteractionArea"] +[editable path="YSorted/Farm visuals/FieldParent/BaseField8/SaveSystem"] [editable path="YSorted/Farm visuals/FieldParent/BaseField9"] [editable path="YSorted/Farm visuals/FieldParent/BaseField9/FieldActivator/InteractionArea"] +[editable path="YSorted/Farm visuals/FieldParent/BaseField9/SaveSystem"] [editable path="YSorted/Blocker/BackToFarm"] [editable path="YSorted/RakeGenericPickup"] [editable path="YSorted/RakeGenericPickup/PickupInteractionArea"] diff --git a/scenes/Babushka_scene_startMenu.tscn b/scenes/scene_startMenu.tscn similarity index 97% rename from scenes/Babushka_scene_startMenu.tscn rename to scenes/scene_startMenu.tscn index 02d132a..62e891b 100644 --- a/scenes/Babushka_scene_startMenu.tscn +++ b/scenes/scene_startMenu.tscn @@ -7,7 +7,7 @@ [node name="BabushkaSceneStartMenu" type="Node2D"] script = ExtResource("1_fj2fh") -_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_farm_outside_2d.tscn") +_sceneNamesToLoad = PackedStringArray("res://scenes/scene_disclaimer.tscn") [node name="CanvasLayer" type="CanvasLayer" parent="."] diff --git a/scenes/IndoorTest.tscn b/scenes/testing/IndoorTest.tscn similarity index 100% rename from scenes/IndoorTest.tscn rename to scenes/testing/IndoorTest.tscn diff --git a/scripts/CSharp/Common/CharacterControls/DetectableInteractionArea.cs b/scripts/CSharp/Common/CharacterControls/DetectableInteractionArea.cs index 2d67333..0781149 100644 --- a/scripts/CSharp/Common/CharacterControls/DetectableInteractionArea.cs +++ b/scripts/CSharp/Common/CharacterControls/DetectableInteractionArea.cs @@ -7,4 +7,17 @@ namespace Babushka.scripts.CSharp.Common.CharacterControls; /// public partial class DetectableInteractionArea : Area2D { + [Export] public InteractionArea2D interactionArea2D; + + public void InteractionAreaSelectionChanged(Variant instanceID) + { + if (instanceID.AsString() == GetInstanceId().ToString()) + { + interactionArea2D.HighlightInteractable(); + } + else + { + interactionArea2D.ResetHighlight(); + } + } } \ No newline at end of file diff --git a/scripts/CSharp/Common/CharacterControls/DetectionCross.cs b/scripts/CSharp/Common/CharacterControls/DetectionCross.cs index 1ce4e12..70010ab 100644 --- a/scripts/CSharp/Common/CharacterControls/DetectionCross.cs +++ b/scripts/CSharp/Common/CharacterControls/DetectionCross.cs @@ -7,7 +7,8 @@ namespace Babushka.scripts.CSharp.Common.CharacterControls; /// public partial class DetectionCross : Node2D { - [Export] private Detector _detector; + [Export] private Detector _collider; + [Export] private ShapeCast2D _shapeCast2D; [Export] private float _xOffset; [Export] private float _yOffset; @@ -17,6 +18,8 @@ public partial class DetectionCross : Node2D /// public void SetDirection(Vector2 direction) { - _detector.Position = new Vector2(direction.X * _xOffset, direction.Y * _yOffset); + Vector2 newPos = new Vector2(direction.X * _xOffset, direction.Y * _yOffset); + _collider.Position = newPos; + _shapeCast2D.TargetPosition = newPos; } } \ No newline at end of file diff --git a/scripts/CSharp/Common/CharacterControls/Detector.cs b/scripts/CSharp/Common/CharacterControls/Detector.cs index 95767d0..1f0b3d3 100644 --- a/scripts/CSharp/Common/CharacterControls/Detector.cs +++ b/scripts/CSharp/Common/CharacterControls/Detector.cs @@ -1,4 +1,6 @@ +using System.Collections.Generic; using Babushka.scripts.CSharp.Common.Services; +using Babushka.scripts.CSharp.Low_Code.Variables; using Godot; namespace Babushka.scripts.CSharp.Common.CharacterControls; @@ -8,18 +10,11 @@ namespace Babushka.scripts.CSharp.Common.CharacterControls; /// public partial class Detector : Area2D { - [Export] private bool _active = true; + [Export] private ShapeCast2D _shapeCast2D; + [Export] private VariableResource _itemToTriggerResource; - /// - /// Called when entering an interactionArea node. - /// - [Signal] public delegate void InteractableEnteredEventHandler(); - - /// - /// Called when exiting an interactionArea node. - /// - [Signal] public delegate void InteractableExitedEventHandler(); + private List _areasInDetector = new(); public bool IsActive { @@ -41,29 +36,62 @@ public partial class Detector : Area2D /// Called every time this node enters an Area2D. /// /// - public void OnEnteredInteractable(Node area) + public void OnEnteredInteractable(Area2D area) { if (!_active || !InputService.Instance.InputEnabled) return; - if (area is DetectableInteractionArea interactionArea2D) - { - EmitSignal(SignalName.InteractableEntered); - } + PopulateList(); + CalculateClosestInteractable(); } /// /// Called whenever this node exits an Area2D. /// /// - public void OnExitedInteractable(Node area) + public void OnExitedInteractable(Area2D area) { if (!_active || !InputService.Instance.InputEnabled) return; - if (area is DetectableInteractionArea interactionArea2D) + PopulateList(); + CalculateClosestInteractable(); + } + + private void PopulateList() + { + // repopulate the list of areas in the detector to account for enabled / disabled areas + var currentOverlap = GetOverlappingAreas(); + _areasInDetector = new List(); + + foreach (var area2D in currentOverlap) { - EmitSignal(SignalName.InteractableExited); + if (area2D is DetectableInteractionArea detectable) + { + ulong id = detectable.GetInstanceId(); + _areasInDetector.Add(id); + } } } + + private void CalculateClosestInteractable() + { + float smallestDistance = float.MaxValue; + string closestInteractable = null; + foreach (var area in _areasInDetector) + { + Area2D? area2D = InstanceFromId(area) as Area2D; + if(area2D == null) + continue; + + float distance = area2D.GlobalPosition.DistanceSquaredTo(ToGlobal(_shapeCast2D.TargetPosition)); + if (distance < smallestDistance) + { + closestInteractable = area.ToString(); + smallestDistance = distance; + } + } + _itemToTriggerResource.Payload = closestInteractable; + } + } \ No newline at end of file diff --git a/scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs b/scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs index 0b84dbd..7fc601a 100644 --- a/scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs +++ b/scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs @@ -1,12 +1,14 @@ using System.Linq; using Babushka.scripts.CSharp.Common.Services; +using Babushka.scripts.CSharp.Low_Code.Variables; using Godot; namespace Babushka.scripts.CSharp.Common.CharacterControls; public partial class InteractionArea2D : Node2D { - [ExportGroup("Settings")] + [ExportGroup("Settings")] + [Export] private VariableListener _selectionChangeListener; [Export] private Area2D _area; [Export] private Label _label; [Export] private bool _active = true; @@ -17,6 +19,7 @@ public partial class InteractionArea2D : Node2D [Export] private int _id = -1; // TODO: remove private Material[] _backupMaterials; + private bool _initializationComplete; [Signal] public delegate void InteractedToolEventHandler(int id); // TODO: remove @@ -25,9 +28,19 @@ public partial class InteractionArea2D : Node2D public bool IsActive { get => _active; - set => _active = value; + set + { + ProcessMode = value ? ProcessModeEnum.Inherit : ProcessModeEnum.Disabled; + Visible = value; + _selectionChangeListener.ProcessMode = value ? ProcessModeEnum.Inherit : ProcessModeEnum.Disabled; + _active = value; + if(!_active && _initializationComplete) + ResetHighlight(); + } } + public bool IsSelectedByDetector { get; set; } = false; + public void SetActiveInverse(bool active) { IsActive = !active; @@ -38,11 +51,14 @@ public partial class InteractionArea2D : Node2D if (_useOutline) { _backupMaterials = _spritesToOutline.Select(s => s.Material).ToArray(); + _initializationComplete = true; } } - public void OnPlayerEntered(Node2D player) + public void HighlightInteractable() { + IsSelectedByDetector = true; + if (!_active || !InputService.Instance.InputEnabled) return; @@ -51,15 +67,16 @@ public partial class InteractionArea2D : Node2D if (!_useOutline) return; - + foreach (var sprite in _spritesToOutline) { sprite.Material = _outlineMaterial; } } - public void OnPlayerExited(Node2D player) + public void ResetHighlight() { + IsSelectedByDetector = false; _label.Hide(); if (!_useOutline) @@ -76,6 +93,9 @@ public partial class InteractionArea2D : Node2D { if (!_active || !InputService.Instance.InputEnabled) return; + + if(!IsSelectedByDetector) + return; if (@event.IsAction("interact") && @event.IsPressed()) { @@ -92,16 +112,7 @@ public partial class InteractionArea2D : Node2D { if (_area.HasOverlappingAreas()) { - _label.Hide(); - - if (_useOutline) - { - for (var i = 0; i < _spritesToOutline.Length; i++) - { - var sprite = _spritesToOutline[i]; - sprite.Material = _backupMaterials[i]; - } - } + ResetHighlight(); Interact(); } } @@ -120,8 +131,20 @@ public partial class InteractionArea2D : Node2D public void ToggleActive() { + GD.Print($"Toggle active {GetParent().Name}: {!_active}"); _active = !_active; _label.Hide(); } + public void SetActiveTrue() + { + IsActive = true; + } + + public void SetActiveFalse() + { + IsActive = false; + } + + } \ No newline at end of file diff --git a/scripts/CSharp/Common/Farming/FieldActivator.cs b/scripts/CSharp/Common/Farming/FieldActivator.cs index f324176..d537bc0 100644 --- a/scripts/CSharp/Common/Farming/FieldActivator.cs +++ b/scripts/CSharp/Common/Farming/FieldActivator.cs @@ -1,15 +1,18 @@ using Babushka.scripts.CSharp.Common.CharacterControls; +using Babushka.scripts.CSharp.Common.Savegame; using Godot; +using Godot.Collections; namespace Babushka.scripts.CSharp.Common.Farming; /// /// Enables a preset field in the scene sothat it can be used for farming. /// -public partial class FieldActivator : Node +public partial class FieldActivator : Node, ISaveable { [Export] private FieldBehaviour2D _field; [Export] private InteractionArea2D _activatorArea; + [Export] private Node _saveIdHolder; private bool _used = false; private bool _rakeInHand; @@ -18,6 +21,7 @@ public partial class FieldActivator : Node public override void _Ready() { + LoadFromSaveData(); ToggleInteractionArea(); } @@ -32,6 +36,8 @@ public partial class FieldActivator : Node _field.UpdateFieldState(FieldState.Tilled); EmitSignal(SignalName.FieldCreated, _field); _used = true; + ToggleInteractionArea(); + UpdateSaveData(); } } @@ -42,6 +48,8 @@ public partial class FieldActivator : Node /// public void RakeActivated(bool activated) { + if (_used || ProcessMode == ProcessModeEnum.Disabled) + return; _rakeInHand = activated; ToggleInteractionArea(); } @@ -50,5 +58,36 @@ public partial class FieldActivator : Node { _activatorArea.IsActive = !_used && _rakeInHand; } - + + public void UpdateSaveData() + { + var payloadData = new Dictionary + { + { "field_activator_used", _used } + }; + + // Building a unique id from the top node's save id and a qualifier to make it new. + string parent_id = _saveIdHolder.GetMeta("SaveID").AsString(); + string id = $"{parent_id}_field_activator"; + SavegameService.AppendDataToSave( id, payloadData); + } + + public void LoadFromSaveData() + { + string parent_id = _saveIdHolder.GetMeta("SaveID").AsString(); + string id = $"{parent_id}_field_activator"; + + Dictionary save = SavegameService.GetSaveData(id); + if (save.Count > 0) + { + if (save.TryGetValue("field_activator_used", out Variant usedVar)) + { + _used = usedVar.AsBool(); + } + else + { + _used = false; + } + } + } } \ No newline at end of file diff --git a/scripts/CSharp/Common/Farming/FieldBehaviour2D.cs b/scripts/CSharp/Common/Farming/FieldBehaviour2D.cs index 969681b..f747986 100644 --- a/scripts/CSharp/Common/Farming/FieldBehaviour2D.cs +++ b/scripts/CSharp/Common/Farming/FieldBehaviour2D.cs @@ -33,7 +33,6 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable [ExportGroup("Field Interactions")] [Export] public InteractionArea2D PlantingInteraction; - [Export] public InteractionArea2D FieldInteractionArea; [ExportGroup("Configuration")] [Export] public Node2D PlantingPlaceholder; @@ -48,6 +47,8 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable private bool _canWater; private int _currentDay; + public bool IsPlanted; + private PlantBehaviour2D? _currentPlant; private const string DAY_COUNTER_SAVE_ID = "12c6da2e-fc71-4281-a04a-dfd3c7943975"; @@ -57,11 +58,11 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable private void UpdateInteractionArea() { // fieldstate == tilled / watered && samen im Inventar - _canPlant = (FieldState == FieldState.Tilled || FieldState == FieldState.Watered) && _seedsActive; + _canPlant = (FieldState == FieldState.Tilled || FieldState == FieldState.Watered) && _seedsActive && !IsPlanted; // fieldstate == tilled && watering can ausgewählt - _canWater = (FieldState == FieldState.Tilled || FieldState == FieldState.Planted) && _wateringCanActive; + _canWater = (FieldState == FieldState.Tilled || IsPlanted) && _wateringCanActive && WateringCanState.GetFillState() > 0; - FieldInteractionArea.IsActive = _canPlant || _canWater; + PlantingInteraction.IsActive = _canPlant || _canWater; } public void ActivatedSeedInInventory(bool activated) @@ -78,9 +79,17 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable public override void _EnterTree() { + WateringCanState.OnFill += UpdateInteractionArea; + WateringCanState.OnEmpty += UpdateInteractionArea; LoadFromSaveData(); } + public override void _ExitTree() + { + WateringCanState.OnFill -= UpdateInteractionArea; + WateringCanState.OnEmpty -= UpdateInteractionArea; + } + public override void _Ready() { if(PlantingPlaceholder.GetChildCount() > 0) @@ -104,17 +113,14 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable case FieldState.Tilled: FieldState = FieldState.Tilled; _fieldSprite.Texture = Tilled; - PlantingInteraction.IsActive = true; + if(!IsPlanted) + PlantingInteraction.IsActive = true; break; case FieldState.Watered: FieldState = FieldState.Watered; _fieldSprite.Texture = Watered; - PlantingInteraction.IsActive = true; - break; - case FieldState.Planted: - FieldState = FieldState.Planted; - _fieldSprite.Texture = Tilled; - PlantingInteraction.IsActive = false; + if(!IsPlanted) + PlantingInteraction.IsActive = true; break; default: FieldState = FieldState.NotFound; @@ -125,7 +131,6 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable UpdateSaveData(); } - public void Water() { if (WateringCanState.GetFillState() > 0 && FieldState != FieldState.Watered) @@ -151,7 +156,7 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable if (_canPlant && TryPlant()) { EmitSignal(SignalName.Planted); - UpdateFieldState(FieldState.Planted); + UpdateSaveData(); } if (_canWater) @@ -159,6 +164,16 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable Water(); } } + + public void ChangePlantedState() + { + IsPlanted = true; + if(FieldState == FieldState.Tilled) + _fieldSprite.Texture = Tilled; + if(FieldState == FieldState.Watered) + _fieldSprite.Texture = Watered; + PlantingInteraction.IsActive = false; + } private bool TryPlant() { @@ -187,6 +202,7 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable if (_currentPlant != null) { + ChangePlantedState(); _currentPlant.DayPlanted = _currentDay; } } @@ -209,6 +225,7 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable { _currentPlant = null; UpdateFieldState(FieldState.Empty, true); + IsPlanted = false; } #region SAVE AND LOAD @@ -221,10 +238,10 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable var payloadData = new Dictionary { { "field_state", (int)FieldState }, - { "day_count_on_last_exit", _currentDay} + { "day_count_on_last_exit", _currentDay}, }; - if (_currentPlant != null) + if (IsPlanted) { payloadData.Add( "plant_data", new Dictionary() @@ -258,6 +275,7 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable // get plant first because it's also relevant for the field state if (save.TryGetValue("plant_data", out Variant plantDataVar)) { + IsPlanted = true; Dictionary plantDataDict = plantDataVar.AsGodotDictionary(); if (plantDataDict.TryGetValue("prefab_path", out Variant prefabPathVar)) @@ -314,17 +332,10 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable // if day is today, then just use the provided field state as is. if (CalendarController.Instance != null && _currentDay != lastDayCount) { - // if the field was watered the day before, set it to tilled or planted. + // if the field was watered the day before, set it to tilled if (fieldStateInt == 3) { - if (_currentPlant != null) - { - fieldStateInt = 2; - } - else - { - fieldStateInt = 1; - } + fieldStateInt = 1; } } } diff --git a/scripts/CSharp/Common/Farming/FieldState.cs b/scripts/CSharp/Common/Farming/FieldState.cs index b489bb8..730ba38 100644 --- a/scripts/CSharp/Common/Farming/FieldState.cs +++ b/scripts/CSharp/Common/Farming/FieldState.cs @@ -7,7 +7,6 @@ public enum FieldState { Empty = 0, Tilled = 1, - Planted = 2, Watered = 3, NotFound = 99 } \ No newline at end of file diff --git a/scripts/CSharp/Common/Farming/PlantBehaviour2D.cs b/scripts/CSharp/Common/Farming/PlantBehaviour2D.cs index 660e304..f640695 100644 --- a/scripts/CSharp/Common/Farming/PlantBehaviour2D.cs +++ b/scripts/CSharp/Common/Farming/PlantBehaviour2D.cs @@ -3,7 +3,6 @@ using System.Diagnostics; using Babushka.scripts.CSharp.Common.Inventory; using Babushka.scripts.CSharp.Low_Code.Variables; using Godot; -using Godot.Collections; namespace Babushka.scripts.CSharp.Common.Farming; @@ -187,6 +186,7 @@ public partial class PlantBehaviour2D : Node2D private void SetActiveHarvestablePlant(bool active) { _harvestablePlant.IsActive = active; + _harvestablePlant.ProcessMode = active ? ProcessModeEnum.Inherit : ProcessModeEnum.Disabled; _harvestablePlant.UpdateVisuals(); } diff --git a/scripts/CSharp/Common/Farming/WateringCanState.cs b/scripts/CSharp/Common/Farming/WateringCanState.cs index 359ee6f..9e6fb08 100644 --- a/scripts/CSharp/Common/Farming/WateringCanState.cs +++ b/scripts/CSharp/Common/Farming/WateringCanState.cs @@ -30,6 +30,7 @@ public static class WateringCanState public static event WateringCanDelegate WateringCanActiveStateChanged; public static event Action? OnWater; public static event Action? OnFill; + public static event Action? OnEmpty; @@ -52,6 +53,11 @@ public static class WateringCanState _fillstate--; OnWater?.Invoke(); } + + if (_fillstate == 0) + { + OnEmpty?.Invoke(); + } } /// diff --git a/scripts/CSharp/Common/Farming/WellBehaviour.cs b/scripts/CSharp/Common/Farming/WellBehaviour.cs index 51b2958..eafabd2 100644 --- a/scripts/CSharp/Common/Farming/WellBehaviour.cs +++ b/scripts/CSharp/Common/Farming/WellBehaviour.cs @@ -7,11 +7,16 @@ public partial class WellBehaviour : Node2D { [Export] private InteractionArea2D _interactionArea; - public override void _Ready() + public override void _EnterTree() { WateringCanState.WateringCanActiveStateChanged += OnWateringCanStateChanged; } + public override void _ExitTree() + { + WateringCanState.WateringCanActiveStateChanged -= OnWateringCanStateChanged; + } + private void OnWateringCanStateChanged(bool state) { _interactionArea.IsActive = state; diff --git a/scripts/CSharp/Common/Interactables/TrashObject.cs b/scripts/CSharp/Common/Interactables/TrashObject.cs new file mode 100644 index 0000000..b594db9 --- /dev/null +++ b/scripts/CSharp/Common/Interactables/TrashObject.cs @@ -0,0 +1,69 @@ +using Godot; +using Babushka.scripts.CSharp.Common.Savegame; +using Godot.Collections; + +/// +/// Simple collectible scene objects with saveable state. +/// +public partial class TrashObject : Sprite2D, ISaveable +{ + private bool _collected; + + /// + /// Loads objects state on scene start. + /// + public override void _Ready() + { + LoadFromSaveData(); + } + + /// + /// Sets object state to collected and updates save data. + /// + public void Collect() + { + SetCollectedState(); + UpdateSaveData(); + } + + private void SetCollectedState() + { + _collected = true; + Visible = false; + ProcessMode = ProcessModeEnum.Disabled; + } + + /// + /// Updates the save data with the current state of the object. + /// + public void UpdateSaveData() + { + var payloadData = new Dictionary + { + { "collectedState", _collected }, + }; + + string id = GetMeta("SaveID").AsString(); + SavegameService.AppendDataToSave( id, payloadData); + } + + /// + /// Loads objects state from save data. + /// + public void LoadFromSaveData() + { + string id = GetMeta("SaveID").AsString(); + + Dictionary save = SavegameService.GetSaveData(id); + if (save.Count > 0) + { + if (save.TryGetValue("collectedState", out Variant collectedVar)) + { + if (collectedVar.AsBool()) + { + SetCollectedState(); + } + } + } + } +} diff --git a/scripts/CSharp/Common/Interactables/TrashObject.cs.uid b/scripts/CSharp/Common/Interactables/TrashObject.cs.uid new file mode 100644 index 0000000..80d75b7 --- /dev/null +++ b/scripts/CSharp/Common/Interactables/TrashObject.cs.uid @@ -0,0 +1 @@ +uid://c2cgj153m05sp diff --git a/scripts/CSharp/Common/Temp/MVPDuck.cs b/scripts/CSharp/Common/Temp/MVPDuck.cs index 1cd019d..08a9fa6 100644 --- a/scripts/CSharp/Common/Temp/MVPDuck.cs +++ b/scripts/CSharp/Common/Temp/MVPDuck.cs @@ -1,6 +1,4 @@ -using System.Threading.Tasks; using Babushka.scripts.CSharp.Common.Savegame; -using Babushka.scripts.CSharp.Low_Code.Variables; using Godot; using Godot.Collections; diff --git a/scripts/CSharp/Low Code/Variables/VariableListener.cs b/scripts/CSharp/Low Code/Variables/VariableListener.cs index 2576015..90573a9 100644 --- a/scripts/CSharp/Low Code/Variables/VariableListener.cs +++ b/scripts/CSharp/Low Code/Variables/VariableListener.cs @@ -63,6 +63,9 @@ public partial class VariableListener : Node /// public void EventPayloadChanged(Variant payload, Variant oldPayload) { + if (ProcessMode == ProcessModeEnum.Disabled) + return; + if(_showLog) GD.Print($"Calling Event Payload Changed Signals on: " + Name); EmitSignal(SignalName.PayloadChanged, payload, oldPayload);