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)
+    public FireHorn() : base(0xFC7) => Hue = 0x466;
-    {
+
-        Hue = 0x466;
+    public override double DefaultWeight => 1.0;
-        Weight = 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)
+    public Fukiya() : base(0x27AA) => Layer = Layer.OneHanded;
-    {
+
-        Weight = 4.0;
+    public override double DefaultWeight => 1.0;
-        Layer = Layer.OneHanded;
-    }
 
     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)
+    public FukiyaDarts(int amount = 1) : base(0x2806) => _usesRemaining = amount;
-    {
-        Weight = 1.0;
-        _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)
+    public LeatherNinjaBelt() : base(0x2790) => Layer = Layer.Waist;
-    {
+
-        Weight = 1.0;
+    public override double DefaultWeight => 1.0;
-        Layer = Layer.Waist;
-    }
 
     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)
+    public Shuriken(int amount = 1) : base(0x27AC) => _usesRemaining = amount;
-    {
+
-        Weight = 1.0;
+    public override double DefaultWeight => 1.0;
-        _usesRemaining = amount;
-    }
 
     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)
+    public SmokeBomb() : base(0x2808) => Stackable = Core.ML;
-    {
+
-        Stackable = Core.ML;
+    public override double DefaultWeight => 1.0;
-        Weight = 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)
+    public Sand(int amount = 1) : base(0x11EA) => Stackable = Core.ML;
-    {
+
-        Stackable = Core.ML;
+    public override double DefaultWeight => 1.0;
-        Weight = 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)
+        public DyeTub() : base(0xFAB) => _redyable = true;
-        {
+
-            Weight = 10.0;
+        public override double DefaultWeight => 10.0;
-            _redyable = true;
-        }
 
         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)
+    public Blowpipe() : base(0xE8A) => Hue = 0x3B9;
-    {
-        Weight = 4.0;
-        Hue = 0x3B9;
-    }
 
     [Constructible]
-    public Blowpipe(int uses) : base(uses, 0xE8A)
+    public Blowpipe(int uses) : base(uses, 0xE8A) => Hue = 0x3B9;
-    {
+
-        Weight = 4.0;
+    public override double DefaultWeight => 4.0;
-        Hue = 0x3B9;
-    }
 
     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)
+    public RunicDovetailSaw(CraftResource resource) : base(resource, 0x1028) => Hue = CraftResources.GetHue(resource);
-    {
-        Weight = 2.0;
-        Hue = CraftResources.GetHue(resource);
-    }
 
     [Constructible]
-    public RunicDovetailSaw(CraftResource resource, int uses) : base(resource, uses, 0x1028)
+    public RunicDovetailSaw(CraftResource resource, int uses) : base(resource, uses, 0x1028) => Hue = CraftResources.GetHue(resource);
-    {
+
-        Weight = 2.0;
+    public override double DefaultWeight => 2.0;
-        Hue = CraftResources.GetHue(resource);
-    }
 
     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)
+    public RunicFletcherTool(CraftResource resource) : base(resource, 0x1022) => Hue = CraftResources.GetHue(resource);
-    {
-        Weight = 2.0;
-        Hue = CraftResources.GetHue(resource);
-    }
 
     [Constructible]
-    public RunicFletcherTool(CraftResource resource, int uses) : base(resource, uses, 0x1022)
+    public RunicFletcherTool(CraftResource resource, int uses) : base(resource, uses, 0x1022) => Hue = CraftResources.GetHue(resource);
-    {
+
-        Weight = 2.0;
+    public override double DefaultWeight => 2.0;
-        Hue = CraftResources.GetHue(resource);
-    }
 
     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)
+    public RunicSewingKit(CraftResource resource) : base(resource, 0xF9D) => Hue = CraftResources.GetHue(resource);
-    {
-        Weight = 2.0;
-        Hue = CraftResources.GetHue(resource);
-    }
 
     [Constructible]
-    public RunicSewingKit(CraftResource resource, int uses) : base(resource, uses, 0xF9D)
+    public RunicSewingKit(CraftResource resource, int uses) : base(resource, uses, 0xF9D) => Hue = CraftResources.GetHue(resource);
-    {
+
-        Weight = 2.0;
+    public override double DefaultWeight => 2.0;
-        Hue = CraftResources.GetHue(resource);
-    }
 
     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)
+    public SmithHammer() : base(0x13E3) => Layer = Layer.OneHanded;
-    {
-        Weight = 8.0;
-        Layer = Layer.OneHanded;
-    }
 
     [Constructible]
-    public SmithHammer(int uses) : base(uses, 0x13E3)
+    public SmithHammer(int uses) : base(uses, 0x13E3) => Layer = Layer.OneHanded;
-    {
+
-        Weight = 8.0;
+    public override double DefaultWeight => 8.0;
-        Layer = Layer.OneHanded;
-    }
 
     public override CraftSystem CraftSystem => DefBlacksmithy.CraftSystem;
 }

Projects/UOContent/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs

@@ -118,8 +118,6 @@ public partial class DawnsMusicBox : Item, ISecurable
     [Constructible]
     public DawnsMusicBox() : base(0x2AF9)
     {
-        Weight = 1.0;
-
         var shuffledTracks = GetTracks(DawnsMusicRarity.Common);
         shuffledTracks.Shuffle();
 
@@ -132,6 +130,8 @@ public partial class DawnsMusicBox : Item, ISecurable
         ];
     }
 
+    public override double DefaultWeight => 1.0;
+
     public override int LabelNumber => 1075198; // Dawn's Music Box
 
     public override void OnAfterDuped(Item newItem)

Projects/UOContent/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicGear.cs

