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

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

@ -204,7 +204,7 @@ namespace Server.Spells
}
}
public virtual bool ValidatesDuringHit{ get { return true; } }
public virtual bool ValidatesDuringHit => true;
public static SpecialMove GetCurrentMove( Mobile m )
{
@ -217,8 +217,7 @@ namespace Server.Spells
return null;
}
SpecialMove move = null;
m_Table.TryGetValue( m, out move );
m_Table.TryGetValue( m, out SpecialMove move );
if ( move != null && move.ValidatesDuringHit && !move.Validate( m ) )
{
@ -271,8 +270,7 @@ namespace Server.Spells
public static void ClearCurrentMove( Mobile m )
{
SpecialMove move = null;
m_Table.TryGetValue( m, out move );
m_Table.TryGetValue( m, out SpecialMove move );
if ( move != null )
{
@ -318,8 +316,7 @@ namespace Server.Spells
public static bool GetContext( Mobile m, Type type )
{
SpecialMoveContext context = null;
m_PlayersTable.TryGetValue( m, out context );
m_PlayersTable.TryGetValue( m, out SpecialMoveContext context );
if ( context == null )
return false;
@ -359,4 +356,4 @@ namespace Server.Spells
}
}
}
}
}

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

@ -27,7 +27,7 @@ namespace Server.Spells
public string Mantra{ get{ return m_Info.Mantra; } }
public Type[] Reagents{ get{ return m_Info.Reagents; } }
public Item Scroll{ get{ return m_Scroll; } }
public long StartCastTime { get { return m_StartCastTime; } }
public long StartCastTime => m_StartCastTime;
private static TimeSpan NextSpellDelay = TimeSpan.FromSeconds( 0.75 );
private static TimeSpan AnimateDelay = TimeSpan.FromSeconds( 1.5 );
@ -41,9 +41,9 @@ namespace Server.Spells
public virtual bool DelayedDamage{ get{ return false; } }
public virtual bool DelayedDamageStacking { get { return 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
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
//of course, two MA's won't.
@ -55,8 +55,7 @@ namespace Server.Spells
public void Add( Mobile m, Timer t )
{
Timer oldTimer;
if( m_Contexts.TryGetValue( m, out oldTimer ) )
if (m_Contexts.TryGetValue( m, out Timer oldTimer ))
{
oldTimer.Stop();
m_Contexts.Remove( m );
@ -76,9 +75,7 @@ namespace Server.Spells
if( DelayedDamageStacking )
return; //Sanity
DelayedDamageContextWrapper contexts;
if( !m_ContextTable.TryGetValue( GetType(), out contexts ) )
if (!m_ContextTable.TryGetValue( GetType(), out DelayedDamageContextWrapper contexts ))
{
contexts = new DelayedDamageContextWrapper();
m_ContextTable.Add( GetType(), contexts );
@ -89,9 +86,7 @@ namespace Server.Spells
public void RemoveDelayedDamageContext( Mobile m )
{
DelayedDamageContextWrapper contexts;
if( !m_ContextTable.TryGetValue( GetType(), out contexts ) )
if (!m_ContextTable.TryGetValue( GetType(), out DelayedDamageContextWrapper contexts ))
return;
contexts.Remove( m );
@ -140,7 +135,7 @@ namespace Server.Spells
damageBonus += intBonus;
int sdiBonus = AosAttributes.GetValue( m_Caster, AosAttribute.SpellDamage );
// PvP spell damage increase cap of 15% from an item’s magic property
// PvP spell damage increase cap of 15% from an item<EFBFBD>s magic property
if ( playerVsPlayer && sdiBonus > 15 )
sdiBonus = 15;
@ -667,8 +662,8 @@ namespace Server.Spells
public abstract TimeSpan CastDelayBase { get; }
public virtual double CastDelayFastScalar { get { return 1; } }
public virtual double CastDelaySecondsPerTick { get { return 0.25; } }
public virtual double CastDelayFastScalar => 1;
public virtual double CastDelaySecondsPerTick => 0.25;
public virtual TimeSpan CastDelayMinimum { get { return TimeSpan.FromSeconds( 0.25 ); } }
//public virtual int CastDelayBase{ get{ return 3; } }
@ -681,10 +676,10 @@ namespace Server.Spells
if ( m_Scroll is BaseWand )
return Core.ML ? CastDelayBase : TimeSpan.Zero; // TODO: Should FC apply to wands?
// Faster casting cap of 2 (if not using the protection spell)
// Faster casting cap of 0 (if using the protection spell)
// Paladin spells are subject to a faster casting cap of 4
// Paladins with magery of 70.0 or above are subject to a faster casting cap of 2
// Faster casting cap of 2 (if not using the protection spell)
// Faster casting cap of 0 (if using the protection spell)
// Paladin spells are subject to a faster casting cap of 4
// Paladins with magery of 70.0 or above are subject to a faster casting cap of 2
int fcMax = 4;
if ( CastSkill == SkillName.Magery || CastSkill == SkillName.Necromancy || ( CastSkill == SkillName.Chivalry && m_Caster.Skills[SkillName.Magery].Value >= 70.0 ) )
@ -931,4 +926,4 @@ namespace Server.Spells
}
}
}
}
}

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

@ -75,12 +75,12 @@ namespace Server.Spells
{
return CheckMulti( p, map, true, 0);
}
public static bool CheckMulti(Point3D p, Map map, bool houses)
{
return CheckMulti(p, map, houses, 0);
}
public static bool CheckMulti( Point3D p, Map map, bool houses, int housingrange )
{
if( map == null || map == Map.Internal )
@ -182,11 +182,11 @@ namespace Server.Spells
if ( m is BaseCreature )
{
BaseCreature c = (BaseCreature)m;
if ( !c.Controlled )
return true;
}
return false;
}
@ -1246,9 +1246,7 @@ namespace Server.Spells
public static TransformContext GetContext( Mobile m )
{
TransformContext context = null;
m_Table.TryGetValue( m, out context );
m_Table.TryGetValue( m, out TransformContext context );
return context;
}
@ -1407,10 +1405,10 @@ namespace Server.Spells
private Type m_Type;
private ITransformationSpell m_Spell;
public Timer Timer { get { return m_Timer; } }
public List<ResistanceMod> Mods { get { return m_Mods; } }
public Type Type { get { return m_Type; } }
public ITransformationSpell Spell { get { return m_Spell; } }
public Timer Timer => m_Timer;
public List<ResistanceMod> Mods => m_Mods;
public Type Type => m_Type;
public ITransformationSpell Spell => m_Spell;
public TransformContext( Timer timer, List<ResistanceMod> mods, Type type, ITransformationSpell spell )
{

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

@ -22,7 +22,7 @@ namespace Server.Spells
return m_Types;
}
}
//What IS this used for anyways.
public static int Count
{
@ -42,9 +42,9 @@ namespace Server.Spells
}
private static Dictionary<Type, Int32> m_IDsFromTypes = new Dictionary<Type, Int32>( m_Types.Length );
private static Dictionary<Int32, SpecialMove> m_SpecialMoves = new Dictionary<Int32, SpecialMove>();
public static Dictionary<Int32, SpecialMove> SpecialMoves { get { return m_SpecialMoves; } }
public static Dictionary<Int32, SpecialMove> SpecialMoves => m_SpecialMoves;
public static int GetRegistryNumber( ISpell s )
{
@ -174,4 +174,4 @@ namespace Server.Spells
return null;
}
}
}
}

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 )
{

14
Scripts/Spells/Chivalry/CleanseByFire.cs
View file

@ -14,12 +14,12 @@ namespace Server.Spells.Chivalry
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 5.0; } }
public override int RequiredMana{ get{ return 10; } }
public override int RequiredTithing{ get{ return 10; } }
public override int MantraNumber{ get{ return 1060718; } } // Expor Flamus
public override double RequiredSkill => 5.0;
public override int RequiredMana => 10;
public override int RequiredTithing => 10;
public override int MantraNumber => 1060718; // Expor Flamus
public CleanseByFireSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -59,7 +59,7 @@ namespace Server.Spells.Chivalry
if ( p != null )
{
// Cleanse by fire is now difficulty based
// Cleanse by fire is now difficulty based
int chanceToCure = 10000 + (int)(Caster.Skills[SkillName.Chivalry].Value * 75) - ((p.Level + 1) * 2000);
chanceToCure /= 100;
@ -124,4 +124,4 @@ namespace Server.Spells.Chivalry
}
}
}
}
}

