From 83753d0c02ded2f63a5edd0c769fbfb789ca9a7c Mon Sep 17 00:00:00 2001 From: Jennifer Date: Fri, 7 Feb 2020 20:22:55 +0000 Subject: [PATCH] EMA Version: v8.3.0-Release-v2.4(0139) Game Version: 8.3.0 Release Date: 07/02/2020 ## Bank - Fixed a bug that would not put normal items in the bank ## information - Fixed Issue #96 --- CHANGELOG.txt | 14 ++++++++++++++ Modules/Bank.lua | 20 +++++++++++++++++++- Modules/Information.lua | 2 +- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3a83ef2..ce57592 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -2,6 +2,20 @@ ChangeLogs: --------------------------- +EMA Version: v8.3.0-Release-v2.4(0139) +Game Version: 8.3.0 +Release Date: 07/02/2020 + +## Bank + - Fixed a bug that would not put normal items in the bank + +## information + - Fixed Issue #96 + + + +--------------------------- + EMA Version: v8.3.0-Release-v2.4(0138) Game Version: 8.3.0 Release Date: 02/02/2020 diff --git a/Modules/Bank.lua b/Modules/Bank.lua index ab96764..89702a8 100644 --- a/Modules/Bank.lua +++ b/Modules/Bank.lua @@ -764,6 +764,18 @@ function EMA:BANKFRAME_CLOSED(event, ...) EMA.ShiftkeyDown = false end +function EMA:AmountInBank( itemLink ) + EMA:Print("test", itemLink ) + local countBags = GetItemCount( itemLink ) + local countTotal = GetItemCount( itemLink , true) + local countBank = countTotal - countBags + EMA:Print("test2", countBags, countTotal, countBank ) + + return countBank + + +end + function EMA:AddAllToBank() --EMA:Print("run") for bagID = 0, NUM_BAG_SLOTS do @@ -780,6 +792,7 @@ function EMA:AddAllToBank() local isBop = C_Item.IsBound( location ) local itemRarity = C_Item.GetItemQuality( location ) local _,_,_,_,_,_,_, itemStackCount,_,_,_,_,_,_,_,_,isCraftingReagent = GetItemInfo( bagItemLink ) + --local countBank = EMA:AmountInBank( itemLink ) --EMA:Print("I have", itemLink, countBank, "inMyBank") if EMA.db.BankBoEItems == true then if itemType ~= 0 then @@ -821,7 +834,12 @@ function EMA:AddAllToBank() if canSend == true then PickupContainerItem( bagID, slotID ) - UseContainerItem( bagID , slotID, nil, true ) + --EMA:Print("test", isCraftingReagent ) + if isCraftingReagent == true then + UseContainerItem( bagID , slotID, nil, true ) + else + UseContainerItem( bagID , slotID ) + end end end end diff --git a/Modules/Information.lua b/Modules/Information.lua index 6bb7a78..1806203 100644 --- a/Modules/Information.lua +++ b/Modules/Information.lua @@ -1665,7 +1665,7 @@ function EMA:DoShowToonsCurrency( characterName, currencyValues ) -- Update width of currency list. EMA:CurrencyListSetColumnWidth() EMAToonCurrencyListFrame:Show() - EMAToonCurrencyListFrameTwo:Show() + --EMAToonCurrencyListFrameTwo:Show() end -- A EMA command has been received. -- 1.7.9.5