Skip to content

Commit

Permalink
feat: Adds leather/metal food, fixes weapons/armors with wrong materi…
Browse files Browse the repository at this point in the history
…als (#1718)

### Summary
- Fixes the name `Vegies` to `Veggies`
- Adds feeding leather to goats
- Adds metal for Lava Lizards
- Fixes Bone Helm being classified as plate instead of bone.
- Fixes wooden shields not classified as wood.

### Note
On OSI, the preferred foods on the animal lore gump doesn't contain all possible favorite food categories. Furthermore, the one listed is not necessarily always the "first" in the list of possible categories. We aren't going to try and fix that since it isn't important.
  • Loading branch information
kamronbatman committed Apr 5, 2024
1 parent 29ea813 commit 974062b
Show file tree
Hide file tree
Showing 61 changed files with 265 additions and 127 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public UnholySteed(Serial serial) : base(serial)
public override string CorpseName => "an unholy corpse";
public override bool IsDispellable => false;
public override bool IsBondable => false;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;

private static MonsterAbility[] _abilities = { MonsterAbilities.FireBreath };
public override MonsterAbility[] GetMonsterAbilities() => _abilities;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public HolySteed(Serial serial) : base(serial)
public override string CorpseName => "a holy corpse";
public override bool IsDispellable => false;
public override bool IsBondable => false;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;

private static MonsterAbility[] _abilities = { MonsterAbilities.FireBreath };
public override MonsterAbility[] GetMonsterAbilities() => _abilities;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public Faction Faction
}
}

public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;

public override void OnDoubleClick(Mobile from)
{
Expand Down
2 changes: 1 addition & 1 deletion Projects/UOContent/Items/Armor/Helmets/BoneHelm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ public partial class BoneHelm : BaseArmor

public override int ArmorBase => 30;

public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate;
public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone;
}
}
4 changes: 3 additions & 1 deletion Projects/UOContent/Items/Shields/GargishWoodenShield.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ public partial class GargishWoodenShield : BaseShield
public override int AosStrReq => 20;

public override int RequiredRaces => Race.AllowGargoylesOnly;
}

public override ArmorMaterialType MaterialType => ArmorMaterialType.Wood;
}
2 changes: 2 additions & 0 deletions Projects/UOContent/Items/Shields/WoodenKiteShield.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ public partial class WoodenKiteShield : BaseShield
public override int AosStrReq => 20;

public override int ArmorBase => 12;

public override ArmorMaterialType MaterialType => ArmorMaterialType.Wood;
}
2 changes: 2 additions & 0 deletions Projects/UOContent/Items/Shields/WoodenShield.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ public partial class WoodenShield : BaseShield
public override int AosStrReq => 20;

public override int ArmorBase => 8;

public override ArmorMaterialType MaterialType => ArmorMaterialType.Wood;
}
1 change: 1 addition & 0 deletions Projects/UOContent/Items/Wands/BaseWand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public BaseWand(WandEffect effect, int minCharges, int maxCharges) : base(0xDF2
Attributes.SpellChanneling = 1;
Attributes.CastSpeed = -1;
WeaponAttributes.MageWeapon = Utility.RandomMinMax(1, 10);
Resource = CraftResource.None;
}

public override WeaponAbility PrimaryAbility => WeaponAbility.Dismount;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ namespace Server.Items
public partial class ElvenCompositeLongbow : BaseRanged
{
[Constructible]
public ElvenCompositeLongbow() : base(0x2D1E) => Weight = 8.0;
public ElvenCompositeLongbow() : base(0x2D1E)
{
Weight = 8.0;
Resource = CraftResource.RegularWood;
}

public override int EffectID => 0xF42;
public override Type AmmoType => typeof(Arrow);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ namespace Server.Items
public partial class MagicalShortbow : BaseRanged
{
[Constructible]
public MagicalShortbow() : base(0x2D2B) => Weight = 6.0;
public MagicalShortbow() : base(0x2D2B)
{
Weight = 6.0;
Resource = CraftResource.RegularWood;
}

public override int EffectID => 0xF42;
public override Type AmmoType => typeof(Arrow);
Expand Down
6 changes: 5 additions & 1 deletion Projects/UOContent/Items/Weapons/ML Weapons/WildStaff.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ namespace Server.Items
public partial class WildStaff : BaseStaff
{
[Constructible]
public WildStaff() : base(0x2D25) => Weight = 8.0;
public WildStaff() : base(0x2D25)
{
Weight = 8.0;
Resource = CraftResource.RegularWood;
}

public override WeaponAbility PrimaryAbility => WeaponAbility.Block;
public override WeaponAbility SecondaryAbility => WeaponAbility.ForceOfNature;
Expand Down
1 change: 1 addition & 0 deletions Projects/UOContent/Items/Weapons/Ranged/Bow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public Bow() : base(0x13B2)
{
Weight = 6.0;
Layer = Layer.TwoHanded;
Resource = CraftResource.RegularWood;
}

public override int EffectID => 0xF42;
Expand Down
6 changes: 5 additions & 1 deletion Projects/UOContent/Items/Weapons/Ranged/CompositeBow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ namespace Server.Items
public partial class CompositeBow : BaseRanged
{
[Constructible]
public CompositeBow() : base(0x26C2) => Weight = 5.0;
public CompositeBow() : base(0x26C2)
{
Weight = 5.0;
Resource = CraftResource.RegularWood;
}

public override int EffectID => 0xF42;
public override Type AmmoType => typeof(Arrow);
Expand Down
1 change: 1 addition & 0 deletions Projects/UOContent/Items/Weapons/Ranged/Crossbow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public Crossbow() : base(0xF50)
{
Weight = 7.0;
Layer = Layer.TwoHanded;
Resource = CraftResource.RegularWood;
}

public override int EffectID => 0x1BFE;
Expand Down
1 change: 1 addition & 0 deletions Projects/UOContent/Items/Weapons/Ranged/HeavyCrossbow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public HeavyCrossbow() : base(0x13FD)
{
Weight = 9.0;
Layer = Layer.TwoHanded;
Resource = CraftResource.RegularWood;
}

public override int EffectID => 0x1BFE;
Expand Down
1 change: 1 addition & 0 deletions Projects/UOContent/Items/Weapons/Ranged/JukaBow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public partial class JukaBow : Bow
[Constructible]
public JukaBow()
{
Resource = CraftResource.RegularWood;
}

public override int AosStrengthReq => 80;
Expand Down
6 changes: 5 additions & 1 deletion Projects/UOContent/Items/Weapons/Ranged/RepeatingCrossbow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ namespace Server.Items
public partial class RepeatingCrossbow : BaseRanged
{
[Constructible]
public RepeatingCrossbow() : base(0x26C3) => Weight = 6.0;
public RepeatingCrossbow() : base(0x26C3)
{
Weight = 6.0;
Resource = CraftResource.RegularWood;
}

public override int EffectID => 0x1BFE;
public override Type AmmoType => typeof(Bolt);
Expand Down
1 change: 1 addition & 0 deletions Projects/UOContent/Items/Weapons/SE Weapons/Yumi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public Yumi() : base(0x27A5)
{
Weight = 9.0;
Layer = Layer.TwoHanded;
Resource = CraftResource.RegularWood;
}

public override int EffectID => 0xF42;
Expand Down
5 changes: 4 additions & 1 deletion Projects/UOContent/Items/Weapons/Staves/GlassStaff.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ namespace Server.Items
public partial class GlassStaff : BaseStaff
{
[Constructible]
public GlassStaff() : base(0x905) =>
public GlassStaff() : base(0x905)
{
Weight = 4.0;
Resource = CraftResource.None;
}

public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike;
Expand Down
6 changes: 5 additions & 1 deletion Projects/UOContent/Items/Weapons/Staves/GnarledStaff.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ namespace Server.Items
public partial class GnarledStaff : BaseStaff
{
[Constructible]
public GnarledStaff() : base(0x13F8) => Weight = 3.0;
public GnarledStaff() : base(0x13F8)
{
Weight = 3.0;
Resource = CraftResource.RegularWood;
}

public override WeaponAbility PrimaryAbility => WeaponAbility.ConcussionBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.ForceOfNature;
Expand Down
6 changes: 5 additions & 1 deletion Projects/UOContent/Items/Weapons/Staves/QuarterStaff.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ namespace Server.Items
public partial class QuarterStaff : BaseStaff
{
[Constructible]
public QuarterStaff() : base(0xE89) => Weight = 4.0;
public QuarterStaff() : base(0xE89)
{
Weight = 4.0;
Resource = CraftResource.RegularWood;
}

public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public partial class SerpentstoneStaff : BaseStaff
[Constructible]
public SerpentstoneStaff() : base(0x906)
{
Resource = CraftResource.RegularWood;
}

public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow;
Expand Down
6 changes: 5 additions & 1 deletion Projects/UOContent/Items/Weapons/Staves/ShepherdsCrook.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ namespace Server.Items
public partial class ShepherdsCrook : BaseStaff
{
[Constructible]
public ShepherdsCrook() : base(0xE81) => Weight = 4.0;
public ShepherdsCrook() : base(0xE81)
{
Weight = 4.0;
Resource = CraftResource.RegularWood;
}

public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
Expand Down
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Bears/BlackBear.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public BlackBear() : base(AIType.AI_Animal, FightMode.Aggressor)

public override int Meat => 1;
public override int Hides => 12;
public override FoodType FavoriteFood => FoodType.Fish | FoodType.Meat | FoodType.FruitsAndVegies;
public override FoodType FavoriteFood => FoodType.Fish | FoodType.Meat | FoodType.FruitsAndVeggies;
public override PackInstinct PackInstinct => PackInstinct.Bear;
}
}
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Bears/BrownBear.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public BrownBear() : base(AIType.AI_Animal, FightMode.Aggressor)

public override int Meat => 1;
public override int Hides => 12;
public override FoodType FavoriteFood => FoodType.Fish | FoodType.FruitsAndVegies | FoodType.Meat;
public override FoodType FavoriteFood => FoodType.Fish | FoodType.FruitsAndVeggies | FoodType.Meat;
public override PackInstinct PackInstinct => PackInstinct.Bear;
}
}
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Bears/GrizzlyBear.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public GrizzlyBear() : base(AIType.AI_Animal, FightMode.Aggressor)

public override int Meat => 2;
public override int Hides => 16;
public override FoodType FavoriteFood => FoodType.Fish | FoodType.FruitsAndVegies | FoodType.Meat;
public override FoodType FavoriteFood => FoodType.Fish | FoodType.FruitsAndVeggies | FoodType.Meat;
public override PackInstinct PackInstinct => PackInstinct.Bear;
}
}
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Bears/PolarBear.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public PolarBear() : base(AIType.AI_Animal, FightMode.Aggressor)

public override int Meat => 2;
public override int Hides => 16;
public override FoodType FavoriteFood => FoodType.Fish | FoodType.FruitsAndVegies | FoodType.Meat;
public override FoodType FavoriteFood => FoodType.Fish | FoodType.FruitsAndVeggies | FoodType.Meat;
public override PackInstinct PackInstinct => PackInstinct.Bear;
}
}
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Cows/Cow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public Cow() : base(AIType.AI_Animal, FightMode.Aggressor)

public override int Meat => 8;
public override int Hides => 12;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;

public override void OnDoubleClick(Mobile from)
{
Expand Down
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Misc/Boar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ public Boar() : base(AIType.AI_Animal, FightMode.Aggressor)
public override string DefaultName => "a boar";

public override int Meat => 2;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;
}
}
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Misc/Goat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ public Goat() : base(AIType.AI_Animal, FightMode.Aggressor)

public override int Meat => 2;
public override int Hides => 8;
public override FoodType FavoriteFood => FoodType.GrainsAndHay | FoodType.FruitsAndVegies;
public override FoodType FavoriteFood => FoodType.GrainsAndHay | FoodType.FruitsAndVeggies | FoodType.Leather;
}
}
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Misc/Gorilla.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ public Gorilla() : base(AIType.AI_Animal, FightMode.Aggressor)

public override int Meat => 1;
public override int Hides => 6;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;
}
}
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Misc/GreatHart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public GreatHart() : base(AIType.AI_Animal, FightMode.Aggressor)

public override int Meat => 6;
public override int Hides => 15;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;

public override int GetAttackSound() => 0x82;

Expand Down
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Misc/Hind.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public Hind() : base(AIType.AI_Animal, FightMode.Aggressor)

public override int Meat => 5;
public override int Hides => 8;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;

public override int GetAttackSound() => 0x82;

Expand Down
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Misc/Llama.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ public Llama() : base(AIType.AI_Animal, FightMode.Aggressor)

public override int Meat => 1;
public override int Hides => 12;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;
}
}
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Misc/MountainGoat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ public MountainGoat() : base(AIType.AI_Animal, FightMode.Aggressor)

public override int Meat => 2;
public override int Hides => 12;
public override FoodType FavoriteFood => FoodType.GrainsAndHay | FoodType.FruitsAndVegies;
public override FoodType FavoriteFood => FoodType.GrainsAndHay | FoodType.FruitsAndVeggies;
}
}
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Misc/PackHorse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public PackHorse() : base(AIType.AI_Animal, FightMode.Aggressor)