10
Scripts/Spells/Chivalry/CloseWounds.cs
View file

@ -15,12 +15,12 @@ namespace Server.Spells.Chivalry
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 0.0; } }
public override int RequiredMana{ get{ return 10; } }
public override int RequiredTithing{ get{ return 10; } }
public override int MantraNumber{ get{ return 1060719; } } // Obsu Vulni
public override double RequiredSkill => 0.0;
public override int RequiredMana => 10;
public override int RequiredTithing => 10;
public override int MantraNumber => 1060719; // Obsu Vulni
public CloseWoundsSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

10
Scripts/Spells/Chivalry/ConsecrateWeapon.cs
View file

@ -14,12 +14,12 @@ namespace Server.Spells.Chivalry
9002
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.5 );
public override double RequiredSkill{ get{ return 15.0; } }
public override int RequiredMana{ get{ return 10; } }
public override int RequiredTithing{ get{ return 10; } }
public override int MantraNumber{ get{ return 1060720; } } // Consecrus Arma
public override double RequiredSkill => 15.0;
public override int RequiredMana => 10;
public override int RequiredTithing => 10;
public override int MantraNumber => 1060720; // Consecrus Arma
public override bool BlocksMovement => false;
public ConsecrateWeaponSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )

10
Scripts/Spells/Chivalry/DispelEvil.cs
View file

@ -16,12 +16,12 @@ namespace Server.Spells.Chivalry
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 35.0; } }
public override int RequiredMana{ get{ return 10; } }
public override int RequiredTithing{ get{ return 10; } }
public override int MantraNumber{ get{ return 1060721; } } // Dispiro Malas
public override double RequiredSkill => 35.0;
public override int RequiredMana => 10;
public override int RequiredTithing => 10;
public override int MantraNumber => 1060721; // Dispiro Malas
public override bool BlocksMovement => false;
public DispelEvilSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )

10
Scripts/Spells/Chivalry/DivineFury.cs
View file

@ -14,12 +14,12 @@ namespace Server.Spells.Chivalry
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 25.0; } }
public override int RequiredMana{ get{ return 15; } }
public override int RequiredTithing{ get{ return 10; } }
public override int MantraNumber{ get{ return 1060722; } } // Divinum Furis
public override double RequiredSkill => 25.0;
public override int RequiredMana => 15;
public override int RequiredTithing => 10;
public override int MantraNumber => 1060722; // Divinum Furis
public override bool BlocksMovement => false;
public DivineFurySpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )

10
Scripts/Spells/Chivalry/EnemyOfOne.cs
View file

@ -16,12 +16,12 @@ namespace Server.Spells.Chivalry
9002
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.5 );
public override double RequiredSkill{ get{ return 45.0; } }
public override int RequiredMana{ get{ return 20; } }
public override int RequiredTithing{ get{ return 10; } }
public override int MantraNumber{ get{ return 1060723; } } // Forul Solum
public override double RequiredSkill => 45.0;
public override int RequiredMana => 20;
public override int RequiredTithing => 10;
public override int MantraNumber => 1060723; // Forul Solum
public override bool BlocksMovement => false;
public EnemyOfOneSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )

10
Scripts/Spells/Chivalry/HolyLight.cs
View file

@ -14,12 +14,12 @@ namespace Server.Spells.Chivalry
9002
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.75 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.75 );
public override double RequiredSkill{ get{ return 55.0; } }
public override int RequiredMana{ get{ return 10; } }
public override int RequiredTithing{ get{ return 10; } }
public override int MantraNumber{ get{ return 1060724; } } // Augus Luminos
public override double RequiredSkill => 55.0;
public override int RequiredMana => 10;
public override int RequiredTithing => 10;
public override int MantraNumber => 1060724; // Augus Luminos
public override bool BlocksMovement => false;
public HolyLightSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )

10
Scripts/Spells/Chivalry/NobleSacrifice.cs
View file

@ -20,12 +20,12 @@ namespace Server.Spells.Chivalry
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 65.0; } }
public override int RequiredMana{ get{ return 20; } }
public override int RequiredTithing{ get{ return 30; } }
public override int MantraNumber{ get{ return 1060725; } } // Dium Prostra
public override double RequiredSkill => 65.0;
public override int RequiredMana => 20;
public override int RequiredTithing => 30;
public override int MantraNumber => 1060725; // Dium Prostra
public override bool BlocksMovement => false;
public NobleSacrificeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )

8
Scripts/Spells/Chivalry/PaladinSpell.cs
View file

@ -12,14 +12,14 @@ namespace Server.Spells.Chivalry
public abstract int RequiredTithing{ get; }
public abstract int MantraNumber{ get; }
public override SkillName CastSkill{ get{ return SkillName.Chivalry; } }
public override SkillName DamageSkill{ get{ return SkillName.Chivalry; } }
public override SkillName CastSkill => SkillName.Chivalry;
public override SkillName DamageSkill => SkillName.Chivalry;
public override bool ClearHandsOnCast => 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 PaladinSpell( Mobile caster, Item scroll, SpellInfo info ) : base( caster, scroll, info )
{

12
Scripts/Spells/Chivalry/RemoveCurse.cs
View file

@ -16,12 +16,12 @@ namespace Server.Spells.Chivalry
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 5.0; } }
public override int RequiredMana{ get{ return 20; } }
public override int RequiredTithing{ get{ return 10; } }
public override int MantraNumber{ get{ return 1060726; } } // Extermo Vomica
public override double RequiredSkill => 5.0;
public override int RequiredMana => 20;
public override int RequiredTithing => 10;
public override int MantraNumber => 1060726; // Extermo Vomica
public RemoveCurseSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -140,4 +140,4 @@ namespace Server.Spells.Chivalry
}
}
}
}
}

10
Scripts/Spells/Chivalry/SacredJourney.cs
View file

@ -16,12 +16,12 @@ namespace Server.Spells.Chivalry
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 15.0; } }
public override int RequiredMana{ get{ return 10; } }
public override int RequiredTithing{ get{ return 15; } }
public override int MantraNumber{ get{ return 1060727; } } // Sanctum Viatas
public override double RequiredSkill => 15.0;
public override int RequiredMana => 10;
public override int RequiredTithing => 15;
public override int MantraNumber => 1060727; // Sanctum Viatas
public override bool BlocksMovement => false;
private RunebookEntry m_Entry;

4
Scripts/Spells/Eighth/AirElemental.cs
View file

@ -17,7 +17,7 @@ namespace Server.Spells.Eighth
Reagent.SpidersSilk
);
public override SpellCircle Circle { get { return SpellCircle.Eighth; } }
public override SpellCircle Circle => SpellCircle.Eighth;
public AirElementalSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -52,4 +52,4 @@ namespace Server.Spells.Eighth
FinishSequence();
}
}
}
}

4
Scripts/Spells/Eighth/EarthElemental.cs
View file

@ -17,7 +17,7 @@ namespace Server.Spells.Eighth
Reagent.SpidersSilk
);
public override SpellCircle Circle { get { return SpellCircle.Eighth; } }
public override SpellCircle Circle => SpellCircle.Eighth;
public EarthElementalSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -52,4 +52,4 @@ namespace Server.Spells.Eighth
FinishSequence();
}
}
}
}

2
Scripts/Spells/Eighth/Earthquake.cs
View file

@ -19,7 +19,7 @@ namespace Server.Spells.Eighth
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Eighth; } }
public override SpellCircle Circle => SpellCircle.Eighth;
public EarthquakeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

4
Scripts/Spells/Eighth/EnergyVortex.cs
View file

@ -18,7 +18,7 @@ namespace Server.Spells.Eighth
Reagent.Nightshade
);
public override SpellCircle Circle { get { return SpellCircle.Eighth; } }
public override SpellCircle Circle => SpellCircle.Eighth;
public EnergyVortexSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -98,4 +98,4 @@ namespace Server.Spells.Eighth
}
}
}
}
}

4
Scripts/Spells/Eighth/FireElemental.cs
View file

@ -18,7 +18,7 @@ namespace Server.Spells.Eighth
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Eighth; } }
public override SpellCircle Circle => SpellCircle.Eighth;
public FireElementalSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -53,4 +53,4 @@ namespace Server.Spells.Eighth
FinishSequence();
}
}
}
}

4
Scripts/Spells/Eighth/Resurrection.cs
View file

@ -16,7 +16,7 @@ namespace Server.Spells.Eighth
Reagent.Ginseng
);
public override SpellCircle Circle { get { return SpellCircle.Eighth; } }
public override SpellCircle Circle => SpellCircle.Eighth;
public ResurrectionSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -110,4 +110,4 @@ namespace Server.Spells.Eighth
}
}
}
}
}

6
Scripts/Spells/Eighth/SummonDaemon.cs
View file

@ -20,7 +20,7 @@ namespace Server.Spells.Eighth
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Eighth; } }
public override SpellCircle Circle => SpellCircle.Eighth;
public SummonDaemonSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -43,7 +43,7 @@ namespace Server.Spells.Eighth
public override void OnCast()
{
if ( CheckSequence() )
{
{
TimeSpan duration = TimeSpan.FromSeconds( (2 * Caster.Skills.Magery.Fixed) / 5 );
if ( Core.AOS ) /* Why two diff daemons? TODO: solve this */
@ -59,4 +59,4 @@ namespace Server.Spells.Eighth
FinishSequence();
}
}
}
}

4
Scripts/Spells/Eighth/WaterElemental.cs
View file

@ -17,7 +17,7 @@ namespace Server.Spells.Eighth
Reagent.SpidersSilk
);
public override SpellCircle Circle { get { return SpellCircle.Eighth; } }
public override SpellCircle Circle => SpellCircle.Eighth;
public WaterElementalSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -52,4 +52,4 @@ namespace Server.Spells.Eighth
FinishSequence();
}
}
}
}

6
Scripts/Spells/Fifth/BladeSpirits.cs
View file

@ -8,7 +8,7 @@ namespace Server.Spells.Fifth
public class BladeSpiritsSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Blade Spirits", "In Jux Hur Ylem",
"Blade Spirits", "In Jux Hur Ylem",
266,
9040,
false,
@ -17,7 +17,7 @@ namespace Server.Spells.Fifth
Reagent.Nightshade
);
public override SpellCircle Circle { get { return SpellCircle.Fifth; } }
public override SpellCircle Circle => SpellCircle.Fifth;
public BladeSpiritsSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -105,4 +105,4 @@ namespace Server.Spells.Fifth
}
}
}
}
}

4
Scripts/Spells/Fifth/DispelField.cs
View file

@ -18,7 +18,7 @@ namespace Server.Spells.Fifth
Reagent.Garlic
);
public override SpellCircle Circle { get { return SpellCircle.Fifth; } }
public override SpellCircle Circle => SpellCircle.Fifth;
public DispelFieldSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -85,4 +85,4 @@ namespace Server.Spells.Fifth
}
}
}
}
}

2
Scripts/Spells/Fifth/Incognito.cs
View file

@ -21,7 +21,7 @@ namespace Server.Spells.Fifth
Reagent.Nightshade
);
public override SpellCircle Circle { get { return SpellCircle.Fifth; } }
public override SpellCircle Circle => SpellCircle.Fifth;
public IncognitoSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

4
Scripts/Spells/Fifth/MagicReflect.cs
View file

@ -17,7 +17,7 @@ namespace Server.Spells.Fifth
Reagent.SpidersSilk
);
public override SpellCircle Circle { get { return SpellCircle.Fifth; } }
public override SpellCircle Circle => SpellCircle.Fifth;
public MagicReflectSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -52,7 +52,7 @@ namespace Server.Spells.Fifth
* Physical decrease = 25 - (Inscription/20).
* Elemental resistance = +10 (-20 physical, +10 elemental at GM Inscription)
* The magic reflection spell has an indefinite duration, becoming active when cast, and deactivated when re-cast.
* Reactive Armor, Protection, and Magic Reflection will stay on—even after logging out, even after dying—until you “turn them off” by casting them again.
* Reactive Armor, Protection, and Magic Reflection will stay on<EFBFBD>even after logging out, even after dying<EFBFBD>until you <EFBFBD>turn them off<EFBFBD> by casting them again.
*/
if ( CheckSequence() )

