diff --git a/prefabs/characters/Chugar.tscn b/prefabs/characters/Chugar.tscn index c1f1cd6..48a8efa 100644 --- a/prefabs/characters/Chugar.tscn +++ b/prefabs/characters/Chugar.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=8 format=3 uid="uid://ddpl8cbck7e6s"] +[gd_scene load_steps=9 format=3 uid="uid://ddpl8cbck7e6s"] [ext_resource type="Script" uid="uid://d0kgxh4ykuv23" path="res://scripts/CSharp/Common/NPC/TalkingCharacter.cs" id="1_xix7p"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="2_udjjv"] [ext_resource type="Texture2D" uid="uid://bgba1uv0muxat" path="res://art/characters/chugeist_tmp.png" id="3_42og6"] +[ext_resource type="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/intaractable_outline.tres" id="3_kd44q"] [ext_resource type="Script" uid="uid://d2486x6upmwqq" path="res://scripts/GdScript/dialogic_starter.gd" id="43_xooq4"] -[ext_resource type="Script" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_v6w16"] +[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_v6w16"] [sub_resource type="CircleShape2D" id="CircleShape2D_at1n1"] resource_local_to_scene = true @@ -20,24 +21,16 @@ z_index = 1 y_sort_enabled = true script = ExtResource("1_xix7p") -[node name="InteractionArea" parent="." instance=ExtResource("2_udjjv")] +[node name="InteractionArea" parent="." node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("2_udjjv")] position = Vector2(0, -450) scale = Vector2(2.805, 2.805) +_outlineMaterial = ExtResource("3_kd44q") +_spriteToOutline = NodePath("../TalkingControl/Visual") [node name="CollisionShape3D" parent="InteractionArea/Area2D" index="0"] position = Vector2(-4.99109, 63.4581) shape = SubResource("CircleShape2D_at1n1") -[node name="Label" parent="InteractionArea" index="1"] -z_index = 5 -custom_minimum_size = Vector2(10, 10) -offset_left = -131.194 -offset_top = -157.219 -offset_right = 115.806 -offset_bottom = -54.2193 -theme_override_font_sizes/font_size = 60 -text = "[E] talk" - [node name="TalkingControl" type="Node2D" parent="."] [node name="Visual" type="Sprite2D" parent="TalkingControl"] diff --git a/prefabs/farm/beet_field.tscn b/prefabs/farm/beet_field.tscn index 3b94f13..f491ec4 100644 --- a/prefabs/farm/beet_field.tscn +++ b/prefabs/farm/beet_field.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=13 format=3 uid="uid://d4m5iy5mwqpq3"] +[gd_scene load_steps=14 format=3 uid="uid://d4m5iy5mwqpq3"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="1_tp1yj"] [ext_resource type="Script" uid="uid://bdffon388rkty" path="res://scripts/CSharp/Common/Farming/FieldBehaviour2D.cs" id="2_c6u1a"] +[ext_resource type="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/intaractable_outline.tres" id="2_pdgar"] [ext_resource type="Texture2D" uid="uid://cgmu3qlovdr22" path="res://art/masks/field_outline_1.png" id="3_b5av1"] [ext_resource type="Texture2D" uid="uid://eg5ej0mtuac" path="res://art/masks/field_outline_2.png" id="4_yav45"] [ext_resource type="Texture2D" uid="uid://djpigvoyadvjs" path="res://art/masks/field_outline_3.png" id="5_pdgar"] @@ -12,16 +13,18 @@ [ext_resource type="Script" uid="uid://dnipeibppjirs" path="res://scripts/CSharp/Common/NPC/DialogicOverlayStarter.cs" id="10_yav45"] [ext_resource type="Script" uid="uid://drle5aies8ye4" path="res://scripts/GdScript/dialogic_event_forward.gd" id="11_yav45"] -[sub_resource type="CircleShape2D" id="CircleShape2D_tp1yj"] +[sub_resource type="CircleShape2D" id="CircleShape2D_a35l4"] resource_local_to_scene = true radius = 300.0 [node name="BaseField" type="Node2D"] -[node name="InteractionArea2" parent="." instance=ExtResource("1_tp1yj")] +[node name="InteractionArea2" parent="." node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("1_tp1yj")] visible = false z_index = 1 scale = Vector2(2.225, 2.225) +_outlineMaterial = ExtResource("2_pdgar") +_spriteToOutline = NodePath("../FieldBehaviour/MaskedField") [node name="FieldBehaviour" type="Sprite2D" parent="." node_paths=PackedStringArray("_fieldSprite", "_maskSprite", "_growingCollider")] z_index = -1 @@ -50,8 +53,8 @@ _field = NodePath("..") [node name="01" parent="FieldBehaviour/BeetRoot/BigPlant" index="0"] visible = true -[node name="CollisionShape3D" parent="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"] -shape = SubResource("CircleShape2D_tp1yj") +[node name="CollisionShape3D" parent="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_a35l4") [node name="01" parent="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/ReadyPlant" index="0"] scale = Vector2(3, 3) @@ -84,4 +87,4 @@ eventName = "MagicWord" [editable path="FieldBehaviour/BeetRoot"] [editable path="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem"] -[editable path="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2"] +[editable path="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea"] diff --git a/prefabs/farm/beet_plant.tscn b/prefabs/farm/beet_plant.tscn index 2621373..9ab0020 100644 --- a/prefabs/farm/beet_plant.tscn +++ b/prefabs/farm/beet_plant.tscn @@ -20,7 +20,7 @@ shader_parameter/distortion = 0.0 shader_parameter/heightOffset = 0.635 shader_parameter/offset = 0.0 -[sub_resource type="CircleShape2D" id="CircleShape2D_2tt5u"] +[sub_resource type="CircleShape2D" id="CircleShape2D_rvwu0"] resource_local_to_scene = true radius = 300.0 @@ -126,6 +126,8 @@ region_rect = Rect2(18, 311, 129, 142) [node name="InteractionArea" parent="." instance=ExtResource("4_cfgyx")] position = Vector2(0, 2.3) +_useOutline = false +_useSprite = false [node name="ReadyPlantInventoryItem" parent="." instance=ExtResource("5_25lcb")] position = Vector2(0, 2.3) @@ -140,8 +142,8 @@ visible = false [node name="PickupErrorLabel" parent="ReadyPlantInventoryItem" index="2"] visible = false -[node name="CollisionShape3D" parent="ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"] -shape = SubResource("CircleShape2D_2tt5u") +[node name="CollisionShape3D" parent="ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_rvwu0") [node name="Icon" parent="ReadyPlantInventoryItem" index="4"] visible = false @@ -202,4 +204,4 @@ hue_variation_max = 0.4 [connection signal="Interacted" from="InteractionArea" to="." method="Grow"] [editable path="ReadyPlantInventoryItem"] -[editable path="ReadyPlantInventoryItem/InteractionArea2"] +[editable path="ReadyPlantInventoryItem/PickupInteractionArea"] diff --git a/prefabs/farm/tomato_field.tscn b/prefabs/farm/tomato_field.tscn index 23aa8b2..8f1e2bf 100644 --- a/prefabs/farm/tomato_field.tscn +++ b/prefabs/farm/tomato_field.tscn @@ -30,22 +30,16 @@ Watered = ExtResource("7_f504p") _growingCollider = NodePath("BasePlant2/GrowingInteractionArea") [node name="BasePlant2" parent="FieldBehaviour" node_paths=PackedStringArray("_field") groups=["PlantGrowing"] instance=ExtResource("8_jrdc4")] +visible = false _field = NodePath("..") _magicWordNeeded = false [node name="CollisionShape3D" parent="FieldBehaviour/BasePlant2/GrowingInteractionArea/Area2D" index="0"] shape = SubResource("CircleShape2D_jrdc4") -[node name="Label" parent="FieldBehaviour/BasePlant2/GrowingInteractionArea" index="1"] -text = "[E] Grow -" - [node name="CollisionShape3D" parent="FieldBehaviour/BasePlant2/ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"] shape = SubResource("CircleShape2D_l0vvv") -[node name="Label" parent="FieldBehaviour/BasePlant2/ReadyPlantInventoryItem/PickupInteractionArea" index="1"] -text = "[E] Harvest" - [node name="MaskedField" type="Sprite2D" parent="FieldBehaviour"] clip_children = 1 scale = Vector2(1.5, 1.5) diff --git a/prefabs/farm/tomato_plant.tscn b/prefabs/farm/tomato_plant.tscn index b52936d..a342358 100644 --- a/prefabs/farm/tomato_plant.tscn +++ b/prefabs/farm/tomato_plant.tscn @@ -140,13 +140,12 @@ region_rect = Rect2(546, 697, 535, 687) [node name="GrowingInteractionArea" parent="." instance=ExtResource("5_3j24b")] position = Vector2(0, 2.3) +_useOutline = false +_useSprite = false [node name="CollisionShape3D" parent="GrowingInteractionArea/Area2D" index="0"] shape = SubResource("CircleShape2D_vjw4j") -[node name="Label" parent="GrowingInteractionArea" index="1"] -text = "[E] Grow" - [node name="ReadyPlantInventoryItem" parent="." instance=ExtResource("6_gdrin")] position = Vector2(0, 2.3) IsActive = false diff --git a/prefabs/interactions/interaction_area_2d.tscn b/prefabs/interactions/interaction_area_2d.tscn index aabd043..348957c 100644 --- a/prefabs/interactions/interaction_area_2d.tscn +++ b/prefabs/interactions/interaction_area_2d.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=4 format=3 uid="uid://cqc72e4hq6bcd"] +[gd_scene load_steps=5 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="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/intaractable_outline.tres" id="2_qoey7"] [sub_resource type="CircleShape2D" id="CircleShape2D_npluf"] resource_local_to_scene = true @@ -13,6 +14,7 @@ default_font_size = 30 script = ExtResource("1_5ajrf") _area = NodePath("Area2D") _label = NodePath("Area2D/CanvasLayer/MarginContainer/Label") +_outlineMaterial = ExtResource("2_qoey7") [node name="Area2D" type="Area2D" parent="."] collision_mask = 4 diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index d259499..aaaf609 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=108 format=3 uid="uid://gigb28qk8t12"] +[gd_scene load_steps=107 format=3 uid="uid://gigb28qk8t12"] [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="1_7wfwe"] [ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_7b2ri"] @@ -44,7 +44,6 @@ [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="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/intaractable_outline.tres" id="38_tm0yg"] [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"] @@ -1055,7 +1054,6 @@ shape = SubResource("RectangleShape2D_0sfl7") [node name="InteractionArea" parent="YSorted/Brünnen" node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("27_klb81")] _active = false -_outlineMaterial = ExtResource("38_tm0yg") _spriteToOutline = NodePath("..") _id = 1 @@ -1135,7 +1133,6 @@ polygon = PackedVector2Array(247.227, 43.5123, 44.7822, 43.5123, -87.2178, 45.12 [node name="EnterHouseInteraction" parent="YSorted/Farm visuals/Static" node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("27_klb81")] position = Vector2(5839, 2349) scale = Vector2(2.425, 2.425) -_outlineMaterial = ExtResource("38_tm0yg") _spriteToOutline = NodePath("DoorSprite") _id = 0 diff --git a/scenes/Babushka_scene_indoor_common_room.tscn b/scenes/Babushka_scene_indoor_common_room.tscn index 2947cb4..c90c160 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"] @@ -7,6 +7,7 @@ [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="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/intaractable_outline.tres" id="8_7a68a"] [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"] @@ -36,6 +37,10 @@ resource_local_to_scene = true size = Vector2(3836, 1086) +[sub_resource type="CircleShape2D" id="CircleShape2D_yd2gv"] +resource_local_to_scene = true +radius = 472.086 + [sub_resource type="CircleShape2D" id="CircleShape2D_gpagp"] resource_local_to_scene = true radius = 300.0 @@ -210,10 +215,6 @@ _data = { resource_local_to_scene = true radius = 209.703 -[sub_resource type="CircleShape2D" id="CircleShape2D_yd2gv"] -resource_local_to_scene = true -radius = 472.086 - [node name="IndoorTest" type="Node2D"] z_index = 1 y_sort_enabled = true @@ -309,13 +310,28 @@ texture = ExtResource("6_blyw3") region_enabled = true region_rect = Rect2(3161, 313, 679, 1050) -[node name="Room01DioorL" type="Sprite2D" parent="BackWall"] +[node name="OutsideDoor" parent="BackWall/Room01DorrR" node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("11_gpagp")] +position = Vector2(-7, 248) +_outlineMaterial = ExtResource("8_7a68a") +_spriteToOutline = 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("_spriteToOutline") instance=ExtResource("11_gpagp")] +position = Vector2(-1559, -16) +_outlineMaterial = ExtResource("8_7a68a") +_spriteToOutline = 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) @@ -344,8 +360,10 @@ texture = ExtResource("10_xcryd") region_enabled = true region_rect = Rect2(2360, 864, 356, 251) -[node name="InteractionArea" parent="BackWall/Room01PechkaDoor" instance=ExtResource("11_gpagp")] +[node name="InteractionArea" parent="BackWall/Room01PechkaDoor" node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("11_gpagp")] scale = Vector2(1.8, 1.96) +_outlineMaterial = ExtResource("8_7a68a") +_spriteToOutline = NodePath("..") [node name="CollisionShape3D" parent="BackWall/Room01PechkaDoor/InteractionArea/Area2D" index="0"] shape = SubResource("CircleShape2D_gpagp") @@ -392,6 +410,12 @@ stream = SubResource("AudioStreamRandomizer_b6vf7") bus = &"SFX" script = ExtResource("22_tggq2") +[node name="InteractionArea" parent="BackWall/Katze" node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("11_gpagp")] +position = Vector2(-6.5, -44) +scale = Vector2(0.5, 0.5) +_outlineMaterial = ExtResource("8_7a68a") +_spriteToOutline = NodePath("..") + [node name="Room assets" type="Node" parent="BackWall"] [node name="wood" type="Sprite2D" parent="BackWall/Room assets"] @@ -512,9 +536,6 @@ offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2576, 802, 219, 64) -[node name="InteractionArea" parent="BackWall" instance=ExtResource("11_gpagp")] -position = Vector2(-4064, 244) - [node name="Vesna" parent="." instance=ExtResource("15_7a68a")] y_sort_enabled = false position = Vector2(-920, 319) @@ -559,26 +580,15 @@ _followNode = NodePath("../Vesna/CharacterBody2D") [node name="CanvasLayer" parent="." instance=ExtResource("24_yd2gv")] -[node name="VesnasRoomDoor" parent="." instance=ExtResource("11_gpagp")] -position = Vector2(-4855, 32) -_id = 0 - -[node name="CollisionShape3D" parent="VesnasRoomDoor/Area2D" index="0"] -shape = SubResource("CircleShape2D_yd2gv") - -[node name="OutsideDoor" parent="." instance=ExtResource("11_gpagp")] -position = Vector2(929, 32) -_id = 1 - +[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/InteractionArea" to="BackWall/Katze/AudioStreamPlayer2D" method="PlayOneShot"] +[connection signal="Interacted" from="BackWall/Katze/InteractionArea" to="BackWall/Katze/AudioStreamPlayer2D" method="PlayOneShot"] [connection signal="timelineEnded" from="Yeli/dialogic_toggle" to="Yeli/Beetroot Quest trigger" method="Trigger"] -[connection signal="InteractedTool" from="VesnasRoomDoor" to="." method="LoadSceneAtIndex"] -[connection signal="InteractedTool" from="OutsideDoor" to="." method="LoadSceneAtIndex"] +[editable path="BackWall/Room01DoorL/VesnasRoomDoor"] [editable path="BackWall/Room01PechkaDoor/InteractionArea"] [editable path="Vesna"] [editable path="Yeli"] [editable path="Yeli/InteractionArea"] -[editable path="VesnasRoomDoor"] diff --git a/scenes/Babushka_scene_indoor_vesnas_room.tscn b/scenes/Babushka_scene_indoor_vesnas_room.tscn index 3a5bed7..685d0e5 100644 --- a/scenes/Babushka_scene_indoor_vesnas_room.tscn +++ b/scenes/Babushka_scene_indoor_vesnas_room.tscn @@ -96,10 +96,14 @@ _followNode = NodePath("../Vesna/CharacterBody2D") [node name="BedInteraction" parent="." instance=ExtResource("8_phqdf")] position = Vector2(-1429, 487) +_useOutline = false +_useSprite = false _id = 1 [node name="DoorInteraction" parent="." instance=ExtResource("8_phqdf")] position = Vector2(777, 201) +_useOutline = false +_useSprite = false _id = 0 [node name="CollisionShape3D" parent="DoorInteraction/Area2D" index="0"]