ModernUO/Projects/UOContent/Items/Jewels/BaseJewel.cs
Kamron Batman 16bf3016fb
feat: Pre-Publish 14 Crafting (supersedes #2181, #2381) (#2476)
## Summary

Adds authentic **T2A-era (pre-UO:Third-Dawn) packet-based crafting menus**, enabled via the **`t2aCraftMenus` server setting** (read once at startup; default **`!Core.UOTD`**, so a pre-UO:TD shard gets them automatically). When enabled, double-clicking a crafting tool opens the classic `0x7C`/`0x7D` item-list menu — skill- and material-filtered — instead of the modern gump, covering all 8 tool/skill crafts (blacksmithy, tailoring, tinkering, carpentry, alchemy, bowcraft/fletching, inscription, cartography). It is **not** a runtime/admin-flippable feature flag.

This is the **definitive, reconciled** branch and **supersedes**:
- **#2181** (Delphi — `T2A_CraftingMenus`): the original effort.
- **#2381** (Jack/UOLL — `t2a_crafting_menus`): the research-grounded superset (Delphi's base + 12 corrections), rebased onto current `main`.

Original authorship is preserved across the cherry-picked history: foundation commit **@Delphi79**, mechanic fixes **@jackuoll (Jack Ward)**, reconciliation/fixes/docs mine.

## How it was built

1. Cherry-picked Jack's 13 commits onto current `main` (superset of Delphi's; only 2 trivial FeatureFlags conflicts).
2. Applied targeted fixes (below) with tests.
3. Full convention audit, build, and test pass.

Grounded in independent historical research plus Jack's deep dive. Maintainer reference: `dev-docs/t2a-crafting.md`.

## Mechanics (highlights)

- Double-click tool → target resource → skill/material-filtered menu → craft. Resource pre-selection per skill; make-last by targeting the tool.
- **Stacked-gem jewelry:** target a gem stack → the **full stack** is consumed and the piece is named by count ("a 1000 diamond ring"); count persists (`BaseJewel` serialization **v4 → v5**, new `_gemCount`).
- **Tool-less inscription & cartography** (skill-list invoked; no pen/sextant); inscription consumes reagents+scroll on success and failure, mana only on success.
- **Tailoring matching-hue consumption:** targeting hued cloth/leather consumes only that hue. Crafted items take color from their **`CraftResource`** (not the dyed hue), so dyed leather/cloth don't tint the product; in T2A only colored ingots/ore color items (metal armor/shields).
- **Half-resources on failed non-scroll crafts** (pre-UO:TD).
- **Maker's mark** always prompted for exceptional items, via the shared `QueryMakersMarkGump`.
- Server-side menu infra changes are additive (`ItemListEntry.CraftIndex`, `Entries` setter, `HasSent`).

## Notable changes on top of the cherry-pick

- **Toggle is a startup server setting, not a feature flag.** Removed `ContentFeatureFlags.T2ACraftMenus` (and its admin-flippable plumbing); the value is read once via `ServerConfiguration.GetSetting("t2aCraftMenus", !Core.UOTD)` into `T2ACraftSystem.Enabled`. Since the default tracks the era and it can't be flipped at runtime, there's no incoherent "menus-on / UO:TD-era" state.
- **Stacked-gem consumption (B3a/B3):** consume the full `PendingGemCount` (was deliberately consuming 1 while naming by the stack), null-safe gem type, plain-piece fallback + message. New `T2AJewelGemCraftTests`.
- **Convention audit:** `new List<Item>()` → `PooledRefList<Item>` on the hue-aware consume path; removed dead code.

## Decisions & deviations

- `make-last` kept as **QoL** (post-T2A gump-era feature).
- `half-on-failure` (non-scroll) kept as a **reconstruction** (not OSI-confirmed).
- **Stacked-gem** behavior set per shard authority (overrides the "single gem" reconstruction).
- **Cooking** out of scope (no T2A crafting menu existed for it).
- **No colored items from dyed materials:** crafted color comes from the `CraftResource` type. Pre-AOS leather has no colored variant, so leather is always uncolored; weapons retain resource color only in AOS+ (unchanged, intended).

