b042edcf0b
## 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.
104 lines
2.6 KiB
C#
104 lines
2.6 KiB
C#
using System;
|
|
using ModernUO.Serialization;
|
|
|
|
namespace Server.Items;
|
|
|
|
[SerializationGenerator(0, false)]
|
|
public partial class MorphItem : Item
|
|
{
|
|
[SerializableField(1)]
|
|
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
|
private int _inactiveItemId;
|
|
|
|
[SerializableField(2)]
|
|
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
|
private int _activeItemId;
|
|
|
|
[Constructible]
|
|
public MorphItem(int inactiveItemID, int activeItemID, int range) : this(inactiveItemID, activeItemID, range, range)
|
|
{
|
|
}
|
|
|
|
[Constructible]
|
|
public MorphItem(int inactiveItemID, int activeItemID, int inRange, int outRange) : base(inactiveItemID)
|
|
{
|
|
Movable = false;
|
|
|
|
_inactiveItemId = inactiveItemID;
|
|
_activeItemId = activeItemID;
|
|
_insideRange = inRange;
|
|
_outsideRange = outRange;
|
|
}
|
|
|
|
[SerializableField(0, allowFieldChange: nameof(AllowOutsideRangeChange))]
|
|
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
|
private int _outsideRange;
|
|
|
|
private bool AllowOutsideRangeChange(ref int value)
|
|
{
|
|
value = Math.Clamp(value, 0, 18);
|
|
return true;
|
|
}
|
|
|
|
[SerializableField(3, allowFieldChange: nameof(AllowInsideRangeChange))]
|
|
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
|
private int _insideRange;
|
|
|
|
private bool AllowInsideRangeChange(ref int value)
|
|
{
|
|
value = Math.Clamp(value, 0, 18);
|
|
return true;
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.GameMaster)]
|
|
public int CurrentRange => ItemID == _inactiveItemId ? _insideRange : _outsideRange;
|
|
|
|
public override bool HandlesOnMovement => true;
|
|
|
|
public override void OnMovement(Mobile m, Point3D oldLocation)
|
|
{
|
|
if (Utility.InRange(m.Location, Location, CurrentRange) || Utility.InRange(oldLocation, Location, CurrentRange))
|
|
{
|
|
Refresh();
|
|
}
|
|
}
|
|
|
|
public override void OnMapChange()
|
|
{
|
|
if (!Deleted)
|
|
{
|
|
Refresh();
|
|
}
|
|
}
|
|
|
|
public override void OnLocationChange(Point3D oldLoc)
|
|
{
|
|
if (!Deleted)
|
|
{
|
|
Refresh();
|
|
}
|
|
}
|
|
|
|
public void Refresh()
|
|
{
|
|
var found = false;
|
|
foreach (var mob in GetMobilesInRange(CurrentRange))
|
|
{
|
|
if (!mob.Hidden || mob.AccessLevel <= AccessLevel.Player)
|
|
{
|
|
found = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
ItemID = found ? _activeItemId : _inactiveItemId;
|
|
|
|
Visible = ItemID != 0x1;
|
|
}
|
|
|
|
[AfterDeserialization]
|
|
private void AfterDeserialization()
|
|
{
|
|
Refresh();
|
|
}
|
|
}
|