2
Scripts/Spells/Fifth/MindBlast.cs
View file

@ -16,7 +16,7 @@ namespace Server.Spells.Fifth
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Fifth; } }
public override SpellCircle Circle => SpellCircle.Fifth;
public MindBlastSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

8
Scripts/Spells/Fifth/Paralyze.cs
View file

@ -17,7 +17,7 @@ namespace Server.Spells.Fifth
Reagent.SpidersSilk
);
public override SpellCircle Circle { get { return SpellCircle.Fifth; } }
public override SpellCircle Circle => SpellCircle.Fifth;
public ParalyzeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -45,11 +45,11 @@ namespace Server.Spells.Fifth
SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m );
double duration;
if ( Core.AOS )
{
int secs = (int)((GetDamageSkill( Caster ) / 10) - (GetResistSkill( m ) / 10));
if( !Core.SE )
secs += 2;
@ -109,4 +109,4 @@ namespace Server.Spells.Fifth
}
}
}
}
}

2
Scripts/Spells/Fifth/PoisonField.cs
View file

@ -20,7 +20,7 @@ namespace Server.Spells.Fifth
Reagent.SpidersSilk
);
public override SpellCircle Circle { get { return SpellCircle.Fifth; } }
public override SpellCircle Circle => SpellCircle.Fifth;
public PoisonFieldSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

4
Scripts/Spells/Fifth/SummonCreature.cs
View file

@ -16,7 +16,7 @@ namespace Server.Spells.Fifth
Reagent.SpidersSilk
);
public override SpellCircle Circle { get { return SpellCircle.Fifth; } }
public override SpellCircle Circle => SpellCircle.Fifth;
public SummonCreatureSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -95,4 +95,4 @@ namespace Server.Spells.Fifth
return base.GetCastDelay() + TimeSpan.FromSeconds( 6.0 );
}
}
}
}

4
Scripts/Spells/First/Clumsy.cs
View file

@ -14,7 +14,7 @@ namespace Server.Spells.First
Reagent.Nightshade
);
public override SpellCircle Circle { get { return SpellCircle.First; } }
public override SpellCircle Circle => SpellCircle.First;
public ClumsySpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -81,4 +81,4 @@ namespace Server.Spells.First
}
}
}
}
}

4
Scripts/Spells/First/CreateFood.cs
View file

@ -14,7 +14,7 @@ namespace Server.Spells.First
Reagent.MandrakeRoot
);
public override SpellCircle Circle { get { return SpellCircle.First; } }
public override SpellCircle Circle => SpellCircle.First;
public CreateFoodSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -87,4 +87,4 @@ namespace Server.Spells.First
return item;
}
}
}
}

4
Scripts/Spells/First/Feeblemind.cs
View file

@ -14,7 +14,7 @@ namespace Server.Spells.First
Reagent.Nightshade
);
public override SpellCircle Circle { get { return SpellCircle.First; } }
public override SpellCircle Circle => SpellCircle.First;
public FeeblemindSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -81,4 +81,4 @@ namespace Server.Spells.First
}
}
}
}
}

4
Scripts/Spells/First/Heal.cs
View file

@ -17,7 +17,7 @@ namespace Server.Spells.First
Reagent.SpidersSilk
);
public override SpellCircle Circle { get { return SpellCircle.First; } }
public override SpellCircle Circle => SpellCircle.First;
public HealSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -114,4 +114,4 @@ namespace Server.Spells.First
}
}
}
}
}

4
Scripts/Spells/First/MagicArrow.cs
View file

@ -13,13 +13,13 @@ namespace Server.Spells.First
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.First; } }
public override SpellCircle Circle => SpellCircle.First;
public MagicArrowSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}
public override bool DelayedDamageStacking { get { return !Core.AOS; } }
public override bool DelayedDamageStacking => !Core.AOS;
public override void OnCast()
{

2
Scripts/Spells/First/NightSight.cs
View file

@ -15,7 +15,7 @@ namespace Server.Spells.First
Reagent.SpidersSilk
);
public override SpellCircle Circle { get { return SpellCircle.First; } }
public override SpellCircle Circle => SpellCircle.First;
public NightSightSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

8
Scripts/Spells/First/ReactiveArmor.cs
View file

@ -16,7 +16,7 @@ namespace Server.Spells.First
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.First; } }
public override SpellCircle Circle => SpellCircle.First;
public ReactiveArmorSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -50,8 +50,8 @@ namespace Server.Spells.First
/* The reactive armor spell increases the caster's physical resistance, while lowering the caster's elemental resistances.
* 15 + (Inscription/20) Physcial bonus
* -5 Elemental
* The reactive armor spell has an indefinite duration, becoming active when cast, and deactivated when re-cast.
* Reactive Armor, Protection, and Magic Reflection will stay on—even after logging out, even after dying—until you “turn them off” by casting them again.
* The reactive armor spell has an indefinite duration, becoming active when cast, and deactivated when re-cast.
* Reactive Armor, Protection, and Magic Reflection will stay on<EFBFBD>even after logging out, even after dying<EFBFBD>until you <EFBFBD>turn them off<EFBFBD> by casting them again.
* (+20 physical -5 elemental at 100 Inscription)
*/
@ -155,4 +155,4 @@ namespace Server.Spells.First
}
}
}
}
}

4
Scripts/Spells/First/Weaken.cs
View file

@ -14,7 +14,7 @@ namespace Server.Spells.First
Reagent.Nightshade
);
public override SpellCircle Circle { get { return SpellCircle.First; } }
public override SpellCircle Circle => SpellCircle.First;
public WeakenSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -81,4 +81,4 @@ namespace Server.Spells.First
}
}
}
}
}

4
Scripts/Spells/Fourth/ArchCure.cs
View file

@ -18,7 +18,7 @@ namespace Server.Spells.Fourth
Reagent.MandrakeRoot
);
public override SpellCircle Circle { get { return SpellCircle.Fourth; } }
public override SpellCircle Circle => SpellCircle.Fourth;
public ArchCureSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -30,7 +30,7 @@ namespace Server.Spells.Fourth
}
// Arch cure is now 1/4th of a second faster
public override TimeSpan CastDelayBase{ get{ return base.CastDelayBase - TimeSpan.FromSeconds( 0.25 ); } }
public override TimeSpan CastDelayBase => base.CastDelayBase - TimeSpan.FromSeconds( 0.25 );
public void Target( IPoint3D p )
{

4
Scripts/Spells/Fourth/ArchProtection.cs
View file

@ -19,7 +19,7 @@ namespace Server.Spells.Fourth
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Fourth; } }
public override SpellCircle Circle => SpellCircle.Fourth;
public ArchProtectionSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -90,7 +90,7 @@ namespace Server.Spells.Fourth
{
Caster.DoBeneficial( m );
m.VirtualArmorMod += val;
AddEntry( m, val );
new InternalTimer( m, Caster ).Start();

4
Scripts/Spells/Fourth/Curse.cs
View file

@ -16,7 +16,7 @@ namespace Server.Spells.Fourth
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Fourth; } }
public override SpellCircle Circle => SpellCircle.Fourth;
public CurseSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -110,4 +110,4 @@ namespace Server.Spells.Fourth
}
}
}
}
}

2
Scripts/Spells/Fourth/FireField.cs
View file

@ -20,7 +20,7 @@ namespace Server.Spells.Fourth
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Fourth; } }
public override SpellCircle Circle => SpellCircle.Fourth;
public FireFieldSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

4
Scripts/Spells/Fourth/GreaterHeal.cs
View file

@ -18,7 +18,7 @@ namespace Server.Spells.Fourth
Reagent.SpidersSilk
);
public override SpellCircle Circle { get { return SpellCircle.Fourth; } }
public override SpellCircle Circle => SpellCircle.Fourth;
public GreaterHealSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -104,4 +104,4 @@ namespace Server.Spells.Fourth
}
}
}
}
}

2
Scripts/Spells/Fourth/Lightning.cs
View file

@ -14,7 +14,7 @@ namespace Server.Spells.Fourth
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Fourth; } }
public override SpellCircle Circle => SpellCircle.Fourth;
public LightningSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

4
Scripts/Spells/Fourth/ManaDrain.cs
View file

@ -16,7 +16,7 @@ namespace Server.Spells.Fourth
Reagent.SpidersSilk
);
public override SpellCircle Circle { get { return SpellCircle.Fourth; } }
public override SpellCircle Circle => SpellCircle.Fourth;
public ManaDrainSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -131,4 +131,4 @@ namespace Server.Spells.Fourth
}
}
}
}
}

6
Scripts/Spells/Fourth/Recall.cs
View file

@ -20,7 +20,7 @@ namespace Server.Spells.Fourth
Reagent.MandrakeRoot
);
public override SpellCircle Circle { get { return SpellCircle.Fourth; } }
public override SpellCircle Circle => SpellCircle.Fourth;
private RunebookEntry m_Entry;
private Runebook m_Book;
@ -193,7 +193,7 @@ namespace Server.Spells.Fourth
from.Send( new MessageLocalized( from.Serial, from.Body, MessageType.Regular, 0x3B2, 3, 502357, from.Name, "" ) ); // I can not recall from that object.
}
}
protected override void OnNonlocalTarget( Mobile from, object o )
{
}
@ -204,4 +204,4 @@ namespace Server.Spells.Fourth
}
}
}
}
}

6
Scripts/Spells/Mysticism/AnimatedWeaponSpell.cs
View file

@ -16,10 +16,10 @@ namespace Server.Spells.Mysticism
Reagent.Nightshade
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 );
public override double RequiredSkill { get { return 33.0; } }
public override int RequiredMana { get { return 11; } }
public override double RequiredSkill => 33.0;
public override int RequiredMana => 11;
public AnimatedWeaponSpell( Mobile caster, Item scroll )
: base( caster, scroll, m_Info )

6
Scripts/Spells/Mysticism/EagleStrikeSpell.cs
View file

@ -15,10 +15,10 @@ namespace Server.Spells.Mysticism
Reagent.MandrakeRoot
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.25 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.25 );
public override double RequiredSkill { get { return 20.0; } }
public override int RequiredMana { get { return 9; } }
public override double RequiredSkill => 20.0;
public override int RequiredMana => 9;
public EagleStrikeSpell( Mobile caster, Item scroll )
: base( caster, scroll, m_Info )

6
Scripts/Spells/Mysticism/HailStormSpell.cs
View file

@ -17,10 +17,10 @@ namespace Server.Spells.Mysticism
Reagent.MandrakeRoot
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.25 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.25 );
public override double RequiredSkill { get { return 70.0; } }
public override int RequiredMana { get { return 40; } }
public override double RequiredSkill => 70.0;
public override int RequiredMana => 40;
public HailStormSpell( Mobile caster, Item scroll )
: base( caster, scroll, m_Info )

6
Scripts/Spells/Mysticism/MysticSpell.cs
View file

@ -8,9 +8,9 @@ namespace Server.Spells.Mysticism
public abstract double RequiredSkill { get; }
public abstract int RequiredMana { get; }
public override SkillName CastSkill { get { return SkillName.Mysticism; } }
public override SkillName CastSkill => SkillName.Mysticism;
/*
/*
* As per OSI Publish 64:
* Imbuing is not the only skill associated with Mysticism now.
* Players can use EITHER their Focus skill or Imbuing skill.
@ -89,4 +89,4 @@ namespace Server.Spells.Mysticism
return Math.Max( m.Skills[SkillName.Imbuing].Value, m.Skills[SkillName.Focus].Value );
}
}
}
}

6
Scripts/Spells/Mysticism/NetherCycloneSpell.cs
View file

@ -17,10 +17,10 @@ namespace Server.Spells.Mysticism
Reagent.Bloodmoss
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.5 );
public override double RequiredSkill { get { return 83.0; } }
public override int RequiredMana { get { return 50; } }
public override double RequiredSkill => 83.0;
public override int RequiredMana => 50;
public NetherCycloneSpell( Mobile caster, Item scroll )
: base( caster, scroll, m_Info )

6
Scripts/Spells/Mysticism/SpellPlagueSpell.cs
View file

@ -21,10 +21,10 @@ namespace Server.Spells.Mysticism
Reagent.SulfurousAsh
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.25 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.25 );
public override double RequiredSkill { get { return 70.0; } }
public override int RequiredMana { get { return 40; } }
public override double RequiredSkill => 70.0;
public override int RequiredMana => 40;
public SpellPlagueSpell( Mobile caster, Item scroll )
: base( caster, scroll, m_Info )

6
Scripts/Spells/Mysticism/StoneFormSpell.cs
View file

@ -22,10 +22,10 @@ namespace Server.Spells.Mysticism
Reagent.Garlic
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 );
public override double RequiredSkill { get { return 33.0; } }
public override int RequiredMana { get { return 11; } }
public override double RequiredSkill => 33.0;
public override int RequiredMana => 11;
private static Hashtable m_Table = new Hashtable();

14
Scripts/Spells/Necromancy/AnimateDeadSpell.cs
View file

@ -19,10 +19,10 @@ namespace Server.Spells.Necromancy
Reagent.DaemonBlood
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 );
public override double RequiredSkill{ get{ return 40.0; } }
public override int RequiredMana{ get{ return 23; } }
public override double RequiredSkill => 40.0;
public override int RequiredMana => 23;
public AnimateDeadSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -239,8 +239,7 @@ namespace Server.Spells.Necromancy
if ( master == null )
return;
List<Mobile> list = null;
m_Table.TryGetValue( master, out list );
m_Table.TryGetValue( master, out List<Mobile> list );
if ( list == null )
return;
@ -256,8 +255,7 @@ namespace Server.Spells.Necromancy
if ( master == null )
return;
List<Mobile> list = null;
m_Table.TryGetValue( master, out list );
m_Table.TryGetValue( master, out List<Mobile> list );
if ( list == null )
m_Table[master] = list = new List<Mobile>();
@ -418,4 +416,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

12
Scripts/Spells/Necromancy/BloodOathSpell.cs
View file

@ -15,10 +15,10 @@ namespace Server.Spells.Necromancy
Reagent.DaemonBlood
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 );
public override double RequiredSkill{ get{ return 20.0; } }
public override int RequiredMana{ get{ return 13; } }
public override double RequiredSkill => 20.0;
public override int RequiredMana => 13;
public BloodOathSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -53,7 +53,7 @@ namespace Server.Spells.Necromancy
/* Temporarily creates a dark pact between the caster and the target.
* Any damage dealt by the target to the caster is increased, but the target receives the same amount of damage.
* The effect lasts for ((Spirit Speak skill level - target's Resist Magic skill level) / 80 ) + 8 seconds.
*
*
* NOTE: The above algorithm must be fixed point, it should be:
* ((ss-rm)/8)+8
*/
@ -67,7 +67,7 @@ namespace Server.Spells.Necromancy
if ( m.Spell != null )
m.Spell.OnCasterHurt();
Caster.PlaySound( 0x175 );
Caster.FixedParticles( 0x375A, 1, 17, 9919, 33, 7, EffectLayer.Waist );
@ -187,4 +187,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

