## 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
This commit is contained in:
Kamron Batman
GitHub
parent
2e93201e51
commit
16bf3016fb
50 changed files with 4483 additions and 219 deletions
|
|
@ -18,7 +18,7 @@ public enum GemType
|
|||
Diamond
|
||||
}
|
||||
|
||||
[SerializationGenerator(4, false)]
|
||||
[SerializationGenerator(5, false)]
|
||||
public abstract partial class BaseJewel : Item, ICraftable, IAosItem
|
||||
{
|
||||
[EncodedInt]
|
||||
|
|
@ -47,6 +47,11 @@ public abstract partial class BaseJewel : Item, ICraftable, IAosItem
|
|||
[SerializedCommandProperty(AccessLevel.GameMaster, canModify: true)]
|
||||
private AosSkillBonuses _skillBonuses;
|
||||
|
||||
[EncodedInt]
|
||||
[SerializableField(7)]
|
||||
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
||||
private int _gemCount;
|
||||
|
||||
public BaseJewel(int itemID, Layer layer) : base(itemID)
|
||||
{
|
||||
_attributes = new AosAttributes(this);
|
||||
|
|
@ -183,9 +188,129 @@ public abstract partial class BaseJewel : Item, ICraftable, IAosItem
|
|||
}
|
||||
}
|
||||
|
||||
// T2A jewelry: read gem info from craft context (set by GemSelectTarget).
|
||||
// The entire targeted gem stack is consumed and the piece is named by that
|
||||
// count (e.g. "a 1000 diamond ring").
|
||||
if (context is { PendingGemType: not GemType.None, PendingGemCount: > 0 })
|
||||
{
|
||||
var gemItemType = GetGemItemType(context.PendingGemType);
|
||||
var gemCount = context.PendingGemCount;
|
||||
|
||||
if (gemItemType != null && from.Backpack?.ConsumeTotal(gemItemType, gemCount) == true)
|
||||
{
|
||||
GemType = context.PendingGemType;
|
||||
GemCount = gemCount;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Gems were no longer available (or unknown type): craft a plain piece
|
||||
// rather than naming it for gems that were never consumed.
|
||||
from.SendAsciiMessage("You lack the gemstones to set into this piece.");
|
||||
}
|
||||
|
||||
context.PendingGemType = GemType.None;
|
||||
context.PendingGemCount = 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
public override void OnSingleClick(Mobile from)
|
||||
{
|
||||
if (!Core.UOTD)
|
||||
{
|
||||
OnSingleClickPreUOTD(from);
|
||||
return;
|
||||
}
|
||||
|
||||
base.OnSingleClick(from);
|
||||
}
|
||||
|
||||
public virtual void OnSingleClickPreUOTD(Mobile from)
|
||||
{
|
||||
var plural = _gemCount > 1;
|
||||
string name;
|
||||
if (this is WeddingRing)
|
||||
{
|
||||
name = $"a {Name}";
|
||||
}
|
||||
else
|
||||
{
|
||||
name = Name;
|
||||
|
||||
if (name == null)
|
||||
{
|
||||
var articleAnName = (TileData.ItemTable[ItemID].Flags & TileFlag.ArticleAn) != 0;
|
||||
name = $"{(articleAnName ? "an" : "a")} {Localization.GetText(LabelNumber).ToLowerInvariant()}";
|
||||
}
|
||||
}
|
||||
|
||||
if (_gemType != GemType.None && _gemCount > 0)
|
||||
{
|
||||
var gemName = GetGemName(_gemType, plural);
|
||||
LabelTo(from, plural
|
||||
? $"{name} with {_gemCount} {gemName}"
|
||||
: $"{name} with {gemName}");
|
||||
}
|
||||
else
|
||||
{
|
||||
LabelTo(from, name);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private static string GetGemName(GemType type, bool plural = false) => type switch
|
||||
{
|
||||
GemType.StarSapphire when plural => "star sapphires",
|
||||
GemType.StarSapphire => "a star sapphire",
|
||||
GemType.Emerald when plural => "emeralds",
|
||||
GemType.Emerald => "an emerald",
|
||||
GemType.Sapphire when plural => "sapphires",
|
||||
GemType.Sapphire => "a sapphire",
|
||||
GemType.Ruby when plural => "rubies",
|
||||
GemType.Ruby => "a ruby",
|
||||
GemType.Citrine when plural => "citrines",
|
||||
GemType.Citrine => "a citrine",
|
||||
GemType.Amethyst when plural => "amethysts",
|
||||
GemType.Amethyst => "an amethyst",
|
||||
GemType.Tourmaline when plural => "tourmalines",
|
||||
GemType.Tourmaline => "a tourmaline",
|
||||
GemType.Amber when plural => "ambers",
|
||||
GemType.Amber => "an amber",
|
||||
GemType.Diamond when plural => "diamonds",
|
||||
GemType.Diamond => "a diamond",
|
||||
_ when plural => "gems",
|
||||
_ => "a gem"
|
||||
};
|
||||
|
||||
internal static GemType GetGemType(Item item) => item switch
|
||||
{
|
||||
StarSapphire => GemType.StarSapphire,
|
||||
Emerald => GemType.Emerald,
|
||||
Sapphire => GemType.Sapphire,
|
||||
Ruby => GemType.Ruby,
|
||||
Citrine => GemType.Citrine,
|
||||
Amethyst => GemType.Amethyst,
|
||||
Tourmaline => GemType.Tourmaline,
|
||||
Amber => GemType.Amber,
|
||||
Diamond => GemType.Diamond,
|
||||
_ => GemType.None
|
||||
};
|
||||
|
||||
internal static Type GetGemItemType(GemType type) => type switch
|
||||
{
|
||||
GemType.StarSapphire => typeof(StarSapphire),
|
||||
GemType.Emerald => typeof(Emerald),
|
||||
GemType.Sapphire => typeof(Sapphire),
|
||||
GemType.Ruby => typeof(Ruby),
|
||||
GemType.Citrine => typeof(Citrine),
|
||||
GemType.Amethyst => typeof(Amethyst),
|
||||
GemType.Tourmaline => typeof(Tourmaline),
|
||||
GemType.Amber => typeof(Amber),
|
||||
GemType.Diamond => typeof(Diamond),
|
||||
_ => null
|
||||
};
|
||||
|
||||
public override void OnAfterDuped(Item newItem)
|
||||
{
|
||||
if (newItem is not BaseJewel jewel)
|
||||
|
|
@ -406,6 +531,18 @@ public abstract partial class BaseJewel : Item, ICraftable, IAosItem
|
|||
_skillBonuses.Deserialize(reader);
|
||||
}
|
||||
|
||||
private void MigrateFrom(V4Content content)
|
||||
{
|
||||
_maxHitPoints = content.MaxHitPoints;
|
||||
_hitPoints = content.HitPoints;
|
||||
_resource = content.Resource;
|
||||
_gemType = content.GemType;
|
||||
_attributes = content.Attributes;
|
||||
_resistances = content.Resistances;
|
||||
_skillBonuses = content.SkillBonuses;
|
||||
// _gemCount defaults to 0
|
||||
}
|
||||
|
||||
[AfterDeserialization]
|
||||
private void AfterDeserialization()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -33,3 +33,16 @@ public partial class SilverRing : BaseRing
|
|||
|
||||
public override double DefaultWeight => 0.1;
|
||||
}
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class WeddingRing : BaseRing
|
||||
{
|
||||
public override string DefaultName => "wedding ring";
|
||||
|
||||
[Constructible]
|
||||
public WeddingRing() : base(0x108a)
|
||||
{
|
||||
}
|
||||
|
||||
public override double DefaultWeight => 0.1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
using System;
|
||||
using ModernUO.Serialization;
|
||||
using Server.Engines.Craft;
|
||||
using Server.Gumps;
|
||||
using Server.Engines.Craft.T2A;
|
||||
using Server.Network;
|
||||
|
||||
namespace Server.Items;
|
||||
|
|
@ -159,9 +159,14 @@ public abstract partial class BaseTool : Item, IUsesRemaining, ICraftable
|
|||
{
|
||||
from.SendLocalizedMessage(num);
|
||||
}
|
||||
else if (T2ACraftSystem.Enabled)
|
||||
{
|
||||
from.Target = new T2ACraftToolTarget(this, system);
|
||||
from.SendAsciiMessage("Target this tool to make last item, or any other target to begin crafting.");
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendGump(new CraftGump(from, system, this, null));
|
||||
CraftItem.ShowCraftMenu(from, system, this, null);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue