bd79cb7759
Follow-up to #2573. That change made `SmallBOD.EndCombine` require a player-crafted item, but it could only read provenance off `BaseArmor`, `BaseWeapon` and `BaseClothing`, because those are the only three classes that track it — hence the hand-enumerated `armor?.PlayerConstructed ?? clothing?.PlayerConstructed ?? weapon?.PlayerConstructed ?? false`. The gap is structural rather than cosmetic. `PlayerConstructed` is set inside each base's `OnCraft`, so it can only ever reach types implementing `ICraftable`. Most craftables do not — the tinkering catalogue alone is largely plain `Item` subclasses — so any rule keyed on "was this actually crafted" has nothing to key on for those types. ## What changed Provenance moves to `Item` and is stamped centrally in `CraftItem`, immediately after the item is constructed and before the `ICraftable` dispatch, covering both the AOS and T2A craft paths. The three `OnCraft` overrides drop their now-redundant assignment and inherit `Item`'s property, so no call site outside them changes — `Resmelt` and `SalvageBag` still read `armor.PlayerConstructed` and still compile unchanged. `SmallBOD`'s three-way null-coalescing chain collapses to `item.PlayerConstructed`. `OnCraft` is only ever invoked from `CraftItem` (the other three call sites are `base.OnCraft` chaining), so removing those assignments has no other reachable effect. ## Storage cost: none `Item`'s `SaveFlag` word is written as a fixed-width `int`, not an encoded one, so occupying bit `0x08000000` changes no record lengths. Items that are not player-constructed serialize byte for byte as before, and crafted ones differ by a single bit in a field already being written. `Item` itself needs no version bump: a bare `SaveFlag` bit is self-describing, so records written before it existed lack it and read `false`. ## Version bumps The three content classes do need one, since removing a serialized field changes their layout: | Class | Version | Field removed | |---|---|---| | `BaseArmor` | 9 → 10 | 24 (was last, nothing renumbered) | | `BaseClothing` | 7 → 8 | 7 (fields 8–10 shift down) | | `BaseWeapon` | 10 → 11 | 26 (fields 27–30 shift down) | Each gets a `MigrateFrom` for its previous version that assigns the old bool to the inherited property, so existing crafted armour, weapons and clothing keep their provenance across the upgrade. `Item.Deserialize` runs first and reads the absent bit as `false`, then the migration overwrites it — the generated `Deserialize` calls `base.Deserialize` before dispatching, so the ordering holds. `BaseWeapon` had no migrations file and gains one. The renumbering is not stylistic: the generator requires contiguous field ordering and rejects a hole with `SG3005: Expected field 'Crafter' with order 7 but found 8`. New schema JSONs (`BaseArmor.v10`, `BaseClothing.v8`, `BaseWeapon.v11`) are generated by `ModernUOSchemaGenerator` and committed alongside. ## One thing worth a second opinion The new property is a plain auto-property on `Item`, so it does not call `this.MarkDirty()` the way the codegen setters it replaces did. `MarkDirty` is currently a no-op (`// TODO: Add dirty tracking back`) and no property in `Item.cs` calls it, so this matches the file as it stands — but it is worth noting if dirty tracking comes back. ## Verification Full solution builds in Release with 0 errors and 0 warnings; 1516 tests pass (815 `Server.Tests`, 701 `UOContent.Tests`).
42 lines
1.9 KiB
C#
42 lines
1.9 KiB
C#
using Server.Engines.Craft;
|
|
|
|
namespace Server.Items;
|
|
|
|
public partial class BaseWeapon
|
|
{
|
|
// PlayerConstructed moved onto Item
|
|
private void MigrateFrom(V10Content content)
|
|
{
|
|
_damageLevel = content.DamageLevel ?? WeaponDamageLevel.Regular;
|
|
_accuracyLevel = content.AccuracyLevel ?? WeaponAccuracyLevel.Regular;
|
|
_durabilityLevel = content.DurabilityLevel ?? WeaponDurabilityLevel.Regular;
|
|
_quality = content.Quality ?? WeaponQuality.Regular;
|
|
_hitPoints = content.HitPoints ?? 0;
|
|
_maxHitPoints = content.MaxHitPoints ?? 0;
|
|
_slayer = content.Slayer ?? SlayerName.None;
|
|
_poison = content.Poison;
|
|
_poisonCharges = content.PoisonCharges ?? 0;
|
|
_crafter = content.Crafter;
|
|
_identified = content.Identified;
|
|
_strRequirement = content.StrRequirement ?? -1;
|
|
_dexRequirement = content.DexRequirement ?? -1;
|
|
_intRequirement = content.IntRequirement ?? -1;
|
|
_minDamage = content.MinDamage ?? -1;
|
|
_maxDamage = content.MaxDamage ?? -1;
|
|
_hitSound = content.HitSound ?? -1;
|
|
_missSound = content.MissSound ?? -1;
|
|
_speed = content.Speed ?? -1;
|
|
_maxRange = content.MaxRange ?? -1;
|
|
_skill = content.Skill ?? (SkillName)(-1);
|
|
_type = content.Type ?? (WeaponType)(-1);
|
|
_animation = content.Animation ?? (WeaponAnimation)(-1);
|
|
_resource = content.Resource ?? CraftResource.Iron;
|
|
_attributes = content.Attributes ?? AttributesDefaultValue();
|
|
_weaponAttributes = content.WeaponAttributes ?? WeaponAttributesDefaultValue();
|
|
PlayerConstructed = content.PlayerConstructed;
|
|
_skillBonuses = content.SkillBonuses ?? SkillBonusesDefaultValue();
|
|
_slayer2 = content.Slayer2 ?? SlayerName.None;
|
|
_aosElementDamages = content.AosElementDamages ?? AosElementAttributesDefaultValue();
|
|
_engravedText = content.EngravedText;
|
|
}
|
|
}
|