fix: Fixes dirty-tracking gaps in generated content: setters, sub-object owners, BaseVendor (#2609)
## 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.
This commit is contained in:
Kamron Batman
GitHub
parent
a2c232f4a8
commit
84153fba58
49 changed files with 223 additions and 214 deletions
|
|
@ -155,7 +155,7 @@ public partial class BaseTalisman : Item, IAosItem
|
|||
|
||||
public bool ShouldSerializeProtection() => !_protection.IsEmpty;
|
||||
|
||||
private TalismanAttribute ProtectionDefaultValue() => new();
|
||||
private TalismanAttribute ProtectionDefaultValue() => new(this);
|
||||
|
||||
[SerializedIgnoreDupe]
|
||||
[InvalidateProperties]
|
||||
|
|
@ -166,7 +166,7 @@ public partial class BaseTalisman : Item, IAosItem
|
|||
|
||||
public bool ShouldSerializeKiller() => !_killer.IsEmpty;
|
||||
|
||||
private TalismanAttribute KillerDefaultValue() => new();
|
||||
private TalismanAttribute KillerDefaultValue() => new(this);
|
||||
|
||||
[SerializedIgnoreDupe]
|
||||
[InvalidateProperties]
|
||||
|
|
@ -177,7 +177,7 @@ public partial class BaseTalisman : Item, IAosItem
|
|||
|
||||
public bool ShouldSerializeSummoner() => !_summoner.IsEmpty;
|
||||
|
||||
private TalismanAttribute SummonerDefaultValue() => new();
|
||||
private TalismanAttribute SummonerDefaultValue() => new(this);
|
||||
|
||||
[InvalidateProperties]
|
||||
[SerializableField(5)]
|
||||
|
|
@ -267,9 +267,9 @@ public partial class BaseTalisman : Item, IAosItem
|
|||
{
|
||||
Layer = Layer.Talisman;
|
||||
|
||||
_protection = new TalismanAttribute();
|
||||
_killer = new TalismanAttribute();
|
||||
_summoner = new TalismanAttribute();
|
||||
_protection = new TalismanAttribute(this);
|
||||
_killer = new TalismanAttribute(this);
|
||||
_summoner = new TalismanAttribute(this);
|
||||
Attributes = new AosAttributes(this);
|
||||
SkillBonuses = new AosSkillBonuses(this);
|
||||
}
|
||||
|
|
@ -319,9 +319,9 @@ public partial class BaseTalisman : Item, IAosItem
|
|||
return;
|
||||
}
|
||||
|
||||
talisman._summoner = new TalismanAttribute(_summoner);
|
||||
talisman._protection = new TalismanAttribute(_protection);
|
||||
talisman._killer = new TalismanAttribute(_killer);
|
||||
talisman._summoner = new TalismanAttribute(talisman, _summoner);
|
||||
talisman._protection = new TalismanAttribute(talisman, _protection);
|
||||
talisman._killer = new TalismanAttribute(talisman, _killer);
|
||||
talisman.Attributes = new AosAttributes(newItem, Attributes);
|
||||
talisman.SkillBonuses = new AosSkillBonuses(newItem, SkillBonuses);
|
||||
}
|
||||
|
|
@ -660,17 +660,17 @@ public partial class BaseTalisman : Item, IAosItem
|
|||
|
||||
public virtual void SetSummoner(Type type, TextDefinition name)
|
||||
{
|
||||
_summoner = new TalismanAttribute(type, name);
|
||||
_summoner = new TalismanAttribute(this, type, name);
|
||||
}
|
||||
|
||||
public virtual void SetProtection(Type type, TextDefinition name, int amount)
|
||||
{
|
||||
_protection = new TalismanAttribute(type, name, amount);
|
||||
_protection = new TalismanAttribute(this, type, name, amount);
|
||||
}
|
||||
|
||||
public virtual void SetKiller(Type type, TextDefinition name, int amount)
|
||||
{
|
||||
_killer = new TalismanAttribute(type, name, amount);
|
||||
_killer = new TalismanAttribute(this, type, name, amount);
|
||||
}
|
||||
|
||||
public virtual void StartTimer()
|
||||
|
|
@ -712,18 +712,18 @@ public partial class BaseTalisman : Item, IAosItem
|
|||
|
||||
public static Type GetRandomSummonType() => _summons.RandomElement();
|
||||
|
||||
public static TalismanAttribute GetRandomSummoner()
|
||||
public static TalismanAttribute GetRandomSummoner(BaseTalisman owner)
|
||||
{
|
||||
if (Utility.RandomDouble() < 0.975)
|
||||
{
|
||||
return new TalismanAttribute();
|
||||
return new TalismanAttribute(owner);
|
||||
}
|
||||
|
||||
var num = Utility.Random(_summons.Length);
|
||||
|
||||
return num > 14
|
||||
? new TalismanAttribute(_summons[num], _summonLabels[num], 10)
|
||||
: new TalismanAttribute(_summons[num], _summonLabels[num]);
|
||||
? new TalismanAttribute(owner, _summons[num], _summonLabels[num], 10)
|
||||
: new TalismanAttribute(owner, _summons[num], _summonLabels[num]);
|
||||
}
|
||||
|
||||
public static TalismanRemoval GetRandomRemoval()
|
||||
|
|
@ -736,32 +736,32 @@ public partial class BaseTalisman : Item, IAosItem
|
|||
return TalismanRemoval.None;
|
||||
}
|
||||
|
||||
public static TalismanAttribute GetRandomKiller() => GetRandomKiller(true);
|
||||
public static TalismanAttribute GetRandomKiller(BaseTalisman owner) => GetRandomKiller(owner, true);
|
||||
|
||||
public static TalismanAttribute GetRandomKiller(bool includingNone)
|
||||
public static TalismanAttribute GetRandomKiller(BaseTalisman owner, bool includingNone)
|
||||
{
|
||||
if (includingNone && Utility.RandomBool())
|
||||
{
|
||||
return new TalismanAttribute();
|
||||
return new TalismanAttribute(owner);
|
||||
}
|
||||
|
||||
var num = Utility.Random(_killers.Length);
|
||||
|
||||
return new TalismanAttribute(_killers[num], _killerLabels[num], Utility.RandomMinMax(10, 100));
|
||||
return new TalismanAttribute(owner, _killers[num], _killerLabels[num], Utility.RandomMinMax(10, 100));
|
||||
}
|
||||
|
||||
public static TalismanAttribute GetRandomProtection() => GetRandomProtection(true);
|
||||
public static TalismanAttribute GetRandomProtection(BaseTalisman owner) => GetRandomProtection(owner, true);
|
||||
|
||||
public static TalismanAttribute GetRandomProtection(bool includingNone)
|
||||
public static TalismanAttribute GetRandomProtection(BaseTalisman owner, bool includingNone)
|
||||
{
|
||||
if (includingNone && Utility.RandomBool())
|
||||
{
|
||||
return new TalismanAttribute();
|
||||
return new TalismanAttribute(owner);
|
||||
}
|
||||
|
||||
var num = Utility.Random(_killers.Length);
|
||||
|
||||
return new TalismanAttribute(_killers[num], _killerLabels[num], Utility.RandomMinMax(5, 60));
|
||||
return new TalismanAttribute(owner, _killers[num], _killerLabels[num], Utility.RandomMinMax(5, 60));
|
||||
}
|
||||
|
||||
public static SkillName GetRandomSkill() => _skills.RandomElement();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue