Formatting FIxes (#58)

This commit is contained in:
Kamron Batman 2019-10-04 23:08:13 -07:00 committed by GitHub
parent 57fb9fb525
commit 096d39609e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1318 changed files with 11633 additions and 22129 deletions

View file

@ -51,10 +51,7 @@ namespace Server.Items
BeginBleed(defender, attacker);
}
public static bool IsBleeding(Mobile m)
{
return m_Table.ContainsKey(m);
}
public static bool IsBleeding(Mobile m) => m_Table.ContainsKey(m);
public static void BeginBleed(Mobile m, Mobile from)
{

View file

@ -17,10 +17,7 @@ namespace Server.Items
{
public override int BaseMana => 15;
public override bool RequiresTactics(Mobile from)
{
return false;
}
public override bool RequiresTactics(Mobile from) => false;
public override void OnHit(Mobile attacker, Mobile defender, int damage)
{

View file

@ -34,10 +34,7 @@ namespace Server.Items
BeginWound(defender, defender.Player ? PlayerDuration : NPCDuration);
}
public static bool IsWounded(Mobile m)
{
return m_Table.ContainsKey(m);
}
public static bool IsWounded(Mobile m) => m_Table.ContainsKey(m);
public static void BeginWound(Mobile m, TimeSpan duration)
{

View file

@ -11,10 +11,7 @@ namespace Server.Items
public override bool ValidatesDuringHit => false;
public override bool OnBeforeSwing(Mobile attacker, Mobile defender)
{
return Validate(attacker) && CheckMana(attacker, true);
}
public override bool OnBeforeSwing(Mobile attacker, Mobile defender) => Validate(attacker) && CheckMana(attacker, true);
public override void OnMiss(Mobile attacker, Mobile defender)
{

View file

@ -36,10 +36,7 @@ namespace Server.Items
return false;
}*/
public override bool RequiresTactics(Mobile from)
{
return !(from.Weapon is BaseWeapon weapon && weapon.Skill == SkillName.Wrestling);
}
public override bool RequiresTactics(Mobile from) => !(from.Weapon is BaseWeapon weapon && weapon.Skill == SkillName.Wrestling);
public override bool OnBeforeSwing(Mobile attacker, Mobile defender)
{
@ -80,10 +77,7 @@ namespace Server.Items
BeginImmunity(defender, duration + FreezeDelayDuration);
}
public static bool IsImmune(Mobile m)
{
return m_Table.ContainsKey(m);
}
public static bool IsImmune(Mobile m) => m_Table.ContainsKey(m);
public static void BeginImmunity(Mobile m, TimeSpan duration)
{

View file

@ -10,10 +10,7 @@ namespace Server.Items
public override int BaseMana => 20;
public override double DamageScalar => 1.25;
public override bool RequiresTactics(Mobile from)
{
return false;
}
public override bool RequiresTactics(Mobile from) => false;
public override bool CheckSkills(Mobile from)
{

View file

@ -102,21 +102,11 @@ namespace Server.Items
{
}
public virtual bool OnBeforeSwing(Mobile attacker, Mobile defender)
{
// Here because you must be sure you can use the skill before calling CheckHit if the ability has a HCI bonus for example
return true;
}
public virtual bool OnBeforeSwing(Mobile attacker, Mobile defender) => true;
public virtual bool OnBeforeDamage(Mobile attacker, Mobile defender)
{
return true;
}
public virtual bool OnBeforeDamage(Mobile attacker, Mobile defender) => true;
public virtual bool RequiresTactics(Mobile from)
{
return true;
}
public virtual bool RequiresTactics(Mobile from) => true;
public virtual double GetRequiredSkill(Mobile from)
{
@ -203,10 +193,7 @@ namespace Server.Items
return false;
}
public virtual bool CheckSkills(Mobile from)
{
return CheckWeaponSkill(from);
}
public virtual bool CheckSkills(Mobile from) => CheckWeaponSkill(from);
public virtual double GetSkill(Mobile from, SkillName skillName) => from.Skills[skillName]?.Value ?? 0.0;
@ -327,11 +314,9 @@ namespace Server.Items
return CheckSkills(from) && CheckMana(from, false);
}
public static bool IsWeaponAbility(Mobile m, WeaponAbility a)
{
return a == null || !m.Player || m.Weapon is BaseWeapon weapon &&
(weapon.PrimaryAbility == a || weapon.SecondaryAbility == a);
}
public static bool IsWeaponAbility(Mobile m, WeaponAbility a) =>
a == null || !m.Player || m.Weapon is BaseWeapon weapon &&
(weapon.PrimaryAbility == a || weapon.SecondaryAbility == a);
public static WeaponAbility GetCurrentAbility(Mobile m)
{
@ -459,10 +444,7 @@ namespace Server.Items
private class WeaponAbilityContext
{
public WeaponAbilityContext(Timer timer)
{
Timer = timer;
}
public WeaponAbilityContext(Timer timer) => Timer = timer;
public Timer Timer{ get; }
}

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Axe : BaseAxe
{
[Constructible]
public Axe() : base(0xF49)
{
Weight = 4.0;
}
public Axe() : base(0xF49) => Weight = 4.0;
public Axe(Serial serial) : base(serial)
{

View file

@ -18,10 +18,7 @@ namespace Server.Items
private int m_UsesRemaining;
public BaseAxe(int itemID) : base(itemID)
{
m_UsesRemaining = 150;
}
public BaseAxe(int itemID) : base(itemID) => m_UsesRemaining = 150;
public BaseAxe(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class DoubleAxe : BaseAxe
{
[Constructible]
public DoubleAxe() : base(0xF4B)
{
Weight = 8.0;
}
public DoubleAxe() : base(0xF4B) => Weight = 8.0;
public DoubleAxe(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class ExecutionersAxe : BaseAxe
{
[Constructible]
public ExecutionersAxe() : base(0xF45)
{
Weight = 8.0;
}
public ExecutionersAxe() : base(0xF45) => Weight = 8.0;
public ExecutionersAxe(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Hatchet : BaseAxe
{
[Constructible]
public Hatchet() : base(0xF43)
{
Weight = 4.0;
}
public Hatchet() : base(0xF43) => Weight = 4.0;
public Hatchet(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class HeavyOrnateAxe : OrnateAxe
{
[Constructible]
public HeavyOrnateAxe()
{
Attributes.WeaponDamage = 8;
}
public HeavyOrnateAxe() => Attributes.WeaponDamage = 8;
public HeavyOrnateAxe(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class LargeBattleAxe : BaseAxe
{
[Constructible]
public LargeBattleAxe() : base(0x13FB)
{
Weight = 6.0;
}
public LargeBattleAxe() : base(0x13FB) => Weight = 6.0;
public LargeBattleAxe(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class ThunderingAxe : OrnateAxe
{
[Constructible]
public ThunderingAxe()
{
WeaponAttributes.HitLightning = 10;
}
public ThunderingAxe() => WeaponAttributes.HitLightning = 10;
public ThunderingAxe(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class TwoHandedAxe : BaseAxe
{
[Constructible]
public TwoHandedAxe() : base(0x1443)
{
Weight = 8.0;
}
public TwoHandedAxe() : base(0x1443) => Weight = 8.0;
public TwoHandedAxe(Serial serial) : base(serial)
{

View file

@ -6,10 +6,7 @@ namespace Server.Items
public class WarAxe : BaseAxe
{
[Constructible]
public WarAxe() : base(0x13B0)
{
Weight = 8.0;
}
public WarAxe() : base(0x13B0) => Weight = 8.0;
public WarAxe(Serial serial) : base(serial)
{

View file

@ -255,10 +255,7 @@ namespace Server.Items
SpecialMove.ClearCurrentMove(attacker);
}
public virtual TimeSpan OnSwing(Mobile attacker, Mobile defender)
{
return OnSwing(attacker, defender, 1.0);
}
public virtual TimeSpan OnSwing(Mobile attacker, Mobile defender) => OnSwing(attacker, defender, 1.0);
public virtual void GetStatusDamage(Mobile from, out int min, out int max)
{
@ -375,11 +372,9 @@ namespace Server.Items
return false;
}
public override bool AllowSecureTrade(Mobile from, Mobile to, Mobile newOwner, bool accepted)
{
return Ethic.CheckTrade(from, to, newOwner, this) &&
base.AllowSecureTrade(from, to, newOwner, accepted);
}
public override bool AllowSecureTrade(Mobile from, Mobile to, Mobile newOwner, bool accepted) =>
Ethic.CheckTrade(from, to, newOwner, this) &&
base.AllowSecureTrade(from, to, newOwner, accepted);
public override bool CanEquip(Mobile from)
{
@ -553,20 +548,11 @@ namespace Server.Items
return sk;
}
public virtual double GetAttackSkillValue(Mobile attacker, Mobile defender)
{
return attacker.Skills[GetUsedSkill(attacker, true)].Value;
}
public virtual double GetAttackSkillValue(Mobile attacker, Mobile defender) => attacker.Skills[GetUsedSkill(attacker, true)].Value;
public virtual double GetDefendSkillValue(Mobile attacker, Mobile defender)
{
return defender.Skills[GetUsedSkill(defender, true)].Value;
}
public virtual double GetDefendSkillValue(Mobile attacker, Mobile defender) => defender.Skills[GetUsedSkill(defender, true)].Value;
private static bool CheckAnimal(Mobile m, Type type)
{
return AnimalForm.UnderTransformation(m, type);
}
private static bool CheckAnimal(Mobile m, Type type) => AnimalForm.UnderTransformation(m, type);
public virtual bool CheckHit(Mobile attacker, Mobile defender)
{
@ -1786,10 +1772,7 @@ namespace Server.Items
return damage + (int)(damage * totalBonus);
}
public virtual int ComputeDamageAOS(Mobile attacker, Mobile defender)
{
return (int)ScaleDamageAOS(attacker, GetBaseDamage(attacker), true);
}
public virtual int ComputeDamageAOS(Mobile attacker, Mobile defender) => (int)ScaleDamageAOS(attacker, GetBaseDamage(attacker), true);
public virtual double ScaleDamageOld(Mobile attacker, double damage, bool checkSkills)
{
@ -1981,10 +1964,7 @@ namespace Server.Items
from.Animate(action, 7, 1, true, false, 0);
}
private string GetNameString()
{
return Name ?? $"#{LabelNumber}";
}
private string GetNameString() => Name ?? $"#{LabelNumber}";
public int GetElementalDamageHue()
{
@ -2461,10 +2441,7 @@ namespace Server.Items
{
private Mobile m_Mobile;
public ResetEquipTimer(Mobile m, TimeSpan duration) : base(duration)
{
m_Mobile = m;
}
public ResetEquipTimer(Mobile m, TimeSpan duration) : base(duration) => m_Mobile = m;
protected override void OnTick()
{
@ -2928,20 +2905,11 @@ namespace Server.Items
return sound;
}
public virtual int GetHitDefendSound(Mobile attacker, Mobile defender)
{
return defender.GetHurtSound();
}
public virtual int GetHitDefendSound(Mobile attacker, Mobile defender) => defender.GetHurtSound();
public virtual int GetMissAttackSound(Mobile attacker, Mobile defender)
{
return attacker.GetAttackSound() == -1 ? MissSound : -1;
}
public virtual int GetMissAttackSound(Mobile attacker, Mobile defender) => attacker.GetAttackSound() == -1 ? MissSound : -1;
public virtual int GetMissDefendSound(Mobile attacker, Mobile defender)
{
return -1;
}
public virtual int GetMissDefendSound(Mobile attacker, Mobile defender) => -1;
#endregion
@ -3108,10 +3076,7 @@ namespace Server.Items
flags |= toSet;
}
private static bool GetSaveFlag(SaveFlag flags, SaveFlag toGet)
{
return (flags & toGet) != 0;
}
private static bool GetSaveFlag(SaveFlag flags, SaveFlag toGet) => (flags & toGet) != 0;
public override void Serialize(GenericWriter writer)
{

View file

@ -11,10 +11,7 @@ namespace Server.Items
private static HashSet<Mobile> m_AttackTable = new HashSet<Mobile>();
private static HashSet<Mobile> m_DefenseTable = new HashSet<Mobile>();
public static bool IsUnderAttackEffect(Mobile m)
{
return m_AttackTable.Contains(m);
}
public static bool IsUnderAttackEffect(Mobile m) => m_AttackTable.Contains(m);
public static bool ApplyAttack(Mobile m)
{
@ -34,10 +31,7 @@ namespace Server.Items
m.SendLocalizedMessage(1062320); // Your attack chance has returned to normal.
}
public static bool IsUnderDefenseEffect(Mobile m)
{
return m_DefenseTable.Contains(m);
}
public static bool IsUnderDefenseEffect(Mobile m) => m_DefenseTable.Contains(m);
public static bool ApplyDefense(Mobile m)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class ButcherKnife : BaseKnife
{
[Constructible]
public ButcherKnife() : base(0x13F6)
{
Weight = 1.0;
}
public ButcherKnife() : base(0x13F6) => Weight = 1.0;
public ButcherKnife(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Cleaver : BaseKnife
{
[Constructible]
public Cleaver() : base(0xEC3)
{
Weight = 2.0;
}
public Cleaver() : base(0xEC3) => Weight = 2.0;
public Cleaver(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Dagger : BaseKnife
{
[Constructible]
public Dagger() : base(0xF52)
{
Weight = 1.0;
}
public Dagger() : base(0xF52) => Weight = 1.0;
public Dagger(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class SkinningKnife : BaseKnife
{
[Constructible]
public SkinningKnife() : base(0xEC4)
{
Weight = 1.0;
}
public SkinningKnife() : base(0xEC4) => Weight = 1.0;
public SkinningKnife(Serial serial) : base(serial)
{

View file

@ -50,10 +50,7 @@ namespace Server.Items
{
private ThrowingDagger m_Dagger;
public InternalTarget(ThrowingDagger dagger) : base(10, false, TargetFlags.Harmful)
{
m_Dagger = dagger;
}
public InternalTarget(ThrowingDagger dagger) : base(10, false, TargetFlags.Harmful) => m_Dagger = dagger;
protected override void OnTarget(Mobile from, object targeted)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class AssassinSpike : BaseKnife
{
[Constructible]
public AssassinSpike() : base(0x2D21)
{
Weight = 4.0;
}
public AssassinSpike() : base(0x2D21) => Weight = 4.0;
public AssassinSpike(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class DiamondMace : BaseBashing
{
[Constructible]
public DiamondMace() : base(0x2D24)
{
Weight = 10.0;
}
public DiamondMace() : base(0x2D24) => Weight = 10.0;
public DiamondMace(Serial serial) : base(serial)
{

View file

@ -6,10 +6,7 @@ namespace Server.Items
public class ElvenCompositeLongbow : BaseRanged
{
[Constructible]
public ElvenCompositeLongbow() : base(0x2D1E)
{
Weight = 8.0;
}
public ElvenCompositeLongbow() : base(0x2D1E) => Weight = 8.0;
public ElvenCompositeLongbow(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class ElvenMachete : BaseSword
{
[Constructible]
public ElvenMachete() : base(0x2D35)
{
Weight = 6.0;
}
public ElvenMachete() : base(0x2D35) => Weight = 6.0;
public ElvenMachete(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Leafblade : BaseKnife
{
[Constructible]
public Leafblade() : base(0x2D22)
{
Weight = 8.0;
}
public Leafblade() : base(0x2D22) => Weight = 8.0;
public Leafblade(Serial serial) : base(serial)
{

View file

@ -6,10 +6,7 @@ namespace Server.Items
public class MagicalShortbow : BaseRanged
{
[Constructible]
public MagicalShortbow() : base(0x2D2B)
{
Weight = 6.0;
}
public MagicalShortbow() : base(0x2D2B) => Weight = 6.0;
public MagicalShortbow(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class RadiantScimitar : BaseSword
{
[Constructible]
public RadiantScimitar() : base(0x2D33)
{
Weight = 9.0;
}
public RadiantScimitar() : base(0x2D33) => Weight = 9.0;
public RadiantScimitar(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class WarCleaver : BaseKnife
{
[Constructible]
public WarCleaver() : base(0x2D2F)
{
Weight = 10.0;
}
public WarCleaver() : base(0x2D2F) => Weight = 10.0;
public WarCleaver(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class WildStaff : BaseStaff
{
[Constructible]
public WildStaff() : base(0x2D25)
{
Weight = 8.0;
}
public WildStaff() : base(0x2D25) => Weight = 8.0;
public WildStaff(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Club : BaseBashing
{
[Constructible]
public Club() : base(0x13B4)
{
Weight = 9.0;
}
public Club() : base(0x13B4) => Weight = 9.0;
public Club(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class EmeraldMace : DiamondMace
{
[Constructible]
public EmeraldMace()
{
WeaponAttributes.ResistPoisonBonus = 5;
}
public EmeraldMace() => WeaponAttributes.ResistPoisonBonus = 5;
public EmeraldMace(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Mace : BaseBashing
{
[Constructible]
public Mace() : base(0xF5C)
{
Weight = 14.0;
}
public Mace() : base(0xF5C) => Weight = 14.0;
public Mace(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class MagicWand : BaseBashing
{
[Constructible]
public MagicWand() : base(0xDF2)
{
Weight = 1.0;
}
public MagicWand() : base(0xDF2) => Weight = 1.0;
public MagicWand(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Maul : BaseBashing
{
[Constructible]
public Maul() : base(0x143B)
{
Weight = 10.0;
}
public Maul() : base(0x143B) => Weight = 10.0;
public Maul(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class RubyMace : DiamondMace
{
[Constructible]
public RubyMace()
{
Attributes.WeaponDamage = 5;
}
public RubyMace() => Attributes.WeaponDamage = 5;
public RubyMace(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class SapphireMace : DiamondMace
{
[Constructible]
public SapphireMace()
{
WeaponAttributes.ResistEnergyBonus = 5;
}
public SapphireMace() => WeaponAttributes.ResistEnergyBonus = 5;
public SapphireMace(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Scepter : BaseBashing
{
[Constructible]
public Scepter() : base(0x26BC)
{
Weight = 8.0;
}
public Scepter() : base(0x26BC) => Weight = 8.0;
public Scepter(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class SilverEtchedMace : DiamondMace
{
[Constructible]
public SilverEtchedMace()
{
Slayer = SlayerName.Exorcism;
}
public SilverEtchedMace() => Slayer = SlayerName.Exorcism;
public SilverEtchedMace(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class WarMace : BaseBashing
{
[Constructible]
public WarMace() : base(0x1407)
{
Weight = 17.0;
}
public WarMace() : base(0x1407) => Weight = 17.0;
public WarMace(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Bardiche : BasePoleArm
{
[Constructible]
public Bardiche() : base(0xF4D)
{
Weight = 7.0;
}
public Bardiche() : base(0xF4D) => Weight = 7.0;
public Bardiche(Serial serial) : base(serial)
{

View file

@ -12,10 +12,7 @@ namespace Server.Items
private int m_UsesRemaining;
public BasePoleArm(int itemID) : base(itemID)
{
m_UsesRemaining = 150;
}
public BasePoleArm(int itemID) : base(itemID) => m_UsesRemaining = 150;
public BasePoleArm(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Halberd : BasePoleArm
{
[Constructible]
public Halberd() : base(0x143E)
{
Weight = 16.0;
}
public Halberd() : base(0x143E) => Weight = 16.0;
public Halberd(Serial serial) : base(serial)
{

View file

@ -6,10 +6,7 @@ namespace Server.Items
public class Scythe : BasePoleArm
{
[Constructible]
public Scythe() : base(0x26BA)
{
Weight = 5.0;
}
public Scythe() : base(0x26BA) => Weight = 5.0;
public Scythe(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class BarbedLongbow : ElvenCompositeLongbow
{
[Constructible]
public BarbedLongbow()
{
Attributes.ReflectPhysical = 12;
}
public BarbedLongbow() => Attributes.ReflectPhysical = 12;
public BarbedLongbow(Serial serial) : base(serial)
{

View file

@ -6,10 +6,7 @@ namespace Server.Items
public class CompositeBow : BaseRanged
{
[Constructible]
public CompositeBow() : base(0x26C2)
{
Weight = 5.0;
}
public CompositeBow() : base(0x26C2) => Weight = 5.0;
public CompositeBow(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class LightweightShortbow : MagicalShortbow
{
[Constructible]
public LightweightShortbow()
{
Balanced = true;
}
public LightweightShortbow() => Balanced = true;
public LightweightShortbow(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class LongbowOfMight : ElvenCompositeLongbow
{
[Constructible]
public LongbowOfMight()
{
Attributes.WeaponDamage = 5;
}
public LongbowOfMight() => Attributes.WeaponDamage = 5;
public LongbowOfMight(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class RangersShortbow : MagicalShortbow
{
[Constructible]
public RangersShortbow()
{
Attributes.WeaponSpeed = 5;
}
public RangersShortbow() => Attributes.WeaponSpeed = 5;
public RangersShortbow(Serial serial) : base(serial)
{

View file

@ -6,10 +6,7 @@ namespace Server.Items
public class RepeatingCrossbow : BaseRanged
{
[Constructible]
public RepeatingCrossbow() : base(0x26C3)
{
Weight = 6.0;
}
public RepeatingCrossbow() : base(0x26C3) => Weight = 6.0;
public RepeatingCrossbow(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class SlayerLongbow : ElvenCompositeLongbow
{
[Constructible]
public SlayerLongbow()
{
Slayer2 = (SlayerName)Utility.RandomMinMax(1, 27);
}
public SlayerLongbow() => Slayer2 = (SlayerName)Utility.RandomMinMax(1, 27);
public SlayerLongbow(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Bokuto : BaseSword
{
[Constructible]
public Bokuto() : base(0x27A8)
{
Weight = 7.0;
}
public Bokuto() : base(0x27A8) => Weight = 7.0;
public Bokuto(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Nunchaku : BaseBashing
{
[Constructible]
public Nunchaku() : base(0x27AE)
{
Weight = 5.0;
}
public Nunchaku() : base(0x27AE) => Weight = 5.0;
public Nunchaku(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class BladedStaff : BaseSpear
{
[Constructible]
public BladedStaff() : base(0x26BD)
{
Weight = 4.0;
}
public BladedStaff() : base(0x26BD) => Weight = 4.0;
public BladedStaff(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class DoubleBladedStaff : BaseSpear
{
[Constructible]
public DoubleBladedStaff() : base(0x26BF)
{
Weight = 2.0;
}
public DoubleBladedStaff() : base(0x26BF) => Weight = 2.0;
public DoubleBladedStaff(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Pike : BaseSpear
{
[Constructible]
public Pike() : base(0x26BE)
{
Weight = 8.0;
}
public Pike() : base(0x26BE) => Weight = 8.0;
public Pike(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Pitchfork : BaseSpear
{
[Constructible]
public Pitchfork() : base(0xE87)
{
Weight = 11.0;
}
public Pitchfork() : base(0xE87) => Weight = 11.0;
public Pitchfork(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class ShortSpear : BaseSpear
{
[Constructible]
public ShortSpear() : base(0x1403)
{
Weight = 4.0;
}
public ShortSpear() : base(0x1403) => Weight = 4.0;
public ShortSpear(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Spear : BaseSpear
{
[Constructible]
public Spear() : base(0xF62)
{
Weight = 7.0;
}
public Spear() : base(0xF62) => Weight = 7.0;
public Spear(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class WarFork : BaseSpear
{
[Constructible]
public WarFork() : base(0x1405)
{
Weight = 9.0;
}
public WarFork() : base(0x1405) => Weight = 9.0;
public WarFork(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class BlackStaff : BaseStaff
{
[Constructible]
public BlackStaff() : base(0xDF0)
{
Weight = 6.0;
}
public BlackStaff() : base(0xDF0) => Weight = 6.0;
public BlackStaff(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class GnarledStaff : BaseStaff
{
[Constructible]
public GnarledStaff() : base(0x13F8)
{
Weight = 3.0;
}
public GnarledStaff() : base(0x13F8) => Weight = 3.0;
public GnarledStaff(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class QuarterStaff : BaseStaff
{
[Constructible]
public QuarterStaff() : base(0xE89)
{
Weight = 4.0;
}
public QuarterStaff() : base(0xE89) => Weight = 4.0;
public QuarterStaff(Serial serial) : base(serial)
{

View file

@ -10,10 +10,7 @@ namespace Server.Items
public class ShepherdsCrook : BaseStaff
{
[Constructible]
public ShepherdsCrook() : base(0xE81)
{
Weight = 4.0;
}
public ShepherdsCrook() : base(0xE81) => Weight = 4.0;
public ShepherdsCrook(Serial serial) : base(serial)
{
@ -133,10 +130,7 @@ namespace Server.Items
{
private BaseCreature m_Creature;
public InternalTarget(BaseCreature c) : base(10, true, TargetFlags.None)
{
m_Creature = c;
}
public InternalTarget(BaseCreature c) : base(10, true, TargetFlags.None) => m_Creature = c;
protected override void OnTarget(Mobile from, object targ)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class AdventurersMachete : ElvenMachete
{
[Constructible]
public AdventurersMachete()
{
Attributes.Luck = 20;
}
public AdventurersMachete() => Attributes.Luck = 20;
public AdventurersMachete(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class BoneHarvester : BaseSword
{
[Constructible]
public BoneHarvester() : base(0x26BB)
{
Weight = 3.0;
}
public BoneHarvester() : base(0x26BB) => Weight = 3.0;
public BoneHarvester(Serial serial) : base(serial)
{

View file

@ -5,10 +5,7 @@ namespace Server.Items
public class BoneMachete : ElvenMachete, ITicket
{
[Constructible]
public BoneMachete()
{
ItemID = 0x20E;
}
public BoneMachete() => ItemID = 0x20E;
public BoneMachete(Serial serial)
: base(serial)

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Broadsword : BaseSword
{
[Constructible]
public Broadsword() : base(0xF5E)
{
Weight = 6.0;
}
public Broadsword() : base(0xF5E) => Weight = 6.0;
public Broadsword(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class ChargedAssassinSpike : AssassinSpike
{
[Constructible]
public ChargedAssassinSpike()
{
WeaponAttributes.HitLightning = 10;
}
public ChargedAssassinSpike() => WeaponAttributes.HitLightning = 10;
public ChargedAssassinSpike(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class CrescentBlade : BaseSword
{
[Constructible]
public CrescentBlade() : base(0x26C1)
{
Weight = 1.0;
}
public CrescentBlade() : base(0x26C1) => Weight = 1.0;
public CrescentBlade(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Cutlass : BaseSword
{
[Constructible]
public Cutlass() : base(0x1441)
{
Weight = 8.0;
}
public Cutlass() : base(0x1441) => Weight = 8.0;
public Cutlass(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class DarkglowScimitar : RadiantScimitar
{
[Constructible]
public DarkglowScimitar()
{
WeaponAttributes.HitDispel = 10;
}
public DarkglowScimitar() => WeaponAttributes.HitDispel = 10;
public DarkglowScimitar(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class DiseasedMachete : ElvenMachete
{
[Constructible]
public DiseasedMachete()
{
WeaponAttributes.HitPoisonArea = 25;
}
public DiseasedMachete() => WeaponAttributes.HitPoisonArea = 25;
public DiseasedMachete(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class FierySpellblade : ElvenSpellblade
{
[Constructible]
public FierySpellblade()
{
WeaponAttributes.ResistFireBonus = 5;
}
public FierySpellblade() => WeaponAttributes.ResistFireBonus = 5;
public FierySpellblade(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class IcyScimitar : RadiantScimitar
{
[Constructible]
public IcyScimitar()
{
WeaponAttributes.HitHarm = 15;
}
public IcyScimitar() => WeaponAttributes.HitHarm = 15;
public IcyScimitar(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class IcySpellblade : ElvenSpellblade
{
[Constructible]
public IcySpellblade()
{
WeaponAttributes.ResistColdBonus = 5;
}
public IcySpellblade() => WeaponAttributes.ResistColdBonus = 5;
public IcySpellblade(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Katana : BaseSword
{
[Constructible]
public Katana() : base(0x13FF)
{
Weight = 6.0;
}
public Katana() : base(0x13FF) => Weight = 6.0;
public Katana(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class KnightsWarCleaver : WarCleaver
{
[Constructible]
public KnightsWarCleaver()
{
Attributes.RegenHits = 3;
}
public KnightsWarCleaver() => Attributes.RegenHits = 3;
public KnightsWarCleaver(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Kryss : BaseSword
{
[Constructible]
public Kryss() : base(0x1401)
{
Weight = 2.0;
}
public Kryss() : base(0x1401) => Weight = 2.0;
public Kryss(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Lance : BaseSword
{
[Constructible]
public Lance() : base(0x26C0)
{
Weight = 12.0;
}
public Lance() : base(0x26C0) => Weight = 12.0;
public Lance(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class LeafbladeOfEase : Leafblade
{
[Constructible]
public LeafbladeOfEase()
{
WeaponAttributes.UseBestSkill = 1;
}
public LeafbladeOfEase() => WeaponAttributes.UseBestSkill = 1;
public LeafbladeOfEase(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Longsword : BaseSword
{
[Constructible]
public Longsword() : base(0xF61)
{
Weight = 7.0;
}
public Longsword() : base(0xF61) => Weight = 7.0;
public Longsword(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class Luckblade : Leafblade
{
[Constructible]
public Luckblade()
{
Attributes.Luck = 20;
}
public Luckblade() => Attributes.Luck = 20;
public Luckblade(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class MacheteOfDefense : ElvenMachete
{
[Constructible]
public MacheteOfDefense()
{
Attributes.DefendChance = 5;
}
public MacheteOfDefense() => Attributes.DefendChance = 5;
public MacheteOfDefense(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class MagekillerAssassinSpike : AssassinSpike
{
[Constructible]
public MagekillerAssassinSpike()
{
WeaponAttributes.HitLeechMana = 16;
}
public MagekillerAssassinSpike() => WeaponAttributes.HitLeechMana = 16;
public MagekillerAssassinSpike(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class MagekillerLeafblade : Leafblade
{
[Constructible]
public MagekillerLeafblade()
{
WeaponAttributes.HitLeechMana = 16;
}
public MagekillerLeafblade() => WeaponAttributes.HitLeechMana = 16;
public MagekillerLeafblade(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class MagesRuneBlade : RuneBlade
{
[Constructible]
public MagesRuneBlade()
{
Attributes.CastSpeed = 1;
}
public MagesRuneBlade() => Attributes.CastSpeed = 1;
public MagesRuneBlade(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class RuneBladeOfKnowledge : RuneBlade
{
[Constructible]
public RuneBladeOfKnowledge()
{
Attributes.SpellDamage = 5;
}
public RuneBladeOfKnowledge() => Attributes.SpellDamage = 5;
public RuneBladeOfKnowledge(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Scimitar : BaseSword
{
[Constructible]
public Scimitar() : base(0x13B6)
{
Weight = 5.0;
}
public Scimitar() : base(0x13B6) => Weight = 5.0;
public Scimitar(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class SerratedWarCleaver : WarCleaver
{
[Constructible]
public SerratedWarCleaver()
{
Attributes.WeaponDamage = 7;
}
public SerratedWarCleaver() => Attributes.WeaponDamage = 7;
public SerratedWarCleaver(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class SpellbladeOfDefense : ElvenSpellblade
{
[Constructible]
public SpellbladeOfDefense()
{
Attributes.DefendChance = 5;
}
public SpellbladeOfDefense() => Attributes.DefendChance = 5;
public SpellbladeOfDefense(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class ThinLongsword : BaseSword
{
[Constructible]
public ThinLongsword() : base(0x13B8)
{
Weight = 1.0;
}
public ThinLongsword() : base(0x13B8) => Weight = 1.0;
public ThinLongsword(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class TrueLeafblade : Leafblade
{
[Constructible]
public TrueLeafblade()
{
WeaponAttributes.ResistPoisonBonus = 5;
}
public TrueLeafblade() => WeaponAttributes.ResistPoisonBonus = 5;
public TrueLeafblade(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class TrueRadiantScimitar : RadiantScimitar
{
[Constructible]
public TrueRadiantScimitar()
{
Attributes.NightSight = 1;
}
public TrueRadiantScimitar() => Attributes.NightSight = 1;
public TrueRadiantScimitar(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class TwinklingScimitar : RadiantScimitar
{
[Constructible]
public TwinklingScimitar()
{
Attributes.DefendChance = 6;
}
public TwinklingScimitar() => Attributes.DefendChance = 6;
public TwinklingScimitar(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class VikingSword : BaseSword
{
[Constructible]
public VikingSword() : base(0x13B9)
{
Weight = 6.0;
}
public VikingSword() : base(0x13B9) => Weight = 6.0;
public VikingSword(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class WoundingAssassinSpike : AssassinSpike
{
[Constructible]
public WoundingAssassinSpike()
{
WeaponAttributes.HitHarm = 15;
}
public WoundingAssassinSpike() => WeaponAttributes.HitHarm = 15;
public WoundingAssassinSpike(Serial serial) : base(serial)
{

Some files were not shown because too many files have changed in this diff Show more