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,106 +1,107 @@
using Server.Targeting;
using Server.Items;
using Server.Targeting;
namespace Server.Spells.Third
{
public class TelekinesisSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Telekinesis", "Ort Por Ylem",
203,
9031,
Reagent.Bloodmoss,
Reagent.MandrakeRoot
);
public class TelekinesisSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Telekinesis", "Ort Por Ylem",
203,
9031,
Reagent.Bloodmoss,
Reagent.MandrakeRoot
);
public override SpellCircle Circle => SpellCircle.Third;
public TelekinesisSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
{
}
public TelekinesisSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}
public override SpellCircle Circle => SpellCircle.Third;
public override void OnCast()
{
Caster.Target = new InternalTarget( this );
}
public override void OnCast()
{
Caster.Target = new InternalTarget(this);
}
public void Target( ITelekinesisable obj )
{
if ( CheckSequence() )
{
SpellHelper.Turn( Caster, obj );
public void Target(ITelekinesisable obj)
{
if (CheckSequence())
{
SpellHelper.Turn(Caster, obj);
obj.OnTelekinesis( Caster );
}
obj.OnTelekinesis(Caster);
}
FinishSequence();
}
FinishSequence();
}
public void Target( Container item )
{
if ( CheckSequence() )
{
SpellHelper.Turn( Caster, item );
public void Target(Container item)
{
if (CheckSequence())
{
SpellHelper.Turn(Caster, item);
object root = item.RootParent;
object root = item.RootParent;
if ( !item.IsAccessibleTo( Caster ) )
{
item.OnDoubleClickNotAccessible( Caster );
}
else if ( !item.CheckItemUse( Caster, item ) )
{
}
else if ( root is Mobile && root != Caster )
{
item.OnSnoop( Caster );
}
else if ( item is Corpse && !((Corpse)item).CheckLoot( Caster, null ) )
{
}
else if ( Caster.Region.OnDoubleClick( Caster, item ) )
{
Effects.SendLocationParticles( EffectItem.Create( item.Location, item.Map, EffectItem.DefaultDuration ), 0x376A, 9, 32, 5022 );
Effects.PlaySound( item.Location, item.Map, 0x1F5 );
if (!item.IsAccessibleTo(Caster))
{
item.OnDoubleClickNotAccessible(Caster);
}
else if (!item.CheckItemUse(Caster, item))
{
}
else if (root is Mobile && root != Caster)
{
item.OnSnoop(Caster);
}
else if (item is Corpse && !((Corpse)item).CheckLoot(Caster, null))
{
}
else if (Caster.Region.OnDoubleClick(Caster, item))
{
Effects.SendLocationParticles(EffectItem.Create(item.Location, item.Map, EffectItem.DefaultDuration),
0x376A, 9, 32, 5022);
Effects.PlaySound(item.Location, item.Map, 0x1F5);
item.OnItemUsed( Caster, item );
}
}
item.OnItemUsed(Caster, item);
}
}
FinishSequence();
}
FinishSequence();
}
public class InternalTarget : Target
{
private TelekinesisSpell m_Owner;
public class InternalTarget : Target
{
private TelekinesisSpell m_Owner;
public InternalTarget( TelekinesisSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.None )
{
m_Owner = owner;
}
public InternalTarget(TelekinesisSpell owner) : base(Core.ML ? 10 : 12, false, TargetFlags.None)
{
m_Owner = owner;
}
protected override void OnTarget( Mobile from, object o )
{
if ( o is ITelekinesisable )
m_Owner.Target( (ITelekinesisable)o );
else if ( o is Container )
m_Owner.Target( (Container)o );
else
from.SendLocalizedMessage( 501857 ); // This spell won't work on that!
}
protected override void OnTarget(Mobile from, object o)
{
if (o is ITelekinesisable)
m_Owner.Target((ITelekinesisable)o);
else if (o is Container)
m_Owner.Target((Container)o);
else
from.SendLocalizedMessage(501857); // This spell won't work on that!
}
protected override void OnTargetFinish( Mobile from )
{
m_Owner.FinishSequence();
}
}
}
protected override void OnTargetFinish(Mobile from)
{
m_Owner.FinishSequence();
}
}
}
}
namespace Server
{
public interface ITelekinesisable : IPoint3D
{
void OnTelekinesis( Mobile from );
}
}
public interface ITelekinesisable : IPoint3D
{
void OnTelekinesis(Mobile from);
}
}