Extracted FightAttack Enum in the hopes of fixing errors

2025-07-31 20:35:14 +02:00
parent cfe604d3b7
commit 730c4999d7
6 changed files with 37 additions and 24 deletions
@@ -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
 {
@@ -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
+}
@@ -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.
@@ -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
+}
@@ -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;
+}
@@ -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;
-}
+