warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

129
Scripts/Spells/Second/RemoveTrap.cs
View file

@ -1,82 +1,79 @@
using Server.Targeting;
using Server.Items;
using Server.Targeting;
namespace Server.Spells.Second
{
public class RemoveTrapSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Remove Trap", "An Jux",
212,
9001,
Reagent.Bloodmoss,
Reagent.SulfurousAsh
);
public class RemoveTrapSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Remove Trap", "An Jux",
212,
9001,
Reagent.Bloodmoss,
Reagent.SulfurousAsh
);
public override SpellCircle Circle => SpellCircle.Second;
public RemoveTrapSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
{
}
public RemoveTrapSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}
public override SpellCircle Circle => SpellCircle.Second;
public override void OnCast()
{
Caster.Target = new InternalTarget( this );
Caster.SendMessage( "What do you wish to untrap?" );
}
public override void OnCast()
{
Caster.Target = new InternalTarget(this);
Caster.SendMessage("What do you wish to untrap?");
}
public void Target( TrappableContainer item )
{
if ( !Caster.CanSee( item ) )
{
Caster.SendLocalizedMessage( 500237 ); // Target can not be seen.
}
else if ( item.TrapType != TrapType.None && item.TrapType != TrapType.MagicTrap )
{
base.DoFizzle();
}
else if ( CheckSequence() )
{
SpellHelper.Turn( Caster, item );
public void Target(TrappableContainer item)
{
if (!Caster.CanSee(item))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (item.TrapType != TrapType.None && item.TrapType != TrapType.MagicTrap)
{
base.DoFizzle();
}
else if (CheckSequence())
{
SpellHelper.Turn(Caster, item);
Point3D loc = item.GetWorldLocation();
Point3D loc = item.GetWorldLocation();
Effects.SendLocationParticles( EffectItem.Create( loc, item.Map, EffectItem.DefaultDuration ), 0x376A, 9, 32, 5015 );
Effects.PlaySound( loc, item.Map, 0x1F0 );
Effects.SendLocationParticles(EffectItem.Create(loc, item.Map, EffectItem.DefaultDuration), 0x376A, 9, 32,
5015);
Effects.PlaySound(loc, item.Map, 0x1F0);
item.TrapType = TrapType.None;
item.TrapPower = 0;
item.TrapLevel = 0;
}
item.TrapType = TrapType.None;
item.TrapPower = 0;
item.TrapLevel = 0;
}
FinishSequence();
}
FinishSequence();
}
private class InternalTarget : Target
{
private RemoveTrapSpell m_Owner;
private class InternalTarget : Target
{
private RemoveTrapSpell m_Owner;
public InternalTarget( RemoveTrapSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.None )
{
m_Owner = owner;
}
public InternalTarget(RemoveTrapSpell owner) : base(Core.ML ? 10 : 12, false, TargetFlags.None)
{
m_Owner = owner;
}
protected override void OnTarget( Mobile from, object o )
{
if ( o is TrappableContainer )
{
m_Owner.Target( (TrappableContainer)o );
}
else
{
from.SendMessage( "You can't disarm that" );
}
}
protected override void OnTarget(Mobile from, object o)
{
if (o is TrappableContainer)
m_Owner.Target((TrappableContainer)o);
else
from.SendMessage("You can't disarm that");
}
protected override void OnTargetFinish( Mobile from )
{
m_Owner.FinishSequence();
}
}
}
}
protected override void OnTargetFinish(Mobile from)
{
m_Owner.FinishSequence();
}
}
}
}