fix: Optimizes items to use default weights. (Part 4) (#2243)

Projects/UOContent/Items/Skill Items/Lumberjack/Log.cs

@@ -20,13 +20,14 @@ public partial class Log : Item, ICommodity, IAxe
     public Log(CraftResource resource, int amount) : base(0x1BDD)
     {
         Stackable = true;
-        Weight = 2.0;
         Amount = amount;
 
         _resource = resource;
         Hue = CraftResources.GetHue(resource);
     }
 
+    public override double DefaultWeight => 2.0;
+
     [SerializableProperty(0)]
     [CommandProperty(AccessLevel.GameMaster)]
     public CraftResource Resource

Projects/UOContent/Items/Skill Items/Magical/Misc/BlankScroll.cs

@@ -9,10 +9,11 @@ public partial class BlankScroll : Item, ICommodity
     public BlankScroll(int amount = 1) : base(0xEF3)
     {
         Stackable = true;
-        Weight = 1.0;
         Amount = amount;
     }
 
+    public override double DefaultWeight => 1.0;
+
     int ICommodity.DescriptionNumber => LabelNumber;
     bool ICommodity.IsDeedable => Core.ML;
 }

Projects/UOContent/Items/Skill Items/Magical/Misc/Bottle.cs

@@ -9,10 +9,11 @@ public partial class Bottle : Item, ICommodity
     public Bottle(int amount = 1) : base(0xF0E)
     {
         Stackable = true;
-        Weight = 1.0;
         Amount = amount;
     }
 
+    public override double DefaultWeight => 1.0;
+
     int ICommodity.DescriptionNumber => LabelNumber;
     bool ICommodity.IsDeedable => Core.ML;
 }

Projects/UOContent/Items/Skill Items/Magical/Misc/PotionKeg.cs

@@ -16,7 +16,11 @@ public partial class PotionKeg : Item
     private PotionEffect _type;
 
     [Constructible]
-    public PotionKeg() : base(0x1940) => UpdateWeight();
+    public PotionKeg() : base(0x1940)
+    {
+    }
+
+    public override double DefaultWeight => 20 + Math.Clamp(_held, 0, 100) * 0.8;
 
     [SerializableProperty(1)]
     [CommandProperty(AccessLevel.GameMaster)]
@@ -28,7 +32,6 @@ public partial class PotionKeg : Item
             if (_held != value)
             {
                 _held = value;
-                UpdateWeight();
                 InvalidateProperties();
                 this.MarkDirty();
             }
@@ -48,13 +51,6 @@ public partial class PotionKeg : Item
         }
     }
 
-    public virtual void UpdateWeight()
-    {
-        var held = Math.Max(0, Math.Min(_held, 100));
-
-        Weight = 20 + held * 80 / 100;
-    }
-
     private void Deserialize(IGenericReader reader, int version)
     {
         _type = (PotionEffect)reader.ReadInt();

Projects/UOContent/Items/Skill Items/Magical/Misc/RecallRune.cs

@@ -21,10 +21,11 @@ public partial class RecallRune : Item
     [Constructible]
     public RecallRune() : base(0x1F14)
     {
-        Weight = 1.0;
         CalculateHue();
     }
 
+    public override double DefaultWeight => 1.0;
+
     [SerializableProperty(0)]
     [CommandProperty(AccessLevel.Counselor, AccessLevel.GameMaster)]
     public BaseHouse House

Projects/UOContent/Items/Skill Items/Magical/Potions/BasePotion.cs

@@ -50,9 +50,10 @@ public abstract partial class BasePotion : Item, ICraftable, ICommodity
         _potionEffect = effect;
 
         Stackable = Core.ML;
-        Weight = 1.0;
     }
 
+    public override double DefaultWeight => 1.0;
+
     public override int LabelNumber => 1041314 + (int)_potionEffect;
 
     public virtual bool RequireFreeHand => true;

Projects/UOContent/Items/Skill Items/Magical/Runebook.cs

@@ -60,7 +60,6 @@ public partial class Runebook : Item, ISecurable, ICraftable
     [Constructible]
     public Runebook(int maxCharges) : base(Core.AOS ? 0x22C5 : 0xEFA)
     {
-        Weight = Core.SE ? 1.0 : 3.0;
         LootType = LootType.Blessed;
         Hue = 0x461;
 
@@ -72,6 +71,8 @@ public partial class Runebook : Item, ISecurable, ICraftable
         _level = SecureLevel.CoOwners;
     }
 
+    public override double DefaultWeight => Core.SE ? 1.0 : 3.0;
+
     [CommandProperty(AccessLevel.GameMaster)]
     public DateTime NextUse { get; set; }
 

Projects/UOContent/Items/Skill Items/Magical/Scrolls/SpellScroll.cs

@@ -16,12 +16,13 @@ public partial class SpellScroll : Item, ICommodity
     public SpellScroll(int spellID, int itemID, int amount = 1) : base(itemID)
     {
         Stackable = true;
-        Weight = 1.0;
         Amount = amount;
 
         _spellID = spellID;
     }
 
+    public override double DefaultWeight => 1.0;
+
     int ICommodity.DescriptionNumber => LabelNumber;
     bool ICommodity.IsDeedable => Core.ML;
 

Projects/UOContent/Items/Skill Items/Magical/Spellbook.cs

@@ -116,7 +116,6 @@ public partial class Spellbook : Item, ICraftable, ISlayer, IAosItem
         _attributes = new AosAttributes(this);
         _skillBonuses = new AosSkillBonuses(this);
 
-        Weight = 3.0;
         Layer = Layer.OneHanded;
         LootType = LootType.Blessed;
 
@@ -124,6 +123,8 @@ public partial class Spellbook : Item, ICraftable, ISlayer, IAosItem
         Content = content;
     }
 
+    public override double DefaultWeight => 3.0;
+
     public override bool DisplayWeight => false;
 
     public virtual SpellbookType SpellbookType => SpellbookType.Regular;

Projects/UOContent/Items/Skill Items/Misc/FireHorn.cs

@@ -10,11 +10,9 @@ namespace Server.Items;
 public partial class FireHorn : Item
 {
     [Constructible]
-    public FireHorn() : base(0xFC7)
-    {
-        Hue = 0x466;
-        Weight = 1.0;
-    }
+    public FireHorn() : base(0xFC7) => Hue = 0x466;
+
+    public override double DefaultWeight => 1.0;
 
     public override int LabelNumber => 1060456; // fire horn
 

Projects/UOContent/Items/Skill Items/Ninjitsu/EggBomb.cs

@@ -11,9 +11,10 @@ public partial class EggBomb : Item
     {
         // Item ID should be 0x2809 - Temporary solution for clients 7.0.0.0 and up
         Stackable = Core.ML;
-        Weight = 1.0;
     }
 
+    public override double DefaultWeight => 1.0;
+
     public override int LabelNumber => 1030249;
 
     public override void OnDoubleClick(Mobile from)

Projects/UOContent/Items/Skill Items/Ninjitsu/Fukiya.cs

@@ -26,11 +26,9 @@ public partial class Fukiya : Item, INinjaWeapon
     private int _poisonCharges;
 
     [Constructible]
-    public Fukiya() : base(0x27AA)
-    {
-        Weight = 4.0;
-        Layer = Layer.OneHanded;
-    }
+    public Fukiya() : base(0x27AA) => Layer = Layer.OneHanded;
+
+    public override double DefaultWeight => 1.0;
 
     public virtual int WrongAmmoMessage => 1063329;    // You can only load fukiya darts
     public virtual int NoFreeHandMessage => 1063327;   // You must have a free hand to use a fukiya.

Projects/UOContent/Items/Skill Items/Ninjitsu/FukiyaDarts.cs

@@ -23,15 +23,9 @@ public partial class FukiyaDarts : Item, ICraftable, INinjaAmmo
     private int _poisonCharges;
 
     [Constructible]
-    public FukiyaDarts(int amount = 1) : base(0x2806)
-    {
-        Weight = 1.0;
-        _usesRemaining = amount;
-    }
+    public FukiyaDarts(int amount = 1) : base(0x2806) => _usesRemaining = amount;
 
-    public FukiyaDarts(Serial serial) : base(serial)
-    {
-    }
+    public override double DefaultWeight => 1.0;
 
     public int OnCraft(
         int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool,

Projects/UOContent/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs

@@ -26,11 +26,9 @@ public partial class LeatherNinjaBelt : BaseWaist, INinjaWeapon
     private int _poisonCharges;
 
     [Constructible]
-    public LeatherNinjaBelt() : base(0x2790)
-    {
-        Weight = 1.0;
-        Layer = Layer.Waist;
-    }
+    public LeatherNinjaBelt() : base(0x2790) => Layer = Layer.Waist;
+
+    public override double DefaultWeight => 1.0;
 
     public override CraftResource DefaultResource => CraftResource.RegularLeather;
 

Projects/UOContent/Items/Skill Items/Ninjitsu/Shuriken.cs

@@ -24,11 +24,9 @@ public partial class Shuriken : Item, ICraftable, INinjaAmmo
     private int _poisonCharges;
 
     [Constructible]
-    public Shuriken(int amount = 1) : base(0x27AC)
-    {
-        Weight = 1.0;
-        _usesRemaining = amount;
-    }
+    public Shuriken(int amount = 1) : base(0x27AC) => _usesRemaining = amount;
+
+    public override double DefaultWeight => 1.0;
 
     public int OnCraft(
         int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool,

Projects/UOContent/Items/Skill Items/Ninjitsu/SmokeBomb.cs

@@ -7,11 +7,9 @@ namespace Server.Items;
 public partial class SmokeBomb : Item
 {
     [Constructible]
-    public SmokeBomb() : base(0x2808)
-    {
-        Stackable = Core.ML;
-        Weight = 1.0;
-    }
+    public SmokeBomb() : base(0x2808) => Stackable = Core.ML;
+
+    public override double DefaultWeight => 1.0;
 
     public override void OnDoubleClick(Mobile from)
     {

Projects/UOContent/Items/Skill Items/Specialized/Sand.cs

@@ -7,11 +7,9 @@ namespace Server.Items;
 public partial class Sand : Item, ICommodity
 {
     [Constructible]
-    public Sand(int amount = 1) : base(0x11EA)
-    {
-        Stackable = Core.ML;
-        Weight = 1.0;
-    }
+    public Sand(int amount = 1) : base(0x11EA) => Stackable = Core.ML;
+
+    public override double DefaultWeight => 1.0;
 
     public override int LabelNumber => 1044626; // sand
     int ICommodity.DescriptionNumber => LabelNumber;

Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs

@@ -25,11 +25,9 @@ namespace Server.Items
         private bool _redyable;
 
         [Constructible]
-        public DyeTub() : base(0xFAB)
-        {
-            Weight = 10.0;
-            _redyable = true;
-        }
+        public DyeTub() : base(0xFAB) => _redyable = true;
+
+        public override double DefaultWeight => 10.0;
 
         public virtual CustomHuePicker CustomHuePicker => null;
 

Projects/UOContent/Items/Skill Items/Tinkering/Axle.cs

@@ -11,6 +11,7 @@ public partial class Axle : Item
     {
         Stackable = true;
         Amount = amount;
-        Weight = 1.0;
     }
+
+    public override double DefaultWeight => 1.0;
 }

Projects/UOContent/Items/Skill Items/Tinkering/AxleGears.cs

@@ -11,6 +11,7 @@ public partial class AxleGears : Item
     {
         Stackable = true;
         Amount = amount;
-        Weight = 1.0;
     }
+
+    public override double DefaultWeight => 1.0;
 }

Projects/UOContent/Items/Skill Items/Tinkering/ClockFrame.cs

@@ -11,6 +11,7 @@ public partial class ClockFrame : Item
     {
         Stackable = true;
         Amount = amount;
-        Weight = 2.0;
     }
+
+    public override double DefaultWeight => 2.0;
 }

Projects/UOContent/Items/Skill Items/Tinkering/ClockParts.cs

@@ -11,6 +11,7 @@ public partial class ClockParts : Item
     {
         Stackable = true;
         Amount = amount;
-        Weight = 1.0;
     }
+
+    public override double DefaultWeight => 1.0;
 }

Projects/UOContent/Items/Skill Items/Tinkering/Gears.cs

@@ -11,6 +11,7 @@ public partial class Gears : Item
     {
         Stackable = true;
         Amount = amount;
-        Weight = 1.0;
     }
+
+    public override double DefaultWeight => 1.0;
 }

Projects/UOContent/Items/Skill Items/Tinkering/Hinge.cs

@@ -11,6 +11,7 @@ public partial class Hinge : Item
     {
         Stackable = true;
         Amount = amount;
-        Weight = 1.0;
     }
+
+    public override double DefaultWeight => 1.0;
 }

Projects/UOContent/Items/Skill Items/Tinkering/SextantParts.cs

@@ -11,6 +11,7 @@ public partial class SextantParts : Item
     {
         Stackable = true;
         Amount = amount;
-        Weight = 2.0;
     }
+
+    public override double DefaultWeight => 2.0;
 }

Projects/UOContent/Items/Skill Items/Tinkering/Springs.cs

@@ -11,6 +11,7 @@ public partial class Springs : Item
     {
         Stackable = true;
         Amount = amount;
-        Weight = 1.0;
     }
+
+    public override double DefaultWeight => 1.0;
 }

Projects/UOContent/Items/Skill Items/Tools/Blowpipe.cs

@@ -8,18 +8,12 @@ namespace Server.Items;
 public partial class Blowpipe : BaseTool
 {
     [Constructible]
-    public Blowpipe() : base(0xE8A)
-    {
-        Weight = 4.0;
-        Hue = 0x3B9;
-    }
+    public Blowpipe() : base(0xE8A) => Hue = 0x3B9;
 
     [Constructible]
-    public Blowpipe(int uses) : base(uses, 0xE8A)
-    {
-        Weight = 4.0;
-        Hue = 0x3B9;
-    }
+    public Blowpipe(int uses) : base(uses, 0xE8A) => Hue = 0x3B9;
+
+    public override double DefaultWeight => 4.0;
 
     public override CraftSystem CraftSystem => DefGlassblowing.CraftSystem;
 

Projects/UOContent/Items/Skill Items/Tools/RunicDovetailSaw.cs

@@ -7,18 +7,12 @@ namespace Server.Items;
 public partial class RunicDovetailSaw : BaseRunicTool
 {
     [Constructible]
-    public RunicDovetailSaw(CraftResource resource) : base(resource, 0x1028)
-    {
-        Weight = 2.0;
-        Hue = CraftResources.GetHue(resource);
-    }
+    public RunicDovetailSaw(CraftResource resource) : base(resource, 0x1028) => Hue = CraftResources.GetHue(resource);
 
     [Constructible]
-    public RunicDovetailSaw(CraftResource resource, int uses) : base(resource, uses, 0x1028)
-    {
-        Weight = 2.0;
-        Hue = CraftResources.GetHue(resource);
-    }
+    public RunicDovetailSaw(CraftResource resource, int uses) : base(resource, uses, 0x1028) => Hue = CraftResources.GetHue(resource);
+
+    public override double DefaultWeight => 2.0;
 
     public override CraftSystem CraftSystem => DefCarpentry.CraftSystem;
 

Projects/UOContent/Items/Skill Items/Tools/RunicFletcherTool.cs

@@ -7,18 +7,12 @@ namespace Server.Items;
 public partial class RunicFletcherTool : BaseRunicTool
 {
     [Constructible]
-    public RunicFletcherTool(CraftResource resource) : base(resource, 0x1022)
-    {
-        Weight = 2.0;
-        Hue = CraftResources.GetHue(resource);
-    }
+    public RunicFletcherTool(CraftResource resource) : base(resource, 0x1022) => Hue = CraftResources.GetHue(resource);
 
     [Constructible]
-    public RunicFletcherTool(CraftResource resource, int uses) : base(resource, uses, 0x1022)
-    {
-        Weight = 2.0;
-        Hue = CraftResources.GetHue(resource);
-    }
+    public RunicFletcherTool(CraftResource resource, int uses) : base(resource, uses, 0x1022) => Hue = CraftResources.GetHue(resource);
+
+    public override double DefaultWeight => 2.0;
 
     public override CraftSystem CraftSystem => DefBowFletching.CraftSystem;
 

Projects/UOContent/Items/Skill Items/Tools/RunicHammer.cs

@@ -10,7 +10,6 @@ public partial class RunicHammer : BaseRunicTool
     [Constructible]
     public RunicHammer(CraftResource resource) : base(resource, 0x13E3)
     {
-        Weight = 8.0;
         Layer = Layer.OneHanded;
         Hue = CraftResources.GetHue(resource);
     }
@@ -18,11 +17,12 @@ public partial class RunicHammer : BaseRunicTool
     [Constructible]
     public RunicHammer(CraftResource resource, int uses) : base(resource, uses, 0x13E3)
     {
-        Weight = 8.0;
         Layer = Layer.OneHanded;
         Hue = CraftResources.GetHue(resource);
     }
 
+    public override double DefaultWeight => 8.0;
+
     public override CraftSystem CraftSystem => DefBlacksmithy.CraftSystem;
 
     public override int LabelNumber

Projects/UOContent/Items/Skill Items/Tools/RunicSewingKit.cs

@@ -7,18 +7,12 @@ namespace Server.Items;
 public partial class RunicSewingKit : BaseRunicTool
 {
     [Constructible]
-    public RunicSewingKit(CraftResource resource) : base(resource, 0xF9D)
-    {
-        Weight = 2.0;
-        Hue = CraftResources.GetHue(resource);
-    }
+    public RunicSewingKit(CraftResource resource) : base(resource, 0xF9D) => Hue = CraftResources.GetHue(resource);
 
     [Constructible]
-    public RunicSewingKit(CraftResource resource, int uses) : base(resource, uses, 0xF9D)
-    {
-        Weight = 2.0;
-        Hue = CraftResources.GetHue(resource);
-    }
+    public RunicSewingKit(CraftResource resource, int uses) : base(resource, uses, 0xF9D) => Hue = CraftResources.GetHue(resource);
+
+    public override double DefaultWeight => 2.0;
 
     public override CraftSystem CraftSystem => DefTailoring.CraftSystem;
 

Projects/UOContent/Items/Skill Items/Tools/SmithHammer.cs

@@ -8,18 +8,12 @@ namespace Server.Items;
 public partial class SmithHammer : BaseTool
 {
     [Constructible]
-    public SmithHammer() : base(0x13E3)
-    {
-        Weight = 8.0;
-        Layer = Layer.OneHanded;
-    }
+    public SmithHammer() : base(0x13E3) => Layer = Layer.OneHanded;
 
     [Constructible]
-    public SmithHammer(int uses) : base(uses, 0x13E3)
-    {
-        Weight = 8.0;
-        Layer = Layer.OneHanded;
-    }
+    public SmithHammer(int uses) : base(uses, 0x13E3) => Layer = Layer.OneHanded;
+
+    public override double DefaultWeight => 8.0;
 
     public override CraftSystem CraftSystem => DefBlacksmithy.CraftSystem;
 }