## Test plan

- Automated: `dotnet build ModernUO.slnx -c Debug` clean; `dotnet test Projects/UOContent.Tests` → **421 passed** (incl. 3 new jewelry tests).
- Manual (needs a running T2A shard + client):
  - [ ] Each of the 8 skills opens the correct menu; empty-menu guard fires.
  - [ ] Make-last repeats the last craft (jewelry re-prompts gem).
  - [ ] Jewelry consumes the full targeted gem stack and names by count.
  - [ ] Cartography consumes blank maps only with T2A enabled / maps+scrolls when disabled.
  - [ ] Tailoring consumes only the targeted-hue material; crafted items are not tinted by dyed cloth/leather.
  - [ ] Maker's-mark prompt on exceptional.
  - [ ] Failed non-scroll craft consumes half resources.
  - [ ] Inscription: reagents+scroll on success/failure, mana only on success.
  - [ ] T2A disabled: gump crafting unchanged.

## Credits

Co-authored-by: @Delphi79
Co-authored-by: @jackuoll
2026-06-07 20:27:22 -07:00

582 lines
17 KiB
C#

using System;
using ModernUO.Serialization;
using Server.Engines.Craft;
namespace Server.Items;
public enum GemType
{
None,
StarSapphire,
Emerald,
Sapphire,
Ruby,
Citrine,
Amethyst,
Tourmaline,
Amber,
Diamond
}
[SerializationGenerator(5, false)]
public abstract partial class BaseJewel : Item, ICraftable, IAosItem
{
[EncodedInt]
[InvalidateProperties]
[SerializableField(0)]
[SerializedCommandProperty(AccessLevel.GameMaster)]
private int _maxHitPoints;
[SerializableField(3)]
[InvalidateProperties]
[SerializedCommandProperty(AccessLevel.GameMaster)]
private GemType _gemType;
[SerializedIgnoreDupe]
[SerializableField(4, setter: "private")]
[SerializedCommandProperty(AccessLevel.GameMaster, canModify: true)]
private AosAttributes _attributes;
[SerializedIgnoreDupe]
[SerializableField(5, setter: "private")]
[SerializedCommandProperty(AccessLevel.GameMaster, canModify: true)]
private AosElementAttributes _resistances;
[SerializedIgnoreDupe]
[SerializableField(6, setter: "private")]
[SerializedCommandProperty(AccessLevel.GameMaster, canModify: true)]
private AosSkillBonuses _skillBonuses;
[EncodedInt]
[SerializableField(7)]
[SerializedCommandProperty(AccessLevel.GameMaster)]
private int _gemCount;
public BaseJewel(int itemID, Layer layer) : base(itemID)
{
_attributes = new AosAttributes(this);
_resistances = new AosElementAttributes(this);
_skillBonuses = new AosSkillBonuses(this);
_resource = CraftResource.Iron;
Hue = CraftResources.GetHue(_resource);
_gemType = GemType.None;
Layer = layer;
_hitPoints = _maxHitPoints = Utility.RandomMinMax(InitMinHits, InitMaxHits);
}
[EncodedInt]
[SerializableProperty(1)]
[CommandProperty(AccessLevel.GameMaster)]
public int HitPoints
{
get => _hitPoints;
set
{
if (value != _hitPoints && _maxHitPoints > 0)
{
_hitPoints = value;
if (_hitPoints < 0)
{
Delete();
}
else if (_hitPoints > _maxHitPoints)
{
_hitPoints = _maxHitPoints;
}
InvalidateProperties();
this.MarkDirty();
}
}
}
[SerializableProperty(2)]
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => _resource;
set
{
_resource = value;
Hue = CraftResources.GetHue(_resource);
}
}
public override int PhysicalResistance => Resistances.Physical;
public override int FireResistance => Resistances.Fire;
public override int ColdResistance => Resistances.Cold;
public override int PoisonResistance => Resistances.Poison;
public override int EnergyResistance => Resistances.Energy;
public virtual int BaseGemTypeNumber => 0;
public virtual int InitMinHits => 0;
public virtual int InitMaxHits => 0;
public override int LabelNumber
{
get
{
if (_gemType == GemType.None)
{
return base.LabelNumber;
}
return BaseGemTypeNumber + (int)_gemType - 1;
}
}
public virtual int ArtifactRarity => 0;
public int OnCraft(
int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool,
CraftItem craftItem, int resHue
)
{
var resourceType = typeRes ?? craftItem.Resources[0].ItemType;
Resource = CraftResources.GetFromType(resourceType);
var context = craftSystem.GetContext(from);
if (context?.DoNotColor == true)
{
Hue = 0;
}
if (craftItem.Resources.Count > 1)
{
resourceType = craftItem.Resources[1].ItemType;
if (resourceType == typeof(StarSapphire))
{
GemType = GemType.StarSapphire;
}
else if (resourceType == typeof(Emerald))
{
GemType = GemType.Emerald;
}
else if (resourceType == typeof(Sapphire))
{
GemType = GemType.Sapphire;
}
else if (resourceType == typeof(Ruby))
{
GemType = GemType.Ruby;
}
else if (resourceType == typeof(Citrine))
{
GemType = GemType.Citrine;
}
else if (resourceType == typeof(Amethyst))
{
GemType = GemType.Amethyst;
}
else if (resourceType == typeof(Tourmaline))
{
GemType = GemType.Tourmaline;
}
else if (resourceType == typeof(Amber))
{
GemType = GemType.Amber;
}
else if (resourceType == typeof(Diamond))
{
GemType = GemType.Diamond;
}
}
// T2A jewelry: read gem info from craft context (set by GemSelectTarget).
// The entire targeted gem stack is consumed and the piece is named by that
// count (e.g. "a 1000 diamond ring").
if (context is { PendingGemType: not GemType.None, PendingGemCount: > 0 })
{
var gemItemType = GetGemItemType(context.PendingGemType);
var gemCount = context.PendingGemCount;
if (gemItemType != null && from.Backpack?.ConsumeTotal(gemItemType, gemCount) == true)
{
GemType = context.PendingGemType;
GemCount = gemCount;
}
else
{
// Gems were no longer available (or unknown type): craft a plain piece
// rather than naming it for gems that were never consumed.
from.SendAsciiMessage("You lack the gemstones to set into this piece.");
}
context.PendingGemType = GemType.None;
context.PendingGemCount = 0;
}
return 1;
}
public override void OnSingleClick(Mobile from)
{
if (!Core.UOTD)
{
OnSingleClickPreUOTD(from);
return;
}
base.OnSingleClick(from);
}
public virtual void OnSingleClickPreUOTD(Mobile from)
{
var plural = _gemCount > 1;
string name;
if (this is WeddingRing)
{
name = $"a {Name}";
}
else
{
name = Name;
if (name == null)
{
var articleAnName = (TileData.ItemTable[ItemID].Flags & TileFlag.ArticleAn) != 0;
name = $"{(articleAnName ? "an" : "a")} {Localization.GetText(LabelNumber).ToLowerInvariant()}";
}
}
if (_gemType != GemType.None && _gemCount > 0)
{
var gemName = GetGemName(_gemType, plural);
LabelTo(from, plural
? $"{name} with {_gemCount} {gemName}"
: $"{name} with {gemName}");
}
else
{
LabelTo(from, name);
}
}
private static string GetGemName(GemType type, bool plural = false) => type switch
{
GemType.StarSapphire when plural => "star sapphires",
GemType.StarSapphire => "a star sapphire",
GemType.Emerald when plural => "emeralds",
GemType.Emerald => "an emerald",
GemType.Sapphire when plural => "sapphires",
GemType.Sapphire => "a sapphire",
GemType.Ruby when plural => "rubies",
GemType.Ruby => "a ruby",
GemType.Citrine when plural => "citrines",
GemType.Citrine => "a citrine",
GemType.Amethyst when plural => "amethysts",
GemType.Amethyst => "an amethyst",
GemType.Tourmaline when plural => "tourmalines",
GemType.Tourmaline => "a tourmaline",
GemType.Amber when plural => "ambers",
GemType.Amber => "an amber",
GemType.Diamond when plural => "diamonds",
GemType.Diamond => "a diamond",
_ when plural => "gems",
_ => "a gem"
};
internal static GemType GetGemType(Item item) => item switch
{
StarSapphire => GemType.StarSapphire,
Emerald => GemType.Emerald,
Sapphire => GemType.Sapphire,
Ruby => GemType.Ruby,
Citrine => GemType.Citrine,
Amethyst => GemType.Amethyst,
Tourmaline => GemType.Tourmaline,
Amber => GemType.Amber,
Diamond => GemType.Diamond,
_ => GemType.None
};
internal static Type GetGemItemType(GemType type) => type switch
{
GemType.StarSapphire => typeof(StarSapphire),
GemType.Emerald => typeof(Emerald),
GemType.Sapphire => typeof(Sapphire),
GemType.Ruby => typeof(Ruby),
GemType.Citrine => typeof(Citrine),
GemType.Amethyst => typeof(Amethyst),
GemType.Tourmaline => typeof(Tourmaline),
GemType.Amber => typeof(Amber),
GemType.Diamond => typeof(Diamond),
_ => null
};
public override void OnAfterDuped(Item newItem)
{
if (newItem is not BaseJewel jewel)
{
return;
}
jewel.Attributes = new AosAttributes(newItem, Attributes);
jewel.Resistances = new AosElementAttributes(newItem, Resistances);
jewel.SkillBonuses = new AosSkillBonuses(newItem, SkillBonuses);
// Set hue again because of resource
jewel.Hue = Hue;
}
public override void OnAdded(IEntity parent)
{
if (Core.AOS && parent is Mobile from)
{
SkillBonuses.AddTo(from);
var strBonus = Attributes.BonusStr;
var dexBonus = Attributes.BonusDex;
var intBonus = Attributes.BonusInt;
if (strBonus != 0 || dexBonus != 0 || intBonus != 0)
{
var serial = Serial;
if (strBonus != 0)
{
from.AddStatMod(new StatMod(StatType.Str, $"{serial}Str", strBonus, TimeSpan.Zero));
}
if (dexBonus != 0)
{
from.AddStatMod(new StatMod(StatType.Dex, $"{serial}Dex", dexBonus, TimeSpan.Zero));
}
if (intBonus != 0)
{
from.AddStatMod(new StatMod(StatType.Int, $"{serial}Int", intBonus, TimeSpan.Zero));
}
}
from.CheckStatTimers();
}
}
public override void OnRemoved(IEntity parent)
{
if (Core.AOS && parent is Mobile from)
{
SkillBonuses.Remove();
var serial = Serial;
from.RemoveStatMod($"{serial}Str");
from.RemoveStatMod($"{serial}Dex");
from.RemoveStatMod($"{serial}Int");
from.CheckStatTimers();
}
}
public override void GetProperties(IPropertyList list)
{
base.GetProperties(list);
SkillBonuses.GetProperties(list);
int prop;
if ((prop = ArtifactRarity) > 0)
{
list.Add(1061078, prop); // artifact rarity ~1_val~
}
if ((prop = Attributes.WeaponDamage) != 0)
{
list.Add(1060401, prop); // damage increase ~1_val~%
}
if ((prop = Attributes.DefendChance) != 0)
{
list.Add(1060408, prop); // defense chance increase ~1_val~%
}
if ((prop = Attributes.BonusDex) != 0)
{
list.Add(1060409, prop); // dexterity bonus ~1_val~
}
if ((prop = Attributes.EnhancePotions) != 0)
{
list.Add(1060411, prop); // enhance potions ~1_val~%
}
if ((prop = Attributes.CastRecovery) != 0)
{
list.Add(1060412, prop); // faster cast recovery ~1_val~
}
if ((prop = Attributes.CastSpeed) != 0)
{
list.Add(1060413, prop); // faster casting ~1_val~
}
if ((prop = Attributes.AttackChance) != 0)
{
list.Add(1060415, prop); // hit chance increase ~1_val~%
}
if ((prop = Attributes.BonusHits) != 0)
{
list.Add(1060431, prop); // hit point increase ~1_val~
}
if ((prop = Attributes.BonusInt) != 0)
{
list.Add(1060432, prop); // intelligence bonus ~1_val~
}
if ((prop = Attributes.LowerManaCost) != 0)
{
list.Add(1060433, prop); // lower mana cost ~1_val~%
}
if ((prop = Attributes.LowerRegCost) != 0)
{
list.Add(1060434, prop); // lower reagent cost ~1_val~%
}
if ((prop = Attributes.Luck) != 0)
{
list.Add(1060436, prop); // luck ~1_val~
}
if ((prop = Attributes.BonusMana) != 0)
{
list.Add(1060439, prop); // mana increase ~1_val~
}
if ((prop = Attributes.RegenMana) != 0)
{
list.Add(1060440, prop); // mana regeneration ~1_val~
}
if (Attributes.NightSight != 0)
{
list.Add(1060441); // night sight
}
if ((prop = Attributes.ReflectPhysical) != 0)
{
list.Add(1060442, prop); // reflect physical damage ~1_val~%
}
if ((prop = Attributes.RegenStam) != 0)
{
list.Add(1060443, prop); // stamina regeneration ~1_val~
}
if ((prop = Attributes.RegenHits) != 0)
{
list.Add(1060444, prop); // hit point regeneration ~1_val~
}
if (Attributes.SpellChanneling != 0)
{
list.Add(1060482); // spell channeling
}
if ((prop = Attributes.SpellDamage) != 0)
{
list.Add(1060483, prop); // spell damage increase ~1_val~%
}
if ((prop = Attributes.BonusStam) != 0)
{
list.Add(1060484, prop); // stamina increase ~1_val~
}
if ((prop = Attributes.BonusStr) != 0)
{
list.Add(1060485, prop); // strength bonus ~1_val~
}
if ((prop = Attributes.WeaponSpeed) != 0)
{
list.Add(1060486, prop); // swing speed increase ~1_val~%
}
if (Core.ML && (prop = Attributes.IncreasedKarmaLoss) != 0)
{
list.Add(1075210, prop); // Increased Karma Loss ~1val~%
}
AddResistanceProperties(list);
if (_hitPoints >= 0 && _maxHitPoints > 0)
{
list.Add(1060639, $"{_hitPoints}\t{_maxHitPoints}"); // durability ~1_val~ / ~2_val~
}
}
private void Deserialize(IGenericReader reader, int version)
{
_maxHitPoints = reader.ReadEncodedInt();
_hitPoints = reader.ReadEncodedInt();
_resource = (CraftResource)reader.ReadEncodedInt();
_gemType = (GemType)reader.ReadEncodedInt();
_attributes = new AosAttributes(this);
_attributes.Deserialize(reader);
_resistances = new AosElementAttributes(this);
_resistances.Deserialize(reader);
_skillBonuses = new AosSkillBonuses(this);
_skillBonuses.Deserialize(reader);
}
private void MigrateFrom(V4Content content)
{
_maxHitPoints = content.MaxHitPoints;
_hitPoints = content.HitPoints;
_resource = content.Resource;
_gemType = content.GemType;
_attributes = content.Attributes;
_resistances = content.Resistances;
_skillBonuses = content.SkillBonuses;
// _gemCount defaults to 0
}
[AfterDeserialization]
private void AfterDeserialization()
{
var m = Parent as Mobile;
if (Core.AOS && m != null)
{
SkillBonuses.AddTo(m);
}
var strBonus = Attributes.BonusStr;
var dexBonus = Attributes.BonusDex;
var intBonus = Attributes.BonusInt;
if (m != null && (strBonus != 0 || dexBonus != 0 || intBonus != 0))
{
var serial = Serial;
if (strBonus != 0)
{
m.AddStatMod(new StatMod(StatType.Str, $"{serial}Str", strBonus, TimeSpan.Zero));
}
if (dexBonus != 0)
{
m.AddStatMod(new StatMod(StatType.Dex, $"{serial}Dex", dexBonus, TimeSpan.Zero));
}
if (intBonus != 0)
{
m.AddStatMod(new StatMod(StatType.Int, $"{serial}Int", intBonus, TimeSpan.Zero));
}
}
m?.CheckStatTimers();
}
}