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/Maces/BaseBashing.cs
View file

@ -6,12 +6,12 @@ namespace Server.Items
{
public abstract class BaseBashing : BaseMeleeWeapon
{
public override int DefHitSound{ get{ return 0x233; } }
public override int DefMissSound{ get{ return 0x239; } }
public override int DefHitSound => 0x233;
public override int DefMissSound => 0x239;
public override SkillName DefSkill{ get{ return SkillName.Macing; } }
public override WeaponType DefType{ get{ return WeaponType.Bashing; } }
public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Bash1H; } }
public override SkillName DefSkill => SkillName.Macing;
public override WeaponType DefType => WeaponType.Bashing;
public override WeaponAnimation DefAnimation => WeaponAnimation.Bash1H;
public BaseBashing( int itemID ) : base( itemID )
{
@ -57,4 +57,4 @@ namespace Server.Items
return damage;
}
}
}
}

28
Scripts/Items/Weapons/Maces/Club.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0x13b4, 0x13b3 )]
public class Club : BaseBashing
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ShadowStrike; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Dismount; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.ShadowStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount;
public override int AosStrengthReq{ get{ return 40; } }
public override int AosMinDamage{ get{ return 11; } }
public override int AosMaxDamage{ get{ return 13; } }
public override int AosSpeed{ get{ return 44; } }
public override float MlSpeed{ get{ return 2.50f; } }
public override int AosStrengthReq => 40;
public override int AosMinDamage => 11;
public override int AosMaxDamage => 13;
public override int AosSpeed => 44;
public override float MlSpeed => 2.50f;
public override int OldStrengthReq{ get{ return 10; } }
public override int OldMinDamage{ get{ return 8; } }
public override int OldMaxDamage{ get{ return 24; } }
public override int OldSpeed{ get{ return 40; } }
public override int OldStrengthReq => 10;
public override int OldMinDamage => 8;
public override int OldMaxDamage => 24;
public override int OldSpeed => 40;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 40; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 40;
[Constructible]
public Club() : base( 0x13B4 )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Items/Weapons/Maces/EmeraldMace.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class EmeraldMace : DiamondMace
{
public override int LabelNumber{ get{ return 1073530; } } // emerald mace
public override int LabelNumber => 1073530; // emerald mace
[Constructible]
public EmeraldMace()

4
Scripts/Items/Weapons/Maces/FireworksWand.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class FireworksWand : MagicWand
{
public override int LabelNumber{ get{ return 1041424; } } // a fireworks wand
public override int LabelNumber => 1041424; // a fireworks wand
private int m_Charges;
@ -135,4 +135,4 @@ namespace Server.Items
}
}
}
}
}

28
Scripts/Items/Weapons/Maces/HammerPick.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0x143D, 0x143C )]
public class HammerPick : BaseBashing
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike;
public override int AosStrengthReq{ get{ return 45; } }
public override int AosMinDamage{ get{ return 15; } }
public override int AosMaxDamage{ get{ return 17; } }
public override int AosSpeed{ get{ return 28; } }
public override float MlSpeed{ get{ return 3.75f; } }
public override int AosStrengthReq => 45;
public override int AosMinDamage => 15;
public override int AosMaxDamage => 17;
public override int AosSpeed => 28;
public override float MlSpeed => 3.75f;
public override int OldStrengthReq{ get{ return 35; } }
public override int OldMinDamage{ get{ return 6; } }
public override int OldMaxDamage{ get{ return 33; } }
public override int OldSpeed{ get{ return 30; } }
public override int OldStrengthReq => 35;
public override int OldMinDamage => 6;
public override int OldMaxDamage => 33;
public override int OldSpeed => 30;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 70; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 70;
[Constructible]
public HammerPick() : base( 0x143D )
@ -49,4 +49,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

28
Scripts/Items/Weapons/Maces/Mace.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0xF5C, 0xF5D )]
public class Mace : BaseBashing
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ConcussionBlow; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.ConcussionBlow;
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 14; } }
public override int AosSpeed{ get{ return 40; } }
public override float MlSpeed{ get{ return 2.75f; } }
public override int AosStrengthReq => 45;
public override int AosMinDamage => 12;
public override int AosMaxDamage => 14;
public override int AosSpeed => 40;
public override float MlSpeed => 2.75f;
public override int OldStrengthReq{ get{ return 20; } }
public override int OldMinDamage{ get{ return 8; } }
public override int OldMaxDamage{ get{ return 32; } }
public override int OldSpeed{ get{ return 30; } }
public override int OldStrengthReq => 20;
public override int OldMinDamage => 8;
public override int OldMaxDamage => 32;
public override int OldSpeed => 30;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 70; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 70;
[Constructible]
public Mace() : base( 0xF5C )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

28
Scripts/Items/Weapons/Maces/MagicWand.cs
View file

@ -6,22 +6,22 @@ namespace Server.Items
{
public class MagicWand : BaseBashing
{
public override WeaponAbility PrimaryAbility { get { return WeaponAbility.Dismount; } }
public override WeaponAbility SecondaryAbility { get { return WeaponAbility.Disarm; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.Dismount;
public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
public override int AosStrengthReq{ get{ return 5; } }
public override int AosMinDamage{ get{ return 9; } }
public override int AosMaxDamage{ get{ return 11; } }
public override int AosSpeed{ get{ return 40; } }
public override float MlSpeed{ get{ return 2.75f; } }
public override int AosStrengthReq => 5;
public override int AosMinDamage => 9;
public override int AosMaxDamage => 11;
public override int AosSpeed => 40;
public override float MlSpeed => 2.75f;
public override int OldStrengthReq{ get{ return 0; } }
public override int OldMinDamage{ get{ return 2; } }
public override int OldMaxDamage{ get{ return 6; } }
public override int OldSpeed{ get{ return 35; } }
public override int OldStrengthReq => 0;
public override int OldMinDamage => 2;
public override int OldMaxDamage => 6;
public override int OldSpeed => 35;
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 MagicWand() : base( 0xDF2 )
@ -47,4 +47,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

28
Scripts/Items/Weapons/Maces/Maul.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0x143B, 0x143A )]
public class Maul : BaseBashing
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ConcussionBlow; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow;
public override int AosStrengthReq{ get{ return 45; } }
public override int AosMinDamage{ get{ return 14; } }
public override int AosMaxDamage{ get{ return 16; } }
public override int AosSpeed{ get{ return 32; } }
public override float MlSpeed{ get{ return 3.50f; } }
public override int AosStrengthReq => 45;
public override int AosMinDamage => 14;
public override int AosMaxDamage => 16;
public override int AosSpeed => 32;
public override float MlSpeed => 3.50f;
public override int OldStrengthReq{ get{ return 20; } }
public override int OldMinDamage{ get{ return 10; } }
public override int OldMaxDamage{ get{ return 30; } }
public override int OldSpeed{ get{ return 30; } }
public override int OldStrengthReq => 20;
public override int OldMinDamage => 10;
public override int OldMaxDamage => 30;
public override int OldSpeed => 30;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 70; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 70;
[Constructible]
public Maul() : base( 0x143B )
@ -51,4 +51,4 @@ namespace Server.Items
Weight = 10.0;
}
}
}
}

2
Scripts/Items/Weapons/Maces/RubyMace.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class RubyMace : DiamondMace
{
public override int LabelNumber{ get{ return 1073529; } } // ruby mace
public override int LabelNumber => 1073529; // ruby mace
[Constructible]
public RubyMace()

2
Scripts/Items/Weapons/Maces/SapphireMace.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class SapphireMace : DiamondMace
{
public override int LabelNumber{ get{ return 1073531; } } // sapphire mace
public override int LabelNumber => 1073531; // sapphire mace
[Constructible]
public SapphireMace()

28
Scripts/Items/Weapons/Maces/Scepter.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0x26BC, 0x26C6 )]
public class Scepter : BaseBashing
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike;
public override int AosStrengthReq{ get{ return 40; } }
public override int AosMinDamage{ get{ return 14; } }
public override int AosMaxDamage{ get{ return 17; } }
public override int AosSpeed{ get{ return 30; } }
public override float MlSpeed{ get{ return 3.50f; } }
public override int AosStrengthReq => 40;
public override int AosMinDamage => 14;
public override int AosMaxDamage => 17;
public override int AosSpeed => 30;
public override float MlSpeed => 3.50f;
public override int OldStrengthReq{ get{ return 40; } }
public override int OldMinDamage{ get{ return 14; } }
public override int OldMaxDamage{ get{ return 17; } }
public override int OldSpeed{ get{ return 30; } }
public override int OldStrengthReq => 40;
public override int OldMinDamage => 14;
public override int OldMaxDamage => 17;
public override int OldSpeed => 30;
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 Scepter() : base( 0x26BC )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Items/Weapons/Maces/SilverEtchedMace.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class SilverEtchedMace : DiamondMace
{
public override int LabelNumber{ get{ return 1073532; } } // silver-etched mace
public override int LabelNumber => 1073532; // silver-etched mace
[Constructible]
public SilverEtchedMace()

30
Scripts/Items/Weapons/Maces/WarHammer.cs
View file

@ -7,24 +7,24 @@ namespace Server.Items
[FlippableAttribute( 0x1439, 0x1438 )]
public class WarHammer : BaseBashing
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.WhirlwindAttack; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.CrushingBlow; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.CrushingBlow;
public override int AosStrengthReq{ get{ return 95; } }
public override int AosMinDamage{ get{ return 17; } }
public override int AosMaxDamage{ get{ return 18; } }
public override int AosSpeed{ get{ return 28; } }
public override float MlSpeed{ get{ return 3.75f; } }
public override int AosStrengthReq => 95;
public override int AosMinDamage => 17;
public override int AosMaxDamage => 18;
public override int AosSpeed => 28;
public override float MlSpeed => 3.75f;
public override int OldStrengthReq{ get{ return 40; } }
public override int OldMinDamage{ get{ return 8; } }
public override int OldMaxDamage{ get{ return 36; } }
public override int OldSpeed{ get{ return 31; } }
public override int OldStrengthReq => 40;
public override int OldMinDamage => 8;
public override int OldMaxDamage => 36;
public override int OldSpeed => 31;
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.Bash2H; } }
public override WeaponAnimation DefAnimation => WeaponAnimation.Bash2H;
[Constructible]
public WarHammer() : base( 0x1439 )
@ -51,4 +51,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

28
Scripts/Items/Weapons/Maces/WarMace.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0x1407, 0x1406 )]
public class WarMace : BaseBashing
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike;
public override int AosStrengthReq{ get{ return 80; } }
public override int AosMinDamage{ get{ return 16; } }
public override int AosMaxDamage{ get{ return 17; } }
public override int AosSpeed{ get{ return 26; } }
public override float MlSpeed{ get{ return 4.00f; } }
public override int AosStrengthReq => 80;
public override int AosMinDamage => 16;
public override int AosMaxDamage => 17;
public override int AosSpeed => 26;
public override float MlSpeed => 4.00f;
public override int OldStrengthReq{ get{ return 30; } }
public override int OldMinDamage{ get{ return 10; } }
public override int OldMaxDamage{ get{ return 30; } }
public override int OldSpeed{ get{ return 32; } }
public override int OldStrengthReq => 30;
public override int OldMinDamage => 10;
public override int OldMaxDamage => 30;
public override int OldSpeed => 32;
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 WarMace() : base( 0x1407 )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}