Skip to content

Commit 5363939

Browse files
committed
remove alternate TradeUI
The only thing this did was making trade UI categories collapsible. However, due to constant updates by the game devs in this menu, it has repeatedly blocked/broken other features and led to negative user feedback, so it feels like it's time to retire this from the mod. It was originally hoped that this change would be implemented in the base game, but that never happened.
1 parent 85f4fc0 commit 5363939

File tree

4 files changed

+0
-1696
lines changed

4 files changed

+0
-1696
lines changed

Concepts/Options.cs

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public static class UI
2121
public static bool UseSpriteMenu => GetOption("QudUX_OptionCustomSpriteMenu").EqualsNoCase("Yes") || string.IsNullOrEmpty(GetOption("QudUX_OptionCustomSpriteMenu"));
2222
public static bool ViewItemValues => GetOption("QudUX_OptionValPerLbInInventory").EqualsNoCase("Yes") || string.IsNullOrEmpty(GetOption("QudUX_OptionValPerLbInInventory"));
2323
public static bool ViewInventoryTiles => GetOption("QudUX_OptionShowInventoryTiles").EqualsNoCase("Yes") || string.IsNullOrEmpty(GetOption("QudUX_OptionShowInventoryTiles"));
24-
public static bool CollapsibleTradeUI => GetOption("QudUX_OptionCollapseInTradeMenu").EqualsNoCase("Yes") || string.IsNullOrEmpty(GetOption("QudUX_OptionCollapseInTradeMenu"));
2524
public static bool AddConversationTiles => GetOption("QudUX_OptionTileConversationUI").EqualsNoCase("Yes") || string.IsNullOrEmpty(GetOption("QudUX_OptionTileConversationUI"));
2625
public static bool ShowAbilityDescriptions => GetOption("QudUX_OptionAbilityDescriptions").EqualsNoCase("Yes") || string.IsNullOrEmpty(GetOption("QudUX_OptionAbilityDescriptions"));
2726
public static bool EnableAutogetExclusions => GetOption("QudUX_OptionAutogetExclusions").EqualsNoCase("Yes") || string.IsNullOrEmpty(GetOption("QudUX_OptionAutogetExclusions"));

Harmony Patches/Patch_XRL_UI_TradeUI.cs

-29
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using XRL.World.Parts;
55
using GameOptions = XRL.UI.Options;
66
using QudUXOptions = QudUX.Concepts.Options;
7-
using QudUXTradeUI = XRL.UI.QudUX_DummyTradeNamespace.TradeUI;
87

98
namespace QudUX.HarmonyPatches
109
{
@@ -21,32 +20,4 @@ public static void Prefix(GameObject Trader)
2120
QudUX_ConversationHelper.SetTraderInteraction(Trader);
2221
}
2322
}
24-
25-
/// <summary>
26-
/// This patch is likely only temporary - it enables collapsible TradeUI sections. I have submitted this
27-
/// for inclusion in the base game, so if that happens, I'll remove this patch & feature from QudUX.
28-
/// </summary>
29-
[HarmonyPatch(typeof(TradeUI))]
30-
public static class Patch_XRL_UI_TradeUI_2
31-
{
32-
[HarmonyPrefix]
33-
[HarmonyPatch("ShowTradeScreen")]
34-
public static bool Prefix(GameObject Trader, float _costMultiple, TradeUI.TradeScreenMode screenMode)
35-
{
36-
if (GameOptions.OverlayPrereleaseTrade)
37-
{
38-
return true; //patch method not compatible with overlay trade UI
39-
}
40-
if (!QudUXOptions.UI.CollapsibleTradeUI)
41-
{
42-
return true; //user has disabled this feature
43-
}
44-
if (GameOptions.SifrahHaggling)
45-
{
46-
return true; //not currently compatible with chaos's sifrah haggling stuff (would require some work incorporate all of chaos's changes)
47-
}
48-
QudUXTradeUI.ShowTradeScreen(Trader, _costMultiple, (QudUXTradeUI.TradeScreenMode)screenMode);
49-
return false; //skip the original function
50-
}
51-
}
5223
}

Options.xml

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<option ID="QudUX_OptionValPerLbInInventory" DisplayText=" In revamped inventory, press {{W|.}} or {{W|0}} to show value per pound" Category="QudUX" Type="Checkbox" Default="Yes"></option>
1111
<option ID="QudUX_OptionUseCookMenus" DisplayText="Use revamped cooking menus (requires restart)" Category="QudUX" Type="Checkbox" Default="Yes"></option>
1212
<option ID="QudUX_OptionUseBuildLibrary" DisplayText="Use revamped build library text UI (requires restart)" Category="QudUX" Type="Checkbox" Default="Yes"></option>
13-
<option ID="QudUX_OptionCollapseInTradeMenu" DisplayText="Enable collapsible categories on the trade screen text UI" Category="QudUX" Type="Checkbox" Default="Yes"></option>
1413
<option ID="QudUX_OptionCustomSpriteMenu" DisplayText="Modify your sprite from character creation text UI (requires restart)" Category="QudUX" Type="Checkbox" Default="Yes"></option>
1514
<option ID="QudUX_OptionTileConversationUI" DisplayText="Show sprites in conversation screen text UI" Category="QudUX" Type="Checkbox" Default="Yes"></option>
1615
<option ID="QudUX_OptionAbilityDescriptions" DisplayText="Add descriptions and cooldown info to activated ability screen" Category="QudUX" Type="Checkbox" Default="Yes"></option>

0 commit comments

Comments
 (0)