## 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
298 lines
10 KiB
C#
298 lines
10 KiB
C#
using System;
|
|
using Server.Items;
|
|
using Server.Menus.ItemLists;
|
|
using Server.Network;
|
|
|
|
namespace Server.Engines.Craft.T2A;
|
|
|
|
public class CarpentryMenu : ItemListMenu
|
|
{
|
|
private enum Category
|
|
{
|
|
Main,
|
|
Furniture,
|
|
Containers,
|
|
Weapons,
|
|
Instruments,
|
|
Misc,
|
|
Addons
|
|
}
|
|
|
|
private static readonly Type[] FurnitureTypes =
|
|
[
|
|
typeof(FootStool), typeof(Stool), typeof(BambooChair), typeof(WoodenChair),
|
|
typeof(FancyWoodenChairCushion), typeof(WoodenChairCushion),
|
|
typeof(WoodenBench), typeof(WoodenThrone), typeof(Throne),
|
|
typeof(Nightstand), typeof(WritingTable), typeof(YewWoodTable), typeof(LargeTable)
|
|
];
|
|
|
|
private static readonly Type[] ContainerTypes =
|
|
[
|
|
typeof(WoodenBox), typeof(SmallCrate), typeof(MediumCrate), typeof(LargeCrate),
|
|
typeof(WoodenChest), typeof(EmptyBookcase), typeof(FancyArmoire), typeof(Armoire),
|
|
typeof(Keg)
|
|
];
|
|
|
|
private static readonly Type[] WeaponTypes =
|
|
[
|
|
typeof(ShepherdsCrook), typeof(QuarterStaff), typeof(GnarledStaff), typeof(WoodenShield)
|
|
];
|
|
|
|
private static readonly Type[] InstrumentTypes =
|
|
[
|
|
typeof(LapHarp), typeof(Harp), typeof(Drums), typeof(Lute),
|
|
typeof(Tambourine), typeof(TambourineTassel)
|
|
];
|
|
|
|
private static readonly Type[] MiscItemTypes =
|
|
[
|
|
typeof(FishingPole), typeof(BarrelStaves), typeof(BarrelLid),
|
|
typeof(ShortMusicStand), typeof(TallMusicStand), typeof(Easel)
|
|
];
|
|
|
|
private static readonly Type[] AddonTypes =
|
|
[
|
|
typeof(SmallBedSouthDeed), typeof(SmallBedEastDeed),
|
|
typeof(LargeBedSouthDeed), typeof(LargeBedEastDeed),
|
|
typeof(DartBoardSouthDeed), typeof(DartBoardEastDeed),
|
|
typeof(BallotBoxDeed),
|
|
typeof(PentagramDeed), typeof(AbbatoirDeed),
|
|
typeof(SmallForgeDeed), typeof(LargeForgeEastDeed), typeof(LargeForgeSouthDeed),
|
|
typeof(AnvilEastDeed), typeof(AnvilSouthDeed),
|
|
typeof(TrainingDummyEastDeed), typeof(TrainingDummySouthDeed),
|
|
typeof(PickpocketDipEastDeed), typeof(PickpocketDipSouthDeed),
|
|
typeof(Dressform),
|
|
typeof(SpinningWheelEastDeed), typeof(SpinningWheelSouthDeed),
|
|
typeof(LoomEastDeed), typeof(LoomSouthDeed),
|
|
typeof(StoneOvenEastDeed), typeof(StoneOvenSouthDeed),
|
|
typeof(FlourMillEastDeed), typeof(FlourMillSouthDeed),
|
|
typeof(WaterTroughEastDeed), typeof(WaterTroughSouthDeed)
|
|
];
|
|
|
|
private static ItemListEntry[] _mainEntries;
|
|
private static ItemListEntry[] _furnitureEntries;
|
|
private static ItemListEntry[] _containerEntries;
|
|
private static ItemListEntry[] _weaponEntries;
|
|
private static ItemListEntry[] _instrumentEntries;
|
|
private static ItemListEntry[] _miscEntries;
|
|
private static ItemListEntry[] _addonEntries;
|
|
|
|
private readonly Category _category;
|
|
private readonly BaseTool _tool;
|
|
|
|
public CarpentryMenu(Mobile from, BaseTool tool) : this(from, tool, Category.Main)
|
|
{
|
|
}
|
|
|
|
private static string GetQuestion(Category category) => category switch
|
|
{
|
|
Category.Main => "What would you like to make?",
|
|
Category.Furniture => "What kind of furniture?",
|
|
Category.Containers => "What kind of container?",
|
|
Category.Weapons => "What kind of weapon?",
|
|
Category.Instruments => "What kind of instrument?",
|
|
Category.Addons => "What kind of add-on?",
|
|
_ => "What would you like to make?"
|
|
};
|
|
|
|
private CarpentryMenu(Mobile from, BaseTool tool, Category category)
|
|
: base(GetQuestion(category), BuildFilteredEntries(from, category))
|
|
{
|
|
_tool = tool;
|
|
_category = category;
|
|
}
|
|
|
|
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 = DefCarpentry.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;
|
|
|
|
string label;
|
|
if (res.Count > 1)
|
|
{
|
|
var secondName = res[1].ItemType == typeof(IronIngot) ? "ingots" : "cloth";
|
|
label = $"{name} ({res[0].Amount} {resourceName}, {res[1].Amount} {secondName})";
|
|
}
|
|
else
|
|
{
|
|
label = $"{name} ({res[0].Amount} {resourceName})";
|
|
}
|
|
|
|
entries[count++] = new ItemListEntry(label, 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.Furniture => Furniture(),
|
|
Category.Containers => Containers(),
|
|
Category.Weapons => Weapons(),
|
|
Category.Instruments => Instruments(),
|
|
Category.Misc => Misc(),
|
|
Category.Addons => Addons(),
|
|
_ => null
|
|
};
|
|
|
|
private static Type[] GetTypes(Category category) => category switch
|
|
{
|
|
Category.Furniture => FurnitureTypes,
|
|
Category.Containers => ContainerTypes,
|
|
Category.Weapons => WeaponTypes,
|
|
Category.Instruments => InstrumentTypes,
|
|
Category.Misc => MiscItemTypes,
|
|
Category.Addons => AddonTypes,
|
|
_ => null
|
|
};
|
|
|
|
public static ItemListEntry[] Main() => _mainEntries ??=
|
|
[
|
|
new ItemListEntry("Furniture", 0xB57, 0, (int)Category.Furniture),
|
|
new ItemListEntry("Containers", 0x9AA, 0, (int)Category.Containers),
|
|
new ItemListEntry("Weapons", 0xE89, 0, (int)Category.Weapons),
|
|
new ItemListEntry("Instruments", 0xEB3, 0, (int)Category.Instruments),
|
|
new ItemListEntry("Miscellaneous", 0xDC0, 0, (int)Category.Misc),
|
|
new ItemListEntry("Add-Ons", 0x14F0, 0, (int)Category.Addons)
|
|
];
|
|
|
|
public static ItemListEntry[] Furniture() => _furnitureEntries ??= BuildStaticEntries(FurnitureTypes, "wood");
|
|
public static ItemListEntry[] Containers() => _containerEntries ??= BuildStaticEntries(ContainerTypes, "wood");
|
|
public static ItemListEntry[] Weapons() => _weaponEntries ??= BuildStaticEntries(WeaponTypes, "wood");
|
|
public static ItemListEntry[] Instruments() => _instrumentEntries ??= BuildStaticEntries(InstrumentTypes, "wood");
|
|
public static ItemListEntry[] Misc() => _miscEntries ??= BuildStaticEntries(MiscItemTypes, "wood");
|
|
public static ItemListEntry[] Addons() => _addonEntries ??= BuildStaticEntries(AddonTypes, "wood");
|
|
|
|
private static ItemListEntry[] BuildFilteredEntries(Mobile from, Category category)
|
|
{
|
|
if (category == Category.Main)
|
|
{
|
|
return BuildFilteredMainEntries(from);
|
|
}
|
|
|
|
var types = GetTypes(category);
|
|
var staticEntries = GetStaticEntries(category);
|
|
if (types == null || staticEntries == null)
|
|
{
|
|
return [];
|
|
}
|
|
|
|
return T2ACraftSystem.FilterEntries(from, staticEntries, types, DefCarpentry.CraftSystem);
|
|
}
|
|
|
|
private static ItemListEntry[] BuildFilteredMainEntries(Mobile from)
|
|
{
|
|
var system = DefCarpentry.CraftSystem;
|
|
var mainStatic = Main();
|
|
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 CraftSelectedItem(Mobile from, Type itemType)
|
|
{
|
|
var itemDef = DefCarpentry.CraftSystem.CraftItems.SearchFor(itemType);
|
|
|
|
if (itemDef == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
var num = DefCarpentry.CraftSystem.CanCraft(from, _tool, itemDef.ItemType);
|
|
|
|
if (num > 0)
|
|
{
|
|
from.SendLocalizedMessage(num);
|
|
return;
|
|
}
|
|
|
|
var context = DefCarpentry.CraftSystem.GetContext(from);
|
|
var res = itemDef.UseSubRes2 ? DefCarpentry.CraftSystem.CraftSubRes2 : DefCarpentry.CraftSystem.CraftSubRes;
|
|
var resIndex = itemDef.UseSubRes2 ? context.LastResourceIndex2 : context.LastResourceIndex;
|
|
var type = resIndex > -1 ? res[resIndex].ItemType : null;
|
|
DefCarpentry.CraftSystem.CreateItem(from, itemDef.ItemType, type, _tool, itemDef);
|
|
}
|
|
|
|
public override void OnResponse(NetState state, int index)
|
|
{
|
|
var from = state.Mobile;
|
|
var craftIndex = Entries[index].CraftIndex;
|
|
|
|
if (_category == Category.Main)
|
|
{
|
|
var menu = new CarpentryMenu(from, _tool, (Category)craftIndex);
|
|
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)
|
|
{
|
|
CraftSelectedItem(from, types[craftIndex]);
|
|
}
|
|
}
|
|
}
|