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,231 +4,232 @@ using Server.Targeting;
namespace Server.Spells.Mysticism
{
public class SpellPlagueSpell : MysticSpell
{
public static void Initialize()
{
EventSink.PlayerDeath += OnPlayerDeath;
}
public class SpellPlagueSpell : MysticSpell
{
private static SpellInfo m_Info = new SpellInfo(
"Spell Plague", "Vas Rel Jux Ort",
-1,
9002,
Reagent.DaemonBone,
Reagent.DragonsBlood,
Reagent.Nightshade,
Reagent.SulfurousAsh
);
private static SpellInfo m_Info = new SpellInfo(
"Spell Plague", "Vas Rel Jux Ort",
-1,
9002,
Reagent.DaemonBone,
Reagent.DragonsBlood,
Reagent.Nightshade,
Reagent.SulfurousAsh
);
private static Dictionary<Mobile, SpellPlagueContext> m_Table = new Dictionary<Mobile, SpellPlagueContext>();
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.25 );
public SpellPlagueSpell(Mobile caster, Item scroll)
: base(caster, scroll, m_Info)
{
}
public override double RequiredSkill => 70.0;
public override int RequiredMana => 40;
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds(2.25);
public SpellPlagueSpell( Mobile caster, Item scroll )
: base( caster, scroll, m_Info )
{
}
public override double RequiredSkill => 70.0;
public override int RequiredMana => 40;
public override void OnCast()
{
Caster.Target = new InternalTarget( this );
}
public static void Initialize()
{
EventSink.PlayerDeath += OnPlayerDeath;
}
public void Target( Mobile targeted )
{
if ( !Caster.CanSee( targeted ) )
{
Caster.SendLocalizedMessage( 500237 ); // Target can not be seen.
}
else if ( CheckHSequence( targeted ) )
{
SpellHelper.Turn( Caster, targeted );
public override void OnCast()
{
Caster.Target = new InternalTarget(this);
}
SpellHelper.CheckReflect( 6, Caster, ref targeted );
public void Target(Mobile targeted)
{
if (!Caster.CanSee(targeted))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (CheckHSequence(targeted))
{
SpellHelper.Turn(Caster, targeted);
/* The target is hit with an explosion of chaos damage and then inflicted
* with the spell plague curse. Each time the target is damaged while under
* the effect of the spell plague, they may suffer an explosion of chaos
* damage. The initial chance to trigger the explosion starts at 90% and
* reduces by 30% every time an explosion occurs. Once the target is
* afflicted by 3 explosions or 8 seconds have passed, that spell plague
* is removed from the target. Spell Plague will stack with other spell
* plagues so that they are applied one after the other.
*/
SpellHelper.CheckReflect(6, Caster, ref targeted);
VisualEffect( targeted );
/* The target is hit with an explosion of chaos damage and then inflicted
* with the spell plague curse. Each time the target is damaged while under
* the effect of the spell plague, they may suffer an explosion of chaos
* damage. The initial chance to trigger the explosion starts at 90% and
* reduces by 30% every time an explosion occurs. Once the target is
* afflicted by 3 explosions or 8 seconds have passed, that spell plague
* is removed from the target. Spell Plague will stack with other spell
* plagues so that they are applied one after the other.
*/
var damage = GetNewAosDamage( 33, 1, 5, targeted );
VisualEffect(targeted);
var types = new int[4];
types[Utility.Random( types.Length )] = 100;
int damage = GetNewAosDamage(33, 1, 5, targeted);
SpellHelper.Damage( this, targeted, damage, 0, types[0], types[1], types[2], types[3] );
int[] types = new int[4];
types[Utility.Random(types.Length)] = 100;
var context = new SpellPlagueContext( this, targeted );
SpellHelper.Damage(this, targeted, damage, 0, types[0], types[1], types[2], types[3]);
if ( m_Table.ContainsKey( targeted ) )
{
var oldContext = m_Table[targeted];
oldContext.SetNext( context );
}
else
{
m_Table[targeted] = context;
context.Start();
}
}
SpellPlagueContext context = new SpellPlagueContext(this, targeted);
FinishSequence();
}
if (m_Table.ContainsKey(targeted))
{
SpellPlagueContext oldContext = m_Table[targeted];
oldContext.SetNext(context);
}
else
{
m_Table[targeted] = context;
context.Start();
}
}
public static bool UnderEffect( Mobile m )
{
return m_Table.ContainsKey( m );
}
FinishSequence();
}
public static void RemoveEffect( Mobile m )
{
if ( !m_Table.ContainsKey( m ) )
return;
public static bool UnderEffect(Mobile m)
{
return m_Table.ContainsKey(m);
}
var context = m_Table[m];
public static void RemoveEffect(Mobile m)
{
if (!m_Table.ContainsKey(m))
return;
context.EndPlague( false );
}
SpellPlagueContext context = m_Table[m];
public static void CheckPlague( Mobile m )
{
if ( !m_Table.ContainsKey( m ) )
return;
context.EndPlague(false);
}
var context = m_Table[m];
public static void CheckPlague(Mobile m)
{
if (!m_Table.ContainsKey(m))
return;
context.OnDamage();
}
SpellPlagueContext context = m_Table[m];
private static void OnPlayerDeath( PlayerDeathEventArgs e )
{
RemoveEffect( e.Mobile );
}
context.OnDamage();
}
private static Dictionary<Mobile, SpellPlagueContext> m_Table = new Dictionary<Mobile, SpellPlagueContext>();
private static void OnPlayerDeath(PlayerDeathEventArgs e)
{
RemoveEffect(e.Mobile);
}
protected void VisualEffect( Mobile to )
{
to.PlaySound( 0x658 );
protected void VisualEffect(Mobile to)
{
to.PlaySound(0x658);
to.FixedParticles( 0x3728, 1, 13, 0x26B8, 0x47E, 7, EffectLayer.Head, 0 );
to.FixedParticles( 0x3779, 1, 15, 0x251E, 0x43, 7, EffectLayer.Head, 0 );
}
to.FixedParticles(0x3728, 1, 13, 0x26B8, 0x47E, 7, EffectLayer.Head, 0);
to.FixedParticles(0x3779, 1, 15, 0x251E, 0x43, 7, EffectLayer.Head, 0);
}
private class SpellPlagueContext
{
private SpellPlagueSpell m_Owner;
private Mobile m_Target;
private DateTime m_LastExploded;
private int m_Explosions;
private Timer m_Timer;
private SpellPlagueContext m_Next;
private class SpellPlagueContext
{
private int m_Explosions;
private DateTime m_LastExploded;
private SpellPlagueContext m_Next;
private SpellPlagueSpell m_Owner;
private Mobile m_Target;
private Timer m_Timer;
public SpellPlagueContext( SpellPlagueSpell owner, Mobile target )
{
m_Owner = owner;
m_Target = target;
}
public SpellPlagueContext(SpellPlagueSpell owner, Mobile target)
{
m_Owner = owner;
m_Target = target;
}
public void SetNext( SpellPlagueContext context )
{
if ( m_Next == null )
m_Next = context;
else
m_Next.SetNext( context );
}
public void SetNext(SpellPlagueContext context)
{
if (m_Next == null)
m_Next = context;
else
m_Next.SetNext(context);
}
public void Start()
{
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 8.0 ), EndPlague );
m_Timer.Start();
public void Start()
{
m_Timer = Timer.DelayCall(TimeSpan.FromSeconds(8.0), EndPlague);
m_Timer.Start();
BuffInfo.AddBuff( m_Target, new BuffInfo( BuffIcon.SpellPlague, 1031690, 1080167, TimeSpan.FromSeconds( 8.5 ), m_Target ) );
}
BuffInfo.AddBuff(m_Target,
new BuffInfo(BuffIcon.SpellPlague, 1031690, 1080167, TimeSpan.FromSeconds(8.5), m_Target));
}
public void OnDamage()
{
if ( DateTime.Now > ( m_LastExploded + TimeSpan.FromSeconds( 2.0 ) ) )
{
var exploChance = 90 - ( m_Explosions * 30 );
public void OnDamage()
{
if (DateTime.Now > m_LastExploded + TimeSpan.FromSeconds(2.0))
{
int exploChance = 90 - m_Explosions * 30;
var resist = m_Target.Skills[SkillName.MagicResist].Value;
double resist = m_Target.Skills[SkillName.MagicResist].Value;
if ( resist >= 70 )
exploChance -= (int) ( ( resist - 70.0 ) * 3.0 / 10.0 );
if (resist >= 70)
exploChance -= (int)((resist - 70.0) * 3.0 / 10.0);
if ( exploChance > Utility.Random( 100 ) )
{
m_Owner.VisualEffect( m_Target );
if (exploChance > Utility.Random(100))
{
m_Owner.VisualEffect(m_Target);
var damage = m_Owner.GetNewAosDamage( 15 + ( m_Explosions * 3 ), 1, 5, m_Target );
int damage = m_Owner.GetNewAosDamage(15 + m_Explosions * 3, 1, 5, m_Target);
m_Explosions++;
m_LastExploded = DateTime.Now;
m_Explosions++;
m_LastExploded = DateTime.Now;
var types = new int[4];
types[Utility.Random( types.Length )] = 100;
int[] types = new int[4];
types[Utility.Random(types.Length)] = 100;
SpellHelper.Damage( m_Owner, m_Target, damage, 0, types[0], types[1], types[2], types[3] );
SpellHelper.Damage(m_Owner, m_Target, damage, 0, types[0], types[1], types[2], types[3]);
if ( m_Explosions >= 3 )
EndPlague();
}
}
}
if (m_Explosions >= 3)
EndPlague();
}
}
}
private void EndPlague()
{
EndPlague( true );
}
private void EndPlague()
{
EndPlague(true);
}
public void EndPlague( bool restart )
{
m_Timer?.Stop();
public void EndPlague(bool restart)
{
m_Timer?.Stop();
if ( restart && m_Next != null )
{
m_Table[m_Target] = m_Next;
m_Next.Start();
}
else
{
m_Table.Remove( m_Target );
if (restart && m_Next != null)
{
m_Table[m_Target] = m_Next;
m_Next.Start();
}
else
{
m_Table.Remove(m_Target);
BuffInfo.RemoveBuff( m_Target, BuffIcon.SpellPlague );
}
}
}
BuffInfo.RemoveBuff(m_Target, BuffIcon.SpellPlague);
}
}
}
private class InternalTarget : Target
{
private SpellPlagueSpell m_Owner;
private class InternalTarget : Target
{
private SpellPlagueSpell m_Owner;
public InternalTarget( SpellPlagueSpell owner )
: base( 12, false, TargetFlags.Harmful )
{
m_Owner = owner;
}
public InternalTarget(SpellPlagueSpell owner)
: base(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();
}
}
}
}