complete refactor

scripts/resources/EntityResource.cs

@@ -1,22 +0,0 @@
-using Godot;
-
-[Tool]
-public partial class EntityResource : Resource
-{
-    [Export] public string name_key;
-    [Export] public string description_key;
-    [Export]
-    public float Cost;
-    [Export]
-    public PackedScene Scene;
-    [Export]
-    public float ReloadTime;
-    [Export(PropertyHint.Range, "0,1,0.01")]
-    public float ReloadProgress;
-    [Export]
-    public Texture2D Preview;
-    [Export] public CustomSeedpacketFrame customFrame;
-    [Export] public int Layer = 1;
-    [Export] public int Order = 0;
-    public string internal_id;
-}

scripts/resources/MoneyReward.cs

@@ -1,5 +1,7 @@
 using Godot;
 
+namespace Newlon.Resources;
+
 [GlobalClass]
 [Tool]
 public partial class MoneyReward : RewardResource

scripts/resources/PlantResource.cs

@@ -1,9 +0,0 @@
-using Godot;
-
-namespace Newlon;
-
-[GlobalClass]
-[Tool]
-public partial class PlantResource : EntityResource
-{
-}

scripts/resources/PlantReward.cs

@@ -1,5 +1,6 @@
 using Godot;
-using Newlon;
+
+namespace Newlon.Resources;
 
 [GlobalClass]
 [Tool]

scripts/resources/RewardResource.cs

@@ -1,5 +1,7 @@
 using Godot;
 
+namespace Newlon.Resources;
+
 [GlobalClass]
 [Tool]
 public abstract partial class RewardResource : Resource

scripts/resources/ZombieResource.cs

@@ -1,7 +0,0 @@
-using Godot;
-
-[GlobalClass]
-[Tool]
-public partial class ZombieResource : EntityResource
-{
-}

scripts/resources/entities/EntityResource.cs

@@ -0,0 +1,16 @@
+using Godot;
+
+[Tool]
+public partial class EntityResource : Resource
+{
+    [Export] public string NameKey;
+    [Export] public string DescriptionKey;
+    [Export] public float Cost;
+    [Export] public PackedScene Scene;
+    [Export] public float ReloadTime;
+    [Export(PropertyHint.Range, "0,1,0.01")] public float ReloadProgress;
+    [Export] public Texture2D Preview;
+    [Export] public CustomSeedpacketFrame CustomFrame;
+    [Export] public int Order = 0;
+    public string internal_id;
+}

scripts/resources/entities/GridEntityResource.cs

@@ -0,0 +1,11 @@
+using Godot;
+
+namespace Newlon.Resources;
+
+[GlobalClass]
+[Tool]
+public partial class GridEntityResource : EntityResource
+{
+    [Export] public int Layer = 1;
+    [Export] public bool DontRegister = false;
+}

scripts/resources/entities/GridEntityResource.cs.uid

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

scripts/resources/entities/PlantResource.cs

@@ -0,0 +1,9 @@
+using Godot;
+
+namespace Newlon.Resources;
+
+[GlobalClass]
+[Tool]
+public partial class PlantResource : GridEntityResource
+{
+}

scripts/resources/entities/ZombieResource.cs

@@ -0,0 +1,28 @@
+using Godot;
+
+namespace Newlon.Resources;
+
+[GlobalClass]
+[Tool]
+public partial class ZombieResource : EntityResource
+{
+    public GridEntityResource ToGridEntity()
+    {
+        GridEntityResource result = new();
+
+        result.NameKey = NameKey;
+        result.DescriptionKey = DescriptionKey;
+        result.Cost = Cost;
+        result.Scene = Scene;
+        result.ReloadTime = ReloadTime;
+        result.ReloadProgress = ReloadProgress;
+        result.Preview = Preview;
+        result.CustomFrame = CustomFrame;
+        result.Order = Order;
+
+        result.Layer = 1;
+        result.DontRegister = true;
+
+        return result;
+    }
+}