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

28
Scripts/Items/Weapons/Axes/Axe.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0xF49, 0xF4a )]
public class Axe : BaseAxe
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Dismount; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount;
public override int AosStrengthReq{ get{ return 35; } }
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 => 35;
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 35; } }
public override int OldMinDamage{ get{ return 6; } }
public override int OldMaxDamage{ get{ return 33; } }
public override int OldSpeed{ get{ return 37; } }
public override int OldStrengthReq => 35;
public override int OldMinDamage => 6;
public override int OldMaxDamage => 33;
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 Axe() : base( 0xF49 )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

14
Scripts/Items/Weapons/Axes/BaseAxe.cs
View file

@ -16,12 +16,12 @@ namespace Server.Items
public abstract class BaseAxe : BaseMeleeWeapon
{
public override int DefHitSound{ get{ return 0x232; } }
public override int DefMissSound{ get{ return 0x23A; } }
public override int DefHitSound => 0x232;
public override int DefMissSound => 0x23A;
public override SkillName DefSkill{ get{ return SkillName.Swords; } }
public override WeaponType DefType{ get{ return WeaponType.Axe; } }
public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Slash2H; } }
public override SkillName DefSkill => SkillName.Swords;
public override WeaponType DefType => WeaponType.Axe;
public override WeaponAnimation DefAnimation => WeaponAnimation.Slash2H;
public virtual HarvestSystem HarvestSystem{ get{ return Lumberjacking.System; } }
@ -96,7 +96,7 @@ namespace Server.Items
this.PublicOverheadMessage( MessageType.Regular, 0x3E9, 1061637 ); // You are not allowed to access this.
return;
}
if ( !(this.HarvestSystem is Mining) )
from.SendLocalizedMessage( 1010018 ); // What do you want to use this item on?
@ -169,4 +169,4 @@ namespace Server.Items
}
}
}
}
}

28
Scripts/Items/Weapons/Axes/BattleAxe.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0xF47, 0xF48 )]
public class BattleAxe : BaseAxe
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.BleedAttack; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ConcussionBlow; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow;
public override int AosStrengthReq{ get{ return 35; } }
public override int AosMinDamage{ get{ return 15; } }
public override int AosMaxDamage{ get{ return 17; } }
public override int AosSpeed{ get{ return 31; } }
public override float MlSpeed{ get{ return 3.50f; } }
public override int AosStrengthReq => 35;
public override int AosMinDamage => 15;
public override int AosMaxDamage => 17;
public override int AosSpeed => 31;
public override float MlSpeed => 3.50f;
public override int OldStrengthReq{ get{ return 40; } }
public override int OldMinDamage{ get{ return 6; } }
public override int OldMaxDamage{ get{ return 38; } }
public override int OldSpeed{ get{ return 30; } }
public override int OldStrengthReq => 40;
public override int OldMinDamage => 6;
public override int OldMaxDamage => 38;
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 BattleAxe() : base( 0xF47 )
@ -49,4 +49,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

28
Scripts/Items/Weapons/Axes/DoubleAxe.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0xf4b, 0xf4c )]
public class DoubleAxe : BaseAxe
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.WhirlwindAttack; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.WhirlwindAttack;
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 33; } }
public override float MlSpeed{ get{ return 3.25f; } }
public override int AosStrengthReq => 45;
public override int AosMinDamage => 15;
public override int AosMaxDamage => 17;
public override int AosSpeed => 33;
public override float MlSpeed => 3.25f;
public override int OldStrengthReq{ get{ return 45; } }
public override int OldMinDamage{ get{ return 5; } }
public override int OldMaxDamage{ get{ return 35; } }
public override int OldSpeed{ get{ return 37; } }
public override int OldStrengthReq => 45;
public override int OldMinDamage => 5;
public override int OldMaxDamage => 35;
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 DoubleAxe() : base( 0xF4B )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

