## 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
375 lines
13 KiB
C#
375 lines
13 KiB
C#
using System;
|
|
using Server.Items;
|
|
using Server.Menus.ItemLists;
|
|
using Server.Network;
|
|
using Server.Targeting;
|
|
|
|
namespace Server.Engines.Craft.T2A;
|
|
|
|
public class TailoringMenu : ItemListMenu
|
|
{
|
|
private enum Category
|
|
{
|
|
Main,
|
|
LeatherMain,
|
|
Hats,
|
|
Shirts,
|
|
Pants,
|
|
Misc,
|
|
Footwear,
|
|
Leather,
|
|
Studded,
|
|
Female
|
|
}
|
|
|
|
private static readonly Type[] HatsTypes =
|
|
[
|
|
typeof(SkullCap), typeof(Bandana), typeof(FloppyHat), typeof(Cap), typeof(WideBrimHat),
|
|
typeof(StrawHat), typeof(TallStrawHat), typeof(WizardsHat), typeof(Bonnet),
|
|
typeof(FeatheredHat), typeof(TricorneHat), typeof(JesterHat)
|
|
];
|
|
|
|
private static readonly Type[] ShirtsTypes =
|
|
[
|
|
typeof(Doublet), typeof(Shirt), typeof(FancyShirt), typeof(Tunic), typeof(Surcoat), typeof(PlainDress)
|
|
];
|
|
|
|
private static readonly Type[] PantsTypes = [typeof(ShortPants), typeof(LongPants), typeof(Kilt) ];
|
|
|
|
private static readonly Type[] MiscTypes =
|
|
[
|
|
typeof(Skirt), typeof(Cloak), typeof(Robe), typeof(JesterSuit), typeof(FancyDress),
|
|
typeof(BodySash), typeof(HalfApron), typeof(FullApron)
|
|
];
|
|
|
|
private static readonly Type[] FootwearTypes = [typeof(Sandals), typeof(Shoes), typeof(Boots), typeof(ThighBoots)];
|
|
|
|
private static readonly Type[] LeatherArmorTypes =
|
|
[
|
|
typeof(LeatherChest), typeof(LeatherGorget), typeof(LeatherGloves), typeof(LeatherCap),
|
|
typeof(LeatherArms), typeof(LeatherLegs)
|
|
];
|
|
|
|
private static readonly Type[] StuddedArmorTypes =
|
|
[
|
|
typeof(StuddedChest), typeof(StuddedGorget), typeof(StuddedGloves), typeof(StuddedArms), typeof(StuddedLegs)
|
|
];
|
|
|
|
private static readonly Type[] FemaleArmorTypes =
|
|
[
|
|
typeof(FemaleLeatherChest), typeof(FemaleStuddedChest), typeof(LeatherBustierArms), typeof(StuddedBustierArms),
|
|
typeof(FemalePlateChest), typeof(LeatherShorts), typeof(LeatherSkirt)
|
|
];
|
|
|
|
private static ItemListEntry[] _mainEntries;
|
|
private static ItemListEntry[] _leatherMainEntries;
|
|
private static ItemListEntry[] _hatsEntries;
|
|
private static ItemListEntry[] _shirtsEntries;
|
|
private static ItemListEntry[] _pantsEntries;
|
|
private static ItemListEntry[] _miscEntries;
|
|
private static ItemListEntry[] _footwearEntries;
|
|
private static ItemListEntry[] _leatherEntries;
|
|
private static ItemListEntry[] _studdedEntries;
|
|
private static ItemListEntry[] _femaleEntries;
|
|
|
|
private readonly Category _category;
|
|
private readonly BaseTool _tool;
|
|
private readonly int _hue;
|
|
|
|
private static string GetQuestion(Category category) => category switch
|
|
{
|
|
Category.Main => "What would you like to make?",
|
|
Category.LeatherMain => "What would you like to make?",
|
|
Category.Hats => "What kind of hat?",
|
|
Category.Shirts => "What kind of shirt?",
|
|
Category.Pants => "What kind of pants?",
|
|
Category.Misc => "What would you like to make?",
|
|
Category.Footwear => "What kind of footwear?",
|
|
Category.Leather => "What kind of leather armor?",
|
|
Category.Studded => "What kind of studded armor?",
|
|
Category.Female => "What kind of female leather?",
|
|
_ => "What would you like to make?"
|
|
};
|
|
|
|
private TailoringMenu(Mobile from, BaseTool tool, Category category, int hue = -1)
|
|
: base(GetQuestion(category), BuildFilteredEntries(from, category))
|
|
{
|
|
_tool = tool;
|
|
_category = category;
|
|
_hue = hue;
|
|
}
|
|
|
|
private static string FormatItemName(Type type)
|
|
{
|
|
var name = type.Name;
|
|
Span<char> buffer = stackalloc char[name.Length * 2];
|
|
var pos = 0;
|
|
|
|
for (var i = 0; i < name.Length; i++)
|
|
{
|
|
if (i > 0 && char.IsUpper(name[i]))
|
|
{
|
|
buffer[pos++] = ' ';
|
|
}
|
|
|
|
buffer[pos++] = char.ToLower(name[i]);
|
|
}
|
|
|
|
return new string(buffer[..pos]);
|
|
}
|
|
|
|
private static ItemListEntry[] BuildStaticEntries(Type[] types, string resourceName)
|
|
{
|
|
var entries = new ItemListEntry[types.Length];
|
|
var count = 0;
|
|
var craftItems = DefTailoring.CraftSystem.CraftItems;
|
|
|
|
for (var i = 0; i < types.Length; i++)
|
|
{
|
|
var itemDef = craftItems.SearchFor(types[i]);
|
|
if (itemDef == null)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
var name = FormatItemName(types[i]);
|
|
var res = itemDef.Resources[0];
|
|
entries[count++] = new ItemListEntry($"{name} ({res.Amount} {resourceName})", itemDef.ItemId, 0, i);
|
|
}
|
|
|
|
if (count < entries.Length)
|
|
{
|
|
Array.Resize(ref entries, count);
|
|
}
|
|
|
|
return entries;
|
|
}
|
|
|
|
private static ItemListEntry[] GetStaticEntries(Category category) => category switch
|
|
{
|
|
Category.Main => Main(),
|
|
Category.LeatherMain => LeatherMain(),
|
|
Category.Hats => Hats(),
|
|
Category.Shirts => Shirts(),
|
|
Category.Pants => Pants(),
|
|
Category.Misc => Misc(),
|
|
Category.Footwear => Footwear(),
|
|
Category.Leather => Leather(),
|
|
Category.Studded => Studded(),
|
|
Category.Female => Female(),
|
|
_ => null
|
|
};
|
|
|
|
private static Type[] GetTypes(Category category) => category switch
|
|
{
|
|
Category.Hats => HatsTypes,
|
|
Category.Shirts => ShirtsTypes,
|
|
Category.Pants => PantsTypes,
|
|
Category.Misc => MiscTypes,
|
|
Category.Footwear => FootwearTypes,
|
|
Category.Leather => LeatherArmorTypes,
|
|
Category.Studded => StuddedArmorTypes,
|
|
Category.Female => FemaleArmorTypes,
|
|
_ => null
|
|
};
|
|
|
|
public static ItemListEntry[] Main() => _mainEntries ??=
|
|
[
|
|
new ItemListEntry("Build Hats", 0x1718, 0, (int)Category.Hats),
|
|
new ItemListEntry("Build Shirts", 0x1517, 0, (int)Category.Shirts),
|
|
new ItemListEntry("Build Pants", 0x1539, 0, (int)Category.Pants),
|
|
new ItemListEntry("Build Misc", 0x153D, 0, (int)Category.Misc)
|
|
];
|
|
|
|
public static ItemListEntry[] LeatherMain() => _leatherMainEntries ??=
|
|
[
|
|
new ItemListEntry("Build Shoes", 0x170f, 0, (int)Category.Footwear),
|
|
new ItemListEntry("Build Leather Armor", 0x13cc, 0, (int)Category.Leather),
|
|
new ItemListEntry("Build Studded Armor", 0x13db, 0, (int)Category.Studded),
|
|
new ItemListEntry("Build Female Armor", 0x1c06, 0, (int)Category.Female)
|
|
];
|
|
|
|
public static ItemListEntry[] Hats() => _hatsEntries ??= BuildStaticEntries(HatsTypes, "cloth");
|
|
public static ItemListEntry[] Shirts() => _shirtsEntries ??= BuildStaticEntries(ShirtsTypes, "cloth");
|
|
public static ItemListEntry[] Pants() => _pantsEntries ??= BuildStaticEntries(PantsTypes, "cloth");
|
|
public static ItemListEntry[] Misc() => _miscEntries ??= BuildStaticEntries(MiscTypes, "cloth");
|
|
public static ItemListEntry[] Footwear() => _footwearEntries ??= BuildStaticEntries(FootwearTypes, "leather");
|
|
public static ItemListEntry[] Leather() => _leatherEntries ??= BuildStaticEntries(LeatherArmorTypes, "leather");
|
|
public static ItemListEntry[] Studded() => _studdedEntries ??= BuildStaticEntries(StuddedArmorTypes, "leather");
|
|
public static ItemListEntry[] Female() => _femaleEntries ??= BuildStaticEntries(FemaleArmorTypes, "leather");
|
|
|
|
private static ItemListEntry[] BuildFilteredEntries(Mobile from, Category category)
|
|
{
|
|
if (category is Category.Main or Category.LeatherMain)
|
|
{
|
|
return BuildFilteredMainEntries(from, category);
|
|
}
|
|
|
|
var types = GetTypes(category);
|
|
var staticEntries = GetStaticEntries(category);
|
|
if (types == null || staticEntries == null)
|
|
{
|
|
return [];
|
|
}
|
|
|
|
return T2ACraftSystem.FilterEntries(from, staticEntries, types, DefTailoring.CraftSystem);
|
|
}
|
|
|
|
private static ItemListEntry[] BuildFilteredMainEntries(Mobile from, Category mainCategory)
|
|
{
|
|
var system = DefTailoring.CraftSystem;
|
|
var mainStatic = GetStaticEntries(mainCategory);
|
|
if (mainStatic == null)
|
|
{
|
|
return [];
|
|
}
|
|
|
|
var filtered = new ItemListEntry[mainStatic.Length];
|
|
var count = 0;
|
|
|
|
for (var i = 0; i < mainStatic.Length; i++)
|
|
{
|
|
var entry = mainStatic[i];
|
|
var types = GetTypes((Category)entry.CraftIndex);
|
|
if (types != null && T2ACraftSystem.AnyCraftableInCategory(from, types, system))
|
|
{
|
|
filtered[count++] = entry;
|
|
}
|
|
}
|
|
|
|
if (count == 0)
|
|
{
|
|
return [];
|
|
}
|
|
|
|
if (count < filtered.Length)
|
|
{
|
|
Array.Resize(ref filtered, count);
|
|
}
|
|
|
|
return filtered;
|
|
}
|
|
|
|
private void CraftItem(Mobile from, Type itemType)
|
|
{
|
|
var itemDef = DefTailoring.CraftSystem.CraftItems.SearchFor(itemType);
|
|
if (itemDef == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
var num = DefTailoring.CraftSystem.CanCraft(from, _tool, itemDef.ItemType);
|
|
if (num > 0)
|
|
{
|
|
from.SendLocalizedMessage(num);
|
|
return;
|
|
}
|
|
|
|
var context = DefTailoring.CraftSystem.GetContext(from);
|
|
var res = itemDef.UseSubRes2 ? DefTailoring.CraftSystem.CraftSubRes2 : DefTailoring.CraftSystem.CraftSubRes;
|
|
var resIndex = itemDef.UseSubRes2 ? context.LastResourceIndex2 : context.LastResourceIndex;
|
|
var resourceType = resIndex > -1 ? res[resIndex].ItemType : null;
|
|
|
|
if (_hue >= 0)
|
|
{
|
|
// Pipeline B: hue-aware crafting — only consumes resources matching this hue
|
|
context.LastHue = _hue;
|
|
DefTailoring.CraftSystem.CreateItem(from, itemDef.ItemType, resourceType, _tool, itemDef, _hue);
|
|
}
|
|
else
|
|
{
|
|
DefTailoring.CraftSystem.CreateItem(from, itemDef.ItemType, resourceType, _tool, itemDef);
|
|
}
|
|
}
|
|
|
|
public override void OnResponse(NetState state, int index)
|
|
{
|
|
var from = state.Mobile;
|
|
var craftIndex = Entries[index].CraftIndex;
|
|
|
|
if (_category is Category.Main or Category.LeatherMain)
|
|
{
|
|
// Carry hue through to child menus
|
|
var menu = new TailoringMenu(from, _tool, (Category)craftIndex, _hue);
|
|
if (menu.Entries.Length == 0)
|
|
{
|
|
from.SendAsciiMessage("You lack the skill and materials to craft anything in that category.");
|
|
return;
|
|
}
|
|
|
|
from.SendMenu(menu);
|
|
return;
|
|
}
|
|
|
|
var types = GetTypes(_category);
|
|
if (types != null && craftIndex >= 0 && craftIndex < types.Length)
|
|
{
|
|
CraftItem(from, types[craftIndex]);
|
|
}
|
|
}
|
|
|
|
public static void ResourceSelection(Mobile from, BaseTool tool, Item preTarget = null)
|
|
{
|
|
if (preTarget != null && TrySelectResource(from, tool, preTarget))
|
|
{
|
|
return;
|
|
}
|
|
|
|
from.SendAsciiMessage("Select the resource you wish to use (cloth, leather, or hides).");
|
|
from.Target = new ResourceSelectTarget(from, tool);
|
|
}
|
|
|
|
private static bool TrySelectResource(Mobile from, BaseTool tool, Item targeted)
|
|
{
|
|
if (targeted is Cloth or UncutCloth)
|
|
{
|
|
var menu = new TailoringMenu(from, tool, Category.Main, targeted.Hue);
|
|
if (menu.Entries.Length == 0)
|
|
{
|
|
from.SendAsciiMessage("You lack the skill and materials to craft anything.");
|
|
return true;
|
|
}
|
|
|
|
from.SendMenu(menu);
|
|
return true;
|
|
}
|
|
|
|
if (targeted is Items.Leather or Hides)
|
|
{
|
|
var menu = new TailoringMenu(from, tool, Category.LeatherMain);
|
|
if (menu.Entries.Length == 0)
|
|
{
|
|
from.SendAsciiMessage("You lack the skill and materials to craft anything.");
|
|
return true;
|
|
}
|
|
|
|
from.SendMenu(menu);
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
private class ResourceSelectTarget : Target
|
|
{
|
|
private readonly Mobile _from;
|
|
private readonly BaseTool _tool;
|
|
|
|
public ResourceSelectTarget(Mobile from, BaseTool tool) : base(12, false, TargetFlags.None)
|
|
{
|
|
_from = from;
|
|
_tool = tool;
|
|
}
|
|
|
|
protected override void OnTarget(Mobile from, object targeted)
|
|
{
|
|
if (targeted is Item item && TrySelectResource(from, _tool, item))
|
|
{
|
|
return;
|
|
}
|
|
|
|
from.SendAsciiMessage("That is not a valid resource. Please select cloth, leather, or hides.");
|
|
from.Target = new ResourceSelectTarget(_from, _tool);
|
|
}
|
|
}
|
|
}
|