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

8
Projects/UOContent/Engines/Quests/Collector/Items/EnchantedPaints.cs
View file

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

4
Projects/UOContent/Engines/Quests/Collector/Items/PaintedImage.cs
View file

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

6
Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs
View file

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

3
Projects/UOContent/Engines/Quests/Core/Items/HornOfRetreat.cs
View file

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

8
Projects/UOContent/Engines/Quests/Dark Tides/Items/KronusScroll.cs
View file

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

6
Projects/UOContent/Engines/Quests/Dark Tides/Items/ScrollOfAbraxus.cs
View file

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

6
Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/EminosKatana.cs
View file

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

8
Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/NoteForZoel.cs
View file

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

6
Projects/UOContent/Engines/Quests/Haochi's Trials/Items/HaochisKatana.cs
View file

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

3
Projects/UOContent/Engines/Quests/The Summoning/Items/GoldenSkull.cs
View file

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

3
Projects/UOContent/Engines/Quests/The Summoning/Items/GrandGrimoire.cs
View file

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

6
Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestDaemonBlood.cs
View file

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

6
Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestDaemonBone.cs
View file

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

6
Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/QuestFertileDirt.cs
View file

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

8
Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickScrollOfPower.cs
View file

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

6
Projects/UOContent/Engines/Quests/Witch Apprentice/Items/Cauldron.cs
View file

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

3
Projects/UOContent/Engines/Quests/Witch Apprentice/Items/HangoverCure.cs
View file

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

6
Projects/UOContent/Engines/Quests/Witch Apprentice/Items/MoonfireBrew.cs
View file

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