## 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
GitHub
parent
2e93201e51
commit
16bf3016fb
50 changed files with 4483 additions and 219 deletions
351
Projects/UOContent/Engines/Craft/T2A/T2ACraftSystem.cs
Normal file
351
Projects/UOContent/Engines/Craft/T2A/T2ACraftSystem.cs
Normal file
|
|
@ -0,0 +1,351 @@
|
|||
// T2A crafting system: packet-based, not gump-based
|
||||
|
||||
using System;
|
||||
using Server.Items;
|
||||
using Server.Menus.ItemLists;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Engines.Craft.T2A;
|
||||
|
||||
public static class T2ACraftSystem
|
||||
{
|
||||
/// <summary>
|
||||
/// Whether T2A packet-based crafting menus are active. Set once at startup from the
|
||||
/// "t2aCraftMenus" server setting (default: !Core.UOTD). Not flippable at runtime.
|
||||
/// </summary>
|
||||
public static bool Enabled { get; set; }
|
||||
|
||||
public static void ShowMenu(Mobile from, CraftSystem craftSystem, BaseTool tool, Item preTarget = null)
|
||||
{
|
||||
if (!Enabled)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (craftSystem == DefBlacksmithy.CraftSystem)
|
||||
{
|
||||
// Lost Lands flow: resource selection first, then menu
|
||||
BlacksmithMenu.ResourceSelection(from, tool, (mob, t) =>
|
||||
{
|
||||
var menu = new BlacksmithMenu(mob, t);
|
||||
if (menu.Entries.Length == 0)
|
||||
{
|
||||
mob.SendAsciiMessage("You lack the skill and materials to craft anything.");
|
||||
return;
|
||||
}
|
||||
|
||||
mob.SendMenu(menu);
|
||||
}, preTarget);
|
||||
}
|
||||
else if (craftSystem == DefAlchemy.CraftSystem)
|
||||
{
|
||||
if (preTarget is BaseReagent or Bottle || preTarget == null)
|
||||
{
|
||||
ShowMenuDirect<AlchemyMenu>(from, tool);
|
||||
}
|
||||
else
|
||||
{
|
||||
PromptForResource(from, tool, craftSystem, "Target a reagent or empty bottle.",
|
||||
item => item is BaseReagent or Bottle);
|
||||
}
|
||||
}
|
||||
else if (craftSystem == DefBowFletching.CraftSystem)
|
||||
{
|
||||
if (preTarget is Log or Board or Feather or Shaft || preTarget == null)
|
||||
{
|
||||
ShowMenuDirect<BowFletchingMenu>(from, tool);
|
||||
}
|
||||
else
|
||||
{
|
||||
PromptForResource(from, tool, craftSystem, "Target the wood or feathers you wish to use.",
|
||||
item => item is Log or Board or Feather or Shaft);
|
||||
}
|
||||
}
|
||||
else if (craftSystem == DefCarpentry.CraftSystem)
|
||||
{
|
||||
if (preTarget is Log or Board || preTarget == null)
|
||||
{
|
||||
ShowMenuDirect<CarpentryMenu>(from, tool);
|
||||
}
|
||||
else
|
||||
{
|
||||
PromptForResource(from, tool, craftSystem, "Target the wood you wish to use.",
|
||||
item => item is Log or Board);
|
||||
}
|
||||
}
|
||||
else if (craftSystem == DefCartography.CraftSystem)
|
||||
{
|
||||
if (preTarget is BlankMap || preTarget == null)
|
||||
{
|
||||
ShowMenuDirect<CartographyMenu>(from, tool);
|
||||
}
|
||||
else
|
||||
{
|
||||
PromptForResource(from, tool, craftSystem, "Target a blank map.",
|
||||
item => item is BlankMap);
|
||||
}
|
||||
}
|
||||
else if (craftSystem == DefInscription.CraftSystem)
|
||||
{
|
||||
if (preTarget is BlankScroll or BaseReagent or RecallRune || preTarget == null)
|
||||
{
|
||||
ShowMenuDirect<InscriptionMenu>(from, tool);
|
||||
}
|
||||
else
|
||||
{
|
||||
PromptForResource(from, tool, craftSystem, "Target the blank scrolls you wish to use.",
|
||||
item => item is BlankScroll or BaseReagent or RecallRune);
|
||||
}
|
||||
}
|
||||
else if (craftSystem == DefTailoring.CraftSystem)
|
||||
{
|
||||
TailoringMenu.ResourceSelection(from, tool, preTarget);
|
||||
}
|
||||
else if (craftSystem == DefTinkering.CraftSystem)
|
||||
{
|
||||
TinkeringMenu.ResourceSelection(from, tool, preTarget);
|
||||
}
|
||||
}
|
||||
|
||||
private static void ShowMenuDirect<T>(Mobile from, BaseTool tool) where T : ItemListMenu
|
||||
{
|
||||
var menu = (T)Activator.CreateInstance(typeof(T), from, tool);
|
||||
if (menu.Entries.Length == 0)
|
||||
{
|
||||
from.SendAsciiMessage("You lack the skill and materials to craft anything.");
|
||||
return;
|
||||
}
|
||||
|
||||
from.SendMenu(menu);
|
||||
}
|
||||
|
||||
private static void PromptForResource(
|
||||
Mobile from, BaseTool tool, CraftSystem system, string message, Func<Item, bool> isValid
|
||||
)
|
||||
{
|
||||
from.SendAsciiMessage(message);
|
||||
from.Target = new CraftResourceTarget(tool, system, message, isValid);
|
||||
}
|
||||
|
||||
private class CraftResourceTarget : Target
|
||||
{
|
||||
private readonly BaseTool _tool;
|
||||
private readonly CraftSystem _system;
|
||||
private readonly string _message;
|
||||
private readonly Func<Item, bool> _isValid;
|
||||
|
||||
public CraftResourceTarget(
|
||||
BaseTool tool, CraftSystem system, string message, Func<Item, bool> isValid
|
||||
) : base(12, false, TargetFlags.None)
|
||||
{
|
||||
_tool = tool;
|
||||
_system = system;
|
||||
_message = message;
|
||||
_isValid = isValid;
|
||||
}
|
||||
|
||||
protected override void OnTarget(Mobile from, object targeted)
|
||||
{
|
||||
if (targeted is Item item && _isValid(item))
|
||||
{
|
||||
ShowMenu(from, _system, _tool, item);
|
||||
return;
|
||||
}
|
||||
|
||||
from.SendAsciiMessage(_message);
|
||||
from.Target = new CraftResourceTarget(_tool, _system, _message, _isValid);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Persists the selected resource type as a LastResourceIndex on the craft context,
|
||||
/// so that make-last can recall which resource was used.
|
||||
/// </summary>
|
||||
public static void SetLastResourceIndex(Mobile from, CraftSystem system, Type selectedResourceType)
|
||||
{
|
||||
if (selectedResourceType == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var context = system.GetContext(from);
|
||||
var resCol = system.CraftSubRes;
|
||||
|
||||
if (context == null || !resCol.Init)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
for (var i = 0; i < resCol.Count; i++)
|
||||
{
|
||||
if (resCol[i].ItemType == selectedResourceType)
|
||||
{
|
||||
context.LastResourceIndex = i;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Checks if a player can craft a specific item, accounting for sub-resource types.
|
||||
/// When <paramref name="selectedResourceType"/> is non-null, checks against that specific sub-resource.
|
||||
/// When null, checks against ANY available sub-resource the player has sufficient skill and materials for.
|
||||
/// </summary>
|
||||
public static bool CanCraftItem(
|
||||
Mobile from, CraftItem itemDef, CraftSystem system, Type selectedResourceType = null
|
||||
)
|
||||
{
|
||||
var pack = from.Backpack;
|
||||
if (pack == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
var chance = itemDef.GetSuccessChance(from, selectedResourceType, system, false, out var allRequiredSkills);
|
||||
if (!allRequiredSkills || chance <= 0.0)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
var resCol = system.CraftSubRes;
|
||||
|
||||
for (var i = 0; i < itemDef.Resources.Count; i++)
|
||||
{
|
||||
var res = itemDef.Resources[i];
|
||||
var resType = res.ItemType;
|
||||
|
||||
// If this resource is the base sub-resource type (e.g. IronIngot for blacksmithing),
|
||||
// handle sub-resource substitution
|
||||
if (resCol.Init && resType == resCol.ResType)
|
||||
{
|
||||
if (selectedResourceType != null)
|
||||
{
|
||||
// Specific resource selected — check skill gate for this sub-resource
|
||||
var subRes = resCol.SearchFor(selectedResourceType);
|
||||
if (subRes != null && from.Skills[system.MainSkill].Value < subRes.RequiredSkill)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check if player has enough of the selected resource
|
||||
if (GetResourceAmount(pack, selectedResourceType) < res.Amount)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else if (!HasAnySufficientSubResource(from, pack, res.Amount, system, resCol))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else if (GetResourceAmount(pack, resType) < res.Amount)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convenience overload that resolves a Type to a CraftItem first.
|
||||
/// </summary>
|
||||
public static bool CanCraftItem(Mobile from, Type itemType, CraftSystem system, Type selectedResourceType = null)
|
||||
{
|
||||
var itemDef = system.CraftItems.SearchFor(itemType);
|
||||
return itemDef != null && CanCraftItem(from, itemDef, system, selectedResourceType);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Filters static template entries to only those the player can craft.
|
||||
/// </summary>
|
||||
public static ItemListEntry[] FilterEntries(
|
||||
Mobile from, ItemListEntry[] staticEntries, Type[] types, CraftSystem system, Type selectedResourceType = null
|
||||
)
|
||||
{
|
||||
var filtered = new ItemListEntry[staticEntries.Length];
|
||||
var count = 0;
|
||||
|
||||
for (var i = 0; i < staticEntries.Length; i++)
|
||||
{
|
||||
var entry = staticEntries[i];
|
||||
var typeIndex = entry.CraftIndex;
|
||||
if (typeIndex >= 0 && typeIndex < types.Length &&
|
||||
CanCraftItem(from, types[typeIndex], system, selectedResourceType))
|
||||
{
|
||||
filtered[count++] = entry;
|
||||
}
|
||||
}
|
||||
|
||||
if (count == 0)
|
||||
{
|
||||
return [];
|
||||
}
|
||||
|
||||
if (count < filtered.Length)
|
||||
{
|
||||
Array.Resize(ref filtered, count);
|
||||
}
|
||||
|
||||
return filtered;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns true if at least one item in the type array is craftable.
|
||||
/// </summary>
|
||||
public static bool AnyCraftableInCategory(
|
||||
Mobile from, Type[] types, CraftSystem system, Type selectedResourceType = null
|
||||
)
|
||||
{
|
||||
for (var i = 0; i < types.Length; i++)
|
||||
{
|
||||
if (CanCraftItem(from, types[i], system, selectedResourceType))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Equivalent type pairs mirroring CraftItem.m_TypesTable — used so that menu filtering
|
||||
/// counts boards when checking for logs, hides when checking for leather, etc.
|
||||
/// </summary>
|
||||
private static readonly Type[][] _equivalentTypes =
|
||||
[
|
||||
[typeof(Log), typeof(Board)],
|
||||
[typeof(Cloth), typeof(UncutCloth)],
|
||||
[typeof(Items.Leather), typeof(Hides)]
|
||||
];
|
||||
|
||||
private static int GetResourceAmount(Container pack, Type type)
|
||||
{
|
||||
for (var i = 0; i < _equivalentTypes.Length; i++)
|
||||
{
|
||||
if (_equivalentTypes[i][0] == type)
|
||||
{
|
||||
return pack.GetAmount(_equivalentTypes[i]);
|
||||
}
|
||||
}
|
||||
|
||||
return pack.GetAmount(type);
|
||||
}
|
||||
|
||||
private static bool HasAnySufficientSubResource(
|
||||
Mobile from, Container pack, int amountNeeded, CraftSystem system, CraftSubResCol resCol
|
||||
)
|
||||
{
|
||||
for (var j = 0; j < resCol.Count; j++)
|
||||
{
|
||||
var subRes = resCol[j];
|
||||
if (from.Skills[system.MainSkill].Value >= subRes.RequiredSkill &&
|
||||
GetResourceAmount(pack, subRes.ItemType) >= amountNeeded)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue