🐛 field creation at the same spot no longer possible, also watering works now.

scripts/CSharp/Common/Farming/FieldService.cs

@@ -3,75 +3,109 @@ using Godot;
 
 namespace Babushka.scripts.CSharp.Common.Farming;
 
-public partial class FieldService : Node2D
+public partial class FieldService : Node
 {
-    private Dictionary<PackedScene, FieldsInScene>? fieldsPerScene;
-
-
-
+    private Dictionary<string, FieldsInScene>? outerDict;
+    
     [Signal] public delegate void FieldCreatedEventHandler();
     
-    //Create
-    public bool TryAddEntry(PackedScene scene, Vector2I key, FieldBehaviour2D field)
+    public static FieldService Instance { get; private set; } = null!;
+
+    public override void _EnterTree()
     {
-        if (!fieldsPerScene.ContainsKey(scene))
+            Instance = this;
+            outerDict = new Dictionary<string, FieldsInScene>();
+    }
+    
+
+    //Create
+    public bool TryAddEntry(string sceneName, Vector2I position, FieldBehaviour2D field)
+    {
+        GD.Print($"Fieldservice: Trying to add a new entry. SceneName: {sceneName} Position: {position}.");
+        if (outerDict != null )
         {
-            FieldsInScene fieldInstance = new FieldsInScene();
-            fieldsPerScene.Add(scene, fieldInstance);
-            EmitSignal(SignalName.FieldCreated);
-            return true;
+            FieldsInScene fieldsInScene;
+            bool outerDictEntryExists = outerDict.TryGetValue(sceneName, out fieldsInScene);
+            
+            if (!outerDictEntryExists)
+            {
+                fieldsInScene = new FieldsInScene();
+                outerDict.Add(sceneName, fieldsInScene);
+            }
+            
+            if (!fieldsInScene.fields.ContainsKey(position))
+            {
+                fieldsInScene.fields.Add(position, field);
+                EmitSignal(SignalName.FieldCreated);
+                GD.Print("Fieldservice: successfully added field to dictionary.");
+                return true;
+            }
         }
+        
+        GD.Print("Fieldservice: Either no outerdict found or there is already a field here!");
         return false;
     }
     
     // Read
-    public FieldBehaviour2D Get(PackedScene key, Vector2I fieldPosition)
+    public FieldBehaviour2D? TryGet(string key, Vector2I fieldPosition)
     {
-        if (fieldsPerScene.TryGetValue(key, out FieldsInScene field))
+        if (outerDict != null && outerDict.TryGetValue(key, out FieldsInScene? field))
         {
-            if (field.fields.TryGetValue(fieldPosition, out FieldBehaviour2D fieldInstance))
+            GD.Print($"Fieldservice: Successfully retrieved fieldsPerScene Dictionary. " +
+                     $"OuterDict Count: {outerDict.Count} InnerDict Count {outerDict[key].fields.Count}");
+            if (field.fields.TryGetValue(fieldPosition, out FieldBehaviour2D? fieldInstance))
+            {
+                GD.Print($"Fieldservice: Successfully retrieved fieldInstance at position: {fieldPosition}.");
                 return fieldInstance;
+            }
         }
-            
+        GD.Print("Fieldservice TryGet: No field found.");
         return null;
     }
     
-    //todo: 
-    // - Make this a singleton
-    // - Let this interact with the FarmingControls and the FieldBehaviours
-    // - Replace FieldService2D and remove it from scenes.
     
-    
-    /*
     //Update
-    public void UpdateEntry(Vector2I fieldPosition, FieldBehaviour2D state)
+    public void UpdateEntry(string key, Vector2I fieldPosition, FieldBehaviour2D state)
     {
+        GD.Print($"FieldService: Updating entry at {fieldPosition}");
+        if (outerDict != null && outerDict.TryGetValue(key, out FieldsInScene? field))
+        {
+            if (field.fields.ContainsKey(fieldPosition))
+            {
+                field.fields[fieldPosition] = state;
+            }
+            else
+            {
+                TryAddEntry(key, fieldPosition, state);
+            }
+        }
+
         
-        if (fields.ContainsKey(fieldPosition))
-        {
-            fields[fieldPosition] = state;
-        }
-        else
-        {
-            TryAddEntry(fieldPosition, state);
-        }
     }
     
     //Delete
 
-    public void RemoveEntry(Vector2I fieldPosition)
+    public void RemoveEntry(string key, Vector2I fieldPosition)
     {
-        if (fields.ContainsKey(fieldPosition))
+        GD.Print($"FieldService: Removing entry at {fieldPosition}.");
+        if (outerDict != null && outerDict.TryGetValue(key, out FieldsInScene? field))
         {
-            fields.Remove(fieldPosition);
+            if (field.fields.ContainsKey(fieldPosition))
+            {
+                field.fields.Remove(fieldPosition);
+            }
         }
     }
-    */
 }
 
 internal class FieldsInScene 
 {
-    public Dictionary<Vector2I, FieldBehaviour2D> fields;
+    public Dictionary<Vector2I, FieldBehaviour2D?> fields;
+
+    public FieldsInScene()
+    {
+        fields = new Dictionary<Vector2I, FieldBehaviour2D?>();
+    }
 }