fix: Stages faction code for serialization conversion (#1835)

This commit is contained in:
Kamron Batman 2024-06-16 11:53:15 -07:00 • committed by GitHub
parent 20596e52fa
commit 221312be4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
43 changed files with 6234 additions and 6364 deletions

View file

@ -2,289 +2,288 @@ using System;
using Server.Items;
using Server.Network;
namespace Server.Factions
{
public enum AllowedPlacing
{
Everywhere,
namespace Server.Factions;
AnyFactionTown,
ControlledFactionTown,
FactionStronghold
public enum AllowedPlacing
{
Everywhere,
AnyFactionTown,
ControlledFactionTown,
FactionStronghold
}
public abstract class BaseFactionTrap : BaseTrap
{
private TimerExecutionToken _concealingTimerToken;
public BaseFactionTrap(Faction f, Mobile m, int itemID) : base(itemID)
{
Visible = false;
Faction = f;
TimeOfPlacement = Core.Now;
Placer = m;
}
public abstract class BaseFactionTrap : BaseTrap
public BaseFactionTrap(Serial serial) : base(serial)
{
private TimerExecutionToken _concealingTimerToken;
}
public BaseFactionTrap(Faction f, Mobile m, int itemID) : base(itemID)
[CommandProperty(AccessLevel.GameMaster)]
public Faction Faction { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public Mobile Placer { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public DateTime TimeOfPlacement { get; set; }
public virtual int EffectSound => 0;
public virtual int SilverFromDisarm => 100;
public virtual int MessageHue => 0;
public virtual int AttackMessage => 0;
public virtual int DisarmMessage => 0;
public virtual AllowedPlacing AllowedPlacing => AllowedPlacing.Everywhere;
public virtual TimeSpan ConcealPeriod => TimeSpan.FromMinutes(1.0);
public virtual TimeSpan DecayPeriod => Core.AOS ? TimeSpan.FromDays(1.0) : TimeSpan.MaxValue;
public override void OnTrigger(Mobile from)
{
if (!IsEnemy(from))
{
Visible = false;
Faction = f;
TimeOfPlacement = Core.Now;
Placer = m;
return;
}
public BaseFactionTrap(Serial serial) : base(serial)
Conceal();
DoVisibleEffect();
Effects.PlaySound(Location, Map, EffectSound);
DoAttackEffect(from);
var silverToAward = from.Alive ? 20 : 40;
if (Placer != null && Faction != null)
{
}
var victimState = PlayerState.Find(from);
[CommandProperty(AccessLevel.GameMaster)]
public Faction Faction { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public Mobile Placer { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public DateTime TimeOfPlacement { get; set; }
public virtual int EffectSound => 0;
public virtual int SilverFromDisarm => 100;
public virtual int MessageHue => 0;
public virtual int AttackMessage => 0;
public virtual int DisarmMessage => 0;
public virtual AllowedPlacing AllowedPlacing => AllowedPlacing.Everywhere;
public virtual TimeSpan ConcealPeriod => TimeSpan.FromMinutes(1.0);
public virtual TimeSpan DecayPeriod => Core.AOS ? TimeSpan.FromDays(1.0) : TimeSpan.MaxValue;
public override void OnTrigger(Mobile from)
{
if (!IsEnemy(from))
if (victimState?.CanGiveSilverTo(Placer) == true && victimState.KillPoints > 0)
{
return;
}
var silverGiven = Faction.AwardSilver(Placer, silverToAward);
Conceal();
DoVisibleEffect();
Effects.PlaySound(Location, Map, EffectSound);
DoAttackEffect(from);
var silverToAward = from.Alive ? 20 : 40;
if (Placer != null && Faction != null)
{
var victimState = PlayerState.Find(from);
if (victimState?.CanGiveSilverTo(Placer) == true && victimState.KillPoints > 0)
if (silverGiven > 0)
{
var silverGiven = Faction.AwardSilver(Placer, silverToAward);
if (silverGiven > 0)
// TODO: Get real message
if (from.Alive)
{
// TODO: Get real message
if (from.Alive)
{
Placer.SendMessage(
$"You have earned {silverGiven} silver pieces because {from.Name} fell for your trap."
);
}
else
{
// You have earned ~1_SILVER_AMOUNT~ pieces for vanquishing ~2_PLAYER_NAME~!
Placer.SendLocalizedMessage(1042736, $"{silverGiven} silver\t{from.Name}");
}
Placer.SendMessage(
$"You have earned {silverGiven} silver pieces because {from.Name} fell for your trap."
);
}
victimState.OnGivenSilverTo(Placer);
}
}
from.LocalOverheadMessage(MessageType.Regular, MessageHue, AttackMessage);
}
public abstract void DoVisibleEffect();
public abstract void DoAttackEffect(Mobile m);
public virtual int IsValidLocation() => IsValidLocation(GetWorldLocation(), Map);
public virtual int IsValidLocation(Point3D p, Map m)
{
if (m == null)
{
return 502956; // You cannot place a trap on that.
}
if (Core.ML)
{
foreach (var item in m.GetItemsAt(p))
{
if (item is BaseFactionTrap trap && trap.Faction == Faction)
else
{
return 1075263; // There is already a trap belonging to your faction at this location.;
// You have earned ~1_SILVER_AMOUNT~ pieces for vanquishing ~2_PLAYER_NAME~!
Placer.SendLocalizedMessage(1042736, $"{silverGiven} silver\t{from.Name}");
}
}
victimState.OnGivenSilverTo(Placer);
}
switch (AllowedPlacing)
{
case AllowedPlacing.FactionStronghold:
{
var region = Region.Find(p, m).GetRegion<StrongholdRegion>();
if (region != null && region.Faction == Faction)
{
return 0;
}
return 1010355; // This trap can only be placed in your stronghold
}
case AllowedPlacing.AnyFactionTown:
{
var town = Town.FromRegion(Region.Find(p, m));
if (town != null)
{
return 0;
}
return 1010356; // This trap can only be placed in a faction town
}
case AllowedPlacing.ControlledFactionTown:
{
var town = Town.FromRegion(Region.Find(p, m));
if (town != null && town.Owner == Faction)
{
return 0;
}
return 1010357; // This trap can only be placed in a town your faction controls
}
}
return 0;
}
public override void OnMovement(Mobile m, Point3D oldLocation)
{
base.OnMovement(m, oldLocation);
from.LocalOverheadMessage(MessageType.Regular, MessageHue, AttackMessage);
}
if (!CheckDecay() && CheckRange(m.Location, oldLocation, 6))
public abstract void DoVisibleEffect();
public abstract void DoAttackEffect(Mobile m);
public virtual int IsValidLocation() => IsValidLocation(GetWorldLocation(), Map);
public virtual int IsValidLocation(Point3D p, Map m)
{
if (m == null)
{
return 502956; // You cannot place a trap on that.
}
if (Core.ML)
{
foreach (var item in m.GetItemsAt(p))
{
if (Faction.Find(m) != null &&
(m.Skills.DetectHidden.Value - 80.0) / 20.0 > Utility.RandomDouble())
if (item is BaseFactionTrap trap && trap.Faction == Faction)
{
PrivateOverheadLocalizedMessage(m, 1010154, MessageHue, "", ""); // [Faction Trap]
return 1075263; // There is already a trap belonging to your faction at this location.;
}
}
}
public void PrivateOverheadLocalizedMessage(Mobile to, int number, int hue, string name, string args)
switch (AllowedPlacing)
{
to?.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Regular, hue, 3, number, name, args);
case AllowedPlacing.FactionStronghold:
{
var region = Region.Find(p, m).GetRegion<StrongholdRegion>();
if (region != null && region.Faction == Faction)
{
return 0;
}
return 1010355; // This trap can only be placed in your stronghold
}
case AllowedPlacing.AnyFactionTown:
{
var town = Town.FromRegion(Region.Find(p, m));
if (town != null)
{
return 0;
}
return 1010356; // This trap can only be placed in a faction town
}
case AllowedPlacing.ControlledFactionTown:
{
var town = Town.FromRegion(Region.Find(p, m));
if (town != null && town.Owner == Faction)
{
return 0;
}
return 1010357; // This trap can only be placed in a town your faction controls
}
}
public virtual bool CheckDecay()
return 0;
}
public override void OnMovement(Mobile m, Point3D oldLocation)
{
base.OnMovement(m, oldLocation);
if (!CheckDecay() && CheckRange(m.Location, oldLocation, 6))
{
var decayPeriod = DecayPeriod;
if (decayPeriod == TimeSpan.MaxValue)
if (Faction.Find(m) != null &&
(m.Skills.DetectHidden.Value - 80.0) / 20.0 > Utility.RandomDouble())
{
return false;
PrivateOverheadLocalizedMessage(m, 1010154, MessageHue, "", ""); // [Faction Trap]
}
}
}
if (TimeOfPlacement + decayPeriod < Core.Now)
{
Timer.StartTimer(Delete);
return true;
}
public void PrivateOverheadLocalizedMessage(Mobile to, int number, int hue, string name, string args)
{
to?.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Regular, hue, 3, number, name, args);
}
public virtual bool CheckDecay()
{
var decayPeriod = DecayPeriod;
if (decayPeriod == TimeSpan.MaxValue)
{
return false;
}
public virtual void BeginConceal()
if (TimeOfPlacement + decayPeriod < Core.Now)
{
_concealingTimerToken.Cancel();
Timer.StartTimer(ConcealPeriod, Conceal, out _concealingTimerToken);
Timer.StartTimer(Delete);
return true;
}
public virtual void Conceal()
return false;
}
public virtual void BeginConceal()
{
_concealingTimerToken.Cancel();
Timer.StartTimer(ConcealPeriod, Conceal, out _concealingTimerToken);
}
public virtual void Conceal()
{
_concealingTimerToken.Cancel();
if (!Deleted)
{
_concealingTimerToken.Cancel();
if (!Deleted)
{
Visible = false;
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
Faction.WriteReference(writer, Faction);
writer.Write(Placer);
writer.Write(TimeOfPlacement);
if (Visible)
{
BeginConceal();
}
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
Faction = Faction.ReadReference(reader);
Placer = reader.ReadEntity<Mobile>();
TimeOfPlacement = reader.ReadDateTime();
if (Visible)
{
BeginConceal();
}
CheckDecay();
}
public override void OnDelete()
{
if (Faction?.Traps.Contains(this) == true)
{
Faction.Traps.Remove(this);
}
base.OnDelete();
}
public virtual bool IsEnemy(Mobile mob)
{
if (mob.Hidden && mob.AccessLevel > AccessLevel.Player)
{
return false;
}
if (!mob.Alive || mob.IsDeadBondedPet)
{
return false;
}
var faction = Faction.Find(mob, true);
if (faction == null && mob is BaseFactionGuard guard)
{
faction = guard.Faction;
}
if (faction == null)
{
return false;
}
return faction != Faction;
Visible = false;
}
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
Faction.WriteReference(writer, Faction);
writer.Write(Placer);
writer.Write(TimeOfPlacement);
if (Visible)
{
BeginConceal();
}
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
Faction = Faction.ReadReference(reader);
Placer = reader.ReadEntity<Mobile>();
TimeOfPlacement = reader.ReadDateTime();
if (Visible)
{
BeginConceal();
}
CheckDecay();
}
public override void OnDelete()
{
if (Faction?.Traps.Contains(this) == true)
{
Faction.Traps.Remove(this);
}
base.OnDelete();
}
public virtual bool IsEnemy(Mobile mob)
{
if (mob.Hidden && mob.AccessLevel > AccessLevel.Player)
{
return false;
}
if (!mob.Alive || mob.IsDeadBondedPet)
{
return false;
}
var faction = Faction.Find(mob, true);
if (faction == null && mob is BaseFactionGuard guard)
{
faction = guard.Faction;
}
if (faction == null)
{
return false;
}
return faction != Faction;
}
}

View file

@ -2,120 +2,119 @@ using System;
using Server.Engines.Craft;
using Server.Items;
namespace Server.Factions
namespace Server.Factions;
public abstract class BaseFactionTrapDeed : Item, ICraftable
{
public abstract class BaseFactionTrapDeed : Item, ICraftable
private Faction m_Faction;
public BaseFactionTrapDeed(int itemID = 0x14F0) : base(itemID)
{
private Faction m_Faction;
Weight = 1.0;
LootType = LootType.Blessed;
}
public BaseFactionTrapDeed(int itemID = 0x14F0) : base(itemID)
public BaseFactionTrapDeed(Serial serial) : base(serial)
{
}
public abstract Type TrapType { get; }
[CommandProperty(AccessLevel.GameMaster)]
public Faction Faction
{
get => m_Faction;
set
{
Weight = 1.0;
LootType = LootType.Blessed;
}
m_Faction = value;
public BaseFactionTrapDeed(Serial serial) : base(serial)
{
}
public abstract Type TrapType { get; }
[CommandProperty(AccessLevel.GameMaster)]
public Faction Faction
{
get => m_Faction;
set
if (m_Faction != null)
{
m_Faction = value;
if (m_Faction != null)
{
Hue = m_Faction.Definition.HuePrimary;
}
Hue = m_Faction.Definition.HuePrimary;
}
}
}
public int OnCraft(
int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool,
CraftItem craftItem, int resHue
)
public int OnCraft(
int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool,
CraftItem craftItem, int resHue
)
{
ItemID = 0x14F0;
Faction = Faction.Find(from);
return 1;
}
public virtual BaseFactionTrap Construct(Mobile from)
{
try
{
ItemID = 0x14F0;
Faction = Faction.Find(from);
return 1;
return TrapType.CreateInstance<BaseFactionTrap>(m_Faction, from);
}
public virtual BaseFactionTrap Construct(Mobile from)
catch
{
try
{
return TrapType.CreateInstance<BaseFactionTrap>(m_Faction, from);
}
catch
{
return null;
}
return null;
}
}
public override void OnDoubleClick(Mobile from)
public override void OnDoubleClick(Mobile from)
{
var faction = Faction.Find(from);
if (faction == null)
{
var faction = Faction.Find(from);
from.SendLocalizedMessage(1010353, "", 0x23); // Only faction members may place faction traps
}
else if (faction != m_Faction)
{
from.SendLocalizedMessage(1010354, "", 0x23); // You may only place faction traps created by your faction
}
else if (faction.Traps.Count >= faction.MaximumTraps)
{
from.SendLocalizedMessage(1010358, "", 0x23); // Your faction already has the maximum number of traps placed
}
else
{
var trap = Construct(from);
if (faction == null)
if (trap == null)
{
from.SendLocalizedMessage(1010353, "", 0x23); // Only faction members may place faction traps
return;
}
else if (faction != m_Faction)
var message = trap.IsValidLocation(from.Location, from.Map);
if (message > 0)
{
from.SendLocalizedMessage(1010354, "", 0x23); // You may only place faction traps created by your faction
}
else if (faction.Traps.Count >= faction.MaximumTraps)
{
from.SendLocalizedMessage(1010358, "", 0x23); // Your faction already has the maximum number of traps placed
from.SendLocalizedMessage(message, "", 0x23);
trap.Delete();
}
else
{
var trap = Construct(from);
if (trap == null)
{
return;
}
var message = trap.IsValidLocation(from.Location, from.Map);
if (message > 0)
{
from.SendLocalizedMessage(message, "", 0x23);
trap.Delete();
}
else
{
from.SendLocalizedMessage(1010360); // You arm the trap and carefully hide it from view
trap.MoveToWorld(from.Location, from.Map);
faction.Traps.Add(trap);
Delete();
}
from.SendLocalizedMessage(1010360); // You arm the trap and carefully hide it from view
trap.MoveToWorld(from.Location, from.Map);
faction.Traps.Add(trap);
Delete();
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
Faction.WriteReference(writer, m_Faction);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
m_Faction = Faction.ReadReference(reader);
}
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
Faction.WriteReference(writer, m_Faction);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
m_Faction = Faction.ReadReference(reader);
}
}