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

148
Scripts/Spells/Sixth/Mark.cs
View file

@ -1,92 +1,90 @@
using Server.Items;
using Server.Targeting;
using Server.Network;
using Server.Targeting;
namespace Server.Spells.Sixth
{
public class MarkSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Mark", "Kal Por Ylem",
218,
9002,
Reagent.BlackPearl,
Reagent.Bloodmoss,
Reagent.MandrakeRoot
);
public class MarkSpell : MagerySpell
{
private static SpellInfo m_Info = new SpellInfo(
"Mark", "Kal Por Ylem",
218,
9002,
Reagent.BlackPearl,
Reagent.Bloodmoss,
Reagent.MandrakeRoot
);
public override SpellCircle Circle => SpellCircle.Sixth;
public MarkSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
{
}
public MarkSpell( 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 void OnCast()
{
Caster.Target = new InternalTarget(this);
}
public override bool CheckCast()
{
if ( !base.CheckCast() )
return false;
public override bool CheckCast()
{
if (!base.CheckCast())
return false;
return SpellHelper.CheckTravel( Caster, TravelCheckType.Mark );
}
return SpellHelper.CheckTravel(Caster, TravelCheckType.Mark);
}
public void Target( RecallRune rune )
{
if ( !Caster.CanSee( rune ) )
{
Caster.SendLocalizedMessage( 500237 ); // Target can not be seen.
}
else if ( !SpellHelper.CheckTravel( Caster, TravelCheckType.Mark ) )
{
}
else if ( SpellHelper.CheckMulti( Caster.Location, Caster.Map, !Core.AOS ) )
{
Caster.SendLocalizedMessage( 501942 ); // That location is blocked.
}
else if ( !rune.IsChildOf( Caster.Backpack ) )
{
Caster.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1062422 ); // You must have this rune in your backpack in order to mark it.
}
else if ( CheckSequence() )
{
rune.Mark( Caster );
public void Target(RecallRune rune)
{
if (!Caster.CanSee(rune))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (!SpellHelper.CheckTravel(Caster, TravelCheckType.Mark))
{
}
else if (SpellHelper.CheckMulti(Caster.Location, Caster.Map, !Core.AOS))
{
Caster.SendLocalizedMessage(501942); // That location is blocked.
}
else if (!rune.IsChildOf(Caster.Backpack))
{
Caster.LocalOverheadMessage(MessageType.Regular, 0x3B2,
1062422); // You must have this rune in your backpack in order to mark it.
}
else if (CheckSequence())
{
rune.Mark(Caster);
Caster.PlaySound( 0x1FA );
Effects.SendLocationEffect( Caster, Caster.Map, 14201, 16 );
}
Caster.PlaySound(0x1FA);
Effects.SendLocationEffect(Caster, Caster.Map, 14201, 16);
}
FinishSequence();
}
FinishSequence();
}
private class InternalTarget : Target
{
private MarkSpell m_Owner;
private class InternalTarget : Target
{
private MarkSpell m_Owner;
public InternalTarget( MarkSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.None )
{
m_Owner = owner;
}
public InternalTarget(MarkSpell owner) : base(Core.ML ? 10 : 12, false, TargetFlags.None)
{
m_Owner = owner;
}
protected override void OnTarget( Mobile from, object o )
{
if ( o is RecallRune )
{
m_Owner.Target( (RecallRune) o );
}
else
{
from.Send( new MessageLocalized( from.Serial, from.Body, MessageType.Regular, 0x3B2, 3, 501797, from.Name, "" ) ); // I cannot mark that object.
}
}
protected override void OnTarget(Mobile from, object o)
{
if (o is RecallRune)
m_Owner.Target((RecallRune)o);
else
from.Send(new MessageLocalized(from.Serial, from.Body, MessageType.Regular, 0x3B2, 3, 501797, from.Name,
"")); // I cannot mark that object.
}
protected override void OnTargetFinish( Mobile from )
{
m_Owner.FinishSequence();
}
}
}
}
protected override void OnTargetFinish(Mobile from)
{
m_Owner.FinishSequence();
}
}
}
}