Formats UO Content (#201)
This commit is contained in:
parent
86b7b3aed1
commit
ad3775c4d7
3249 changed files with 431083 additions and 440981 deletions
|
|
@ -1,9 +1,9 @@
|
|||
namespace Server.Spells
|
||||
{
|
||||
public interface IRecallSpell
|
||||
{
|
||||
Mobile Caster { get; }
|
||||
void Effect(Point3D loc, Map map, bool checkMulti);
|
||||
void FinishSequence();
|
||||
}
|
||||
public interface IRecallSpell
|
||||
{
|
||||
Mobile Caster { get; }
|
||||
void Effect(Point3D loc, Map map, bool checkMulti);
|
||||
void FinishSequence();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
namespace Server.Spells
|
||||
{
|
||||
public interface ISpellTarget
|
||||
{
|
||||
ISpell Spell { get; }
|
||||
}
|
||||
public interface ISpellTarget
|
||||
{
|
||||
ISpell Spell { get; }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,62 +5,82 @@ using Server.Targeting;
|
|||
|
||||
namespace Server.Spells
|
||||
{
|
||||
public class RecallSpellTarget : Target
|
||||
{
|
||||
private readonly IRecallSpell m_Spell;
|
||||
private readonly bool m_ToBoat;
|
||||
|
||||
public RecallSpellTarget(IRecallSpell spell, bool toBoat = true) : base(Core.ML ? 10 : 12, false, TargetFlags.None)
|
||||
public class RecallSpellTarget : Target
|
||||
{
|
||||
m_Spell = spell;
|
||||
m_ToBoat = toBoat;
|
||||
m_Spell.Caster.LocalOverheadMessage(MessageType.Regular, 0x3B2, 501029); // Select Marked item.
|
||||
}
|
||||
private readonly IRecallSpell m_Spell;
|
||||
private readonly bool m_ToBoat;
|
||||
|
||||
protected override void OnTarget(Mobile from, object o)
|
||||
{
|
||||
if (o is RecallRune rune)
|
||||
{
|
||||
if (rune.Marked)
|
||||
m_Spell.Effect(rune.Target, rune.TargetMap, true);
|
||||
else
|
||||
from.SendLocalizedMessage(501805); // That rune is not yet marked.
|
||||
}
|
||||
else if (o is Runebook runebook)
|
||||
{
|
||||
RunebookEntry e = runebook.Default;
|
||||
public RecallSpellTarget(IRecallSpell spell, bool toBoat = true) : base(Core.ML ? 10 : 12, false, TargetFlags.None)
|
||||
{
|
||||
m_Spell = spell;
|
||||
m_ToBoat = toBoat;
|
||||
m_Spell.Caster.LocalOverheadMessage(MessageType.Regular, 0x3B2, 501029); // Select Marked item.
|
||||
}
|
||||
|
||||
if (e != null)
|
||||
m_Spell.Effect(e.Location, e.Map, true);
|
||||
else
|
||||
from.SendLocalizedMessage(502354); // Target is not marked.
|
||||
}
|
||||
else if (m_ToBoat && o is Key key && key.KeyValue != 0 && key.Link is BaseBoat boat)
|
||||
{
|
||||
if (!boat.Deleted && boat.CheckKey(key.KeyValue))
|
||||
m_Spell.Effect(boat.GetMarkedLocation(), boat.Map, false);
|
||||
else
|
||||
from.Send(new MessageLocalized(from.Serial, from.Body, MessageType.Regular, 0x3B2, 3, 502357,
|
||||
from.Name, "")); // I can not recall from that object.
|
||||
}
|
||||
else if (o is HouseRaffleDeed deed && deed.ValidLocation())
|
||||
{
|
||||
m_Spell.Effect(deed.PlotLocation, deed.PlotFacet, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
from.Send(new MessageLocalized(from.Serial, from.Body, MessageType.Regular, 0x3B2, 3, 502357, from.Name,
|
||||
"")); // I can not recall from that object.
|
||||
}
|
||||
}
|
||||
protected override void OnTarget(Mobile from, object o)
|
||||
{
|
||||
if (o is RecallRune rune)
|
||||
{
|
||||
if (rune.Marked)
|
||||
m_Spell.Effect(rune.Target, rune.TargetMap, true);
|
||||
else
|
||||
from.SendLocalizedMessage(501805); // That rune is not yet marked.
|
||||
}
|
||||
else if (o is Runebook runebook)
|
||||
{
|
||||
var e = runebook.Default;
|
||||
|
||||
protected override void OnNonlocalTarget(Mobile from, object o)
|
||||
{
|
||||
}
|
||||
if (e != null)
|
||||
m_Spell.Effect(e.Location, e.Map, true);
|
||||
else
|
||||
from.SendLocalizedMessage(502354); // Target is not marked.
|
||||
}
|
||||
else if (m_ToBoat && o is Key key && key.KeyValue != 0 && key.Link is BaseBoat boat)
|
||||
{
|
||||
if (!boat.Deleted && boat.CheckKey(key.KeyValue))
|
||||
m_Spell.Effect(boat.GetMarkedLocation(), boat.Map, false);
|
||||
else
|
||||
from.Send(
|
||||
new MessageLocalized(
|
||||
from.Serial,
|
||||
from.Body,
|
||||
MessageType.Regular,
|
||||
0x3B2,
|
||||
3,
|
||||
502357,
|
||||
from.Name,
|
||||
""
|
||||
)
|
||||
); // I can not recall from that object.
|
||||
}
|
||||
else if (o is HouseRaffleDeed deed && deed.ValidLocation())
|
||||
{
|
||||
m_Spell.Effect(deed.PlotLocation, deed.PlotFacet, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
from.Send(
|
||||
new MessageLocalized(
|
||||
from.Serial,
|
||||
from.Body,
|
||||
MessageType.Regular,
|
||||
0x3B2,
|
||||
3,
|
||||
502357,
|
||||
from.Name,
|
||||
""
|
||||
)
|
||||
); // I can not recall from that object.
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnTargetFinish(Mobile from)
|
||||
{
|
||||
m_Spell?.FinishSequence();
|
||||
protected override void OnNonlocalTarget(Mobile from, object o)
|
||||
{
|
||||
}
|
||||
|
||||
protected override void OnTargetFinish(Mobile from)
|
||||
{
|
||||
m_Spell?.FinishSequence();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,27 +2,29 @@ using Server.Targeting;
|
|||
|
||||
namespace Server.Spells
|
||||
{
|
||||
public interface ISpellTargetingItem : ISpell
|
||||
{
|
||||
void Target(Item item);
|
||||
}
|
||||
|
||||
public class SpellTargetItem : Target, ISpellTarget
|
||||
{
|
||||
private readonly ISpellTargetingItem m_Spell;
|
||||
public ISpell Spell => m_Spell;
|
||||
|
||||
public SpellTargetItem(ISpellTargetingItem spell, TargetFlags flags, int range = 12) : base(range, false, flags) => m_Spell = spell;
|
||||
|
||||
protected override void OnTarget(Mobile from, object o)
|
||||
public interface ISpellTargetingItem : ISpell
|
||||
{
|
||||
if (o is Item item)
|
||||
m_Spell.Target(item);
|
||||
void Target(Item item);
|
||||
}
|
||||
|
||||
protected override void OnTargetFinish(Mobile from)
|
||||
public class SpellTargetItem : Target, ISpellTarget
|
||||
{
|
||||
m_Spell?.FinishSequence();
|
||||
private readonly ISpellTargetingItem m_Spell;
|
||||
|
||||
public SpellTargetItem(ISpellTargetingItem spell, TargetFlags flags, int range = 12) : base(range, false, flags) =>
|
||||
m_Spell = spell;
|
||||
|
||||
public ISpell Spell => m_Spell;
|
||||
|
||||
protected override void OnTarget(Mobile from, object o)
|
||||
{
|
||||
if (o is Item item)
|
||||
m_Spell.Target(item);
|
||||
}
|
||||
|
||||
protected override void OnTargetFinish(Mobile from)
|
||||
{
|
||||
m_Spell?.FinishSequence();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,26 +2,28 @@ using Server.Targeting;
|
|||
|
||||
namespace Server.Spells
|
||||
{
|
||||
public interface ISpellTargetingMobile : ISpell
|
||||
{
|
||||
void Target(Mobile from);
|
||||
}
|
||||
|
||||
public class SpellTargetMobile : Target, ISpellTarget
|
||||
{
|
||||
private readonly ISpellTargetingMobile m_Spell;
|
||||
public ISpell Spell => m_Spell;
|
||||
|
||||
public SpellTargetMobile(ISpellTargetingMobile spell, TargetFlags flags, int range = 12) : base(range, false, flags) => m_Spell = spell;
|
||||
|
||||
protected override void OnTarget(Mobile from, object o)
|
||||
public interface ISpellTargetingMobile : ISpell
|
||||
{
|
||||
m_Spell.Target(o as Mobile);
|
||||
void Target(Mobile from);
|
||||
}
|
||||
|
||||
protected override void OnTargetFinish(Mobile from)
|
||||
public class SpellTargetMobile : Target, ISpellTarget
|
||||
{
|
||||
m_Spell?.FinishSequence();
|
||||
private readonly ISpellTargetingMobile m_Spell;
|
||||
|
||||
public SpellTargetMobile(ISpellTargetingMobile spell, TargetFlags flags, int range = 12) :
|
||||
base(range, false, flags) => m_Spell = spell;
|
||||
|
||||
public ISpell Spell => m_Spell;
|
||||
|
||||
protected override void OnTarget(Mobile from, object o)
|
||||
{
|
||||
m_Spell.Target(o as Mobile);
|
||||
}
|
||||
|
||||
protected override void OnTargetFinish(Mobile from)
|
||||
{
|
||||
m_Spell?.FinishSequence();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,44 +3,46 @@ using Server.Targeting;
|
|||
|
||||
namespace Server.Spells
|
||||
{
|
||||
public interface ISpellTargetingPoint3D : ISpell
|
||||
{
|
||||
void Target(IPoint3D p);
|
||||
}
|
||||
|
||||
public class SpellTargetPoint3D : Target
|
||||
{
|
||||
private ISpellTargetingPoint3D m_Spell;
|
||||
public ISpell Spell => m_Spell;
|
||||
|
||||
private readonly bool m_CheckLOS;
|
||||
|
||||
public SpellTargetPoint3D(ISpellTargetingPoint3D spell, TargetFlags flags = TargetFlags.None, int range = 12, bool checkLOS = true) : base(range, true, flags)
|
||||
public interface ISpellTargetingPoint3D : ISpell
|
||||
{
|
||||
m_Spell = spell;
|
||||
m_CheckLOS = checkLOS;
|
||||
void Target(IPoint3D p);
|
||||
}
|
||||
|
||||
protected override void OnTarget(Mobile from, object o)
|
||||
public class SpellTargetPoint3D : Target
|
||||
{
|
||||
if (o is IPoint3D p)
|
||||
m_Spell.Target(p);
|
||||
}
|
||||
private readonly bool m_CheckLOS;
|
||||
private ISpellTargetingPoint3D m_Spell;
|
||||
|
||||
protected override void OnTargetOutOfLOS(Mobile from, object o)
|
||||
{
|
||||
if (!m_CheckLOS)
|
||||
return;
|
||||
public SpellTargetPoint3D(
|
||||
ISpellTargetingPoint3D spell, TargetFlags flags = TargetFlags.None, int range = 12, bool checkLOS = true
|
||||
) : base(range, true, flags)
|
||||
{
|
||||
m_Spell = spell;
|
||||
m_CheckLOS = checkLOS;
|
||||
}
|
||||
|
||||
from.SendLocalizedMessage(501943); // Target cannot be seen. Try again.
|
||||
from.Target = new SpellTargetPoint3D(m_Spell);
|
||||
from.Target.BeginTimeout(from, TimeoutTime - DateTime.UtcNow);
|
||||
m_Spell = null; // Needed?
|
||||
}
|
||||
public ISpell Spell => m_Spell;
|
||||
|
||||
protected override void OnTargetFinish(Mobile from)
|
||||
{
|
||||
m_Spell?.FinishSequence();
|
||||
protected override void OnTarget(Mobile from, object o)
|
||||
{
|
||||
if (o is IPoint3D p)
|
||||
m_Spell.Target(p);
|
||||
}
|
||||
|
||||
protected override void OnTargetOutOfLOS(Mobile from, object o)
|
||||
{
|
||||
if (!m_CheckLOS)
|
||||
return;
|
||||
|
||||
from.SendLocalizedMessage(501943); // Target cannot be seen. Try again.
|
||||
from.Target = new SpellTargetPoint3D(m_Spell);
|
||||
from.Target.BeginTimeout(from, TimeoutTime - DateTime.UtcNow);
|
||||
m_Spell = null; // Needed?
|
||||
}
|
||||
|
||||
protected override void OnTargetFinish(Mobile from)
|
||||
{
|
||||
m_Spell?.FinishSequence();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue