diff --git a/scenes/entity_scenes/outside_beets.tscn b/scenes/entity_scenes/outside_beets.tscn index 54d9534..9737842 100644 --- a/scenes/entity_scenes/outside_beets.tscn +++ b/scenes/entity_scenes/outside_beets.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=99 format=3 uid="uid://by0tsbnlflt32"] +[gd_scene load_steps=100 format=3 uid="uid://by0tsbnlflt32"] [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_amrci"] [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="2_muqao"] @@ -26,7 +26,6 @@ [ext_resource type="Shader" uid="uid://xnky830dtfsn" path="res://shader/repeat_texture.gdshader" id="24_it0dm"] [ext_resource type="Texture2D" uid="uid://btea6eyucsyxj" path="res://art/farm/farming/farmobjekte/zaun/tilable fence middle part.png" id="25_o2tj7"] [ext_resource type="Texture2D" uid="uid://3ed3dgq3irn2" path="res://art/farm/farming/farmobjekte/zaun/tilable fence end part2.png" id="26_3huw1"] -[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="27_prtwx"] [ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="28_ed312"] [ext_resource type="Texture2D" uid="uid://dg7rlugnq0t45" path="res://art/farm/farming/farmobjekte/brünnen.png" id="29_bsi8d"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="30_tdbxb"] @@ -43,8 +42,10 @@ [ext_resource type="Texture2D" uid="uid://blb3agipyxnal" path="res://art/farm/farming/farmobjekte/zaun/fence_door.png" id="41_6ulg3"] [ext_resource type="PackedScene" uid="uid://dpbbroif2tnil" path="res://prefabs/interactions/generic_item_on_ground_2d.tscn" id="42_yddng"] [ext_resource type="Texture2D" uid="uid://dmo21h14toxfu" path="res://art/indoor/indoor outdoor/domovoi.png" id="43_j7hi4"] +[ext_resource type="PackedScene" uid="uid://cv7trh2b3dyiv" path="res://prefabs/entity_placer/VesnaPlacer.tscn" id="44_sqbr3"] [ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/wateringcan.tres" id="44_v53u5"] [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="45_4k41w"] +[ext_resource type="Script" uid="uid://ca1pg6k3gn47y" path="res://scripts/CSharp/GameEntity/Management/EntitySceneContainer.cs" id="45_54vw7"] [ext_resource type="AudioStream" uid="uid://dku1rq5cocisg" path="res://audio/Music/Farming_90BPM_69Bars.wav" id="46_kqri4"] [ext_resource type="Script" uid="uid://clxb3n668oud3" path="res://scripts/CSharp/Common/Audio/AudioDebugger.cs" id="47_1nlk0"] [ext_resource type="AudioStream" uid="uid://cfqg50am0swb7" path="res://audio/Music/Farming_90BPM_69Bars_Loop.wav" id="48_uesai"] @@ -253,7 +254,7 @@ stream_2/stream = ExtResource("56_vedvh") script = ExtResource("1_amrci") _sceneNamesToLoad = PackedStringArray("res://scenes/entity_scenes/farm_outside.tscn") -[node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")] +[node name="Camera2D" type="Camera2D" parent="."] position = Vector2(3180, 1961) scale = Vector2(1, 0.993819) offset = Vector2(0, -500) @@ -264,7 +265,6 @@ limit_right = 11000 limit_bottom = 6000 editor_draw_limits = true script = ExtResource("2_muqao") -_followNode = NodePath("../YSorted/Vesna/CharacterBody2D") [node name="ParallaxBackground" type="ParallaxBackground" parent="."] @@ -964,17 +964,6 @@ shape = SubResource("RectangleShape2D_0qu0h") z_index = 1 y_sort_enabled = true -[node name="Vesna" parent="YSorted" instance=ExtResource("27_prtwx")] -z_index = 1 -position = Vector2(2693, 1876) -_hoe = ExtResource("28_ed312") - -[node name="Animated Sprites" parent="YSorted/Vesna/CharacterBody2D/visuals" index="0"] -position = Vector2(-33, 554) - -[node name="FarmingControls" parent="YSorted/Vesna" index="1" node_paths=PackedStringArray("_camera")] -_camera = NodePath("../../../Camera2D") - [node name="Brünnen" type="Sprite2D" parent="YSorted"] z_index = 1 y_sort_enabled = true @@ -2070,6 +2059,13 @@ _blueprint = ExtResource("44_v53u5") [node name="CollisionShape3D" parent="YSorted/WateringCan/PickupInteractionArea/Area2D" index="0"] shape = SubResource("CircleShape2D_34r5t") +[node name="VesnaPlacer" parent="YSorted" instance=ExtResource("44_sqbr3")] +position = Vector2(3708, 2279) + +[node name="EntitySceneContainer" type="Node2D" parent="YSorted"] +script = ExtResource("45_54vw7") +sceneName = "outside_beets" + [node name="CanvasLayer" parent="." instance=ExtResource("45_4k41w")] [node name="Inventory" parent="CanvasLayer" index="1"] @@ -2145,32 +2141,38 @@ script = ExtResource("59_d24ik") [node name="SaveIDProvider" type="Node" parent="SaveSystem"] script = ExtResource("60_yr8eo") -[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="finished" from="Audio/Background Music Ramp up" to="Audio/Background Music loop" method="PlayFromOffset"] [connection signal="tree_entered" from="SceneNameSetter" to="SceneNameSetter" method="Set"] -[editable path="YSorted/Vesna"] [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/scripts/CSharp/GameEntity/EntityPlacer/VesnaEntityPlacer.cs b/scripts/CSharp/GameEntity/EntityPlacer/VesnaEntityPlacer.cs index 495e143..5f3acdf 100644 --- a/scripts/CSharp/GameEntity/EntityPlacer/VesnaEntityPlacer.cs +++ b/scripts/CSharp/GameEntity/EntityPlacer/VesnaEntityPlacer.cs @@ -9,11 +9,10 @@ public partial class VesnaEntityPlacer : Node2D public override void _Ready() { var sceneName = EntityManager.Instance.CurrentEntitySceneContainer!.sceneName; - var loadedScenesEntity = EntityManager.Instance.GetUniqueEntity(); + var entity = EntityManager.Instance.GetUniqueEntity(); - if (!loadedScenesEntity.WasSceneLoaded(sceneName)) + if (entity.sceneName != sceneName) { - var entity = EntityManager.Instance.GetUniqueEntity(); entity.position = GlobalPosition; entity.sceneName = sceneName; }