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

@ -1,136 +1,137 @@
using System;
using System.Collections.Generic;
using Server.Targeting;
using Server.Engines.ConPVP;
using Server.Items;
using Server.Mobiles;
using Server.Targeting;
namespace Server.Spells.Sixth
{
public class InvisibilitySpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Invisibility", "An Lor Xen",
206,
9002,
Reagent.Bloodmoss,
Reagent.Nightshade
);
public class InvisibilitySpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Invisibility", "An Lor Xen",
206,
9002,
Reagent.Bloodmoss,
Reagent.Nightshade
);
public override SpellCircle Circle => SpellCircle.Sixth;
private static Dictionary<Mobile, Timer> m_Table = new Dictionary<Mobile, Timer>();
public InvisibilitySpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}
public InvisibilitySpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
{
}
public override bool CheckCast()
{
if ( Engines.ConPVP.DuelContext.CheckSuddenDeath( Caster ) )
{
Caster.SendMessage( 0x22, "You cannot cast this spell when in sudden death." );
return false;
}
public override SpellCircle Circle => SpellCircle.Sixth;
return base.CheckCast();
}
public override bool CheckCast()
{
if (DuelContext.CheckSuddenDeath(Caster))
{
Caster.SendMessage(0x22, "You cannot cast this spell when in sudden death.");
return false;
}
public override void OnCast()
{
Caster.Target = new InternalTarget( this );
}
return base.CheckCast();
}
public void Target( Mobile m )
{
if ( !Caster.CanSee( m ) )
{
Caster.SendLocalizedMessage( 500237 ); // Target can not be seen.
}
else if ( m is Mobiles.BaseVendor || m is Mobiles.PlayerVendor || m is Mobiles.PlayerBarkeeper || m.AccessLevel > Caster.AccessLevel )
{
Caster.SendLocalizedMessage( 501857 ); // This spell won't work on that!
}
else if ( CheckBSequence( m ) )
{
SpellHelper.Turn( Caster, m );
public override void OnCast()
{
Caster.Target = new InternalTarget(this);
}
Effects.SendLocationParticles( EffectItem.Create( new Point3D( m.X, m.Y, m.Z + 16 ), Caster.Map, EffectItem.DefaultDuration ), 0x376A, 10, 15, 5045 );
m.PlaySound( 0x3C4 );
public void Target(Mobile m)
{
if (!Caster.CanSee(m))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (m is BaseVendor || m is PlayerVendor || m is PlayerBarkeeper || m.AccessLevel > Caster.AccessLevel)
{
Caster.SendLocalizedMessage(501857); // This spell won't work on that!
}
else if (CheckBSequence(m))
{
SpellHelper.Turn(Caster, m);
m.Hidden = true;
m.Combatant = null;
m.Warmode = false;
Effects.SendLocationParticles(
EffectItem.Create(new Point3D(m.X, m.Y, m.Z + 16), Caster.Map, EffectItem.DefaultDuration), 0x376A, 10,
15, 5045);
m.PlaySound(0x3C4);
RemoveTimer( m );
m.Hidden = true;
m.Combatant = null;
m.Warmode = false;
TimeSpan duration = TimeSpan.FromSeconds( (( 1.2 * Caster.Skills.Magery.Fixed) / 10 ));
RemoveTimer(m);
Timer t = new InternalTimer( m, duration );
TimeSpan duration = TimeSpan.FromSeconds(1.2 * Caster.Skills.Magery.Fixed / 10);
BuffInfo.RemoveBuff( m, BuffIcon.HidingAndOrStealth );
BuffInfo.AddBuff( m, new BuffInfo( BuffIcon.Invisibility, 1075825, duration, m ) ); //Invisibility/Invisible
Timer t = new InternalTimer(m, duration);
m_Table[m] = t;
BuffInfo.RemoveBuff(m, BuffIcon.HidingAndOrStealth);
BuffInfo.AddBuff(m, new BuffInfo(BuffIcon.Invisibility, 1075825, duration, m)); //Invisibility/Invisible
t.Start();
}
m_Table[m] = t;
FinishSequence();
}
t.Start();
}
private static Dictionary<Mobile, Timer> m_Table = new Dictionary<Mobile, Timer>();
FinishSequence();
}
public static bool HasTimer( Mobile m )
{
return m_Table.ContainsKey(m);
}
public static bool HasTimer(Mobile m)
{
return m_Table.ContainsKey(m);
}
public static void RemoveTimer( Mobile m )
{
m_Table.TryGetValue( m, out Timer t );
public static void RemoveTimer(Mobile m)
{
m_Table.TryGetValue(m, out Timer t);
if ( t != null )
{
t.Stop();
m_Table.Remove( m );
}
}
if (t != null)
{
t.Stop();
m_Table.Remove(m);
}
}
private class InternalTimer : Timer
{
private Mobile m_Mobile;
private class InternalTimer : Timer
{
private Mobile m_Mobile;
public InternalTimer( Mobile m, TimeSpan duration ) : base( duration )
{
Priority = TimerPriority.OneSecond;
m_Mobile = m;
}
public InternalTimer(Mobile m, TimeSpan duration) : base(duration)
{
Priority = TimerPriority.OneSecond;
m_Mobile = m;
}
protected override void OnTick()
{
m_Mobile.RevealingAction();
RemoveTimer( m_Mobile );
}
}
protected override void OnTick()
{
m_Mobile.RevealingAction();
RemoveTimer(m_Mobile);
}
}
public class InternalTarget : Target
{
private InvisibilitySpell m_Owner;
public class InternalTarget : Target
{
private InvisibilitySpell m_Owner;
public InternalTarget( InvisibilitySpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Beneficial )
{
m_Owner = owner;
}
public InternalTarget(InvisibilitySpell owner) : base(Core.ML ? 10 : 12, false, TargetFlags.Beneficial)
{
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();
}
}
}
}