From 730c4999d7ce55ab26f2ce05f76966a4d2767000 Mon Sep 17 00:00:00 2001
From: kziolkowski <Katharina.Ziolkowski@gmail.com>
Date: Thu, 31 Jul 2025 20:35:14 +0200
Subject: [PATCH] Extracted FightAttack Enum in the hopes of fixing errors

---
 scripts/CSharp/Common/Farming/FieldBehaviour2D.cs |  9 ---------
 scripts/CSharp/Common/Farming/FieldState.cs       | 13 +++++++++++++
 scripts/CSharp/Common/Farming/PlantBehaviour2D.cs |  9 +--------
 scripts/CSharp/Common/Farming/PlantState.cs       | 13 +++++++++++++
 scripts/CSharp/Common/Fight/FightAttack.cs        |  9 +++++++++
 scripts/CSharp/Common/Fight/FightInstance.cs      |  8 +-------
 6 files changed, 37 insertions(+), 24 deletions(-)
 create mode 100644 scripts/CSharp/Common/Farming/FieldState.cs
 create mode 100644 scripts/CSharp/Common/Farming/PlantState.cs
 create mode 100644 scripts/CSharp/Common/Fight/FightAttack.cs

diff --git a/scripts/CSharp/Common/Farming/FieldBehaviour2D.cs b/scripts/CSharp/Common/Farming/FieldBehaviour2D.cs
index b52e0c4..b747ebf 100644
--- a/scripts/CSharp/Common/Farming/FieldBehaviour2D.cs
+++ b/scripts/CSharp/Common/Farming/FieldBehaviour2D.cs
@@ -4,15 +4,6 @@ using Godot;
 
 namespace Babushka.scripts.CSharp.Common.Farming;
 
-public enum FieldState
-{
-    Empty = 0,
-    Tilled = 1,
-    Planted = 2,
-    Watered = 3,
-    NotFound = 99
-}
-
 [GlobalClass]
 public partial class FieldBehaviour2D : Sprite2D
 {
diff --git a/scripts/CSharp/Common/Farming/FieldState.cs b/scripts/CSharp/Common/Farming/FieldState.cs
new file mode 100644
index 0000000..b489bb8
--- /dev/null
+++ b/scripts/CSharp/Common/Farming/FieldState.cs
@@ -0,0 +1,13 @@
+namespace Babushka.scripts.CSharp.Common.Farming;
+
+/// <summary>
+/// State of a farm field.
+/// </summary>
+public enum FieldState
+{
+    Empty = 0,
+    Tilled = 1,
+    Planted = 2,
+    Watered = 3,
+    NotFound = 99
+}
\ No newline at end of file
diff --git a/scripts/CSharp/Common/Farming/PlantBehaviour2D.cs b/scripts/CSharp/Common/Farming/PlantBehaviour2D.cs
index 36ea630..96f8fcd 100644
--- a/scripts/CSharp/Common/Farming/PlantBehaviour2D.cs
+++ b/scripts/CSharp/Common/Farming/PlantBehaviour2D.cs
@@ -5,14 +5,7 @@ using Godot;
 
 namespace Babushka.scripts.CSharp.Common.Farming;
 
-public enum PlantState
-{
-    None = 0,
-    Planted = 1,
-    SmallPlant = 2,
-    BigPlant = 3,
-    Ready = 4
-}
+
 
 /// <summary>
 /// Determines the behaviour of a plant in Babushka.
diff --git a/scripts/CSharp/Common/Farming/PlantState.cs b/scripts/CSharp/Common/Farming/PlantState.cs
new file mode 100644
index 0000000..7019625
--- /dev/null
+++ b/scripts/CSharp/Common/Farming/PlantState.cs
@@ -0,0 +1,13 @@
+namespace Babushka.scripts.CSharp.Common.Farming;
+
+/// <summary>
+///  State of a harvestable plant. Used in farming.
+/// </summary>
+public enum PlantState
+{
+    None = 0,
+    Planted = 1,
+    SmallPlant = 2,
+    BigPlant = 3,
+    Ready = 4
+}
\ No newline at end of file
diff --git a/scripts/CSharp/Common/Fight/FightAttack.cs b/scripts/CSharp/Common/Fight/FightAttack.cs
new file mode 100644
index 0000000..0c1248f
--- /dev/null
+++ b/scripts/CSharp/Common/Fight/FightAttack.cs
@@ -0,0 +1,9 @@
+namespace Babushka.scripts.CSharp.Common.Fight;
+
+public class FightAttack
+{
+    public int damage;
+    public bool needsSelectedTarget;
+    public Fighter? target;
+    public Fighter attacker;
+}
\ No newline at end of file
diff --git a/scripts/CSharp/Common/Fight/FightInstance.cs b/scripts/CSharp/Common/Fight/FightInstance.cs
index ff5eb89..28d608f 100644
--- a/scripts/CSharp/Common/Fight/FightInstance.cs
+++ b/scripts/CSharp/Common/Fight/FightInstance.cs
@@ -348,10 +348,4 @@ public partial class FightInstance : Node2D //TODO: remake
         return false;
     }
 }
-public class FightAttack
-{
-    public int damage;
-    public bool needsSelectedTarget;
-    public Fighter? target;
-    public Fighter attacker;
-}
+