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

fix: Codegens spawners (#1678)

Browse source
This commit is contained in:
Kamron Batman 2024-02-12 21:14:42 -08:00 • committed by GitHub
parent 48e47f9352
commit 5ada7a4e50
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 1494 additions and 1604 deletions
Download patch file Download diff file Expand all files Collapse all files

263
Projects/UOContent/Engines/Spawners/ProximitySpawner.cs
View file

@ -15,174 +15,147 @@
using System;
using System.Text.Json;
using ModernUO.Serialization;
using Server.Json;
using Server.Mobiles;
namespace Server.Engines.Spawners
namespace Server.Engines.Spawners;
[SerializationGenerator(0)]
public partial class ProximitySpawner : Spawner
{
public class ProximitySpawner : Spawner
[SerializableField(0)]
[SerializedCommandProperty(AccessLevel.Developer)]
private int _triggerRange;
[SerializableField(1)]
[SerializedCommandProperty(AccessLevel.Developer)]
private TextDefinition _spawnMessage;
[SerializableField(2)]
[SerializedCommandProperty(AccessLevel.Developer)]
private bool _instantFlag;
[Constructible(AccessLevel.Developer)]
public ProximitySpawner()
{
[Constructible(AccessLevel.Developer)]
public ProximitySpawner()
}
[Constructible(AccessLevel.Developer)]
public ProximitySpawner(string spawnName) : base(spawnName)
{
}
[Constructible(AccessLevel.Developer)]
public ProximitySpawner(int amount, int minDelay, int maxDelay, int team, int homeRange, string spawnName)
: base(amount, minDelay, maxDelay, team, homeRange, spawnName)
{
}
[Constructible(AccessLevel.Developer)]
public ProximitySpawner(
int amount, int minDelay, int maxDelay, int team, int homeRange, int triggerRange,
string spawnMessage, bool instantFlag, string spawnName
) : base(amount, minDelay, maxDelay, team, homeRange, spawnName)
{
TriggerRange = triggerRange;
SpawnMessage = TextDefinition.Parse(spawnMessage);
InstantFlag = instantFlag;
}
[Constructible(AccessLevel.Developer)]
public ProximitySpawner(
int amount, TimeSpan minDelay, TimeSpan maxDelay, int team, int homeRange,
params string[] spawnedNames
) : base(amount, minDelay, maxDelay, team, homeRange, spawnedNames)
{
}
[Constructible(AccessLevel.Developer)]
public ProximitySpawner(
int amount, TimeSpan minDelay, TimeSpan maxDelay, int team, int homeRange, int triggerRange,
TextDefinition spawnMessage, bool instantFlag, params string[] spawnedNames
) : base(amount, minDelay, maxDelay, team, homeRange, spawnedNames)
{
TriggerRange = triggerRange;
SpawnMessage = spawnMessage;
InstantFlag = instantFlag;
}
public ProximitySpawner(DynamicJson json, JsonSerializerOptions options) : base(json, options)
{
json.GetProperty("triggerRange", options, out int triggerRange);
json.GetProperty("spawnMessage", options, out TextDefinition spawnMessage);
json.GetProperty("instant", options, out bool instant);
TriggerRange = triggerRange;
SpawnMessage = spawnMessage;
InstantFlag = instant;
}
public override string DefaultName => "Proximity Spawner";
public override bool HandlesOnMovement => true;
public override void ToJson(DynamicJson json, JsonSerializerOptions options)
{
json.SetProperty("triggerRange", options, TriggerRange);
json.SetProperty("spawnMessage", options, SpawnMessage);
json.SetProperty("instant", options, InstantFlag);
}
public override void DoTimer(TimeSpan delay)
{
if (!Running)
{
return;
}
[Constructible(AccessLevel.Developer)]
public ProximitySpawner(string spawnName)
: base(spawnName)
End = Core.Now + delay;
}
public override void Respawn()
{
RemoveSpawns();
End = Core.Now;
}
public virtual bool ValidTrigger(Mobile m)
{
if (m is BaseCreature bc && (bc.IsDeadBondedPet || !(bc.Controlled || bc.Summoned)))
{
return false;
}
[Constructible(AccessLevel.Developer)]
public ProximitySpawner(int amount, int minDelay, int maxDelay, int team, int homeRange, string spawnName)
: base(amount, minDelay, maxDelay, team, homeRange, spawnName)
return m.AccessLevel == AccessLevel.Player && (m.Player || m.Alive && !m.Hidden && m.CanBeDamaged());
}
public override void OnMovement(Mobile m, Point3D oldLocation)
{
if (!Running)
{
return;
}
[Constructible(AccessLevel.Developer)]
public ProximitySpawner(
int amount, int minDelay, int maxDelay, int team, int homeRange, int triggerRange,
string spawnMessage, bool instantFlag, string spawnName
)
: base(amount, minDelay, maxDelay, team, homeRange, spawnName)
if (IsEmpty && End <= Core.Now && m.InRange(GetWorldLocation(), TriggerRange) &&
m.Location != oldLocation && ValidTrigger(m))
{
TriggerRange = triggerRange;
SpawnMessage = TextDefinition.Parse(spawnMessage);
InstantFlag = instantFlag;
}
SpawnMessage.SendMessageTo(m);
[Constructible(AccessLevel.Developer)]
public ProximitySpawner(
int amount, TimeSpan minDelay, TimeSpan maxDelay, int team, int homeRange,
params string[] spawnedNames
)
: base(amount, minDelay, maxDelay, team, homeRange, spawnedNames)
{
}
DoTimer();
Spawn();
[Constructible(AccessLevel.Developer)]
public ProximitySpawner(
int amount, TimeSpan minDelay, TimeSpan maxDelay, int team, int homeRange, int triggerRange,
TextDefinition spawnMessage, bool instantFlag, params string[] spawnedNames
)
: base(amount, minDelay, maxDelay, team, homeRange, spawnedNames)
{
TriggerRange = triggerRange;
SpawnMessage = spawnMessage;
InstantFlag = instantFlag;
}
public ProximitySpawner(DynamicJson json, JsonSerializerOptions options) : base(json, options)
{
json.GetProperty("triggerRange", options, out int triggerRange);
json.GetProperty("spawnMessage", options, out TextDefinition spawnMessage);
json.GetProperty("instant", options, out bool instant);
TriggerRange = triggerRange;
SpawnMessage = spawnMessage;
InstantFlag = instant;
}
public ProximitySpawner(Serial serial)
: base(serial)
{
}
[CommandProperty(AccessLevel.Developer)]
public int TriggerRange { get; set; }
[CommandProperty(AccessLevel.Developer)]
public TextDefinition SpawnMessage { get; set; }
[CommandProperty(AccessLevel.Developer)]
public bool InstantFlag { get; set; }
public override string DefaultName => "Proximity Spawner";
public override bool HandlesOnMovement => true;
public override void ToJson(DynamicJson json, JsonSerializerOptions options)
{
json.SetProperty("triggerRange", options, TriggerRange);
json.SetProperty("spawnMessage", options, SpawnMessage);
json.SetProperty("instant", options, InstantFlag);
}
public override void DoTimer(TimeSpan delay)
{
if (!Running)
if (InstantFlag)
{
return;
}
End = Core.Now + delay;
}
public override void Respawn()
{
RemoveSpawns();
End = Core.Now;
}
public virtual bool ValidTrigger(Mobile m)
{
if (m is BaseCreature bc && (bc.IsDeadBondedPet || !(bc.Controlled || bc.Summoned)))
{
return false;
}
return m.AccessLevel == AccessLevel.Player && (m.Player || m.Alive && !m.Hidden && m.CanBeDamaged());
}
public override void OnMovement(Mobile m, Point3D oldLocation)
{
if (!Running)
{
return;
}
if (IsEmpty && End <= Core.Now && m.InRange(GetWorldLocation(), TriggerRange) &&
m.Location != oldLocation && ValidTrigger(m))
{
SpawnMessage.SendMessageTo(m);
DoTimer();
Spawn();
if (InstantFlag)
foreach (var spawned in Spawned.Keys)
{
foreach (var spawned in Spawned.Keys)
if (spawned is Mobile mobile)
{
if (spawned is Mobile mobile)
{
mobile.Combatant = m;
}
mobile.Combatant = m;
}
}
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
writer.Write(TriggerRange);
writer.Write(SpawnMessage);
writer.Write(InstantFlag);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
TriggerRange = reader.ReadInt();
SpawnMessage = reader.ReadTextDefinition();
InstantFlag = reader.ReadBool();
}
}
}