From 143e1ec050be3f64f901074abb59e95424fb6cf3 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Fri, 27 Mar 2020 08:25:35 +0000 Subject: [PATCH] v1.13.2-Release-v0.6(121025) --- Core/Communications-Classic.lua | 2 +- Core/Core-Classic.lua | 2 +- Core/Message-Classic.lua | 2 +- Core/Module-Classic.lua | 2 +- Core/Tag-Classic.lua | 2 +- Core/Team-Classic.lua | 2 +- GUI/AceGUIContainer-EMATreeGroup.lua | 2 +- GUI/AceGUIContainer-EMAWindow.lua | 2 +- GUI/AceGUIWidget-EMAContinueLabel.lua | 2 +- GUI/AceGUIWidget-EMANormalLabel.lua | 2 +- GUI/EMAHelperSettings.lua | 2 +- Locales/Classic-Core-Locale-deDE.lua | 4 +- Locales/Classic-Core-Locale-enUS.lua | 18 ++- Locales/Locales.xml | 2 +- Media/BankIcon.tga | Bin 0 -> 13299 bytes Modules/Bank-Classic.lua | 270 +++++++++++++++++---------------- Modules/DisplayTeam-Classic.lua | 2 +- Modules/Follow-Classic.lua | 2 +- Modules/ISBoxer-Classic.lua | 2 +- Modules/Information-Classic.lua | 2 +- Modules/Interaction-Classic.lua | 2 +- Modules/ItemUse-Classic.lua | 2 +- Modules/LDBBar.lua | 2 +- Modules/Mail-Classic.lua | 2 +- Modules/Modules-Classic.xml | 8 +- Modules/Purchase-Classic.lua | 2 +- Modules/Quest-Classic.lua | 2 +- Modules/QuestWatcher-Classic.lua | 2 +- Modules/Sell-Classic.lua | 2 +- Modules/Sync-Classic.lua | 2 +- Modules/Talk-Classic.lua | 2 +- Modules/Toon-Classic.lua | 2 +- Modules/Trade-Classic.lua | 2 +- 33 files changed, 190 insertions(+), 166 deletions(-) create mode 100644 Media/BankIcon.tga diff --git a/Core/Communications-Classic.lua b/Core/Communications-Classic.lua index d271993..c355936 100644 --- a/Core/Communications-Classic.lua +++ b/Core/Communications-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Core/Core-Classic.lua b/Core/Core-Classic.lua index 742a746..755e8f5 100644 --- a/Core/Core-Classic.lua +++ b/Core/Core-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Core/Message-Classic.lua b/Core/Message-Classic.lua index 912c657..b089f10 100644 --- a/Core/Message-Classic.lua +++ b/Core/Message-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Core/Module-Classic.lua b/Core/Module-Classic.lua index 54dfb70..3edcac6 100644 --- a/Core/Module-Classic.lua +++ b/Core/Module-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Core/Tag-Classic.lua b/Core/Tag-Classic.lua index 940fff5..b985334 100644 --- a/Core/Tag-Classic.lua +++ b/Core/Tag-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Core/Team-Classic.lua b/Core/Team-Classic.lua index 79cd99f..f46f8cc 100644 --- a/Core/Team-Classic.lua +++ b/Core/Team-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/GUI/AceGUIContainer-EMATreeGroup.lua b/GUI/AceGUIContainer-EMATreeGroup.lua index 3923807..5aeeff6 100644 --- a/GUI/AceGUIContainer-EMATreeGroup.lua +++ b/GUI/AceGUIContainer-EMATreeGroup.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/GUI/AceGUIContainer-EMAWindow.lua b/GUI/AceGUIContainer-EMAWindow.lua index 2a78275..feca9b6 100644 --- a/GUI/AceGUIContainer-EMAWindow.lua +++ b/GUI/AceGUIContainer-EMAWindow.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/GUI/AceGUIWidget-EMAContinueLabel.lua b/GUI/AceGUIWidget-EMAContinueLabel.lua index 1c38461..c8edb63 100644 --- a/GUI/AceGUIWidget-EMAContinueLabel.lua +++ b/GUI/AceGUIWidget-EMAContinueLabel.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/GUI/AceGUIWidget-EMANormalLabel.lua b/GUI/AceGUIWidget-EMANormalLabel.lua index e18be20..c88d1dd 100644 --- a/GUI/AceGUIWidget-EMANormalLabel.lua +++ b/GUI/AceGUIWidget-EMANormalLabel.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/GUI/EMAHelperSettings.lua b/GUI/EMAHelperSettings.lua index 4c56e02..36731db 100644 --- a/GUI/EMAHelperSettings.lua +++ b/GUI/EMAHelperSettings.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Locales/Classic-Core-Locale-deDE.lua b/Locales/Classic-Core-Locale-deDE.lua index 7ec287b..5171671 100644 --- a/Locales/Classic-Core-Locale-deDE.lua +++ b/Locales/Classic-Core-Locale-deDE.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- @@ -164,7 +164,7 @@ L["ISB"] = "http://IsBoxer.com" L["TEMP_WEBSITE1"] = "" L["TEMP_WEBSITE2"] = "" L["TEMP_WEBSITE3"] = "" -L["COPYRIGHT"] = "Copyright (c) 2015-2018 Jennifer Cally" +L["COPYRIGHT"] = "Copyright (c) 2018-2020 Jennifer Cally" L["COPYRIGHTTWO"] = "Released Under License: The MIT License" L["FRAME_RESET"] = "Frame Reset" -- Msg 8000 diff --git a/Locales/Classic-Core-Locale-enUS.lua b/Locales/Classic-Core-Locale-enUS.lua index 482214e..de280f5 100644 --- a/Locales/Classic-Core-Locale-enUS.lua +++ b/Locales/Classic-Core-Locale-enUS.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- @@ -172,7 +172,7 @@ L["ISB"] = "" L["TEMP_WEBSITE1"] = "" L["TEMP_WEBSITE2"] = "" L["TEMP_WEBSITE3"] = "" -L["COPYRIGHT"] = "Copyright (c) 2015-2019 Jennifer Cally" +L["COPYRIGHT"] = "Copyright (c) 2018-2020 Jennifer Cally" L["COPYRIGHTTWO"] = "Released Under License: All Rights Reserved unless otherwise explicitly stated" L["FRAME_RESET"] = "Frame Reset" -- Msg 8000 @@ -964,14 +964,18 @@ L["SENT_AUTO_MAILER_GOLD"] = function( gold ) return string.format("EMA Auto Gold Mailer: %s", gold ) end - ----------------------- -- Bank Locale L["BANK"] = "Bank" -L["REMOVE_BANK_LIST"] = "Remove Item From Bank List" - - - +L["REMOVE_BANK_LIST"] = "Are You Sure You Wish To Remove The Selected Item From The Bank Items List?" +L["BANK_LIST_HEADER"] = "Bank Items List" +L["BANK_LIST"] = "Put The Items In The Bank" +L["BANK_LIST_HELP"] = "Automatically Put Listed Items Below In The Bank" +L["BANK_BOE_ITEMS"] = "Places All BoE Items In The Bank" +L["BANK_BOE_ITEMS_HELP"] = "Places All Binds When Equipped Items In The Bank" +L["BANK_REAGENTS"] = "Places All Reagents In Bank" +L["BANK_REAGENTS_HELP"] = "Places All Crafting Reagents Items In The Bank" +L["BANK_OPTIONS"] = "Extra Bank Options" ----------------------- -- LDBBar Locale diff --git a/Locales/Locales.xml b/Locales/Locales.xml index f44003f..5f1f6e4 100644 --- a/Locales/Locales.xml +++ b/Locales/Locales.xml @@ -2,7 +2,7 @@ Jamba EE - ( The Awesome MultiBoxing Assistant Ebony's Edition ) Current Author: Jennifer Cally (Ebony) - License: All Rights Reserved 2018-2019 Jennifer Cally + License: All Rights Reserved 2018-2020 Jennifer Cally --> diff --git a/Media/BankIcon.tga b/Media/BankIcon.tga new file mode 100644 index 0000000000000000000000000000000000000000..cd939c709730363af2aeb113d49b3d4a4a0aa1cf GIT binary patch literal 13299 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 literal 0 HcmV?d00001 diff --git a/Modules/Bank-Classic.lua b/Modules/Bank-Classic.lua index 35ee266..c8f239d 100644 --- a/Modules/Bank-Classic.lua +++ b/Modules/Bank-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- @@ -41,20 +41,27 @@ EMA.moduleOrder = 20 -- Settings - the values to store and their defaults for the settings database. EMA.settings = { + global = { + ['**'] = { + autoBankItemsListGlobal = {}, + }, + }, profile = { messageArea = EMAApi.DefaultMessageArea(), showEMABankWindow = false, + globalBankList = false, blackListItem = false, BankBoEItems = false, - autoBankToonNameBoE = "", +-- autoBankToonNameBoE = "", BankTagName = EMAApi.AllGroup(), autoBoEItemTag = EMAApi.AllGroup(), BankCRItems = false, - autoBankToonNameCR = "", +-- autoBankToonNameCR = "", autoCRItemTag = EMAApi.AllGroup(), autoBankItemsList = {}, - adjustMoneyWithBankBank = false, - goldAmountToKeepOnToon = 250, +-- autoBankItemsAmount = "", +-- adjustMoneyWithBankBank = false, +-- goldAmountToKeepOnToon = 250, }, } @@ -127,7 +134,8 @@ function EMA:OnInitialize() -- Initialise the popup dialogs. InitializePopupDialogs() EMA.autoBankItemLink = nil - EMA.autoBankToonName = nil +-- EMA.autoBankToonName = nil +-- EMA.autoBankItemsAmount = nil EMA.BankItemTable = {} EMA.ShiftkeyDown = false --EMA.putItemsInGB = {} @@ -197,17 +205,26 @@ function EMA:SettingsCreateBank( top ) -- A blank to get layout to show right? EMAHelperSettings:CreateHeading( EMA.settingsControl, L[""], movingTop, false ) movingTop = movingTop - headingHeight - EMAHelperSettings:CreateHeading( EMA.settingsControl, L["Bank_LIST_HEADER"], movingTop, false ) + EMAHelperSettings:CreateHeading( EMA.settingsControl, L["BANK_LIST_HEADER"], movingTop, false ) movingTop = movingTop - headingHeight EMA.settingsControl.checkBoxShowEMABankWindow = EMAHelperSettings:CreateCheckBox( EMA.settingsControl, - headingWidth, - left2, + halfWidth, + left, movingTop, - L["Bank_LIST"], + L["BANK_LIST"], EMA.SettingsToggleShowEMABankWindow, - L["Bank_LIST_HELP"] + L["BANK_LIST_HELP"] ) + EMA.settingsControl.checkBoxGlobalBankList = EMAHelperSettings:CreateCheckBox( + EMA.settingsControl, + halfWidth, + left3, + movingTop, + L["GLOBAL_LIST"], + EMA.SettingsToggleGlobalBankList, + L["GLOBAL_SETTINGS_LIST_HELP"] + ) movingTop = movingTop - checkBoxHeight EMA.settingsControl.BankItemsHighlightRow = 1 EMA.settingsControl.BankItemsOffset = 1 @@ -269,15 +286,16 @@ function EMA:SettingsCreateBank( top ) EMA.SettingsToggleBlackListItem, L["BLACKLIST_ITEM_HELP"] ) - - EMA.settingsControl.tabNumListDropDownList = EMAHelperSettings:CreateEditBox( +--[[ + EMA.settingsControl.autoBankItemsAmount = EMAHelperSettings:CreateEditBox( EMA.settingsControl, thirdWidth, left2, movingTop, - L["BankTOON"] - ) - EMA.settingsControl.tabNumListDropDownList:SetCallback( "OnEnterPressed", EMA.EditBankToonName ) + L["AMOUNT"] + ) + EMA.settingsControl.autoBankItemsAmount:SetCallback( "OnEnterPressed", EMA.EditBankItemsAmount ) +]] --Group EMA.settingsControl.BankItemsEditBoxBankTag = EMAHelperSettings:CreateDropdown( EMA.settingsControl, @@ -298,7 +316,7 @@ function EMA:SettingsCreateBank( top ) EMA.SettingsBankItemsAddClick ) movingTop = movingTop - buttonHeight - EMAHelperSettings:CreateHeading( EMA.settingsControl, L["Bank_OPTIONS"], movingTop, false ) + EMAHelperSettings:CreateHeading( EMA.settingsControl, L["BANK_OPTIONS"], movingTop, false ) movingTop = movingTop - editBoxHeight - 3 EMA.settingsControl.checkBoxBankBoEItems = EMAHelperSettings:CreateCheckBox( @@ -306,18 +324,20 @@ function EMA:SettingsCreateBank( top ) thirdWidth, left, movingTop + movingTopEdit, - L["Bank_BOE_ITEMS"], + L["BANK_BOE_ITEMS"], EMA.SettingsToggleBankBoEItems, - L["Bank_BOE_ITEMS_HELP"] + L["BANK_BOE_ITEMS_HELP"] ) +--[[ EMA.settingsControl.tabNumListDropDownListBoE = EMAHelperSettings:CreateEditBox( EMA.settingsControl, thirdWidth, left2, movingTop, L["BankTOON"] - ) + ) EMA.settingsControl.tabNumListDropDownListBoE:SetCallback( "OnEnterPressed", EMA.EditBankToonNameBoE ) +--]] EMA.settingsControl.BankTradeBoEItemsTagBoE = EMAHelperSettings:CreateDropdown( EMA.settingsControl, thirdWidth, @@ -334,10 +354,11 @@ function EMA:SettingsCreateBank( top ) thirdWidth, left, movingTop + movingTopEdit, - L["Bank_REAGENTS"], + L["BANK_REAGENTS"], EMA.SettingsToggleBankCRItems, - L["Bank_REAGENTS_HELP"] + L["BANK_REAGENTS_HELP"] ) +--[[ EMA.settingsControl.tabNumListDropDownListCR = EMAHelperSettings:CreateEditBox( EMA.settingsControl, thirdWidth, @@ -345,7 +366,9 @@ function EMA:SettingsCreateBank( top ) movingTop, L["BankTOON"] ) + EMA.settingsControl.tabNumListDropDownListCR:SetCallback( "OnEnterPressed", EMA.EditBankToonNameCR ) +]] EMA.settingsControl.BankTradeCRItemsTagCR = EMAHelperSettings:CreateDropdown( EMA.settingsControl, thirdWidth, @@ -358,7 +381,7 @@ function EMA:SettingsCreateBank( top ) movingTop = movingTop - editBoxHeight movingTop = movingTop - editBoxHeight - +--[[ EMA.settingsControl.labelComingSoon = EMAHelperSettings:CreateContinueLabel( EMA.settingsControl, headingWidth, @@ -366,7 +389,6 @@ function EMA:SettingsCreateBank( top ) movingTop, L["Bank_GOLD_COMING_SOON"] ) ---[[ EMA.settingsControl.checkBoxAdjustMoneyOnToonViaBankBank = EMAHelperSettings:CreateCheckBox( EMA.settingsControl, headingWidth, @@ -435,7 +457,7 @@ function EMA:SettingsScrollRefresh() blackListText = L["ITEM_ON_BLACKLIST"] end EMA.settingsControl.BankItems.rows[iterateDisplayRows].columns[1].textString:SetText( BankItemsInformation.name ) - EMA.settingsControl.BankItems.rows[iterateDisplayRows].columns[2].textString:SetText( BankItemsInformation.GBTab ) + EMA.settingsControl.BankItems.rows[iterateDisplayRows].columns[2].textString:SetText( BankItemsInformation.amount ) EMA.settingsControl.BankItems.rows[iterateDisplayRows].columns[3].textString:SetText( BankItemsInformation.tag ) EMA.settingsControl.BankItems.rows[iterateDisplayRows].columns[4].textString:SetText( blackListText ) -- Highlight the selected row. @@ -454,17 +476,22 @@ function EMA:SettingsBankItemsRowClick( rowNumber, columnNumber ) end function EMA:SettingsBankItemsRemoveClick( event ) - StaticPopup_Show( "EMABank_CONFIRM_REMOVE_Bank_ITEMS" ) + StaticPopup_Show( "EMABANK_CONFIRM_REMOVE_BANK_ITEMS" ) end +function EMA:SettingsToggleGlobalBankList( event, checked ) + EMA.db.globalBankList = checked + EMA:SettingsRefresh() +end + function EMA:SettingsEditBoxChangedBankItem( event, text ) EMA.autoBankItemLink = text EMA:SettingsRefresh() end function EMA:SettingsBankItemsAddClick( event ) - if EMA.autoBankItemLink ~= nil and EMA.autoBankToonName ~= nil and EMA.db.BankTagName ~= nil then - EMA:AddItem( EMA.autoBankItemLink, EMA.autoBankToonName, EMA.db.BankTagName, EMA.db.blackListItem ) + if EMA.autoBankItemLink ~= nil and EMA.db.BankTagName ~= nil then + EMA:AddItem( EMA.autoBankItemLink, EMA.db.BankTagName, EMA.db.blackListItem ) EMA.autoBankItemLink = nil EMA:SettingsRefresh() end @@ -490,12 +517,12 @@ function EMA:SettingsToggleBlackListItem( event, checked ) end -function EMA:EditBankToonName (event, value ) +function EMA:EditBankItemsAmount (event, value ) -- if nil or the blank group then don't get Name. if value == " " or value == nil then return end - EMA.autoBankToonName = value + EMA.autoBankItemsAmount = value EMA:SettingsRefresh() end @@ -504,16 +531,16 @@ function EMA:SettingsToggleBankBoEItems(event, checked ) EMA:SettingsRefresh() end - +--[[ function EMA:EditBankToonNameBoE (event, value ) -- if nil or the blank group then don't get Name. if value == " " or value == nil then return end - EMA.db.autoBankToonNameBoE = value +-- EMA.db.autoBankToonNameBoE = value EMA:SettingsRefresh() end - +]] function EMA:GroupListDropDownListBoE (event, value ) -- if nil or the blank group then don't get Name. if value == " " or value == nil then @@ -533,7 +560,7 @@ function EMA:SettingsToggleBankCRItems(event, checked ) EMA.db.BankCRItems = checked EMA:SettingsRefresh() end - +--[[ function EMA:EditBankToonNameCR (event, value ) -- if nil or the blank group then don't get Name. if value == " " or value == nil then @@ -542,7 +569,7 @@ function EMA:EditBankToonNameCR (event, value ) EMA.db.autoBankToonNameCR = value EMA:SettingsRefresh() end - +]] function EMA:GroupListDropDownListCR (event, value ) -- if nil or the blank group then don't get Name. if value == " " or value == nil then @@ -576,7 +603,7 @@ function EMA:SettingsToggleShowEMABankWindow( event, checked ) EMA.db.showEMABankWindow = checked EMA:SettingsRefresh() end - +--[[ function EMA:SettingsToggleAdjustMoneyOnToonViaBankBank( event, checked ) EMA.db.adjustMoneyWithBankBank = checked EMA:SettingsRefresh() @@ -594,19 +621,21 @@ function EMA:EditBoxChangedGoldAmountToLeaveOnToon( event, text ) end EMA:SettingsRefresh() end - +]] -- Settings received. function EMA:EMAOnSettingsReceived( characterName, settings ) if characterName ~= EMA.characterName then -- Update the settings. EMA.db.messageArea = settings.messageArea + EMA.db.globalBankdList = settings.globalBankList EMA.db.showEMABankWindow = settings.showEMABankWindow EMA.db.BankTagName = settings.BankTagName EMA.db.BankBoEItems = settings.BankBoEItems - EMA.db.autoBankToonNameBoE = settings.autoBankToonNameBoE +-- EMA.db.autoBankItemsAmount = settings.autoBankItemsAmount +-- EMA.db.autoBankToonNameBoE = settings.autoBankToonNameBoE EMA.db.autoBoEItemTag = settings.autoBoEItemTag EMA.db.BankCRItems = settings.BankCRItems - EMA.db.autoBankToonNameCR = settings.autoBankToonNameCR +-- EMA.db.autoBankToonNameCR = settings.autoBankToonNameCR EMA.db.autoCRItemTag = settings.autoCRItemTag EMA.db.autoBankItemsList = EMAUtilities:CopyTable( settings.autoBankItemsList ) EMA.db.adjustMoneyWithBankBank = settings.adjustMoneyWithBankBank @@ -627,13 +656,16 @@ end function EMA:SettingsRefresh() EMA.settingsControl.checkBoxShowEMABankWindow:SetValue( EMA.db.showEMABankWindow ) + EMA.settingsControl.checkBoxGlobalBankList:SetValue( EMA.db.globalBankList ) + EMA.settingsControl.checkBoxGlobalBankList:SetDisabled( not EMA.db.showEMABankWindow ) EMA.settingsControl.BankItemsEditBoxBankTag:SetText( EMA.db.BankTagName ) EMA.settingsControl.listCheckBoxBoxOtherBlackListItem:SetValue( EMA.db.blackListItem ) +-- EMA.settingsControl.autoBankItemsAmount:SetText( EMA.db.autoBankItemsAmount ) EMA.settingsControl.checkBoxBankBoEItems:SetValue( EMA.db.BankBoEItems ) - EMA.settingsControl.tabNumListDropDownListBoE:SetText( EMA.db.autoBankToonNameBoE ) +-- EMA.settingsControl.tabNumListDropDownListBoE:SetText( EMA.db.autoBankToonNameBoE ) EMA.settingsControl.BankTradeBoEItemsTagBoE:SetText( EMA.db.autoBoEItemTag ) EMA.settingsControl.checkBoxBankCRItems:SetValue( EMA.db.BankCRItems ) - EMA.settingsControl.tabNumListDropDownListCR:SetText( EMA.db.autoBankToonNameCR ) +-- EMA.settingsControl.tabNumListDropDownListCR:SetText( EMA.db.autoBankToonNameCR ) EMA.settingsControl.BankTradeCRItemsTagCR:SetText( EMA.db.autoCRItemTag ) EMA.settingsControl.dropdownMessageArea:SetValue( EMA.db.messageArea ) -- EMA.settingsControl.checkBoxAdjustMoneyOnToonViaBankBank:SetValue( EMA.db.adjustMoneyWithBankBank ) @@ -641,15 +673,16 @@ function EMA:SettingsRefresh() -- EMA.settingsControl.editBoxGoldAmountToLeaveOnToon:SetDisabled( not EMA.db.adjustMoneyWithBankBank ) EMA.settingsControl.BankItemsEditBoxBankItem:SetDisabled( not EMA.db.showEMABankWindow ) EMA.settingsControl.listCheckBoxBoxOtherBlackListItem:SetDisabled( not EMA.db.showEMABankWindow ) +-- EMA.settingsControl.autoBankItemsAmount:SetDisabled( not EMA.db.showEMABankWindow ) EMA.settingsControl.BankItemsEditBoxBankTag:SetDisabled( not EMA.db.showEMABankWindow ) - EMA.settingsControl.tabNumListDropDownList:SetDisabled( not EMA.db.showEMABankWindow ) +-- EMA.settingsControl.tabNumListDropDownList:SetDisabled( not EMA.db.showEMABankWindow ) EMA.settingsControl.BankItemsButtonRemove:SetDisabled( not EMA.db.showEMABankWindow ) EMA.settingsControl.BankItemsButtonAdd:SetDisabled( not EMA.db.showEMABankWindow ) EMA.settingsControl.checkBoxBankBoEItems:SetDisabled( not EMA.db.showEMABankWindow ) - EMA.settingsControl.tabNumListDropDownListBoE:SetDisabled( not EMA.db.showEMABankWindow ) +-- EMA.settingsControl.tabNumListDropDownListBoE:SetDisabled( not EMA.db.showEMABankWindow ) EMA.settingsControl.BankTradeBoEItemsTagBoE:SetDisabled( not EMA.db.showEMABankWindow ) EMA.settingsControl.checkBoxBankCRItems:SetDisabled( not EMA.db.showEMABankWindow ) - EMA.settingsControl.tabNumListDropDownListCR:SetDisabled( not EMA.db.showEMABankWindow ) +-- EMA.settingsControl.tabNumListDropDownListCR:SetDisabled( not EMA.db.showEMABankWindow ) EMA.settingsControl.BankTradeCRItemsTagCR:SetDisabled( not EMA.db.showEMABankWindow ) EMA:SettingsScrollRefresh() @@ -668,15 +701,23 @@ end ------------------------------------------------------------------------------------------------------------- function EMA:GetBankItemsMaxPosition() - return #EMA.db.autoBankItemsList + if EMA.db.globalBankList == true then + return #EMA.db.global.autoBankItemsListGlobal + else + return #EMA.db.autoBankItemsList + end end function EMA:GetBankItemsAtPosition( position ) - return EMA.db.autoBankItemsList[position] + if EMA.db.globalBankList == true then + return EMA.db.global.autoBankItemsListGlobal[position] + else + return EMA.db.autoBankItemsList[position] + end end -function EMA:AddItem( itemLink, GBTab, itemTag, blackList ) - --EMA:Print("testDBAdd", itemLink, GBTab, itemTag ) +function EMA:AddItem( itemLink, itemTag, blackList ) + --EMA:Print("testDBAdd", itemLink, itemTag ) -- Get some more information about the item. local name, link, quality, iLevel, reqLevel, class, subclass, maxStack, equipSlot, texture, vendorPrice = GetItemInfo( itemLink ) -- If the item could be found. @@ -684,48 +725,59 @@ function EMA:AddItem( itemLink, GBTab, itemTag, blackList ) local itemInformation = {} itemInformation.link = link itemInformation.name = name - itemInformation.GBTab = GBTab itemInformation.tag = itemTag itemInformation.blackList = blackList + if EMA.db.globalBankList == true then + table.insert( EMA.db.global.autoBankItemsListGlobal, itemInformation ) + else table.insert( EMA.db.autoBankItemsList, itemInformation ) - EMA:SettingsRefresh() - EMA:SettingsBankItemsRowClick( 1, 1 ) + end + + EMA:SettingsRefresh() + EMA:SettingsBankItemsRowClick( 1, 1 ) end end function EMA:RemoveItem() - table.remove( EMA.db.autoBankItemsList, EMA.settingsControl.BankItemsHighlightRow ) + if EMA.db.globalBankList == true then + table.remove( EMA.db.global.autoBankItemsListGlobal, EMA.settingsControl.BankItemsHighlightRow ) + else + table.remove( EMA.db.autoBankItemsList, EMA.settingsControl.BankItemsHighlightRow ) + end EMA:SettingsRefresh() EMA:SettingsBankItemsRowClick( EMA.settingsControl.BankItemsHighlightRow - 1, 1 ) end -function EMA:Bank_SHOW(event, ...) +function EMA:BANKFRAME_OPENED(event, ...) --EMA:Print("test") if EMA.db.showEMABankWindow == true then if not IsShiftKeyDown() then - EMA:AddAllToBankBox() + EMA:AddAllToBank() else EMA.ShiftkeyDown = true end end - --[[ - if EMA.db.adjustMoneyWithBankBank == true then - AddGoldToBankBox() - end - ]] end -function EMA:Bank_CLOSED(event, ...) +function EMA:BANKFRAME_CLOSED(event, ...) EMA.ShiftkeyDown = false end -function EMA:AddAllToBankBox() +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") - BankFrameTab_OnClick(nil, "2") - SendBankNameEditBox:SetText( "" ) - SendBankNameEditBox:ClearFocus() - local count = 1 for bagID = 0, NUM_BAG_SLOTS do for slotID = 1,GetContainerNumSlots( bagID ),1 do --EMA:Print( "Bags OK. checking", itemLink ) @@ -733,21 +785,21 @@ function EMA:AddAllToBankBox() if ( item ) then local bagItemLink = item:GetItemLink() if ( bagItemLink ) then + local canSend = false local itemLink = item:GetItemLink() local location = item:GetItemLocation() local itemType = C_Item.GetItemInventoryType( location ) local isBop = C_Item.IsBound( location ) local itemRarity = C_Item.GetItemQuality( location ) - local _,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,isCraftingReagent = GetItemInfo( bagItemLink ) - local canSend = false - local toonName = nil + 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 if EMAApi.IsCharacterInGroup( EMA.characterName, EMA.db.autoBoEItemTag ) == true then if isBop == false then if itemRarity == 2 or itemRarity == 3 or itemRarity == 4 then canSend = true - toonName = EMA.db.autoBankToonNameBoE end end end @@ -757,76 +809,40 @@ function EMA:AddAllToBankBox() if isCraftingReagent == true then if EMAApi.IsCharacterInGroup( EMA.characterName, EMA.db.autoCRItemTag ) == true then if isBop == false then - canSend = true - toonName = EMA.db.autoBankToonNameCR + canSend = true end end end end - for position, itemInformation in pairs( EMA.db.autoBankItemsList ) do + if EMA.db.globalBankList == true then + itemTable = EMA.db.global.autoBankItemsListGlobal + else + itemTable = EMA.db.autoBankItemsList + end + for position, itemInformation in pairs( itemTable ) do + -- EMA:Print("test2", itemInformation.tag, itemInformation.link, "vs", itemLink ) if EMAUtilities:DoItemLinksContainTheSameItem( itemLink, itemInformation.link ) then + local dataAmount = tonumber( itemInformation.amount ) if EMAApi.IsCharacterInGroup( EMA.characterName, itemInformation.tag ) == true then - --EMA:Print("DataTest", itemInformation.link, itemInformation.blackList ) - --EMA:Print("test", itemLink) canSend = true - toonName = itemInformation.GBTab - end - if itemInformation.blackList == true then - canSend = false - end + if itemInformation.blackList == true then + canSend = false + end + end end end - if canSend == true and toonName ~= "" and toonName ~= nil then - local currentBankToon = SendBankNameEditBox:GetText() - local characterName = EMAUtilities:AddRealmToNameIfMissing( toonName ) - if toonName == currentBankToon or currentBankToon == "" and characterName ~= EMA.characterName then - if count <= ATTACHMENTS_MAX_SEND then - --EMA:Print("sending Bank:", count) - count = count + 1 - SendBankNameEditBox:SetText( toonName ) - SendBankSubjectEditBox:SetText( L["SENT_AUTO_BankER"] ) - PickupContainerItem( bagID, slotID ) - UseContainerItem( bagID , slotID ) - end - end + + if canSend == true then + PickupContainerItem( bagID, slotID ) + --EMA:Print("test", isCraftingReagent ) + if isCraftingReagent == true then + UseContainerItem( bagID , slotID, nil, true ) + else + UseContainerItem( bagID , slotID ) + end end end end end - end - EMA:ScheduleTimer( "DoSendBank", 0.5, nil ) -end - -function EMA:Bank_SEND_SUCCESS( event, ... ) - --EMA:Print("try sendBank Again") - if EMA.ShiftkeyDown == false then - EMA:ScheduleTimer( "AddAllToBankBox", 1, nil ) - end -end - -function EMA:DoSendBank() - --EMA:Print("newSendRun") - for iterateBankSlots = 1, ATTACHMENTS_MAX_SEND do - if HasSendBankItem( iterateBankSlots ) == true then - SendBankFrame_SendBank() - break - end - end -end - --- gold -function AddGoldToBankBox() - local moneyToKeepOnToon = tonumber( EMA.db.goldAmountToKeepOnToon ) - local moneyOnToon = GetMoney() - local moneyToDepositOrWithdraw = moneyOnToon - moneyToKeepOnToon - if moneyToDepositOrWithdraw == 0 then - return - end - if moneyToDepositOrWithdraw > 0 then - --local tradePlayersName = GetUnitName("NPC", true) - --local characterName = EMAUtilities:AddRealmToNameIfMissing( tradePlayersName ) - --if EMAApi.IsCharacterTheMaster(characterName) == true and EMAUtilities:CheckIsFromMyRealm(characterName) == true then - SendBankMoneyGold:SetText(moneyToDepositOrWithdraw) - --end end end \ No newline at end of file diff --git a/Modules/DisplayTeam-Classic.lua b/Modules/DisplayTeam-Classic.lua index 0168745..d8b23f1 100644 --- a/Modules/DisplayTeam-Classic.lua +++ b/Modules/DisplayTeam-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/Follow-Classic.lua b/Modules/Follow-Classic.lua index 4830d31..7752b76 100644 --- a/Modules/Follow-Classic.lua +++ b/Modules/Follow-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/ISBoxer-Classic.lua b/Modules/ISBoxer-Classic.lua index 060dbff..de443cc 100644 --- a/Modules/ISBoxer-Classic.lua +++ b/Modules/ISBoxer-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/Information-Classic.lua b/Modules/Information-Classic.lua index a07e585..bf5b935 100644 --- a/Modules/Information-Classic.lua +++ b/Modules/Information-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/Interaction-Classic.lua b/Modules/Interaction-Classic.lua index f6cc318..c9f64fa 100644 --- a/Modules/Interaction-Classic.lua +++ b/Modules/Interaction-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/ItemUse-Classic.lua b/Modules/ItemUse-Classic.lua index 922775e..1b8e2e2 100644 --- a/Modules/ItemUse-Classic.lua +++ b/Modules/ItemUse-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/LDBBar.lua b/Modules/LDBBar.lua index 3eb7351..974f876 100644 --- a/Modules/LDBBar.lua +++ b/Modules/LDBBar.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/Mail-Classic.lua b/Modules/Mail-Classic.lua index 6aae728..4bccb62 100644 --- a/Modules/Mail-Classic.lua +++ b/Modules/Mail-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2019 Jennifer Cally -- +-- License: All Rights Reserved 2018-2020 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/Modules-Classic.xml b/Modules/Modules-Classic.xml index 52b56dc..5e22cd4 100644 --- a/Modules/Modules-Classic.xml +++ b/Modules/Modules-Classic.xml @@ -1,7 +1,7 @@ +