warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Kamron Batman 2025-07-24 14:44:39 -07:00 • committed by GitHub
parent c2e44a58f6
commit 2eba2868a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
126 changed files with 1184 additions and 380 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Projects/UOContent/Items/Misc/ExecutionersCap.cs
View file

@ -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;
}

258
Projects/UOContent/Items/Misc/GlassItems.cs
View file

@ -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;
}

6
Projects/UOContent/Items/Misc/HairDye.cs
View file

@ -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

6
Projects/UOContent/Items/Misc/PlayerVendorDeed.cs
View file

@ -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

6
Projects/UOContent/Items/Misc/PowerCrystal.cs
View file

@ -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";

72
Projects/UOContent/Items/Misc/Rares.cs
View file

@ -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;
}