diff --git a/dialog/Scene1_farm_outside/yeli_intro_05.dtl b/dialog/Scene1_farm_outside/yeli_intro_05.dtl index e1037f1..39183e5 100644 --- a/dialog/Scene1_farm_outside/yeli_intro_05.dtl +++ b/dialog/Scene1_farm_outside/yeli_intro_05.dtl @@ -1,7 +1,7 @@ [quest_complete quest_resource="res://resources/quests/demo/7_talk_yeli_inside_1.tres"] join Yeli right Yeli: Thank you for your help out there. -Yeli: You must be tired. Please rest. I prepared a bed for you. It's in the room to the left. +Yeli: You must be tired. Please rest. I prepared a bed for you. It's the door in the middle. Yeli: There is nothing interesting to see here. leave Yeli [quest_activate quest_resource="res://resources/quests/demo/8_goto_bed.tres"] diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 565c512..be2050a 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -278,7 +278,7 @@ metadata/_custom_type_script = "uid://be54lnb6gg81f" [node name="BabushkaSceneFarmOutside2d" type="Node2D"] script = ExtResource("34_e5b7x") -_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_kitchen.tscn", "res://scenes/Babushka_scene_outside_beets.tscn") +_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn", "res://scenes/Babushka_scene_outside_beets.tscn") [node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")] position = Vector2(3180, 1961) @@ -802,7 +802,7 @@ z_index = -50 motion_mirroring = Vector2(3779, 0) [node name="Sonnenblumeseamless" type="Sprite2D" parent="ParallaxBackground/sunflower field"] -modulate = Color(1, 0.5294118, 1, 0.7921569) +modulate = Color(1, 1, 1, 0.7921569) position = Vector2(0, 1863) texture = ExtResource("23_d77e7") offset = Vector2(1892, 0) diff --git a/scenes/Babushka_scene_indoor_common_room.tscn b/scenes/Babushka_scene_indoor_common_room.tscn index ed4fc55..5b5f74e 100644 --- a/scenes/Babushka_scene_indoor_common_room.tscn +++ b/scenes/Babushka_scene_indoor_common_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=40 format=3 uid="uid://bm21nqepnwaik"] +[gd_scene load_steps=41 format=3 uid="uid://bm21nqepnwaik"] [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_3vr4f"] [ext_resource type="Texture2D" uid="uid://cnhsxxps2cw5" path="res://art/indoor/room export/Room_01_table.png" id="2_ubg3a"] @@ -30,16 +30,13 @@ [ext_resource type="AudioStream" uid="uid://r2f6xmjvyyjv" path="res://audio/sfx/Animals/SFX_Cat_Purr_01.wav" id="21_ytap8"] [ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="22_tggq2"] [ext_resource type="Resource" uid="uid://cbpurnewhyefa" path="res://resources/quests/beetRoot.tres" id="22_yd2gv"] +[ext_resource type="Texture2D" uid="uid://da67c7avarwq2" path="res://art/indoor/kitchen_bgAssets.png" id="23_d7yky"] [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="24_yd2gv"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_a2ood"] resource_local_to_scene = true size = Vector2(3836, 1086) -[sub_resource type="CircleShape2D" id="CircleShape2D_yd2gv"] -resource_local_to_scene = true -radius = 300.0 - [sub_resource type="CircleShape2D" id="CircleShape2D_gpagp"] resource_local_to_scene = true radius = 300.0 @@ -210,6 +207,10 @@ _data = { &"hand_stretch": SubResource("Animation_8o6or") } +[sub_resource type="CircleShape2D" id="CircleShape2D_yd2gv"] +resource_local_to_scene = true +radius = 300.0 + [sub_resource type="CircleShape2D" id="CircleShape2D_wuntg"] resource_local_to_scene = true radius = 400.0 @@ -218,7 +219,7 @@ radius = 400.0 z_index = 1 y_sort_enabled = true script = ExtResource("1_3vr4f") -_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_vesnas_room.tscn", "res://scenes/Babushka_scene_indoor_kitchen.tscn") +_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_vesnas_room.tscn", "res://scenes/Babushka_scene_indoor_kitchen.tscn", "res://scenes/Babushka_scene_farm_outside_2d.tscn") [node name="Foreground" type="Node" parent="."] @@ -304,34 +305,6 @@ region_rect = Rect2(111, 292, 3323, 2160) position = Vector2(950, -419) shape = SubResource("RectangleShape2D_a2ood") -[node name="Room01DorrR" type="Sprite2D" parent="BackWall"] -z_index = -50 -position = Vector2(936, -216) -texture = ExtResource("6_blyw3") -region_enabled = true -region_rect = Rect2(3161, 313, 679, 1050) - -[node name="OutsideDoor" parent="BackWall/Room01DorrR" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] -position = Vector2(-7, 248) -scale = Vector2(1.5, 1.5) -_spritesToOutline = [NodePath("..")] -_id = 1 - -[node name="Room01DoorL" type="Sprite2D" parent="BackWall"] -z_index = -50 -position = Vector2(-3296, 48) -texture = ExtResource("7_yd2gv") -region_enabled = true -region_rect = Rect2(0, 0, 3840, 2160) - -[node name="VesnasRoomDoor" parent="BackWall/Room01DoorL" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] -position = Vector2(-1559, -16) -_spritesToOutline = [NodePath("..")] -_id = 0 - -[node name="CollisionShape3D" parent="BackWall/Room01DoorL/VesnasRoomDoor/Area2D" index="0"] -shape = SubResource("CircleShape2D_yd2gv") - [node name="Room01Pechka" type="Sprite2D" parent="BackWall"] z_index = -80 position = Vector2(-224, -392) @@ -341,14 +314,14 @@ region_rect = Rect2(2236, 0, 724, 1392) [node name="Room01Window2" type="Sprite2D" parent="BackWall"] z_index = -50 -position = Vector2(-3192, -344) +position = Vector2(-5870, -408) texture = ExtResource("9_aoesu") region_enabled = true region_rect = Rect2(1020, 338, 607, 757) [node name="Room01Window3" type="Sprite2D" parent="BackWall"] z_index = -50 -position = Vector2(-1792, -336) +position = Vector2(-3931, -397) texture = ExtResource("9_aoesu") region_enabled = true region_rect = Rect2(1020, 338, 607, 757) @@ -374,46 +347,39 @@ texture = ExtResource("11_as3nm") region_enabled = true region_rect = Rect2(2469, 459, 247, 131) -[node name="Room01Shelf" type="Sprite2D" parent="BackWall"] -z_index = -50 -position = Vector2(-880, -416) -texture = ExtResource("12_bu2a1") -region_enabled = true -region_rect = Rect2(1846, 471, 348, 490) - [node name="Bench" type="Sprite2D" parent="BackWall"] z_index = -10 y_sort_enabled = true -position = Vector2(-3240, 224) +position = Vector2(-5070, 1051) texture = ExtResource("13_rongr") flip_h = true region_enabled = true region_rect = Rect2(1156, 1185, 940, 189) -[node name="Bench2" type="Sprite2D" parent="BackWall"] +[node name="Katze" type="Sprite2D" parent="BackWall/Bench"] z_index = -10 -position = Vector2(-1824, 224) -texture = ExtResource("13_rongr") -region_enabled = true -region_rect = Rect2(1156, 1185, 940, 189) - -[node name="Katze" type="Sprite2D" parent="BackWall"] -z_index = -10 -position = Vector2(-4051, 332) +position = Vector2(61, -87) scale = Vector2(2, 2) texture = ExtResource("15_sndxu") offset = Vector2(-8, -126) -[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="BackWall/Katze"] +[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="BackWall/Bench/Katze"] stream = SubResource("AudioStreamRandomizer_b6vf7") bus = &"SFX" script = ExtResource("22_tggq2") -[node name="InteractionArea" parent="BackWall/Katze" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] +[node name="InteractionArea" parent="BackWall/Bench/Katze" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] position = Vector2(-6.5, -44) scale = Vector2(0.5, 0.5) _spritesToOutline = [NodePath("..")] +[node name="Bench2" type="Sprite2D" parent="BackWall"] +z_index = -10 +position = Vector2(-2906, 243) +texture = ExtResource("13_rongr") +region_enabled = true +region_rect = Rect2(1156, 1185, 940, 189) + [node name="Room assets" type="Node" parent="BackWall"] [node name="wood" type="Sprite2D" parent="BackWall/Room assets"] @@ -434,19 +400,10 @@ offset = Vector2(-14.6475, -97.651) region_enabled = true region_rect = Rect2(3157, 688, 118.519, 221) -[node name="vase" type="Sprite2D" parent="BackWall/Room assets"] -z_index = -10 -y_sort_enabled = true -position = Vector2(-857, -37.5) -texture = ExtResource("4_27bwy") -offset = Vector2(0, -296) -region_enabled = true -region_rect = Rect2(2748, 432, 174, 191) - [node name="candle" type="Sprite2D" parent="BackWall/Room assets"] z_index = -10 y_sort_enabled = true -position = Vector2(-425, -77.5) +position = Vector2(-852, -187) rotation = -0.0663225 texture = ExtResource("4_27bwy") offset = Vector2(0, -296) @@ -534,6 +491,66 @@ offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2576, 802, 219, 64) +[node name="Doors" type="Node2D" parent="BackWall"] + +[node name="Door_Kitchen" type="Sprite2D" parent="BackWall/Doors"] +z_index = -50 +position = Vector2(923, -221) +texture = ExtResource("6_blyw3") +region_enabled = true +region_rect = Rect2(3161, 313, 679, 1050) + +[node name="KitchendoorInteraction" parent="BackWall/Doors/Door_Kitchen" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] +position = Vector2(-7, 248) +scale = Vector2(1.5, 1.5) +_spritesToOutline = [NodePath("..")] +_id = 1 + +[node name="Door_Outside" type="Sprite2D" parent="BackWall/Doors"] +z_index = -50 +position = Vector2(-4917, -226) +texture = ExtResource("23_d7yky") +region_enabled = true +region_rect = Rect2(3009, 666, 679, 1050) + +[node name="OutsideDoor" parent="BackWall/Doors/Door_Outside" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] +position = Vector2(-7, 248) +scale = Vector2(1.5, 1.5) +_spritesToOutline = [NodePath("..")] +_id = 2 + +[node name="Door_Bedroom" type="Sprite2D" parent="BackWall/Doors"] +z_index = -50 +position = Vector2(-1620, -259) +texture = ExtResource("7_yd2gv") +region_enabled = true +region_rect = Rect2(0, 165, 763, 1224) + +[node name="VesnasRoomDoor" parent="BackWall/Doors/Door_Bedroom" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")] +position = Vector2(2, 233) +_spritesToOutline = [NodePath("..")] +_id = 0 + +[node name="CollisionShape3D" parent="BackWall/Doors/Door_Bedroom/VesnasRoomDoor/Area2D" index="0"] +shape = SubResource("CircleShape2D_yd2gv") + +[node name="Shelf" type="Sprite2D" parent="BackWall"] +z_index = -50 +position = Vector2(-880, -416) +texture = ExtResource("12_bu2a1") +region_enabled = true +region_rect = Rect2(1846, 471, 348, 490) + +[node name="vase" type="Sprite2D" parent="BackWall/Shelf"] +visible = false +z_index = -10 +y_sort_enabled = true +position = Vector2(23, 378.5) +texture = ExtResource("4_27bwy") +offset = Vector2(0, -296) +region_enabled = true +region_rect = Rect2(2748, 432, 174, 191) + [node name="Vesna" parent="." instance=ExtResource("15_7a68a")] y_sort_enabled = false position = Vector2(-920, 319) @@ -541,18 +558,18 @@ position = Vector2(-920, 319) [node name="Yeli" parent="." instance=ExtResource("16_dhsxs")] z_index = 0 y_sort_enabled = false -position = Vector2(-1395, 16) +position = Vector2(-2841, 198) _timelinesToPlay = PackedStringArray("yeli_intro_05") [node name="InteractionArea" parent="Yeli" index="0"] -position = Vector2(-373, -63) +position = Vector2(0, -63) [node name="CollisionShape3D" parent="Yeli/InteractionArea/Area2D" index="0"] position = Vector2(-225.99994, 33) shape = SubResource("CircleShape2D_wuntg") [node name="AnimatedSprite" parent="Yeli/TalkingControl" index="0"] -position = Vector2(-576, 368) +position = Vector2(-224, 373) [node name="CollisionShape2D" parent="Yeli/AnimatableBody2D" index="0"] position = Vector2(-565, 464) @@ -580,15 +597,16 @@ _followNode = NodePath("../Vesna/CharacterBody2D") [node name="CanvasLayer" parent="." instance=ExtResource("24_yd2gv")] -[connection signal="InteractedTool" from="BackWall/Room01DorrR/OutsideDoor" to="." method="LoadSceneAtIndex"] -[connection signal="InteractedTool" from="BackWall/Room01DoorL/VesnasRoomDoor" to="." method="LoadSceneAtIndex"] [connection signal="Interacted" from="BackWall/Room01PechkaDoor/InteractionArea" to="BackWall/Room01PechkaDoor/InteractionArea" method="ToggleActive"] [connection signal="Interacted" from="BackWall/Room01PechkaDoor/InteractionArea" to="BackWall/Room assets/hand" method="PlayAnimation"] -[connection signal="Interacted" from="BackWall/Katze/InteractionArea" to="BackWall/Katze/AudioStreamPlayer2D" method="PlayOneShot"] +[connection signal="Interacted" from="BackWall/Bench/Katze/InteractionArea" to="BackWall/Bench/Katze/AudioStreamPlayer2D" method="PlayOneShot"] +[connection signal="InteractedTool" from="BackWall/Doors/Door_Kitchen/KitchendoorInteraction" to="." method="LoadSceneAtIndex"] +[connection signal="InteractedTool" from="BackWall/Doors/Door_Outside/OutsideDoor" to="." method="LoadSceneAtIndex"] +[connection signal="InteractedTool" from="BackWall/Doors/Door_Bedroom/VesnasRoomDoor" to="." method="LoadSceneAtIndex"] [connection signal="timelineEnded" from="Yeli/dialogic_toggle" to="Yeli/Beetroot Quest trigger" method="Trigger"] -[editable path="BackWall/Room01DoorL/VesnasRoomDoor"] [editable path="BackWall/Room01PechkaDoor/InteractionArea"] +[editable path="BackWall/Doors/Door_Bedroom/VesnasRoomDoor"] [editable path="Vesna"] [editable path="Yeli"] [editable path="Yeli/InteractionArea"] diff --git a/scenes/Babushka_scene_indoor_kitchen.tscn b/scenes/Babushka_scene_indoor_kitchen.tscn index 23a7f5a..4895ee3 100644 --- a/scenes/Babushka_scene_indoor_kitchen.tscn +++ b/scenes/Babushka_scene_indoor_kitchen.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=9 format=3 uid="uid://bvp5ju36h1vl2"] +[gd_scene load_steps=10 format=3 uid="uid://bvp5ju36h1vl2"] [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_ftmt4"] [ext_resource type="Texture2D" uid="uid://da67c7avarwq2" path="res://art/indoor/kitchen_bgAssets.png" id="2_qsw8g"] +[ext_resource type="Texture2D" uid="uid://x7trh4dgsvoe" path="res://art/indoor/room export/Room_01_assets.png" id="5_3wvmt"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="7_6mpmc"] [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="25_58hm8"] [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="30_wqpex"] @@ -19,7 +20,7 @@ radius = 300.0 z_index = 1 y_sort_enabled = true script = ExtResource("1_ftmt4") -_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_farm_outside_2d.tscn", "res://scenes/Babushka_scene_indoor_common_room.tscn") +_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn") [node name="Foreground" type="Node" parent="."] @@ -171,18 +172,6 @@ texture = ExtResource("2_qsw8g") region_enabled = true region_rect = Rect2(0, 2246, 3840, 912) -[node name="Room01DorrR" type="Sprite2D" parent="Background"] -position = Vector2(-250, -216) -texture = ExtResource("2_qsw8g") -region_enabled = true -region_rect = Rect2(3009, 666, 679, 1050) - -[node name="OutsideDoor" parent="Background/Room01DorrR" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("7_6mpmc")] -position = Vector2(-7, 248) -scale = Vector2(1.5, 1.5) -_spritesToOutline = [NodePath("..")] -_id = 0 - [node name="Room01DoorL" type="Sprite2D" parent="Background"] position = Vector2(-4000, -221) texture = ExtResource("2_qsw8g") @@ -191,7 +180,7 @@ region_rect = Rect2(92, 458, 641, 1050) [node name="CommonRoomDoor" parent="Background/Room01DoorL" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("7_6mpmc")] _spritesToOutline = [NodePath("..")] -_id = 1 +_id = 0 [node name="CollisionShape3D" parent="Background/Room01DoorL/CommonRoomDoor/Area2D" index="0"] shape = SubResource("CircleShape2D_yd2gv") @@ -246,6 +235,15 @@ flip_h = true region_enabled = true region_rect = Rect2(3037, 440, 701, 170) +[node name="vase" type="Sprite2D" parent="BackItems/wallshelf"] +z_index = -10 +y_sort_enabled = true +position = Vector2(42, 124) +texture = ExtResource("5_3wvmt") +offset = Vector2(0, -296) +region_enabled = true +region_rect = Rect2(2748, 432, 174, 191) + [node name="FrontItems" type="Node2D" parent="."] z_index = 50 @@ -276,7 +274,6 @@ texture = ExtResource("2_qsw8g") region_enabled = true region_rect = Rect2(1599, 1107, 1351, 418) -[connection signal="InteractedTool" from="Background/Room01DorrR/OutsideDoor" to="." method="LoadSceneAtIndex"] [connection signal="InteractedTool" from="Background/Room01DoorL/CommonRoomDoor" to="." method="LoadSceneAtIndex"] [connection signal="Interacted" from="FrontItems/Stove/Firetoggle" to="FrontItems/Stove/Fireleft" method="hide"] [connection signal="Interacted" from="FrontItems/Stove/Firetoggle" to="FrontItems/Stove/FireRight" method="hide"]