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

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

8
Scripts/Spells/Bushido/Confidence.cs
View file

@ -14,10 +14,10 @@ namespace Server.Spells.Bushido
9002
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.25 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.25 );
public override double RequiredSkill{ get{ return 25.0; } }
public override int RequiredMana{ get{ return 10; } }
public override double RequiredSkill => 25.0;
public override int RequiredMana => 10;
public Confidence( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -156,4 +156,4 @@ namespace Server.Spells.Bushido
}
}
}
}
}

8
Scripts/Spells/Bushido/CounterAttack.cs
View file

@ -15,10 +15,10 @@ namespace Server.Spells.Bushido
9002
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.25 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.25 );
public override double RequiredSkill{ get{ return 40.0; } }
public override int RequiredMana{ get{ return 5; } }
public override double RequiredSkill => 40.0;
public override int RequiredMana => 5;
public override bool CheckCast()
{
@ -113,4 +113,4 @@ namespace Server.Spells.Bushido
}
}
}
}
}

18
Scripts/Spells/Bushido/Evasion.cs
View file

@ -16,10 +16,10 @@ namespace Server.Spells.Bushido
9002
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.25 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.25 );
public override double RequiredSkill { get { return 60.0; } }
public override int RequiredMana { get { return 10; } }
public override double RequiredSkill => 60.0;
public override int RequiredMana => 10;
public override bool CheckCast()
{
@ -74,7 +74,7 @@ namespace Server.Spells.Bushido
if ( defender.Spell != null && defender.Spell.IsCasting ) {
return false;
}
if ( weap != null ) {
if ( defender.Skills[weap.Skill].Base < 50 ) {
return false;
@ -83,7 +83,7 @@ namespace Server.Spells.Bushido
return false;
}
}
if ( IsEvading( defender ) && BaseWeapon.CheckParry( defender ) ) {
defender.Emote( "*evades*" ); // Yes. Eew. Blame OSI.
defender.FixedEffect( 0x37B9, 10, 16 );
@ -135,11 +135,11 @@ namespace Server.Spells.Bushido
{
/* Evasion duration now scales with Bushido skill
*
*
* If the player has higher than GM Bushido, and GM Tactics and Anatomy, they get a 1 second bonus
* Evasion duration range:
* o 3-6 seconds w/o tactics/anatomy
* o 6-7 seconds w/ GM+ Bushido and GM tactics/anatomy
* o 6-7 seconds w/ GM+ Bushido and GM tactics/anatomy
*/
if( !Core.ML )
@ -159,9 +159,9 @@ namespace Server.Spells.Bushido
public static double GetParryScalar( Mobile m )
{
/* Evasion modifier to parry now scales with Bushido skill
*
*
* If the player has higher than GM Bushido, and at least GM Tactics and Anatomy, they get a bonus to their evasion modifier (10% bonus to the evasion modifier to parry NOT 10% to the final parry chance)
*
*
* Bonus modifier to parry range: (these are the ranges for the evasion modifier)
* o 16-40% bonus w/o tactics/anatomy
* o 42-50% bonus w/ GM+ bushido and GM tactics/anatomy

8
Scripts/Spells/Bushido/HonorableExecution.cs
View file

@ -13,10 +13,10 @@ namespace Server.Spells.Bushido
{
}
public override int BaseMana{ get{ return 0; } }
public override double RequiredSkill{ get{ return 25.0; } }
public override int BaseMana => 0;
public override double RequiredSkill => 25.0;
public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1063122 ); } } // You better kill your enemy with your next hit or you'll be rather sorry...
public override TextDefinition AbilityMessage => new TextDefinition( 1063122 ); // You better kill your enemy with your next hit or you'll be rather sorry...
public override double GetDamageScalar( Mobile attacker, Mobile defender )
{
@ -186,4 +186,4 @@ namespace Server.Spells.Bushido
RemovePenalty( info.m_Mobile );
}
}
}
}

6
Scripts/Spells/Bushido/LightningStrike.cs
View file

@ -13,10 +13,10 @@ namespace Server.Spells.Bushido
{
}
public override int BaseMana{ get{ return 5; } }
public override double RequiredSkill{ get{ return 50.0; } }
public override int BaseMana => 5;
public override double RequiredSkill => 50.0;
public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1063167 ); } } // You prepare to strike quickly.
public override TextDefinition AbilityMessage => new TextDefinition( 1063167 ); // You prepare to strike quickly.
public override bool DelayedContext => true;

6
Scripts/Spells/Bushido/MomentumStrike.cs
View file

@ -13,10 +13,10 @@ namespace Server.Spells.Bushido
{
}
public override int BaseMana{ get{ return 10; } }
public override double RequiredSkill{ get{ return 70.0; } }
public override int BaseMana => 10;
public override double RequiredSkill => 70.0;
public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1070757 ); } } // You prepare to strike two enemies with one blow.
public override TextDefinition AbilityMessage => new TextDefinition( 1070757 ); // You prepare to strike two enemies with one blow.
public override void OnHit( Mobile attacker, Mobile defender, int damage )
{

4
Scripts/Spells/Bushido/SamuraiMove.cs
View file

@ -5,11 +5,11 @@ namespace Server.Spells
{
public class SamuraiMove : SpecialMove
{
public override SkillName MoveSkill{ get{ return SkillName.Bushido; } }
public override SkillName MoveSkill => SkillName.Bushido;
public override void CheckGain( Mobile m )
{
m.CheckSkill( MoveSkill, RequiredSkill - 12.5, RequiredSkill + 37.5 ); //Per five on friday 02/16/07
}
}
}
}

10
Scripts/Spells/Bushido/SamuraiSpell.cs
View file

@ -12,17 +12,17 @@ namespace Server.Spells.Bushido
public abstract double RequiredSkill{ get; }
public abstract int RequiredMana{ get; }
public override SkillName CastSkill{ get{ return SkillName.Bushido; } }
public override SkillName DamageSkill{ get{ return SkillName.Bushido; } }
public override SkillName CastSkill => SkillName.Bushido;
public override SkillName DamageSkill => SkillName.Bushido;
public override bool ClearHandsOnCast => false;
public override bool BlocksMovement => false;
public override bool ShowHandMovement => false;
//public override int CastDelayBase{ get{ return 1; } }
public override double CastDelayFastScalar{ get{ return 0; } }
//public override int CastDelayBase => 1;
public override double CastDelayFastScalar => 0;
public override int CastRecoveryBase{ get{ return 7; } }
public override int CastRecoveryBase => 7;
public SamuraiSpell( Mobile caster, Item scroll, SpellInfo info ) : base( caster, scroll, info )
{