fix: Optimizes items to use default weights. (Part 3) (#2242)

This commit is contained in:
Kamron Batman 2025-07-24 16:21:27 -07:00 • committed by GitHub
parent 2c5441731e
commit 40ba85d7b8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
104 changed files with 497 additions and 425 deletions

View file

@ -13,9 +13,10 @@ public partial class ArcaneGem : Item
public ArcaneGem() : base(0x1EA7)
{
Stackable = Core.ML;
Weight = 1.0;
}
public override double DefaultWeight => 1.0;
public override string DefaultName => "arcane gem";
public override void OnDoubleClick(Mobile from)

View file

@ -20,13 +20,14 @@ public partial class BankCheck : Item
[Constructible]
public BankCheck(int worth) : base(0x14F0)
{
Weight = 1.0;
Hue = 0x34;
LootType = LootType.Blessed;
_worth = worth;
}
public override double DefaultWeight => 1.0;
public override bool DisplayLootType => Core.AOS;
public override int LabelNumber => 1041361; // A bank check

View file

@ -8,8 +8,9 @@ public partial class Beeswax : Item
[Constructible]
public Beeswax(int amount = 1) : base(0x1422)
{
Weight = 1.0;
Stackable = true;
Amount = amount;
}
public override double DefaultWeight => 1.0;
}

View file

@ -12,11 +12,12 @@ public partial class Bola : Item
[Constructible]
public Bola(int amount = 1) : base(0x26AC)
{
Weight = 4.0;
Stackable = true;
Amount = amount;
}
public override double DefaultWeight => 4.0;
public override void OnDoubleClick(Mobile from)
{
if (!IsChildOf(from.Backpack))

View file

@ -8,9 +8,10 @@ public partial class BolaBall : Item
[Constructible]
public BolaBall(int amount = 1) : base(0xE73)
{
Weight = 4.0;
Stackable = true;
Amount = amount;
Hue = 0x8AC;
}
public override double DefaultWeight => 4.0;
}

View file

@ -34,10 +34,11 @@ public partial class ClockworkAssembly : Item
[Constructible]
public ClockworkAssembly() : base(0x1EA8)
{
Weight = 5.0;
Hue = 1102;
}
public override double DefaultWeight => 5.0;
public override int LabelNumber => 1073426; // Clockwork Assembly
public override void OnDoubleClick(Mobile from)

View file

