## 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
357 lines
12 KiB
C#
357 lines
12 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using Server.Items;
|
|
|
|
namespace Server.Engines.Craft
|
|
{
|
|
public enum CraftECA
|
|
{
|
|
ChanceMinusSixty,
|
|
FiftyPercentChanceMinusTenPercent,
|
|
ChanceMinusSixtyToFortyFive
|
|
}
|
|
|
|
public abstract class CraftSystem
|
|
{
|
|
private readonly Dictionary<Mobile, CraftContext> m_ContextTable = new();
|
|
private readonly List<int> m_RareRecipes;
|
|
private readonly List<int> m_Recipes;
|
|
|
|
public CraftSystem(int minCraftEffect, int maxCraftEffect, double delay)
|
|
{
|
|
MinCraftEffect = minCraftEffect;
|
|
MaxCraftEffect = maxCraftEffect;
|
|
Delay = delay;
|
|
|
|
CraftItems = new List<CraftItem>();
|
|
CraftGroups = new List<CraftGroup>();
|
|
CraftSubRes = new CraftSubResCol();
|
|
CraftSubRes2 = new CraftSubResCol();
|
|
|
|
m_Recipes = new List<int>();
|
|
m_RareRecipes = new List<int>();
|
|
|
|
InitCraftList();
|
|
}
|
|
|
|
public int MinCraftEffect { get; }
|
|
|
|
public int MaxCraftEffect { get; }
|
|
|
|
public double Delay { get; }
|
|
|
|
public List<CraftItem> CraftItems { get; }
|
|
|
|
public List<CraftGroup> CraftGroups { get; }
|
|
|
|
public CraftSubResCol CraftSubRes { get; }
|
|
|
|
public CraftSubResCol CraftSubRes2 { get; }
|
|
|
|
public abstract SkillName MainSkill { get; }
|
|
|
|
public virtual TextDefinition GumpTitle => TextDefinition.Empty;
|
|
|
|
public virtual CraftECA ECA => CraftECA.ChanceMinusSixty;
|
|
|
|
public virtual bool RequiresTool => true;
|
|
|
|
public bool Resmelt { get; set; }
|
|
|
|
public bool Repair { get; set; }
|
|
|
|
public bool MarkOption { get; set; }
|
|
|
|
public bool CanEnhance { get; set; }
|
|
|
|
public abstract double GetChanceAtMin(CraftItem item);
|
|
|
|
public virtual bool RetainsColorFrom(CraftItem item, Type type) => false;
|
|
|
|
public CraftContext GetContext(Mobile m)
|
|
{
|
|
if (m == null)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
if (m.Deleted)
|
|
{
|
|
m_ContextTable.Remove(m);
|
|
return null;
|
|
}
|
|
|
|
if (!m_ContextTable.TryGetValue(m, out var c))
|
|
{
|
|
m_ContextTable[m] = c = new CraftContext();
|
|
}
|
|
|
|
return c;
|
|
}
|
|
|
|
public void OnMade(Mobile m, CraftItem item)
|
|
{
|
|
GetContext(m)?.OnMade(item);
|
|
}
|
|
|
|
public virtual bool ConsumeOnFailure(Mobile from, Type resourceType, CraftItem craftItem) => true;
|
|
|
|
public void CreateItem(Mobile from, Type type, Type typeRes, BaseTool tool, CraftItem realCraftItem)
|
|
{
|
|
// Verify if the type is in the list of the craftable item
|
|
if (CraftItems.SearchFor(type) != null)
|
|
{
|
|
realCraftItem.Craft(from, this, typeRes, tool);
|
|
}
|
|
}
|
|
|
|
public void CreateItem(
|
|
Mobile from, Type type, Type typeRes, BaseTool tool, CraftItem realCraftItem, int hue
|
|
)
|
|
{
|
|
// Verify if the type is in the list of the craftable item
|
|
if (CraftItems.SearchFor(type) != null)
|
|
{
|
|
realCraftItem.Craft(from, this, typeRes, tool, hue);
|
|
}
|
|
}
|
|
|
|
public int RandomRecipe()
|
|
{
|
|
if (m_Recipes.Count == 0)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
return m_Recipes.RandomElement();
|
|
}
|
|
|
|
public int RandomRareRecipe()
|
|
{
|
|
if (m_RareRecipes.Count == 0)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
return m_RareRecipes.RandomElement();
|
|
}
|
|
|
|
public int AddCraft(
|
|
Type typeItem, TextDefinition group, TextDefinition name, double minSkill, double maxSkill,
|
|
Type typeRes, TextDefinition nameRes, int amount
|
|
) => AddCraft(typeItem, group, name, MainSkill, minSkill, maxSkill, typeRes, nameRes, amount, "");
|
|
|
|
public int AddCraft(
|
|
Type typeItem, TextDefinition group, TextDefinition name, int itemId, double minSkill, double maxSkill,
|
|
Type typeRes, TextDefinition nameRes, int amount
|
|
) => AddCraft(typeItem, group, name, itemId, MainSkill, minSkill, maxSkill, typeRes, nameRes, amount, "");
|
|
|
|
public int AddCraft(
|
|
Type typeItem, TextDefinition group, TextDefinition name, double minSkill, double maxSkill,
|
|
Type typeRes, TextDefinition nameRes, int amount, TextDefinition message
|
|
) => AddCraft(typeItem, group, name, MainSkill, minSkill, maxSkill, typeRes, nameRes, amount, message);
|
|
|
|
public int AddCraft(
|
|
Type typeItem, TextDefinition group, TextDefinition name, int itemId, double minSkill, double maxSkill,
|
|
Type typeRes, TextDefinition nameRes, int amount, TextDefinition message
|
|
) => AddCraft(typeItem, group, name, itemId, MainSkill, minSkill, maxSkill, typeRes, nameRes, amount, message);
|
|
|
|
public int AddCraft(
|
|
Type typeItem, TextDefinition group, TextDefinition name, SkillName skillToMake, double minSkill,
|
|
double maxSkill, Type typeRes, TextDefinition nameRes, int amount
|
|
) => AddCraft(typeItem, group, name, skillToMake, minSkill, maxSkill, typeRes, nameRes, amount, "");
|
|
|
|
public int AddCraft(
|
|
Type typeItem, TextDefinition group, TextDefinition name, int itemId, SkillName skillToMake, double minSkill,
|
|
double maxSkill, Type typeRes, TextDefinition nameRes, int amount
|
|
) => AddCraft(typeItem, group, name, itemId, skillToMake, minSkill, maxSkill, typeRes, nameRes, amount, "");
|
|
|
|
public int AddCraft(
|
|
Type typeItem, TextDefinition group, TextDefinition name, SkillName skillToMake, double minSkill,
|
|
double maxSkill, Type typeRes, TextDefinition nameRes, int amount, TextDefinition message
|
|
)
|
|
{
|
|
var craftItem = new CraftItem(typeItem, group, name);
|
|
craftItem.AddRes(typeRes, nameRes, amount, message);
|
|
craftItem.AddSkill(skillToMake, minSkill, maxSkill);
|
|
|
|
DoGroup(group, craftItem);
|
|
CraftItems.Add(craftItem);
|
|
return CraftItems.Count - 1;
|
|
}
|
|
|
|
public int AddCraft(
|
|
Type typeItem, TextDefinition group, TextDefinition name, int itemId, SkillName skillToMake, double minSkill,
|
|
double maxSkill, Type typeRes, TextDefinition nameRes, int amount, TextDefinition message
|
|
)
|
|
{
|
|
var craftItem = new CraftItem(typeItem, group, name, itemId);
|
|
craftItem.AddRes(typeRes, nameRes, amount, message);
|
|
craftItem.AddSkill(skillToMake, minSkill, maxSkill);
|
|
|
|
DoGroup(group, craftItem);
|
|
CraftItems.Add(craftItem);
|
|
return CraftItems.Count - 1;
|
|
}
|
|
|
|
private void DoGroup(TextDefinition groupName, CraftItem craftItem)
|
|
{
|
|
var index = CraftGroups.SearchFor(groupName);
|
|
|
|
if (index == -1)
|
|
{
|
|
var craftGroup = new CraftGroup(groupName);
|
|
craftGroup.AddCraftItem(craftItem);
|
|
CraftGroups.Add(craftGroup);
|
|
}
|
|
else
|
|
{
|
|
CraftGroups[index].AddCraftItem(craftItem);
|
|
}
|
|
}
|
|
|
|
public void SetItemHue(int index, int hue)
|
|
{
|
|
CraftItems[index].ItemHue = hue;
|
|
}
|
|
|
|
public void SetManaReq(int index, int mana, int cliloc = 0)
|
|
{
|
|
CraftItems[index].Mana = mana;
|
|
CraftItems[index].NeedManaLabel = TextDefinition.Of(cliloc, "You lack the required mana to make that.");
|
|
}
|
|
|
|
public void SetStamReq(int index, int stam, int cliloc = 0)
|
|
{
|
|
CraftItems[index].Stam = stam;
|
|
CraftItems[index].NeedStamLabel = TextDefinition.Of(cliloc, "You lack the required stamina to make that.");
|
|
}
|
|
|
|
public void SetHitsReq(int index, int hits, int cliloc = 0)
|
|
{
|
|
CraftItems[index].Hits = hits;
|
|
CraftItems[index].NeedHitsLabel = TextDefinition.Of(cliloc, "You lack the required hit points to make that.");
|
|
}
|
|
|
|
public void SetUseAllRes(int index, bool useAll)
|
|
{
|
|
CraftItems[index].UseAllRes = useAll;
|
|
}
|
|
|
|
public void SetNeedHeat(int index, bool needHeat)
|
|
{
|
|
CraftItems[index].NeedHeat = needHeat;
|
|
}
|
|
|
|
public void SetNeedOven(int index, bool needOven)
|
|
{
|
|
CraftItems[index].NeedOven = needOven;
|
|
}
|
|
|
|
public void SetBeverageType(int index, BeverageType requiredBeverage)
|
|
{
|
|
CraftItems[index].RequiredBeverage = requiredBeverage;
|
|
}
|
|
|
|
public void SetNeedMill(int index, bool needMill)
|
|
{
|
|
CraftItems[index].NeedMill = needMill;
|
|
}
|
|
|
|
public void SetNeededExpansion(int index, Expansion expansion)
|
|
{
|
|
CraftItems[index].RequiredExpansion = expansion;
|
|
}
|
|
|
|
public void AddRes(int index, Type type, TextDefinition name, int amount, TextDefinition message)
|
|
{
|
|
CraftItems[index].AddRes(type, name, amount, message);
|
|
}
|
|
|
|
public void AddSkill(int index, SkillName skillToMake, double minSkill, double maxSkill)
|
|
{
|
|
CraftItems[index].AddSkill(skillToMake, minSkill, maxSkill);
|
|
}
|
|
|
|
public void SetUseSubRes2(int index, bool val)
|
|
{
|
|
CraftItems[index].UseSubRes2 = val;
|
|
}
|
|
|
|
private void AddRecipeBase(int index, int id)
|
|
{
|
|
CraftItems[index].AddRecipe(id, this);
|
|
}
|
|
|
|
public void AddRecipe(int index, int id)
|
|
{
|
|
AddRecipeBase(index, id);
|
|
m_Recipes.Add(id);
|
|
}
|
|
|
|
public void AddRareRecipe(int index, int id)
|
|
{
|
|
AddRecipeBase(index, id);
|
|
m_RareRecipes.Add(id);
|
|
}
|
|
|
|
public void AddQuestRecipe(int index, int id)
|
|
{
|
|
AddRecipeBase(index, id);
|
|
}
|
|
|
|
public void ForceNonExceptional(int index)
|
|
{
|
|
CraftItems[index].ForceNonExceptional = true;
|
|
}
|
|
|
|
public void SetSubRes(Type type, TextDefinition name)
|
|
{
|
|
CraftSubRes.ResType = type;
|
|
CraftSubRes.Name = name;
|
|
CraftSubRes.Init = true;
|
|
}
|
|
|
|
public void AddSubRes(Type type, TextDefinition name, double reqSkill, int genericName, TextDefinition message)
|
|
{
|
|
var craftSubRes = new CraftSubRes(type, name, reqSkill, genericName, message);
|
|
CraftSubRes.Add(craftSubRes);
|
|
}
|
|
|
|
public void AddSubRes(Type type, TextDefinition name, double reqSkill, TextDefinition message)
|
|
{
|
|
var craftSubRes = new CraftSubRes(type, name, reqSkill, message);
|
|
CraftSubRes.Add(craftSubRes);
|
|
}
|
|
|
|
public void SetSubRes2(Type type, TextDefinition name)
|
|
{
|
|
CraftSubRes2.ResType = type;
|
|
CraftSubRes2.Name = name;
|
|
CraftSubRes2.Init = true;
|
|
}
|
|
|
|
public void AddSubRes2(Type type, TextDefinition name, double reqSkill, int genericName, TextDefinition message)
|
|
{
|
|
var craftSubRes = new CraftSubRes(type, name, reqSkill, genericName, message);
|
|
CraftSubRes2.Add(craftSubRes);
|
|
}
|
|
|
|
public void AddSubRes2(Type type, TextDefinition name, double reqSkill, TextDefinition message)
|
|
{
|
|
var craftSubRes = new CraftSubRes(type, name, reqSkill, message);
|
|
CraftSubRes2.Add(craftSubRes);
|
|
}
|
|
|
|
public abstract void InitCraftList();
|
|
|
|
public abstract void PlayCraftEffect(Mobile from);
|
|
|
|
public abstract int PlayEndingEffect(
|
|
Mobile from, bool failed, bool lostMaterial, bool toolBroken, int quality,
|
|
bool makersMark, CraftItem item
|
|
);
|
|
|
|
public abstract int CanCraft(Mobile from, BaseTool tool, Type itemType);
|
|
}
|
|
}
|