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

40
Scripts/Spells/Ninjitsu/AnimalForm.cs
View file

@ -30,11 +30,11 @@ namespace Server.Spells.Ninjitsu
9002
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds(1.0); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds(1.0);
public override double RequiredSkill { get { return 0.0; } }
public override int RequiredMana { get { return (Core.ML ? 10 : 0); } }
public override int CastRecoveryBase { get { return (Core.ML ? 10 : base.CastRecoveryBase); } }
public override double RequiredSkill => 0.0;
public override int RequiredMana => (Core.ML ? 10 : 0);
public override int CastRecoveryBase => (Core.ML ? 10 : base.CastRecoveryBase);
public override bool BlockedByAnimalForm => false;
@ -332,17 +332,17 @@ namespace Server.Spells.Ninjitsu
private bool m_SpeedBoost;
private bool m_StealingBonus;
public Type Type { get { return m_Type; } }
public TextDefinition Name { get { return m_Name; } }
public int ItemID { get { return m_ItemID; } }
public int Hue { get { return m_Hue; } }
public int Tooltip { get { return m_Tooltip; } }
public double ReqSkill { get { return m_ReqSkill; } }
public int BodyMod { get { return m_BodyMod; } }
public Type Type => m_Type;
public TextDefinition Name => m_Name;
public int ItemID => m_ItemID;
public int Hue => m_Hue;
public int Tooltip => m_Tooltip;
public double ReqSkill => m_ReqSkill;
public int BodyMod => m_BodyMod;
public int HueMod { get { return Utility.RandomMinMax( m_HueModMin, m_HueModMax ); } }
public bool StealthBonus { get { return m_StealthBonus; } }
public bool SpeedBoost { get { return m_SpeedBoost; } }
public bool StealingBonus { get { return m_StealingBonus; } }
public bool StealthBonus => m_StealthBonus;
public bool SpeedBoost => m_SpeedBoost;
public bool StealingBonus => m_StealingBonus;
/*
private AnimalFormCallback m_TransformCallback;
private AnimalFormCallback m_UntransformCallback;
@ -386,7 +386,7 @@ namespace Server.Spells.Ninjitsu
new AnimalFormEntry( typeof( Reptalon ), 1075202, 11669, 0, 1075222, 90.0, 0x114, 0, 0, false, false, false ),
};
public static AnimalFormEntry[] Entries { get { return m_Entries; } }
public static AnimalFormEntry[] Entries => m_Entries;
public class AnimalFormGump : Gump
{
@ -507,11 +507,11 @@ namespace Server.Spells.Ninjitsu
private Type m_Type;
private SkillMod m_StealingMod;
public Timer Timer { get { return m_Timer; } }
public SkillMod Mod { get { return m_Mod; } }
public bool SpeedBoost { get { return m_SpeedBoost; } }
public Type Type { get { return m_Type; } }
public SkillMod StealingMod { get { return m_StealingMod; } }
public Timer Timer => m_Timer;
public SkillMod Mod => m_Mod;
public bool SpeedBoost => m_SpeedBoost;
public Type Type => m_Type;
public SkillMod StealingMod => m_StealingMod;
public AnimalFormContext(Timer timer, SkillMod mod, bool speedBoost, Type type, SkillMod stealingMod)
{

6
Scripts/Spells/Ninjitsu/Backstab.cs
View file

@ -14,10 +14,10 @@ namespace Server.Spells.Ninjitsu
{
}
public override int BaseMana{ get{ return 30; } }
public override double RequiredSkill{ get{ return Core.ML ? 40.0 : 20.0; } }
public override int BaseMana => 30;
public override double RequiredSkill => Core.ML ? 40.0 : 20.0;
public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1063089 ); } } // You prepare to Backstab your opponent.
public override TextDefinition AbilityMessage => new TextDefinition( 1063089 ); // You prepare to Backstab your opponent.
public override double GetDamageScalar( Mobile attacker, Mobile defender )
{

8
Scripts/Spells/Ninjitsu/DeathStrike.cs
View file

@ -14,10 +14,10 @@ namespace Server.Spells.Ninjitsu
{
}
public override int BaseMana { get { return 30; } }
public override double RequiredSkill { get { return 85.0; } }
public override int BaseMana => 30;
public override double RequiredSkill => 85.0;
public override TextDefinition AbilityMessage { get { return new TextDefinition( 1063091 ); } } // You prepare to hit your opponent with a Death Strike.
public override TextDefinition AbilityMessage => new TextDefinition( 1063091 ); // You prepare to hit your opponent with a Death Strike.
public override double GetDamageScalar( Mobile attacker, Mobile defender )
{
@ -169,4 +169,4 @@ namespace Server.Spells.Ninjitsu
m_Table.Remove( info.m_Target );
}
}
}
}

6
Scripts/Spells/Ninjitsu/FocusAttack.cs
View file

@ -13,10 +13,10 @@ namespace Server.Spells.Ninjitsu
{
}
public override int BaseMana{ get{ return Core.ML ? 10 : 20; } }
public override double RequiredSkill{ get{ return Core.ML? 30.0 : 60 ; } }
public override int BaseMana => Core.ML ? 10 : 20;
public override double RequiredSkill => Core.ML? 30.0 : 60 ;
public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1063095 ); } } // You prepare to focus all of your abilities into your next strike.
public override TextDefinition AbilityMessage => new TextDefinition( 1063095 ); // You prepare to focus all of your abilities into your next strike.
public override bool Validate( Mobile from )
{

6
Scripts/Spells/Ninjitsu/KiAttack.cs
View file

@ -13,10 +13,10 @@ namespace Server.Spells.Ninjitsu
{
}
public override int BaseMana{ get{ return 25; } }
public override double RequiredSkill{ get{ return 80.0; } }
public override int BaseMana => 25;
public override double RequiredSkill => 80.0;
public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1063099 ); } } // Your Ki Attack must be complete within 2 seconds for the damage bonus!
public override TextDefinition AbilityMessage => new TextDefinition( 1063099 ); // Your Ki Attack must be complete within 2 seconds for the damage bonus!
public override void OnUse( Mobile from )
{

6
Scripts/Spells/Ninjitsu/MirrorImage.cs
View file

@ -49,10 +49,10 @@ namespace Server.Spells.Ninjitsu
9002
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 );
public override double RequiredSkill{ get{ return Core.ML ? 20.0 : 40.0; } }
public override int RequiredMana{ get{ return 10; } }
public override double RequiredSkill => Core.ML ? 20.0 : 40.0;
public override int RequiredMana => 10;
public override bool BlockedByAnimalForm => false;

4
Scripts/Spells/Ninjitsu/NinjaMove.cs
View file

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

8
Scripts/Spells/Ninjitsu/NinjaSpell.cs
View file

@ -12,8 +12,8 @@ namespace Server.Spells.Ninjitsu
public abstract double RequiredSkill{ get; }
public abstract int RequiredMana{ get; }
public override SkillName CastSkill{ get{ return SkillName.Ninjitsu; } }
public override SkillName DamageSkill{ get{ return SkillName.Ninjitsu; } }
public override SkillName CastSkill => SkillName.Ninjitsu;
public override SkillName DamageSkill => SkillName.Ninjitsu;
public override bool RevealOnCast => false;
public override bool ClearHandsOnCast => false;
@ -21,9 +21,9 @@ namespace Server.Spells.Ninjitsu
public override bool BlocksMovement => false;
//public override int CastDelayBase{ get{ return 1; } }
//public override int CastDelayBase => 1;
public override int CastRecoveryBase{ get{ return 7; } }
public override int CastRecoveryBase => 7;
public NinjaSpell( Mobile caster, Item scroll, SpellInfo info ) : base( caster, scroll, info )
{

6
Scripts/Spells/Ninjitsu/ShadowJump.cs
View file

@ -16,10 +16,10 @@ namespace Server.Spells.Ninjitsu
9002
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.0 );
public override double RequiredSkill{ get{ return 50.0; } }
public override int RequiredMana{ get{ return 15; } }
public override double RequiredSkill => 50.0;
public override int RequiredMana => 15;
public override bool BlockedByAnimalForm => false;

6
Scripts/Spells/Ninjitsu/SurpriseAttack.cs
View file

@ -14,10 +14,10 @@ namespace Server.Spells.Ninjitsu
{
}
public override int BaseMana{ get{ return 20; } }
public override double RequiredSkill{ get{ return Core.ML ? 60.0 : 30.0; } }
public override int BaseMana => 20;
public override double RequiredSkill => Core.ML ? 60.0 : 30.0;
public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1063128 ); } } // You prepare to surprise your prey.
public override TextDefinition AbilityMessage => new TextDefinition( 1063128 ); // You prepare to surprise your prey.
public override bool Validate( Mobile from )
{