fix: Consolidates commodity interface for reagents. (#1709)

modernuo · Mar 21, 2024 · f3d1fb8 · f3d1fb8
1 parent 3332fab
commit f3d1fb8
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 80 deletions.
diff --git a/Projects/UOContent/Items/Resources/Reagents/BaseReagent.cs b/Projects/UOContent/Items/Resources/Reagents/BaseReagent.cs
@@ -3,7 +3,7 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public abstract partial class BaseReagent : Item
+public abstract partial class BaseReagent : Item, ICommodity
 {
     public BaseReagent(int itemID, int amount = 1) : base(itemID)
     {
@@ -12,4 +12,7 @@ public BaseReagent(int itemID, int amount = 1) : base(itemID)
     }
 
     public override double DefaultWeight => 0.1;
-}
+
+    public virtual int DescriptionNumber => LabelNumber;
+    public virtual bool IsDeedable => true;
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/BatWing.cs b/Projects/UOContent/Items/Resources/Reagents/BatWing.cs
@@ -3,13 +3,10 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class BatWing : BaseReagent, ICommodity
+public partial class BatWing : BaseReagent
 {
     [Constructible]
     public BatWing(int amount = 1) : base(0xF78, amount)
     {
     }
-
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => true;
-}
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/BlackPearl.cs b/Projects/UOContent/Items/Resources/Reagents/BlackPearl.cs
@@ -3,13 +3,10 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class BlackPearl : BaseReagent, ICommodity
+public partial class BlackPearl : BaseReagent
 {
     [Constructible]
     public BlackPearl(int amount = 1) : base(0xF7A, amount)
     {
     }
-
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => true;
-}
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/Bloodmoss.cs b/Projects/UOContent/Items/Resources/Reagents/Bloodmoss.cs
@@ -3,13 +3,10 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class Bloodmoss : BaseReagent, ICommodity
+public partial class Bloodmoss : BaseReagent
 {
     [Constructible]
     public Bloodmoss(int amount = 1) : base(0xF7B, amount)
     {
     }
-
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => true;
-}
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/DaemonBlood.cs b/Projects/UOContent/Items/Resources/Reagents/DaemonBlood.cs
@@ -3,13 +3,10 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class DaemonBlood : BaseReagent, ICommodity
+public partial class DaemonBlood : BaseReagent
 {
     [Constructible]
     public DaemonBlood(int amount = 1) : base(0xF7D, amount)
     {
     }
-
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => true;
-}
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/DaemonBone.cs b/Projects/UOContent/Items/Resources/Reagents/DaemonBone.cs
@@ -3,7 +3,7 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class DaemonBone : BaseReagent, ICommodity
+public partial class DaemonBone : BaseReagent
 {
     [Constructible]
     public DaemonBone(int amount = 1) : base(0xF80, amount)
@@ -12,6 +12,5 @@ public DaemonBone(int amount = 1) : base(0xF80, amount)
 
     public override double DefaultWeight => 1.0;
 
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => Core.ML;
-}
+    public override bool IsDeedable => Core.ML;
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/DeadWood.cs b/Projects/UOContent/Items/Resources/Reagents/DeadWood.cs
@@ -3,13 +3,10 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class DeadWood : BaseReagent, ICommodity
+public partial class DeadWood : BaseReagent
 {
     [Constructible]
     public DeadWood(int amount = 1) : base(0xF90, amount)
     {
     }
-
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => true;
-}
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/DragonsBlood.cs b/Projects/UOContent/Items/Resources/Reagents/DragonsBlood.cs
@@ -3,13 +3,12 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class DragonsBlood : BaseReagent, ICommodity
+public partial class DragonsBlood : BaseReagent
 {
     [Constructible]
     public DragonsBlood(int amount = 1) : base(0x4077, amount)
     {
     }
 
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => Core.ML;
-}
+    public override bool IsDeedable => Core.ML;
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/Garlic.cs b/Projects/UOContent/Items/Resources/Reagents/Garlic.cs
@@ -3,13 +3,10 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class Garlic : BaseReagent, ICommodity
+public partial class Garlic : BaseReagent
 {
     [Constructible]
     public Garlic(int amount = 1) : base(0xF84, amount)
     {
     }
-
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => true;
-}
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/Ginseng.cs b/Projects/UOContent/Items/Resources/Reagents/Ginseng.cs
@@ -3,13 +3,10 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class Ginseng : BaseReagent, ICommodity
+public partial class Ginseng : BaseReagent
 {
     [Constructible]
     public Ginseng(int amount = 1) : base(0xF85, amount)
     {
     }
-
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => true;
-}
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/GraveDust.cs b/Projects/UOContent/Items/Resources/Reagents/GraveDust.cs
@@ -3,13 +3,10 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class GraveDust : BaseReagent, ICommodity
+public partial class GraveDust : BaseReagent
 {
     [Constructible]
     public GraveDust(int amount = 1) : base(0xF8F, amount)
     {
     }
-
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => true;
-}
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/MandrakeRoot.cs b/Projects/UOContent/Items/Resources/Reagents/MandrakeRoot.cs
@@ -3,13 +3,10 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class MandrakeRoot : BaseReagent, ICommodity
+public partial class MandrakeRoot : BaseReagent
 {
     [Constructible]
     public MandrakeRoot(int amount = 1) : base(0xF86, amount)
     {
     }
-
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => true;
-}
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/Nightshade.cs b/Projects/UOContent/Items/Resources/Reagents/Nightshade.cs
@@ -3,13 +3,10 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class Nightshade : BaseReagent, ICommodity
+public partial class Nightshade : BaseReagent
 {
     [Constructible]
     public Nightshade(int amount = 1) : base(0xF88, amount)
     {
     }
-
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => true;
-}
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/NoxCrystal.cs b/Projects/UOContent/Items/Resources/Reagents/NoxCrystal.cs
@@ -3,13 +3,10 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class NoxCrystal : BaseReagent, ICommodity
+public partial class NoxCrystal : BaseReagent
 {
     [Constructible]
     public NoxCrystal(int amount = 1) : base(0xF8E, amount)
     {
     }
-
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => true;
-}
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/PigIron.cs b/Projects/UOContent/Items/Resources/Reagents/PigIron.cs
@@ -3,13 +3,10 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class PigIron : BaseReagent, ICommodity
+public partial class PigIron : BaseReagent
 {
     [Constructible]
     public PigIron(int amount = 1) : base(0xF8A, amount)
     {
     }
-
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => true;
-}
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/SpidersSilk.cs b/Projects/UOContent/Items/Resources/Reagents/SpidersSilk.cs
@@ -3,13 +3,10 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class SpidersSilk : BaseReagent, ICommodity
+public partial class SpidersSilk : BaseReagent
 {
     [Constructible]
     public SpidersSilk(int amount = 1) : base(0xF8D, amount)
     {
     }
-
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => true;
-}
+}
diff --git a/Projects/UOContent/Items/Resources/Reagents/SulfurousAsh.cs b/Projects/UOContent/Items/Resources/Reagents/SulfurousAsh.cs
@@ -3,13 +3,10 @@
 namespace Server.Items;
 
 [SerializationGenerator(0, false)]
-public partial class SulfurousAsh : BaseReagent, ICommodity
+public partial class SulfurousAsh : BaseReagent
 {
     [Constructible]
     public SulfurousAsh(int amount = 1) : base(0xF8C, amount)
     {
     }
-
-    int ICommodity.DescriptionNumber => LabelNumber;
-    bool ICommodity.IsDeedable => true;
-}
+}