feat: Adds leather/metal food, fixes weapons/armors with wrong materials (#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.
This commit is contained in:
parent
29ea813242
commit
974062b0d4
61 changed files with 266 additions and 128 deletions
|
|
@ -23,6 +23,6 @@ namespace Server.Items
|
|||
|
||||
public override int ArmorBase => 30;
|
||||
|
||||
public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate;
|
||||
public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ public abstract partial class BaseWand : BaseBashing
|
|||
Attributes.SpellChanneling = 1;
|
||||
Attributes.CastSpeed = -1;
|
||||
WeaponAttributes.MageWeapon = Utility.RandomMinMax(1, 10);
|
||||
Resource = CraftResource.None;
|
||||
}
|
||||
|
||||
public override WeaponAbility PrimaryAbility => WeaponAbility.Dismount;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ namespace Server.Items
|
|||
{
|
||||
Weight = 6.0;
|
||||
Layer = Layer.TwoHanded;
|
||||
Resource = CraftResource.RegularWood;
|
||||
}
|
||||
|
||||
public override int EffectID => 0xF42;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ namespace Server.Items
|
|||
{
|
||||
Weight = 7.0;
|
||||
Layer = Layer.TwoHanded;
|
||||
Resource = CraftResource.RegularWood;
|
||||
}
|
||||
|
||||
public override int EffectID => 0x1BFE;
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ namespace Server.Items
|
|||
{
|
||||
Weight = 9.0;
|
||||
Layer = Layer.TwoHanded;
|
||||
Resource = CraftResource.RegularWood;
|
||||
}
|
||||
|
||||
public override int EffectID => 0x1BFE;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ namespace Server.Items
|
|||
[Constructible]
|
||||
public JukaBow()
|
||||
{
|
||||
Resource = CraftResource.RegularWood;
|
||||
}
|
||||
|
||||
public override int AosStrengthReq => 80;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ namespace Server.Items
|
|||
{
|
||||
Weight = 9.0;
|
||||
Layer = Layer.TwoHanded;
|
||||
Resource = CraftResource.RegularWood;
|
||||
}
|
||||
|
||||
public override int EffectID => 0xF42;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ namespace Server.Items
|
|||
[Constructible]
|
||||
public SerpentstoneStaff() : base(0x906)
|
||||
{
|
||||
Resource = CraftResource.RegularWood;
|
||||
}
|
||||
|
||||
public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue