fix: Codegens traps (#1472)
This commit is contained in:
parent
c341d6ad3e
commit
06309d9d59
31 changed files with 1082 additions and 1254 deletions
|
|
@ -1,83 +1,66 @@
|
|||
using System;
|
||||
using ModernUO.Serialization;
|
||||
|
||||
namespace Server.Items
|
||||
namespace Server.Items;
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public abstract partial class BaseTrap : Item
|
||||
{
|
||||
public abstract class BaseTrap : Item
|
||||
private DateTime m_NextPassiveTrigger, m_NextActiveTrigger;
|
||||
|
||||
public BaseTrap(int itemID) : base(itemID) => Movable = false;
|
||||
|
||||
public virtual bool PassivelyTriggered => false;
|
||||
public virtual TimeSpan PassiveTriggerDelay => TimeSpan.Zero;
|
||||
public virtual int PassiveTriggerRange => -1;
|
||||
public virtual TimeSpan ResetDelay => TimeSpan.Zero;
|
||||
|
||||
public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
|
||||
|
||||
public virtual void OnTrigger(Mobile from)
|
||||
{
|
||||
private DateTime m_NextPassiveTrigger, m_NextActiveTrigger;
|
||||
}
|
||||
|
||||
public BaseTrap(int itemID) : base(itemID) => Movable = false;
|
||||
public virtual int GetEffectHue()
|
||||
{
|
||||
var hue = Hue & 0x3FFF;
|
||||
|
||||
public BaseTrap(Serial serial) : base(serial)
|
||||
if (hue < 2)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
public virtual bool PassivelyTriggered => false;
|
||||
public virtual TimeSpan PassiveTriggerDelay => TimeSpan.Zero;
|
||||
public virtual int PassiveTriggerRange => -1;
|
||||
public virtual TimeSpan ResetDelay => TimeSpan.Zero;
|
||||
return hue - 1;
|
||||
}
|
||||
|
||||
public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
|
||||
public bool CheckRange(Point3D loc, Point3D oldLoc, int range) =>
|
||||
CheckRange(loc, range) && !CheckRange(oldLoc, range);
|
||||
|
||||
public virtual void OnTrigger(Mobile from)
|
||||
public bool CheckRange(Point3D loc, int range) =>
|
||||
Z + 8 >= loc.Z && loc.Z + 16 > Z
|
||||
&& Utility.InRange(GetWorldLocation(), loc, range);
|
||||
|
||||
public override void OnMovement(Mobile m, Point3D oldLocation)
|
||||
{
|
||||
base.OnMovement(m, oldLocation);
|
||||
|
||||
if (m.Location == oldLocation)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
public virtual int GetEffectHue()
|
||||
if (CheckRange(m.Location, oldLocation, 0) && Core.Now >= m_NextActiveTrigger)
|
||||
{
|
||||
var hue = Hue & 0x3FFF;
|
||||
m_NextActiveTrigger = m_NextPassiveTrigger = Core.Now + ResetDelay;
|
||||
|
||||
if (hue < 2)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return hue - 1;
|
||||
OnTrigger(m);
|
||||
}
|
||||
|
||||
public bool CheckRange(Point3D loc, Point3D oldLoc, int range) =>
|
||||
CheckRange(loc, range) && !CheckRange(oldLoc, range);
|
||||
|
||||
public bool CheckRange(Point3D loc, int range) =>
|
||||
Z + 8 >= loc.Z && loc.Z + 16 > Z
|
||||
&& Utility.InRange(GetWorldLocation(), loc, range);
|
||||
|
||||
public override void OnMovement(Mobile m, Point3D oldLocation)
|
||||
else if (PassivelyTriggered && CheckRange(m.Location, oldLocation, PassiveTriggerRange) &&
|
||||
Core.Now >= m_NextPassiveTrigger)
|
||||
{
|
||||
base.OnMovement(m, oldLocation);
|
||||
m_NextPassiveTrigger = Core.Now + PassiveTriggerDelay;
|
||||
|
||||
if (m.Location == oldLocation)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (CheckRange(m.Location, oldLocation, 0) && Core.Now >= m_NextActiveTrigger)
|
||||
{
|
||||
m_NextActiveTrigger = m_NextPassiveTrigger = Core.Now + ResetDelay;
|
||||
|
||||
OnTrigger(m);
|
||||
}
|
||||
else if (PassivelyTriggered && CheckRange(m.Location, oldLocation, PassiveTriggerRange) &&
|
||||
Core.Now >= m_NextPassiveTrigger)
|
||||
{
|
||||
m_NextPassiveTrigger = Core.Now + PassiveTriggerDelay;
|
||||
|
||||
OnTrigger(m);
|
||||
}
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
OnTrigger(m);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue