Spawning and watering is now bound to the cursor position (kinda)

# Conflicts:
#	scripts/CSharp/Common/CharacterControls/VesnaBehaviour.cs.uid
#	scripts/CSharp/Common/Farming/FieldService.cs.uid

.idea/.idea.Babushka/.idea/AndroidProjectSystem.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="RiderAndroidProjectSystem" />
+  </component>
+</project>

.idea/.idea.Babushka/.idea/libraries/GdSdk_Master.xml

@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="GdSdk Master" type="GdScript">
+    <properties path="$USER_HOME$/.cache/JetBrains/Rider2025.1/projects/.idea.babushka.a4de4632/sdk/GdSdk Master" version="Master" date="2024-06-01T15:14:16.000+02:00" />
+    <CLASSES />
+    <JAVADOC />
+    <SOURCES>
+      <root url="file://$USER_HOME$/.cache/JetBrains/Rider2025.1/projects/.idea.babushka.a4de4632/sdk/GdSdk Master" />
+    </SOURCES>
+  </library>
+</component>

Babushka.sln.DotSettings.user

@@ -1,2 +1,3 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArea3D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F8a54226fa2e1c9371a8091f24cfd744aef11fe6869527dc23b9b837623a29b9_003FArea3D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArea3D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F8a54226fa2e1c9371a8091f24cfd744aef11fe6869527dc23b9b837623a29b9_003FArea3D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACastHelpers_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd111abf504bf42b5968a609b168fd093b2e200_003Fbb_003F1c116fcd_003FCastHelpers_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>

art/farm/farming/farmobjekte/zaun/fence part end part.png.import

@@ -3,25 +3,26 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://csig0r8rffflt"
-path="res://.godot/imported/fence part end part.png-eb57fa6bd3b30e6dbbabec560b997ff4.ctex"
+path.s3tc="res://.godot/imported/fence part end part.png-eb57fa6bd3b30e6dbbabec560b997ff4.s3tc.ctex"
 metadata={
-"vram_texture": false
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://art/farm/farming/farmobjekte/zaun/fence part end part.png"
-dest_files=["res://.godot/imported/fence part end part.png-eb57fa6bd3b30e6dbbabec560b997ff4.ctex"]
+dest_files=["res://.godot/imported/fence part end part.png-eb57fa6bd3b30e6dbbabec560b997ff4.s3tc.ctex"]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=false
+mipmaps/generate=true
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
@@ -31,4 +32,4 @@ 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
+detect_3d/compress_to=0

art/mockups/3d/best_house_blender.blend.import

@@ -4,12 +4,11 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://b3kyrsoobmkhp"
-path="res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn"
+valid=false
 
 [deps]
 
 source_file="res://art/mockups/3d/best_house_blender.blend"
-dest_files=["res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn"]
 
 [params]
 

prefabs/Player3D.tscn

@@ -1337,12 +1337,11 @@ sprite_frames = SubResource("SpriteFrames_4q8ml")
 autoplay = "default"
 frame_progress = 0.481133
 
-[node name="FarmingControls" type="Node3D" parent="." node_paths=PackedStringArray("_hoeSprite", "_wateringCanSprite", "_movingPlayer")]
+[node name="FarmingControls" type="Node3D" parent="." node_paths=PackedStringArray("_hoeSprite", "_wateringCanSprite", "_movingPlayer", "_camera")]
 script = ExtResource("4_q5t2e")
 _hoeSprite = NodePath("../CharacterBody3D/Farming/Hoe")
 _wateringCanSprite = NodePath("../CharacterBody3D/Farming/Watering can")
 _fieldPrefab = ExtResource("2_oq5hi")
 _movingPlayer = NodePath("../CharacterBody3D")
+_camera = NodePath("../CharacterBody3D/CameraPivot2/SubPivot/Camera3D")
 metadata/_custom_type_script = "uid://b1sscdr4ptec8"
-
-[connection signal="WaterField" from="FarmingControls" to="." method="UseWateringCan"]

prefabs/UI/Inventory/Inventory.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=3 uid="uid://cgjc4wurbgimy"]
 
-[ext_resource type="Script" uid="uid://b7vlkecrn0t5c" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"]
+[ext_resource type="Script" uid="uid://hg7jay2kt441" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"]
 [ext_resource type="Script" uid="uid://b2jhdxcrhtm2d" path="res://scripts/CSharp/Common/Inventory/InventoryTestScript.cs" id="3_exrk4"]
 [ext_resource type="Resource" uid="uid://datee0flk1e84" path="res://resources/items/pickaxe.tres" id="4_5fdxq"]
 [ext_resource type="Texture2D" uid="uid://c7wqla0mbu3np" path="res://graphics/ui/babushka_ui_tmp_inventory_select.png" id="4_tiss4"]

prefabs/farming/base_field.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=6 format=3 uid="uid://biwd3jj65qrlh"]
+[gd_scene load_steps=7 format=3 uid="uid://biwd3jj65qrlh"]
 
 [ext_resource type="Texture2D" uid="uid://c2pirgay3jfnn" path="res://art/farm/tilable grounds/böden/trockene farming erde.png" id="1_2cisk"]
 [ext_resource type="Script" uid="uid://histmmyi1wr" path="res://scripts/CSharp/Common/Farming/FieldBehaviour.cs" id="2_u7egi"]
+[ext_resource type="Texture2D" uid="uid://ctvdxwgmfaj5c" path="res://art/farm/tilable grounds/böden/nasse farming erde.png" id="4_lsseu"]
 [ext_resource type="PackedScene" uid="uid://bjhj1wa5olwcu" path="res://prefabs/farming/base_plant.tscn" id="4_u7egi"]
 [ext_resource type="PackedScene" uid="uid://ob04y3syvo0e" path="res://prefabs/interaction_area.tscn" id="4_xc4m0"]
 
@@ -18,17 +19,20 @@ _showLabel = false
 [node name="CollisionShape3D" parent="InteractionArea/Area3D" index="0"]
 shape = SubResource("SphereShape3D_u7egi")
 
-[node name="Sprite3D" type="Sprite3D" parent="."]
+[node name="FieldBehaviour" type="Sprite3D" parent="."]
 transform = Transform3D(0.4, 0, 0, 0, -1.74846e-08, -0.4, 0, 0.4, -1.74846e-08, 0, 0, 0)
 pixel_size = 0.004
-texture = ExtResource("1_2cisk")
 script = ExtResource("2_u7egi")
 Tilled = ExtResource("1_2cisk")
+Watered = ExtResource("4_lsseu")
 FieldState = 1
+metadata/_custom_type_script = "uid://histmmyi1wr"
 
-[node name="BasePlant" parent="Sprite3D" instance=ExtResource("4_u7egi")]
+[node name="BasePlant" parent="FieldBehaviour" node_paths=PackedStringArray("_seeds", "_smallPlants", "_bigPlants", "_readyPlants") instance=ExtResource("4_u7egi")]
 transform = Transform3D(0.5, 0, 0, 0, -2.18557e-08, 0.5, 0, -0.5, -2.18557e-08, 0, 0, 0)
-
+_seeds = [null, null, null]
-[connection signal="Interacted" from="InteractionArea" to="Sprite3D/BasePlant" method="Grow"]
+_smallPlants = [null, null, null, null]
+_bigPlants = [null, null, null, null]
+_readyPlants = [null, null, null, null]
 
 [editable path="InteractionArea"]

project.godot

@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="Babushka"
-run/main_scene="uid://dbxy2y85r1d8x"
+run/main_scene="uid://br7yq757cawts"
 config/features=PackedStringArray("4.4", "C#", "Forward Plus")
 config/icon="res://icon.svg"
 

resources/items/pickaxe.tres

@@ -6,5 +6,4 @@
 script = ExtResource("1_07aya")
 name = "Pick Axe"
 color = Color(0.589014, 0.823353, 0.998475, 1)
-maxStack = 1
 metadata/_custom_type_script = "uid://cbskymrxs6ksu"

scenes/testing/Babushka_scene_item_pickup_testing.tscn

@@ -5,7 +5,7 @@
 [ext_resource type="PackedScene" uid="uid://5hltxpdxmqcq" path="res://prefabs/interactions/generic_item_on_ground.tscn" id="5_sjt6k"]
 [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="6_876p1"]
 [ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/bucket.tres" id="6_nvnpb"]
-[ext_resource type="Script" uid="uid://d17si23dtlg72" path="res://scripts/CSharp/Common/Farming/FieldService.cs" id="7_3rkjv"]
+[ext_resource type="Script" uid="uid://c6hh7m8wikv04" path="res://scripts/CSharp/Common/Farming/FieldService.cs" id="7_3rkjv"]
 [ext_resource type="Resource" uid="uid://c5yg3lx756v4v" path="res://resources/items/hoe.tres" id="7_hv2km"]
 [ext_resource type="Resource" uid="uid://d1uuxp1lp4aro" path="res://resources/items/tomato_seed.tres" id="8_hv2km"]
 

scripts/CSharp/Common/CharacterControls/VesnaBehaviour.cs.uid

@@ -1 +1 @@
-uid://xm0um640aes7
+uid://bblprbhnbyv77

scripts/CSharp/Common/Farming/FarmingControls.cs

@@ -1,5 +1,8 @@
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using Godot;
+using Godot.Collections;
 
 namespace Babushka.scripts.CSharp.Common.Farming;
 
@@ -10,6 +13,7 @@ public partial class FarmingControls : Node3D
     [Export] private Sprite3D _wateringCanSprite;
     [Export] private PackedScene _fieldPrefab;
     [Export] private Node3D _movingPlayer;
+    [Export] private Camera3D _camera;
     
     public FieldService FieldParent;
     
@@ -42,45 +46,63 @@ public partial class FarmingControls : Node3D
     
     public override void _Input(InputEvent @event)
     {
-        if (@event.IsActionPressed("click") && _hoeInHand)
+        Vector2 mousePosition = GetViewport().GetMousePosition();
-        {
+        var dropPlane = new Plane(new Vector3(0, 0, 10), 10);
-            MakeField();
+        Vector3? position3D = dropPlane.IntersectsRay(_camera.ProjectRayOrigin(mousePosition),
-        }
+            _camera.ProjectRayNormal(mousePosition));
+        Debug.Print(position3D.ToString());
 
-        if (@event.IsActionPressed("click") && _waterCanInHand)
+        if (position3D.HasValue)
         {
-            WaterTheField();
+            Vector2I adjustedPosition = new Vector2I(AdjustValue(position3D.Value.X), AdjustValue(position3D.Value.Y));
+
+            if (@event.IsActionPressed("click") && _hoeInHand)
+            {
+                MakeField(adjustedPosition);
+            }
+
+            if (@event.IsActionPressed("click") && _waterCanInHand)
+            {
+                WaterTheField(adjustedPosition);
+            }
         }
     }
 
-    private void WaterTheField()
+    private void WaterTheField(Vector2I fieldPosition)
     {
+        FieldBehaviour field = FieldParent.Get(fieldPosition);
+        if (field == null)
+            return;
         
+        field.Water();
     }
 
-    private void MakeField()
+    private void MakeField(Vector2I fieldPosition)
     {
         if(FieldParent == null || _fieldPrefab == null) 
             return;
-
-        Node fieldInstance = _fieldPrefab.Instantiate();
         
-        if (fieldInstance is Node3D field3d)
+        // only instantiate a field if there isn't one already.
+        if(FieldParent.Get(fieldPosition) == null)
         {
-            Vector3 playerPos = _movingPlayer.GlobalPosition;
+            Node fieldInstance = _fieldPrefab.Instantiate();
-            playerPos = new Vector3(AdjustValue(playerPos.X), 0.1f, AdjustValue(playerPos.Z));
+            if (fieldInstance is Node3D field3d)
-            field3d.Position = playerPos;
+            {
-            Vector2I intPosition = new Vector2I((int) playerPos.X, (int) playerPos.Z);
+                // add dictionary entry for the field
-            FieldParent.AddEntry(intPosition, FieldState.Tilled);
+                Array<Node> fields = field3d.FindChildren("*", nameof(FieldBehaviour));
+                if (fields.Count > 0)
+                    FieldParent.TryAddEntry(fieldPosition, fields[0] as FieldBehaviour);
+                
+                // reposition and reparent the instance
+                field3d.Position = new Vector3(fieldPosition.X, 0.1f, fieldPosition.Y * -1);;
+                FieldParent.AddChild(fieldInstance);
+            }
         }
-
-
-        FieldParent.AddChild(fieldInstance);
     }
 
-    private float AdjustValue(float value)
+    private int AdjustValue(float value)
     {
-        return Mathf.Floor(value);
+        return (int) Mathf.Floor(value);
     }
     
 }

scripts/CSharp/Common/Farming/FieldBehaviour.cs

@@ -1,54 +1,59 @@
+using System.Diagnostics;
 using Godot;
 
-namespace Babushka.scripts.CSharp.Common.Farming;
+namespace Babushka.scripts.CSharp.Common.Farming
-
-public enum FieldState
 {
-    Empty = 0,
+    public enum FieldState
-    Tilled = 1,
+    {
-    Planted = 2,
+        Empty = 0,
-    Watered = 3
+        Tilled = 1,
+        Planted = 2,
+        Watered = 3,
+        NotFound = 99
+    }
+
+    [GlobalClass]
+    public partial class FieldBehaviour : Sprite3D
+    {
+        [Export] private Texture2D Tilled;
+        [Export] private Texture2D Watered;
+        [Export] public FieldState FieldState = FieldState.Empty;
+
+        public Vector2 FieldPosition;
+
+        public override void _Ready()
+        {
+            Texture = Tilled;
+            base._Ready();
+        }
+
+        public void Water()
+        {
+            FieldState = FieldState.Watered;
+            Texture = Watered;
+        }
+    
+        /// <summary>
+        /// Called when the player enters the field'S interaction area and presses <E>.
+        /// </summary>
+        public void Farm()
+        {
+            switch (FieldState)
+            {
+                case FieldState.Empty:
+                    Texture = Tilled;
+                    FieldState = FieldState.Tilled;
+                    break;
+                case FieldState.Tilled:
+                    FieldState = FieldState.Planted;
+                    break;
+                case FieldState.Planted:
+                    break;
+                default:
+                    break;
+            }
+        
+        }
+    }
 }
 
-public partial class FieldBehaviour : Sprite3D
-{
-    [Export] private Texture2D Tilled;
-    [Export] private Texture2D Watered;
-    [Export] private FieldState FieldState = FieldState.Empty;
-
-    public Vector2 FieldPosition;
-
-    public override void _Ready()
-    {
-        Texture = Tilled;
-        base._Ready();
-    }
-
-    public void Water()
-    {
-        FieldState = FieldState.Watered;
-        Texture = Watered;
-    }
-    
-    /// <summary>
-    /// Called when the player enters the field'S interaction area and presses <E>.
-    /// </summary>
-    public void Farm()
-    {
-        switch (FieldState)
-        {
-            case FieldState.Empty:
-                Texture = Tilled;
-                FieldState = FieldState.Tilled;
-                break;
-            case FieldState.Tilled:
-                FieldState = FieldState.Planted;
-                break;
-            case FieldState.Planted:
-                break;
-            default:
-                break;
-        }
-        
-    }
-}

scripts/CSharp/Common/Farming/FieldService.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using Godot;
 using Godot.Collections;
 
@@ -6,32 +7,39 @@ namespace Babushka.scripts.CSharp.Common.Farming;
 [GlobalClass]
 public partial class FieldService : Node3D
 {
-    [Export] private Dictionary<Vector2I, FieldState> fields = new Dictionary<Vector2I, FieldState>();
+    [Export] private Dictionary<Vector2I, FieldBehaviour> fields = new Dictionary<Vector2I, FieldBehaviour>();
 
     //Create
-
+    public bool TryAddEntry(Vector2I key, FieldBehaviour field)
-    public void AddEntry(Vector2I key, FieldState state)
     {
-        fields.Add(key, state);
+        if (!fields.ContainsKey(key))
+        {
+            fields.Add(key, field);
+            return true;
+        }
+        return false;
     }
     
     // Read
-
+    public FieldBehaviour Get(Vector2I key)
-    public FieldState Get(Vector2I key)
     {
-        return fields[key];
+        if (fields.TryGetValue(key, out FieldBehaviour field))
+            return field;
+            
+        return null;
     }
     
     //Update
-    public void UpdateEntry(Vector2I fieldPosition, FieldState state)
+    public void UpdateEntry(Vector2I fieldPosition, FieldBehaviour state)
     {
+        
         if (fields.ContainsKey(fieldPosition))
         {
             fields[fieldPosition] = state;
         }
         else
         {
-            AddEntry(fieldPosition, state);
+            TryAddEntry(fieldPosition, state);
         }
     }
     

scripts/CSharp/Common/Farming/FieldService.cs.uid

@@ -1 +1 @@
-uid://12hleqx8amr8
+uid://c6hh7m8wikv04

scripts/CSharp/Common/Inventory/InventoryUI.cs.uid

@@ -1 +0,0 @@
-uid://b7vlkecrn0t5c

scripts/CSharp/Common/Inventory/InventoryUi.cs.uid

@@ -0,0 +1 @@
+uid://hg7jay2kt441