From 36c9dc2aaabc6ddee57f119b499ab085f9b0f40f Mon Sep 17 00:00:00 2001 From: chairmanpow Date: Sun, 4 Oct 2026 16:08:45 +0100 Subject: [PATCH] ui: load TurtleWoW's Custom_Merchant frame, so the armoury's PvP gear opens instead of the trigger text --- crates/benilla-app/assets/ui/benilla.toc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crates/benilla-app/assets/ui/benilla.toc b/crates/benilla-app/assets/ui/benilla.toc index 7046a34a..d7b096e6 100644 --- a/crates/benilla-app/assets/ui/benilla.toc +++ b/crates/benilla-app/assets/ui/benilla.toc @@ -186,6 +186,12 @@ Interface\FrameXML\Turtle_TransmogUI\Turtle_TransmogUITemplates.xml Interface\FrameXML\Turtle_TransmogUI\Turtle_TransmogUI.xml Interface\FrameXML\Turtle_ShopUI\Turtle_ShopUITemplates.xml Interface\FrameXML\Turtle_ShopUI\Turtle_ShopUI.xml +# Turtle's honour/arena merchant (Stormwind armoury PvP gear, the Custom_Merchant NPCs): it hooks +# `GOSSIP_SHOW`, hides the gossip frame for an NPC whose greeting is `CUSTOM_MERCHANT_TRIGGER` and +# fills over `TW_Merchant` addon messages. Without it that trigger text is what the stock gossip +# window shows. The `.xml` scripts its own `.lua`, and it inherits SmallAlterateCurrencyFrameTemplate +# (MoneyFrame.xml) and uses `json` (json.lua above), both already on the chain. +Interface\FrameXML\Custom_Merchant\CustomMerchantFrame.xml # Ours: the `/errors` script error log and our slash commands. ScriptLogFrame.xml Interface\FrameXML\HelpFrame.xml