## Summary
Folds **113** hand-written `[SerializableProperty]` members into plain `[SerializableField]` declarations using the v4 setter hooks — value coercion/vetoes via `allowFieldChange`, post-change side effects via `fieldChanged` (whose `oldValue` parameter covers the old-house/old-sender unsubscribe patterns). Net **-450 lines** of setter boilerplate.
```cs
// before
[SerializableProperty(1)]
[CommandProperty(AccessLevel.GameMaster)]
public int Charges
{
get => _charges;
set
{
_charges = Math.Clamp(value, 0, MaxCharges);
InvalidateProperties();
this.MarkDirty();
}
}
// after
[SerializableField(1, allowFieldChange: nameof(AllowChargesChange))]
[SerializedCommandProperty(AccessLevel.GameMaster)]
[InvalidateProperties]
private int _charges;
private bool AllowChargesChange(ref int value)
{
value = Math.Clamp(value, 0, MaxCharges);
return true;
}
```
## How sites were selected
A classifier parsed all 204 `[SerializableProperty]` sites and converted only those matching strict shapes: getter is exactly `get => _field;`, the assignment comes first (after at most an equality guard), and relocated side effects contain no `return`, no `value` mutation, and no field re-assignment. Everything else was left alone deliberately:
- **~34 custom getters** (fallback defaults like `_x == -1 ? Default : _x`, self-healing refs) — no setter hook can express these.
- **~35 pre-assignment logic** (durability Unscale/Scale sandwiches, old-state captures like PotionKeg's pile weight).
- **virtual/override members, name-mismatched backing fields (`m_`), exotic semantics** (guards' `Focus` does work on *equal* assignment; `ChampionSpawn.Active` never assigns its field).
Five sites the classifier refused were converted by hand where the hooks fit cleanly: `ReceiverCrystal.Sender`, `PlayerVendor.House`, `PlayerBarkeeper.House` (old-value unsubscribe via `oldValue`), `BaseSuit.AccessLevel` (its existing virtual `OnAccessLevelChanged` already had the exact callback shape), and `DyeTub.DyedHue` (a true veto: `AllowDyedHueChange(ref int value) => _redyable`).
## Verification
- Build: **0 errors, 0 warnings**.
- **Schema regeneration produces zero Migrations changes** — the conversion is wire- and schema-neutral by construction (same orders, types, and property names), and CI's schema diff check enforces it.
- **835 + 708 tests green.**
## Behavioral notes (all strict improvements, called out for review)
- Generated setters skip everything when the incoming value equals the current one; a few converted setters previously re-ran side effects on equal assignment (redundant `Update()`-style refreshes).
- Generated setters always `MarkDirty()` on change; several converted setters never did (e.g. `DyeTub.DyedHue`, `MorphItem` ranges) — their changes only persisted if something else dirtied the entity. Those latent persistence bugs are fixed by construction.
161 lines
3.3 KiB
C#
161 lines
3.3 KiB
C#
using System;
|
|
using ModernUO.Serialization;
|
|
using Server.Targeting;
|
|
|
|
namespace Server.Items;
|
|
|
|
[SerializationGenerator(0, false)]
|
|
public partial class Dough : Item
|
|
{
|
|
[Constructible]
|
|
public Dough() : base(0x103d)
|
|
{
|
|
Stackable = Core.ML;
|
|
}
|
|
|
|
public override double DefaultWeight => 1.0;
|
|
}
|
|
|
|
[SerializationGenerator(0, false)]
|
|
public partial class SweetDough : Item
|
|
{
|
|
[Constructible]
|
|
public SweetDough() : base(0x103d)
|
|
{
|
|
Stackable = Core.ML;
|
|
Hue = 150;
|
|
}
|
|
|
|
public override double DefaultWeight => 1.0;
|
|
public override int LabelNumber => 1041340; // sweet dough
|
|
}
|
|
|
|
[SerializationGenerator(0, false)]
|
|
public partial class JarHoney : Item
|
|
{
|
|
[Constructible]
|
|
public JarHoney() : base(0x9ec)
|
|
{
|
|
Stackable = true;
|
|
}
|
|
|
|
public override double DefaultWeight => 1.0;
|
|
}
|
|
|
|
[SerializationGenerator(0, false)]
|
|
public partial class BowlFlour : Item
|
|
{
|
|
[Constructible]
|
|
public BowlFlour() : base(0xa1e)
|
|
{
|
|
}
|
|
|
|
public override double DefaultWeight => 1.0;
|
|
}
|
|
|
|
[SerializationGenerator(0, false)]
|
|
public partial class WoodenBowl : Item
|
|
{
|
|
[Constructible]
|
|
public WoodenBowl() : base(0x15f8)
|
|
{
|
|
}
|
|
|
|
public override double DefaultWeight => 1.0;
|
|
}
|
|
|
|
[TypeAlias("Server.Items.SackFlourOpen")]
|
|
[SerializationGenerator(0, false)]
|
|
public partial class SackFlour : Item, IHasQuantity
|
|
{
|
|
[Constructible]
|
|
public SackFlour() : base(0x1039)
|
|
{
|
|
_quantity = 20;
|
|
}
|
|
|
|
public override double DefaultWeight => 5.0;
|
|
|
|
[SerializableField(0, fieldChanged: nameof(OnQuantityChanged), allowFieldChange: nameof(AllowQuantityChange))]
|
|
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
|
private int _quantity;
|
|
|
|
private bool AllowQuantityChange(ref int value)
|
|
{
|
|
value = Math.Min(20, Math.Max(0, value));
|
|
return true;
|
|
}
|
|
|
|
private void OnQuantityChanged(int oldValue, int newValue)
|
|
{
|
|
if (_quantity == 0)
|
|
{
|
|
Delete();
|
|
}
|
|
else if (_quantity < 20 && ItemID is 0x1039 or 0x1045)
|
|
{
|
|
++ItemID;
|
|
}
|
|
}
|
|
|
|
public override void OnDoubleClick(Mobile from)
|
|
{
|
|
if (Movable && ItemID is 0x1039 or 0x1045)
|
|
{
|
|
++ItemID;
|
|
}
|
|
}
|
|
}
|
|
|
|
[SerializationGenerator(0, false)]
|
|
public partial class Eggshells : Item
|
|
{
|
|
[Constructible]
|
|
public Eggshells() : base(0x9b4)
|
|
{
|
|
}
|
|
|
|
public override double DefaultWeight => 0.5;
|
|
}
|
|
|
|
[SerializationGenerator(0, false)]
|
|
public partial class WheatSheaf : Item
|
|
{
|
|
[Constructible]
|
|
public WheatSheaf(int amount = 1) : base(7869)
|
|
{
|
|
Stackable = true;
|
|
Amount = amount;
|
|
}
|
|
|
|
public override double DefaultWeight => 1.0;
|
|
|
|
public override void OnDoubleClick(Mobile from)
|
|
{
|
|
if (Movable)
|
|
{
|
|
from.BeginTarget(4, false, TargetFlags.None, OnTarget);
|
|
}
|
|
}
|
|
|
|
public virtual void OnTarget(Mobile from, object obj)
|
|
{
|
|
if (obj is AddonComponent addon)
|
|
{
|
|
obj = addon.Addon;
|
|
}
|
|
|
|
if (obj is IFlourMill mill)
|
|
{
|
|
var needs = mill.MaxFlour - mill.CurFlour;
|
|
|
|
if (needs > Amount)
|
|
{
|
|
needs = Amount;
|
|
}
|
|
|
|
mill.CurFlour += needs;
|
|
Consume(needs);
|
|
}
|
|
}
|
|
}
|