Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -3,126 +3,126 @@ using Server.Targeting;
|
|||
|
||||
namespace Server.Spells.Sixth
|
||||
{
|
||||
public class ExplosionSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Explosion", "Vas Ort Flam",
|
||||
230,
|
||||
9041,
|
||||
Reagent.Bloodmoss,
|
||||
Reagent.MandrakeRoot
|
||||
);
|
||||
public class ExplosionSpell : MagerySpell
|
||||
{
|
||||
private static SpellInfo m_Info = new SpellInfo(
|
||||
"Explosion", "Vas Ort Flam",
|
||||
230,
|
||||
9041,
|
||||
Reagent.Bloodmoss,
|
||||
Reagent.MandrakeRoot
|
||||
);
|
||||
|
||||
public override SpellCircle Circle => SpellCircle.Sixth;
|
||||
public ExplosionSpell(Mobile caster, Item scroll)
|
||||
: base(caster, scroll, m_Info)
|
||||
{
|
||||
}
|
||||
|
||||
public ExplosionSpell( Mobile caster, Item scroll )
|
||||
: base( caster, scroll, m_Info )
|
||||
{
|
||||
}
|
||||
public override SpellCircle Circle => SpellCircle.Sixth;
|
||||
|
||||
public override bool DelayedDamageStacking => !Core.AOS;
|
||||
public override bool DelayedDamageStacking => !Core.AOS;
|
||||
|
||||
public override void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget( this );
|
||||
}
|
||||
public override bool DelayedDamage => false;
|
||||
|
||||
public override bool DelayedDamage => false;
|
||||
public override void OnCast()
|
||||
{
|
||||
Caster.Target = new InternalTarget(this);
|
||||
}
|
||||
|
||||
public void Target( Mobile m )
|
||||
{
|
||||
if ( !Caster.CanSee( m ) )
|
||||
{
|
||||
Caster.SendLocalizedMessage( 500237 ); // Target can not be seen.
|
||||
}
|
||||
else if ( Caster.CanBeHarmful( m ) && CheckSequence() )
|
||||
{
|
||||
Mobile attacker = Caster, defender = m;
|
||||
public void Target(Mobile m)
|
||||
{
|
||||
if (!Caster.CanSee(m))
|
||||
{
|
||||
Caster.SendLocalizedMessage(500237); // Target can not be seen.
|
||||
}
|
||||
else if (Caster.CanBeHarmful(m) && CheckSequence())
|
||||
{
|
||||
Mobile attacker = Caster, defender = m;
|
||||
|
||||
SpellHelper.Turn( Caster, m );
|
||||
SpellHelper.Turn(Caster, m);
|
||||
|
||||
SpellHelper.CheckReflect( (int) Circle, Caster, ref m );
|
||||
SpellHelper.CheckReflect((int)Circle, Caster, ref m);
|
||||
|
||||
InternalTimer t = new InternalTimer( this, attacker, defender, m );
|
||||
t.Start();
|
||||
}
|
||||
InternalTimer t = new InternalTimer(this, attacker, defender, m);
|
||||
t.Start();
|
||||
}
|
||||
|
||||
FinishSequence();
|
||||
}
|
||||
FinishSequence();
|
||||
}
|
||||
|
||||
private class InternalTimer : Timer
|
||||
{
|
||||
private MagerySpell m_Spell;
|
||||
private Mobile m_Target;
|
||||
private Mobile m_Attacker, m_Defender;
|
||||
private class InternalTimer : Timer
|
||||
{
|
||||
private Mobile m_Attacker, m_Defender;
|
||||
private MagerySpell m_Spell;
|
||||
private Mobile m_Target;
|
||||
|
||||
public InternalTimer( MagerySpell spell, Mobile attacker, Mobile defender, Mobile target )
|
||||
: base( TimeSpan.FromSeconds( Core.AOS ? 3.0 : 2.5 ) )
|
||||
{
|
||||
m_Spell = spell;
|
||||
m_Attacker = attacker;
|
||||
m_Defender = defender;
|
||||
m_Target = target;
|
||||
public InternalTimer(MagerySpell spell, Mobile attacker, Mobile defender, Mobile target)
|
||||
: base(TimeSpan.FromSeconds(Core.AOS ? 3.0 : 2.5))
|
||||
{
|
||||
m_Spell = spell;
|
||||
m_Attacker = attacker;
|
||||
m_Defender = defender;
|
||||
m_Target = target;
|
||||
|
||||
m_Spell?.StartDelayedDamageContext( attacker, this );
|
||||
m_Spell?.StartDelayedDamageContext(attacker, this);
|
||||
|
||||
Priority = TimerPriority.FiftyMS;
|
||||
}
|
||||
Priority = TimerPriority.FiftyMS;
|
||||
}
|
||||
|
||||
protected override void OnTick()
|
||||
{
|
||||
if ( m_Attacker.HarmfulCheck( m_Defender ) )
|
||||
{
|
||||
double damage;
|
||||
protected override void OnTick()
|
||||
{
|
||||
if (m_Attacker.HarmfulCheck(m_Defender))
|
||||
{
|
||||
double damage;
|
||||
|
||||
if ( Core.AOS )
|
||||
{
|
||||
damage = m_Spell.GetNewAosDamage( 40, 1, 5, m_Defender );
|
||||
}
|
||||
else
|
||||
{
|
||||
damage = Utility.Random( 23, 22 );
|
||||
if (Core.AOS)
|
||||
{
|
||||
damage = m_Spell.GetNewAosDamage(40, 1, 5, m_Defender);
|
||||
}
|
||||
else
|
||||
{
|
||||
damage = Utility.Random(23, 22);
|
||||
|
||||
if ( m_Spell.CheckResisted( m_Target ) )
|
||||
{
|
||||
damage *= 0.75;
|
||||
if (m_Spell.CheckResisted(m_Target))
|
||||
{
|
||||
damage *= 0.75;
|
||||
|
||||
m_Target.SendLocalizedMessage( 501783 ); // You feel yourself resisting magical energy.
|
||||
}
|
||||
m_Target.SendLocalizedMessage(501783); // You feel yourself resisting magical energy.
|
||||
}
|
||||
|
||||
damage *= m_Spell.GetDamageScalar( m_Target );
|
||||
}
|
||||
damage *= m_Spell.GetDamageScalar(m_Target);
|
||||
}
|
||||
|
||||
m_Target.FixedParticles( 0x36BD, 20, 10, 5044, EffectLayer.Head );
|
||||
m_Target.PlaySound( 0x307 );
|
||||
m_Target.FixedParticles(0x36BD, 20, 10, 5044, EffectLayer.Head);
|
||||
m_Target.PlaySound(0x307);
|
||||
|
||||
SpellHelper.Damage( m_Spell, m_Target, damage, 0, 100, 0, 0, 0 );
|
||||
SpellHelper.Damage(m_Spell, m_Target, damage, 0, 100, 0, 0, 0);
|
||||
|
||||
m_Spell?.RemoveDelayedDamageContext( m_Attacker );
|
||||
}
|
||||
}
|
||||
}
|
||||
m_Spell?.RemoveDelayedDamageContext(m_Attacker);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private ExplosionSpell m_Owner;
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private ExplosionSpell m_Owner;
|
||||
|
||||
public InternalTarget( ExplosionSpell owner )
|
||||
: base( Core.ML ? 10 : 12, false, TargetFlags.Harmful )
|
||||
{
|
||||
m_Owner = owner;
|
||||
}
|
||||
public InternalTarget(ExplosionSpell owner)
|
||||
: base(Core.ML ? 10 : 12, false, TargetFlags.Harmful)
|
||||
{
|
||||
m_Owner = owner;
|
||||
}
|
||||
|
||||
protected override void OnTarget( Mobile from, object o )
|
||||
{
|
||||
if ( o is Mobile )
|
||||
m_Owner.Target( (Mobile) o );
|
||||
}
|
||||
protected override void OnTarget(Mobile from, object o)
|
||||
{
|
||||
if (o is Mobile)
|
||||
m_Owner.Target((Mobile)o);
|
||||
}
|
||||
|
||||
protected override void OnTargetFinish( Mobile from )
|
||||
{
|
||||
m_Owner.FinishSequence();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
protected override void OnTargetFinish(Mobile from)
|
||||
{
|
||||
m_Owner.FinishSequence();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue