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

Upgrades code style - First batch (#22)

Browse source
This commit is contained in:
Kamron Batman 2018-08-14 06:16:50 +08:00 • committed by GitHub
parent 8ee42c8ea2
commit 632e8b4757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1834 changed files with 10245 additions and 10437 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Scripts/Items/Weapons/SpearsAndForks/BaseSpear.cs
View file

@ -6,12 +6,12 @@ namespace Server.Items
{
public abstract class BaseSpear : BaseMeleeWeapon
{
public override int DefHitSound{ get{ return 0x23C; } }
public override int DefMissSound{ get{ return 0x238; } }
public override int DefHitSound => 0x23C;
public override int DefMissSound => 0x238;
public override SkillName DefSkill{ get{ return SkillName.Fencing; } }
public override WeaponType DefType{ get{ return WeaponType.Piercing; } }
public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Pierce2H; } }
public override SkillName DefSkill => SkillName.Fencing;
public override WeaponType DefType => WeaponType.Piercing;
public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce2H;
public BaseSpear( int itemID ) : base( itemID )
{
@ -57,4 +57,4 @@ namespace Server.Items
}
}
}
}
}

30
Scripts/Items/Weapons/SpearsAndForks/BladedStaff.cs
View file

@ -7,24 +7,24 @@ namespace Server.Items
[FlippableAttribute( 0x26BD, 0x26C7 )]
public class BladedStaff : BaseSpear
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Dismount; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount;
public override int AosStrengthReq{ get{ return 40; } }
public override int AosMinDamage{ get{ return 14; } }
public override int AosMaxDamage{ get{ return 16; } }
public override int AosSpeed{ get{ return 37; } }
public override float MlSpeed{ get{ return 3.00f; } }
public override int AosStrengthReq => 40;
public override int AosMinDamage => 14;
public override int AosMaxDamage => 16;
public override int AosSpeed => 37;
public override float MlSpeed => 3.00f;
public override int OldStrengthReq{ get{ return 40; } }
public override int OldMinDamage{ get{ return 14; } }
public override int OldMaxDamage{ get{ return 16; } }
public override int OldSpeed{ get{ return 37; } }
public override int OldStrengthReq => 40;
public override int OldMinDamage => 14;
public override int OldMaxDamage => 16;
public override int OldSpeed => 37;
public override int InitMinHits{ get{ return 21; } }
public override int InitMaxHits{ get{ return 110; } }
public override int InitMinHits => 21;
public override int InitMaxHits => 110;
public override SkillName DefSkill{ get{ return SkillName.Swords; } }
public override SkillName DefSkill => SkillName.Swords;
[Constructible]
public BladedStaff() : base( 0x26BD )
@ -50,4 +50,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

28
Scripts/Items/Weapons/SpearsAndForks/DoubleBladedStaff.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0x26BF, 0x26C9 )]
public class DoubleBladedStaff : BaseSpear
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.InfectiousStrike; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.InfectiousStrike;
public override int AosStrengthReq{ get{ return 50; } }
public override int AosMinDamage{ get{ return 12; } }
public override int AosMaxDamage{ get{ return 13; } }
public override int AosSpeed{ get{ return 49; } }
public override float MlSpeed{ get{ return 2.25f; } }
public override int AosStrengthReq => 50;
public override int AosMinDamage => 12;
public override int AosMaxDamage => 13;
public override int AosSpeed => 49;
public override float MlSpeed => 2.25f;
public override int OldStrengthReq{ get{ return 50; } }
public override int OldMinDamage{ get{ return 12; } }
public override int OldMaxDamage{ get{ return 13; } }
public override int OldSpeed{ get{ return 49; } }
public override int OldStrengthReq => 50;
public override int OldMinDamage => 12;
public override int OldMaxDamage => 13;
public override int OldSpeed => 49;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 80; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 80;
[Constructible]
public DoubleBladedStaff() : base( 0x26BF )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

28
Scripts/Items/Weapons/SpearsAndForks/Pike.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0x26BE, 0x26C8 )]
public class Pike : BaseSpear
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.InfectiousStrike; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.ParalyzingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.InfectiousStrike;
public override int AosStrengthReq{ get{ return 50; } }
public override int AosMinDamage{ get{ return 14; } }
public override int AosMaxDamage{ get{ return 16; } }
public override int AosSpeed{ get{ return 37; } }
public override float MlSpeed{ get{ return 3.00f; } }
public override int AosStrengthReq => 50;
public override int AosMinDamage => 14;
public override int AosMaxDamage => 16;
public override int AosSpeed => 37;
public override float MlSpeed => 3.00f;
public override int OldStrengthReq{ get{ return 50; } }
public override int OldMinDamage{ get{ return 14; } }
public override int OldMaxDamage{ get{ return 16; } }
public override int OldSpeed{ get{ return 37; } }
public override int OldStrengthReq => 50;
public override int OldMinDamage => 14;
public override int OldMaxDamage => 16;
public override int OldSpeed => 37;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 110; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 110;
[Constructible]
public Pike() : base( 0x26BE )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

28
Scripts/Items/Weapons/SpearsAndForks/Pitchfork.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0xE87, 0xE88 )]
public class Pitchfork : BaseSpear
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.BleedAttack; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Dismount; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount;
public override int AosStrengthReq{ get{ return 55; } }
public override int AosMinDamage{ get{ return 13; } }
public override int AosMaxDamage{ get{ return 14; } }
public override int AosSpeed{ get{ return 43; } }
public override float MlSpeed{ get{ return 2.50f; } }
public override int AosStrengthReq => 55;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 14;
public override int AosSpeed => 43;
public override float MlSpeed => 2.50f;
public override int OldStrengthReq{ get{ return 15; } }
public override int OldMinDamage{ get{ return 4; } }
public override int OldMaxDamage{ get{ return 16; } }
public override int OldSpeed{ get{ return 45; } }
public override int OldStrengthReq => 15;
public override int OldMinDamage => 4;
public override int OldMaxDamage => 16;
public override int OldSpeed => 45;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 60; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 60;
[Constructible]
public Pitchfork() : base( 0xE87 )
@ -51,4 +51,4 @@ namespace Server.Items
Weight = 11.0;
}
}
}
}

