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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

37
Projects/UOContent/Items/Food/Asian.cs
View file

@ -20,9 +20,10 @@ public partial class WasabiClumps : Food
public WasabiClumps() : base(0x24EB)
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -34,7 +35,6 @@ public partial class EmptyBentoBox : Item
}
public override double DefaultWeight => 5.0;
}
[SerializationGenerator(0, false)]
@ -44,20 +44,10 @@ public partial class BentoBox : Food
public BentoBox() : base(0x2836)
{
Stackable = false;
Weight = 5.0;
FillFactor = 2;
}
public override bool Eat(Mobile from)
{
if (!base.Eat(from))
{
return false;
}
from.AddToBackpack(new EmptyBentoBox());
return true;
}
public override double DefaultWeight => 5.0;
}
[SerializationGenerator(0, false)]
@ -67,9 +57,10 @@ public partial class SushiRolls : Food
public SushiRolls() : base(0x283E)
{
Stackable = false;
Weight = 3.0;
FillFactor = 2;
}
public override double DefaultWeight => 3.0;
}
[SerializationGenerator(0, false)]
@ -79,9 +70,10 @@ public partial class SushiPlatter : Food
public SushiPlatter() : base(0x2840)
{
Stackable = Core.ML;
Weight = 3.0;
FillFactor = 2;
}
public override double DefaultWeight => 3.0;
}
[SerializationGenerator(0, false)]
@ -102,9 +94,10 @@ public partial class GreenTea : Food
public GreenTea() : base(0x284C)
{
Stackable = false;
Weight = 4.0;
FillFactor = 2;
}
public override double DefaultWeight => 4.0;
}
[SerializationGenerator(0, false)]
@ -114,9 +107,10 @@ public partial class MisoSoup : Food
public MisoSoup() : base(0x284D)
{
Stackable = false;
Weight = 4.0;
FillFactor = 2;
}
public override double DefaultWeight => 4.0;
}
[SerializationGenerator(0, false)]
@ -126,9 +120,10 @@ public partial class WhiteMisoSoup : Food
public WhiteMisoSoup() : base(0x284E)
{
Stackable = false;
Weight = 4.0;
FillFactor = 2;
}
public override double DefaultWeight => 4.0;
}
[SerializationGenerator(0, false)]
@ -138,9 +133,10 @@ public partial class RedMisoSoup : Food
public RedMisoSoup() : base(0x284F)
{
Stackable = false;
Weight = 4.0;
FillFactor = 2;
}
public override double DefaultWeight => 4.0;
}
[SerializationGenerator(0, false)]
@ -150,7 +146,8 @@ public partial class AwaseMisoSoup : Food
public AwaseMisoSoup() : base(0x2850)
{
Stackable = false;
Weight = 4.0;
FillFactor = 2;
}
public override double DefaultWeight => 4.0;
}

33
Projects/UOContent/Items/Food/Bowls.cs
View file

