From 50129bd92243c855390686c91451f78dfdfeb69e Mon Sep 17 00:00:00 2001 From: Cinecom <42314202+Cinecom@users.noreply.github.com> Date: Fri, 27 Dec 2024 13:38:28 +0100 Subject: [PATCH] Update 2.0.1 - Fixed a compatibility issue with Onebag - Added some food buffs to the item list --- ConsumesManager.toc | 2 +- Itemlist.lua | 4 +++- Main.lua | 24 +++++++++++++++++++++--- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ConsumesManager.toc b/ConsumesManager.toc index 568e3b3..cacff87 100644 --- a/ConsumesManager.toc +++ b/ConsumesManager.toc @@ -2,7 +2,7 @@ ## Title: |cff00ff00Consumes Manager|r |cff808080[Horyoshi]|r ## Notes: Easily track and manage your consumables, food buffs, and more across your inventory, bank, and mail, while supporting multiple characters and accounts. ## Author: Horyoshi -## Version: 2.0 +## Version: 2.0.1 ## SavedVariables: ConsumesManager_Options, ConsumesManager_SelectedItems, ConsumesManager_Data libs\LibStub\LibStub.lua diff --git a/Itemlist.lua b/Itemlist.lua index 2797aa3..4080028 100644 --- a/Itemlist.lua +++ b/Itemlist.lua @@ -73,7 +73,6 @@ consumablesCategories = { { id = 20004, name = "Major Troll's Blood Potion", mats = {"1x Gromsblood", "2x Plaguebloom", "1x Crystal Vial"}, texture = "Interface\\Icons\\inv_potion_80", description = "Regenerate 20 health every 5 sec for 1 hour." }, { id = 14530, name = "Heavy Runecloth Bandage", mats = {"2x Runecloth"}, texture = "Interface\\Icons\\inv_misc_bandage_12", description = "Heals 2000 damage over 8 sec." }, { id = 13180, name = "Stratholme Holy Water", mats = {"Looted from Crates in Stratholme"}, texture = "Interface\\Icons\\inv_potion_75", description = "Inflicts between 438 and 562 damage to Undead in a 10 yard radius." } - }, ["Food Buffs"] = { { id = 21023, name = "Dirge's Kickin' Chimaerok Chops", mats = {"1x Hot Spices", "1x Goblin Rocket Fuel", "1x Deeprock Salt", "1x Chimaerok Tenderloin"}, texture = "Interface\\Icons\\INV_Misc_Food_65", description = "Increases Strength by 25 for 1 hour." }, @@ -91,6 +90,9 @@ consumablesCategories = { { id = 60976, name = "Danonzo's Tel'Abim Surprise", mats = {"1x Gargantuan Tel'Abim Banana", "1x Soothing Spices", "1x Heart of the Wild"}, texture = "Interface\\Icons\\INV_Misc_Food_09", description = "Gain 45 Ranged Attack Power for 15 minutes." }, { id = 84041, name = "Gilneas Hot Stew", mats = {"1x Red Wolf Meat", "1x White Spider Meat", "1x Refreshing Spring Water"}, texture = "Interface\\Icons\\inv_drink_19", description = "Gain 12 spell damage for 15 minutes." }, { id = 21217, name = "Sagefish Delight", mats = {"1x Raw Greater Sagefish", "1x Hot Spices"}, texture = "Interface\\Icons\\inv_misc_fish_21", description = "Gain 6 mana every 5 seconds for 15 minutes." } + { id = 18045, name = "Tender Wolf Steak", mats = {"1x Tender Wolf Meat", "1x Soothing Spices"}, texture = "Interface\\Icons\\inv_misc_food_47", description = "Gain 12 stamina and spirit for 15 minutes." } + { id = 13935, name = "Baked Salmon", mats = {"1x Raw Whitescale Salmon", "1x Soothing Spices"}, texture = "Interface\\Icons\\inv_misc_fish_20", description = "Gain 14 stamina and spirit for 15 minutes." } + { id = 13933, name = "Lobster Stew", mats = {"1x Darkclaw Lobster", "1x Refreshing Spring Water"}, texture = "Interface\\Icons\\inv_drink_17", description = "Gain 14 stamina and spirit for 15 minutes." } }, ["Special Buffs"] = { { id = 12451, name = "Juju Power", mats = {"Quest: 3x Winterfall E'ko (Kill Furbolgs)"}, texture = "Interface\\Icons\\INV_Misc_MonsterScales_11", description = "Increases Strength by 30 for 30 minutes." }, diff --git a/Main.lua b/Main.lua index 765c93e..05034de 100644 --- a/Main.lua +++ b/Main.lua @@ -5,11 +5,13 @@ self:RegisterForDrag("LeftButton") self:SetScript("OnDragStart", function() ConsumesManager_OnDragStart(self) end) self:SetScript("OnDragStop", function() ConsumesManager_OnDragStop(self) end) + self:SetScript("OnClick", ConsumesManager_HandleClick) end function ConsumesManager_HandleClick(self, button) - if not self then return end + -- Only respond to left-clicks without the Shift key pressed if button == "LeftButton" and not IsShiftKeyDown() then + -- Toggle the visibility of the main frame if ConsumesManager_MainFrame and ConsumesManager_MainFrame:IsShown() then ConsumesManager_MainFrame:Hide() else @@ -392,8 +394,10 @@ function ConsumesManager_ShowMainWindow() ConsumesManager_CreateMainWindow() end ConsumesManager_MainFrame:Show() + -- Scan inventory when the window is opened ConsumesManager_ScanPlayerInventory() + -- Only scan bank and mail if they are open if BankFrame and BankFrame:IsShown() then ConsumesManager_ScanPlayerBank() @@ -401,17 +405,24 @@ function ConsumesManager_ShowMainWindow() if MailFrame and MailFrame:IsShown() then ConsumesManager_ScanPlayerMail() end + -- Update the tabs based on whether bank and mail have been scanned ConsumesManager_UpdateTabStates() + -- Update the Manager content ConsumesManager_UpdateManagerContent() + -- Update the Presets content ConsumesManager_UpdatePresetsConsumables() + + -- Update Settings content ConsumesManager_UpdateSettingsContent() - ConsumesManager_UpdateManagerContent() + + -- Removed duplicate call to ConsumesManager_UpdateManagerContent() end + function ConsumesManager_ShowTab(tabIndex) if not ConsumesManager_MainFrame or not ConsumesManager_MainFrame.tabs then return end @@ -3483,7 +3494,14 @@ function ConsumesManager_ScanPlayerInventory() end function ConsumesManager_ScanPlayerBank() - if not BankFrame or not BankFrame:IsShown() then + local isBankOpen = false + if BankFrame and BankFrame:IsShown() then + isBankOpen = true + elseif _G["BBankFrame"] and _G["BBankFrame"]:IsShown() then + isBankOpen = true + end + + if not isBankOpen then return end