fix: Optimizes items to use default weights. (Part 1) (#2240)

Projects/UOContent/Items/Food/Asian.cs

@@ -6,7 +6,11 @@ namespace Server.Items;
 public partial class Wasabi : Food
 {
     [Constructible]
-    public Wasabi() : base(0x24E8) => Weight = 1.0;
+    public Wasabi() : base(0x24E8)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 }
 
 [SerializationGenerator(0, false)]

Projects/UOContent/Items/Food/Beverage.cs

@@ -38,7 +38,11 @@ public interface IWaterSource : IHasQuantity
 public partial class BeverageBottle : BaseBeverage
 {
     [Constructible]
-    public BeverageBottle(BeverageType type) : base(type) => Weight = 1.0;
+    public BeverageBottle(BeverageType type) : base(type)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int BaseLabelNumber => 1042959; // a bottle of Ale
     public override int MaxQuantity => 5;
@@ -68,7 +72,11 @@ public partial class BeverageBottle : BaseBeverage
 public partial class Jug : BaseBeverage
 {
     [Constructible]
-    public Jug(BeverageType type) : base(type) => Weight = 1.0;
+    public Jug(BeverageType type) : base(type)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int BaseLabelNumber => 1042965; // a jug of Ale
     public override int MaxQuantity => 10;
@@ -81,10 +89,16 @@ public partial class Jug : BaseBeverage
 public partial class CeramicMug : BaseBeverage
 {
     [Constructible]
-    public CeramicMug() => Weight = 1.0;
+    public CeramicMug()
+    {
+    }
 
     [Constructible]
-    public CeramicMug(BeverageType type) : base(type) => Weight = 1.0;
+    public CeramicMug(BeverageType type) : base(type)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int BaseLabelNumber => 1042982; // a ceramic mug of Ale
     public override int MaxQuantity => 1;
@@ -96,10 +110,16 @@ public partial class CeramicMug : BaseBeverage
 public partial class PewterMug : BaseBeverage
 {
     [Constructible]
-    public PewterMug() => Weight = 1.0;
+    public PewterMug()
+    {
+    }
 
     [Constructible]
-    public PewterMug(BeverageType type) : base(type) => Weight = 1.0;
+    public PewterMug(BeverageType type) : base(type)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int BaseLabelNumber => 1042994; // a pewter mug with Ale
     public override int MaxQuantity => 1;
@@ -111,10 +131,16 @@ public partial class PewterMug : BaseBeverage
 public partial class Goblet : BaseBeverage
 {
     [Constructible]
-    public Goblet() => Weight = 1.0;
+    public Goblet()
+    {
+    }
 
     [Constructible]
-    public Goblet(BeverageType type) : base(type) => Weight = 1.0;
+    public Goblet(BeverageType type) : base(type)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int BaseLabelNumber => 1043000; // a goblet of Ale
     public override int MaxQuantity => 1;
@@ -134,10 +160,16 @@ public partial class Goblet : BaseBeverage
 public partial class GlassMug : BaseBeverage
 {
     [Constructible]
-    public GlassMug() => Weight = 1.0;
+    public GlassMug()
+    {
+    }
 
     [Constructible]
-    public GlassMug(BeverageType type) : base(type) => Weight = 1.0;
+    public GlassMug(BeverageType type) : base(type)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int EmptyLabelNumber => 1022456; // mug
     public override int BaseLabelNumber => 1042976;  // a mug of Ale

Projects/UOContent/Items/Food/Bowls.cs

@@ -6,14 +6,22 @@ namespace Server.Items;
 public partial class EmptyWoodenBowl : Item
 {
     [Constructible]
-    public EmptyWoodenBowl() : base(0x15F8) => Weight = 1.0;
+    public EmptyWoodenBowl() : base(0x15F8)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 }
 
 [SerializationGenerator(0, false)]
 public partial class EmptyPewterBowl : Item
 {
     [Constructible]
-    public EmptyPewterBowl() : base(0x15FD) => Weight = 1.0;
+    public EmptyPewterBowl() : base(0x15FD)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 }
 
 [SerializationGenerator(0, false)]

Projects/UOContent/Items/Food/CookableFood.cs

@@ -128,7 +128,11 @@ public partial class RawBird : CookableFood
 public partial class UnbakedPeachCobbler : CookableFood
 {
     [Constructible]
-    public UnbakedPeachCobbler() : base(0x1042, 25) => Weight = 1.0;
+    public UnbakedPeachCobbler() : base(0x1042, 25)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int LabelNumber => 1041335; // unbaked peach cobbler
 
@@ -139,7 +143,11 @@ public partial class UnbakedPeachCobbler : CookableFood
 public partial class UnbakedFruitPie : CookableFood
 {
     [Constructible]
-    public UnbakedFruitPie() : base(0x1042, 25) => Weight = 1.0;
+    public UnbakedFruitPie() : base(0x1042, 25)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int LabelNumber => 1041334; // unbaked fruit pie
 
@@ -150,7 +158,11 @@ public partial class UnbakedFruitPie : CookableFood
 public partial class UnbakedMeatPie : CookableFood
 {
     [Constructible]
-    public UnbakedMeatPie() : base(0x1042, 25) => Weight = 1.0;
+    public UnbakedMeatPie() : base(0x1042, 25)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int LabelNumber => 1041338; // unbaked meat pie
 
@@ -161,7 +173,11 @@ public partial class UnbakedMeatPie : CookableFood
 public partial class UnbakedPumpkinPie : CookableFood
 {
     [Constructible]
-    public UnbakedPumpkinPie() : base(0x1042, 25) => Weight = 1.0;
+    public UnbakedPumpkinPie() : base(0x1042, 25)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int LabelNumber => 1041342; // unbaked pumpkin pie
 
@@ -172,7 +188,11 @@ public partial class UnbakedPumpkinPie : CookableFood
 public partial class UnbakedApplePie : CookableFood
 {
     [Constructible]
-    public UnbakedApplePie() : base(0x1042, 25) => Weight = 1.0;
+    public UnbakedApplePie() : base(0x1042, 25)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int LabelNumber => 1041336; // unbaked apple pie
 
@@ -184,7 +204,11 @@ public partial class UnbakedApplePie : CookableFood
 public partial class UncookedCheesePizza : CookableFood
 {
     [Constructible]
-    public UncookedCheesePizza() : base(0x1083, 20) => Weight = 1.0;
+    public UncookedCheesePizza() : base(0x1083, 20)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int LabelNumber => 1041341; // uncooked cheese pizza
 
@@ -195,7 +219,11 @@ public partial class UncookedCheesePizza : CookableFood
 public partial class UncookedSausagePizza : CookableFood
 {
     [Constructible]
-    public UncookedSausagePizza() : base(0x1083, 20) => Weight = 1.0;
+    public UncookedSausagePizza() : base(0x1083, 20)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int LabelNumber => 1041337; // uncooked sausage pizza
 
@@ -206,7 +234,11 @@ public partial class UncookedSausagePizza : CookableFood
 public partial class UnbakedQuiche : CookableFood
 {
     [Constructible]
-    public UnbakedQuiche() : base(0x1042, 25) => Weight = 1.0;
+    public UnbakedQuiche() : base(0x1042, 25)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int LabelNumber => 1041339; // unbaked quiche
 
@@ -261,7 +293,11 @@ public partial class EasterEggs : CookableFood
 public partial class CookieMix : CookableFood
 {
     [Constructible]
-    public CookieMix() : base(0x103F, 20) => Weight = 1.0;
+    public CookieMix() : base(0x103F, 20)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override Food Cook() => new Cookies();
 }
@@ -270,7 +306,11 @@ public partial class CookieMix : CookableFood
 public partial class CakeMix : CookableFood
 {
     [Constructible]
-    public CakeMix() : base(0x103F, 40) => Weight = 1.0;
+    public CakeMix() : base(0x103F, 40)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 
     public override int LabelNumber => 1041002; // cake mix
 

Projects/UOContent/Items/Food/Cooking.cs

@@ -44,14 +44,22 @@ public partial class JarHoney : Item
 public partial class BowlFlour : Item
 {
     [Constructible]
-    public BowlFlour() : base(0xa1e) => Weight = 1.0;
+    public BowlFlour() : base(0xa1e)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 }
 
 [SerializationGenerator(0, false)]
 public partial class WoodenBowl : Item
 {
     [Constructible]
-    public WoodenBowl() : base(0x15f8) => Weight = 1.0;
+    public WoodenBowl() : base(0x15f8)
+    {
+    }
+
+    public override double DefaultWeight => 1.0;
 }
 
 [TypeAlias("Server.Items.SackFlourOpen")]

Projects/UOContent/Items/Food/Vegetables.cs

@@ -7,11 +7,9 @@ namespace Server.Items;
 public partial class Carrot : Food
 {
     [Constructible]
-    public Carrot(int amount = 1) : base(0xc78, amount)
-    {
-        Weight = 1.0;
-        FillFactor = 1;
-    }
+    public Carrot(int amount = 1) : base(0xc78, amount) => FillFactor = 1;
+
+    public override double DefaultWeight => 1.0;
 }
 
 [Flippable(0xc7b, 0xc7c)]
@@ -19,11 +17,9 @@ public partial class Carrot : Food
 public partial class Cabbage : Food
 {
     [Constructible]
-    public Cabbage(int amount = 1) : base(0xc7b, amount)
-    {
-        Weight = 1.0;
-        FillFactor = 1;
-    }
+    public Cabbage(int amount = 1) : base(0xc7b, amount) => FillFactor = 1;
+
+    public override double DefaultWeight => 1.0;
 }
 
 [Flippable(0xc6d, 0xc6e)]
@@ -31,11 +27,9 @@ public partial class Cabbage : Food
 public partial class Onion : Food
 {
     [Constructible]
-    public Onion(int amount = 1) : base(0xc6d, amount)
-    {
-        Weight = 1.0;
-        FillFactor = 1;
-    }
+    public Onion(int amount = 1) : base(0xc6d, amount) => FillFactor = 1;
+
+    public override double DefaultWeight => 1.0;
 }
 
 [Flippable(0xc70, 0xc71)]
@@ -43,11 +37,9 @@ public partial class Onion : Food
 public partial class Lettuce : Food
 {
     [Constructible]
-    public Lettuce(int amount = 1) : base(0xc70, amount)
-    {
-        Weight = 1.0;
-        FillFactor = 1;
-    }
+    public Lettuce(int amount = 1) : base(0xc70, amount) => FillFactor = 1;
+
+    public override double DefaultWeight => 1.0;
 }
 
 [Flippable(0xC6A, 0xC6B)]
@@ -55,20 +47,16 @@ public partial class Lettuce : Food
 public partial class Pumpkin : Food
 {
     [Constructible]
-    public Pumpkin(int amount = 1) : base(0xC6A, amount)
-    {
-        Weight = 1.0;
-        FillFactor = 8;
-    }
+    public Pumpkin(int amount = 1) : base(0xC6A, amount) => FillFactor = 8;
+
+    public override double DefaultWeight => 1.0;
 }
 
 [SerializationGenerator(0, false)]
 public partial class SmallPumpkin : Food
 {
     [Constructible]
-    public SmallPumpkin(int amount = 1) : base(0xC6C, amount)
-    {
-        Weight = 1.0;
-        FillFactor = 8;
-    }
+    public SmallPumpkin(int amount = 1) : base(0xC6C, amount) => FillFactor = 8;
+
+    public override double DefaultWeight => 1.0;
 }