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/Staves/BaseStaff.cs
View file

@ -6,12 +6,12 @@ namespace Server.Items
{
public abstract class BaseStaff : 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.Staff; } }
public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Bash2H; } }
public override SkillName DefSkill => SkillName.Macing;
public override WeaponType DefType => WeaponType.Staff;
public override WeaponAnimation DefAnimation => WeaponAnimation.Bash2H;
public BaseStaff( int itemID ) : base( itemID )
{
@ -42,4 +42,4 @@ namespace Server.Items
defender.Stam -= Utility.Random( 3, 3 ); // 3-5 points of stamina loss
}
}
}
}

28
Scripts/Items/Weapons/Staves/BlackStaff.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0xDF1, 0xDF0 )]
public class BlackStaff : BaseStaff
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.WhirlwindAttack; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;
public override int AosStrengthReq{ get{ return 35; } }
public override int AosMinDamage{ get{ return 13; } }
public override int AosMaxDamage{ get{ return 16; } }
public override int AosSpeed{ get{ return 39; } }
public override float MlSpeed{ get{ return 2.75f; } }
public override int AosStrengthReq => 35;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 16;
public override int AosSpeed => 39;
public override float MlSpeed => 2.75f;
public override int OldStrengthReq{ get{ return 35; } }
public override int OldMinDamage{ get{ return 8; } }
public override int OldMaxDamage{ get{ return 33; } }
public override int OldSpeed{ get{ return 35; } }
public override int OldStrengthReq => 35;
public override int OldMinDamage => 8;
public override int OldMaxDamage => 33;
public override int OldSpeed => 35;
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 BlackStaff() : base( 0xDF0 )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Items/Weapons/Staves/GlacialStaff.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
public class GlacialStaff : BlackStaff
{
//TODO: Pre-AoS stuff
public override int LabelNumber{ get{ return 1017413; } } // Glacial Staff
public override int LabelNumber => 1017413; // Glacial Staff
[Constructible]
public GlacialStaff()

28
Scripts/Items/Weapons/Staves/GnarledStaff.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0x13F8, 0x13F9 )]
public class GnarledStaff : BaseStaff
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ConcussionBlow; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.ConcussionBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;
public override int AosStrengthReq{ get{ return 20; } }
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 => 20;
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 20; } }
public override int OldMinDamage{ get{ return 10; } }
public override int OldMaxDamage{ get{ return 30; } }
public override int OldSpeed{ get{ return 33; } }
public override int OldStrengthReq => 20;
public override int OldMinDamage => 10;
public override int OldMaxDamage => 30;
public override int OldSpeed => 33;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 50; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 50;
[Constructible]
public GnarledStaff() : base( 0x13F8 )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

28
Scripts/Items/Weapons/Staves/QuarterStaff.cs
View file

@ -7,22 +7,22 @@ namespace Server.Items
[FlippableAttribute( 0xE89, 0xE8a )]
public class QuarterStaff : BaseStaff
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ConcussionBlow; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow;
public override int AosStrengthReq{ get{ return 30; } }
public override int AosMinDamage{ get{ return 11; } }
public override int AosMaxDamage{ get{ return 14; } }
public override int AosSpeed{ get{ return 48; } }
public override float MlSpeed{ get{ return 2.25f; } }
public override int AosStrengthReq => 30;
public override int AosMinDamage => 11;
public override int AosMaxDamage => 14;
public override int AosSpeed => 48;
public override float MlSpeed => 2.25f;
public override int OldStrengthReq{ get{ return 30; } }
public override int OldMinDamage{ get{ return 8; } }
public override int OldMaxDamage{ get{ return 28; } }
public override int OldSpeed{ get{ return 48; } }
public override int OldStrengthReq => 30;
public override int OldMinDamage => 8;
public override int OldMaxDamage => 28;
public override int OldSpeed => 48;
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 QuarterStaff() : base( 0xE89 )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

30
Scripts/Items/Weapons/Staves/ShepherdsCrook.cs
View file

@ -10,22 +10,22 @@ namespace Server.Items
[FlippableAttribute( 0xE81, 0xE82 )]
public class ShepherdsCrook : BaseStaff
{
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow;
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 40; } }
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 => 40;
public override float MlSpeed => 2.75f;
public override int OldStrengthReq{ get{ return 10; } }
public override int OldMinDamage{ get{ return 3; } }
public override int OldMaxDamage{ get{ return 12; } }
public override int OldSpeed{ get{ return 30; } }
public override int OldStrengthReq => 10;
public override int OldMinDamage => 3;
public override int OldMaxDamage => 12;
public override int OldSpeed => 30;
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 50; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 50;
[Constructible]
public ShepherdsCrook() : base( 0xE81 )
@ -78,7 +78,7 @@ namespace Server.Items
{
bc.PrivateOverheadMessage( MessageType.Regular, 0x3B2, 502467, from.NetState ); // That animal looks tame already.
}
else
else
{
from.SendLocalizedMessage( 502475 ); // Click where you wish the animal to go.
from.Target = new InternalTarget( bc );
@ -100,7 +100,7 @@ namespace Server.Items
typeof( StrongMongbat ), typeof( Imp ), typeof( Scorpion ), typeof( GiantSpider ),
typeof( Snake ), typeof( LavaLizard ), typeof( Drake ), typeof( Dragon ),
typeof( Kirin ), typeof( Unicorn ), typeof( GiantRat ), typeof( Slime ),
typeof( DireWolf ), typeof( HellHound ), typeof( DeathwatchBeetle ),
typeof( DireWolf ), typeof( HellHound ), typeof( DeathwatchBeetle ),
typeof( LesserHiryu ), typeof( Hiryu )
};