84153fba58
## Why Delta world saves re-serialize an entity only when it has been marked dirty. An audit of the generated classes found three ways serialized state changes without a mark; this PR closes the ones that do not need a new generator package. ## What - **Custom `[SerializableProperty]` setters mark dirty.** Twelve hand-written setters assigned their backing field without `this.MarkDirty()`. `PlagueBeastLord.OpenedBy` was an auto-property carrying the attribute with no backing field at all; it is now a generated field with the same name, order and command-property exposure. - **Generated sub-objects are linked to their owner.** Without a `[DirtyTrackingEntity]` member the generator emits setters that mark nothing. Eight entity-owned sub-objects now carry the link and receive the owner through the constructor the generator calls: `BOBFilter` (owner is `IEntity`: a `PlayerMobile` or a `BulkOrderBook`), `BOBLargeSubEntry`, `PuzzleChestSolution` and `PuzzleChestSolutionAndTime`, `TalismanAttribute` (the random factories now take the talisman), `VendorItem`, `PlayerBBMessage`, `RaffleEntry`, `ShardPollOption`. Migration schemas were regenerated with the pinned tool; the only change is the value rule argument becoming `DeserializationRequiresParent`. - **BaseVendor uses the generator; restock amounts are no longer persisted.** The only state it wrote was which buy entries had grown restock amounts, packed by index into the live `SBInfos` tables. Restock is transient now and rebuilds on load; version 1 records are read and discarded through the legacy path. Every vendor subclass now serializes through a generated chain. ## Generator 4.1.0 This PR adopts SerializationGenerator 4.1.0 (modernuo/SerializationGenerator#55): SG3019/SG3020 diagnostics, `[VolatileSerializedState]`, `StopXxx()` timer helpers, and owner-constructor preference for sub-objects (so dictionary values are constructed with their owner; the 4.0.0 relink fallback is gone). `PlayerVendor.v3.json` gains `DeserializationRequiresParent` for its `VendorItem` values so the migration content struct constructs them with their vendor. SG3019 is an error under `TreatWarningsAsErrors` and generator diagnostics ignore pragmas, so the five contexts that live in whole-file player-keyed persistences (`ChampionTitle`, `ChampionTitleContext`, `MurderContext`, `VirtueContext`, `JailRecord`) now carry a `[DirtyTrackingEntity]` link to their `PlayerMobile`, which is where they will live once those blobs move onto the player record. `JailSystem.EmptyRecord` keeps a null player (`[CanBeNull]`). `ChampionTitle` needs both a context and a player constructor because the generator resolves the rule against the containing type but emits the call with the parent field; a comment in the file records this. ## Wire format Unchanged. No version bumps except `BaseVendor` 1 to 2 (which now writes nothing of its own). Schema diffs are rule-argument only (`DeserializationRequiresParent`). ## Testing Server.Tests 848 passed, UOContent.Tests 759 passed.
76 lines
1.8 KiB
C#
76 lines
1.8 KiB
C#
using System;
|
|
using ModernUO.Serialization;
|
|
|
|
namespace Server.Items;
|
|
|
|
[PropertyObject]
|
|
[SerializationGenerator(1, false)]
|
|
public partial class TalismanAttribute
|
|
{
|
|
[DirtyTrackingEntity]
|
|
private BaseTalisman _owner;
|
|
|
|
[SerializableField(0)]
|
|
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
|
private Type _type;
|
|
|
|
[SerializableField(1)]
|
|
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
|
private TextDefinition _name;
|
|
|
|
[SerializableField(2)]
|
|
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
|
private int _amount;
|
|
|
|
public TalismanAttribute(BaseTalisman owner) => _owner = owner;
|
|
|
|
public TalismanAttribute(BaseTalisman owner, TalismanAttribute copy)
|
|
{
|
|
_owner = owner;
|
|
|
|
if (copy != null)
|
|
{
|
|
_type = copy.Type;
|
|
_name = copy.Name;
|
|
_amount = copy.Amount;
|
|
}
|
|
}
|
|
|
|
public TalismanAttribute(BaseTalisman owner, Type type, TextDefinition name, int amount = 0)
|
|
{
|
|
_owner = owner;
|
|
_type = type;
|
|
_name = name;
|
|
_amount = amount;
|
|
}
|
|
|
|
private void Deserialize(IGenericReader reader, int version)
|
|
{
|
|
var flags = reader.ReadEncodedInt();
|
|
|
|
if ((flags & 0x1) != 0)
|
|
{
|
|
_type = AssemblyHandler.FindTypeByFullName(reader.ReadString());
|
|
}
|
|
|
|
if ((flags & 0x2) != 0)
|
|
{
|
|
_name = reader.ReadTextDefinition();
|
|
}
|
|
|
|
if ((flags & 0x4) != 0)
|
|
{
|
|
_amount = reader.ReadEncodedInt();
|
|
}
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.GameMaster)]
|
|
public bool IsEmpty => _type == null;
|
|
|
|
[CommandProperty(AccessLevel.GameMaster)]
|
|
public bool IsItem => _type.IsAssignableTo(typeof(Item));
|
|
|
|
public override string ToString() => _type?.Name ?? "None";
|
|
|
|
public int DamageBonus(Mobile to) => to?.GetType() == _type ? _amount : 0;
|
|
}
|