public override int Meat => 3;
public override int Hides => 10;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;

public override bool OnBeforeDeath()
{
Expand Down
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Misc/PackLlama.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public PackLlama() : base(AIType.AI_Animal, FightMode.Aggressor)
public override string DefaultName => "a pack llama";

public override int Meat => 1;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;

public override bool OnBeforeDeath()
{
Expand Down
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Misc/Pig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ public Pig() : base(AIType.AI_Animal, FightMode.Aggressor)
public override string DefaultName => "a pig";

public override int Meat => 1;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;
}
}
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Misc/Sheep.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public DateTime NextWoolTime

public override int Meat => 3;
public override MeatType MeatType => MeatType.LambLeg;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;

public override int Wool => Body == 0xCF ? 3 : 0;

Expand Down
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Mounts/DesertOstard.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public DesertOstard() : base(0xD2, 0x3EA3, AIType.AI_Animal, FightMode.Aggressor
public override string CorpseName => "an ostard corpse";

public override int Meat => 3;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;
public override PackInstinct PackInstinct => PackInstinct.Ostard;
}
}
2 changes: 1 addition & 1 deletion Projects/UOContent/Mobiles/Animals/Mounts/ForestOstard.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public ForestOstard() : base(0xDB, 0x3EA5, AIType.AI_Animal, FightMode.Aggressor
public override string CorpseName => "an ostard corpse";

public override int Meat => 3;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override FoodType FavoriteFood => FoodType.FruitsAndVeggies | FoodType.GrainsAndHay;
public override PackInstinct PackInstinct => PackInstinct.Ostard;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public FrenziedOstard() : base(0xDA, 0x3EA4, AIType.AI_Melee)
public override string CorpseName => "an ostard corpse";

public override int Meat => 3;
public override FoodType FavoriteFood => FoodType.Meat | FoodType.Fish | FoodType.Eggs | FoodType.FruitsAndVegies;
public override FoodType FavoriteFood => FoodType.Meat | FoodType.Fish | FoodType.Eggs | FoodType.FruitsAndVeggies;
public override PackInstinct PackInstinct => PackInstinct.Ostard;
}
}

0 comments on commit 974062b

Please sign in to comment.