## 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
184 lines
4.8 KiB
C#
184 lines
4.8 KiB
C#
using System;
|
|
using ModernUO.Serialization;
|
|
using Server.Engines.Craft;
|
|
using Server.Engines.Craft.T2A;
|
|
using Server.Network;
|
|
|
|
namespace Server.Items;
|
|
|
|
public enum ToolQuality
|
|
{
|
|
Low,
|
|
Regular,
|
|
Exceptional
|
|
}
|
|
|
|
[SerializationGenerator(2, false)]
|
|
public abstract partial class BaseTool : Item, IUsesRemaining, ICraftable
|
|
{
|
|
[InvalidateProperties]
|
|
[SerializableField(0)]
|
|
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
|
private string _crafter;
|
|
|
|
[InvalidateProperties]
|
|
[SerializableField(2)]
|
|
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
|
private int _usesRemaining;
|
|
|
|
public BaseTool(int itemID) : this(Utility.RandomMinMax(25, 75), itemID)
|
|
{
|
|
}
|
|
|
|
public BaseTool(int uses, int itemID) : base(itemID)
|
|
{
|
|
_usesRemaining = uses;
|
|
_quality = ToolQuality.Regular;
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.GameMaster)]
|
|
[SerializableProperty(1)]
|
|
public ToolQuality Quality
|
|
{
|
|
get => _quality;
|
|
set
|
|
{
|
|
UnscaleUses();
|
|
_quality = value;
|
|
ScaleUses();
|
|
this.MarkDirty();
|
|
}
|
|
}
|
|
|
|
public virtual bool BreakOnDepletion => true;
|
|
|
|
public abstract CraftSystem CraftSystem { get; }
|
|
|
|
private bool ShowUsesRemaining { get; set; } = true;
|
|
|
|
public virtual int OnCraft(
|
|
int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool,
|
|
CraftItem craftItem, int resHue
|
|
)
|
|
{
|
|
Quality = (ToolQuality)quality;
|
|
|
|
if (makersMark)
|
|
{
|
|
Crafter = from?.RawName;
|
|
}
|
|
|
|
if (Core.UOR)
|
|
{
|
|
if (Quality == ToolQuality.Exceptional)
|
|
{
|
|
UsesRemaining = 100;
|
|
}
|
|
}
|
|
else if (Quality != ToolQuality.Regular)
|
|
{
|
|
UsesRemaining += (int)(UsesRemaining * ((int)Quality - 1) * 0.2);
|
|
}
|
|
|
|
return quality;
|
|
}
|
|
|
|
bool IUsesRemaining.ShowUsesRemaining
|
|
{
|
|
get => ShowUsesRemaining;
|
|
set => ShowUsesRemaining = value;
|
|
}
|
|
|
|
public void ScaleUses()
|
|
{
|
|
UsesRemaining = _usesRemaining * GetUsesScalar() / 100;
|
|
InvalidateProperties();
|
|
}
|
|
|
|
public void UnscaleUses()
|
|
{
|
|
UsesRemaining = _usesRemaining * 100 / GetUsesScalar();
|
|
}
|
|
|
|
public int GetUsesScalar() => _quality == ToolQuality.Exceptional ? 200 : 100;
|
|
|
|
public override void GetProperties(IPropertyList list)
|
|
{
|
|
base.GetProperties(list);
|
|
|
|
// Makers mark not displayed on OSI
|
|
// if (m_Crafter != null)
|
|
// list.Add( 1050043, m_Crafter.Name ); // crafted by ~1_NAME~
|
|
|
|
if (_quality == ToolQuality.Exceptional)
|
|
{
|
|
list.Add(1060636); // exceptional
|
|
}
|
|
|
|
list.Add(1060584, _usesRemaining); // uses remaining: ~1_val~
|
|
}
|
|
|
|
public virtual void DisplayDurabilityTo(Mobile m)
|
|
{
|
|
LabelToAffix(m, 1017323, AffixType.Append, $": {_usesRemaining}"); // Durability
|
|
}
|
|
|
|
public static bool CheckAccessible(Item tool, Mobile m) => tool.IsChildOf(m) || tool.Parent == m;
|
|
|
|
public static bool CheckTool(Item tool, Mobile m)
|
|
{
|
|
var check = m.FindItemOnLayer(Layer.OneHanded);
|
|
|
|
if (check is BaseTool && check != tool && check is not AncientSmithyHammer)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
check = m.FindItemOnLayer(Layer.TwoHanded);
|
|
|
|
return check is not BaseTool || check == tool || check is AncientSmithyHammer;
|
|
}
|
|
|
|
public override void OnSingleClick(Mobile from)
|
|
{
|
|
DisplayDurabilityTo(from);
|
|
|
|
base.OnSingleClick(from);
|
|
}
|
|
|
|
public override void OnDoubleClick(Mobile from)
|
|
{
|
|
if (IsChildOf(from.Backpack) || Parent == from)
|
|
{
|
|
var system = CraftSystem;
|
|
|
|
var num = system.CanCraft(from, this, null);
|
|
|
|
// Blacksmithing shows the gump regardless of proximity of an anvil and forge after SE
|
|
if (num > 0 && (num != 1044267 || !Core.SE))
|
|
{
|
|
from.SendLocalizedMessage(num);
|
|
}
|
|
else if (T2ACraftSystem.Enabled)
|
|
{
|
|
from.Target = new T2ACraftToolTarget(this, system);
|
|
from.SendAsciiMessage("Target this tool to make last item, or any other target to begin crafting.");
|
|
}
|
|
else
|
|
{
|
|
CraftItem.ShowCraftMenu(from, system, this, null);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
|
|
}
|
|
}
|
|
|
|
private void Deserialize(IGenericReader reader, int version)
|
|
{
|
|
Timer.DelayCall((item, crafter) => item._crafter = crafter?.RawName, this, reader.ReadEntity<Mobile>());
|
|
_quality = (ToolQuality)reader.ReadInt();
|
|
_usesRemaining = reader.ReadInt();
|
|
}
|
|
}
|