30
Scripts/Items/Weapons/SpearsAndForks/ShortSpear.cs
View file

@ -7,24 +7,24 @@ namespace Server.Items
[FlippableAttribute( 0x1403, 0x1402 )]
public class ShortSpear : BaseSpear
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ShadowStrike; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.ShadowStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike;
public override int AosStrengthReq{ get{ return 40; } }
public override int AosMinDamage{ get{ return 10; } }
public override int AosMaxDamage{ get{ return 13; } }
public override int AosSpeed{ get{ return 55; } }
public override float MlSpeed{ get{ return 2.00f; } }
public override int AosStrengthReq => 40;
public override int AosMinDamage => 10;
public override int AosMaxDamage => 13;
public override int AosSpeed => 55;
public override float MlSpeed => 2.00f;
public override int OldStrengthReq{ get{ return 15; } }
public override int OldMinDamage{ get{ return 4; } }
public override int OldMaxDamage{ get{ return 32; } }
public override int OldSpeed{ get{ return 50; } }
public override int OldStrengthReq => 15;
public override int OldMinDamage => 4;
public override int OldMaxDamage => 32;
public override int OldSpeed => 50;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 70; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 70;
public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Pierce1H; } }
public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H;
[Constructible]
public ShortSpear() : base( 0x1403 )
@ -50,4 +50,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

28
Scripts/Items/Weapons/SpearsAndForks/Spear.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0xF62, 0xF63 )]
public class Spear : BaseSpear
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;
public override int AosStrengthReq{ get{ return 50; } }
public override int AosMinDamage{ get{ return 13; } }
public override int AosMaxDamage{ get{ return 15; } }
public override int AosSpeed{ get{ return 42; } }
public override float MlSpeed{ get{ return 2.75f; } }
public override int AosStrengthReq => 50;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 15;
public override int AosSpeed => 42;
public override float MlSpeed => 2.75f;
public override int OldStrengthReq{ get{ return 30; } }
public override int OldMinDamage{ get{ return 2; } }
public override int OldMaxDamage{ get{ return 36; } }
public override int OldSpeed{ get{ return 46; } }
public override int OldStrengthReq => 30;
public override int OldMinDamage => 2;
public override int OldMaxDamage => 36;
public override int OldSpeed => 46;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 80; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 80;
[Constructible]
public Spear() : base( 0xF62 )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

30
Scripts/Items/Weapons/SpearsAndForks/TribalSpear.cs
View file

@ -7,24 +7,24 @@ namespace Server.Items
[FlippableAttribute( 0xF62, 0xF63 )]
public class TribalSpear : BaseSpear
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;
public override int AosStrengthReq{ get{ return 50; } }
public override int AosMinDamage{ get{ return 13; } }
public override int AosMaxDamage{ get{ return 15; } }
public override int AosSpeed{ get{ return 42; } }
public override float MlSpeed{ get{ return 2.75f; } }
public override int AosStrengthReq => 50;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 15;
public override int AosSpeed => 42;
public override float MlSpeed => 2.75f;
public override int OldStrengthReq{ get{ return 30; } }
public override int OldMinDamage{ get{ return 2; } }
public override int OldMaxDamage{ get{ return 36; } }
public override int OldSpeed{ get{ return 46; } }
public override int OldStrengthReq => 30;
public override int OldMinDamage => 2;
public override int OldMaxDamage => 36;
public override int OldSpeed => 46;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 80; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 80;
public override int VirtualDamageBonus{ get{ return 25; } }
public override int VirtualDamageBonus => 25;
public override string DefaultName
{
@ -56,4 +56,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

34
Scripts/Items/Weapons/SpearsAndForks/WarFork.cs
View file

@ -7,27 +7,27 @@ namespace Server.Items
[FlippableAttribute( 0x1405, 0x1404 )]
public class WarFork : BaseSpear
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.BleedAttack; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
public override int AosStrengthReq{ get{ return 45; } }
public override int AosMinDamage{ get{ return 12; } }
public override int AosMaxDamage{ get{ return 13; } }
public override int AosSpeed{ get{ return 43; } }
public override float MlSpeed{ get{ return 2.50f; } }
public override int AosStrengthReq => 45;
public override int AosMinDamage => 12;
public override int AosMaxDamage => 13;
public override int AosSpeed => 43;
public override float MlSpeed => 2.50f;
public override int OldStrengthReq{ get{ return 35; } }
public override int OldMinDamage{ get{ return 4; } }
public override int OldMaxDamage{ get{ return 32; } }
public override int OldSpeed{ get{ return 45; } }
public override int OldStrengthReq => 35;
public override int OldMinDamage => 4;
public override int OldMaxDamage => 32;
public override int OldSpeed => 45;
public override int DefHitSound{ get{ return 0x236; } }
public override int DefMissSound{ get{ return 0x238; } }
public override int DefHitSound => 0x236;
public override int DefMissSound => 0x238;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 110; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 110;
public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Pierce1H; } }
public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H;
[Constructible]
public WarFork() : base( 0x1405 )
@ -53,4 +53,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}