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

fix: Optimizes items to use default weights. (Part 4) (#2243)

Browse source
This commit is contained in:
Kamron Batman 2025-07-24 23:29:29 -07:00 • committed by GitHub
parent 40ba85d7b8
commit fa0b67ec29
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
109 changed files with 250 additions and 391 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Projects/UOContent/Items/Weapons/Axes/BattleAxe.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class BattleAxe : BaseAxe
{
[Constructible]
public BattleAxe() : base(0xF47)
{
Weight = 4.0;
Layer = Layer.TwoHanded;
}
public BattleAxe() : base(0xF47) => Layer = Layer.TwoHanded;
public override double DefaultWeight => 4.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow;

2
Projects/UOContent/Items/Weapons/Axes/Pickaxe.cs
View file

@ -12,11 +12,11 @@ namespace Server.Items
[Constructible]
public Pickaxe() : base(0xE86)
{
Weight = 11.0;
UsesRemaining = 50;
ShowUsesRemaining = true;
}
public override double DefaultWeight => 11.0;
public override HarvestSystem HarvestSystem => Mining.System;
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;

8
Projects/UOContent/Items/Weapons/Knives/ThrowingDagger.cs
View file

@ -10,11 +10,9 @@ namespace Server.Items;
public partial class ThrowingDagger : Item
{
[Constructible]
public ThrowingDagger() : base(0xF52)
{
Weight = 1.0;
Layer = Layer.OneHanded;
}
public ThrowingDagger() : base(0xF52) => Layer = Layer.OneHanded;
public override double DefaultWeight => 1.0;
public override string DefaultName => "a throwing dagger";

8
Projects/UOContent/Items/Weapons/ML Weapons/ElvenCompositeLongbow.cs
View file

@ -8,11 +8,9 @@ namespace Server.Items
public partial class ElvenCompositeLongbow : BaseRanged
{
[Constructible]
public ElvenCompositeLongbow() : base(0x2D1E)
{
Weight = 8.0;
Resource = CraftResource.RegularWood;
}
public ElvenCompositeLongbow() : base(0x2D1E) => Resource = CraftResource.RegularWood;
public override double DefaultWeight => 8.0;
public override int EffectID => 0xF42;
public override Type AmmoType => typeof(Arrow);

7
Projects/UOContent/Items/Weapons/ML Weapons/ElvenSpellblade.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class ElvenSpellblade : BaseKnife
{
[Constructible]
public ElvenSpellblade() : base(0x2D20)
{
Weight = 5.0;
Layer = Layer.TwoHanded;
}
public ElvenSpellblade() : base(0x2D20) => Layer = Layer.TwoHanded;
public override double DefaultWeight => 5.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.PsychicAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.BleedAttack;

7
Projects/UOContent/Items/Weapons/ML Weapons/MagicalShortbow.cs
View file

@ -8,12 +8,9 @@ namespace Server.Items
public partial class MagicalShortbow : BaseRanged
{
[Constructible]
public MagicalShortbow() : base(0x2D2B)
{
Weight = 6.0;
Resource = CraftResource.RegularWood;
}
public MagicalShortbow() : base(0x2D2B) => Resource = CraftResource.RegularWood;
public override double DefaultWeight => 6.0;
public override int EffectID => 0xF42;
public override Type AmmoType => typeof(Arrow);
public override Item Ammo => new Arrow();

7
Projects/UOContent/Items/Weapons/ML Weapons/OrnateAxe.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class OrnateAxe : BaseAxe
{
[Constructible]
public OrnateAxe() : base(0x2D28)
{
Weight = 12.0;
Layer = Layer.TwoHanded;
}
public OrnateAxe() : base(0x2D28) => Layer = Layer.TwoHanded;
public override double DefaultWeight => 12.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.Disarm;
public override WeaponAbility SecondaryAbility => WeaponAbility.CrushingBlow;

7
Projects/UOContent/Items/Weapons/ML Weapons/RuneBlade.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class RuneBlade : BaseSword
{
[Constructible]
public RuneBlade() : base(0x2D32)
{
Weight = 7.0;
Layer = Layer.TwoHanded;
}
public RuneBlade() : base(0x2D32) => Layer = Layer.TwoHanded;
public override double DefaultWeight => 7.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.Disarm;
public override WeaponAbility SecondaryAbility => WeaponAbility.Bladeweave;

7
Projects/UOContent/Items/Weapons/ML Weapons/WildStaff.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class WildStaff : BaseStaff
{
[Constructible]
public WildStaff() : base(0x2D25)
{
Weight = 8.0;
Resource = CraftResource.RegularWood;
}
public WildStaff() : base(0x2D25) => Resource = CraftResource.RegularWood;
public override double DefaultWeight => 8.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.Block;
public override WeaponAbility SecondaryAbility => WeaponAbility.ForceOfNature;

7
Projects/UOContent/Items/Weapons/Maces/HammerPick.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class HammerPick : BaseBashing
{
[Constructible]
public HammerPick() : base(0x143D)
{
Weight = 9.0;
Layer = Layer.OneHanded;
}
public HammerPick() : base(0x143D) => Layer = Layer.OneHanded;
public override double DefaultWeight => 9.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike;

7
Projects/UOContent/Items/Weapons/Maces/WarHammer.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class WarHammer : BaseBashing
{
[Constructible]
public WarHammer() : base(0x1439)
{
Weight = 10.0;
Layer = Layer.TwoHanded;
}
public WarHammer() : base(0x1439) => Layer = Layer.TwoHanded;
public override double DefaultWeight => 10.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.CrushingBlow;

2
Projects/UOContent/Items/Weapons/Ranged/Bow.cs
View file

@ -10,11 +10,11 @@ namespace Server.Items
[Constructible]
public Bow() : base(0x13B2)
{
Weight = 6.0;
Layer = Layer.TwoHanded;
Resource = CraftResource.RegularWood;
}
public override double DefaultWeight => 6.0;
public override int EffectID => 0xF42;
public override Type AmmoType => typeof(Arrow);
public override Item Ammo => new Arrow();

7
Projects/UOContent/Items/Weapons/Ranged/CompositeBow.cs
View file

@ -8,12 +8,9 @@ namespace Server.Items
public partial class CompositeBow : BaseRanged
{
[Constructible]
public CompositeBow() : base(0x26C2)
{
Weight = 5.0;
Resource = CraftResource.RegularWood;
}
public CompositeBow() : base(0x26C2) => Resource = CraftResource.RegularWood;
public override double DefaultWeight => 5.0;
public override int EffectID => 0xF42;
public override Type AmmoType => typeof(Arrow);
public override Item Ammo => new Arrow();

2
Projects/UOContent/Items/Weapons/Ranged/Crossbow.cs
View file

@ -10,11 +10,11 @@ namespace Server.Items
[Constructible]
public Crossbow() : base(0xF50)
{
Weight = 7.0;
Layer = Layer.TwoHanded;
Resource = CraftResource.RegularWood;
}
public override double DefaultWeight => 7.0;
public override int EffectID => 0x1BFE;
public override Type AmmoType => typeof(Bolt);
public override Item Ammo => new Bolt();

2
Projects/UOContent/Items/Weapons/Ranged/HeavyCrossbow.cs
View file

@ -10,11 +10,11 @@ namespace Server.Items
[Constructible]
public HeavyCrossbow() : base(0x13FD)
{
Weight = 9.0;
Layer = Layer.TwoHanded;
Resource = CraftResource.RegularWood;
}
public override double DefaultWeight => 9.0;
public override int EffectID => 0x1BFE;
public override Type AmmoType => typeof(Bolt);
public override Item Ammo => new Bolt();

7
Projects/UOContent/Items/Weapons/Ranged/RepeatingCrossbow.cs
View file

@ -8,12 +8,9 @@ namespace Server.Items
public partial class RepeatingCrossbow : BaseRanged
{
[Constructible]
public RepeatingCrossbow() : base(0x26C3)
{
Weight = 6.0;
Resource = CraftResource.RegularWood;
}
public RepeatingCrossbow() : base(0x26C3) => Resource = CraftResource.RegularWood;
public override double DefaultWeight => 6.0;
public override int EffectID => 0x1BFE;
public override Type AmmoType => typeof(Bolt);
public override Item Ammo => new Bolt();

7
Projects/UOContent/Items/Weapons/SE Weapons/Daisho.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class Daisho : BaseSword
{
[Constructible]
public Daisho() : base(0x27A9)
{
Weight = 8.0;
Layer = Layer.TwoHanded;
}
public Daisho() : base(0x27A9) => Layer = Layer.TwoHanded;
public override double DefaultWeight => 8.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.Feint;
public override WeaponAbility SecondaryAbility => WeaponAbility.DoubleStrike;

7
Projects/UOContent/Items/Weapons/SE Weapons/Kama.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class Kama : BaseKnife
{
[Constructible]
public Kama() : base(0x27AD)
{
Weight = 7.0;
Layer = Layer.TwoHanded;
}
public Kama() : base(0x27AD) => Layer = Layer.TwoHanded;
public override double DefaultWeight => 7.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.DefenseMastery;

7
Projects/UOContent/Items/Weapons/SE Weapons/Lajatang.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class Lajatang : BaseKnife
{
[Constructible]
public Lajatang() : base(0x27A7)
{
Weight = 12.0;
Layer = Layer.TwoHanded;
}
public Lajatang() : base(0x27A7) => Layer = Layer.TwoHanded;
public override double DefaultWeight => 12.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.DefenseMastery;
public override WeaponAbility SecondaryAbility => WeaponAbility.FrenziedWhirlwind;

7
Projects/UOContent/Items/Weapons/SE Weapons/NoDachi.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class NoDachi : BaseSword
{
[Constructible]
public NoDachi() : base(0x27A2)
{
Weight = 10.0;
Layer = Layer.TwoHanded;
}
public NoDachi() : base(0x27A2) => Layer = Layer.TwoHanded;
public override double DefaultWeight => 10.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.RidingSwipe;

8
Projects/UOContent/Items/Weapons/SE Weapons/Sai.cs
View file

@ -7,11 +7,9 @@ namespace Server.Items
public partial class Sai : BaseKnife
{
[Constructible]
public Sai() : base(0x27AF)
{
Weight = 7.0;
Layer = Layer.TwoHanded;
}
public Sai() : base(0x27AF) => Layer = Layer.TwoHanded;
public override double DefaultWeight => 7.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.Block;
public override WeaponAbility SecondaryAbility => WeaponAbility.ArmorPierce;

7
Projects/UOContent/Items/Weapons/SE Weapons/Tekagi.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class Tekagi : BaseKnife
{
[Constructible]
public Tekagi() : base(0x27AB)
{
Weight = 5.0;
Layer = Layer.TwoHanded;
}
public Tekagi() : base(0x27AB) => Layer = Layer.TwoHanded;
public override double DefaultWeight => 5.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.DualWield;
public override WeaponAbility SecondaryAbility => WeaponAbility.TalonStrike;

8
Projects/UOContent/Items/Weapons/SE Weapons/Tessen.cs
View file

@ -7,11 +7,9 @@ namespace Server.Items
public partial class Tessen : BaseBashing
{
[Constructible]
public Tessen() : base(0x27A3)
{
Weight = 6.0;
Layer = Layer.TwoHanded;
}
public Tessen() : base(0x27A3) => Layer = Layer.TwoHanded;
public override double DefaultWeight => 6.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.Feint;
public override WeaponAbility SecondaryAbility => WeaponAbility.Block;

7
Projects/UOContent/Items/Weapons/SE Weapons/Tetsubo.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class Tetsubo : BaseBashing
{
[Constructible]
public Tetsubo() : base(0x27A6)
{
Weight = 8.0;
Layer = Layer.TwoHanded;
}
public Tetsubo() : base(0x27A6) => Layer = Layer.TwoHanded;
public override double DefaultWeight => 8.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.FrenziedWhirlwind;
public override WeaponAbility SecondaryAbility => WeaponAbility.CrushingBlow;

7
Projects/UOContent/Items/Weapons/SE Weapons/Wakizashi.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class Wakizashi : BaseSword
{
[Constructible]
public Wakizashi() : base(0x27A4)
{
Weight = 5.0;
Layer = Layer.OneHanded;
}
public Wakizashi() : base(0x27A4) => Layer = Layer.OneHanded;
public override double DefaultWeight => 5.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.FrenziedWhirlwind;
public override WeaponAbility SecondaryAbility => WeaponAbility.DoubleStrike;

2
Projects/UOContent/Items/Weapons/SE Weapons/Yumi.cs
View file

@ -10,11 +10,11 @@ namespace Server.Items
[Constructible]
public Yumi() : base(0x27A5)
{
Weight = 9.0;
Layer = Layer.TwoHanded;
Resource = CraftResource.RegularWood;
}
public override double DefaultWeight => 9.0;
public override int EffectID => 0xF42;
public override Type AmmoType => typeof(Arrow);
public override Item Ammo => new Arrow();

8
Projects/UOContent/Items/Weapons/SpearsAndForks/TribalSpear.cs
View file

@ -7,11 +7,9 @@ namespace Server.Items
public partial class TribalSpear : BaseSpear
{
[Constructible]
public TribalSpear() : base(0xF62)
{
Weight = 7.0;
Hue = 837;
}
public TribalSpear() : base(0xF62) => Hue = 837;
public override double DefaultWeight => 7.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;

7
Projects/UOContent/Items/Weapons/Staves/GlassStaff.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class GlassStaff : BaseStaff
{
[Constructible]
public GlassStaff() : base(0x905)
{
Weight = 4.0;
Resource = CraftResource.None;
}
public GlassStaff() : base(0x905) => Resource = CraftResource.None;
public override double DefaultWeight => 4.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike;
public override int AosStrengthReq => 20;

7
Projects/UOContent/Items/Weapons/Staves/GnarledStaff.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class GnarledStaff : BaseStaff
{
[Constructible]
public GnarledStaff() : base(0x13F8)
{
Weight = 3.0;
Resource = CraftResource.RegularWood;
}
public GnarledStaff() : base(0x13F8) => Resource = CraftResource.RegularWood;
public override double DefaultWeight => 3.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.ConcussionBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.ForceOfNature;

7
Projects/UOContent/Items/Weapons/Staves/QuarterStaff.cs
View file

@ -7,12 +7,9 @@ namespace Server.Items
public partial class QuarterStaff : BaseStaff
{
[Constructible]
public QuarterStaff() : base(0xE89)
{
Weight = 4.0;
Resource = CraftResource.RegularWood;
}
public QuarterStaff() : base(0xE89) => Resource = CraftResource.RegularWood;
public override double DefaultWeight => 4.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow;

7
Projects/UOContent/Items/Weapons/Staves/ShepherdsCrook.cs
View file

@ -11,12 +11,9 @@ namespace Server.Items
public partial class ShepherdsCrook : BaseStaff
{
[Constructible]
public ShepherdsCrook() : base(0xE81)
{
Weight = 4.0;
Resource = CraftResource.RegularWood;
}
public ShepherdsCrook() : base(0xE81) => Resource = CraftResource.RegularWood;
public override double DefaultWeight => 4.0;
public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;

7
Projects/UOContent/Items/Weapons/Throwing/Boomerang.cs
View file

@ -6,12 +6,9 @@ namespace Server.Items;
public partial class Boomerang : BaseThrown
{
[Constructible]
public Boomerang() : base(0x8FF)
{
Weight = 4.0;
Layer = Layer.OneHanded;
}
public Boomerang() : base(0x8FF) => Layer = Layer.OneHanded;
public override double DefaultWeight => 4.0;
public override int MinThrowRange => 4;
public override WeaponAbility PrimaryAbility => WeaponAbility.MysticArc;

7
Projects/UOContent/Items/Weapons/Throwing/Cyclone.cs
View file

@ -6,12 +6,9 @@ namespace Server.Items;
public partial class Cyclone : BaseThrown
{
[Constructible]
public Cyclone() : base(0x901)
{
Weight = 6.0;
Layer = Layer.OneHanded;
}
public Cyclone() : base(0x901) => Layer = Layer.OneHanded;
public override double DefaultWeight => 6.0;
public override int MinThrowRange => 6;
public override WeaponAbility PrimaryAbility => WeaponAbility.MovingShot;

7
Projects/UOContent/Items/Weapons/Throwing/SoulGlaive.cs
View file

@ -6,12 +6,9 @@ namespace Server.Items;
public partial class SoulGlaive : BaseThrown
{
[Constructible]
public SoulGlaive() : base(0x090A)
{
Weight = 8.0;
Layer = Layer.OneHanded;
}
public SoulGlaive() : base(0x090A) => Layer = Layer.OneHanded;
public override double DefaultWeight => 8.0;
public override int MinThrowRange => 8;
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;