## 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
180 lines
6.1 KiB
C#
180 lines
6.1 KiB
C#
using Server.Ethics;
|
|
using Server.Items;
|
|
using Server.Targeting;
|
|
|
|
namespace Server.Engines.Craft
|
|
{
|
|
public enum SmeltResult
|
|
{
|
|
Success,
|
|
Invalid,
|
|
NoSkill
|
|
}
|
|
|
|
public static class Resmelt
|
|
{
|
|
public static void Do(Mobile from, CraftSystem craftSystem, BaseTool tool)
|
|
{
|
|
var num = craftSystem.CanCraft(from, tool, null);
|
|
|
|
if (num > 0 && num != 1044267)
|
|
{
|
|
CraftItem.ShowCraftMenu(from, craftSystem, tool, num);
|
|
}
|
|
else
|
|
{
|
|
from.Target = new InternalTarget(craftSystem, tool);
|
|
from.SendLocalizedMessage(1044273); // Target an item to recycle.
|
|
}
|
|
}
|
|
|
|
private class InternalTarget : Target
|
|
{
|
|
private readonly CraftSystem m_CraftSystem;
|
|
private readonly BaseTool m_Tool;
|
|
|
|
public InternalTarget(CraftSystem craftSystem, BaseTool tool) : base(2, false, TargetFlags.None)
|
|
{
|
|
m_CraftSystem = craftSystem;
|
|
m_Tool = tool;
|
|
}
|
|
|
|
private SmeltResult Resmelt(Mobile from, Item item, CraftResource resource)
|
|
{
|
|
try
|
|
{
|
|
if (Ethic.IsImbued(item))
|
|
{
|
|
return SmeltResult.Invalid;
|
|
}
|
|
|
|
if (CraftResources.GetType(resource) != CraftResourceType.Metal)
|
|
{
|
|
return SmeltResult.Invalid;
|
|
}
|
|
|
|
var info = CraftResources.GetInfo(resource);
|
|
|
|
if (info == null || info.ResourceTypes.Length == 0)
|
|
{
|
|
return SmeltResult.Invalid;
|
|
}
|
|
|
|
var craftItem = m_CraftSystem.CraftItems.SearchFor(item.GetType());
|
|
|
|
if (craftItem == null || craftItem.Resources.Count == 0)
|
|
{
|
|
return SmeltResult.Invalid;
|
|
}
|
|
|
|
var craftResource = craftItem.Resources[0];
|
|
|
|
if (craftResource.Amount < 2)
|
|
{
|
|
return SmeltResult.Invalid; // Not enough metal to resmelt
|
|
}
|
|
|
|
var difficulty = resource switch
|
|
{
|
|
CraftResource.DullCopper => 65.0,
|
|
CraftResource.ShadowIron => 70.0,
|
|
CraftResource.Copper => 75.0,
|
|
CraftResource.Bronze => 80.0,
|
|
CraftResource.Gold => 85.0,
|
|
CraftResource.Agapite => 90.0,
|
|
CraftResource.Verite => 95.0,
|
|
CraftResource.Valorite => 99.0,
|
|
_ => 0.0
|
|
};
|
|
|
|
if (difficulty > from.Skills.Mining.Value)
|
|
{
|
|
return SmeltResult.NoSkill;
|
|
}
|
|
|
|
var resourceType = info.ResourceTypes[0];
|
|
var ingot = resourceType.CreateInstance<Item>();
|
|
|
|
if (item is DragonBardingDeed || item is BaseArmor armor && armor.PlayerConstructed ||
|
|
item is BaseWeapon weapon && weapon.PlayerConstructed ||
|
|
item is BaseClothing clothing && clothing.PlayerConstructed)
|
|
{
|
|
ingot.Amount = craftResource.Amount / 2;
|
|
}
|
|
else
|
|
{
|
|
ingot.Amount = 1;
|
|
}
|
|
|
|
item.Delete();
|
|
from.AddToBackpack(ingot);
|
|
|
|
from.PlaySound(0x2A);
|
|
from.PlaySound(0x240);
|
|
return SmeltResult.Success;
|
|
}
|
|
catch
|
|
{
|
|
// ignored
|
|
}
|
|
|
|
return SmeltResult.Invalid;
|
|
}
|
|
|
|
protected override void OnTarget(Mobile from, object targeted)
|
|
{
|
|
var num = m_CraftSystem.CanCraft(from, m_Tool, null);
|
|
|
|
if (num > 0)
|
|
{
|
|
if (num == 1044267)
|
|
{
|
|
DefBlacksmithy.CheckAnvilAndForge(from, 2, out var anvil, out var forge);
|
|
|
|
if (!anvil)
|
|
{
|
|
num = 1044266; // You must be near an anvil
|
|
}
|
|
else if (!forge)
|
|
{
|
|
num = 1044265; // You must be near a forge.
|
|
}
|
|
}
|
|
|
|
CraftItem.ShowCraftMenu(from, m_CraftSystem, m_Tool, num);
|
|
}
|
|
else
|
|
{
|
|
var result = SmeltResult.Invalid;
|
|
var isStoreBought = false;
|
|
int message;
|
|
|
|
if (targeted is BaseArmor armor)
|
|
{
|
|
result = Resmelt(from, armor, armor.Resource);
|
|
isStoreBought = !armor.PlayerConstructed;
|
|
}
|
|
else if (targeted is BaseWeapon weapon)
|
|
{
|
|
result = Resmelt(from, weapon, weapon.Resource);
|
|
isStoreBought = !weapon.PlayerConstructed;
|
|
}
|
|
else if (targeted is DragonBardingDeed deed)
|
|
{
|
|
result = Resmelt(from, deed, deed.Resource);
|
|
}
|
|
|
|
message = result switch
|
|
{
|
|
SmeltResult.Invalid => 1044272,
|
|
SmeltResult.NoSkill => 1044269,
|
|
SmeltResult.Success => isStoreBought ? 500418 : 1044270,
|
|
_ => 1044272
|
|
};
|
|
|
|
CraftItem.ShowCraftMenu(from, m_CraftSystem, m_Tool, message);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|