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

Fixes body expression style.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 08:46:14 -07:00
parent 3f0a72a62f
commit 33f5e77a24
957 changed files with 7424 additions and 15973 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Scripts/Spells/Base/MagerySpell.cs
View file

@ -104,12 +104,6 @@ namespace Server.Spells
return base.GetCastDelay();
}
public override TimeSpan CastDelayBase
{
get
{
return TimeSpan.FromSeconds( (3 + (int)Circle) * CastDelaySecondsPerTick );
}
}
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( (3 + (int)Circle) * CastDelaySecondsPerTick );
}
}

18
Scripts/Spells/Base/SpecialMove.cs
View file

@ -9,15 +9,15 @@ namespace Server.Spells
{
public abstract class SpecialMove
{
public virtual int BaseMana{ get{ return 0; } }
public virtual int BaseMana => 0;
public virtual SkillName MoveSkill{ get{ return SkillName.Bushido; } }
public virtual double RequiredSkill{ get{ return 0.0; } }
public virtual SkillName MoveSkill => SkillName.Bushido;
public virtual double RequiredSkill => 0.0;
public virtual TextDefinition AbilityMessage{ get{ return 0; } }
public virtual TextDefinition AbilityMessage => 0;
public virtual bool BlockedByAnimalForm{ get{ return true; } }
public virtual bool DelayedContext{ get{ return false; } }
public virtual bool BlockedByAnimalForm => true;
public virtual bool DelayedContext => false;
public virtual int GetAccuracyBonus( Mobile attacker )
{
@ -189,7 +189,7 @@ namespace Server.Spells
private static Dictionary<Mobile, SpecialMove> m_Table = new Dictionary<Mobile, SpecialMove>();
public static Dictionary<Mobile, SpecialMove> Table{ get{ return m_Table; } }
public static Dictionary<Mobile, SpecialMove> Table => m_Table;
public static void ClearAllMoves( Mobile m )
{
@ -344,8 +344,8 @@ namespace Server.Spells
private Timer m_Timer;
private Type m_Type;
public Timer Timer{ get{ return m_Timer; } }
public Type Type{ get{ return m_Type; } }
public Timer Timer => m_Timer;
public Type Type => m_Type;
public SpecialMoveContext( Timer timer, Type type )
{

50
Scripts/Spells/Base/Spell.cs
View file

@ -20,28 +20,30 @@ namespace Server.Spells
private SpellState m_State;
private long m_StartCastTime;
public SpellState State{ get{ return m_State; } set{ m_State = value; } }
public Mobile Caster{ get{ return m_Caster; } }
public SpellInfo Info{ get{ return m_Info; } }
public string Name{ get{ return m_Info.Name; } }
public string Mantra{ get{ return m_Info.Mantra; } }
public Type[] Reagents{ get{ return m_Info.Reagents; } }
public Item Scroll{ get{ return m_Scroll; } }
public SpellState State{ get => m_State;
set => m_State = value;
}
public Mobile Caster => m_Caster;
public SpellInfo Info => m_Info;
public string Name => m_Info.Name;
public string Mantra => m_Info.Mantra;
public Type[] Reagents => m_Info.Reagents;
public Item Scroll => m_Scroll;
public long StartCastTime => m_StartCastTime;
private static TimeSpan NextSpellDelay = TimeSpan.FromSeconds( 0.75 );
private static TimeSpan AnimateDelay = TimeSpan.FromSeconds( 1.5 );
public virtual SkillName CastSkill{ get{ return SkillName.Magery; } }
public virtual SkillName DamageSkill{ get{ return SkillName.EvalInt; } }
public virtual SkillName CastSkill => SkillName.Magery;
public virtual SkillName DamageSkill => SkillName.EvalInt;
public virtual bool RevealOnCast{ get{ return true; } }
public virtual bool ClearHandsOnCast{ get{ return true; } }
public virtual bool ShowHandMovement{ get{ return true; } }
public virtual bool RevealOnCast => true;
public virtual bool ClearHandsOnCast => true;
public virtual bool ShowHandMovement => true;
public virtual bool DelayedDamage{ get{ return false; } }
public virtual bool DelayedDamage => false;
public virtual bool DelayedDamageStacking => true;
public virtual bool DelayedDamageStacking => true;
//In reality, it's ANY delayed Damage spell Post-AoS that can't stack, but, only
//Expo & Magic Arrow have enough delay and a short enough cast time to bring up
//the possibility of stacking 'em. Note that a MA & an Explosion will stack, but
@ -158,7 +160,7 @@ namespace Server.Spells
return damage / 100;
}
public virtual bool IsCasting{ get{ return m_State == SpellState.Casting; } }
public virtual bool IsCasting => m_State == SpellState.Casting;
public virtual void OnCasterHurt()
{
@ -469,11 +471,11 @@ namespace Server.Spells
m_Caster.PublicOverheadMessage( MessageType.Spell, m_Caster.SpeechHue, true, m_Info.Mantra, false );
}
public virtual bool BlockedByHorrificBeast{ get{ return true; } }
public virtual bool BlockedByAnimalForm{ get{ return true; } }
public virtual bool BlocksMovement{ get{ return true; } }
public virtual bool BlockedByHorrificBeast => true;
public virtual bool BlockedByAnimalForm => true;
public virtual bool BlocksMovement => true;
public virtual bool CheckNextSpellTime{ get{ return !(m_Scroll is BaseWand); } }
public virtual bool CheckNextSpellTime => !(m_Scroll is BaseWand);
public bool Cast()
{
@ -636,10 +638,10 @@ namespace Server.Spells
return TimeSpan.FromSeconds( delay );
}
public virtual int CastRecoveryBase{ get{ return 6; } }
public virtual int CastRecoveryFastScalar{ get{ return 1; } }
public virtual int CastRecoveryPerSecond{ get{ return 4; } }
public virtual int CastRecoveryMinimum{ get{ return 0; } }
public virtual int CastRecoveryBase => 6;
public virtual int CastRecoveryFastScalar => 1;
public virtual int CastRecoveryPerSecond => 4;
public virtual int CastRecoveryMinimum => 0;
public virtual TimeSpan GetCastRecovery()
{
@ -664,7 +666,7 @@ namespace Server.Spells
public virtual double CastDelayFastScalar => 1;
public virtual double CastDelaySecondsPerTick => 0.25;
public virtual TimeSpan CastDelayMinimum { get { return TimeSpan.FromSeconds( 0.25 ); } }
public virtual TimeSpan CastDelayMinimum => TimeSpan.FromSeconds( 0.25 );
//public virtual int CastDelayBase{ get{ return 3; } }
//public virtual int CastDelayFastScalar{ get{ return 1; } }

4
Scripts/Spells/Base/SpellHelper.cs
View file

@ -280,8 +280,8 @@ namespace Server.Spells
public static bool DisableSkillCheck
{
get { return m_DisableSkillCheck; }
set { m_DisableSkillCheck = value; }
get => m_DisableSkillCheck;
set => m_DisableSkillCheck = value;
}
public static double GetOffsetScalar( Mobile caster, Mobile target, bool curse )

32
Scripts/Spells/Base/SpellInfo.cs
View file

@ -53,13 +53,29 @@ namespace Server.Spells
m_Amounts[i] = 1;
}
public int Action{ get{ return m_Action; } set{ m_Action = value; } }
public bool AllowTown{ get{ return m_AllowTown; } set{ m_AllowTown = value; } }
public int[] Amounts{ get{ return m_Amounts; } set{ m_Amounts = value; } }
public string Mantra{ get{ return m_Mantra; } set{ m_Mantra = value; } }
public string Name{ get{ return m_Name; } set{ m_Name = value; } }
public Type[] Reagents{ get{ return m_Reagents; } set{ m_Reagents = value; } }
public int LeftHandEffect{ get{ return m_LeftHandEffect; } set{ m_LeftHandEffect = value; } }
public int RightHandEffect{ get{ return m_RightHandEffect; } set{ m_RightHandEffect = value; } }
public int Action{ get => m_Action;
set => m_Action = value;
}
public bool AllowTown{ get => m_AllowTown;
set => m_AllowTown = value;
}
public int[] Amounts{ get => m_Amounts;
set => m_Amounts = value;
}
public string Mantra{ get => m_Mantra;
set => m_Mantra = value;
}
public string Name{ get => m_Name;
set => m_Name = value;
}
public Type[] Reagents{ get => m_Reagents;
set => m_Reagents = value;
}
public int LeftHandEffect{ get => m_LeftHandEffect;
set => m_LeftHandEffect = value;
}
public int RightHandEffect{ get => m_RightHandEffect;
set => m_RightHandEffect = value;
}
}
}