@ -31,10 +31,11 @@ public partial class WoodenBowlOfCarrots : Food
public WoodenBowlOfCarrots() : base(0x15F9)
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
}
public override double DefaultWeight => 1.0;
public override bool Eat(Mobile from)
{
if (!base.Eat(from))
@ -54,10 +55,11 @@ public partial class WoodenBowlOfCorn : Food
public WoodenBowlOfCorn() : base(0x15FA)
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
}
public override double DefaultWeight => 1.0;
public override bool Eat(Mobile from)
{
if (!base.Eat(from))
@ -77,10 +79,11 @@ public partial class WoodenBowlOfLettuce : Food
public WoodenBowlOfLettuce() : base(0x15FB)
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
}
public override double DefaultWeight => 1.0;
public override bool Eat(Mobile from)
{
if (!base.Eat(from))
@ -100,10 +103,11 @@ public partial class WoodenBowlOfPeas : Food
public WoodenBowlOfPeas() : base(0x15FC)
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
}
public override double DefaultWeight => 1.0;
public override bool Eat(Mobile from)
{
if (!base.Eat(from))
@ -123,10 +127,11 @@ public partial class PewterBowlOfCarrots : Food
public PewterBowlOfCarrots() : base(0x15FE)
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
}
public override double DefaultWeight => 1.0;
public override bool Eat(Mobile from)
{
if (!base.Eat(from))
@ -146,10 +151,11 @@ public partial class PewterBowlOfCorn : Food
public PewterBowlOfCorn() : base(0x15FF)
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
}
public override double DefaultWeight => 1.0;
public override bool Eat(Mobile from)
{
if (!base.Eat(from))
@ -169,10 +175,11 @@ public partial class PewterBowlOfLettuce : Food
public PewterBowlOfLettuce() : base(0x1600)
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
}
public override double DefaultWeight => 1.0;
public override bool Eat(Mobile from)
{
if (!base.Eat(from))
@ -192,10 +199,11 @@ public partial class PewterBowlOfPeas : Food
public PewterBowlOfPeas() : base(0x1601)
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
}
public override double DefaultWeight => 1.0;
public override bool Eat(Mobile from)
{
if (!base.Eat(from))
@ -215,10 +223,11 @@ public partial class PewterBowlOfPotatos : Food
public PewterBowlOfPotatos() : base(0x1602)
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
}
public override double DefaultWeight => 1.0;
public override bool Eat(Mobile from)
{
if (!base.Eat(from))
@ -262,10 +271,11 @@ public partial class WoodenBowlOfStew : Food
public WoodenBowlOfStew() : base(0x1604)
{
Stackable = false;
Weight = 2.0;
FillFactor = 2;
}
public override double DefaultWeight => 2.0;
public override bool Eat(Mobile from)
{
if (!base.Eat(from))
@ -285,10 +295,11 @@ public partial class WoodenBowlOfTomatoSoup : Food
public WoodenBowlOfTomatoSoup() : base(0x1606)
{
Stackable = false;
Weight = 2.0;
FillFactor = 2;
}
public override double DefaultWeight => 2.0;
public override bool Eat(Mobile from)
{
if (!base.Eat(from))

18
Projects/UOContent/Items/Food/CookableFood.cs
View file

@ -76,11 +76,12 @@ public partial class RawRibs : CookableFood
[Constructible]
public RawRibs(int amount = 1) : base(0x9F1, 10)
{
Weight = 1.0;
Stackable = true;
Amount = amount;
}
public override double DefaultWeight => 1.0;
public override Food Cook() => new Ribs();
}
@ -103,10 +104,11 @@ public partial class RawChickenLeg : CookableFood
[Constructible]
public RawChickenLeg() : base(0x1607, 10)
{
Weight = 1.0;
Stackable = true;
}
public override double DefaultWeight => 1.0;
public override Food Cook() => new ChickenLeg();
}
@ -116,11 +118,12 @@ public partial class RawBird : CookableFood
[Constructible]
public RawBird(int amount = 1) : base(0x9B9, 10)
{
Weight = 1.0;
Stackable = true;
Amount = amount;
}
public override double DefaultWeight => 1.0;
public override Food Cook() => new CookedBird();
}
@ -251,11 +254,12 @@ public partial class Eggs : CookableFood
[Constructible]
public Eggs(int amount = 1) : base(0x9B5, 15)
{
Weight = 1.0;
Stackable = true;
Amount = amount;
}
public override double DefaultWeight => 1.0;
public override Food Cook() => new FriedEggs();
}
@ -265,12 +269,11 @@ public partial class BrightlyColoredEggs : CookableFood
[Constructible]
public BrightlyColoredEggs() : base(0x9B5, 15)
{
Weight = 0.5;
Hue = 3 + Utility.Random(20) * 5;
}
public override double DefaultWeight => 0.5;
public override string DefaultName => "brightly colored eggs";
public override Food Cook() => new FriedEggs();
}
@ -280,12 +283,11 @@ public partial class EasterEggs : CookableFood
[Constructible]
public EasterEggs() : base(0x9B5, 15)
{
Weight = 0.5;
Hue = 3 + Utility.Random(20) * 5;
}
public override double DefaultWeight => 0.5;
public override int LabelNumber => 1016105; // Easter Eggs
public override Food Cook() => new FriedEggs();
}

14
Projects/UOContent/Items/Food/Cooking.cs
View file

@ -11,8 +11,9 @@ public partial class Dough : Item
public Dough() : base(0x103d)
{
Stackable = Core.ML;
Weight = 1.0;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -22,10 +23,10 @@ public partial class SweetDough : Item
public SweetDough() : base(0x103d)
{
Stackable = Core.ML;
Weight = 1.0;
Hue = 150;
}
public override double DefaultWeight => 1.0;
public override int LabelNumber => 1041340; // sweet dough
}
@ -35,9 +36,10 @@ public partial class JarHoney : Item
[Constructible]
public JarHoney() : base(0x9ec)
{
Weight = 1.0;
Stackable = true;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -69,10 +71,11 @@ public partial class SackFlour : Item, IHasQuantity
[Constructible]
public SackFlour() : base(0x1039)
{
Weight = 5.0;
_quantity = 20;
}
public override double DefaultWeight => 5.0;
[SerializableProperty(0)]
[CommandProperty(AccessLevel.GameMaster)]
public int Quantity
@ -121,11 +124,12 @@ public partial class WheatSheaf : Item
[Constructible]
public WheatSheaf(int amount = 1) : base(7869)
{
Weight = 1.0;
Stackable = true;
Amount = amount;
}
public override double DefaultWeight => 1.0;
public override void OnDoubleClick(Mobile from)
{
if (Movable)

76
Projects/UOContent/Items/Food/Food.cs
View file

@ -133,9 +133,10 @@ public partial class BreadLoaf : Food
[Constructible]
public BreadLoaf(int amount = 1) : base(0x103B, amount)
{
Weight = 1.0;
FillFactor = 3;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -144,9 +145,10 @@ public partial class Bacon : Food
[Constructible]
public Bacon(int amount = 1) : base(0x979, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -155,9 +157,10 @@ public partial class SlabOfBacon : Food
[Constructible]
public SlabOfBacon(int amount = 1) : base(0x976, amount)
{
Weight = 1.0;
FillFactor = 3;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -202,9 +205,10 @@ public partial class FrenchBread : Food
[Constructible]
public FrenchBread(int amount = 1) : base(0x98C, amount)
{
Weight = 2.0;
FillFactor = 3;
}
public override double DefaultWeight => 2.0;
}
[SerializationGenerator(0, false)]
@ -213,9 +217,10 @@ public partial class FriedEggs : Food
[Constructible]
public FriedEggs(int amount = 1) : base(0x9B6, amount)
{
Weight = 1.0;
FillFactor = 4;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -224,9 +229,10 @@ public partial class CookedBird : Food
[Constructible]
public CookedBird(int amount = 1) : base(0x9B7, amount)
{
Weight = 1.0;
FillFactor = 5;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -235,9 +241,10 @@ public partial class RoastPig : Food
[Constructible]
public RoastPig(int amount = 1) : base(0x9BB, amount)
{
Weight = 45.0;
FillFactor = 20;
}
public override double DefaultWeight => 45.0;
}
[SerializationGenerator(0, false)]
@ -246,9 +253,10 @@ public partial class Sausage : Food
[Constructible]
public Sausage(int amount = 1) : base(0x9C0, amount)
{
Weight = 1.0;
FillFactor = 4;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -257,9 +265,10 @@ public partial class Ham : Food
[Constructible]
public Ham(int amount = 1) : base(0x9C9, amount)
{
Weight = 1.0;
FillFactor = 5;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -269,9 +278,10 @@ public partial class Cake : Food
public Cake() : base(0x9E9)
{
Stackable = false;
Weight = 1.0;
FillFactor = 10;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -280,9 +290,10 @@ public partial class Ribs : Food
[Constructible]
public Ribs(int amount = 1) : base(0x9F2, amount)
{
Weight = 1.0;
FillFactor = 5;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -292,9 +303,10 @@ public partial class Cookies : Food
public Cookies() : base(0x160b)
{
Stackable = Core.ML;
Weight = 1.0;
FillFactor = 4;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -304,9 +316,10 @@ public partial class Muffins : Food
public Muffins() : base(0x9eb)
{
Stackable = false;
Weight = 1.0;
FillFactor = 4;
}
public override double DefaultWeight => 1.0;
}
[TypeAlias("Server.Items.Pizza")]
@ -317,10 +330,10 @@ public partial class CheesePizza : Food
public CheesePizza() : base(0x1040)
{
Stackable = false;
Weight = 1.0;
FillFactor = 6;
}
public override double DefaultWeight => 1.0;
public override int LabelNumber => 1044516; // cheese pizza
}
@ -331,10 +344,10 @@ public partial class SausagePizza : Food
public SausagePizza() : base(0x1040)
{
Stackable = false;
Weight = 1.0;
FillFactor = 6;
}
public override double DefaultWeight => 1.0;
public override int LabelNumber => 1044517; // sausage pizza
}
@ -345,10 +358,10 @@ public partial class FruitPie : Food
public FruitPie() : base(0x1041)
{
Stackable = false;
Weight = 1.0;
FillFactor = 5;
}
public override double DefaultWeight => 1.0;
public override int LabelNumber => 1041346; // baked fruit pie
}
@ -359,10 +372,10 @@ public partial class MeatPie : Food
public MeatPie() : base(0x1041)
{
Stackable = false;
Weight = 1.0;
FillFactor = 5;
}
public override double DefaultWeight => 1.0;
public override int LabelNumber => 1041347; // baked meat pie
}
@ -373,10 +386,10 @@ public partial class PumpkinPie : Food
public PumpkinPie() : base(0x1041)
{
Stackable = false;
Weight = 1.0;
FillFactor = 5;
}
public override double DefaultWeight => 1.0;
public override int LabelNumber => 1041348; // baked pumpkin pie
}
@ -387,10 +400,10 @@ public partial class ApplePie : Food
public ApplePie() : base(0x1041)
{
Stackable = false;
Weight = 1.0;
FillFactor = 5;
}
public override double DefaultWeight => 1.0;
public override int LabelNumber => 1041343; // baked apple pie
}
@ -401,10 +414,10 @@ public partial class PeachCobbler : Food
public PeachCobbler() : base(0x1041)
{
Stackable = false;
Weight = 1.0;
FillFactor = 5;
}
public override double DefaultWeight => 1.0;
public override int LabelNumber => 1041344; // baked peach cobbler
}
@ -415,10 +428,10 @@ public partial class Quiche : Food
public Quiche() : base(0x1041)
{
Stackable = Core.ML;
Weight = 1.0;
FillFactor = 5;
}
public override double DefaultWeight => 1.0;
public override int LabelNumber => 1041345; // baked quiche
}
@ -428,9 +441,10 @@ public partial class LambLeg : Food
[Constructible]
public LambLeg(int amount = 1) : base(0x160a, amount)
{
Weight = 2.0;
FillFactor = 5;
}
public override double DefaultWeight => 2.0;
}
[SerializationGenerator(0, false)]
@ -439,9 +453,10 @@ public partial class ChickenLeg : Food
[Constructible]
public ChickenLeg(int amount = 1) : base(0x1608, amount)
{
Weight = 1.0;
FillFactor = 4;
}
public override double DefaultWeight => 1.0;
}
[Flippable(0xC74, 0xC75)]
@ -451,9 +466,10 @@ public partial class HoneydewMelon : Food
[Constructible]
public HoneydewMelon(int amount = 1) : base(0xC74, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[Flippable(0xC64, 0xC65)]
@ -463,9 +479,10 @@ public partial class YellowGourd : Food
[Constructible]
public YellowGourd(int amount = 1) : base(0xC64, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[Flippable(0xC66, 0xC67)]
@ -475,9 +492,10 @@ public partial class GreenGourd : Food
[Constructible]
public GreenGourd(int amount = 1) : base(0xC66, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[Flippable(0xC7F, 0xC81)]
@ -487,9 +505,10 @@ public partial class EarOfCorn : Food
[Constructible]
public EarOfCorn(int amount = 1) : base(0xC81, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -498,9 +517,10 @@ public partial class Turnip : Food
[Constructible]
public Turnip(int amount = 1) : base(0xD3A, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]

57
Projects/UOContent/Items/Food/Fruits.cs
View file

@ -8,11 +8,12 @@ public partial class FruitBasket : Food
[Constructible]
public FruitBasket() : base(0x993)
{
Weight = 2.0;
FillFactor = 5;
Stackable = false;
}
public override double DefaultWeight => 2.0;
public override bool Eat(Mobile from)
{
if (!base.Eat(from))
@ -32,9 +33,10 @@ public partial class Banana : Food
[Constructible]
public Banana(int amount = 1) : base(0x171f, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[Flippable(0x1721, 0x1722)]
@ -44,9 +46,10 @@ public partial class Bananas : Food
[Constructible]
public Bananas(int amount = 1) : base(0x1721, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -55,9 +58,10 @@ public partial class SplitCoconut : Food
[Constructible]
public SplitCoconut(int amount = 1) : base(0x1725, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -66,9 +70,10 @@ public partial class Lemon : Food
[Constructible]
public Lemon(int amount = 1) : base(0x1728, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -77,9 +82,10 @@ public partial class Lemons : Food
[Constructible]
public Lemons(int amount = 1) : base(0x1729, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -88,9 +94,10 @@ public partial class Lime : Food
[Constructible]
public Lime(int amount = 1) : base(0x172a, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -99,9 +106,10 @@ public partial class Limes : Food
[Constructible]
public Limes(int amount = 1) : base(0x172B, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -110,9 +118,10 @@ public partial class Coconut : Food
[Constructible]
public Coconut(int amount = 1) : base(0x1726, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -121,9 +130,10 @@ public partial class OpenCoconut : Food
[Constructible]
public OpenCoconut(int amount = 1) : base(0x1723, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -132,9 +142,10 @@ public partial class Dates : Food
[Constructible]
public Dates(int amount = 1) : base(0x1727, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -143,9 +154,10 @@ public partial class Grapes : Food
[Constructible]
public Grapes(int amount = 1) : base(0x9D1, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -154,9 +166,10 @@ public partial class Peach : Food
[Constructible]
public Peach(int amount = 1) : base(0x9D2, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -165,9 +178,10 @@ public partial class Pear : Food
[Constructible]
public Pear(int amount = 1) : base(0x994, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -176,9 +190,10 @@ public partial class Apple : Food
[Constructible]
public Apple(int amount = 1) : base(0x9D0, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[SerializationGenerator(0, false)]
@ -187,9 +202,10 @@ public partial class Watermelon : Food
[Constructible]
public Watermelon(int amount = 1) : base(0xC5C, amount)
{
Weight = 5.0;
FillFactor = 5;
}
public override double DefaultWeight => 5.0;
}
[SerializationGenerator(0, false)]
@ -198,9 +214,10 @@ public partial class SmallWatermelon : Food
[Constructible]
public SmallWatermelon(int amount = 1) : base(0xC5D, amount)
{
Weight = 5.0;
FillFactor = 5;
}
public override double DefaultWeight => 5.0;
}
[Flippable(0xc72, 0xc73)]
@ -210,9 +227,10 @@ public partial class Squash : Food
[Constructible]
public Squash(int amount = 1) : base(0xc72, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}
[Flippable(0xc79, 0xc7a)]
@ -222,7 +240,8 @@ public partial class Cantaloupe : Food
[Constructible]
public Cantaloupe(int amount = 1) : base(0xc79, amount)
{
Weight = 1.0;
FillFactor = 1;
}
public override double DefaultWeight => 1.0;
}