Fixes code according to modern code style. Fixes a few expression bugs.

This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions

View file

@ -4,76 +4,78 @@ using Server.Mobiles;
namespace Server.Spells.Chivalry
{
public class EnemyOfOneSpell : PaladinSpell
{
private static SpellInfo m_Info = new SpellInfo(
"Enemy of One", "Forul Solum",
-1,
9002
);
public class EnemyOfOneSpell : PaladinSpell
{
private static SpellInfo m_Info = new SpellInfo(
"Enemy of One", "Forul Solum",
-1,
9002
);
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.5 );
private static Hashtable m_Table = new Hashtable();
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)
{
}
public EnemyOfOneSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds(0.5);
public override void OnCast()
{
if ( CheckSequence() )
{
Caster.PlaySound( 0x0F5 );
Caster.PlaySound( 0x1ED );
Caster.FixedParticles( 0x375A, 1, 30, 9966, 33, 2, EffectLayer.Head );
Caster.FixedParticles( 0x37B9, 1, 30, 9502, 43, 3, EffectLayer.Head );
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;
Timer t = (Timer)m_Table[Caster];
public override void OnCast()
{
if (CheckSequence())
{
Caster.PlaySound(0x0F5);
Caster.PlaySound(0x1ED);
Caster.FixedParticles(0x375A, 1, 30, 9966, 33, 2, EffectLayer.Head);
Caster.FixedParticles(0x37B9, 1, 30, 9502, 43, 3, EffectLayer.Head);
t?.Stop();
Timer t = (Timer)m_Table[Caster];
double delay = (double)ComputePowerValue( 1 ) / 60;
t?.Stop();
// TODO: Should caps be applied?
if ( delay < 1.5 )
delay = 1.5;
else if ( delay > 3.5 )
delay = 3.5;
double delay = (double)ComputePowerValue(1) / 60;
m_Table[Caster] = Timer.DelayCall( TimeSpan.FromMinutes( delay ), new TimerStateCallback( Expire_Callback ), Caster );
// TODO: Should caps be applied?
if (delay < 1.5)
delay = 1.5;
else if (delay > 3.5)
delay = 3.5;
if ( Caster is PlayerMobile )
{
((PlayerMobile)Caster).EnemyOfOneType = null;
((PlayerMobile)Caster).WaitingForEnemy = true;
m_Table[Caster] = Timer.DelayCall(TimeSpan.FromMinutes(delay), new TimerStateCallback(Expire_Callback),
Caster);
BuffInfo.AddBuff ( Caster, new BuffInfo ( BuffIcon.EnemyOfOne, 1075653, 1044111, TimeSpan.FromMinutes ( delay ), Caster ) );
}
}
if (Caster is PlayerMobile)
{
((PlayerMobile)Caster).EnemyOfOneType = null;
((PlayerMobile)Caster).WaitingForEnemy = true;
FinishSequence();
}
BuffInfo.AddBuff(Caster,
new BuffInfo(BuffIcon.EnemyOfOne, 1075653, 1044111, TimeSpan.FromMinutes(delay), Caster));
}
}
private static Hashtable m_Table = new Hashtable();
FinishSequence();
}
private static void Expire_Callback( object state )
{
Mobile m = (Mobile)state;
private static void Expire_Callback(object state)
{
Mobile m = (Mobile)state;
m_Table.Remove( m );
m_Table.Remove(m);
m.PlaySound( 0x1F8 );
m.PlaySound(0x1F8);
if ( m is PlayerMobile )
{
((PlayerMobile)m).EnemyOfOneType = null;
((PlayerMobile)m).WaitingForEnemy = false;
}
}
}
}
if (m is PlayerMobile)
{
((PlayerMobile)m).EnemyOfOneType = null;
((PlayerMobile)m).WaitingForEnemy = false;
}
}
}
}