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/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/scenes/scene_farm_outside_2d.tscn b/scenes/scene_farm_outside_2d.tscn index 65907a8..eefb06f 100644 --- a/scenes/scene_farm_outside_2d.tscn +++ b/scenes/scene_farm_outside_2d.tscn @@ -1215,9 +1215,10 @@ 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("31_8uout")] +[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" diff --git a/scenes/scene_indoor_vesnas_room.tscn b/scenes/scene_indoor_vesnas_room.tscn index 1959bf6..385acf5 100644 --- a/scenes/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"] @@ -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/scene_outside_beets.tscn b/scenes/scene_outside_beets.tscn index 7d4bfc5..3a96e6a 100644 --- a/scenes/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=98 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"] @@ -201,10 +201,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 @@ -1835,6 +1831,9 @@ _state = 2 _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 @@ -1990,15 +1989,15 @@ 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 FieldState = 1 -metadata/SaveID = "9919b294-04a1-4a16-9783-38c8aa0e291c" +metadata/SaveID = "da44e54a-0b76-4888-ad8b-782a9d146fa3" [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField9/FieldBehaviour" index="1"] z_index = 1 @@ -2007,8 +2006,11 @@ z_index = 1 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"] @@ -2168,22 +2170,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"]