@@ -17,11 +17,9 @@ public partial class DawnsMusicGear : Item
     }
 
     [Constructible]
-    public DawnsMusicGear(MusicName music) : base(0x1053)
+    public DawnsMusicGear(MusicName music) : base(0x1053) => _music = music;
-    {
+
-        _music = music;
+    public override double DefaultWeight => 1.0;
-        Weight = 1.0;
-    }
 
     public static DawnsMusicGear RandomCommon => new(DawnsMusicBox.RandomTrack(DawnsMusicRarity.Common));
 

Projects/UOContent/Items/Special/8th Anniversary Items/DupresShield.cs

@@ -9,7 +9,6 @@ public partial class DupresShield : BaseShield
     public DupresShield() : base(0x2B01)
     {
         LootType = LootType.Blessed;
-        Weight = 6.0;
 
         Attributes.BonusHits = 5;
         Attributes.RegenHits = 1;
@@ -17,6 +16,8 @@ public partial class DupresShield : BaseShield
         SkillBonuses.SetValues(0, SkillName.Parry, 5);
     }
 
+    public override double DefaultWeight => 6.0;
+
     public override int LabelNumber => 1075196; // Dupre's Shield
 
     public override int BasePhysicalResistance => 1;

Projects/UOContent/Items/Special/8th Anniversary Items/QuiverOfInfinity.cs

@@ -9,7 +9,6 @@ public partial class QuiverOfInfinity : BaseQuiver
     public QuiverOfInfinity() : base(0x2B02)
     {
         LootType = LootType.Blessed;
-        Weight = 8.0;
 
         WeightReduction = 30;
         LowerAmmoCost = 20;
@@ -17,5 +16,7 @@ public partial class QuiverOfInfinity : BaseQuiver
         Attributes.DefendChance = 5;
     }
 
+    public override double DefaultWeight => 8.0;
+
     public override int LabelNumber => 1075201; // Quiver of Infinity
 }

Projects/UOContent/Items/Special/8th Anniversary Items/Talismans.cs

@@ -20,9 +20,10 @@ public partial class BaseFormTalisman : Item
     {
         LootType = LootType.Blessed;
         Layer = Layer.Talisman;
-        Weight = 1.0;
     }
 
+    public override double DefaultWeight => 1.0;
+
     public virtual TalismanForm Form => TalismanForm.Squirrel;
 
     public override void AddNameProperty(IPropertyList list)

Projects/UOContent/Items/Special/AoS Promotional/HoodedShroudOfShadows.cs

@@ -7,11 +7,9 @@ namespace Server.Items;
 public partial class HoodedShroudOfShadows : BaseOuterTorso
 {
     [Constructible]
-    public HoodedShroudOfShadows(int hue = 0x455) : base(0x2684, hue)
+    public HoodedShroudOfShadows(int hue = 0x455) : base(0x2684, hue) => LootType = LootType.Blessed;
-    {
+
-        LootType = LootType.Blessed;
+    public override double DefaultWeight => 3.0;
-        Weight = 3.0;
-    }
 
     public override bool Dye(Mobile from, DyeTub sender)
     {

Projects/UOContent/Items/Special/Bulk Order Rewards/Blacksmithy/AncientSmithyHammer.cs

@@ -13,11 +13,12 @@ public partial class AncientSmithyHammer : BaseTool
     public AncientSmithyHammer(int bonus, int uses = 600) : base(uses, 0x13E4)
     {
         _bonus = bonus;
-        Weight = 8.0;
         Layer = Layer.OneHanded;
         Hue = 0x482;
     }
 
+    public override double DefaultWeight => 8.0;
+
     [SerializableProperty(0)]
     [CommandProperty(AccessLevel.GameMaster)]
     public int Bonus

Projects/UOContent/Items/Special/Bulk Order Rewards/Blacksmithy/ColoredAnvil.cs

@@ -13,6 +13,7 @@ public partial class ColoredAnvil : Item
     {
         // TODO: Color weighted by rarity?
         Hue = CraftResources.GetRandomResource(CraftResource.DullCopper, CraftResource.Valorite)?.Hue ?? 0;
-        Weight = 20;
     }
+
+    public override double DefaultWeight => 20.0;
 }

Projects/UOContent/Items/Special/Bulk Order Rewards/Blacksmithy/PowderOfTemperament.cs

@@ -15,11 +15,12 @@ public partial class PowderOfTemperament : Item, IUsesRemaining
     [Constructible]
     public PowderOfTemperament(int charges = 10) : base(4102)
     {
-        Weight = 1.0;
         Hue = 2419;
         UsesRemaining = charges;
     }
 
+    public override double DefaultWeight => 1.0;
+
     public override int LabelNumber => 1049082; // powder of fortifying
 
     bool IUsesRemaining.ShowUsesRemaining

Projects/UOContent/Items/Special/Community Collection/JesterHatofChuckles.cs

@@ -11,11 +11,9 @@ public partial class JesterHatofChuckles : BaseHat
     }
 
     [Constructible]
-    public JesterHatofChuckles(int hue) : base(0x171C, hue)
+    public JesterHatofChuckles(int hue) : base(0x171C, hue) => Attributes.Luck = 150;
-    {
+
-        Attributes.Luck = 150;
+    public override double DefaultWeight => 1.0;
-        Weight = 1.0;
-    }
 
     public override int LabelNumber => 1073256; // Jester Hat of Chuckles - Museum of Vesper Replica	1073256
 

Projects/UOContent/Items/Special/Gifts/RoseOfTrinsic.cs

