## 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
113 lines
No EOL
3.6 KiB
C#
113 lines
No EOL
3.6 KiB
C#
using Server.Engines.Craft;
|
|
using Server.Gumps;
|
|
using Server.Items;
|
|
using Server.Network;
|
|
|
|
namespace Server.Factions;
|
|
|
|
public class FactionImbueGump : FactionGump
|
|
{
|
|
private readonly CraftSystem m_CraftSystem;
|
|
|
|
private readonly FactionItemDefinition m_Definition;
|
|
private readonly Faction m_Faction;
|
|
private readonly Item m_Item;
|
|
private readonly Mobile m_Mobile;
|
|
private readonly TextDefinition m_Notice;
|
|
private readonly BaseTool m_Tool;
|
|
|
|
public FactionImbueGump(
|
|
int quality, Item item, Mobile from, CraftSystem craftSystem, BaseTool tool, TextDefinition notice,
|
|
int availableSilver, Faction faction, FactionItemDefinition def
|
|
) : base(100, 200)
|
|
{
|
|
m_Item = item;
|
|
m_Mobile = from;
|
|
m_Faction = faction;
|
|
m_CraftSystem = craftSystem;
|
|
m_Tool = tool;
|
|
m_Notice = notice;
|
|
m_Definition = def;
|
|
|
|
AddPage(0);
|
|
|
|
AddBackground(0, 0, 320, 270, 5054);
|
|
AddBackground(10, 10, 300, 250, 3000);
|
|
|
|
AddHtmlLocalized(20, 20, 210, 25, 1011569); // Imbue with Faction properties?
|
|
|
|
AddHtmlLocalized(20, 60, 170, 25, 1018302); // Item quality:
|
|
AddHtmlLocalized(175, 60, 100, 25, 1018305 - quality); // Exceptional, Average, Low
|
|
|
|
AddHtmlLocalized(20, 80, 170, 25, 1011572); // Item Cost :
|
|
AddLabel(175, 80, 0x34, def.SilverCost.ToString("N0")); // NOTE: Added 'N0'
|
|
|
|
AddHtmlLocalized(20, 100, 170, 25, 1011573); // Your Silver :
|
|
AddLabel(175, 100, 0x34, availableSilver.ToString("N0")); // NOTE: Added 'N0'
|
|
|
|
AddRadio(20, 140, 210, 211, true, 1);
|
|
AddLabel(55, 140, m_Faction.Definition.HuePrimary - 1, "*****");
|
|
AddHtmlLocalized(150, 140, 150, 25, 1011570); // Primary Color
|
|
|
|
AddRadio(20, 160, 210, 211, false, 2);
|
|
AddLabel(55, 160, m_Faction.Definition.HueSecondary - 1, "*****");
|
|
AddHtmlLocalized(150, 160, 150, 25, 1011571); // Secondary Color
|
|
|
|
AddHtmlLocalized(55, 200, 200, 25, 1011011); // CONTINUE
|
|
AddButton(20, 200, 4005, 4007, 1);
|
|
|
|
AddHtmlLocalized(55, 230, 200, 25, 1011012); // CANCEL
|
|
AddButton(20, 230, 4005, 4007, 0);
|
|
}
|
|
|
|
public override void OnResponse(NetState sender, in RelayInfo info)
|
|
{
|
|
if (info.ButtonID == 1)
|
|
{
|
|
var pack = m_Mobile.Backpack;
|
|
|
|
if (pack != null && m_Item.IsChildOf(pack))
|
|
{
|
|
if (pack.ConsumeTotal(typeof(Silver), m_Definition.SilverCost))
|
|
{
|
|
int hue;
|
|
|
|
if (m_Item is SpellScroll)
|
|
{
|
|
hue = 0;
|
|
}
|
|
else if (info.IsSwitched(1))
|
|
{
|
|
hue = m_Faction.Definition.HuePrimary;
|
|
}
|
|
else
|
|
{
|
|
hue = m_Faction.Definition.HueSecondary;
|
|
}
|
|
|
|
FactionItem.Imbue(m_Item, m_Faction, true, hue);
|
|
}
|
|
else
|
|
{
|
|
m_Mobile.SendLocalizedMessage(1042204); // You do not have enough silver.
|
|
}
|
|
}
|
|
}
|
|
|
|
if (m_Tool?.Deleted == false && m_Tool.UsesRemaining > 0)
|
|
{
|
|
CraftItem.ShowCraftMenu(m_Mobile, m_CraftSystem, m_Tool, m_Notice);
|
|
}
|
|
else if (m_Notice != null)
|
|
{
|
|
if (m_Notice.Number > 0)
|
|
{
|
|
m_Mobile.SendLocalizedMessage(m_Notice.Number);
|
|
}
|
|
else
|
|
{
|
|
m_Mobile.SendMessage(m_Notice.String);
|
|
}
|
|
}
|
|
}
|
|
} |