16
Scripts/Spells/Necromancy/CorpseSkin.cs
View file

@ -16,10 +16,10 @@ namespace Server.Spells.Necromancy
Reagent.GraveDust
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 );
public override double RequiredSkill{ get{ return 20.0; } }
public override int RequiredMana{ get{ return 11; } }
public override double RequiredSkill => 20.0;
public override int RequiredMana => 11;
public CorpseSkinSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -39,12 +39,12 @@ namespace Server.Spells.Necromancy
/* Transmogrifies the flesh of the target creature or player to resemble rotted corpse flesh,
* making them more vulnerable to Fire and Poison damage,
* but increasing their resistance to Physical and Cold damage.
*
*
* The effect lasts for ((Spirit Speak skill level - target's Resist Magic skill level) / 25 ) + 40 seconds.
*
*
* NOTE: Algorithm above is fixed point, should be:
* ((ss-mr)/2.5) + 40
*
*
* NOTE: Resistance is not checked if targeting yourself
*/
@ -57,7 +57,7 @@ namespace Server.Spells.Necromancy
if ( m.Spell != null )
m.Spell.OnCasterHurt();
m.FixedParticles( 0x373A, 1, 15, 9913, 67, 7, EffectLayer.Head );
m.PlaySound( 0x1BB );
@ -154,4 +154,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

12
Scripts/Spells/Necromancy/CurseWeapon.cs
View file

@ -15,10 +15,10 @@ namespace Server.Spells.Necromancy
Reagent.PigIron
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.75 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.75 );
public override double RequiredSkill{ get{ return 0.0; } }
public override int RequiredMana{ get{ return 7; } }
public override double RequiredSkill => 0.0;
public override int RequiredMana => 7;
public CurseWeaponSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -37,10 +37,10 @@ namespace Server.Spells.Necromancy
/* Temporarily imbues a weapon with a life draining effect.
* Half the damage that the weapon inflicts is added to the necromancer's health.
* The effects lasts for (Spirit Speak skill level / 34) + 1 seconds.
*
*
* NOTE: Above algorithm is fixed point, should be :
* (Spirit Speak skill level / 3.4) + 1
*
*
* TODO: What happens if you curse a weapon then give it to someone else? Should they get the drain effect?
*/
@ -103,4 +103,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

8
Scripts/Spells/Necromancy/EvilOmen.cs
View file

@ -15,10 +15,10 @@ namespace Server.Spells.Necromancy
Reagent.NoxCrystal
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds(0.75); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds(0.75);
public override double RequiredSkill { get { return 20.0; } }
public override int RequiredMana { get { return 11; } }
public override double RequiredSkill => 20.0;
public override int RequiredMana => 11;
public EvilOmenSpell(Mobile caster, Item scroll)
: base(caster, scroll, m_Info)
@ -130,4 +130,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

6
Scripts/Spells/Necromancy/Exorcism.cs
View file

@ -20,10 +20,10 @@ namespace Server.Spells.Necromancy
Reagent.GraveDust
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill { get { return 80.0; } }
public override int RequiredMana { get { return 40; } }
public override double RequiredSkill => 80.0;
public override int RequiredMana => 40;
public ExorcismSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

10
Scripts/Spells/Necromancy/HorrificBeast.cs
View file

@ -16,12 +16,12 @@ namespace Server.Spells.Necromancy
Reagent.DaemonBlood
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill{ get{ return 40.0; } }
public override int RequiredMana{ get{ return 11; } }
public override double RequiredSkill => 40.0;
public override int RequiredMana => 11;
public override int Body{ get{ return 746; } }
public override int Body => 746;
public HorrificBeastSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -41,4 +41,4 @@ namespace Server.Spells.Necromancy
m.Delta( MobileDelta.WeaponDamage );
}
}
}
}

18
Scripts/Spells/Necromancy/LichForm.cs
View file

@ -17,18 +17,18 @@ namespace Server.Spells.Necromancy
Reagent.NoxCrystal
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill{ get{ return 70.0; } }
public override int RequiredMana{ get{ return 23; } }
public override double RequiredSkill => 70.0;
public override int RequiredMana => 23;
public override int Body{ get{ return 749; } }
public override int Body => 749;
public override int FireResistOffset{ get{ return -10; } }
public override int ColdResistOffset{ get{ return +10; } }
public override int PoisResistOffset{ get{ return +10; } }
public override int FireResistOffset => -10;
public override int ColdResistOffset => +10;
public override int PoisResistOffset => +10;
public override double TickRate{ get{ return 2.5; } }
public override double TickRate => 2.5;
public LichFormSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -45,4 +45,4 @@ namespace Server.Spells.Necromancy
--m.Hits;
}
}
}
}