28
Scripts/Items/Weapons/Axes/ExecutionersAxe.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0xf45, 0xf46 )]
public class ExecutionersAxe : BaseAxe
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.BleedAttack; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike;
public override int AosStrengthReq{ get{ return 40; } }
public override int AosMinDamage{ get{ return 15; } }
public override int AosMaxDamage{ get{ return 17; } }
public override int AosSpeed{ get{ return 33; } }
public override float MlSpeed{ get{ return 3.25f; } }
public override int AosStrengthReq => 40;
public override int AosMinDamage => 15;
public override int AosMaxDamage => 17;
public override int AosSpeed => 33;
public override float MlSpeed => 3.25f;
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 37; } }
public override int OldStrengthReq => 35;
public override int OldMinDamage => 6;
public override int OldMaxDamage => 33;
public override int OldSpeed => 37;
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 ExecutionersAxe() : base( 0xF45 )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Items/Weapons/Axes/GuardianAxe.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class GuardianAxe : OrnateAxe
{
public override int LabelNumber{ get{ return 1073545; } } // guardian axe
public override int LabelNumber => 1073545; // guardian axe
[Constructible]
public GuardianAxe()

28
Scripts/Items/Weapons/Axes/Hatchet.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0xF43, 0xF44 )]
public class Hatchet : BaseAxe
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
public override int AosStrengthReq{ get{ return 20; } }
public override int AosMinDamage{ get{ return 13; } }
public override int AosMaxDamage{ get{ return 15; } }
public override int AosSpeed{ get{ return 41; } }
public override float MlSpeed{ get{ return 2.75f; } }
public override int AosStrengthReq => 20;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 15;
public override int AosSpeed => 41;
public override float MlSpeed => 2.75f;
public override int OldStrengthReq{ get{ return 15; } }
public override int OldMinDamage{ get{ return 2; } }
public override int OldMaxDamage{ get{ return 17; } }
public override int OldSpeed{ get{ return 40; } }
public override int OldStrengthReq => 15;
public override int OldMinDamage => 2;
public override int OldMaxDamage => 17;
public override int OldSpeed => 40;
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 Hatchet() : base( 0xF43 )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Items/Weapons/Axes/HeavyOrnateAxe.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class HeavyOrnateAxe : OrnateAxe
{
public override int LabelNumber{ get{ return 1073548; } } // heavy ornate axe
public override int LabelNumber => 1073548; // heavy ornate axe
[Constructible]
public HeavyOrnateAxe()

28
Scripts/Items/Weapons/Axes/LargeBattleAxe.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0x13FB, 0x13FA )]
public class LargeBattleAxe : BaseAxe
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.WhirlwindAttack; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.BleedAttack; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.BleedAttack;
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 29; } }
public override float MlSpeed{ get{ return 3.75f; } }
public override int AosStrengthReq => 80;
public override int AosMinDamage => 16;
public override int AosMaxDamage => 17;
public override int AosSpeed => 29;
public override float MlSpeed => 3.75f;
public override int OldStrengthReq{ get{ return 40; } }
public override int OldMinDamage{ get{ return 6; } }
public override int OldMaxDamage{ get{ return 38; } }
public override int OldSpeed{ get{ return 30; } }
public override int OldStrengthReq => 40;
public override int OldMinDamage => 6;
public override int OldMaxDamage => 38;
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 LargeBattleAxe() : base( 0x13FB )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

32
Scripts/Items/Weapons/Axes/Pickaxe.cs
View file

@ -8,26 +8,26 @@ namespace Server.Items
[FlippableAttribute( 0xE86, 0xE85 )]
public class Pickaxe : BaseAxe, IUsesRemaining
{
public override HarvestSystem HarvestSystem{ get{ return Mining.System; } }
public override HarvestSystem HarvestSystem => Mining.System;
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
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 35; } }
public override float MlSpeed{ get{ return 3.00f; } }
public override int AosStrengthReq => 50;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 15;
public override int AosSpeed => 35;
public override float MlSpeed => 3.00f;
public override int OldStrengthReq{ get{ return 25; } }
public override int OldMinDamage{ get{ return 1; } }
public override int OldMaxDamage{ get{ return 15; } }
public override int OldSpeed{ get{ return 35; } }
public override int OldStrengthReq => 25;
public override int OldMinDamage => 1;
public override int OldMaxDamage => 15;
public override int OldSpeed => 35;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 60; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 60;
public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Slash1H; } }
public override WeaponAnimation DefAnimation => WeaponAnimation.Slash1H;
[Constructible]
public Pickaxe() : base( 0xE86 )
@ -56,4 +56,4 @@ namespace Server.Items
ShowUsesRemaining = true;
}
}
}
}

2
Scripts/Items/Weapons/Axes/SingingAxe.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class SingingAxe : OrnateAxe
{
public override int LabelNumber{ get{ return 1073546; } } // singing axe
public override int LabelNumber => 1073546; // singing axe
[Constructible]
public SingingAxe()

2
Scripts/Items/Weapons/Axes/ThunderingAxe.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class ThunderingAxe : OrnateAxe
{
public override int LabelNumber{ get{ return 1073547; } } // thundering axe
public override int LabelNumber => 1073547; // thundering axe
[Constructible]
public ThunderingAxe()

28
Scripts/Items/Weapons/Axes/TwoHandedAxe.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0x1443, 0x1442 )]
public class TwoHandedAxe : BaseAxe
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ShadowStrike; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.ShadowStrike;
public override int AosStrengthReq{ get{ return 40; } }
public override int AosMinDamage{ get{ return 16; } }
public override int AosMaxDamage{ get{ return 17; } }
public override int AosSpeed{ get{ return 31; } }
public override float MlSpeed{ get{ return 3.50f; } }
public override int AosStrengthReq => 40;
public override int AosMinDamage => 16;
public override int AosMaxDamage => 17;
public override int AosSpeed => 31;
public override float MlSpeed => 3.50f;
public override int OldStrengthReq{ get{ return 35; } }
public override int OldMinDamage{ get{ return 5; } }
public override int OldMaxDamage{ get{ return 39; } }
public override int OldSpeed{ get{ return 30; } }
public override int OldStrengthReq => 35;
public override int OldMinDamage => 5;
public override int OldMaxDamage => 39;
public override int OldSpeed => 30;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 90; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 90;
[Constructible]
public TwoHandedAxe() : base( 0x1443 )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

40
Scripts/Items/Weapons/Axes/WarAxe.cs
View file

@ -8,31 +8,31 @@ namespace Server.Items
[FlippableAttribute( 0x13B0, 0x13AF )]
public class WarAxe : BaseAxe
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.BleedAttack; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.BleedAttack;
public override int AosStrengthReq{ get{ return 35; } }
public override int AosMinDamage{ get{ return 14; } }
public override int AosMaxDamage{ get{ return 15; } }
public override int AosSpeed{ get{ return 33; } }
public override float MlSpeed{ get{ return 3.25f; } }
public override int AosStrengthReq => 35;
public override int AosMinDamage => 14;
public override int AosMaxDamage => 15;
public override int AosSpeed => 33;
public override float MlSpeed => 3.25f;
public override int OldStrengthReq{ get{ return 35; } }
public override int OldMinDamage{ get{ return 9; } }
public override int OldMaxDamage{ get{ return 27; } }
public override int OldSpeed{ get{ return 40; } }
public override int OldStrengthReq => 35;
public override int OldMinDamage => 9;
public override int OldMaxDamage => 27;
public override int OldSpeed => 40;
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 int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 80; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 80;
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 override HarvestSystem HarvestSystem{ get{ return null; } }
public override HarvestSystem HarvestSystem => null;
[Constructible]
public WarAxe() : base( 0x13B0 )
@ -58,4 +58,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}