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

2
Scripts/Items/Weapons/Ranged/AssassinsShortbow.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class AssassinsShortbow : MagicalShortbow
{
public override int LabelNumber{ get{ return 1073512; } } // assassin's shortbow
public override int LabelNumber => 1073512; // assassin's shortbow
[Constructible]
public AssassinsShortbow()

2
Scripts/Items/Weapons/Ranged/BarbedLongbow.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class BarbedLongbow : ElvenCompositeLongbow
{
public override int LabelNumber{ get{ return 1073505; } } // barbed longbow
public override int LabelNumber => 1073505; // barbed longbow
[Constructible]
public BarbedLongbow()

18
Scripts/Items/Weapons/Ranged/BaseRanged.cs
View file

@ -12,26 +12,26 @@ namespace Server.Items
public abstract Type AmmoType{ get; }
public abstract Item Ammo{ get; }
public override int DefHitSound{ get{ return 0x234; } }
public override int DefMissSound{ get{ return 0x238; } }
public override int DefHitSound => 0x234;
public override int DefMissSound => 0x238;
public override SkillName DefSkill{ get{ return SkillName.Archery; } }
public override WeaponType DefType{ get{ return WeaponType.Ranged; } }
public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.ShootXBow; } }
public override SkillName DefSkill => SkillName.Archery;
public override WeaponType DefType => WeaponType.Ranged;
public override WeaponAnimation DefAnimation => WeaponAnimation.ShootXBow;
public override SkillName AccuracySkill{ get{ return SkillName.Archery; } }
public override SkillName AccuracySkill => SkillName.Archery;
private Timer m_RecoveryTimer; // so we don't start too many timers
private bool m_Balanced;
private int m_Velocity;
[CommandProperty( AccessLevel.GameMaster )]
public bool Balanced
{
get{ return m_Balanced; }
set{ m_Balanced = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public int Velocity
{
@ -233,4 +233,4 @@ namespace Server.Items
}
}
}
}
}

38
Scripts/Items/Weapons/Ranged/Bow.cs
View file

@ -7,30 +7,30 @@ namespace Server.Items
[FlippableAttribute( 0x13B2, 0x13B1 )]
public class Bow : BaseRanged
{
public override int EffectID{ get{ return 0xF42; } }
public override Type AmmoType{ get{ return typeof( Arrow ); } }
public override Item Ammo{ get{ return new Arrow(); } }
public override int EffectID => 0xF42;
public override Type AmmoType => typeof( Arrow );
public override Item Ammo => new Arrow();
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.ParalyzingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike;
public override int AosStrengthReq{ get{ return 30; } }
public override int AosMinDamage{ get{ return Core.ML ? 15 : 16; } }
public override int AosMaxDamage{ get{ return Core.ML ? 19 : 18; } }
public override int AosSpeed{ get{ return 25; } }
public override float MlSpeed{ get{ return 4.25f; } }
public override int AosStrengthReq => 30;
public override int AosMinDamage => Core.ML ? 15 : 16;
public override int AosMaxDamage => Core.ML ? 19 : 18;
public override int AosSpeed => 25;
public override float MlSpeed => 4.25f;
public override int OldStrengthReq{ get{ return 20; } }
public override int OldMinDamage{ get{ return 9; } }
public override int OldMaxDamage{ get{ return 41; } }
public override int OldSpeed{ get{ return 20; } }
public override int OldStrengthReq => 20;
public override int OldMinDamage => 9;
public override int OldMaxDamage => 41;
public override int OldSpeed => 20;
public override int DefMaxRange{ get{ return 10; } }
public override int DefMaxRange => 10;
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.ShootBow; } }
public override WeaponAnimation DefAnimation => WeaponAnimation.ShootBow;
[Constructible]
public Bow() : base( 0x13B2 )
@ -60,4 +60,4 @@ namespace Server.Items
Weight = 6.0;
}
}
}
}

38
Scripts/Items/Weapons/Ranged/CompositeBow.cs
View file

@ -7,30 +7,30 @@ namespace Server.Items
[FlippableAttribute( 0x26C2, 0x26CC )]
public class CompositeBow : BaseRanged
{
public override int EffectID{ get{ return 0xF42; } }
public override Type AmmoType{ get{ return typeof( Arrow ); } }
public override Item Ammo{ get{ return new Arrow(); } }
public override int EffectID => 0xF42;
public override Type AmmoType => typeof( Arrow );
public override Item Ammo => new Arrow();
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MovingShot; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore;
public override WeaponAbility SecondaryAbility => WeaponAbility.MovingShot;
public override int AosStrengthReq{ get{ return 45; } }
public override int AosMinDamage{ get{ return Core.ML ? 13 : 15; } }
public override int AosMaxDamage{ get{ return 17; } }
public override int AosSpeed{ get{ return 25; } }
public override float MlSpeed{ get{ return 4.00f; } }
public override int AosStrengthReq => 45;
public override int AosMinDamage => Core.ML ? 13 : 15;
public override int AosMaxDamage => 17;
public override int AosSpeed => 25;
public override float MlSpeed => 4.00f;
public override int OldStrengthReq{ get{ return 45; } }
public override int OldMinDamage{ get{ return 15; } }
public override int OldMaxDamage{ get{ return 17; } }
public override int OldSpeed{ get{ return 25; } }
public override int OldStrengthReq => 45;
public override int OldMinDamage => 15;
public override int OldMaxDamage => 17;
public override int OldSpeed => 25;
public override int DefMaxRange{ get{ return 10; } }
public override int DefMaxRange => 10;
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.ShootBow; } }
public override WeaponAnimation DefAnimation => WeaponAnimation.ShootBow;
[Constructible]
public CompositeBow() : base( 0x26C2 )
@ -56,4 +56,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

36
Scripts/Items/Weapons/Ranged/Crossbow.cs
View file

@ -7,28 +7,28 @@ namespace Server.Items
[FlippableAttribute( 0xF50, 0xF4F )]
public class Crossbow : BaseRanged
{
public override int EffectID{ get{ return 0x1BFE; } }
public override Type AmmoType{ get{ return typeof( Bolt ); } }
public override Item Ammo{ get{ return new Bolt(); } }
public override int EffectID => 0x1BFE;
public override Type AmmoType => typeof( Bolt );
public override Item Ammo => new Bolt();
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ConcussionBlow; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.ConcussionBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike;
public override int AosStrengthReq{ get{ return 35; } }
public override int AosMinDamage{ get{ return 18; } }
public override int AosMaxDamage{ get{ return Core.ML ? 22 : 20; } }
public override int AosSpeed{ get{ return 24; } }
public override float MlSpeed{ get{ return 4.50f; } }
public override int AosStrengthReq => 35;
public override int AosMinDamage => 18;
public override int AosMaxDamage => Core.ML ? 22 : 20;
public override int AosSpeed => 24;
public override float MlSpeed => 4.50f;
public override int OldStrengthReq{ get{ return 30; } }
public override int OldMinDamage{ get{ return 8; } }
public override int OldMaxDamage{ get{ return 43; } }
public override int OldSpeed{ get{ return 18; } }
public override int OldStrengthReq => 30;
public override int OldMinDamage => 8;
public override int OldMaxDamage => 43;
public override int OldSpeed => 18;
public override int DefMaxRange{ get{ return 8; } }
public override int DefMaxRange => 8;
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 Crossbow() : base( 0xF50 )
@ -55,4 +55,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Items/Weapons/Ranged/FrozenLongbow.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class FrozenLongbow : ElvenCompositeLongbow
{
public override int LabelNumber{ get{ return 1073507; } } // frozen longbow
public override int LabelNumber => 1073507; // frozen longbow
[Constructible]
public FrozenLongbow()

36
Scripts/Items/Weapons/Ranged/HeavyCrossbow.cs
View file

@ -7,28 +7,28 @@ namespace Server.Items
[FlippableAttribute( 0x13FD, 0x13FC )]
public class HeavyCrossbow : BaseRanged
{
public override int EffectID{ get{ return 0x1BFE; } }
public override Type AmmoType{ get{ return typeof( Bolt ); } }
public override Item Ammo{ get{ return new Bolt(); } }
public override int EffectID => 0x1BFE;
public override Type AmmoType => typeof( Bolt );
public override Item Ammo => new Bolt();
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.MovingShot; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Dismount; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.MovingShot;
public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount;
public override int AosStrengthReq{ get{ return 80; } }
public override int AosMinDamage{ get{ return Core.ML ? 20 : 19; } }
public override int AosMaxDamage{ get{ return Core.ML ? 24 : 20; } }
public override int AosSpeed{ get{ return 22; } }
public override float MlSpeed{ get{ return 5.00f; } }
public override int AosStrengthReq => 80;
public override int AosMinDamage => Core.ML ? 20 : 19;
public override int AosMaxDamage => Core.ML ? 24 : 20;
public override int AosSpeed => 22;
public override float MlSpeed => 5.00f;
public override int OldStrengthReq{ get{ return 40; } }
public override int OldMinDamage{ get{ return 11; } }
public override int OldMaxDamage{ get{ return 56; } }
public override int OldSpeed{ get{ return 10; } }
public override int OldStrengthReq => 40;
public override int OldMinDamage => 11;
public override int OldMaxDamage => 56;
public override int OldSpeed => 10;
public override int DefMaxRange{ get{ return 8; } }
public override int DefMaxRange => 8;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 100; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 100;
[Constructible]
public HeavyCrossbow() : base( 0x13FD )
@ -55,4 +55,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

10
Scripts/Items/Weapons/Ranged/JukaBow.cs
View file

@ -7,11 +7,11 @@ namespace Server.Items
[FlippableAttribute( 0x13B2, 0x13B1 )]
public class JukaBow : Bow
{
public override int AosStrengthReq{ get{ return 80; } }
public override int AosDexterityReq{ get{ return 80; } }
public override int AosStrengthReq => 80;
public override int AosDexterityReq => 80;
public override int OldStrengthReq{ get{ return 80; } }
public override int OldDexterityReq{ get{ return 80; } }
public override int OldStrengthReq => 80;
public override int OldDexterityReq => 80;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsModified
@ -94,4 +94,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Items/Weapons/Ranged/LightweightShortbow.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class LightweightShortbow : MagicalShortbow
{
public override int LabelNumber{ get{ return 1073510; } } // lightweight shortbow
public override int LabelNumber => 1073510; // lightweight shortbow
[Constructible]
public LightweightShortbow()

2
Scripts/Items/Weapons/Ranged/LongbowOfMight.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class LongbowOfMight : ElvenCompositeLongbow
{
public override int LabelNumber{ get{ return 1073508; } } // longbow of might
public override int LabelNumber => 1073508; // longbow of might
[Constructible]
public LongbowOfMight()

2
Scripts/Items/Weapons/Ranged/MysticalShortbow.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class MysticalShortbow : MagicalShortbow
{
public override int LabelNumber{ get{ return 1073511; } } // mystical shortbow
public override int LabelNumber => 1073511; // mystical shortbow
[Constructible]
public MysticalShortbow()

2
Scripts/Items/Weapons/Ranged/RangersShortbow.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class RangersShortbow : MagicalShortbow
{
public override int LabelNumber{ get{ return 1073509; } } // ranger's shortbow
public override int LabelNumber => 1073509; // ranger's shortbow
[Constructible]
public RangersShortbow()

36
Scripts/Items/Weapons/Ranged/RepeatingCrossbow.cs
View file

@ -7,28 +7,28 @@ namespace Server.Items
[FlippableAttribute( 0x26C3, 0x26CD )]
public class RepeatingCrossbow : BaseRanged
{
public override int EffectID{ get{ return 0x1BFE; } }
public override Type AmmoType{ get{ return typeof( Bolt ); } }
public override Item Ammo{ get{ return new Bolt(); } }
public override int EffectID => 0x1BFE;
public override Type AmmoType => typeof( Bolt );
public override Item Ammo => new Bolt();
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MovingShot; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.MovingShot;
public override int AosStrengthReq{ get{ return 30; } }
public override int AosMinDamage{ get{ return Core.ML ? 8 : 10; } }
public override int AosMaxDamage{ get{ return 12; } }
public override int AosSpeed{ get{ return 41; } }
public override float MlSpeed{ get{ return 2.75f; } }
public override int AosStrengthReq => 30;
public override int AosMinDamage => Core.ML ? 8 : 10;
public override int AosMaxDamage => 12;
public override int AosSpeed => 41;
public override float MlSpeed => 2.75f;
public override int OldStrengthReq{ get{ return 30; } }
public override int OldMinDamage{ get{ return 10; } }
public override int OldMaxDamage{ get{ return 12; } }
public override int OldSpeed{ get{ return 41; } }
public override int OldStrengthReq => 30;
public override int OldMinDamage => 10;
public override int OldMaxDamage => 12;
public override int OldSpeed => 41;
public override int DefMaxRange{ get{ return 7; } }
public override int DefMaxRange => 7;
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 RepeatingCrossbow() : base( 0x26C3 )
@ -54,4 +54,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Items/Weapons/Ranged/SlayerLongbow.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class SlayerLongbow : ElvenCompositeLongbow
{
public override int LabelNumber{ get{ return 1073506; } } // slayer longbow
public override int LabelNumber => 1073506; // slayer longbow
[Constructible]
public SlayerLongbow()