planting / growth works again

prefabs/Player3D.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=303 format=3 uid="uid://dbd1niu3tp8y5"]
+[gd_scene load_steps=302 format=3 uid="uid://dbd1niu3tp8y5"]
 
 [ext_resource type="Script" uid="uid://b4ugrget2x6lb" path="res://scripts/CSharp/Common/CharacterControls/Player3D.cs" id="1_3trg2"]
-[ext_resource type="Script" path="res://scripts/CSharp/Common/CharacterControls/VesnaBehaviour.cs" id="1_pkl5l"]
 [ext_resource type="Texture2D" uid="uid://duaideiajsu8r" path="res://art/characters/Vesna/babushka concept art vesna.png" id="2_3trg2"]
 [ext_resource type="PackedScene" uid="uid://biwd3jj65qrlh" path="res://prefabs/farm/base_field.tscn" id="2_oq5hi"]
 [ext_resource type="Texture2D" uid="uid://3pj2q7wtuion" path="res://art/farm/farming/farmobjekte/hoe.png" id="4_pkl5l"]
@@ -1211,9 +1210,7 @@ animations = [{
 "speed": 25.0
 }]
 
-[node name="Player3d" type="Node3D" node_paths=PackedStringArray("_farmingControls")]
+[node name="Player3d" type="Node3D"]
-script = ExtResource("1_pkl5l")
-_farmingControls = NodePath("FarmingControls")
 
 [node name="CharacterBody3D" type="CharacterBody3D" parent="." node_paths=PackedStringArray("_camera", "_frontSpritesAnimated", "_sideSpritesAnimated", "_backSpritesAnimated")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000654221, 0.102765, -0.00300497)

prefabs/farm/base_field_2d.tscn

@@ -27,4 +27,6 @@ position = Vector2(6, -161)
 [node name="ReadyPlant" parent="FieldBehaviour/BasePlant" index="3"]
 position = Vector2(0, -204)
 
+[connection signal="Interacted" from="InteractionArea2" to="FieldBehaviour/BasePlant" method="Grow"]
+
 [editable path="FieldBehaviour/BasePlant"]

prefabs/interactions/sprite_switcher_2d.tscn

@@ -3,20 +3,21 @@
 [ext_resource type="Script" uid="uid://pemu31f6fe4l" path="res://scripts/CSharp/Common/SpriteSwitcher2D.cs" id="1_aktjx"]
 [ext_resource type="Texture2D" uid="uid://3pj2q7wtuion" path="res://art/farm/farming/farmobjekte/hoe.png" id="2_gxaiv"]
 
-[node name="SpriteSwitcher2d" type="Node2D" node_paths=PackedStringArray("_firstSprite", "_secondSprite")]
+[node name="SpriteSwitcher2d" type="Node2D" node_paths=PackedStringArray("_activeSprite", "_inactiveSprite")]
 script = ExtResource("1_aktjx")
-_firstSprite = NodePath("FirstSprite")
+_activeSprite = NodePath("ActiveSprite")
-_secondSprite = NodePath("SecondSprite")
+_inactiveSprite = NodePath("InactiveSprite")
+_active = true
 
-[node name="FirstSprite" type="Sprite2D" parent="."]
+[node name="ActiveSprite" type="Sprite2D" parent="."]
-modulate = Color(0.00322664, 0.644252, 0.264198, 1)
+modulate = Color(0, 0.83, 0.332, 1)
 texture = ExtResource("2_gxaiv")
 region_enabled = true
 region_rect = Rect2(989, 189, 339, 1228)
 
-[node name="SecondSprite" type="Sprite2D" parent="."]
+[node name="InactiveSprite" type="Sprite2D" parent="."]
 visible = false
-modulate = Color(1, 0, 0, 1)
+modulate = Color(0.27, 0.27, 0.27, 1)
 texture = ExtResource("2_gxaiv")
 region_enabled = true
 region_rect = Rect2(1006, 197, 321, 1226)

scenes/Babushka_scene_farm_outside_2d.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=47 format=3 uid="uid://gigb28qk8t12"]
+[gd_scene load_steps=48 format=3 uid="uid://gigb28qk8t12"]
 
 [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/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"]
@@ -93,6 +93,9 @@ shader_parameter/value_mult = 1.068
 shader_parameter/brightness_add = 0.0
 shader_parameter/contrast_mult = 0.913
 
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_p6n74"]
+size = Vector2(5176, 1192)
+
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_2vojv"]
 shader = ExtResource("13_7p0hq")
 shader_parameter/hue_shift = 0.0
@@ -113,16 +116,16 @@ position = Vector2(0, -296)
 motion_scale = Vector2(0.1, 0.1)
 motion_mirroring = Vector2(2048, 0)
 
-[node name="Sprite2D" type="Sprite2D" parent="ParallaxBackground/background color layer"]
+[node name="Sprite2D2" type="Sprite2D" parent="ParallaxBackground/background color layer"]
 modulate = Color(0.607706, 0.894469, 0.564721, 1)
+position = Vector2(4096, 0)
 scale = Vector2(2, 2)
 texture = ExtResource("2_7b2ri")
 centered = false
 offset = Vector2(0, -100)
 
-[node name="Sprite2D2" type="Sprite2D" parent="ParallaxBackground/background color layer"]
+[node name="Sprite2D3" type="Sprite2D" parent="ParallaxBackground/background color layer"]
 modulate = Color(0.607706, 0.894469, 0.564721, 1)
-position = Vector2(4096, 0)
 scale = Vector2(2, 2)
 texture = ExtResource("2_7b2ri")
 centered = false
@@ -658,10 +661,18 @@ collision_mask = 2
 position = Vector2(-257.6, 236.8)
 polygon = PackedVector2Array(232, -4.80005, 0, 0, 0, -96, -262.4, -97.6, -265.6, -260.8, -310.4, -260.8, -235.2, -321.6, -124.8, -323.2, -57.6, -424, 84.8, -436.8, 118.4, -452.8, 136, -436.8, 726.4, -452.8, 817.6, -299.2, 785.6, -291.2, 785.6, -108.8, 241.6, -94.4)
 
-[node name="FieldService2D" type="Node2D" parent="Farm visuals"]
+[node name="FieldParent" type="Node2D" parent="Farm visuals"]
+position = Vector2(48, 0)
 script = ExtResource("25_0qu0h")
 metadata/_custom_type_script = "uid://dhxtdhfqx3bte"
 
+[node name="Area2D" type="Area2D" parent="Farm visuals/FieldParent"]
+position = Vector2(-48, -16)
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Farm visuals/FieldParent/Area2D"]
+position = Vector2(-2492, 2980)
+shape = SubResource("RectangleShape2D_p6n74")
+
 [node name="YSorted" type="Node2D" parent="."]
 z_index = 1
 y_sort_enabled = true
@@ -669,7 +680,7 @@ y_sort_enabled = true
 [node name="Player2d" parent="YSorted" node_paths=PackedStringArray("_fieldParent") instance=ExtResource("1_7wfwe")]
 z_index = 1
 position = Vector2(1064, 2128)
-_fieldParent = NodePath("../../Farm visuals/FieldService2D")
+_fieldParent = NodePath("../../Farm visuals/FieldParent")
 
 [node name="Brünnen" type="Sprite2D" parent="YSorted"]
 z_index = 1
@@ -697,33 +708,38 @@ position = Vector2(12080, 3296)
 [node name="BaseField4" parent="." instance=ExtResource("26_vbdb2")]
 position = Vector2(12080, 2544)
 
-[node name="Hoe Pickup" parent="." instance=ExtResource("27_klb81")]
+[node name="Hoe Pickup" parent="." node_paths=PackedStringArray("_sprites") instance=ExtResource("27_klb81")]
 position = Vector2(3264, 2120)
 rotation = 3.3074
+_sprites = NodePath("SpriteSwitcher2d")
 
 [node name="SpriteSwitcher2d" parent="Hoe Pickup" instance=ExtResource("28_p6n74")]
 scale = Vector2(0.5, 0.5)
 
-[node name="Watercan Pickup" parent="." instance=ExtResource("27_klb81")]
+[node name="Watercan Pickup" parent="." node_paths=PackedStringArray("_sprites") instance=ExtResource("27_klb81")]
 position = Vector2(6216, 2248)
+_sprites = NodePath("SpriteSwitcher2d")
+_id = 1
 
 [node name="Label" parent="Watercan Pickup" index="1"]
 z_index = 1
 
 [node name="SpriteSwitcher2d" parent="Watercan Pickup" instance=ExtResource("28_p6n74")]
 
-[node name="FirstSprite" parent="Watercan Pickup/SpriteSwitcher2d" index="0"]
+[node name="ActiveSprite" parent="Watercan Pickup/SpriteSwitcher2d" index="0"]
 texture = ExtResource("29_p6n74")
-region_rect = Rect2(-2, 1119, 430, 301)
+region_rect = Rect2(-2, 1135, 421, 292)
 
-[node name="SecondSprite" parent="Watercan Pickup/SpriteSwitcher2d" index="1"]
+[node name="InactiveSprite" parent="Watercan Pickup/SpriteSwitcher2d" index="1"]
 texture = ExtResource("29_p6n74")
-region_rect = Rect2(1, 1127, 423, 301)
+region_rect = Rect2(1, 1138, 418, 288)
 
-[connection signal="Interacted" from="Hoe Pickup" to="Hoe Pickup/SpriteSwitcher2d" method="SwitchState"]
+[connection signal="mouse_entered" from="Farm visuals/FieldParent/Area2D" to="Farm visuals/FieldParent" method="MouseEnteredAllowedArea"]
-[connection signal="Switch" from="Hoe Pickup/SpriteSwitcher2d" to="YSorted/Player2d" method="ActivateHoe"]
+[connection signal="mouse_exited" from="Farm visuals/FieldParent/Area2D" to="Farm visuals/FieldParent" method="MouseExitedAllowedArea"]
-[connection signal="Interacted" from="Watercan Pickup" to="Watercan Pickup/SpriteSwitcher2d" method="SwitchState"]
+[connection signal="PickedUpTool" from="YSorted/Player2d" to="Hoe Pickup" method="SetSpriteActiveState"]
-[connection signal="Switch" from="Watercan Pickup/SpriteSwitcher2d" to="YSorted/Player2d" method="ActivateWateringCan"]
+[connection signal="PickedUpTool" from="YSorted/Player2d" to="Watercan Pickup" method="SetSpriteActiveState"]
+[connection signal="Interacted" from="Hoe Pickup" to="YSorted/Player2d" method="ActivateTool"]
+[connection signal="Interacted" from="Watercan Pickup" to="YSorted/Player2d" method="ActivateTool"]
 
 [editable path="Hoe Pickup"]
 [editable path="Watercan Pickup"]

scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs

@@ -6,10 +6,12 @@ public partial class InteractionArea2D : Node2D
 {
     [Export] private Area2D _area;
     [Export] private Label _label;
+    [Export] private SpriteSwitcher2D _sprites;
     [Export] private bool _showLabel = true;
+    [Export] private int _id;
 
     [Signal]
-    public delegate void InteractedEventHandler();
+    public delegate void InteractedEventHandler(int id);
 
     public void OnPlayerEntered(Node2D player)
     {
@@ -27,7 +29,15 @@ public partial class InteractionArea2D : Node2D
         if (@event.IsAction("interact") && @event.IsPressed() && _area.HasOverlappingBodies())
         {
             _label.Hide();
-            EmitSignal(SignalName.Interacted);
+            EmitSignal(SignalName.Interacted, _id);
+        }
+    }
+
+    public void SetSpriteActiveState(bool success, int id)
+    {
+        if (_id == id)
+        {
+            _sprites.SwitchState(!success);
         }
     }
 }

scripts/CSharp/Common/Farming/FarmingControls2D.cs

@@ -18,10 +18,32 @@ public partial class FarmingControls2D : Node2D
     
     #region Tools
     
-    public bool ActivateTool(bool activate, int toolId)
+    /// <summary>
+    /// If no tool has been set, then set the current tool to the incoming tool id.
+    /// </summary>
+    /// <param name="toolId">The id of the tool to activate if possible</param>
+    /// <returns>If the tool in question was activated.</returns>
+    public bool TryActivateTool(int toolId)
+    {
+        bool activate;
+        
+        //if our hands are empty, activate
+        if (_toolId == -1)
+        {
+            activate = true;
+        }
+        else
+        {
+            //if we're already carrying a tool, deactivate or fail return
+            if (_toolId == toolId)
+            {
+                activate = false;
+            }
+            else
             {
-        if(_toolId < 0)
                 return false;
+            }
+        }
         
         switch (toolId)
         {
@@ -30,23 +52,23 @@ public partial class FarmingControls2D : Node2D
                 break;
             case 1:
                 _wateringCanSprite.Visible = activate;
-                
                 break;
             default:
                 _toolId = -1;
                 break;
         }
-        _toolId = toolId;
+
-        return !activate;
+        _toolId = activate ? toolId : -1;
+        return activate;
     }
     
     #endregion
 
     public override void _Input(InputEvent @event)
     {
-        Vector2 mousePosition = GetViewport().GetMousePosition();
+        Vector2 mousePosition = _camera.GetGlobalMousePosition();
-        
+        Vector2I mousePositionInteger = (Vector2I) mousePosition;
-        Vector2I adjustedPosition = new Vector2I(AdjustValue(mousePosition.X), AdjustValue(mousePosition.Y));
+        Vector2I adjustedPosition = AdjustValue(mousePositionInteger, new Vector2I(735, 651));
 
         if (@event.IsActionPressed("click") && _toolId == 0)
         {
@@ -73,6 +95,10 @@ public partial class FarmingControls2D : Node2D
         if(FieldParent == null || _fieldPrefab == null) 
             return;
         
+        // only try to instantiate a field if you're in the allowed area
+        if (!FieldParent.FieldAllowed())
+            return;
+        
         // only instantiate a field if there isn't one already.
         if(FieldParent.Get(fieldPosition) == null)
         {
@@ -93,6 +119,14 @@ public partial class FarmingControls2D : Node2D
 
     private int AdjustValue(float value)
     {
-        return (int) Mathf.Floor(value);
+        float adjustedValue = value / 500;
+        adjustedValue = Mathf.RoundToInt(adjustedValue);
+        adjustedValue *= 500;
+        return (int)adjustedValue;
+    }
+
+    private Vector2I AdjustValue(Vector2I input, Vector2I step)
+    {
+        return input.Snapped(step);
     }
 }

scripts/CSharp/Common/Farming/FieldService2D.cs

@@ -8,6 +8,25 @@ public partial class FieldService2D : Node2D
 {
     [Export] private Dictionary<Vector2I, FieldBehaviour2D> fields = new Dictionary<Vector2I, FieldBehaviour2D>();
     
+    private bool _fieldAllowed = false;
+
+    //Validate
+
+    public void MouseEnteredAllowedArea()
+    {
+        _fieldAllowed = true;
+    }
+
+    public void MouseExitedAllowedArea()
+    {
+        _fieldAllowed = false;
+    }
+    
+    public bool FieldAllowed()
+    {
+        return _fieldAllowed;
+    }
+    
     //Create
     public bool TryAddEntry(Vector2I key, FieldBehaviour2D field)
     {

scripts/CSharp/Common/Farming/PlantBehaviour2D.cs

@@ -19,7 +19,7 @@ public partial class PlantBehaviour2D : Node2D
     /// <summary>
     /// Transitions the plant to its next groth stage.
     /// </summary>
-    public void Grow()
+    public void Grow(int id)
     {
         switch (_state)
         {

scripts/CSharp/Common/Farming/VesnaBehaviour2D.cs

@@ -8,7 +8,7 @@ public partial class VesnaBehaviour2D : Node
     [Export] private FieldService2D _fieldParent;
     [Export] private FarmingControls2D _farmingControls;
     
-    [Signal] public delegate void ToolPickupEventHandler(bool success);
+    [Signal] public delegate void PickedUpToolEventHandler(bool success, int toolId);
 
     public override void _Ready()
     {
@@ -17,20 +17,10 @@ public partial class VesnaBehaviour2D : Node
     
     #region Farming
 
-    public void ActivateHoe(bool activate)
+    public void ActivateTool(int toolId)
     {
-        ActivateTool(activate, 0);
+         bool activated = _farmingControls.TryActivateTool(toolId);
-    }
+         EmitSignal(SignalName.PickedUpTool, activated, toolId);
-
-    public void ActivateWateringCan(bool activate)
-    {
-        ActivateTool(activate, 1);
-    }
-
-    private void ActivateTool(bool activate , int toolId)
-    {
-         bool activated = _farmingControls.ActivateTool(activate, toolId);
-        EmitSignal(SignalName.ToolPickup, activated);
     }
     
     #endregion

scripts/CSharp/Common/SpriteSwitcher2D.cs

@@ -7,30 +7,30 @@ namespace Babushka.scripts.CSharp.Common;
 /// </summary>
 public partial class SpriteSwitcher2D : Node2D
 {
-    [Export] private Sprite2D _firstSprite;
+    [Export] private Sprite2D _activeSprite;
-    [Export] private Sprite2D _secondSprite;
+    [Export] private Sprite2D _inactiveSprite;
-    [Export] private bool _state = true;
+    [Export] private bool _active = false;
-    
-    [Signal]
-    public delegate void SwitchEventHandler(bool state);
 
     public override void _Ready()
     {
-        SetState();
+        SetSprites();
     }
     
-    public void SwitchState()
+    /// <summary>
+    /// Switches the State of the Sprites to the opposite.
+    /// Emits Switch Signal.
+    /// </summary>
+    public void SwitchState(bool state)
     {
-        _state = !_state;
+        _active = state;
-        EmitSignal(SignalName.Switch, _state);
+        SetSprites();
-        SetState();
     }
     
-    private void SetState()
+    private void SetSprites()
     {
-        if(_firstSprite != null)
+        if(_activeSprite != null)
-            _firstSprite.Visible = _state;
+            _activeSprite.Visible = _active;
-        if(_secondSprite != null)
+        if(_inactiveSprite != null)
-            _secondSprite.Visible = !_state;
+            _inactiveSprite.Visible = !_active;
     }
 }