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

@ -2,94 +2,94 @@ using Server.Targeting;
namespace Server.Spells.Sixth
{
public class EnergyBoltSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Energy Bolt", "Corp Por",
230,
9022,
Reagent.BlackPearl,
Reagent.Nightshade
);
public class EnergyBoltSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Energy Bolt", "Corp Por",
230,
9022,
Reagent.BlackPearl,
Reagent.Nightshade
);
public override SpellCircle Circle => SpellCircle.Sixth;
public EnergyBoltSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
{
}
public EnergyBoltSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}
public override SpellCircle Circle => SpellCircle.Sixth;
public override void OnCast()
{
Caster.Target = new InternalTarget( this );
}
public override bool DelayedDamage => true;
public override bool DelayedDamage => true;
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 ( CheckHSequence( m ) )
{
Mobile source = Caster;
public void Target(Mobile m)
{
if (!Caster.CanSee(m))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (CheckHSequence(m))
{
Mobile source = Caster;
SpellHelper.Turn( Caster, m );
SpellHelper.Turn(Caster, m);
SpellHelper.CheckReflect( (int)Circle, ref source, ref m );
SpellHelper.CheckReflect((int)Circle, ref source, ref m);
double damage;
double damage;
if ( Core.AOS )
{
damage = GetNewAosDamage( 40, 1, 5, m );
}
else
{
damage = Utility.Random( 24, 18 );
if (Core.AOS)
{
damage = GetNewAosDamage(40, 1, 5, m);
}
else
{
damage = Utility.Random(24, 18);
if ( CheckResisted( m ) )
{
damage *= 0.75;
if (CheckResisted(m))
{
damage *= 0.75;
m.SendLocalizedMessage( 501783 ); // You feel yourself resisting magical energy.
}
m.SendLocalizedMessage(501783); // You feel yourself resisting magical energy.
}
// Scale damage based on evalint and resist
damage *= GetDamageScalar( m );
}
// Scale damage based on evalint and resist
damage *= GetDamageScalar(m);
}
// Do the effects
source.MovingParticles( m, 0x379F, 7, 0, false, true, 3043, 4043, 0x211 );
source.PlaySound( 0x20A );
// Do the effects
source.MovingParticles(m, 0x379F, 7, 0, false, true, 3043, 4043, 0x211);
source.PlaySound(0x20A);
// Deal the damage
SpellHelper.Damage( this, m, damage, 0, 0, 0, 0, 100 );
}
// Deal the damage
SpellHelper.Damage(this, m, damage, 0, 0, 0, 0, 100);
}
FinishSequence();
}
FinishSequence();
}
private class InternalTarget : Target
{
private EnergyBoltSpell m_Owner;
private class InternalTarget : Target
{
private EnergyBoltSpell m_Owner;
public InternalTarget( EnergyBoltSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Harmful )
{
m_Owner = owner;
}
public InternalTarget(EnergyBoltSpell 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();
}
}
}
}