## 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
228 lines
6 KiB
C#
228 lines
6 KiB
C#
using System;
|
|
using ModernUO.Serialization;
|
|
using Server.Gumps;
|
|
using Server.Network;
|
|
|
|
namespace Server.Engines.ConPVP;
|
|
|
|
[SerializationGenerator(0, false)]
|
|
public partial class LadderItem : Item
|
|
{
|
|
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
|
[SerializableField(0)]
|
|
private LadderController _ladder;
|
|
|
|
[Constructible]
|
|
public LadderItem() : base(0x117F) => Movable = false;
|
|
|
|
public override string DefaultName => "1v1 leaderboard";
|
|
|
|
public override void OnDoubleClick(Mobile from)
|
|
{
|
|
if (from.InRange(GetWorldLocation(), 2))
|
|
{
|
|
var ladder = ConPVP.Ladder.Instance ?? Ladder.Ladder;
|
|
|
|
if (ladder != null)
|
|
{
|
|
LadderGump.DisplayTo(from, ladder);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that
|
|
}
|
|
}
|
|
}
|
|
|
|
public class LadderGump : DynamicGump
|
|
{
|
|
private readonly Ladder _ladder;
|
|
|
|
private int _page;
|
|
private int _columnX;
|
|
|
|
public override bool Singleton => true;
|
|
|
|
private LadderGump(Ladder ladder, int page) : base(50, 50)
|
|
{
|
|
_ladder = ladder;
|
|
_page = page;
|
|
}
|
|
|
|
public static void DisplayTo(Mobile from, Ladder ladder, int page = 0)
|
|
{
|
|
if (from?.NetState == null || ladder == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
from.SendGump(new LadderGump(ladder, page), true);
|
|
}
|
|
|
|
protected override void BuildLayout(ref DynamicGumpBuilder builder)
|
|
{
|
|
_columnX = 12;
|
|
|
|
builder.AddPage();
|
|
|
|
var list = _ladder.Entries;
|
|
|
|
var lc = Math.Min(list.Count, 150);
|
|
|
|
var start = _page * 15;
|
|
var end = start + 15;
|
|
|
|
if (end > lc)
|
|
{
|
|
end = lc;
|
|
}
|
|
|
|
var ct = end - start;
|
|
|
|
var height = 12 + 20 + ct * 20 + 23 + 12;
|
|
|
|
builder.AddBackground(0, 0, 499, height, 0x2436);
|
|
|
|
for (var i = start + 1; i < end; i += 2)
|
|
{
|
|
builder.AddImageTiled(12, 32 + (i - start) * 20, 475, 20, 0x2430);
|
|
}
|
|
|
|
builder.AddAlphaRegion(10, 10, 479, height - 20);
|
|
|
|
if (_page > 0)
|
|
{
|
|
builder.AddButton(446, height - 12 - 2 - 16, 0x15E3, 0x15E7, 1);
|
|
}
|
|
else
|
|
{
|
|
builder.AddImage(446, height - 12 - 2 - 16, 0x2626);
|
|
}
|
|
|
|
if ((_page + 1) * 15 < lc)
|
|
{
|
|
builder.AddButton(466, height - 12 - 2 - 16, 0x15E1, 0x15E5, 2);
|
|
}
|
|
else
|
|
{
|
|
builder.AddImage(466, height - 12 - 2 - 16, 0x2622);
|
|
}
|
|
|
|
builder.AddHtml(
|
|
16,
|
|
height - 12 - 2 - 18,
|
|
400,
|
|
20,
|
|
Html.Color($"Top {lc} of {list.Count:N0} duelists, page {_page + 1} of {(lc + 14) / 15}", 0xFFC000)
|
|
);
|
|
|
|
AddColumnHeader(ref builder, 75, "Rank");
|
|
AddColumnHeader(ref builder, 115, "Level");
|
|
AddColumnHeader(ref builder, 50, "Guild");
|
|
AddColumnHeader(ref builder, 115, "Name");
|
|
AddColumnHeader(ref builder, 60, "Wins");
|
|
AddColumnHeader(ref builder, 60, "Losses");
|
|
|
|
for (var i = start; i < end && i < lc; ++i)
|
|
{
|
|
var entry = list[i];
|
|
|
|
var y = 32 + (i - start) * 20;
|
|
var x = 12;
|
|
|
|
AddBorderedText(ref builder, x, y, 75, Rank(i + 1).Center(), 0xFFFFFF);
|
|
x += 75;
|
|
|
|
builder.AddImage(x + 3, y + 4, 0x805);
|
|
|
|
var xp = entry.Experience;
|
|
var level = Ladder.GetLevel(xp);
|
|
|
|
Ladder.GetLevelInfo(level, out var xpBase, out var xpAdvance);
|
|
|
|
int width;
|
|
|
|
var xpOffset = xp - xpBase;
|
|
|
|
if (xpOffset >= xpAdvance)
|
|
{
|
|
width = 109; // level 50
|
|
}
|
|
else
|
|
{
|
|
width = (109 * xpOffset + xpAdvance / 2) / (xpAdvance - 1);
|
|
}
|
|
|
|
builder.AddImageTiled(x + 3, y + 4, width, 11, 0x806);
|
|
AddBorderedText(ref builder, x, y, 115, Html.Center($"{level}"), 0xFFFFFF);
|
|
x += 115;
|
|
|
|
var mob = entry.Mobile;
|
|
|
|
if (mob.Guild != null)
|
|
{
|
|
AddBorderedText(ref builder, x, y, 50, mob.Guild.Abbreviation.Center(), 0xFFFFFF);
|
|
}
|
|
|
|
x += 50;
|
|
|
|
AddBorderedText(ref builder, x + 5, y, 115 - 5, mob.Name, 0xFFFFFF);
|
|
x += 115;
|
|
|
|
AddBorderedText(ref builder, x, y, 60, Html.Center($"{entry.Wins}"), 0xFFFFFF);
|
|
x += 60;
|
|
|
|
AddBorderedText(ref builder, x, y, 60, Html.Center($"{entry.Losses}"), 0xFFFFFF);
|
|
}
|
|
}
|
|
|
|
public static string Rank(int num)
|
|
{
|
|
var numStr = num.ToString("N0");
|
|
|
|
if (num % 100 > 10 && num % 100 < 20)
|
|
{
|
|
return $"{numStr}th";
|
|
}
|
|
|
|
return (num % 10) switch
|
|
{
|
|
1 => $"{numStr}st",
|
|
2 => $"{numStr}nd",
|
|
3 => $"{numStr}rd",
|
|
_ => $"{numStr}th"
|
|
};
|
|
}
|
|
|
|
public override void OnResponse(NetState sender, in RelayInfo info)
|
|
{
|
|
var from = sender.Mobile;
|
|
|
|
if (info.ButtonID == 1 && _page > 0)
|
|
{
|
|
_page--;
|
|
}
|
|
else if (info.ButtonID == 2 && (_page + 1) * 15 < Math.Min(_ladder.Entries.Count, 150))
|
|
{
|
|
_page++;
|
|
}
|
|
|
|
from.SendGump(this); // refresh-via-this
|
|
}
|
|
|
|
private static void AddBorderedText(ref DynamicGumpBuilder builder, int x, int y, int width, string text, int color) =>
|
|
AddColoredText(ref builder, x, y, width, text, color);
|
|
|
|
private static void AddColoredText(ref DynamicGumpBuilder builder, int x, int y, int width, string text, int color) =>
|
|
builder.AddHtml(x, y, width, 20, color == 0 ? text : text.Color(color));
|
|
|
|
private void AddColumnHeader(ref DynamicGumpBuilder builder, int width, string name)
|
|
{
|
|
builder.AddBackground(_columnX, 12, width, 20, 0x242C);
|
|
builder.AddImageTiled(_columnX + 2, 14, width - 4, 16, 0x2430);
|
|
AddBorderedText(ref builder, _columnX, 13, width, name.Center(), 0xFFFFFF);
|
|
|
|
_columnX += width;
|
|
}
|
|
}
|