From e1b9474ff0f3a402b5a9244fc6ebadfbf14fca5c Mon Sep 17 00:00:00 2001 From: urnati Date: Mon, 12 Dec 2022 10:34:23 -0500 Subject: [PATCH] - TitanBag - Made 'open bags' (left click) an option (default off) until container taint resolved. - TitanGold - Fan fix for total being reset in certain situations. - TitnaRepair - Removed unused tool tip code from old API. - TitanPanel - Fix for some LDB addons not being updating properly. --- Titan/TitanPanel.lua | 5 +++-- TitanBag/TitanBag.lua | 42 ++++++++++++++++++++++++++++++++++++++++-- TitanGold/TitanGold.lua | 2 ++ TitanRepair/TitanRepair.lua | 9 +-------- 4 files changed, 46 insertions(+), 12 deletions(-) diff --git a/Titan/TitanPanel.lua b/Titan/TitanPanel.lua index fa9fc25..87f784e 100644 --- a/Titan/TitanPanel.lua +++ b/Titan/TitanPanel.lua @@ -308,8 +308,7 @@ NOTE: --]] function TitanPanel_PlayerEnteringWorld() if Titan__InitializedPEW then - -- Also sync the LDB object with the Tian plugin - TitanLDBRefreshButton() + -- Currently no additional steps needed else -- Get Profile and Saved Vars TitanVariables_InitTitanSettings(); @@ -405,6 +404,8 @@ function TitanPanel_PlayerEnteringWorld() -- Move frames TitanMovable_SecureFrames() + -- Also sync LDB object text with their created Titan plugin + TitanLDBRefreshButton() end -------------------------------------------------------------- diff --git a/TitanBag/TitanBag.lua b/TitanBag/TitanBag.lua index 99467a9..9a60363 100644 --- a/TitanBag/TitanBag.lua +++ b/TitanBag/TitanBag.lua @@ -125,6 +125,7 @@ function TitanPanelBagButton_OnLoad(self) ShowLabelText = 1, ShowColoredText = 1, DisplayOnRightSide = false, + OpenBags = false, } }; @@ -155,6 +156,22 @@ function TitanPanelBagButton_OnUpdate(self) self:SetScript("OnUpdate", nil) end +local function ToggleBags() + + if TitanGetVar(TITAN_BAG_ID, "OpenBags") then + TitanPrint("" + .." "..tostring("Feature :").."" + .." "..tostring(OPENING or "Opening of").."" + .." "..tostring(INVTYPE_BAG or "Bags").."" + .." "..tostring(ADDON_DISABLED or "Disabled").."" + .." "..tostring("Until taint is fixed or work around found.").."" + , "warning") + else + -- nop + end + +end + --[[ plugin -- ************************************************************************** -- NAME : TitanPanelBagButton_OnClick(button) @@ -164,7 +181,11 @@ end --]] function TitanPanelBagButton_OnClick(self, button) if (button == "LeftButton") then - ToggleAllBags(); + if TitanGetVar(TITAN_BAG_ID, "OpenBags") then + ToggleBags(); + else + -- nop + end end end @@ -426,7 +447,14 @@ function TitanPanelBagButton_GetTooltipText() end returnstring = returnstring.."\n"; end - return returnstring..TitanUtils_GetGreenText(L["TITAN_BAG_TOOLTIP_HINTS"]); + + -- Add Hint + if TitanGetVar(TITAN_BAG_ID, "OpenBags") then + returnstring = returnstring..TitanUtils_GetGreenText(L["TITAN_BAG_TOOLTIP_HINTS"]) + else + -- nop + end + return returnstring end --[[ plugin @@ -459,6 +487,16 @@ function TitanPanelRightClickMenu_PrepareBagMenu() info.func = TitanPanelBagButton_ShowDetailedInfo; info.checked = TitanGetVar(TITAN_BAG_ID, "ShowDetailedInfo"); TitanPanelRightClickMenu_AddButton(info, TitanPanelRightClickMenu_GetDropdownLevel()); + + info = {}; + info.text = (LEFT_BUTTON_STRING or "Left Click") + .." "..(OPENING or "to Open") + .." "..(INVTYPE_BAG or "Bags") + info.func = function() + TitanToggleVar(TITAN_BAG_ID, "OpenBags") + end + info.checked = TitanGetVar(TITAN_BAG_ID, "OpenBags"); + TitanPanelRightClickMenu_AddButton(info, TitanPanelRightClickMenu_GetDropdownLevel()); end return end diff --git a/TitanGold/TitanGold.lua b/TitanGold/TitanGold.lua index 2316045..b78e95d 100644 --- a/TitanGold/TitanGold.lua +++ b/TitanGold/TitanGold.lua @@ -589,6 +589,8 @@ local function ToonAdd(show, amount, total) if show then new_total = total + amount + else + new_total = total end return new_total diff --git a/TitanRepair/TitanRepair.lua b/TitanRepair/TitanRepair.lua index efa431a..e010247 100644 --- a/TitanRepair/TitanRepair.lua +++ b/TitanRepair/TitanRepair.lua @@ -20,7 +20,6 @@ TR.ITEM_STATUS = {}; TR.ITEM_BAG = {}; -- locals -local tool_tip = nil TR.repair_total = 0 TR.dur_total = 0 @@ -192,7 +191,6 @@ local function Scan(reason, force) -- scan bags for 'damaged' items debug_msg("Bags scan Start - ShowInventory") - tool_tip:SetOwner(UIParent, "ANCHOR_NONE") for bag = 0, 4 do for slot = 1, C_Container.GetContainerNumSlots(bag) do local repairCost = 0 @@ -213,7 +211,6 @@ local function Scan(reason, force) end end end - tool_tip:Hide(); TR.repair_bags.dur = (TR.repair_bags.max > 0 and floor(TR.repair_bags.cur / TR.repair_bags.max * 100)) or 100 dmsg = "Bags scan End " .." "..tostring(TR.repair_bags.dur) @@ -1062,11 +1059,7 @@ local function Create_Frames() window:SetScript("OnHide", function(self, button) RepairHide(self) end) - - - -- Tooltip frame - tool_tip = CreateFrame("GameTooltip", TITAN_TOOLTIP, f, "GameTooltipTemplate") -end + end -- Create needed Repair plugin frames here on load rather than in XML. Create_Frames() -- 1.7.9.5