From 2eba2868a678654b6f2e7957010aa8eb66d04b8d Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Thu, 24 Jul 2025 14:44:39 -0700 Subject: [PATCH] fix: Optimizes items to use default weights. (Part 1) (#2240) --- .../UOContent/Engines/Bulk Orders/BaseBOD.cs | 8 +- .../Bulk Orders/Books/BulkOrderBook.cs | 3 +- .../Items/Traps/BaseFactionTrapDeed.cs | 5 +- .../Engines/Plants/MiscItems/FertileDirt.cs | 3 +- .../Engines/Plants/MiscItems/GreenThorns.cs | 3 +- .../UOContent/Engines/Plants/PlantBowl.cs | 6 +- .../UOContent/Engines/Plants/PlantItem.cs | 4 +- Projects/UOContent/Engines/Plants/Seed.cs | 3 +- .../Quests/Collector/Items/EnchantedPaints.cs | 8 +- .../Quests/Collector/Items/PaintedImage.cs | 4 +- .../Quests/Core/Items/EnchantedSextant.cs | 6 +- .../Quests/Core/Items/HornOfRetreat.cs | 3 +- .../Quests/Dark Tides/Items/KronusScroll.cs | 8 +- .../Dark Tides/Items/ScrollOfAbraxus.cs | 6 +- .../Emino's Undertaking/Items/EminosKatana.cs | 6 +- .../Emino's Undertaking/Items/NoteForZoel.cs | 8 +- .../Haochi's Trials/Items/HaochisKatana.cs | 6 +- .../Quests/The Summoning/Items/GoldenSkull.cs | 3 +- .../The Summoning/Items/GrandGrimoire.cs | 3 +- .../Uzeraan Turmoil/Items/QuestDaemonBlood.cs | 6 +- .../Uzeraan Turmoil/Items/QuestDaemonBone.cs | 6 +- .../Uzeraan Turmoil/Items/QuestFertileDirt.cs | 6 +- .../Items/SchmendrickScrollOfPower.cs | 8 +- .../Quests/Witch Apprentice/Items/Cauldron.cs | 6 +- .../Witch Apprentice/Items/HangoverCure.cs | 3 +- .../Witch Apprentice/Items/MoonfireBrew.cs | 6 +- .../BasePigmentsOfTokuno.cs | 4 +- .../Treasures of Tokuno/GreaterArtifacts.cs | 6 +- .../Treasures of Tokuno/LesserArtifacts.cs | 21 +- .../Character Statue Maker/CharacterStatue.cs | 3 +- .../CharacterStatueMaker.cs | 3 +- .../Christmas/2004/DecorativeTopiary.cs | 8 +- .../Christmas/2004/FestiveCactus.cs | 8 +- .../2004/LightOfTheWinterSolstice.cs | 3 +- .../Holiday Stuff/Christmas/2004/Mistletoe.cs | 3 +- .../Christmas/2004/PileOfGlacialSnow.cs | 3 +- .../Holiday Stuff/Christmas/2004/SnowPile.cs | 3 +- .../Holiday Stuff/Christmas/2004/SnowyTree.cs | 8 +- .../Christmas/2010/Addons/FireFliesDeed.cs | 8 +- .../Christmas/2010/Items/AngelDecoration.cs | 21 +- .../Christmas/2010/Items/RockingHorse.cs | 21 +- .../Halloween/2009/Foods/MrPlainsCookies.cs | 26 +- .../Items/Addons/BaseAddonContainerDeed.cs | 4 +- .../UOContent/Items/Addons/BaseAddonDeed.cs | 4 +- .../Items/Armor/Helmets/ChainCoif.cs | 6 +- .../Items/Armor/Leather/FemaleLeatherChest.cs | 6 +- .../Items/Armor/Leather/LeatherBustierArms.cs | 6 +- .../Items/Armor/Leather/LeatherGloves.cs | 6 +- .../Items/Armor/Leather/LeatherGorget.cs | 6 +- .../Items/Armor/Leather/LeatherHiroSode.cs | 6 +- .../Items/Armor/Leather/LeatherSkirt.cs | 6 +- .../Items/Armor/Studded/StuddedBustierArms.cs | 6 +- .../Items/Armor/Studded/StuddedGloves.cs | 6 +- .../Items/Armor/Studded/StuddedGorget.cs | 6 +- .../Items/Armor/Studded/StuddedHiroSode.cs | 6 +- Projects/UOContent/Items/Clothing/Hats.cs | 84 +++++- .../UOContent/Items/Clothing/MiddleTorso.cs | 12 +- Projects/UOContent/Items/Clothing/Shirts.cs | 6 +- Projects/UOContent/Items/Clothing/Shoes.cs | 6 +- Projects/UOContent/Items/Clothing/Waist.cs | 6 +- .../Items/Construction/Chairs/Chairs.cs | 6 +- .../Items/Construction/Chairs/Thrones.cs | 6 +- .../Decorative/GiantReplicaAcorn.cs | 6 +- .../Decorative/MountedDreadHorn.cs | 6 +- .../Items/Construction/Tables/Tables.cs | 30 +- .../Items/Construction/Tables/WritingTable.cs | 6 +- .../UOContent/Items/Containers/Container.cs | 24 +- .../Items/Containers/FurnitureContainer.cs | 78 +++++- .../Items/Deeds/DragonBardingDeed.cs | 6 +- Projects/UOContent/Items/Food/Asian.cs | 6 +- Projects/UOContent/Items/Food/Beverage.cs | 52 +++- Projects/UOContent/Items/Food/Bowls.cs | 12 +- Projects/UOContent/Items/Food/CookableFood.cs | 60 +++- Projects/UOContent/Items/Food/Cooking.cs | 12 +- Projects/UOContent/Items/Food/Vegetables.cs | 48 ++-- Projects/UOContent/Items/Games/Dices.cs | 6 +- Projects/UOContent/Items/Guilds/GuildDeed.cs | 6 +- Projects/UOContent/Items/Jewels/Beads.cs | 6 +- .../UOContent/Items/Misc/ExecutionersCap.cs | 6 +- Projects/UOContent/Items/Misc/GlassItems.cs | 258 +++++++++++++++--- Projects/UOContent/Items/Misc/HairDye.cs | 6 +- .../UOContent/Items/Misc/PlayerVendorDeed.cs | 6 +- Projects/UOContent/Items/Misc/PowerCrystal.cs | 6 +- Projects/UOContent/Items/Misc/Rares.cs | 72 ++++- .../Carpenter Items/TaxidermyKit.cs | 6 +- .../Musical Instruments/Tambourine.cs | 6 +- .../Musical Instruments/TambourineTassel.cs | 6 +- .../Specialized/GlassblowingBook.cs | 6 +- .../Skill Items/Specialized/MasonryBook.cs | 6 +- .../Skill Items/Specialized/SandMiningBook.cs | 6 +- .../Specialized/StoneMiningBook.cs | 6 +- .../Skill Items/Tailor Items/Misc/Scissors.cs | 6 +- .../Items/Skill Items/Thief/DisguiseKit.cs | 6 +- .../Items/Skill Items/Tinkering/Clocks.cs | 6 +- .../Items/Skill Items/Tinkering/Utensils.cs | 60 +++- .../Items/Skill Items/Tools/DrawKnife.cs | 10 +- .../Items/Skill Items/Tools/FlourSifter.cs | 10 +- .../UOContent/Items/Skill Items/Tools/Froe.cs | 10 +- .../Items/Skill Items/Tools/Inshave.cs | 10 +- .../Skill Items/Tools/MalletAndChisel.cs | 10 +- .../Items/Skill Items/Tools/MapmakersPen.cs | 10 +- .../Items/Skill Items/Tools/MortarPestle.cs | 10 +- .../Items/Skill Items/Tools/RollingPin.cs | 10 +- .../Items/Skill Items/Tools/Scorp.cs | 10 +- .../Items/Skill Items/Tools/ScribesPen.cs | 10 +- .../Items/Skill Items/Tools/Skillet.cs | 10 +- .../Items/Skill Items/Tools/SmoothingPlane.cs | 10 +- .../Items/Skill Items/Tools/TinkerTools.cs | 22 +- .../Items/Special/Holiday/HolidayTimepiece.cs | 1 - .../Items/Special/Holiday/WristWatch.cs | 1 - .../Items/Special/ML/GrizzledMareStatuette.cs | 6 +- .../Items/Special/ML/MinotaurHedge.cs | 6 +- .../Items/Special/ML/TormentedChains.cs | 6 +- .../Special/Veteran Rewards/StoneAnkh.cs | 6 +- .../Items/Talismans/Items/EnchantedSwitch.cs | 6 +- .../Items/Talismans/Items/HollowPrism.cs | 6 +- .../Items/Talismans/Items/JeweledFiligree.cs | 6 +- .../Items/Talismans/Items/RunedPrism.cs | 6 +- .../Items/Talismans/Items/RunedSwitch.cs | 6 +- .../Items/Weapons/Knives/ButcherKnife.cs | 6 +- .../UOContent/Items/Weapons/Knives/Dagger.cs | 6 +- .../Items/Weapons/Knives/SkinningKnife.cs | 6 +- .../Items/Weapons/Maces/MagicWand.cs | 6 +- .../Items/Weapons/Swords/CrescentBlade.cs | 6 +- .../Items/Weapons/Swords/ThinLongsword.cs | 6 +- Projects/UOContent/Multis/Camps/BaseCamp.cs | 6 +- 126 files changed, 1184 insertions(+), 380 deletions(-) diff --git a/Projects/UOContent/Engines/Bulk Orders/BaseBOD.cs b/Projects/UOContent/Engines/Bulk Orders/BaseBOD.cs index 20aa0a3ec..a95ca63b5 100644 --- a/Projects/UOContent/Engines/Bulk Orders/BaseBOD.cs +++ b/Projects/UOContent/Engines/Bulk Orders/BaseBOD.cs @@ -14,11 +14,9 @@ namespace Server.Engines.BulkOrders _material = material; } - public BaseBOD() : base(Core.AOS ? 0x2258 : 0x14EF) - { - Weight = 1.0; - LootType = LootType.Blessed; - } + public BaseBOD() : base(Core.AOS ? 0x2258 : 0x14EF) => LootType = LootType.Blessed; + + public override double DefaultWeight => 1.0; public abstract bool Complete { get; } diff --git a/Projects/UOContent/Engines/Bulk Orders/Books/BulkOrderBook.cs b/Projects/UOContent/Engines/Bulk Orders/Books/BulkOrderBook.cs index 4e67ca620..a0c17c575 100644 --- a/Projects/UOContent/Engines/Bulk Orders/Books/BulkOrderBook.cs +++ b/Projects/UOContent/Engines/Bulk Orders/Books/BulkOrderBook.cs @@ -40,7 +40,6 @@ public partial class BulkOrderBook : Item, ISecurable [Constructible] public BulkOrderBook() : base(0x2259) { - Weight = 1.0; LootType = LootType.Blessed; _entries = []; @@ -49,6 +48,8 @@ public partial class BulkOrderBook : Item, ISecurable _level = SecureLevel.CoOwners; } + public override double DefaultWeight => 1.0; + public override void OnAfterDuped(Item newItem) { if (newItem is not BulkOrderBook book) diff --git a/Projects/UOContent/Engines/Factions/Items/Traps/BaseFactionTrapDeed.cs b/Projects/UOContent/Engines/Factions/Items/Traps/BaseFactionTrapDeed.cs index 2104d2eb3..6a5afe534 100644 --- a/Projects/UOContent/Engines/Factions/Items/Traps/BaseFactionTrapDeed.cs +++ b/Projects/UOContent/Engines/Factions/Items/Traps/BaseFactionTrapDeed.cs @@ -10,7 +10,6 @@ public abstract class BaseFactionTrapDeed : Item, ICraftable public BaseFactionTrapDeed(int itemID = 0x14F0) : base(itemID) { - Weight = 1.0; LootType = LootType.Blessed; } @@ -18,6 +17,8 @@ public abstract class BaseFactionTrapDeed : Item, ICraftable { } + public override double DefaultWeight => 1.0; + public abstract Type TrapType { get; } [CommandProperty(AccessLevel.GameMaster)] @@ -117,4 +118,4 @@ public abstract class BaseFactionTrapDeed : Item, ICraftable m_Faction = Faction.ReadReference(reader); } -} \ No newline at end of file +} diff --git a/Projects/UOContent/Engines/Plants/MiscItems/FertileDirt.cs b/Projects/UOContent/Engines/Plants/MiscItems/FertileDirt.cs index 311eae3f6..32a4d0cb1 100644 --- a/Projects/UOContent/Engines/Plants/MiscItems/FertileDirt.cs +++ b/Projects/UOContent/Engines/Plants/MiscItems/FertileDirt.cs @@ -9,7 +9,8 @@ public partial class FertileDirt : Item public FertileDirt(int amount = 1) : base(0xF81) { Stackable = true; - Weight = 1.0; Amount = amount; } + + public override double DefaultWeight => 1.0; } diff --git a/Projects/UOContent/Engines/Plants/MiscItems/GreenThorns.cs b/Projects/UOContent/Engines/Plants/MiscItems/GreenThorns.cs index 846f8d1dd..90e8cc1ea 100644 --- a/Projects/UOContent/Engines/Plants/MiscItems/GreenThorns.cs +++ b/Projects/UOContent/Engines/Plants/MiscItems/GreenThorns.cs @@ -12,11 +12,12 @@ public partial class GreenThorns : Item public GreenThorns(int amount = 1) : base(0xF42) { Stackable = true; - Weight = 1.0; Hue = 0x42; Amount = amount; } + public override double DefaultWeight => 1.0; + public override int LabelNumber => 1060837; // green thorns public override void OnDoubleClick(Mobile from) diff --git a/Projects/UOContent/Engines/Plants/PlantBowl.cs b/Projects/UOContent/Engines/Plants/PlantBowl.cs index 65489d385..5028b6db8 100644 --- a/Projects/UOContent/Engines/Plants/PlantBowl.cs +++ b/Projects/UOContent/Engines/Plants/PlantBowl.cs @@ -56,7 +56,11 @@ public partial class PlantBowl : Item }; [Constructible] - public PlantBowl() : base(0x15FD) => Weight = 1.0; + public PlantBowl() : base(0x15FD) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1060834; // a plant bowl diff --git a/Projects/UOContent/Engines/Plants/PlantItem.cs b/Projects/UOContent/Engines/Plants/PlantItem.cs index 53266f2b4..959bb031b 100644 --- a/Projects/UOContent/Engines/Plants/PlantItem.cs +++ b/Projects/UOContent/Engines/Plants/PlantItem.cs @@ -56,8 +56,6 @@ public partial class PlantItem : Item, ISecurable [Constructible] public PlantItem(bool fertileDirt = false) : base(0x1602) { - Weight = 1.0; - _plantStatus = PlantStatus.BowlOfDirt; _plantSystem = new PlantSystem(this) { @@ -69,6 +67,8 @@ public partial class PlantItem : Item, ISecurable Plants.Add(this); } + public override double DefaultWeight => 1.0; + public ObjectPropertyList OldClientPropertyList { get diff --git a/Projects/UOContent/Engines/Plants/Seed.cs b/Projects/UOContent/Engines/Plants/Seed.cs index 043ad445b..24a290f0b 100644 --- a/Projects/UOContent/Engines/Plants/Seed.cs +++ b/Projects/UOContent/Engines/Plants/Seed.cs @@ -24,7 +24,6 @@ public partial class Seed : Item [Constructible] public Seed(PlantType plantType, PlantHue plantHue, bool showType = false) : base(0xDCF) { - Weight = 1.0; Stackable = Core.SA; _plantType = plantType; @@ -34,6 +33,8 @@ public partial class Seed : Item Hue = PlantHueInfo.GetInfo(plantHue).Hue; } + public override double DefaultWeight => 1.0; + [CommandProperty(AccessLevel.GameMaster)] [SerializableProperty(1)] public PlantHue PlantHue diff --git a/Projects/UOContent/Engines/Quests/Collector/Items/EnchantedPaints.cs b/Projects/UOContent/Engines/Quests/Collector/Items/EnchantedPaints.cs index 5b6ab0bb2..d9e13d5b9 100644 --- a/Projects/UOContent/Engines/Quests/Collector/Items/EnchantedPaints.cs +++ b/Projects/UOContent/Engines/Quests/Collector/Items/EnchantedPaints.cs @@ -8,11 +8,9 @@ namespace Server.Engines.Quests.Collector; public partial class EnchantedPaints : QuestItem { [Constructible] - public EnchantedPaints() : base(0xFC1) - { - LootType = LootType.Blessed; - Weight = 1.0; - } + public EnchantedPaints() : base(0xFC1) => LootType = LootType.Blessed; + + public override double DefaultWeight => 1.0; public override bool CanDrop(PlayerMobile player) => player.Quest is not CollectorQuest; diff --git a/Projects/UOContent/Engines/Quests/Collector/Items/PaintedImage.cs b/Projects/UOContent/Engines/Quests/Collector/Items/PaintedImage.cs index 7c9aa4da8..937424e9b 100644 --- a/Projects/UOContent/Engines/Quests/Collector/Items/PaintedImage.cs +++ b/Projects/UOContent/Engines/Quests/Collector/Items/PaintedImage.cs @@ -14,12 +14,12 @@ public partial class PaintedImage : Item [Constructible] public PaintedImage(ImageType image) : base(0xFF3) { - Weight = 1.0; Hue = 0x8FD; - _image = image; } + public override double DefaultWeight => 1.0; + public override void AddNameProperty(IPropertyList list) { var info = ImageTypeInfo.Get(_image); diff --git a/Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs b/Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs index 142cb42ab..f224d8747 100644 --- a/Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs +++ b/Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs @@ -73,7 +73,11 @@ public partial class EnchantedSextant : Item }; [Constructible] - public EnchantedSextant() : base(0x1058) => Weight = 2.0; + public EnchantedSextant() : base(0x1058) + { + } + + public override double DefaultWeight => 2.0; public override int LabelNumber => 1046226; // an enchanted sextant diff --git a/Projects/UOContent/Engines/Quests/Core/Items/HornOfRetreat.cs b/Projects/UOContent/Engines/Quests/Core/Items/HornOfRetreat.cs index 8bada24bd..2fdfe7146 100644 --- a/Projects/UOContent/Engines/Quests/Core/Items/HornOfRetreat.cs +++ b/Projects/UOContent/Engines/Quests/Core/Items/HornOfRetreat.cs @@ -27,10 +27,11 @@ public partial class HornOfRetreat : Item public HornOfRetreat() : base(0xFC4) { Hue = 0x482; - Weight = 1.0; _charges = 10; } + public override double DefaultWeight => 1.0; + public override int LabelNumber => 1049117; // Horn of Retreat public virtual bool ValidateUse(Mobile from) => true; diff --git a/Projects/UOContent/Engines/Quests/Dark Tides/Items/KronusScroll.cs b/Projects/UOContent/Engines/Quests/Dark Tides/Items/KronusScroll.cs index 76b349706..2b2fe9f3f 100644 --- a/Projects/UOContent/Engines/Quests/Dark Tides/Items/KronusScroll.cs +++ b/Projects/UOContent/Engines/Quests/Dark Tides/Items/KronusScroll.cs @@ -12,11 +12,9 @@ public partial class KronusScroll : QuestItem private static readonly Map m_WellOfTearsMap = Map.Malas; [Constructible] - public KronusScroll() : base(0x227A) - { - Weight = 1.0; - Hue = 0x44E; - } + public KronusScroll() : base(0x227A) => Hue = 0x44E; + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1060149; // Calling of Kronus diff --git a/Projects/UOContent/Engines/Quests/Dark Tides/Items/ScrollOfAbraxus.cs b/Projects/UOContent/Engines/Quests/Dark Tides/Items/ScrollOfAbraxus.cs index 29bbf37e3..a0c90e910 100644 --- a/Projects/UOContent/Engines/Quests/Dark Tides/Items/ScrollOfAbraxus.cs +++ b/Projects/UOContent/Engines/Quests/Dark Tides/Items/ScrollOfAbraxus.cs @@ -8,7 +8,11 @@ namespace Server.Engines.Quests.Necro; public partial class ScrollOfAbraxus : QuestItem { [Constructible] - public ScrollOfAbraxus() : base(0x227B) => Weight = 1.0; + public ScrollOfAbraxus() : base(0x227B) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1028827; // Scroll of Abraxus diff --git a/Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/EminosKatana.cs b/Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/EminosKatana.cs index decb00f71..c8ac8f799 100644 --- a/Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/EminosKatana.cs +++ b/Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/EminosKatana.cs @@ -7,7 +7,11 @@ namespace Server.Engines.Quests.Ninja; public partial class EminosKatana : QuestItem { [Constructible] - public EminosKatana() : base(0x13FF) => Weight = 1.0; + public EminosKatana() : base(0x13FF) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1063214; // Daimyo Emino's Katana diff --git a/Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/NoteForZoel.cs b/Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/NoteForZoel.cs index f40372617..6f21e2f76 100644 --- a/Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/NoteForZoel.cs +++ b/Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/NoteForZoel.cs @@ -7,11 +7,9 @@ namespace Server.Engines.Quests.Ninja; public partial class NoteForZoel : QuestItem { [Constructible] - public NoteForZoel() : base(0x14EF) - { - Weight = 1.0; - Hue = 0x6B9; - } + public NoteForZoel() : base(0x14EF) => Hue = 0x6B9; + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1063186; // A Note for Zoel diff --git a/Projects/UOContent/Engines/Quests/Haochi's Trials/Items/HaochisKatana.cs b/Projects/UOContent/Engines/Quests/Haochi's Trials/Items/HaochisKatana.cs index 900e6e0a5..db023a3da 100644 --- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Items/HaochisKatana.cs +++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Items/HaochisKatana.cs @@ -7,7 +7,11 @@ namespace Server.Engines.Quests.Samurai; public partial class HaochisKatana : QuestItem { [Constructible] - public HaochisKatana() : base(0x13FF) => Weight = 1.0; + public HaochisKatana() : base(0x13FF) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1063165; // Daimyo Haochi's Katana diff --git a/Projects/UOContent/Engines/Quests/The Summoning/Items/GoldenSkull.cs b/Projects/UOContent/Engines/Quests/The Summoning/Items/GoldenSkull.cs index 0fff2f1b1..1a899f766 100644 --- a/Projects/UOContent/Engines/Quests/The Summoning/Items/GoldenSkull.cs +++ b/Projects/UOContent/Engines/Quests/The Summoning/Items/GoldenSkull.cs @@ -8,10 +8,11 @@ public partial class GoldenSkull : Item [Constructible] public GoldenSkull() : base(Utility.Random(0x1AE2, 3)) { - Weight = 1.0; Hue = 0x8A5; LootType = LootType.Blessed; } + public override double DefaultWeight => 1.0; + public override int LabelNumber => 1061619; // a golden skull } diff --git a/Projects/UOContent/Engines/Quests/The Summoning/Items/GrandGrimoire.cs b/Projects/UOContent/Engines/Quests/The Summoning/Items/GrandGrimoire.cs index b646070d5..c7ac9bc3b 100644 --- a/Projects/UOContent/Engines/Quests/The Summoning/Items/GrandGrimoire.cs +++ b/Projects/UOContent/Engines/Quests/The Summoning/Items/GrandGrimoire.cs @@ -8,11 +8,12 @@ public partial class GrandGrimoire : Item [Constructible] public GrandGrimoire() : base(0xEFA) { - Weight = 1.0; Hue = 0x835; Layer = Layer.OneHanded; LootType = LootType.Blessed; } + public override double DefaultWeight => 1.0; + public override int LabelNumber => 1060801; // The Grand Grimoire } diff --git a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestDaemonBlood.cs b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestDaemonBlood.cs index 0e4b6c729..a65a50073 100644 --- a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestDaemonBlood.cs +++ b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestDaemonBlood.cs @@ -7,7 +7,11 @@ namespace Server.Engines.Quests.Haven; public partial class QuestDaemonBlood : QuestItem { [Constructible] - public QuestDaemonBlood() : base(0xF7D) => Weight = 1.0; + public QuestDaemonBlood() : base(0xF7D) + { + } + + public override double DefaultWeight => 1.0; public override bool CanDrop(PlayerMobile player) => player.Quest is not UzeraanTurmoilQuest; } diff --git a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestDaemonBone.cs b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestDaemonBone.cs index 72fdff2f7..9da029d1c 100644 --- a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestDaemonBone.cs +++ b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestDaemonBone.cs @@ -7,7 +7,11 @@ namespace Server.Engines.Quests.Haven; public partial class QuestDaemonBone : QuestItem { [Constructible] - public QuestDaemonBone() : base(0xF80) => Weight = 1.0; + public QuestDaemonBone() : base(0xF80) + { + } + + public override double DefaultWeight => 1.0; public override bool CanDrop(PlayerMobile player) => player.Quest is not UzeraanTurmoilQuest; } diff --git a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestFertileDirt.cs b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestFertileDirt.cs index e29e91f82..c51e6a9dc 100644 --- a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestFertileDirt.cs +++ b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestFertileDirt.cs @@ -7,7 +7,11 @@ namespace Server.Engines.Quests.Haven; public partial class QuestFertileDirt : QuestItem { [Constructible] - public QuestFertileDirt() : base(0xF81) => Weight = 1.0; + public QuestFertileDirt() : base(0xF81) + { + } + + public override double DefaultWeight => 1.0; public override bool CanDrop(PlayerMobile player) => player.Quest is not UzeraanTurmoilQuest; } diff --git a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickScrollOfPower.cs b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickScrollOfPower.cs index ba69b74b5..87eb5c8af 100644 --- a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickScrollOfPower.cs +++ b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickScrollOfPower.cs @@ -6,11 +6,9 @@ namespace Server.Engines.Quests.Haven; [SerializationGenerator(0, false)] public partial class SchmendrickScrollOfPower : QuestItem { - public SchmendrickScrollOfPower() : base(0xE34) - { - Weight = 1.0; - Hue = 0x34D; - } + public SchmendrickScrollOfPower() : base(0xE34) => Hue = 0x34D; + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1049118; // a scroll with ancient markings diff --git a/Projects/UOContent/Engines/Quests/Witch Apprentice/Items/Cauldron.cs b/Projects/UOContent/Engines/Quests/Witch Apprentice/Items/Cauldron.cs index 443ab6a69..2658b7070 100644 --- a/Projects/UOContent/Engines/Quests/Witch Apprentice/Items/Cauldron.cs +++ b/Projects/UOContent/Engines/Quests/Witch Apprentice/Items/Cauldron.cs @@ -6,7 +6,11 @@ namespace Server.Items; public partial class Cauldron : Item { [Constructible] - public Cauldron() : base(0x9ED) => Weight = 1.0; + public Cauldron() : base(0x9ED) + { + } + + public override double DefaultWeight => 1.0; public override string DefaultName => "a cauldron"; } diff --git a/Projects/UOContent/Engines/Quests/Witch Apprentice/Items/HangoverCure.cs b/Projects/UOContent/Engines/Quests/Witch Apprentice/Items/HangoverCure.cs index 633607aa8..edb838167 100644 --- a/Projects/UOContent/Engines/Quests/Witch Apprentice/Items/HangoverCure.cs +++ b/Projects/UOContent/Engines/Quests/Witch Apprentice/Items/HangoverCure.cs @@ -13,12 +13,13 @@ public partial class HangoverCure : Item [Constructible] public HangoverCure() : base(0xE2B) { - Weight = 1.0; Hue = 0x2D; _uses = 20; } + public override double DefaultWeight => 1.0; + public override int LabelNumber => 1055060; // Grizelda's Extra Strength Hangover Cure public override void OnDoubleClick(Mobile from) diff --git a/Projects/UOContent/Engines/Quests/Witch Apprentice/Items/MoonfireBrew.cs b/Projects/UOContent/Engines/Quests/Witch Apprentice/Items/MoonfireBrew.cs index 0a72e067d..4040cb35c 100644 --- a/Projects/UOContent/Engines/Quests/Witch Apprentice/Items/MoonfireBrew.cs +++ b/Projects/UOContent/Engines/Quests/Witch Apprentice/Items/MoonfireBrew.cs @@ -6,7 +6,11 @@ namespace Server.Engines.Quests.Hag; public partial class MoonfireBrew : Item { [Constructible] - public MoonfireBrew() : base(0xF04) => Weight = 1.0; + public MoonfireBrew() : base(0xF04) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1055065; // a bottle of magical moonfire brew } diff --git a/Projects/UOContent/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs b/Projects/UOContent/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs index 9f63e9722..803a88a5d 100644 --- a/Projects/UOContent/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs +++ b/Projects/UOContent/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs @@ -72,13 +72,11 @@ public abstract partial class BasePigmentsOfTokuno : Item, IUsesRemaining public BasePigmentsOfTokuno() : base(0xEFF) { - Weight = 1.0; _usesRemaining = 1; } public BasePigmentsOfTokuno(int uses) : base(0xEFF) { - Weight = 1.0; _usesRemaining = uses; } @@ -86,6 +84,8 @@ public abstract partial class BasePigmentsOfTokuno : Item, IUsesRemaining { } + public override double DefaultWeight => 1.0; + public override int LabelNumber => 1070933; // Pigments of Tokuno protected TextDefinition Label diff --git a/Projects/UOContent/Engines/Treasures of Tokuno/GreaterArtifacts.cs b/Projects/UOContent/Engines/Treasures of Tokuno/GreaterArtifacts.cs index a9fa2d7ca..005688e1e 100644 --- a/Projects/UOContent/Engines/Treasures of Tokuno/GreaterArtifacts.cs +++ b/Projects/UOContent/Engines/Treasures of Tokuno/GreaterArtifacts.cs @@ -330,11 +330,7 @@ public partial class PigmentsOfTokuno : BasePigmentsOfTokuno } [Constructible] - public PigmentsOfTokuno(PigmentType type, int uses) : base(uses) - { - Weight = 1.0; - Type = type; - } + public PigmentsOfTokuno(PigmentType type, int uses) : base(uses) => Type = type; [SerializableProperty(0)] [CommandProperty(AccessLevel.GameMaster)] diff --git a/Projects/UOContent/Engines/Treasures of Tokuno/LesserArtifacts.cs b/Projects/UOContent/Engines/Treasures of Tokuno/LesserArtifacts.cs index 19ea73319..54d026df4 100644 --- a/Projects/UOContent/Engines/Treasures of Tokuno/LesserArtifacts.cs +++ b/Projects/UOContent/Engines/Treasures of Tokuno/LesserArtifacts.cs @@ -354,11 +354,9 @@ public partial class AncientUrn : Item } [Constructible] - public AncientUrn(string urnName) : base(0x241D) - { - _urnName = urnName; - Weight = 1.0; - } + public AncientUrn(string urnName) : base(0x241D) => _urnName = urnName; + + public override double DefaultWeight => 1.0; public static string[] Names { get; } = { @@ -432,12 +430,9 @@ public partial class HonorableSwords : Item } [Constructible] - public HonorableSwords(string swordsName) : base(0x2853) - { - _swordsName = swordsName; + public HonorableSwords(string swordsName) : base(0x2853) => _swordsName = swordsName; - Weight = 5.0; - } + public override double DefaultWeight => 5.0; public override int LabelNumber => 1071015; // Honorable Swords @@ -620,11 +615,7 @@ public partial class LesserPigmentsOfTokuno : BasePigmentsOfTokuno } [Constructible] - public LesserPigmentsOfTokuno(LesserPigmentType type) : base(1) - { - Weight = 1.0; - Type = type; - } + public LesserPigmentsOfTokuno(LesserPigmentType type) : base(1) => Type = type; [SerializableProperty(0)] [CommandProperty(AccessLevel.GameMaster)] diff --git a/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatue.cs b/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatue.cs index 5a8b128ab..fb08fb590 100644 --- a/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatue.cs +++ b/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatue.cs @@ -419,9 +419,10 @@ public partial class CharacterStatueDeed : Item, IRewardItem } LootType = LootType.Blessed; - Weight = 1.0; } + public override double DefaultWeight => 1.0; + public override int LabelNumber { get diff --git a/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatueMaker.cs b/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatueMaker.cs index 0e8ea37b6..56536d4d7 100644 --- a/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatueMaker.cs +++ b/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatueMaker.cs @@ -19,9 +19,10 @@ public partial class CharacterStatueMaker : Item, IRewardItem InvalidateHue(); LootType = LootType.Blessed; - Weight = 5.0; } + public override double DefaultWeight => 5.0; + public override int LabelNumber => 1076173; // Character Statue Maker [SerializableProperty(1)] diff --git a/Projects/UOContent/Holiday Stuff/Christmas/2004/DecorativeTopiary.cs b/Projects/UOContent/Holiday Stuff/Christmas/2004/DecorativeTopiary.cs index b6a89ee3d..54431f0ad 100644 --- a/Projects/UOContent/Holiday Stuff/Christmas/2004/DecorativeTopiary.cs +++ b/Projects/UOContent/Holiday Stuff/Christmas/2004/DecorativeTopiary.cs @@ -6,11 +6,9 @@ namespace Server.Items; public partial class DecorativeTopiary : Item { [Constructible] - public DecorativeTopiary() : base(0x2378) - { - Weight = 1.0; - LootType = LootType.Blessed; - } + public DecorativeTopiary() : base(0x2378) => LootType = LootType.Blessed; + + public override double DefaultWeight => 1.0; public override void OnSingleClick(Mobile from) { diff --git a/Projects/UOContent/Holiday Stuff/Christmas/2004/FestiveCactus.cs b/Projects/UOContent/Holiday Stuff/Christmas/2004/FestiveCactus.cs index 2ceb3f9e1..4fba63754 100644 --- a/Projects/UOContent/Holiday Stuff/Christmas/2004/FestiveCactus.cs +++ b/Projects/UOContent/Holiday Stuff/Christmas/2004/FestiveCactus.cs @@ -6,11 +6,9 @@ namespace Server.Items; public partial class FestiveCactus : Item { [Constructible] - public FestiveCactus() : base(0x2376) - { - Weight = 1.0; - LootType = LootType.Blessed; - } + public FestiveCactus() : base(0x2376) => LootType = LootType.Blessed; + + public override double DefaultWeight => 1.0; public override void OnSingleClick(Mobile from) { diff --git a/Projects/UOContent/Holiday Stuff/Christmas/2004/LightOfTheWinterSolstice.cs b/Projects/UOContent/Holiday Stuff/Christmas/2004/LightOfTheWinterSolstice.cs index 4e03f72cc..d41019847 100644 --- a/Projects/UOContent/Holiday Stuff/Christmas/2004/LightOfTheWinterSolstice.cs +++ b/Projects/UOContent/Holiday Stuff/Christmas/2004/LightOfTheWinterSolstice.cs @@ -18,12 +18,13 @@ public partial class LightOfTheWinterSolstice : Item { _dipper = dipper?.Intern() ?? StaffInfo.GetRandomStaff(); - Weight = 1.0; LootType = LootType.Blessed; Light = LightType.Circle300; Hue = Utility.RandomDyedHue(); } + public override double DefaultWeight => 1.0; + public override void OnSingleClick(Mobile from) { base.OnSingleClick(from); diff --git a/Projects/UOContent/Holiday Stuff/Christmas/2004/Mistletoe.cs b/Projects/UOContent/Holiday Stuff/Christmas/2004/Mistletoe.cs index c5927a129..c59a4a5a9 100644 --- a/Projects/UOContent/Holiday Stuff/Christmas/2004/Mistletoe.cs +++ b/Projects/UOContent/Holiday Stuff/Christmas/2004/Mistletoe.cs @@ -163,10 +163,11 @@ public partial class MistletoeDeed : Item public MistletoeDeed(int hue = 0) : base(0x14F0) { Hue = hue; - Weight = 1.0; LootType = LootType.Blessed; } + public override double DefaultWeight => 1.0; + public override int LabelNumber => 1070882; // Mistletoe Deed public override void OnSingleClick(Mobile from) diff --git a/Projects/UOContent/Holiday Stuff/Christmas/2004/PileOfGlacialSnow.cs b/Projects/UOContent/Holiday Stuff/Christmas/2004/PileOfGlacialSnow.cs index 54cf71449..136ee9f47 100644 --- a/Projects/UOContent/Holiday Stuff/Christmas/2004/PileOfGlacialSnow.cs +++ b/Projects/UOContent/Holiday Stuff/Christmas/2004/PileOfGlacialSnow.cs @@ -9,10 +9,11 @@ public partial class PileOfGlacialSnow : Item public PileOfGlacialSnow() : base(0x913) { Hue = 0x480; - Weight = 1.0; LootType = LootType.Blessed; } + public override double DefaultWeight => 1.0; + public override int LabelNumber => 1070874; // a Pile of Glacial Snow public override void OnSingleClick(Mobile from) diff --git a/Projects/UOContent/Holiday Stuff/Christmas/2004/SnowPile.cs b/Projects/UOContent/Holiday Stuff/Christmas/2004/SnowPile.cs index 2b092f187..2f7624dad 100644 --- a/Projects/UOContent/Holiday Stuff/Christmas/2004/SnowPile.cs +++ b/Projects/UOContent/Holiday Stuff/Christmas/2004/SnowPile.cs @@ -9,10 +9,11 @@ public partial class SnowPile : Item public SnowPile() : base(0x913) { Hue = 0x481; - Weight = 1.0; LootType = LootType.Blessed; } + public override double DefaultWeight => 1.0; + public override int LabelNumber => 1005578; // a pile of snow public override void OnDoubleClick(Mobile from) diff --git a/Projects/UOContent/Holiday Stuff/Christmas/2004/SnowyTree.cs b/Projects/UOContent/Holiday Stuff/Christmas/2004/SnowyTree.cs index ab233720e..e1a231d85 100644 --- a/Projects/UOContent/Holiday Stuff/Christmas/2004/SnowyTree.cs +++ b/Projects/UOContent/Holiday Stuff/Christmas/2004/SnowyTree.cs @@ -6,11 +6,9 @@ namespace Server.Items; public partial class SnowyTree : Item { [Constructible] - public SnowyTree() : base(0x2377) - { - Weight = 1.0; - LootType = LootType.Blessed; - } + public SnowyTree() : base(0x2377) => LootType = LootType.Blessed; + + public override double DefaultWeight => 1.0; public override void OnSingleClick(Mobile from) { diff --git a/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs b/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs index c930a18cb..acbc1ec48 100644 --- a/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs +++ b/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs @@ -61,11 +61,9 @@ public partial class Fireflies : Item, IAddon public partial class FirefliesDeed : Item { [Constructible] - public FirefliesDeed() : base(0x14F0) - { - LootType = LootType.Blessed; - Weight = 1.0; - } + public FirefliesDeed() : base(0x14F0) => LootType = LootType.Blessed; + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1150061; diff --git a/Projects/UOContent/Holiday Stuff/Christmas/2010/Items/AngelDecoration.cs b/Projects/UOContent/Holiday Stuff/Christmas/2010/Items/AngelDecoration.cs index 4b6d4969c..06b662922 100644 --- a/Projects/UOContent/Holiday Stuff/Christmas/2010/Items/AngelDecoration.cs +++ b/Projects/UOContent/Holiday Stuff/Christmas/2010/Items/AngelDecoration.cs @@ -1,16 +1,13 @@ using ModernUO.Serialization; -namespace Server.Items.Holiday -{ - [SerializationGenerator(0, false)] - [TypeAlias("Server.Items.AngelDecoration"), Flippable(0x46FA, 0x46FB)] - public partial class AngelDecoration : Item - { - public AngelDecoration() : base(0x46FA) - { - LootType = LootType.Blessed; +namespace Server.Items.Holiday; - Weight = 30; - } - } +[Flippable(0x46FA, 0x46FB)] +[TypeAlias("Server.Items.AngelDecoration")] +[SerializationGenerator(0, false)] +public partial class AngelDecoration : Item +{ + public AngelDecoration() : base(0x46FA) => LootType = LootType.Blessed; + + public override double DefaultWeight => 30.0; } diff --git a/Projects/UOContent/Holiday Stuff/Christmas/2010/Items/RockingHorse.cs b/Projects/UOContent/Holiday Stuff/Christmas/2010/Items/RockingHorse.cs index f2588cf46..7b5684f57 100644 --- a/Projects/UOContent/Holiday Stuff/Christmas/2010/Items/RockingHorse.cs +++ b/Projects/UOContent/Holiday Stuff/Christmas/2010/Items/RockingHorse.cs @@ -1,16 +1,13 @@ using ModernUO.Serialization; -namespace Server.Items.Holiday -{ - [SerializationGenerator(0, false)] - [TypeAlias("Server.Items.RockingHorse"), Flippable(0x4214, 0x4215)] - public partial class RockingHorse : Item - { - public RockingHorse() : base(0x4214) - { - LootType = LootType.Blessed; +namespace Server.Items.Holiday; - Weight = 30; - } - } +[Flippable(0x4214, 0x4215)] +[TypeAlias("Server.Items.RockingHorse")] +[SerializationGenerator(0, false)] +public partial class RockingHorse : Item +{ + public RockingHorse() : base(0x4214) => LootType = LootType.Blessed; + + public override double DefaultWeight => 30.0; } diff --git a/Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs b/Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs index 9e2c2b670..ab1f44561 100644 --- a/Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs +++ b/Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs @@ -1,18 +1,18 @@ using ModernUO.Serialization; -namespace Server.Items -{ - [SerializationGenerator(0, false)] - public partial class MrPlainsCookies : Food - { - [Constructible] - public MrPlainsCookies() : base(0x160C) - { - Weight = 1.0; - FillFactor = 4; - Hue = 0xF4; - } +namespace Server.Items; - public override string DefaultName => "Mr Plain's Cookies"; +[SerializationGenerator(0, false)] +public partial class MrPlainsCookies : Food +{ + [Constructible] + public MrPlainsCookies() : base(0x160C) + { + FillFactor = 4; + Hue = 0xF4; } + + public override double DefaultWeight => 1.0; + + public override string DefaultName => "Mr Plain's Cookies"; } diff --git a/Projects/UOContent/Items/Addons/BaseAddonContainerDeed.cs b/Projects/UOContent/Items/Addons/BaseAddonContainerDeed.cs index 17c9fba16..ca4913176 100644 --- a/Projects/UOContent/Items/Addons/BaseAddonContainerDeed.cs +++ b/Projects/UOContent/Items/Addons/BaseAddonContainerDeed.cs @@ -13,8 +13,6 @@ namespace Server.Items public BaseAddonContainerDeed() : base(0x14F0) { - Weight = 1.0; - if (!Core.AOS) { LootType = LootType.Newbied; @@ -25,6 +23,8 @@ namespace Server.Items { } + public override double DefaultWeight => 1.0; + public abstract BaseAddonContainer Addon { get; } [CommandProperty(AccessLevel.GameMaster)] diff --git a/Projects/UOContent/Items/Addons/BaseAddonDeed.cs b/Projects/UOContent/Items/Addons/BaseAddonDeed.cs index 49977289b..d6ca03ac3 100644 --- a/Projects/UOContent/Items/Addons/BaseAddonDeed.cs +++ b/Projects/UOContent/Items/Addons/BaseAddonDeed.cs @@ -13,14 +13,14 @@ namespace Server.Items public BaseAddonDeed() : base(0x14F0) { - Weight = 1.0; - if (!Core.AOS) { LootType = LootType.Newbied; } } + public override double DefaultWeight => 1.0; + public abstract BaseAddon Addon { get; } [CommandProperty(AccessLevel.GameMaster)] diff --git a/Projects/UOContent/Items/Armor/Helmets/ChainCoif.cs b/Projects/UOContent/Items/Armor/Helmets/ChainCoif.cs index d1277dd77..cb76d0e39 100644 --- a/Projects/UOContent/Items/Armor/Helmets/ChainCoif.cs +++ b/Projects/UOContent/Items/Armor/Helmets/ChainCoif.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class ChainCoif : BaseArmor { [Constructible] - public ChainCoif() : base(0x13BB) => Weight = 1.0; + public ChainCoif() : base(0x13BB) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 4; public override int BaseFireResistance => 4; diff --git a/Projects/UOContent/Items/Armor/Leather/FemaleLeatherChest.cs b/Projects/UOContent/Items/Armor/Leather/FemaleLeatherChest.cs index 0a6433ff9..7b13c2075 100644 --- a/Projects/UOContent/Items/Armor/Leather/FemaleLeatherChest.cs +++ b/Projects/UOContent/Items/Armor/Leather/FemaleLeatherChest.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class FemaleLeatherChest : BaseArmor { [Constructible] - public FemaleLeatherChest() : base(0x1C06) => Weight = 1.0; + public FemaleLeatherChest() : base(0x1C06) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherBustierArms.cs b/Projects/UOContent/Items/Armor/Leather/LeatherBustierArms.cs index 5e7bd8e9a..4dc7c3dde 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherBustierArms.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherBustierArms.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class LeatherBustierArms : BaseArmor { [Constructible] - public LeatherBustierArms() : base(0x1C0A) => Weight = 1.0; + public LeatherBustierArms() : base(0x1C0A) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherGloves.cs b/Projects/UOContent/Items/Armor/Leather/LeatherGloves.cs index cab91adcc..28517f5db 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherGloves.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherGloves.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class LeatherGloves : BaseArmor, IArcaneEquip { [Constructible] - public LeatherGloves() : base(0x13C6) => Weight = 1.0; + public LeatherGloves() : base(0x13C6) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherGorget.cs b/Projects/UOContent/Items/Armor/Leather/LeatherGorget.cs index 42eb16daf..7e902ae60 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherGorget.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherGorget.cs @@ -6,7 +6,11 @@ namespace Server.Items public partial class LeatherGorget : BaseArmor { [Constructible] - public LeatherGorget() : base(0x13C7) => Weight = 1.0; + public LeatherGorget() : base(0x13C7) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherHiroSode.cs b/Projects/UOContent/Items/Armor/Leather/LeatherHiroSode.cs index 6b54d1695..40fb5885f 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherHiroSode.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherHiroSode.cs @@ -6,7 +6,11 @@ namespace Server.Items public partial class LeatherHiroSode : BaseArmor { [Constructible] - public LeatherHiroSode() : base(0x277E) => Weight = 1.0; + public LeatherHiroSode() : base(0x277E) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherSkirt.cs b/Projects/UOContent/Items/Armor/Leather/LeatherSkirt.cs index acaaa09fb..ea47347e2 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherSkirt.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherSkirt.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class LeatherSkirt : BaseArmor { [Constructible] - public LeatherSkirt() : base(0x1C08) => Weight = 1.0; + public LeatherSkirt() : base(0x1C08) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; diff --git a/Projects/UOContent/Items/Armor/Studded/StuddedBustierArms.cs b/Projects/UOContent/Items/Armor/Studded/StuddedBustierArms.cs index 3dd466c49..eff01f1f1 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedBustierArms.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedBustierArms.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class StuddedBustierArms : BaseArmor { [Constructible] - public StuddedBustierArms() : base(0x1C0C) => Weight = 1.0; + public StuddedBustierArms() : base(0x1C0C) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; diff --git a/Projects/UOContent/Items/Armor/Studded/StuddedGloves.cs b/Projects/UOContent/Items/Armor/Studded/StuddedGloves.cs index aa2d585ea..e7e78da92 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedGloves.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedGloves.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class StuddedGloves : BaseArmor { [Constructible] - public StuddedGloves() : base(0x13D5) => Weight = 1.0; + public StuddedGloves() : base(0x13D5) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; diff --git a/Projects/UOContent/Items/Armor/Studded/StuddedGorget.cs b/Projects/UOContent/Items/Armor/Studded/StuddedGorget.cs index 079d99e3a..cd5af7c1b 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedGorget.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedGorget.cs @@ -6,7 +6,11 @@ namespace Server.Items public partial class StuddedGorget : BaseArmor { [Constructible] - public StuddedGorget() : base(0x13D6) => Weight = 1.0; + public StuddedGorget() : base(0x13D6) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; diff --git a/Projects/UOContent/Items/Armor/Studded/StuddedHiroSode.cs b/Projects/UOContent/Items/Armor/Studded/StuddedHiroSode.cs index 0b0afd5bd..c934b728a 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedHiroSode.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedHiroSode.cs @@ -6,7 +6,11 @@ namespace Server.Items public partial class StuddedHiroSode : BaseArmor { [Constructible] - public StuddedHiroSode() : base(0x277F) => Weight = 1.0; + public StuddedHiroSode() : base(0x277F) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; diff --git a/Projects/UOContent/Items/Clothing/Hats.cs b/Projects/UOContent/Items/Clothing/Hats.cs index d6bec6723..f6d5b0c49 100644 --- a/Projects/UOContent/Items/Clothing/Hats.cs +++ b/Projects/UOContent/Items/Clothing/Hats.cs @@ -96,7 +96,11 @@ namespace Server.Items public partial class FlowerGarland : BaseHat { [Constructible] - public FlowerGarland(int hue = 0) : base(0x2306, hue) => Weight = 1.0; + public FlowerGarland(int hue = 0) : base(0x2306, hue) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; @@ -112,7 +116,11 @@ namespace Server.Items public partial class FloppyHat : BaseHat { [Constructible] - public FloppyHat(int hue = 0) : base(0x1713, hue) => Weight = 1.0; + public FloppyHat(int hue = 0) : base(0x1713, hue) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 0; public override int BaseFireResistance => 5; @@ -128,7 +136,11 @@ namespace Server.Items public partial class WideBrimHat : BaseHat { [Constructible] - public WideBrimHat(int hue = 0) : base(0x1714, hue) => Weight = 1.0; + public WideBrimHat(int hue = 0) : base(0x1714, hue) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 0; public override int BaseFireResistance => 5; @@ -144,7 +156,11 @@ namespace Server.Items public partial class Cap : BaseHat { [Constructible] - public Cap(int hue = 0) : base(0x1715, hue) => Weight = 1.0; + public Cap(int hue = 0) : base(0x1715, hue) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 0; public override int BaseFireResistance => 5; @@ -160,7 +176,11 @@ namespace Server.Items public partial class SkullCap : BaseHat { [Constructible] - public SkullCap(int hue = 0) : base(0x1544, hue) => Weight = 1.0; + public SkullCap(int hue = 0) : base(0x1544, hue) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 0; public override int BaseFireResistance => 3; @@ -176,7 +196,11 @@ namespace Server.Items public partial class Bandana : BaseHat { [Constructible] - public Bandana(int hue = 0) : base(0x1540, hue) => Weight = 1.0; + public Bandana(int hue = 0) : base(0x1540, hue) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 0; public override int BaseFireResistance => 3; @@ -280,7 +304,11 @@ namespace Server.Items public partial class TallStrawHat : BaseHat { [Constructible] - public TallStrawHat(int hue = 0) : base(0x1716, hue) => Weight = 1.0; + public TallStrawHat(int hue = 0) : base(0x1716, hue) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 0; public override int BaseFireResistance => 5; @@ -296,7 +324,11 @@ namespace Server.Items public partial class StrawHat : BaseHat { [Constructible] - public StrawHat(int hue = 0) : base(0x1717, hue) => Weight = 1.0; + public StrawHat(int hue = 0) : base(0x1717, hue) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 0; public override int BaseFireResistance => 5; @@ -401,7 +433,11 @@ namespace Server.Items public partial class WizardsHat : BaseHat { [Constructible] - public WizardsHat(int hue = 0) : base(0x1718, hue) => Weight = 1.0; + public WizardsHat(int hue = 0) : base(0x1718, hue) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 0; public override int BaseFireResistance => 5; @@ -417,7 +453,11 @@ namespace Server.Items public partial class MagicWizardsHat : BaseHat { [Constructible] - public MagicWizardsHat(int hue = 0) : base(0x1718, hue) => Weight = 1.0; + public MagicWizardsHat(int hue = 0) : base(0x1718, hue) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 0; public override int BaseFireResistance => 5; @@ -439,7 +479,11 @@ namespace Server.Items public partial class Bonnet : BaseHat { [Constructible] - public Bonnet(int hue = 0) : base(0x1719, hue) => Weight = 1.0; + public Bonnet(int hue = 0) : base(0x1719, hue) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 0; public override int BaseFireResistance => 5; @@ -455,7 +499,11 @@ namespace Server.Items public partial class FeatheredHat : BaseHat { [Constructible] - public FeatheredHat(int hue = 0) : base(0x171A, hue) => Weight = 1.0; + public FeatheredHat(int hue = 0) : base(0x171A, hue) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 0; public override int BaseFireResistance => 5; @@ -471,7 +519,11 @@ namespace Server.Items public partial class TricorneHat : BaseHat { [Constructible] - public TricorneHat(int hue = 0) : base(0x171B, hue) => Weight = 1.0; + public TricorneHat(int hue = 0) : base(0x171B, hue) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 0; public override int BaseFireResistance => 5; @@ -487,7 +539,11 @@ namespace Server.Items public partial class JesterHat : BaseHat { [Constructible] - public JesterHat(int hue = 0) : base(0x171C, hue) => Weight = 1.0; + public JesterHat(int hue = 0) : base(0x171C, hue) + { + } + + public override double DefaultWeight => 1.0; public override int BasePhysicalResistance => 0; public override int BaseFireResistance => 5; diff --git a/Projects/UOContent/Items/Clothing/MiddleTorso.cs b/Projects/UOContent/Items/Clothing/MiddleTorso.cs index 27e3bc4b6..0003b3625 100644 --- a/Projects/UOContent/Items/Clothing/MiddleTorso.cs +++ b/Projects/UOContent/Items/Clothing/MiddleTorso.cs @@ -15,7 +15,11 @@ namespace Server.Items public partial class BodySash : BaseMiddleTorso { [Constructible] - public BodySash(int hue = 0) : base(0x1541, hue) => Weight = 1.0; + public BodySash(int hue = 0) : base(0x1541, hue) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] @@ -55,7 +59,11 @@ namespace Server.Items public partial class FormalShirt : BaseMiddleTorso { [Constructible] - public FormalShirt(int hue = 0) : base(0x2310, hue) => Weight = 1.0; + public FormalShirt(int hue = 0) : base(0x2310, hue) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] diff --git a/Projects/UOContent/Items/Clothing/Shirts.cs b/Projects/UOContent/Items/Clothing/Shirts.cs index 6ba43a870..899d307f1 100644 --- a/Projects/UOContent/Items/Clothing/Shirts.cs +++ b/Projects/UOContent/Items/Clothing/Shirts.cs @@ -23,7 +23,11 @@ namespace Server.Items public partial class Shirt : BaseShirt { [Constructible] - public Shirt(int hue = 0) : base(0x1517, hue) => Weight = 1.0; + public Shirt(int hue = 0) : base(0x1517, hue) + { + } + + public override double DefaultWeight => 1.0; } [Flippable(0x2794, 0x27DF)] diff --git a/Projects/UOContent/Items/Clothing/Shoes.cs b/Projects/UOContent/Items/Clothing/Shoes.cs index 8e6cb3d7a..167a3fbb7 100644 --- a/Projects/UOContent/Items/Clothing/Shoes.cs +++ b/Projects/UOContent/Items/Clothing/Shoes.cs @@ -153,7 +153,11 @@ namespace Server.Items public partial class Sandals : BaseShoes { [Constructible] - public Sandals(int hue = 0) : base(0x170D, hue) => Weight = 1.0; + public Sandals(int hue = 0) : base(0x170D, hue) + { + } + + public override double DefaultWeight => 1.0; public override CraftResource DefaultResource => CraftResource.RegularLeather; diff --git a/Projects/UOContent/Items/Clothing/Waist.cs b/Projects/UOContent/Items/Clothing/Waist.cs index 45f34d768..6920e1866 100644 --- a/Projects/UOContent/Items/Clothing/Waist.cs +++ b/Projects/UOContent/Items/Clothing/Waist.cs @@ -23,7 +23,11 @@ namespace Server.Items public partial class Obi : BaseWaist { [Constructible] - public Obi(int hue = 0) : base(0x27A0, hue) => Weight = 1.0; + public Obi(int hue = 0) : base(0x27A0, hue) + { + } + + public override double DefaultWeight => 1.0; } [Flippable(0x2B68, 0x315F)] diff --git a/Projects/UOContent/Items/Construction/Chairs/Chairs.cs b/Projects/UOContent/Items/Construction/Chairs/Chairs.cs index 12b2b9ad8..f9034a1e8 100644 --- a/Projects/UOContent/Items/Construction/Chairs/Chairs.cs +++ b/Projects/UOContent/Items/Construction/Chairs/Chairs.cs @@ -53,7 +53,11 @@ namespace Server.Items public partial class OrnateElvenChair : Item { [Constructible] - public OrnateElvenChair() : base(0x2DE3) => Weight = 1.0; + public OrnateElvenChair() : base(0x2DE3) + { + } + + public override double DefaultWeight => 1.0; } [DynamicFlipping] diff --git a/Projects/UOContent/Items/Construction/Chairs/Thrones.cs b/Projects/UOContent/Items/Construction/Chairs/Thrones.cs index de189504f..7ecf175c6 100644 --- a/Projects/UOContent/Items/Construction/Chairs/Thrones.cs +++ b/Projects/UOContent/Items/Construction/Chairs/Thrones.cs @@ -8,7 +8,11 @@ namespace Server.Items public partial class Throne : Item { [Constructible] - public Throne() : base(0xB33) => Weight = 1.0; + public Throne() : base(0xB33) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] diff --git a/Projects/UOContent/Items/Construction/Decorative/GiantReplicaAcorn.cs b/Projects/UOContent/Items/Construction/Decorative/GiantReplicaAcorn.cs index d0a5c7a3e..e644fe701 100644 --- a/Projects/UOContent/Items/Construction/Decorative/GiantReplicaAcorn.cs +++ b/Projects/UOContent/Items/Construction/Decorative/GiantReplicaAcorn.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class GiantReplicaAcorn : Item { [Constructible] - public GiantReplicaAcorn() : base(0x2D4A) => Weight = 1.0; + public GiantReplicaAcorn() : base(0x2D4A) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1072889; // giant replica acorn } diff --git a/Projects/UOContent/Items/Construction/Decorative/MountedDreadHorn.cs b/Projects/UOContent/Items/Construction/Decorative/MountedDreadHorn.cs index c3126fff4..6e79f3f4c 100644 --- a/Projects/UOContent/Items/Construction/Decorative/MountedDreadHorn.cs +++ b/Projects/UOContent/Items/Construction/Decorative/MountedDreadHorn.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class MountedDreadHorn : Item { [Constructible] - public MountedDreadHorn() : base(0x3158) => Weight = 1.0; + public MountedDreadHorn() : base(0x3158) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1074464; // mounted Dread Horn } diff --git a/Projects/UOContent/Items/Construction/Tables/Tables.cs b/Projects/UOContent/Items/Construction/Tables/Tables.cs index b7602efaa..ee670cced 100644 --- a/Projects/UOContent/Items/Construction/Tables/Tables.cs +++ b/Projects/UOContent/Items/Construction/Tables/Tables.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class ElegantLowTable : Item { [Constructible] - public ElegantLowTable() : base(0x2819) => Weight = 1.0; + public ElegantLowTable() : base(0x2819) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] @@ -15,7 +19,11 @@ namespace Server.Items public partial class PlainLowTable : Item { [Constructible] - public PlainLowTable() : base(0x281A) => Weight = 1.0; + public PlainLowTable() : base(0x281A) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] @@ -24,7 +32,11 @@ namespace Server.Items public partial class LargeTable : Item { [Constructible] - public LargeTable() : base(0xB90) => Weight = 1.0; + public LargeTable() : base(0xB90) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] @@ -33,7 +45,11 @@ namespace Server.Items public partial class Nightstand : Item { [Constructible] - public Nightstand() : base(0xB35) => Weight = 1.0; + public Nightstand() : base(0xB35) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] @@ -42,6 +58,10 @@ namespace Server.Items public partial class YewWoodTable : Item { [Constructible] - public YewWoodTable() : base(0xB8F) => Weight = 1.0; + public YewWoodTable() : base(0xB8F) + { + } + + public override double DefaultWeight => 1.0; } } diff --git a/Projects/UOContent/Items/Construction/Tables/WritingTable.cs b/Projects/UOContent/Items/Construction/Tables/WritingTable.cs index 077978a8d..351fbda2e 100644 --- a/Projects/UOContent/Items/Construction/Tables/WritingTable.cs +++ b/Projects/UOContent/Items/Construction/Tables/WritingTable.cs @@ -8,6 +8,10 @@ namespace Server.Items public partial class WritingTable : Item { [Constructible] - public WritingTable() : base(0xB4A) => Weight = 1.0; + public WritingTable() : base(0xB4A) + { + } + + public override double DefaultWeight => 1.0; } } diff --git a/Projects/UOContent/Items/Containers/Container.cs b/Projects/UOContent/Items/Containers/Container.cs index 6afb9105f..d1178ad79 100644 --- a/Projects/UOContent/Items/Containers/Container.cs +++ b/Projects/UOContent/Items/Containers/Container.cs @@ -269,13 +269,21 @@ public partial class Backpack : BaseContainer, IDyable public partial class Pouch : TrappableContainer { [Constructible] - public Pouch() : base(0xE79) => Weight = 1.0; + public Pouch() : base(0xE79) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public abstract partial class BaseBagBall : BaseContainer, IDyable { - public BaseBagBall(int itemID) : base(itemID) => Weight = 1.0; + public BaseBagBall(int itemID) : base(itemID) + { + } + + public override double DefaultWeight => 1.0; public bool Dye(Mobile from, DyeTub sender) { @@ -352,7 +360,11 @@ public partial class PicnicBasket : BaseContainer public partial class Basket : BaseContainer { [Constructible] - public Basket() : base(0x990) => Weight = 1.0; + public Basket() : base(0x990) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] @@ -388,7 +400,11 @@ public partial class MediumCrate : LockableContainer public partial class LargeCrate : LockableContainer { [Constructible] - public LargeCrate() : base(0xE3D) => Weight = 1.0; + public LargeCrate() : base(0xE3D) + { + } + + public override double DefaultWeight => 1.0; } [DynamicFlipping] diff --git a/Projects/UOContent/Items/Containers/FurnitureContainer.cs b/Projects/UOContent/Items/Containers/FurnitureContainer.cs index e638ab2d7..0b19f4979 100644 --- a/Projects/UOContent/Items/Containers/FurnitureContainer.cs +++ b/Projects/UOContent/Items/Containers/FurnitureContainer.cs @@ -10,7 +10,11 @@ namespace Server.Items; public partial class TallCabinet : BaseContainer { [Constructible] - public TallCabinet() : base(0x2815) => Weight = 1.0; + public TallCabinet() : base(0x2815) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] @@ -19,7 +23,11 @@ public partial class TallCabinet : BaseContainer public partial class ShortCabinet : BaseContainer { [Constructible] - public ShortCabinet() : base(0x2817) => Weight = 1.0; + public ShortCabinet() : base(0x2817) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] @@ -28,7 +36,11 @@ public partial class ShortCabinet : BaseContainer public partial class RedArmoire : BaseContainer { [Constructible] - public RedArmoire() : base(0x2857) => Weight = 1.0; + public RedArmoire() : base(0x2857) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] @@ -37,7 +49,11 @@ public partial class RedArmoire : BaseContainer public partial class CherryArmoire : BaseContainer { [Constructible] - public CherryArmoire() : base(0x285D) => Weight = 1.0; + public CherryArmoire() : base(0x285D) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] @@ -46,7 +62,11 @@ public partial class CherryArmoire : BaseContainer public partial class MapleArmoire : BaseContainer { [Constructible] - public MapleArmoire() : base(0x285B) => Weight = 1.0; + public MapleArmoire() : base(0x285B) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] @@ -55,7 +75,11 @@ public partial class MapleArmoire : BaseContainer public partial class ElegantArmoire : BaseContainer { [Constructible] - public ElegantArmoire() : base(0x2859) => Weight = 1.0; + public ElegantArmoire() : base(0x2859) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] @@ -64,7 +88,11 @@ public partial class ElegantArmoire : BaseContainer public partial class FancyElvenArmoire : BaseContainer { [Constructible] - public FancyElvenArmoire() : base(0x2D07) => Weight = 1.0; + public FancyElvenArmoire() : base(0x2D07) + { + } + + public override double DefaultWeight => 1.0; public override int DefaultGumpID => 0x4E; public override int DefaultDropSound => 0x42; } @@ -75,7 +103,11 @@ public partial class FancyElvenArmoire : BaseContainer public partial class SimpleElvenArmoire : BaseContainer { [Constructible] - public SimpleElvenArmoire() : base(0x2D05) => Weight = 1.0; + public SimpleElvenArmoire() : base(0x2D05) + { + } + + public override double DefaultWeight => 1.0; public override int DefaultGumpID => 0x4F; public override int DefaultDropSound => 0x42; } @@ -86,7 +118,11 @@ public partial class SimpleElvenArmoire : BaseContainer public partial class FullBookcase : BaseContainer { [Constructible] - public FullBookcase() : base(0xA97) => Weight = 1.0; + public FullBookcase() : base(0xA97) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] @@ -106,7 +142,11 @@ public partial class EmptyBookcase : BaseContainer public partial class Drawer : BaseContainer { [Constructible] - public Drawer() : base(0xA2C) => Weight = 1.0; + public Drawer() : base(0xA2C) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] @@ -115,7 +155,11 @@ public partial class Drawer : BaseContainer public partial class FancyDrawer : BaseContainer { [Constructible] - public FancyDrawer() : base(0xA30) => Weight = 1.0; + public FancyDrawer() : base(0xA30) + { + } + + public override double DefaultWeight => 1.0; } [Furniture] @@ -124,7 +168,11 @@ public partial class FancyDrawer : BaseContainer public partial class Armoire : BaseContainer { [Constructible] - public Armoire() : base(0xA4F) => Weight = 1.0; + public Armoire() : base(0xA4F) + { + } + + public override double DefaultWeight => 1.0; public override void DisplayTo(Mobile m) { @@ -147,7 +195,11 @@ public partial class Armoire : BaseContainer public partial class FancyArmoire : BaseContainer { [Constructible] - public FancyArmoire() : base(0xA4D) => Weight = 1.0; + public FancyArmoire() : base(0xA4D) + { + } + + public override double DefaultWeight => 1.0; public override void DisplayTo(Mobile m) { diff --git a/Projects/UOContent/Items/Deeds/DragonBardingDeed.cs b/Projects/UOContent/Items/Deeds/DragonBardingDeed.cs index a7ac745dc..6599e6c56 100644 --- a/Projects/UOContent/Items/Deeds/DragonBardingDeed.cs +++ b/Projects/UOContent/Items/Deeds/DragonBardingDeed.cs @@ -20,7 +20,11 @@ public partial class DragonBardingDeed : Item, ICraftable [SerializedCommandProperty(AccessLevel.GameMaster)] private bool _exceptional; - public DragonBardingDeed() : base(0x14F0) => Weight = 1.0; + public DragonBardingDeed() : base(0x14F0) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => _exceptional ? 1053181 : 1053012; // dragon barding deed diff --git a/Projects/UOContent/Items/Food/Asian.cs b/Projects/UOContent/Items/Food/Asian.cs index b80e5f2d9..e050450ab 100644 --- a/Projects/UOContent/Items/Food/Asian.cs +++ b/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)] diff --git a/Projects/UOContent/Items/Food/Beverage.cs b/Projects/UOContent/Items/Food/Beverage.cs index 6398fffc3..f1a8cae29 100644 --- a/Projects/UOContent/Items/Food/Beverage.cs +++ b/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 diff --git a/Projects/UOContent/Items/Food/Bowls.cs b/Projects/UOContent/Items/Food/Bowls.cs index f080b6d62..0ececb679 100644 --- a/Projects/UOContent/Items/Food/Bowls.cs +++ b/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)] diff --git a/Projects/UOContent/Items/Food/CookableFood.cs b/Projects/UOContent/Items/Food/CookableFood.cs index a1515173c..7b2dbad62 100644 --- a/Projects/UOContent/Items/Food/CookableFood.cs +++ b/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 diff --git a/Projects/UOContent/Items/Food/Cooking.cs b/Projects/UOContent/Items/Food/Cooking.cs index 9701772dd..71eac6dbd 100644 --- a/Projects/UOContent/Items/Food/Cooking.cs +++ b/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")] diff --git a/Projects/UOContent/Items/Food/Vegetables.cs b/Projects/UOContent/Items/Food/Vegetables.cs index 9824d23b3..49cd1fcb5 100644 --- a/Projects/UOContent/Items/Food/Vegetables.cs +++ b/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; } diff --git a/Projects/UOContent/Items/Games/Dices.cs b/Projects/UOContent/Items/Games/Dices.cs index 37346703d..ce92158c2 100644 --- a/Projects/UOContent/Items/Games/Dices.cs +++ b/Projects/UOContent/Items/Games/Dices.cs @@ -6,7 +6,11 @@ namespace Server.Items; public partial class Dices : Item, ITelekinesisable { [Constructible] - public Dices() : base(0xFA7) => Weight = 1.0; + public Dices() : base(0xFA7) + { + } + + public override double DefaultWeight => 1.0; public void OnTelekinesis(Mobile from) { diff --git a/Projects/UOContent/Items/Guilds/GuildDeed.cs b/Projects/UOContent/Items/Guilds/GuildDeed.cs index ac0869a71..1c1d6f61a 100644 --- a/Projects/UOContent/Items/Guilds/GuildDeed.cs +++ b/Projects/UOContent/Items/Guilds/GuildDeed.cs @@ -9,7 +9,11 @@ namespace Server.Items; public partial class GuildDeed : Item { [Constructible] - public GuildDeed() : base(0x14F0) => Weight = 1.0; + public GuildDeed() : base(0x14F0) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1041055; // a guild deed diff --git a/Projects/UOContent/Items/Jewels/Beads.cs b/Projects/UOContent/Items/Jewels/Beads.cs index e60572be2..0558cb0d2 100644 --- a/Projects/UOContent/Items/Jewels/Beads.cs +++ b/Projects/UOContent/Items/Jewels/Beads.cs @@ -6,5 +6,9 @@ namespace Server.Items; public partial class Beads : Item { [Constructible] - public Beads() : base(0x108B) => Weight = 1.0; + public Beads() : base(0x108B) + { + } + + public override double DefaultWeight => 1.0; } diff --git a/Projects/UOContent/Items/Misc/ExecutionersCap.cs b/Projects/UOContent/Items/Misc/ExecutionersCap.cs index 69ba5ffe1..d2e1ae395 100644 --- a/Projects/UOContent/Items/Misc/ExecutionersCap.cs +++ b/Projects/UOContent/Items/Misc/ExecutionersCap.cs @@ -6,5 +6,9 @@ namespace Server.Items; public partial class ExecutionersCap : Item { [Constructible] - public ExecutionersCap() : base(0xF83) => Weight = 1.0; + public ExecutionersCap() : base(0xF83) + { + } + + public override double DefaultWeight => 1.0; } diff --git a/Projects/UOContent/Items/Misc/GlassItems.cs b/Projects/UOContent/Items/Misc/GlassItems.cs index 9f3bbf070..6b86a8de2 100644 --- a/Projects/UOContent/Items/Misc/GlassItems.cs +++ b/Projects/UOContent/Items/Misc/GlassItems.cs @@ -7,7 +7,11 @@ namespace Server.Items; public partial class SmallFlask : Item { [Constructible] - public SmallFlask() : base(0x182E) => Weight = 1.0; + public SmallFlask() : base(0x182E) + { + } + + public override double DefaultWeight => 1.0; } [Flippable(0x182A, 0x182B, 0x182C, 0x182D)] @@ -15,7 +19,11 @@ public partial class SmallFlask : Item public partial class MediumFlask : Item { [Constructible] - public MediumFlask() : base(0x182A) => Weight = 1.0; + public MediumFlask() : base(0x182A) + { + } + + public override double DefaultWeight => 1.0; } [Flippable(0x183B, 0x183C, 0x183D)] @@ -23,7 +31,11 @@ public partial class MediumFlask : Item public partial class LargeFlask : Item { [Constructible] - public LargeFlask() : base(0x183B) => Weight = 1.0; + public LargeFlask() : base(0x183B) + { + } + + public override double DefaultWeight => 1.0; } [Flippable(0x1832, 0x1833, 0x1834, 0x1835, 0x1836, 0x1837)] @@ -31,7 +43,11 @@ public partial class LargeFlask : Item public partial class CurvedFlask : Item { [Constructible] - public CurvedFlask() : base(0x1832) => Weight = 1.0; + public CurvedFlask() : base(0x1832) + { + } + + public override double DefaultWeight => 1.0; } [Flippable(0x1838, 0x1839, 0x183A)] @@ -39,7 +55,11 @@ public partial class CurvedFlask : Item public partial class LongFlask : Item { [Constructible] - public LongFlask() : base(0x1838) => Weight = 1.0; + public LongFlask() : base(0x1838) + { + } + + public override double DefaultWeight => 1.0; } [Flippable(0x1810, 0x1811)] @@ -47,49 +67,77 @@ public partial class LongFlask : Item public partial class SpinningHourglass : Item { [Constructible] - public SpinningHourglass() : base(0x1810) => Weight = 1.0; + public SpinningHourglass() : base(0x1810) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class GreenBottle : Item { [Constructible] - public GreenBottle() : base(0x0EFB) => Weight = 1.0; + public GreenBottle() : base(0x0EFB) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class RedBottle : Item { [Constructible] - public RedBottle() : base(0x0EFC) => Weight = 1.0; + public RedBottle() : base(0x0EFC) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class SmallBrownBottle : Item { [Constructible] - public SmallBrownBottle() : base(0x0EFD) => Weight = 1.0; + public SmallBrownBottle() : base(0x0EFD) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class SmallGreenBottle : Item { [Constructible] - public SmallGreenBottle() : base(0x0F01) => Weight = 1.0; + public SmallGreenBottle() : base(0x0F01) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class SmallVioletBottle : Item { [Constructible] - public SmallVioletBottle() : base(0x0F02) => Weight = 1.0; + public SmallVioletBottle() : base(0x0F02) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class TinyYellowBottle : Item { [Constructible] - public TinyYellowBottle() : base(0x0F03) => Weight = 1.0; + public TinyYellowBottle() : base(0x0F03) + { + } + + public override double DefaultWeight => 1.0; } // remove @@ -97,175 +145,275 @@ public partial class TinyYellowBottle : Item public partial class SmallBlueFlask : Item { [Constructible] - public SmallBlueFlask() : base(0x182A) => Weight = 1.0; + public SmallBlueFlask() : base(0x182A) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class SmallYellowFlask : Item { [Constructible] - public SmallYellowFlask() : base(0x182B) => Weight = 1.0; + public SmallYellowFlask() : base(0x182B) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class SmallRedFlask : Item { [Constructible] - public SmallRedFlask() : base(0x182C) => Weight = 1.0; + public SmallRedFlask() : base(0x182C) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class SmallEmptyFlask : Item { [Constructible] - public SmallEmptyFlask() : base(0x182D) => Weight = 1.0; + public SmallEmptyFlask() : base(0x182D) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class YellowBeaker : Item { [Constructible] - public YellowBeaker() : base(0x182E) => Weight = 1.0; + public YellowBeaker() : base(0x182E) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class RedBeaker : Item { [Constructible] - public RedBeaker() : base(0x182F) => Weight = 1.0; + public RedBeaker() : base(0x182F) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class BlueBeaker : Item { [Constructible] - public BlueBeaker() : base(0x1830) => Weight = 1.0; + public BlueBeaker() : base(0x1830) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class GreenBeaker : Item { [Constructible] - public GreenBeaker() : base(0x1831) => Weight = 1.0; + public GreenBeaker() : base(0x1831) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class EmptyCurvedFlaskW : Item { [Constructible] - public EmptyCurvedFlaskW() : base(0x1832) => Weight = 1.0; + public EmptyCurvedFlaskW() : base(0x1832) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class RedCurvedFlask : Item { [Constructible] - public RedCurvedFlask() : base(0x1833) => Weight = 1.0; + public RedCurvedFlask() : base(0x1833) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class LtBlueCurvedFlask : Item { [Constructible] - public LtBlueCurvedFlask() : base(0x1834) => Weight = 1.0; + public LtBlueCurvedFlask() : base(0x1834) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class EmptyCurvedFlaskE : Item { [Constructible] - public EmptyCurvedFlaskE() : base(0x1835) => Weight = 1.0; + public EmptyCurvedFlaskE() : base(0x1835) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class BlueCurvedFlask : Item { [Constructible] - public BlueCurvedFlask() : base(0x1836) => Weight = 1.0; + public BlueCurvedFlask() : base(0x1836) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class GreenCurvedFlask : Item { [Constructible] - public GreenCurvedFlask() : base(0x1837) => Weight = 1.0; + public GreenCurvedFlask() : base(0x1837) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class RedRibbedFlask : Item { [Constructible] - public RedRibbedFlask() : base(0x1838) => Weight = 1.0; + public RedRibbedFlask() : base(0x1838) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class VioletRibbedFlask : Item { [Constructible] - public VioletRibbedFlask() : base(0x1839) => Weight = 1.0; + public VioletRibbedFlask() : base(0x1839) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class EmptyRibbedFlask : Item { [Constructible] - public EmptyRibbedFlask() : base(0x183A) => Weight = 1.0; + public EmptyRibbedFlask() : base(0x183A) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class LargeYellowFlask : Item { [Constructible] - public LargeYellowFlask() : base(0x183B) => Weight = 1.0; + public LargeYellowFlask() : base(0x183B) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class LargeVioletFlask : Item { [Constructible] - public LargeVioletFlask() : base(0x183C) => Weight = 1.0; + public LargeVioletFlask() : base(0x183C) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class LargeEmptyFlask : Item { [Constructible] - public LargeEmptyFlask() : base(0x183D) => Weight = 1.0; + public LargeEmptyFlask() : base(0x183D) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class AniRedRibbedFlask : Item { [Constructible] - public AniRedRibbedFlask() : base(0x183E) => Weight = 1.0; + public AniRedRibbedFlask() : base(0x183E) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class AniLargeVioletFlask : Item { [Constructible] - public AniLargeVioletFlask() : base(0x1841) => Weight = 1.0; + public AniLargeVioletFlask() : base(0x1841) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class AniSmallBlueFlask : Item { [Constructible] - public AniSmallBlueFlask() : base(0x1844) => Weight = 1.0; + public AniSmallBlueFlask() : base(0x1844) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class SmallBlueBottle : Item { [Constructible] - public SmallBlueBottle() : base(0x1847) => Weight = 1.0; + public SmallBlueBottle() : base(0x1847) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class SmallGreenBottle2 : Item { [Constructible] - public SmallGreenBottle2() : base(0x1848) => Weight = 1.0; + public SmallGreenBottle2() : base(0x1848) + { + } + + public override double DefaultWeight => 1.0; } [Flippable(0x185B, 0x185C)] @@ -273,7 +421,11 @@ public partial class SmallGreenBottle2 : Item public partial class EmptyVialsWRack : Item { [Constructible] - public EmptyVialsWRack() : base(0x185B) => Weight = 1.0; + public EmptyVialsWRack() : base(0x185B) + { + } + + public override double DefaultWeight => 1.0; } [Flippable(0x185D, 0x185E)] @@ -281,33 +433,53 @@ public partial class EmptyVialsWRack : Item public partial class FullVialsWRack : Item { [Constructible] - public FullVialsWRack() : base(0x185D) => Weight = 1.0; + public FullVialsWRack() : base(0x185D) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class EmptyVial : Item { [Constructible] - public EmptyVial() : base(0x0E24) => Weight = 1.0; + public EmptyVial() : base(0x0E24) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class HourglassAni : Item { [Constructible] - public HourglassAni() : base(0x1811) => Weight = 1.0; + public HourglassAni() : base(0x1811) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class Hourglass : Item { [Constructible] - public Hourglass() : base(0x1810) => Weight = 1.0; + public Hourglass() : base(0x1810) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class TinyRedBottle : Item { [Constructible] - public TinyRedBottle() : base(0x0F04) => Weight = 1.0; + public TinyRedBottle() : base(0x0F04) + { + } + + public override double DefaultWeight => 1.0; } diff --git a/Projects/UOContent/Items/Misc/HairDye.cs b/Projects/UOContent/Items/Misc/HairDye.cs index 2693250a0..c32e1aa4d 100644 --- a/Projects/UOContent/Items/Misc/HairDye.cs +++ b/Projects/UOContent/Items/Misc/HairDye.cs @@ -9,7 +9,11 @@ namespace Server.Items; public partial class HairDye : Item { [Constructible] - public HairDye() : base(0xEFF) => Weight = 1.0; + public HairDye() : base(0xEFF) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1041060; // Hair Dye diff --git a/Projects/UOContent/Items/Misc/PlayerVendorDeed.cs b/Projects/UOContent/Items/Misc/PlayerVendorDeed.cs index cf864bce6..fb5b0a4e9 100644 --- a/Projects/UOContent/Items/Misc/PlayerVendorDeed.cs +++ b/Projects/UOContent/Items/Misc/PlayerVendorDeed.cs @@ -8,7 +8,11 @@ namespace Server.Items; public partial class ContractOfEmployment : Item { [Constructible] - public ContractOfEmployment() : base(0x14F0) => Weight = 1.0; + public ContractOfEmployment() : base(0x14F0) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1041243; // a contract of employment diff --git a/Projects/UOContent/Items/Misc/PowerCrystal.cs b/Projects/UOContent/Items/Misc/PowerCrystal.cs index 7d43ed5af..650a512ee 100644 --- a/Projects/UOContent/Items/Misc/PowerCrystal.cs +++ b/Projects/UOContent/Items/Misc/PowerCrystal.cs @@ -6,7 +6,11 @@ namespace Server.Items; public partial class PowerCrystal : Item { [Constructible] - public PowerCrystal() : base(0x1F1C) => Weight = 1.0; + public PowerCrystal() : base(0x1F1C) + { + } + + public override double DefaultWeight => 1.0; public override string DefaultName => "power crystal"; diff --git a/Projects/UOContent/Items/Misc/Rares.cs b/Projects/UOContent/Items/Misc/Rares.cs index 2a23a7cc7..a5a0c6201 100644 --- a/Projects/UOContent/Items/Misc/Rares.cs +++ b/Projects/UOContent/Items/Misc/Rares.cs @@ -128,82 +128,130 @@ public partial class ForgedMetal : Item public partial class Whip : Item { [Constructible] - public Whip() : base(0x166E) => Weight = 1.0; + public Whip() : base(0x166E) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class PaintsAndBrush : Item { [Constructible] - public PaintsAndBrush() : base(0xFC1) => Weight = 1.0; + public PaintsAndBrush() : base(0xFC1) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class PenAndInk : Item { [Constructible] - public PenAndInk() : base(0xFBF) => Weight = 1.0; + public PenAndInk() : base(0xFBF) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0)] public partial class ChiselsNorth : Item { [Constructible] - public ChiselsNorth() : base(0x1026) => Weight = 1.0; + public ChiselsNorth() : base(0x1026) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0)] public partial class ChiselsWest : Item { [Constructible] - public ChiselsWest() : base(0x1027) => Weight = 1.0; + public ChiselsWest() : base(0x1027) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0)] public partial class DirtyPan : Item { [Constructible] - public DirtyPan() : base(0x9E8) => Weight = 1.0; + public DirtyPan() : base(0x9E8) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0)] public partial class DirtySmallRoundPot : Item { [Constructible] - public DirtySmallRoundPot() : base(0x9E7) => Weight = 1.0; + public DirtySmallRoundPot() : base(0x9E7) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0)] public partial class DirtyPot : Item { [Constructible] - public DirtyPot() : base(0x9E6) => Weight = 1.0; + public DirtyPot() : base(0x9E6) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0)] public partial class DirtyRoundPot : Item { [Constructible] - public DirtyRoundPot() : base(0x9DF) => Weight = 1.0; + public DirtyRoundPot() : base(0x9DF) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0)] public partial class DirtyFrypan : Item { [Constructible] - public DirtyFrypan() : base(0x9DE) => Weight = 1.0; + public DirtyFrypan() : base(0x9DE) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0)] public partial class DirtySmallPot : Item { [Constructible] - public DirtySmallPot() : base(0x9DD) => Weight = 1.0; + public DirtySmallPot() : base(0x9DD) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0)] public partial class DirtyKettle : Item { [Constructible] - public DirtyKettle() : base(0x9DC) => Weight = 1.0; + public DirtyKettle() : base(0x9DC) + { + } + + public override double DefaultWeight => 1.0; } diff --git a/Projects/UOContent/Items/Skill Items/Carpenter Items/TaxidermyKit.cs b/Projects/UOContent/Items/Skill Items/Carpenter Items/TaxidermyKit.cs index c33cf6980..8915c06f1 100644 --- a/Projects/UOContent/Items/Skill Items/Carpenter Items/TaxidermyKit.cs +++ b/Projects/UOContent/Items/Skill Items/Carpenter Items/TaxidermyKit.cs @@ -22,7 +22,11 @@ public partial class TaxidermyKit : Item }; [Constructible] - public TaxidermyKit() : base(0x1EBA) => Weight = 1.0; + public TaxidermyKit() : base(0x1EBA) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1041279; // a taxidermy kit diff --git a/Projects/UOContent/Items/Skill Items/Musical Instruments/Tambourine.cs b/Projects/UOContent/Items/Skill Items/Musical Instruments/Tambourine.cs index 3e768b929..e2d77530a 100644 --- a/Projects/UOContent/Items/Skill Items/Musical Instruments/Tambourine.cs +++ b/Projects/UOContent/Items/Skill Items/Musical Instruments/Tambourine.cs @@ -6,5 +6,9 @@ namespace Server.Items; public partial class Tambourine : BaseInstrument { [Constructible] - public Tambourine() : base(0xE9D, 0x52, 0x53) => Weight = 1.0; + public Tambourine() : base(0xE9D, 0x52, 0x53) + { + } + + public override double DefaultWeight => 1.0; } diff --git a/Projects/UOContent/Items/Skill Items/Musical Instruments/TambourineTassel.cs b/Projects/UOContent/Items/Skill Items/Musical Instruments/TambourineTassel.cs index 7f4a5a951..ed54c07c9 100644 --- a/Projects/UOContent/Items/Skill Items/Musical Instruments/TambourineTassel.cs +++ b/Projects/UOContent/Items/Skill Items/Musical Instruments/TambourineTassel.cs @@ -6,5 +6,9 @@ namespace Server.Items; public partial class TambourineTassel : BaseInstrument { [Constructible] - public TambourineTassel() : base(0xE9E, 0x52, 0x53) => Weight = 1.0; + public TambourineTassel() : base(0xE9E, 0x52, 0x53) + { + } + + public override double DefaultWeight => 1.0; } diff --git a/Projects/UOContent/Items/Skill Items/Specialized/GlassblowingBook.cs b/Projects/UOContent/Items/Skill Items/Specialized/GlassblowingBook.cs index 4ce98103d..4584259dc 100644 --- a/Projects/UOContent/Items/Skill Items/Specialized/GlassblowingBook.cs +++ b/Projects/UOContent/Items/Skill Items/Specialized/GlassblowingBook.cs @@ -7,7 +7,11 @@ namespace Server.Items; public partial class GlassblowingBook : Item { [Constructible] - public GlassblowingBook() : base(0xFF4) => Weight = 1.0; + public GlassblowingBook() : base(0xFF4) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1153528; // Crafting glass with Glassblowing diff --git a/Projects/UOContent/Items/Skill Items/Specialized/MasonryBook.cs b/Projects/UOContent/Items/Skill Items/Specialized/MasonryBook.cs index 57425ad2a..28de22d89 100644 --- a/Projects/UOContent/Items/Skill Items/Specialized/MasonryBook.cs +++ b/Projects/UOContent/Items/Skill Items/Specialized/MasonryBook.cs @@ -7,7 +7,11 @@ namespace Server.Items; public partial class MasonryBook : Item { [Constructible] - public MasonryBook() : base(0xFBE) => Weight = 1.0; + public MasonryBook() : base(0xFBE) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1153527; // Making valuables with Stonecrafting diff --git a/Projects/UOContent/Items/Skill Items/Specialized/SandMiningBook.cs b/Projects/UOContent/Items/Skill Items/Specialized/SandMiningBook.cs index ec18441ea..5a7642f83 100644 --- a/Projects/UOContent/Items/Skill Items/Specialized/SandMiningBook.cs +++ b/Projects/UOContent/Items/Skill Items/Specialized/SandMiningBook.cs @@ -7,7 +7,11 @@ namespace Server.Items; public partial class SandMiningBook : Item { [Constructible] - public SandMiningBook() : base(0xFF4) => Weight = 1.0; + public SandMiningBook() : base(0xFF4) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1153531; // Find Glass-Quality Sand public override void OnDoubleClick(Mobile from) diff --git a/Projects/UOContent/Items/Skill Items/Specialized/StoneMiningBook.cs b/Projects/UOContent/Items/Skill Items/Specialized/StoneMiningBook.cs index 5af88288b..4955c8306 100644 --- a/Projects/UOContent/Items/Skill Items/Specialized/StoneMiningBook.cs +++ b/Projects/UOContent/Items/Skill Items/Specialized/StoneMiningBook.cs @@ -7,7 +7,11 @@ namespace Server.Items; public partial class StoneMiningBook : Item { [Constructible] - public StoneMiningBook() : base(0xFBE) => Weight = 1.0; + public StoneMiningBook() : base(0xFBE) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1153530; // Mining For Quality Stone diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Scissors.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Scissors.cs index afd5b9e23..1d0863bab 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Scissors.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Scissors.cs @@ -13,7 +13,11 @@ public interface IScissorable public partial class Scissors : Item { [Constructible] - public Scissors() : base(0xF9F) => Weight = 1.0; + public Scissors() : base(0xF9F) + { + } + + public override double DefaultWeight => 1.0; public override void OnDoubleClick(Mobile from) { diff --git a/Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs b/Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs index 1de601118..ef4435bf6 100644 --- a/Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs +++ b/Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs @@ -17,7 +17,11 @@ public partial class DisguiseKit : Item public override int LabelNumber => 1041078; // a disguise kit [Constructible] - public DisguiseKit() : base(0xE05) => Weight = 1.0; + public DisguiseKit() : base(0xE05) + { + } + + public override double DefaultWeight => 1.0; public bool ValidateUse(Mobile from) { diff --git a/Projects/UOContent/Items/Skill Items/Tinkering/Clocks.cs b/Projects/UOContent/Items/Skill Items/Tinkering/Clocks.cs index 46b1dfd5b..82ca1e0d6 100644 --- a/Projects/UOContent/Items/Skill Items/Tinkering/Clocks.cs +++ b/Projects/UOContent/Items/Skill Items/Tinkering/Clocks.cs @@ -25,7 +25,11 @@ public partial class Clock : Item private static readonly DateTime WorldStart = new(1997, 9, 1); [Constructible] - public Clock(int itemID = 0x104B) : base(itemID) => Weight = 3.0; + public Clock(int itemID = 0x104B) : base(itemID) + { + } + + public override double DefaultWeight => 3.0; public static DateTime ServerStart { get; private set; } diff --git a/Projects/UOContent/Items/Skill Items/Tinkering/Utensils.cs b/Projects/UOContent/Items/Skill Items/Tinkering/Utensils.cs index c9449a6ed..0f26e6b73 100644 --- a/Projects/UOContent/Items/Skill Items/Tinkering/Utensils.cs +++ b/Projects/UOContent/Items/Skill Items/Tinkering/Utensils.cs @@ -7,21 +7,33 @@ namespace Server.Items; public partial class Fork : Item { [Constructible] - public Fork() : base(0x9F4) => Weight = 1.0; + public Fork() : base(0x9F4) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class ForkLeft : Item { [Constructible] - public ForkLeft() : base(0x9F4) => Weight = 1.0; + public ForkLeft() : base(0x9F4) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class ForkRight : Item { [Constructible] - public ForkRight() : base(0x9F5) => Weight = 1.0; + public ForkRight() : base(0x9F5) + { + } + + public override double DefaultWeight => 1.0; } [Flippable(0x9F8, 0x9F9, 0x9C2, 0x9C3)] @@ -29,21 +41,33 @@ public partial class ForkRight : Item public partial class Spoon : Item { [Constructible] - public Spoon() : base(0x9F8) => Weight = 1.0; + public Spoon() : base(0x9F8) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class SpoonLeft : Item { [Constructible] - public SpoonLeft() : base(0x9F8) => Weight = 1.0; + public SpoonLeft() : base(0x9F8) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class SpoonRight : Item { [Constructible] - public SpoonRight() : base(0x9F9) => Weight = 1.0; + public SpoonRight() : base(0x9F9) + { + } + + public override double DefaultWeight => 1.0; } [Flippable(0x9F6, 0x9F7, 0x9A5, 0x9A6)] @@ -51,26 +75,42 @@ public partial class SpoonRight : Item public partial class Knife : Item { [Constructible] - public Knife() : base(0x9F6) => Weight = 1.0; + public Knife() : base(0x9F6) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class KnifeLeft : Item { [Constructible] - public KnifeLeft() : base(0x9F6) => Weight = 1.0; + public KnifeLeft() : base(0x9F6) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class KnifeRight : Item { [Constructible] - public KnifeRight() : base(0x9F7) => Weight = 1.0; + public KnifeRight() : base(0x9F7) + { + } + + public override double DefaultWeight => 1.0; } [SerializationGenerator(0, false)] public partial class Plate : Item { [Constructible] - public Plate() : base(0x9D7) => Weight = 1.0; + public Plate() : base(0x9D7) + { + } + + public override double DefaultWeight => 1.0; } diff --git a/Projects/UOContent/Items/Skill Items/Tools/DrawKnife.cs b/Projects/UOContent/Items/Skill Items/Tools/DrawKnife.cs index 397d92975..574861433 100644 --- a/Projects/UOContent/Items/Skill Items/Tools/DrawKnife.cs +++ b/Projects/UOContent/Items/Skill Items/Tools/DrawKnife.cs @@ -7,10 +7,16 @@ namespace Server.Items; public partial class DrawKnife : BaseTool { [Constructible] - public DrawKnife() : base(0x10E4) => Weight = 1.0; + public DrawKnife() : base(0x10E4) + { + } [Constructible] - public DrawKnife(int uses) : base(uses, 0x10E4) => Weight = 1.0; + public DrawKnife(int uses) : base(uses, 0x10E4) + { + } + + public override double DefaultWeight => 1.0; public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; } diff --git a/Projects/UOContent/Items/Skill Items/Tools/FlourSifter.cs b/Projects/UOContent/Items/Skill Items/Tools/FlourSifter.cs index 0794a4aef..33149c8f7 100644 --- a/Projects/UOContent/Items/Skill Items/Tools/FlourSifter.cs +++ b/Projects/UOContent/Items/Skill Items/Tools/FlourSifter.cs @@ -7,10 +7,16 @@ namespace Server.Items; public partial class FlourSifter : BaseTool { [Constructible] - public FlourSifter() : base(0x103E) => Weight = 1.0; + public FlourSifter() : base(0x103E) + { + } [Constructible] - public FlourSifter(int uses) : base(uses, 0x103E) => Weight = 1.0; + public FlourSifter(int uses) : base(uses, 0x103E) + { + } + + public override double DefaultWeight => 1.0; public override CraftSystem CraftSystem => DefCooking.CraftSystem; } diff --git a/Projects/UOContent/Items/Skill Items/Tools/Froe.cs b/Projects/UOContent/Items/Skill Items/Tools/Froe.cs index 3658db1f2..4ecb00594 100644 --- a/Projects/UOContent/Items/Skill Items/Tools/Froe.cs +++ b/Projects/UOContent/Items/Skill Items/Tools/Froe.cs @@ -7,10 +7,16 @@ namespace Server.Items; public partial class Froe : BaseTool { [Constructible] - public Froe() : base(0x10E5) => Weight = 1.0; + public Froe() : base(0x10E5) + { + } [Constructible] - public Froe(int uses) : base(uses, 0x10E5) => Weight = 1.0; + public Froe(int uses) : base(uses, 0x10E5) + { + } + + public override double DefaultWeight => 1.0; public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; } diff --git a/Projects/UOContent/Items/Skill Items/Tools/Inshave.cs b/Projects/UOContent/Items/Skill Items/Tools/Inshave.cs index 48631a9d3..32e5eed36 100644 --- a/Projects/UOContent/Items/Skill Items/Tools/Inshave.cs +++ b/Projects/UOContent/Items/Skill Items/Tools/Inshave.cs @@ -7,10 +7,16 @@ namespace Server.Items; public partial class Inshave : BaseTool { [Constructible] - public Inshave() : base(0x10E6) => Weight = 1.0; + public Inshave() : base(0x10E6) + { + } [Constructible] - public Inshave(int uses) : base(uses, 0x10E6) => Weight = 1.0; + public Inshave(int uses) : base(uses, 0x10E6) + { + } + + public override double DefaultWeight => 1.0; public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; } diff --git a/Projects/UOContent/Items/Skill Items/Tools/MalletAndChisel.cs b/Projects/UOContent/Items/Skill Items/Tools/MalletAndChisel.cs index 5a890e07b..1e35ff142 100644 --- a/Projects/UOContent/Items/Skill Items/Tools/MalletAndChisel.cs +++ b/Projects/UOContent/Items/Skill Items/Tools/MalletAndChisel.cs @@ -7,10 +7,16 @@ namespace Server.Items; public partial class MalletAndChisel : BaseTool { [Constructible] - public MalletAndChisel() : base(0x12B3) => Weight = 1.0; + public MalletAndChisel() : base(0x12B3) + { + } [Constructible] - public MalletAndChisel(int uses) : base(uses, 0x12B3) => Weight = 1.0; + public MalletAndChisel(int uses) : base(uses, 0x12B3) + { + } + + public override double DefaultWeight => 1.0; public override CraftSystem CraftSystem => DefMasonry.CraftSystem; } diff --git a/Projects/UOContent/Items/Skill Items/Tools/MapmakersPen.cs b/Projects/UOContent/Items/Skill Items/Tools/MapmakersPen.cs index edf1e2b6c..dd263e7d5 100644 --- a/Projects/UOContent/Items/Skill Items/Tools/MapmakersPen.cs +++ b/Projects/UOContent/Items/Skill Items/Tools/MapmakersPen.cs @@ -8,10 +8,16 @@ namespace Server.Items; public partial class MapmakersPen : BaseTool { [Constructible] - public MapmakersPen() : base(0x0FBF) => Weight = 1.0; + public MapmakersPen() : base(0x0FBF) + { + } [Constructible] - public MapmakersPen(int uses) : base(uses, 0x0FBF) => Weight = 1.0; + public MapmakersPen(int uses) : base(uses, 0x0FBF) + { + } + + public override double DefaultWeight => 1.0; public override CraftSystem CraftSystem => DefCartography.CraftSystem; diff --git a/Projects/UOContent/Items/Skill Items/Tools/MortarPestle.cs b/Projects/UOContent/Items/Skill Items/Tools/MortarPestle.cs index 9ed61e088..8c13f724e 100644 --- a/Projects/UOContent/Items/Skill Items/Tools/MortarPestle.cs +++ b/Projects/UOContent/Items/Skill Items/Tools/MortarPestle.cs @@ -7,10 +7,16 @@ namespace Server.Items; public partial class MortarPestle : BaseTool { [Constructible] - public MortarPestle() : base(0xE9B) => Weight = 1.0; + public MortarPestle() : base(0xE9B) + { + } [Constructible] - public MortarPestle(int uses) : base(uses, 0xE9B) => Weight = 1.0; + public MortarPestle(int uses) : base(uses, 0xE9B) + { + } + + public override double DefaultWeight => 1.0; public override CraftSystem CraftSystem => DefAlchemy.CraftSystem; } diff --git a/Projects/UOContent/Items/Skill Items/Tools/RollingPin.cs b/Projects/UOContent/Items/Skill Items/Tools/RollingPin.cs index 794e85522..a74bd6ac3 100644 --- a/Projects/UOContent/Items/Skill Items/Tools/RollingPin.cs +++ b/Projects/UOContent/Items/Skill Items/Tools/RollingPin.cs @@ -7,10 +7,16 @@ namespace Server.Items; public partial class RollingPin : BaseTool { [Constructible] - public RollingPin() : base(0x1043) => Weight = 1.0; + public RollingPin() : base(0x1043) + { + } [Constructible] - public RollingPin(int uses) : base(uses, 0x1043) => Weight = 1.0; + public RollingPin(int uses) : base(uses, 0x1043) + { + } + + public override double DefaultWeight => 1.0; public override CraftSystem CraftSystem => DefCooking.CraftSystem; } diff --git a/Projects/UOContent/Items/Skill Items/Tools/Scorp.cs b/Projects/UOContent/Items/Skill Items/Tools/Scorp.cs index d6678a2c9..d495d9b82 100644 --- a/Projects/UOContent/Items/Skill Items/Tools/Scorp.cs +++ b/Projects/UOContent/Items/Skill Items/Tools/Scorp.cs @@ -7,10 +7,16 @@ namespace Server.Items; public partial class Scorp : BaseTool { [Constructible] - public Scorp() : base(0x10E7) => Weight = 1.0; + public Scorp() : base(0x10E7) + { + } [Constructible] - public Scorp(int uses) : base(uses, 0x10E7) => Weight = 1.0; + public Scorp(int uses) : base(uses, 0x10E7) + { + } + + public override double DefaultWeight => 1.0; public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; } diff --git a/Projects/UOContent/Items/Skill Items/Tools/ScribesPen.cs b/Projects/UOContent/Items/Skill Items/Tools/ScribesPen.cs index 2eb9c2ae4..224632da2 100644 --- a/Projects/UOContent/Items/Skill Items/Tools/ScribesPen.cs +++ b/Projects/UOContent/Items/Skill Items/Tools/ScribesPen.cs @@ -8,10 +8,16 @@ namespace Server.Items; public partial class ScribesPen : BaseTool { [Constructible] - public ScribesPen() : base(0x0FBF) => Weight = 1.0; + public ScribesPen() : base(0x0FBF) + { + } [Constructible] - public ScribesPen(int uses) : base(uses, 0x0FBF) => Weight = 1.0; + public ScribesPen(int uses) : base(uses, 0x0FBF) + { + } + + public override double DefaultWeight => 1.0; public override CraftSystem CraftSystem => DefInscription.CraftSystem; diff --git a/Projects/UOContent/Items/Skill Items/Tools/Skillet.cs b/Projects/UOContent/Items/Skill Items/Tools/Skillet.cs index f9278ce38..851e0a726 100644 --- a/Projects/UOContent/Items/Skill Items/Tools/Skillet.cs +++ b/Projects/UOContent/Items/Skill Items/Tools/Skillet.cs @@ -7,10 +7,16 @@ namespace Server.Items; public partial class Skillet : BaseTool { [Constructible] - public Skillet() : base(0x97F) => Weight = 1.0; + public Skillet() : base(0x97F) + { + } [Constructible] - public Skillet(int uses) : base(uses, 0x97F) => Weight = 1.0; + public Skillet(int uses) : base(uses, 0x97F) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1044567; // skillet diff --git a/Projects/UOContent/Items/Skill Items/Tools/SmoothingPlane.cs b/Projects/UOContent/Items/Skill Items/Tools/SmoothingPlane.cs index 13487dffe..6131b86a9 100644 --- a/Projects/UOContent/Items/Skill Items/Tools/SmoothingPlane.cs +++ b/Projects/UOContent/Items/Skill Items/Tools/SmoothingPlane.cs @@ -8,10 +8,16 @@ namespace Server.Items; public partial class SmoothingPlane : BaseTool { [Constructible] - public SmoothingPlane() : base(0x1032) => Weight = 1.0; + public SmoothingPlane() : base(0x1032) + { + } [Constructible] - public SmoothingPlane(int uses) : base(uses, 0x1032) => Weight = 1.0; + public SmoothingPlane(int uses) : base(uses, 0x1032) + { + } + + public override double DefaultWeight => 1.0; public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; } diff --git a/Projects/UOContent/Items/Skill Items/Tools/TinkerTools.cs b/Projects/UOContent/Items/Skill Items/Tools/TinkerTools.cs index d6f9fc4b8..bd85b875c 100644 --- a/Projects/UOContent/Items/Skill Items/Tools/TinkerTools.cs +++ b/Projects/UOContent/Items/Skill Items/Tools/TinkerTools.cs @@ -8,10 +8,16 @@ namespace Server.Items; public partial class TinkerTools : BaseTool { [Constructible] - public TinkerTools() : base(0x1EB8) => Weight = 1.0; + public TinkerTools() : base(0x1EB8) + { + } [Constructible] - public TinkerTools(int uses) : base(uses, 0x1EB8) => Weight = 1.0; + public TinkerTools(int uses) : base(uses, 0x1EB8) + { + } + + public override double DefaultWeight => 1.0; public override CraftSystem CraftSystem => DefTinkering.CraftSystem; } @@ -20,10 +26,16 @@ public partial class TinkerTools : BaseTool public partial class TinkersTools : BaseTool { [Constructible] - public TinkersTools() : base(0x1EBC) => Weight = 1.0; + public TinkersTools() : base(0x1EBC) + { + } [Constructible] - public TinkersTools(int uses) : base(uses, 0x1EBC) => Weight = 1.0; + public TinkersTools(int uses) : base(uses, 0x1EBC) + { + } + + public override double DefaultWeight => 1.0; public override CraftSystem CraftSystem => DefTinkering.CraftSystem; -} \ No newline at end of file +} diff --git a/Projects/UOContent/Items/Special/Holiday/HolidayTimepiece.cs b/Projects/UOContent/Items/Special/Holiday/HolidayTimepiece.cs index e7b6d76b3..085e60e94 100644 --- a/Projects/UOContent/Items/Special/Holiday/HolidayTimepiece.cs +++ b/Projects/UOContent/Items/Special/Holiday/HolidayTimepiece.cs @@ -8,7 +8,6 @@ public partial class HolidayTimepiece : Clock [Constructible] public HolidayTimepiece() : base(0x1086) { - Weight = DefaultWeight; LootType = LootType.Blessed; Layer = Layer.Bracelet; } diff --git a/Projects/UOContent/Items/Special/Holiday/WristWatch.cs b/Projects/UOContent/Items/Special/Holiday/WristWatch.cs index 62dc9e1d0..6df024187 100644 --- a/Projects/UOContent/Items/Special/Holiday/WristWatch.cs +++ b/Projects/UOContent/Items/Special/Holiday/WristWatch.cs @@ -8,7 +8,6 @@ public partial class WristWatch : Clock [Constructible] public WristWatch() : base(0x1086) { - Weight = DefaultWeight; LootType = LootType.Blessed; Layer = Layer.Bracelet; } diff --git a/Projects/UOContent/Items/Special/ML/GrizzledMareStatuette.cs b/Projects/UOContent/Items/Special/ML/GrizzledMareStatuette.cs index 171ef0649..32ed9eda0 100644 --- a/Projects/UOContent/Items/Special/ML/GrizzledMareStatuette.cs +++ b/Projects/UOContent/Items/Special/ML/GrizzledMareStatuette.cs @@ -7,7 +7,11 @@ namespace Server.Items; public partial class GrizzledMareStatuette : BaseImprisonedMobile { [Constructible] - public GrizzledMareStatuette() : base(0x2617) => Weight = 1.0; + public GrizzledMareStatuette() : base(0x2617) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1074475; // Grizzled Mare Statuette public override BaseCreature Summon => new GrizzledMare(); diff --git a/Projects/UOContent/Items/Special/ML/MinotaurHedge.cs b/Projects/UOContent/Items/Special/ML/MinotaurHedge.cs index 593a6586d..fb25317f0 100644 --- a/Projects/UOContent/Items/Special/ML/MinotaurHedge.cs +++ b/Projects/UOContent/Items/Special/ML/MinotaurHedge.cs @@ -6,7 +6,11 @@ namespace Server.Items; public partial class MinotaurHedge : Item { [Constructible] - public MinotaurHedge() : base(Utility.Random(3215, 4)) => Weight = 1.0; + public MinotaurHedge() : base(Utility.Random(3215, 4)) + { + } + + public override double DefaultWeight => 1.0; public override string DefaultName => "minotaur hedge"; } diff --git a/Projects/UOContent/Items/Special/ML/TormentedChains.cs b/Projects/UOContent/Items/Special/ML/TormentedChains.cs index a8d8a5f00..784da5d2e 100644 --- a/Projects/UOContent/Items/Special/ML/TormentedChains.cs +++ b/Projects/UOContent/Items/Special/ML/TormentedChains.cs @@ -6,5 +6,9 @@ namespace Server.Items; public partial class TormentedChains : Item { [Constructible] - public TormentedChains() : base(Utility.Random(6663, 2)) => Weight = 1.0; + public TormentedChains() : base(Utility.Random(6663, 2)) + { + } + + public override double DefaultWeight => 1.0; } diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/StoneAnkh.cs b/Projects/UOContent/Items/Special/Veteran Rewards/StoneAnkh.cs index 0cee61cf5..7d2508903 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/StoneAnkh.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/StoneAnkh.cs @@ -9,7 +9,11 @@ namespace Server.Items; [SerializationGenerator(0)] public partial class StoneAnkhComponent : AddonComponent { - public StoneAnkhComponent(int itemID) : base(itemID) => Weight = 1.0; + public StoneAnkhComponent(int itemID) : base(itemID) + { + } + + public override double DefaultWeight => 1.0; public override bool ForceShowProperties => ObjectPropertyList.Enabled; diff --git a/Projects/UOContent/Items/Talismans/Items/EnchantedSwitch.cs b/Projects/UOContent/Items/Talismans/Items/EnchantedSwitch.cs index 0258a5feb..b7ed6829b 100644 --- a/Projects/UOContent/Items/Talismans/Items/EnchantedSwitch.cs +++ b/Projects/UOContent/Items/Talismans/Items/EnchantedSwitch.cs @@ -6,7 +6,11 @@ namespace Server.Items; public partial class EnchantedSwitch : Item { [Constructible] - public EnchantedSwitch() : base(0x2F5C) => Weight = 1.0; + public EnchantedSwitch() : base(0x2F5C) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1072893; // enchanted switch } diff --git a/Projects/UOContent/Items/Talismans/Items/HollowPrism.cs b/Projects/UOContent/Items/Talismans/Items/HollowPrism.cs index 7f58dcfa5..723afa349 100644 --- a/Projects/UOContent/Items/Talismans/Items/HollowPrism.cs +++ b/Projects/UOContent/Items/Talismans/Items/HollowPrism.cs @@ -6,7 +6,11 @@ namespace Server.Items; public partial class HollowPrism : Item { [Constructible] - public HollowPrism() : base(0x2F5D) => Weight = 1.0; + public HollowPrism() : base(0x2F5D) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1072895; // hollow prism } diff --git a/Projects/UOContent/Items/Talismans/Items/JeweledFiligree.cs b/Projects/UOContent/Items/Talismans/Items/JeweledFiligree.cs index 8164dc22e..042ffa032 100644 --- a/Projects/UOContent/Items/Talismans/Items/JeweledFiligree.cs +++ b/Projects/UOContent/Items/Talismans/Items/JeweledFiligree.cs @@ -6,7 +6,11 @@ namespace Server.Items; public partial class JeweledFiligree : Item { [Constructible] - public JeweledFiligree() : base(0x2F5E) => Weight = 1.0; + public JeweledFiligree() : base(0x2F5E) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1072894; // jeweled filigree } diff --git a/Projects/UOContent/Items/Talismans/Items/RunedPrism.cs b/Projects/UOContent/Items/Talismans/Items/RunedPrism.cs index af7429967..dc8791966 100644 --- a/Projects/UOContent/Items/Talismans/Items/RunedPrism.cs +++ b/Projects/UOContent/Items/Talismans/Items/RunedPrism.cs @@ -6,7 +6,11 @@ namespace Server.Items; public partial class RunedPrism : Item { [Constructible] - public RunedPrism() : base(0x2F57) => Weight = 1.0; + public RunedPrism() : base(0x2F57) + { + } + + public override double DefaultWeight => 1.0; public override int LabelNumber => 1073465; // runed prism } diff --git a/Projects/UOContent/Items/Talismans/Items/RunedSwitch.cs b/Projects/UOContent/Items/Talismans/Items/RunedSwitch.cs index bc1c741c4..0c4bdec4d 100644 --- a/Projects/UOContent/Items/Talismans/Items/RunedSwitch.cs +++ b/Projects/UOContent/Items/Talismans/Items/RunedSwitch.cs @@ -7,7 +7,11 @@ namespace Server.Items; public partial class RunedSwitch : Item { [Constructible] - public RunedSwitch() : base(0x2F61) => Weight = 1.0; + public RunedSwitch() : base(0x2F61) + { + } + + public override double DefaultWeight => 1.0; public RunedSwitch(Serial serial) : base(serial) { diff --git a/Projects/UOContent/Items/Weapons/Knives/ButcherKnife.cs b/Projects/UOContent/Items/Weapons/Knives/ButcherKnife.cs index 19743996b..d9c9f957f 100644 --- a/Projects/UOContent/Items/Weapons/Knives/ButcherKnife.cs +++ b/Projects/UOContent/Items/Weapons/Knives/ButcherKnife.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class ButcherKnife : BaseKnife { [Constructible] - public ButcherKnife() : base(0x13F6) => Weight = 1.0; + public ButcherKnife() : base(0x13F6) + { + } + + public override double DefaultWeight => 1.0; public override WeaponAbility PrimaryAbility => WeaponAbility.InfectiousStrike; public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm; diff --git a/Projects/UOContent/Items/Weapons/Knives/Dagger.cs b/Projects/UOContent/Items/Weapons/Knives/Dagger.cs index fadcb7daf..8daa9d216 100644 --- a/Projects/UOContent/Items/Weapons/Knives/Dagger.cs +++ b/Projects/UOContent/Items/Weapons/Knives/Dagger.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class Dagger : BaseKnife { [Constructible] - public Dagger() : base(0xF52) => Weight = 1.0; + public Dagger() : base(0xF52) + { + } + + public override double DefaultWeight => 1.0; public override WeaponAbility PrimaryAbility => WeaponAbility.InfectiousStrike; public override WeaponAbility SecondaryAbility => WeaponAbility.ShadowStrike; diff --git a/Projects/UOContent/Items/Weapons/Knives/SkinningKnife.cs b/Projects/UOContent/Items/Weapons/Knives/SkinningKnife.cs index dedd24265..c47c45a8c 100644 --- a/Projects/UOContent/Items/Weapons/Knives/SkinningKnife.cs +++ b/Projects/UOContent/Items/Weapons/Knives/SkinningKnife.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class SkinningKnife : BaseKnife { [Constructible] - public SkinningKnife() : base(0xEC4) => Weight = 1.0; + public SkinningKnife() : base(0xEC4) + { + } + + public override double DefaultWeight => 1.0; public override WeaponAbility PrimaryAbility => WeaponAbility.ShadowStrike; public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm; diff --git a/Projects/UOContent/Items/Weapons/Maces/MagicWand.cs b/Projects/UOContent/Items/Weapons/Maces/MagicWand.cs index 31e92e79f..76549be8f 100644 --- a/Projects/UOContent/Items/Weapons/Maces/MagicWand.cs +++ b/Projects/UOContent/Items/Weapons/Maces/MagicWand.cs @@ -6,7 +6,11 @@ namespace Server.Items public partial class MagicWand : BaseBashing { [Constructible] - public MagicWand() : base(0xDF2) => Weight = 1.0; + public MagicWand() : base(0xDF2) + { + } + + public override double DefaultWeight => 1.0; public override WeaponAbility PrimaryAbility => WeaponAbility.Dismount; public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm; diff --git a/Projects/UOContent/Items/Weapons/Swords/CrescentBlade.cs b/Projects/UOContent/Items/Weapons/Swords/CrescentBlade.cs index 7bb7f1470..5853f4a48 100644 --- a/Projects/UOContent/Items/Weapons/Swords/CrescentBlade.cs +++ b/Projects/UOContent/Items/Weapons/Swords/CrescentBlade.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class CrescentBlade : BaseSword { [Constructible] - public CrescentBlade() : base(0x26C1) => Weight = 1.0; + public CrescentBlade() : base(0x26C1) + { + } + + public override double DefaultWeight => 1.0; public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike; public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike; diff --git a/Projects/UOContent/Items/Weapons/Swords/ThinLongsword.cs b/Projects/UOContent/Items/Weapons/Swords/ThinLongsword.cs index 0e17985ca..6d0a4a97a 100644 --- a/Projects/UOContent/Items/Weapons/Swords/ThinLongsword.cs +++ b/Projects/UOContent/Items/Weapons/Swords/ThinLongsword.cs @@ -7,7 +7,11 @@ namespace Server.Items public partial class ThinLongsword : BaseSword { [Constructible] - public ThinLongsword() : base(0x13B8) => Weight = 1.0; + public ThinLongsword() : base(0x13B8) + { + } + + public override double DefaultWeight => 1.0; public override int AosStrengthReq => 35; public override int AosMinDamage => 15; diff --git a/Projects/UOContent/Multis/Camps/BaseCamp.cs b/Projects/UOContent/Multis/Camps/BaseCamp.cs index cd0354859..3b9cece2a 100644 --- a/Projects/UOContent/Multis/Camps/BaseCamp.cs +++ b/Projects/UOContent/Multis/Camps/BaseCamp.cs @@ -176,5 +176,9 @@ public abstract partial class BaseCamp : BaseMulti public partial class LockableBarrel : LockableContainer { [Constructible] - public LockableBarrel() : base(0xE77) => Weight = 1.0; + public LockableBarrel() : base(0xE77) + { + } + + public override double DefaultWeight => 1.0; }