12
Scripts/Spells/Necromancy/MindRot.cs
View file

@ -17,10 +17,10 @@ namespace Server.Spells.Necromancy
Reagent.DaemonBlood
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 );
public override double RequiredSkill{ get{ return 30.0; } }
public override int RequiredMana{ get{ return 17; } }
public override double RequiredSkill => 30.0;
public override int RequiredMana => 17;
public MindRotSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -48,7 +48,7 @@ namespace Server.Spells.Necromancy
if ( m.Spell != null )
m.Spell.OnCasterHurt();
m.PlaySound( 0x1FB );
m.PlaySound( 0x258 );
m.FixedParticles( 0x373A, 1, 17, 9903, 15, 4, EffectLayer.Head );
@ -147,7 +147,7 @@ namespace Server.Spells.Necromancy
m_End = DateTime.UtcNow + delay;
Priority = TimerPriority.TwoFiftyMS;
}
public void RenewDelay(TimeSpan delay)
{
m_End = DateTime.UtcNow + delay;
@ -179,4 +179,4 @@ namespace Server.Spells.Necromancy
public double m_Scalar;
public MRExpireTimer m_MRExpireTimer;
}
}
}

8
Scripts/Spells/Necromancy/NecromancerSpell.cs
View file

@ -9,14 +9,14 @@ namespace Server.Spells.Necromancy
public abstract double RequiredSkill{ get; }
public abstract int RequiredMana{ get; }
public override SkillName CastSkill{ get{ return SkillName.Necromancy; } }
public override SkillName DamageSkill{ get{ return SkillName.SpiritSpeak; } }
public override SkillName CastSkill => SkillName.Necromancy;
public override SkillName DamageSkill => SkillName.SpiritSpeak;
//public override int CastDelayBase{ get{ return base.CastDelayBase; } } // Reference, 3
//public override int CastDelayBase => base.CastDelayBase; // Reference, 3
public override bool ClearHandsOnCast => false;
public override double CastDelayFastScalar{ get{ return (Core.SE? base.CastDelayFastScalar : 0); } } // Necromancer spells are not affected by fast cast items, though they are by fast cast recovery
public override double CastDelayFastScalar => (Core.SE? base.CastDelayFastScalar : 0); // Necromancer spells are not affected by fast cast items, though they are by fast cast recovery
public NecromancerSpell( Mobile caster, Item scroll, SpellInfo info ) : base( caster, scroll, info )
{

6
Scripts/Spells/Necromancy/PainSpike.cs
View file

@ -16,10 +16,10 @@ namespace Server.Spells.Necromancy
Reagent.PigIron
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.0 );
public override double RequiredSkill{ get{ return 20.0; } }
public override int RequiredMana{ get{ return 5; } }
public override double RequiredSkill => 20.0;
public override int RequiredMana => 5;
public PainSpikeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

6
Scripts/Spells/Necromancy/PoisonStrike.cs
View file

@ -16,10 +16,10 @@ namespace Server.Spells.Necromancy
Reagent.NoxCrystal
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( (Core.ML ? 1.75 : 1.5) ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( (Core.ML ? 1.75 : 1.5) );
public override double RequiredSkill { get { return 50.0; } }
public override int RequiredMana { get { return 17; } }
public override double RequiredSkill => 50.0;
public override int RequiredMana => 17;
public PoisonStrikeSpell( Mobile caster, Item scroll )
: base( caster, scroll, m_Info )

12
Scripts/Spells/Necromancy/Strangle.cs
View file

@ -16,10 +16,10 @@ namespace Server.Spells.Necromancy
Reagent.NoxCrystal
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill{ get{ return 65.0; } }
public override int RequiredMana{ get{ return 29; } }
public override double RequiredSkill => 65.0;
public override int RequiredMana => 29;
public StrangleSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -54,7 +54,7 @@ namespace Server.Spells.Necromancy
if ( m.Spell != null )
m.Spell.OnCasterHurt();
m.PlaySound( 0x22F );
m.FixedParticles( 0x36CB, 1, 9, 9911, 67, 5, EffectLayer.Head );
m.FixedParticles( 0x374A, 1, 17, 9502, 1108, 4, (EffectLayer)255 );
@ -210,7 +210,7 @@ namespace Server.Spells.Necromancy
damage *= 1.75;
AOS.Damage( m_Target, m_From, (int)damage, 0, 0, 0, 100, 0 );
if ( 0.60 <= Utility.RandomDouble() ) // OSI: randomly revealed between first and third damage tick, guessing 60% chance
m_Target.RevealingAction();
}
@ -238,4 +238,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

8
Scripts/Spells/Necromancy/SummonFamiliar.cs
View file

@ -19,10 +19,10 @@ namespace Server.Spells.Necromancy
Reagent.DaemonBlood
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill{ get{ return 30.0; } }
public override int RequiredMana{ get{ return 17; } }
public override double RequiredSkill => 30.0;
public override int RequiredMana => 17;
public SummonFamiliarSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -207,4 +207,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

14
Scripts/Spells/Necromancy/VampiricEmbrace.cs
View file

@ -17,15 +17,15 @@ namespace Server.Spells.Necromancy
Reagent.PigIron
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill{ get{ return 99.0; } }
public override int RequiredMana{ get{ return 23; } }
public override double RequiredSkill => 99.0;
public override int RequiredMana => 23;
public override int Body{ get{ return Caster.Female ? 745 : 744; } }
public override int Hue{ get{ return 0x847E; } }
public override int Body => Caster.Female ? 745 : 744;
public override int Hue => 0x847E;
public override int FireResistOffset{ get{ return -25; } }
public override int FireResistOffset => -25;
public VampiricEmbraceSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -51,4 +51,4 @@ namespace Server.Spells.Necromancy
Effects.PlaySound( m.Location, m.Map, 0x4B1 );
}
}
}
}

8
Scripts/Spells/Necromancy/VengefulSpirit.cs
View file

@ -18,10 +18,10 @@ namespace Server.Spells.Necromancy
Reagent.PigIron
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill{ get{ return 80.0; } }
public override int RequiredMana{ get{ return 41; } }
public override double RequiredSkill => 80.0;
public override int RequiredMana => 41;
public VengefulSpiritSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -94,4 +94,4 @@ namespace Server.Spells.Necromancy
}
}
}
}
}

6
Scripts/Spells/Necromancy/Wither.cs
View file

@ -16,11 +16,11 @@ namespace Server.Spells.Necromancy
Reagent.PigIron
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 );
public override double RequiredSkill { get { return 60.0; } }
public override double RequiredSkill => 60.0;
public override int RequiredMana { get { return 23; } }
public override int RequiredMana => 23;
public WitherSpell( Mobile caster, Item scroll )
: base( caster, scroll, m_Info )

26
Scripts/Spells/Necromancy/WraithForm.cs
View file

@ -17,19 +17,19 @@ namespace Server.Spells.Necromancy
Reagent.PigIron
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } }
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 );
public override double RequiredSkill{ get{ return 20.0; } }
public override int RequiredMana{ get{ return 17; } }
public override double RequiredSkill => 20.0;
public override int RequiredMana => 17;
public override int Body{ get{ return Caster.Female ? 747 : 748; } }
public override int Hue{ get{ return Caster.Female ? 0 : 0x4001; } }
public override int Body => Caster.Female ? 747 : 748;
public override int Hue => Caster.Female ? 0 : 0x4001;
public override int PhysResistOffset{ get{ return +15; } }
public override int FireResistOffset{ get{ return -5; } }
public override int ColdResistOffset{ get{ return 0; } }
public override int PoisResistOffset{ get{ return 0; } }
public override int NrgyResistOffset{ get{ return -5; } }
public override int PhysResistOffset => +15;
public override int FireResistOffset => -5;
public override int ColdResistOffset => 0;
public override int PoisResistOffset => 0;
public override int NrgyResistOffset => -5;
public WraithFormSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -39,15 +39,15 @@ namespace Server.Spells.Necromancy
{
if ( m is PlayerMobile )
((PlayerMobile)m).IgnoreMobiles = true;
m.PlaySound( 0x17F );
m.FixedParticles( 0x374A, 1, 15, 9902, 1108, 4, EffectLayer.Waist );
}
public override void RemoveEffect( Mobile m )
{
if ( m is PlayerMobile && m.AccessLevel == AccessLevel.Player )
((PlayerMobile)m).IgnoreMobiles = false;
}
}
}
}

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 )
{

6
Scripts/Spells/Second/Agility.cs
View file

@ -14,7 +14,7 @@ namespace Server.Spells.Second
Reagent.MandrakeRoot
);
public override SpellCircle Circle { get { return SpellCircle.Second; } }
public override SpellCircle Circle => SpellCircle.Second;
public AgilitySpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -67,7 +67,7 @@ namespace Server.Spells.Second
public InternalTarget( AgilitySpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Beneficial )
{
m_Owner = owner;
}
}
protected override void OnTarget( Mobile from, object o )
{
@ -83,4 +83,4 @@ namespace Server.Spells.Second
}
}
}
}
}

6
Scripts/Spells/Second/Cunning.cs
View file

@ -14,7 +14,7 @@ namespace Server.Spells.Second
Reagent.Nightshade
);
public override SpellCircle Circle { get { return SpellCircle.Second; } }
public override SpellCircle Circle => SpellCircle.Second;
public CunningSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -67,7 +67,7 @@ namespace Server.Spells.Second
public InternalTarget( CunningSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Beneficial )
{
m_Owner = owner;
}
}
protected override void OnTarget( Mobile from, object o )
{
@ -83,4 +83,4 @@ namespace Server.Spells.Second
}
}
}
}
}

4
Scripts/Spells/Second/Cure.cs
View file

@ -14,7 +14,7 @@ namespace Server.Spells.Second
Reagent.Ginseng
);
public override SpellCircle Circle { get { return SpellCircle.Second; } }
public override SpellCircle Circle => SpellCircle.Second;
public CureSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -99,4 +99,4 @@ namespace Server.Spells.Second
}
}
}
}
}

2
Scripts/Spells/Second/Harm.cs
View file

@ -14,7 +14,7 @@ namespace Server.Spells.Second
Reagent.SpidersSilk
);
public override SpellCircle Circle { get { return SpellCircle.Second; } }
public override SpellCircle Circle => SpellCircle.Second;
public HarmSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

4
Scripts/Spells/Second/MagicTrap.cs
View file

@ -16,7 +16,7 @@ namespace Server.Spells.Second
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Second; } }
public override SpellCircle Circle => SpellCircle.Second;
public MagicTrapSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -86,4 +86,4 @@ namespace Server.Spells.Second
}
}
}
}
}

8
Scripts/Spells/Second/Protection.cs
View file

@ -8,7 +8,7 @@ namespace Server.Spells.Second
public class ProtectionSpell : MagerySpell
{
private static Hashtable m_Registry = new Hashtable();
public static Hashtable Registry { get { return m_Registry; } }
public static Hashtable Registry => m_Registry;
private static SpellInfo m_Info = new SpellInfo(
"Protection", "Uus Sanct",
@ -19,7 +19,7 @@ namespace Server.Spells.Second
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Second; } }
public override SpellCircle Circle => SpellCircle.Second;
public ProtectionSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -53,8 +53,8 @@ namespace Server.Spells.Second
* a decreased "resisting spells" skill value by -35 + (Inscription/20),
* and a slower casting speed modifier (technically, a negative "faster cast speed") of 2 points.
* The protection spell has an indefinite duration, becoming active when cast, and deactivated when re-cast.
* Reactive Armor, Protection, and Magic Reflection will stay on—even after logging out,
* even after dying—until you “turn them off” by casting them again.
* Reactive Armor, Protection, and Magic Reflection will stay on<EFBFBD>even after logging out,
* even after dying<EFBFBD>until you <EFBFBD>turn them off<EFBFBD> by casting them again.
*/
object[] mods = (object[])m_Table[target];

4
Scripts/Spells/Second/RemoveTrap.cs
View file

@ -15,7 +15,7 @@ namespace Server.Spells.Second
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Second; } }
public override SpellCircle Circle => SpellCircle.Second;
public RemoveTrapSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -81,4 +81,4 @@ namespace Server.Spells.Second
}
}
}
}
}

6
Scripts/Spells/Second/Strength.cs
View file

@ -14,7 +14,7 @@ namespace Server.Spells.Second
Reagent.Nightshade
);
public override SpellCircle Circle { get { return SpellCircle.Second; } }
public override SpellCircle Circle => SpellCircle.Second;
public StrengthSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
@ -67,7 +67,7 @@ namespace Server.Spells.Second
public InternalTarget( StrengthSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Beneficial )
{
m_Owner = owner;
}
}
protected override void OnTarget( Mobile from, object o )
{
@ -83,4 +83,4 @@ namespace Server.Spells.Second
}
}
}
}
}

2
Scripts/Spells/Seventh/ChainLightning.cs
View file

@ -19,7 +19,7 @@ namespace Server.Spells.Seventh
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Seventh; } }
public override SpellCircle Circle => SpellCircle.Seventh;
public ChainLightningSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

2
Scripts/Spells/Seventh/EnergyField.cs
View file

@ -20,7 +20,7 @@ namespace Server.Spells.Seventh
Reagent.SulfurousAsh
);
public override SpellCircle Circle { get { return SpellCircle.Seventh; } }
public override SpellCircle Circle => SpellCircle.Seventh;
public EnergyFieldSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{

Some files were not shown because too many files have changed in this diff Show more