@ -22,10 +22,11 @@ public partial class InteriorDecorator : Item
[Constructible]
public InteriorDecorator() : base(0xFC1)
{
Weight = 1.0;
LootType = LootType.Blessed;
}
public override double DefaultWeight => 1.0;
[CommandProperty(AccessLevel.GameMaster)]
public DecorateCommand Command
{

View file

@ -47,13 +47,13 @@ public partial class Key : Item
public Key(KeyType type, uint val = 0, Item link = null) : base((int)type)
{
Weight = 1.0;
_maxRange = 3;
_keyValue = val;
_link = link;
}
public override double DefaultWeight => 1.0;
public static uint RandomValue() => (uint)(0xFFFFFFFE * Utility.RandomDouble()) + 1;
public static void RemoveKeys(Mobile m, uint keyValue)

View file

@ -15,10 +15,11 @@ public partial class KeyRing : Item
[Constructible]
public KeyRing() : base(0x1011)
{
Weight = 1.0; // They seem to have no weight on OSI ?!
_keys = new List<Key>();
}
public override double DefaultWeight => 1.0;
public override bool OnDragDrop(Mobile from, Item dropped)
{
if (!IsChildOf(from.Backpack))

View file

@ -8,15 +8,10 @@ public partial class MinotaurArtifact : Item
[Constructible]
public MinotaurArtifact() : base(Utility.RandomList(0xB46, 0xB48, 0x9ED))
{
if (ItemID == 0x9ED)
{
Weight = 30;
}
LootType = LootType.Blessed;
Hue = 0x100;
}
public override int LabelNumber => 1074826; // Minotaur Artifact
public override double DefaultWeight => 5.0;
public override double DefaultWeight => ItemID == 0x9ED ? 30.0 : 5.0;
}

View file

@ -20,11 +20,9 @@ public partial class Moonstone : Item
private MoonstoneType _type;
[Constructible]
public Moonstone(MoonstoneType type) : base(0xF8B)
{
Weight = 1.0;
_type = type;
}
public Moonstone(MoonstoneType type) : base(0xF8B) => _type = type;
public override double DefaultWeight => 1.0;
public override int LabelNumber => 1041490 + (int)_type;

View file

@ -11,9 +11,10 @@ public abstract partial class PromotionalToken : Item
{
LootType = LootType.Blessed;
Light = LightType.Circle300;
Weight = 5.0;
}
public override double DefaultWeight => 5.0;
public abstract TextDefinition ItemName { get; }
public abstract TextDefinition ItemReceiveMessage { get; }
public abstract TextDefinition ItemGumpName { get; }

View file

@ -9,9 +9,10 @@ public partial class Rope : Item
public Rope(int amount = 1) : base(0x14F8)
{
Stackable = true;
Weight = 1.0;
Amount = amount;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -21,9 +22,10 @@ public partial class IronWire : Item
public IronWire(int amount = 1) : base(0x1876)
{
Stackable = true;
Weight = 5.0;
Amount = amount;
}
public override double DefaultWeight => 5.0;
}
[SerializationGenerator(0, false)]
@ -33,9 +35,10 @@ public partial class SilverWire : Item
public SilverWire(int amount = 1) : base(0x1877)
{
Stackable = true;
Weight = 5.0;
Amount = amount;
}
public override double DefaultWeight => 5.0;
}
[SerializationGenerator(0, false)]
@ -45,9 +48,10 @@ public partial class GoldWire : Item
public GoldWire(int amount = 1) : base(0x1878)
{
Stackable = true;
Weight = 5.0;
Amount = amount;
}
public override double DefaultWeight => 5.0;
}
[SerializationGenerator(0, false)]
@ -57,9 +61,10 @@ public partial class CopperWire : Item
public CopperWire(int amount = 1) : base(0x1879)
{
Stackable = true;
Weight = 5.0;
Amount = amount;
}
public override double DefaultWeight => 5.0;
}
[SerializationGenerator(0, false)]
@ -69,9 +74,10 @@ public partial class WhiteDriedFlowers : Item
public WhiteDriedFlowers(int amount = 1) : base(0xC3C)
{
Stackable = true;
Weight = 1.0;
Amount = amount;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -81,9 +87,10 @@ public partial class GreenDriedFlowers : Item
public GreenDriedFlowers(int amount = 1) : base(0xC3E)
{
Stackable = true;
Weight = 1.0;
Amount = amount;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -93,9 +100,10 @@ public partial class DriedOnions : Item
public DriedOnions(int amount = 1) : base(0xC40)
{
Stackable = true;
Weight = 1.0;
Amount = amount;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -105,9 +113,10 @@ public partial class DriedHerbs : Item
public DriedHerbs(int amount = 1) : base(0xC42)
{
Stackable = true;
Weight = 1.0;
Amount = amount;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]

View file

@ -9,11 +9,9 @@ namespace Server.Items;
public partial class SpecialBeardDye : Item
{
[Constructible]
public SpecialBeardDye() : base(0xE26)
{
Weight = 1.0;
LootType = LootType.Newbied;
}
public SpecialBeardDye() : base(0xE26) => LootType = LootType.Newbied;
public override double DefaultWeight => 1.0;
public override int LabelNumber => 1041087; // Special Beard Dye

View file

@ -9,11 +9,9 @@ namespace Server.Items;
public partial class SpecialHairDye : Item
{
[Constructible]
public SpecialHairDye() : base(0xE26)
{
Weight = 1.0;
LootType = LootType.Newbied;
}
public SpecialHairDye() : base(0xE26) => LootType = LootType.Newbied;
public override double DefaultWeight => 1.0;
public override int LabelNumber => 1074402;

View file

@ -8,11 +8,12 @@ public partial class TribalBerry : Item
[Constructible]
public TribalBerry(int amount = 1) : base(0x9D0)
{
Weight = 1.0;
Stackable = true;
Amount = amount;
Hue = 6;
}
public override double DefaultWeight => 1.0;
public override int LabelNumber => 1040001; // tribal berry
}

View file

@ -16,10 +16,11 @@ public partial class TribalPaint : Item
public TribalPaint() : base(0x9EC)
{
Hue = 2101;
Weight = 2.0;
Stackable = Core.ML;
}
public override double DefaultWeight => 2.0;
public override int LabelNumber => 1040000; // savage kin paint
public override void OnDoubleClick(Mobile from)