@@ -26,13 +26,13 @@ public partial class RoseOfTrinsic : Item, ISecurable
     [Constructible]
     public RoseOfTrinsic() : base(0x234D)
     {
-        Weight = 1.0;
         LootType = LootType.Blessed;
-
         _petals = 0;
         StartSpawnTimer(TimeSpan.FromMinutes(1.0));
     }
 
+    public override double DefaultWeight => 1.0;
+
     public override int LabelNumber => 1062913; // Rose of Trinsic
 
     public override void OnAfterDuped(Item newItem)
@@ -156,11 +156,11 @@ public partial class RoseOfTrinsicPetal : Item
     {
         Stackable = true;
         Amount = amount;
-
-        Weight = 1.0;
         Hue = 0xE;
     }
 
+    public override double DefaultWeight => 1.0;
+
     public override int LabelNumber => 1062926; // Petal of the Rose of Trinsic
 
     public override void OnDoubleClick(Mobile from)

Projects/UOContent/Items/Special/Gifts/SamuraiHelm.cs

@@ -9,7 +9,6 @@ public partial class SamuraiHelm : BaseArmor
     [Constructible]
     public SamuraiHelm() : base(0x236C)
     {
-        Weight = 5.0;
         LootType = LootType.Blessed;
 
         Attributes.DefendChance = 15;
@@ -18,6 +17,8 @@ public partial class SamuraiHelm : BaseArmor
         ArmorAttributes.MageArmor = 1;
     }
 
+    public override double DefaultWeight => 5.0;
+
     public override int LabelNumber => 1062923; // Ancient Samurai Helm
 
     public override int BasePhysicalResistance => 15;

Projects/UOContent/Items/Special/HeritageToken.cs

@@ -7,12 +7,9 @@ namespace Server.Items;
 public partial class HeritageToken : Item
 {
     [Constructible]
-    public HeritageToken() : base(0x367A)
+    public HeritageToken() : base(0x367A) => LootType = LootType.Blessed;
-    {
-        LootType = LootType.Blessed;
-        Weight = 5.0;
-    }
 
+    public override double DefaultWeight => 5.0;
     public override int LabelNumber => 1076596; // A Heritage Token
 
     public override void OnDoubleClick(Mobile from)

Projects/UOContent/Items/Special/Holiday/GiftBox.cs

@@ -13,9 +13,7 @@ public partial class GiftBox : BaseContainer
     }
 
     [Constructible]
-    public GiftBox(int hue) : base(Utility.Random(0x232A, 2))
+    public GiftBox(int hue) : base(Utility.Random(0x232A, 2)) => Hue = hue;
-    {
+
-        Weight = 2.0;
+    public override double DefaultWeight => 2.0;
-        Hue = hue;
-    }
 }

Projects/UOContent/Items/Special/Holiday/Snowman.cs

@@ -87,13 +87,14 @@ public partial class Snowman : Item, IDyable
     [Constructible]
     public Snowman(int hue, string title) : base(Utility.Random(0x2328, 2))
     {
-        Weight = 10.0;
         Hue = hue;
         LootType = LootType.Blessed;
 
         _title = title;
     }
 
