* Fixes pooled timer leaking * Fixes `[dumptimers` command so it outputs properly, adds spacing, and stacktraces * Adds `[Tidy]` for serializing Lists. This will remove deleted entities during world save before serializing the list. * Adds helpers for managing Lists/Sets/Dictionaries ### New API ```cs // Creates the list if it is null, then adds Utility.Add(ref list, value); Utility.Add(ref set, value); Utility.Add(ref dict, key, value); // Nulls the variable if the count is zero Utility.Remove(ref list, value); Utility.Remove(ref set, value); Utility.Remove(ref dict, key); // Marks entity as dirty in addition to doing the action entity.Add(list, value); // Marks entity as dirty, and will create list if it doesn't exist entity.Add(ref list, value); // Marks entity as dirty in addition to doing the action entity.Remove(list, value); // Marks entity as dirty, and will null the list count is zero entity.Remove(ref list, value); ``` ### Updates to [dumptimers <img width="825" alt="Screen Shot 2021-08-14 at 2 55 10 AM" src="https://user-images.githubusercontent.com/3953314/129442449-ccf7fe14-29d6-4f3f-9366-c8eb7b9828a7.png">
224 lines
5.4 KiB
C#
224 lines
5.4 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using Server.Items;
|
|
using Server.Mobiles;
|
|
|
|
namespace Server.Multis
|
|
{
|
|
public abstract class BaseCamp : BaseMulti
|
|
{
|
|
private TimeSpan m_DecayDelay;
|
|
private DateTime m_DecayTime;
|
|
private Timer _decayTimer;
|
|
private List<Item> m_Items;
|
|
private List<Mobile> m_Mobiles;
|
|
|
|
public BaseCamp(int multiID) : base(multiID)
|
|
{
|
|
m_Items = new List<Item>();
|
|
m_Mobiles = new List<Mobile>();
|
|
m_DecayDelay = TimeSpan.FromMinutes(30.0);
|
|
RefreshDecay(true);
|
|
|
|
Timer.StartTimer(CheckAddComponents);
|
|
}
|
|
|
|
public BaseCamp(Serial serial) : base(serial)
|
|
{
|
|
}
|
|
|
|
public virtual int EventRange => 10;
|
|
|
|
public virtual TimeSpan DecayDelay
|
|
{
|
|
get => m_DecayDelay;
|
|
set
|
|
{
|
|
m_DecayDelay = value;
|
|
RefreshDecay(true);
|
|
}
|
|
}
|
|
|
|
public override bool HandlesOnMovement => true;
|
|
|
|
public void CheckAddComponents()
|
|
{
|
|
if (Deleted)
|
|
{
|
|
return;
|
|
}
|
|
|
|
AddComponents();
|
|
}
|
|
|
|
public virtual void AddComponents()
|
|
{
|
|
}
|
|
|
|
public override void OnDelete()
|
|
{
|
|
_decayTimer?.Stop();
|
|
_decayTimer = null;
|
|
}
|
|
|
|
public virtual void RefreshDecay(bool setDecayTime)
|
|
{
|
|
if (Deleted)
|
|
{
|
|
return;
|
|
}
|
|
|
|
if (setDecayTime)
|
|
{
|
|
m_DecayTime = Core.Now + DecayDelay;
|
|
}
|
|
|
|
_decayTimer?.Stop();
|
|
_decayTimer = Timer.DelayCall(DecayDelay, Delete);
|
|
}
|
|
|
|
public virtual void AddItem(Item item, int xOffset, int yOffset, int zOffset)
|
|
{
|
|
m_Items.Add(item);
|
|
|
|
var zavg = Map.GetAverageZ(X + xOffset, Y + yOffset);
|
|
item.MoveToWorld(new Point3D(X + xOffset, Y + yOffset, zavg + zOffset), Map);
|
|
}
|
|
|
|
public virtual void AddMobile(Mobile m, int wanderRange, int xOffset, int yOffset, int zOffset)
|
|
{
|
|
m_Mobiles.Add(m);
|
|
|
|
var zavg = Map.GetAverageZ(X + xOffset, Y + yOffset);
|
|
var loc = new Point3D(X + xOffset, Y + yOffset, zavg + zOffset);
|
|
|
|
if (m is BaseCreature bc)
|
|
{
|
|
bc.RangeHome = wanderRange;
|
|
bc.Home = loc;
|
|
}
|
|
|
|
if (m is BaseVendor)
|
|
{
|
|
m.Direction = Direction.South;
|
|
}
|
|
|
|
m.MoveToWorld(loc, Map);
|
|
}
|
|
|
|
public virtual void OnEnter(Mobile m)
|
|
{
|
|
RefreshDecay(true);
|
|
}
|
|
|
|
public virtual void OnExit(Mobile m)
|
|
{
|
|
RefreshDecay(true);
|
|
}
|
|
|
|
public override void OnMovement(Mobile m, Point3D oldLocation)
|
|
{
|
|
var inOldRange = Utility.InRange(oldLocation, Location, EventRange);
|
|
var inNewRange = Utility.InRange(m.Location, Location, EventRange);
|
|
|
|
if (inNewRange && !inOldRange)
|
|
{
|
|
OnEnter(m);
|
|
}
|
|
else if (inOldRange && !inNewRange)
|
|
{
|
|
OnExit(m);
|
|
}
|
|
}
|
|
|
|
public override void OnAfterDelete()
|
|
{
|
|
base.OnAfterDelete();
|
|
|
|
for (var i = 0; i < m_Items.Count; ++i)
|
|
{
|
|
m_Items[i].Delete();
|
|
}
|
|
|
|
for (var i = 0; i < m_Mobiles.Count; ++i)
|
|
{
|
|
var bc = (BaseCreature)m_Mobiles[i];
|
|
|
|
if (bc.IsPrisoner == false)
|
|
{
|
|
m_Mobiles[i].Delete();
|
|
}
|
|
else if (m_Mobiles[i].CantWalk)
|
|
{
|
|
m_Mobiles[i].Delete();
|
|
}
|
|
}
|
|
|
|
m_Items.Clear();
|
|
m_Mobiles.Clear();
|
|
}
|
|
|
|
public override void Serialize(IGenericWriter writer)
|
|
{
|
|
base.Serialize(writer);
|
|
|
|
writer.Write(0); // version
|
|
|
|
m_Items.Tidy();
|
|
writer.Write(m_Items);
|
|
m_Mobiles.Tidy();
|
|
writer.Write(m_Mobiles);
|
|
writer.WriteDeltaTime(m_DecayTime);
|
|
}
|
|
|
|
public override void Deserialize(IGenericReader reader)
|
|
{
|
|
base.Deserialize(reader);
|
|
|
|
var version = reader.ReadInt();
|
|
|
|
switch (version)
|
|
{
|
|
case 0:
|
|
{
|
|
m_Items = reader.ReadEntityList<Item>();
|
|
m_Mobiles = reader.ReadEntityList<Mobile>();
|
|
m_DecayTime = reader.ReadDeltaTime();
|
|
|
|
RefreshDecay(false);
|
|
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public class LockableBarrel : LockableContainer
|
|
{
|
|
[Constructible]
|
|
public LockableBarrel() : base(0xE77) => Weight = 1.0;
|
|
|
|
public LockableBarrel(Serial serial) : base(serial)
|
|
{
|
|
}
|
|
|
|
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();
|
|
|
|
if (Weight == 8.0)
|
|
{
|
|
Weight = 1.0;
|
|
}
|
|
}
|
|
}
|
|
}
|