fix: Fixes dupe property copying. Adds IgnoreDupe (#1811)

## Summary

### Changes
- Adds `[IgnoreDupe]` and `[SerializedIgnoreDupe]`
- Updates all _known_ classes that need the attribute. Some might be missing, please helps us find them!
- Adds `Item.Dupe()` command and encapsulates `CopyProperties` and `OnAfterDuped`. This is also overridable.
- Updates Dupe command to use the new logic.
- Fixes duping multiple kinds of objects that used to be outright broken.

### Bug Fixes
- Fixes issue with durability after duping
- Fixes issue with hue after duping

> [!Note]
> **Developer Note**
> Customizing how duping an item works now requires two steps:
> 1. Add `[IgnoreDupe]` or `[SerializedIgnoreDupe]` to the property/field
> 2. Add custom logic in an `OnAfterDuped` override
>
> When do you need to do this?
> *When the property being copied is not a primitive, and you need to manually deep-clone the contents of the property such as with Lists, Dictionaries, or sub classes.*
This commit is contained in:
Kamron Batman 2024-06-02 15:04:54 -07:00 committed by GitHub
parent a8d3d2773e
commit 9c7cb5d778
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
34 changed files with 502 additions and 248 deletions

View file

@ -14,6 +14,7 @@ namespace Server.Engines.Spawners;
[SerializationGenerator(10, false)]
public abstract partial class BaseSpawner : Item, ISpawner
{
[SerializedIgnoreDupe]
[SerializableField(0)]
[SerializedCommandProperty(AccessLevel.Developer)]
private Guid _guid;
@ -22,6 +23,7 @@ public abstract partial class BaseSpawner : Item, ISpawner
[SerializedCommandProperty(AccessLevel.Developer)]
private bool _returnOnDeactivate;
[SerializedIgnoreDupe]
[SerializableField(2, setter: "private")]
private List<SpawnerEntry> _entries;
@ -141,6 +143,7 @@ public abstract partial class BaseSpawner : Item, ISpawner
public bool IsFull => Spawned?.Count >= _count;
public bool IsEmpty => Spawned?.Count == 0;
[IgnoreDupe]
public Dictionary<ISpawnable, SpawnerEntry> Spawned { get; private set; }
[SerializableProperty(8)]
@ -269,17 +272,18 @@ public abstract partial class BaseSpawner : Item, ISpawner
{
newSpawner._guid = Guid.NewGuid();
newSpawner.Spawned = new Dictionary<ISpawnable, SpawnerEntry>();
newSpawner.Entries = new List<SpawnerEntry>();
newSpawner.Entries = [];
for (var i = 0; i < Entries.Count; i++)
{
var entry = Entries[i];
newSpawner.AddEntry(
Entries[i].SpawnedName,
Entries[i].SpawnedProbability,
Entries[i].SpawnedMaxCount,
entry.SpawnedName,
entry.SpawnedProbability,
entry.SpawnedMaxCount,
false,
Entries[i].Properties,
Entries[i].Parameters
entry.Properties,
entry.Parameters
);
}
}
@ -295,7 +299,7 @@ public abstract partial class BaseSpawner : Item, ISpawner
)
{
var entry = new SpawnerEntry(this, creaturename, probability, amount, properties, parameters);
Entries.Add(entry);
AddToEntries(entry);
if (dotimer)
{
DoTimer(TimeSpan.FromSeconds(1));
@ -315,7 +319,7 @@ public abstract partial class BaseSpawner : Item, ISpawner
_count = amount;
_team = team;
_homeRange = homeRange;
Entries = new List<SpawnerEntry>();
Entries = [];
Spawned = new Dictionary<ISpawnable, SpawnerEntry>();
DoTimer(TimeSpan.FromSeconds(1));
@ -394,7 +398,7 @@ public abstract partial class BaseSpawner : Item, ISpawner
public void Defrag()
{
Entries ??= new List<SpawnerEntry>();
Entries ??= [];
for (var i = 0; i < Entries.Count; ++i)
{
@ -590,7 +594,7 @@ public abstract partial class BaseSpawner : Item, ISpawner
IEntity entity = null;
var propargs = string.IsNullOrEmpty(entry.Properties)
? Array.Empty<string>()
? []
: CommandSystem.Split(entry.Properties.Trim());
var props = FormatProperties(propargs);
@ -604,7 +608,7 @@ public abstract partial class BaseSpawner : Item, ISpawner
}
var paramargs = string.IsNullOrEmpty(entry.Parameters)
? Array.Empty<string>()
? []
: entry.Parameters.Trim().Split(' ');
if (paramargs.Length == 0)