+    public override double DefaultWeight => 10.0;
+
     public bool Dye(Mobile from, DyeTub sender)
     {
         if (Deleted)

Projects/UOContent/Items/Special/Holiday/Wreath.cs

@@ -165,11 +165,12 @@ public partial class WreathDeed : Item
     [Constructible]
     public WreathDeed(int hue) : base(0x14F0)
     {
-        Weight = 1.0;
         Hue = hue;
         LootType = LootType.Blessed;
     }
 
+    public override double DefaultWeight => 1.0;
+
     public override int LabelNumber => 1062837; // holiday wreath deed
 
     public override void OnDoubleClick(Mobile from)

Projects/UOContent/Items/Special/MiniHouses.cs

@@ -74,11 +74,11 @@ public partial class MiniHouseDeed : BaseAddonDeed
     public MiniHouseDeed(MiniHouseType type = MiniHouseType.StoneAndPlaster)
     {
         _type = type;
-
-        Weight = 1.0;
         LootType = LootType.Blessed;
     }
 
+    public override double DefaultWeight => 1.0;
+
     public override BaseAddon Addon => new MiniHouseAddon(_type);
     public override int LabelNumber => 1062096; // a mini house deed
 

Projects/UOContent/Items/Special/Mutation Core/PlagueBeastGland.cs

@@ -6,11 +6,9 @@ namespace Server.Items;
 public partial class PlagueBeastGland : Item
 {
     [Constructible]
-    public PlagueBeastGland() : base(0x1CEF)
+    public PlagueBeastGland() : base(0x1CEF) => Hue = 0x6;
-    {
+
-        Weight = 1.0;
+    public override double DefaultWeight => 1.0;
-        Hue = 0x6;
-    }
 
     public override int LabelNumber => 1153759; // a healthy gland
 }

Projects/UOContent/Items/Special/Mutation Core/PlagueBeastInnard.cs

@@ -10,9 +10,10 @@ public partial class PlagueBeastInnard : Item, IScissorable, ICarvable
     {
         Hue = hue;
         Movable = false;
-        Weight = 1.0;
     }
 
+    public override double DefaultWeight => 1.0;
+
     public PlagueBeastLord Owner => RootParent as PlagueBeastLord;
     public override string DefaultName => "plague beast innards";
 

Projects/UOContent/Items/Special/Mutation Core/PlagueBeastMutationCore.cs

@@ -15,10 +15,11 @@ public partial class PlagueBeastMutationCore : Item, IScissorable
     public PlagueBeastMutationCore() : base(0x1CF0)
     {
         _cut = true;
-        Weight = 1.0;
         Hue = 0x480;
     }
 
+    public override double DefaultWeight => 1.0;
+
     public override int LabelNumber => 1153760; // a plague beast mutation core
 
     public virtual bool Scissor(Mobile from, Scissors scissors)

Projects/UOContent/Items/Special/RewardCake.cs

@@ -9,7 +9,6 @@ public partial class RewardCake : Item
     public RewardCake() : base(0x9e9)
     {
         Stackable = false;
-        Weight = 1.0;
         Hue = Utility.RandomList(
             0x135,
             0xcd,
@@ -31,6 +30,8 @@ public partial class RewardCake : Item
         LootType = LootType.Blessed;
     }
 
+    public override double DefaultWeight => 1.0;
+
     public override int LabelNumber => 1049786; // Happy Birthday!  ...
 
     public override bool DisplayLootType => false;

Projects/UOContent/Items/Special/Solen Items/BagOfSending.cs

@@ -27,12 +27,12 @@ public partial class BagOfSending : Item, TranslocationItem
     [Constructible]
     public BagOfSending(BagOfSendingHue hue) : base(0xE76)
     {
-        Weight = 2.0;
-
         BagOfSendingHue = hue;
         _charges = Utility.RandomMinMax(3, 9);
     }
 
+    public override double DefaultWeight => 2.0;
+
     public override int LabelNumber => 1054104; // a bag of sending
 
     [SerializableProperty(0)]

Projects/UOContent/Items/Special/Solen Items/BallOfSummoning.cs

@@ -21,13 +21,14 @@ public partial class BallOfSummoning : Item, TranslocationItem
     [Constructible]
     public BallOfSummoning() : base(0xE2E)
     {
-        Weight = 10.0;
         Light = LightType.Circle150;
 
         _charges = Utility.RandomMinMax(3, 9);
         _petName = null;
     }
 
+    public override double DefaultWeight => 10.0;
+
     [SerializableProperty(0)]
     [CommandProperty(AccessLevel.GameMaster)]
     public int Recharges

Projects/UOContent/Items/Special/Solen Items/BraceletOfBinding.cs

@@ -23,11 +23,9 @@ public partial class BraceletOfBinding : BaseBracelet, TranslocationItem
     private TransportTimer _timer;
 
     [Constructible]
-    public BraceletOfBinding() : base(0x1086)
+    public BraceletOfBinding() : base(0x1086) => Hue = 0x489;
-    {
+
-        Hue = 0x489;
+    public override double DefaultWeight => 1.0;
-        Weight = 1.0;
-    }
 
     [SerializableProperty(0)]
     [CommandProperty(AccessLevel.GameMaster)]

Projects/UOContent/Items/Special/Solen Items/PowderOfTranslocation.cs

@@ -19,10 +19,11 @@ public partial class PowderOfTranslocation : Item
     public PowderOfTranslocation(int amount = 1) : base(0x26B8)
     {
         Stackable = true;
-        Weight = 0.1;
         Amount = amount;
     }
 
+    public override double DefaultWeight => 0.1;
+
     public override void OnDoubleClick(Mobile from)
     {
         if (from.InRange(GetWorldLocation(), 2))

Projects/UOContent/Items/Special/Solen Items/ZoogiFungus.cs

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

Projects/UOContent/Items/Special/Special Scrolls/SpecialScroll.cs

@@ -20,12 +20,13 @@ public abstract partial class SpecialScroll : Item
     public SpecialScroll(SkillName skill, double value) : base(0x14F0)
     {
         LootType = LootType.Cursed;
-        Weight = 1.0;
 
         _skill = skill;
         _value = value;
     }
 
+    public override double DefaultWeight => 1.0;
+
     public abstract int Message { get; }
     public virtual int Title => 0;
     public abstract string DefaultTitle { get; }

Projects/UOContent/Items/Special/Veteran Rewards/Banner.cs

@@ -100,12 +100,9 @@ public partial class BannerDeed : Item, IRewardItem
     private bool _isRewardItem;
 
     [Constructible]
-    public BannerDeed() : base(0x14F0)
+    public BannerDeed() : base(0x14F0) => LootType = LootType.Blessed;
-    {
-        LootType = LootType.Blessed;
-        Weight = 1.0;
-    }
 
+    public override double DefaultWeight => 1.0;
     public override int LabelNumber => 1041007; // a banner deed
 
     public override void GetProperties(IPropertyList list)

Projects/UOContent/Items/Special/Veteran Rewards/Brazier.cs

@@ -25,11 +25,9 @@ public partial class RewardBrazier : Item, IRewardItem
     }
 
     [Constructible]
-    public RewardBrazier(int itemID) : base(itemID)
+    public RewardBrazier(int itemID) : base(itemID) => LootType = LootType.Blessed;
-    {
+
-        LootType = LootType.Blessed;
+    public override double DefaultWeight => 10.0;
-        Weight = 10.0;
-    }
 
     public override bool ForceShowProperties => ObjectPropertyList.Enabled;
 
@@ -115,11 +113,9 @@ public partial class RewardBrazierDeed : Item, IRewardItem
     private bool _isRewardItem;
 
     [Constructible]
-    public RewardBrazierDeed() : base(0x14F0)
+    public RewardBrazierDeed() : base(0x14F0) => LootType = LootType.Blessed;
-    {
+
-        LootType = LootType.Blessed;
+    public override double DefaultWeight => 1.0;
-        Weight = 1.0;
-    }
 
     public override int LabelNumber => 1080527; // Brazier Deed
 

Projects/UOContent/Items/Special/Veteran Rewards/CommodityDeedBox.cs

@@ -13,12 +13,9 @@ public partial class CommodityDeedBox : BaseContainer, IRewardItem
     private bool _isRewardItem;
 
     [Constructible]
-    public CommodityDeedBox() : base(0x9AA)
+    public CommodityDeedBox() : base(0x9AA) => Hue = 0x47;
-    {
-        Hue = 0x47;
-        Weight = 4.0;
-    }
 
+    public override double DefaultWeight => 4.0;
     public override int LabelNumber => 1080523; // Commodity Deed Box
     public override int DefaultGumpID => 0x43;
 

Projects/UOContent/Items/Special/Veteran Rewards/DecorativeShield.cs

@@ -84,12 +84,9 @@ public partial class DecorativeShieldDeed : Item, IRewardItem
     private bool _isRewardItem;
 
     [Constructible]
-    public DecorativeShieldDeed() : base(0x14F0)
+    public DecorativeShieldDeed() : base(0x14F0) => LootType = LootType.Blessed;
-    {
-        LootType = LootType.Blessed;
-        Weight = 1.0;
-    }
 
+    public override double DefaultWeight => 1.0;
     public override int LabelNumber => 1049771; // deed for a decorative shield wall hanging
 
     public override void GetProperties(IPropertyList list)

Projects/UOContent/Items/Special/Veteran Rewards/FlamingHead.cs

@@ -98,12 +98,9 @@ public partial class FlamingHeadDeed : Item, IRewardItem
     private bool _isRewardItem;
 
     [Constructible]
-    public FlamingHeadDeed() : base(0x14F0)
+    public FlamingHeadDeed() : base(0x14F0) => LootType = LootType.Blessed;
-    {
-        LootType = LootType.Blessed;
-        Weight = 1.0;
-    }
 
+    public override double DefaultWeight => 1.0;
     public override int LabelNumber => 1041050; // a flaming head deed
 
     public override void GetProperties(IPropertyList list)

Projects/UOContent/Items/Special/Veteran Rewards/HangingSkeleton.cs

@@ -88,12 +88,9 @@ public partial class HangingSkeletonDeed : Item, IRewardItem
     private bool _isRewardItem;
 
     [Constructible]
-    public HangingSkeletonDeed() : base(0x14F0)
+    public HangingSkeletonDeed() : base(0x14F0) => LootType = LootType.Blessed;
-    {
-        LootType = LootType.Blessed;
-        Weight = 1.0;
-    }
 
+    public override double DefaultWeight => 1.0;
     public override int LabelNumber => 1049772; // deed for a hanging skeleton decoration
 
     public override void GetProperties(IPropertyList list)

Projects/UOContent/Items/Special/Veteran Rewards/PottedCactus.cs

@@ -37,12 +37,9 @@ public partial class PottedCactusDeed : Item, IRewardItem
     private bool _isRewardItem;
 
     [Constructible]
-    public PottedCactusDeed() : base(0x14F0)
+    public PottedCactusDeed() : base(0x14F0) => LootType = LootType.Blessed;
-    {
-        LootType = LootType.Blessed;
-        Weight = 1.0;
-    }
 
+    public override double DefaultWeight => 1.0;
     public override int LabelNumber => 1080407; // Potted Cactus Deed
 
     public override void OnDoubleClick(Mobile from)

Projects/UOContent/Items/Special/Veteran Rewards/WeaponEngravingTool.cs

@@ -24,11 +24,11 @@ public partial class WeaponEngravingTool : Item, IUsesRemaining, IRewardItem
     public WeaponEngravingTool(int uses = 10) : base(0x32F8)
     {
         LootType = LootType.Blessed;
-        Weight = 1.0;
-
         _usesRemaining = uses;
     }
 
+    public override double DefaultWeight => 1.0;
+
     public override int LabelNumber => 1076158; // Weapon Engraving Tool
 
     public bool ShowUsesRemaining

Projects/UOContent/Items/Suits/BaseSuit.cs

@@ -8,7 +8,6 @@ public abstract partial class BaseSuit : Item
     public BaseSuit(AccessLevel level, int hue, int itemID) : base(itemID)
     {
         Hue = hue;
-        Weight = 1.0;
         Movable = false;
         LootType = LootType.Newbied;
         Layer = Layer.OuterTorso;
@@ -16,6 +15,8 @@ public abstract partial class BaseSuit : Item
         _accessLevel = level;
     }
 
+    public override double DefaultWeight => 1.0;
+
     [SerializableProperty(0)]
     public AccessLevel AccessLevel
     {

Projects/UOContent/Items/Talismans/BaseTalisman.cs

@@ -271,7 +271,6 @@ public partial class BaseTalisman : Item, IAosItem
     public BaseTalisman(int itemID) : base(itemID)
     {
         Layer = Layer.Talisman;
-        Weight = 1.0;
 
         _protection = new TalismanAttribute();
         _killer = new TalismanAttribute();
@@ -280,6 +279,8 @@ public partial class BaseTalisman : Item, IAosItem
         SkillBonuses = new AosSkillBonuses(this);
     }
 
+    public override double DefaultWeight => 1.0;
+
     public override int LabelNumber => 1071023; // Talisman
     public virtual bool ForceShowName => false; // used to override default summoner/removal name
 

Projects/UOContent/Items/Wands/BaseWand.cs

@@ -38,7 +38,6 @@ public abstract partial class BaseWand : BaseBashing
 
     public BaseWand(WandEffect effect, int minCharges, int maxCharges) : base(0xDF2 + Utility.Random(4))
     {
-        Weight = 1.0;
         _wandEffect = effect;
         _charges = Utility.RandomMinMax(minCharges, maxCharges);
         Attributes.SpellChanneling = 1;
@@ -47,6 +46,8 @@ public abstract partial class BaseWand : BaseBashing
         Resource = CraftResource.None;
     }
 
+    public override double DefaultWeight => 1.0;
+
     public override WeaponAbility PrimaryAbility => WeaponAbility.Dismount;
     public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
 

Projects/UOContent/Items/Weapons/Axes/BattleAxe.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class BattleAxe : BaseAxe
     {
         [Constructible]
-        public BattleAxe() : base(0xF47)
+        public BattleAxe() : base(0xF47) => Layer = Layer.TwoHanded;
-        {
-            Weight = 4.0;
-            Layer = Layer.TwoHanded;
-        }
 
+        public override double DefaultWeight => 4.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack;
         public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow;
 

Projects/UOContent/Items/Weapons/Axes/Pickaxe.cs

@@ -12,11 +12,11 @@ namespace Server.Items
         [Constructible]
         public Pickaxe() : base(0xE86)
         {
-            Weight = 11.0;
             UsesRemaining = 50;
             ShowUsesRemaining = true;
         }
 
+        public override double DefaultWeight => 11.0;
         public override HarvestSystem HarvestSystem => Mining.System;
 
         public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;

Projects/UOContent/Items/Weapons/Knives/ThrowingDagger.cs

@@ -10,11 +10,9 @@ namespace Server.Items;
 public partial class ThrowingDagger : Item
 {
     [Constructible]
-    public ThrowingDagger() : base(0xF52)
+    public ThrowingDagger() : base(0xF52) => Layer = Layer.OneHanded;
-    {
+
-        Weight = 1.0;
+    public override double DefaultWeight => 1.0;
-        Layer = Layer.OneHanded;
-    }
 
     public override string DefaultName => "a throwing dagger";
 

Projects/UOContent/Items/Weapons/ML Weapons/ElvenCompositeLongbow.cs

@@ -8,11 +8,9 @@ namespace Server.Items
     public partial class ElvenCompositeLongbow : BaseRanged
     {
         [Constructible]
-        public ElvenCompositeLongbow() : base(0x2D1E)
+        public ElvenCompositeLongbow() : base(0x2D1E) => Resource = CraftResource.RegularWood;
-        {
+
-            Weight = 8.0;
+        public override double DefaultWeight => 8.0;
-            Resource = CraftResource.RegularWood;
-        }
 
         public override int EffectID => 0xF42;
         public override Type AmmoType => typeof(Arrow);

Projects/UOContent/Items/Weapons/ML Weapons/ElvenSpellblade.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class ElvenSpellblade : BaseKnife
     {
         [Constructible]
-        public ElvenSpellblade() : base(0x2D20)
+        public ElvenSpellblade() : base(0x2D20) => Layer = Layer.TwoHanded;
-        {
-            Weight = 5.0;
-            Layer = Layer.TwoHanded;
-        }
 
+        public override double DefaultWeight => 5.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.PsychicAttack;
         public override WeaponAbility SecondaryAbility => WeaponAbility.BleedAttack;
 

Projects/UOContent/Items/Weapons/ML Weapons/MagicalShortbow.cs

@@ -8,12 +8,9 @@ namespace Server.Items
     public partial class MagicalShortbow : BaseRanged
     {
         [Constructible]
-        public MagicalShortbow() : base(0x2D2B)
+        public MagicalShortbow() : base(0x2D2B) => Resource = CraftResource.RegularWood;
-        {
-            Weight = 6.0;
-            Resource = CraftResource.RegularWood;
-        }
 
+        public override double DefaultWeight => 6.0;
         public override int EffectID => 0xF42;
         public override Type AmmoType => typeof(Arrow);
         public override Item Ammo => new Arrow();

Projects/UOContent/Items/Weapons/ML Weapons/OrnateAxe.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class OrnateAxe : BaseAxe
     {
         [Constructible]
-        public OrnateAxe() : base(0x2D28)
+        public OrnateAxe() : base(0x2D28) => Layer = Layer.TwoHanded;
-        {
-            Weight = 12.0;
-            Layer = Layer.TwoHanded;
-        }
 
+        public override double DefaultWeight => 12.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.Disarm;
         public override WeaponAbility SecondaryAbility => WeaponAbility.CrushingBlow;
 

Projects/UOContent/Items/Weapons/ML Weapons/RuneBlade.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class RuneBlade : BaseSword
     {
         [Constructible]
-        public RuneBlade() : base(0x2D32)
+        public RuneBlade() : base(0x2D32) => Layer = Layer.TwoHanded;
-        {
-            Weight = 7.0;
-            Layer = Layer.TwoHanded;
-        }
 
+        public override double DefaultWeight => 7.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.Disarm;
         public override WeaponAbility SecondaryAbility => WeaponAbility.Bladeweave;
 

Projects/UOContent/Items/Weapons/ML Weapons/WildStaff.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class WildStaff : BaseStaff
     {
         [Constructible]
-        public WildStaff() : base(0x2D25)
+        public WildStaff() : base(0x2D25) => Resource = CraftResource.RegularWood;
-        {
-            Weight = 8.0;
-            Resource = CraftResource.RegularWood;
-        }
 
+        public override double DefaultWeight => 8.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.Block;
         public override WeaponAbility SecondaryAbility => WeaponAbility.ForceOfNature;
 

Projects/UOContent/Items/Weapons/Maces/HammerPick.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class HammerPick : BaseBashing
     {
         [Constructible]
-        public HammerPick() : base(0x143D)
+        public HammerPick() : base(0x143D) => Layer = Layer.OneHanded;
-        {
-            Weight = 9.0;
-            Layer = Layer.OneHanded;
-        }
 
+        public override double DefaultWeight => 9.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
         public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike;
 

Projects/UOContent/Items/Weapons/Maces/WarHammer.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class WarHammer : BaseBashing
     {
         [Constructible]
-        public WarHammer() : base(0x1439)
+        public WarHammer() : base(0x1439) => Layer = Layer.TwoHanded;
-        {
-            Weight = 10.0;
-            Layer = Layer.TwoHanded;
-        }
 
+        public override double DefaultWeight => 10.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack;
         public override WeaponAbility SecondaryAbility => WeaponAbility.CrushingBlow;
 

Projects/UOContent/Items/Weapons/Ranged/Bow.cs

@@ -10,11 +10,11 @@ namespace Server.Items
         [Constructible]
         public Bow() : base(0x13B2)
         {
-            Weight = 6.0;
             Layer = Layer.TwoHanded;
             Resource = CraftResource.RegularWood;
         }
 
+        public override double DefaultWeight => 6.0;
         public override int EffectID => 0xF42;
         public override Type AmmoType => typeof(Arrow);
         public override Item Ammo => new Arrow();

Projects/UOContent/Items/Weapons/Ranged/CompositeBow.cs

@@ -8,12 +8,9 @@ namespace Server.Items
     public partial class CompositeBow : BaseRanged
     {
         [Constructible]
-        public CompositeBow() : base(0x26C2)
+        public CompositeBow() : base(0x26C2) => Resource = CraftResource.RegularWood;
-        {
-            Weight = 5.0;
-            Resource = CraftResource.RegularWood;
-        }
 
+        public override double DefaultWeight => 5.0;
         public override int EffectID => 0xF42;
         public override Type AmmoType => typeof(Arrow);
         public override Item Ammo => new Arrow();

Projects/UOContent/Items/Weapons/Ranged/Crossbow.cs

@@ -10,11 +10,11 @@ namespace Server.Items
         [Constructible]
         public Crossbow() : base(0xF50)
         {
-            Weight = 7.0;
             Layer = Layer.TwoHanded;
             Resource = CraftResource.RegularWood;
         }
 
+        public override double DefaultWeight => 7.0;
         public override int EffectID => 0x1BFE;
         public override Type AmmoType => typeof(Bolt);
         public override Item Ammo => new Bolt();

Projects/UOContent/Items/Weapons/Ranged/HeavyCrossbow.cs

@@ -10,11 +10,11 @@ namespace Server.Items
         [Constructible]
         public HeavyCrossbow() : base(0x13FD)
         {
-            Weight = 9.0;
             Layer = Layer.TwoHanded;
             Resource = CraftResource.RegularWood;
         }
 
+        public override double DefaultWeight => 9.0;
         public override int EffectID => 0x1BFE;
         public override Type AmmoType => typeof(Bolt);
         public override Item Ammo => new Bolt();

Projects/UOContent/Items/Weapons/Ranged/RepeatingCrossbow.cs

@@ -8,12 +8,9 @@ namespace Server.Items
     public partial class RepeatingCrossbow : BaseRanged
     {
         [Constructible]
-        public RepeatingCrossbow() : base(0x26C3)
+        public RepeatingCrossbow() : base(0x26C3) => Resource = CraftResource.RegularWood;
-        {
-            Weight = 6.0;
-            Resource = CraftResource.RegularWood;
-        }
 
+        public override double DefaultWeight => 6.0;
         public override int EffectID => 0x1BFE;
         public override Type AmmoType => typeof(Bolt);
         public override Item Ammo => new Bolt();

Projects/UOContent/Items/Weapons/SE Weapons/Daisho.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class Daisho : BaseSword
     {
         [Constructible]
-        public Daisho() : base(0x27A9)
+        public Daisho() : base(0x27A9) => Layer = Layer.TwoHanded;
-        {
-            Weight = 8.0;
-            Layer = Layer.TwoHanded;
-        }
 
+        public override double DefaultWeight => 8.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.Feint;
         public override WeaponAbility SecondaryAbility => WeaponAbility.DoubleStrike;
 

Projects/UOContent/Items/Weapons/SE Weapons/Kama.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class Kama : BaseKnife
     {
         [Constructible]
-        public Kama() : base(0x27AD)
+        public Kama() : base(0x27AD) => Layer = Layer.TwoHanded;
-        {
-            Weight = 7.0;
-            Layer = Layer.TwoHanded;
-        }
 
+        public override double DefaultWeight => 7.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack;
         public override WeaponAbility SecondaryAbility => WeaponAbility.DefenseMastery;
 

Projects/UOContent/Items/Weapons/SE Weapons/Lajatang.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class Lajatang : BaseKnife
     {
         [Constructible]
-        public Lajatang() : base(0x27A7)
+        public Lajatang() : base(0x27A7) => Layer = Layer.TwoHanded;
-        {
-            Weight = 12.0;
-            Layer = Layer.TwoHanded;
-        }
 
+        public override double DefaultWeight => 12.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.DefenseMastery;
         public override WeaponAbility SecondaryAbility => WeaponAbility.FrenziedWhirlwind;
 

Projects/UOContent/Items/Weapons/SE Weapons/NoDachi.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class NoDachi : BaseSword
     {
         [Constructible]
-        public NoDachi() : base(0x27A2)
+        public NoDachi() : base(0x27A2) => Layer = Layer.TwoHanded;
-        {
-            Weight = 10.0;
-            Layer = Layer.TwoHanded;
-        }
 
+        public override double DefaultWeight => 10.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow;
         public override WeaponAbility SecondaryAbility => WeaponAbility.RidingSwipe;
 

Projects/UOContent/Items/Weapons/SE Weapons/Sai.cs

@@ -7,11 +7,9 @@ namespace Server.Items
     public partial class Sai : BaseKnife
     {
         [Constructible]
-        public Sai() : base(0x27AF)
+        public Sai() : base(0x27AF) => Layer = Layer.TwoHanded;
-        {
+
-            Weight = 7.0;
+        public override double DefaultWeight => 7.0;
-            Layer = Layer.TwoHanded;
-        }
 
         public override WeaponAbility PrimaryAbility => WeaponAbility.Block;
         public override WeaponAbility SecondaryAbility => WeaponAbility.ArmorPierce;

Projects/UOContent/Items/Weapons/SE Weapons/Tekagi.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class Tekagi : BaseKnife
     {
         [Constructible]
-        public Tekagi() : base(0x27AB)
+        public Tekagi() : base(0x27AB) => Layer = Layer.TwoHanded;
-        {
-            Weight = 5.0;
-            Layer = Layer.TwoHanded;
-        }
 
+        public override double DefaultWeight => 5.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.DualWield;
         public override WeaponAbility SecondaryAbility => WeaponAbility.TalonStrike;
 

Projects/UOContent/Items/Weapons/SE Weapons/Tessen.cs

@@ -7,11 +7,9 @@ namespace Server.Items
     public partial class Tessen : BaseBashing
     {
         [Constructible]
-        public Tessen() : base(0x27A3)
+        public Tessen() : base(0x27A3) => Layer = Layer.TwoHanded;
-        {
+
-            Weight = 6.0;
+        public override double DefaultWeight => 6.0;
-            Layer = Layer.TwoHanded;
-        }
 
         public override WeaponAbility PrimaryAbility => WeaponAbility.Feint;
         public override WeaponAbility SecondaryAbility => WeaponAbility.Block;

Projects/UOContent/Items/Weapons/SE Weapons/Tetsubo.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class Tetsubo : BaseBashing
     {
         [Constructible]
-        public Tetsubo() : base(0x27A6)
+        public Tetsubo() : base(0x27A6) => Layer = Layer.TwoHanded;
-        {
-            Weight = 8.0;
-            Layer = Layer.TwoHanded;
-        }
 
+        public override double DefaultWeight => 8.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.FrenziedWhirlwind;
         public override WeaponAbility SecondaryAbility => WeaponAbility.CrushingBlow;
 

Projects/UOContent/Items/Weapons/SE Weapons/Wakizashi.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class Wakizashi : BaseSword
     {
         [Constructible]
-        public Wakizashi() : base(0x27A4)
+        public Wakizashi() : base(0x27A4) => Layer = Layer.OneHanded;
-        {
-            Weight = 5.0;
-            Layer = Layer.OneHanded;
-        }
 
+        public override double DefaultWeight => 5.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.FrenziedWhirlwind;
         public override WeaponAbility SecondaryAbility => WeaponAbility.DoubleStrike;
 

Projects/UOContent/Items/Weapons/SE Weapons/Yumi.cs

@@ -10,11 +10,11 @@ namespace Server.Items
         [Constructible]
         public Yumi() : base(0x27A5)
         {
-            Weight = 9.0;
             Layer = Layer.TwoHanded;
             Resource = CraftResource.RegularWood;
         }
 
+        public override double DefaultWeight => 9.0;
         public override int EffectID => 0xF42;
         public override Type AmmoType => typeof(Arrow);
         public override Item Ammo => new Arrow();

Projects/UOContent/Items/Weapons/SpearsAndForks/TribalSpear.cs

@@ -7,11 +7,9 @@ namespace Server.Items
     public partial class TribalSpear : BaseSpear
     {
         [Constructible]
-        public TribalSpear() : base(0xF62)
+        public TribalSpear() : base(0xF62) => Hue = 837;
-        {
+
-            Weight = 7.0;
+        public override double DefaultWeight => 7.0;
-            Hue = 837;
-        }
 
         public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
         public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;

Projects/UOContent/Items/Weapons/Staves/GlassStaff.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class GlassStaff : BaseStaff
     {
         [Constructible]
-        public GlassStaff() : base(0x905)
+        public GlassStaff() : base(0x905) => Resource = CraftResource.None;
-        {
-            Weight = 4.0;
-            Resource = CraftResource.None;
-        }
 
+        public override double DefaultWeight => 4.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
         public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike;
         public override int AosStrengthReq => 20;

Projects/UOContent/Items/Weapons/Staves/GnarledStaff.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class GnarledStaff : BaseStaff
     {
         [Constructible]
-        public GnarledStaff() : base(0x13F8)
+        public GnarledStaff() : base(0x13F8) => Resource = CraftResource.RegularWood;
-        {
-            Weight = 3.0;
-            Resource = CraftResource.RegularWood;
-        }
 
+        public override double DefaultWeight => 3.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.ConcussionBlow;
         public override WeaponAbility SecondaryAbility => WeaponAbility.ForceOfNature;
 

Projects/UOContent/Items/Weapons/Staves/QuarterStaff.cs

@@ -7,12 +7,9 @@ namespace Server.Items
     public partial class QuarterStaff : BaseStaff
     {
         [Constructible]
-        public QuarterStaff() : base(0xE89)
+        public QuarterStaff() : base(0xE89) => Resource = CraftResource.RegularWood;
-        {
-            Weight = 4.0;
-            Resource = CraftResource.RegularWood;
-        }
 
+        public override double DefaultWeight => 4.0;
         public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
         public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow;