warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Pre-Publish 14 Crafting (supersedes #2181, #2381) (#2476)

Browse source 
## 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
This commit is contained in:
Kamron Batman 2026-06-07 20:27:22 -07:00 • committed by GitHub
parent 2e93201e51
commit 16bf3016fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
50 changed files with 4483 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

112
Projects/UOContent/Skills/Inscribe.cs
View file

@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
using Server.Engines.Craft;
using Server.Engines.Craft.T2A;
using Server.Items;
using Server.Targeting;
@ -16,10 +18,19 @@ namespace Server.SkillHandlers
public static TimeSpan OnUse(Mobile m)
{
Target target = new InternalTargetSrc();
m.Target = target;
if (T2ACraftSystem.Enabled)
{
var target = new T2AInscribeTarget();
m.Target = target;
m.SendAsciiMessage("Target the book you wish to copy or scroll you want to use.");
target.BeginTimeout(m, 60000); // 1 minute
return TimeSpan.FromSeconds(1.0);
}
Target uotdTarget = new InternalTargetSrc();
m.Target = uotdTarget;
m.SendLocalizedMessage(1046295); // Target the book you wish to copy.
target.BeginTimeout(m, 60000); // 1 minute
uotdTarget.BeginTimeout(m, 60000); // 1 minute
return TimeSpan.FromSeconds(1.0);
}
@ -42,10 +53,12 @@ namespace Server.SkillHandlers
public static bool IsEmpty(BaseBook book)
{
foreach (var page in book.Pages)
for (var i = 0; i < book.Pages.Length; i++)
{
foreach (var line in page.Lines)
var page = book.Pages[i];
for (var j = 0; j < page.Lines.Length; j++)
{
var line = page.Lines[j];
if (!string.IsNullOrEmpty(line))
{
return false;
@ -78,6 +91,76 @@ namespace Server.SkillHandlers
}
}
private class T2AInscribeTarget : Target
{
public T2AInscribeTarget() : base(3, false, TargetFlags.None)
{
}
protected override void OnTarget(Mobile from, object targeted)
{
if (targeted is BlankScroll scroll)
{
if (!scroll.IsChildOf(from.Backpack))
{
from.SendAsciiMessage("That must be in your pack for you to use it.");
}
else
{
T2ACraftSystem.ShowMenu(from, DefInscription.CraftSystem, null);
}
}
else if (targeted is RecallRune)
{
var system = DefInscription.CraftSystem;
var itemDef = system.CraftItems.SearchFor(typeof(Runebook));
if (itemDef != null)
{
var num = system.CanCraft(from, null, itemDef.ItemType);
if (num > 0)
{
from.SendLocalizedMessage(num);
}
else
{
system.CreateItem(from, itemDef.ItemType, null, null, itemDef);
}
}
}
else if (targeted is BaseBook book)
{
if (IsEmpty(book))
{
from.SendLocalizedMessage(501611); // Can't copy an empty book.
}
else if (GetUser(book) != null)
{
from.SendLocalizedMessage(501621); // Someone else is inscribing that item.
}
else
{
Target target = new InternalTargetDst(book);
from.Target = target;
from.SendLocalizedMessage(501612); // Select a book to copy this to.
target.BeginTimeout(from, 60000);
SetUser(book, from);
}
}
else
{
from.SendLocalizedMessage(1046296); // That is not a book
}
}
protected override void OnTargetCancel(Mobile from, TargetCancelType cancelType)
{
if (cancelType == TargetCancelType.Timeout)
{
from.SendLocalizedMessage(501619);
}
}
}
private class InternalTargetSrc : Target
{
public InternalTargetSrc() : base(3, false, TargetFlags.None)
@ -151,19 +234,16 @@ namespace Server.SkillHandlers
{
from.SendLocalizedMessage(501621); // Someone else is inscribing that item.
}
else if (from.CheckTargetSkill(SkillName.Inscribe, bookDst, 0, 50))
{
Copy(m_BookSrc, bookDst);
from.SendLocalizedMessage(501618); // You make a copy of the book.
from.PlaySound(0x249);
}
else
{
if (from.CheckTargetSkill(SkillName.Inscribe, bookDst, 0, 50))
{
Copy(m_BookSrc, bookDst);
from.SendLocalizedMessage(501618); // You make a copy of the book.
from.PlaySound(0x249);
}
else
{
from.SendLocalizedMessage(501617); // You fail to make a copy of the book.
}
from.SendLocalizedMessage(501617); // You fail to make a copy of the book.
}
}