diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c6de9e1..152f3ef 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -2,6 +2,75 @@ ChangeLogs: --------------------------- +EMA Version: v8.3.0-Release-v2.3(0137) +Game Version: 8.3.0 +Release Date: 01/02/2020 + +## Core + - Updated ToC to 8.3.0 + +## Bank + - New Module Bank! + - Store more junk in the bank! + +##information + -- WIP: Lots of new code in here sorry! + -- added 8.3 + - Coalescing Visions + - Corrupted Mementos + + +--------------------------- + +EMA Version: v8.2.2-Release-v2.2(0136) +Game Version: 8.2.5 +Release Date: 03/10/2019 + +## Core + - Updated Toc to 8.2.5 + +## Team + -- Fixed Issue #20 Again! + - Dev Note: Fixed The Lua Error But Did Not Fix The Friend System. ( Is a MixInTable Now) + + +--------------------------- + +EMA Version: v8.2.0-Release-v2.2(0135) +Game Version: 8.2.0 +Release Date: 24/9/2019 + +## Trade + -- Fixed A Bug Where The Groups On Boe And Crafting Reagents Was Not Getting Send To Other Team Members + +## Team + -- Fixed Issue Classic #20 (Changed API ) + +--------------------------- + +EMA Version: v8.2.0-Release-v2.2(0134) +Game Version: 8.2.0 +Release Date: 14/9/2019 + +# Trade, Guild, Purchase, Mail + - Fixed a Global Error where it was not removing the item from the right Selected Item + + + +--------------------------- + + +EMA Version: v8.2.0-Release-v2.2(0133) +Game Version: 8.2.0 +Release Date: 3/8/2019 + +# Disaply Team + - Fixed a SetPoint Bug + + + +--------------------------- + EMA Version: v8.2.0-Release-v2.2(0132) Game Version: 8.2.0 Release Date: 31/7/2019 diff --git a/Core/Communications.lua b/Core/Communications.lua index 7199aa9..2321bb3 100644 --- a/Core/Communications.lua +++ b/Core/Communications.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.lua b/Core/Core.lua index ea94ddc..9052798 100644 --- a/Core/Core.lua +++ b/Core/Core.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.lua b/Core/Message.lua index 88a8853..6a184eb 100644 --- a/Core/Message.lua +++ b/Core/Message.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.lua b/Core/Module.lua index 54dfb70..3edcac6 100644 --- a/Core/Module.lua +++ b/Core/Module.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.lua b/Core/Tag.lua index 37f06be..4739eb4 100644 --- a/Core/Tag.lua +++ b/Core/Tag.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.lua b/Core/Team.lua index 5ef4c42..feb3ed9 100644 --- a/Core/Team.lua +++ b/Core/Team.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 -- @@ -1242,9 +1242,10 @@ function EMA:PARTY_INVITE_REQUEST( event, inviter, ... ) if EMA.db.inviteAcceptFriends == true then -- Iterate each friend; searching for the inviter in the friends list. for friendIndex = 1, C_FriendList.GetNumOnlineFriends() do - local _, friendName = C_FriendList.GetFriendInfoByIndex( friendIndex ) + local f = C_FriendList.GetFriendInfoByIndex( friendIndex ) -- Inviter found in friends list, allow the invite to be accepted. - if inviter == friendName then + --EMA:Print("test", inviter, f.name ) + if inviter == f.name then acceptInvite = true break end diff --git a/EMA.toc b/EMA.toc index a4ea7ce..d2ee0c3 100644 --- a/EMA.toc +++ b/EMA.toc @@ -2,7 +2,7 @@ ## Title: EMA ## Notes: Ebony's MultiBoxing Assistant ## Author: Jennifer Calladine 'Ebony' -## Version: v8.2.0-Release-v2.2(0132) +## Version: v8.2.0-Release-v2.2(0135) ## SavedVariables: CoreProfileDB, CommunicationsProfileDB, TeamProfileDB, TagProfileDB, MessageProfileDB, CurrProfileDB, DisplayTeamProfileDB, FollowProfileDB, GuildProfileDB, InteractionProfileDB, ItemUseProfileDB, PurchaseProfileDB, QuestProfileDB, QuestWatcherProfileDB, SellProfileDB, TalkProfileDB, ToonProfileDB, TradeProfileDB, MailProfileDB, ISBoxerProfileDB #Libs diff --git a/EbonyUtilities.lua b/EbonyUtilities.lua index 73b5c10..a0e76f9 100644 --- a/EbonyUtilities.lua +++ b/EbonyUtilities.lua @@ -254,7 +254,7 @@ function EbonyUtilities:TooltipScaner(item) if item ~= nil then local tooltipName = "EMAScanner" local tooltipScanner = CreateFrame("GameTooltip", tooltipName, nil, "GameTooltipTemplate") - tooltipScanner:SetOwner(UIParent, "ANCHOR_NONE") + tooltipScanner:SetOwner( WorldFrame, "ANCHOR_NONE") tooltipScanner:SetHyperlink(item) local tooltipText = _G[tooltipName.."TextLeft2"]:GetText() local tooltipTextTwo = _G[tooltipName.."TextLeft3"]:GetText() @@ -262,8 +262,11 @@ function EbonyUtilities:TooltipScaner(item) text = tooltipText text2 = tooltipTextTwo --print("test9", text, text2) + --tooltipScanner:Hide() tooltipScanner:Hide() + tooltipScanner:ClearLines() end + return text, text2 end 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 4072ecf..43c5f1e 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/Core-Locale-deDE.lua b/Locales/Core-Locale-deDE.lua index 7ec287b..a33a0bc 100644 --- a/Locales/Core-Locale-deDE.lua +++ b/Locales/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 -- @@ -157,14 +157,14 @@ L["THANKS1"] = "Michael \"Jafula\" Miller For Making Jamba That Some Of This Cod L["THANKS2"] = "tk911 für die Deutsche Übersetzung" L["THANKS3"] = "" L["WEBSITES"] = "Websites" -L["ME"] = "Current Project Manger Jennifer (Ebony) Cally" +L["ME"] = "Current Project Manger Jennifer Calladine (Ebony)" L["ME_TWITTER"] = "https://twitter.com/Jenn_Ebony" L["D-B"] = "http://Dual-boxing.com" 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) 2015-2019 Jennifer Calladine (Ebony)" L["COPYRIGHTTWO"] = "Released Under License: The MIT License" L["FRAME_RESET"] = "Frame Reset" -- Msg 8000 diff --git a/Locales/Core-Locale-enUS.lua b/Locales/Core-Locale-enUS.lua index d41afb7..f8fab53 100644 --- a/Locales/Core-Locale-enUS.lua +++ b/Locales/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 -- @@ -165,14 +165,14 @@ L["THANKS1"] = "Michael \"Jafula\" Miller For Making Jamba That Some Of This Cod L["THANKS2"] = "tk911 For Translating EMA To German (DE)" L["THANKS3"] = "" L["WEBSITES"] = "Websites" -L["ME"] = "Current Project Manger Jennifer (Ebony) Calladine" +L["ME"] = "Current Project Manger Jennifer Calladine (Ebony) " L["ME_TWITTER"] = "https://twitter.com/Jenn_Ebony" L["D-B"] = "http://Dual-boxing.com" L["ISB"] = "" L["TEMP_WEBSITE1"] = "" L["TEMP_WEBSITE2"] = "" L["TEMP_WEBSITE3"] = "" -L["COPYRIGHT"] = "Copyright (c) 2015-2019 Jennifer (Cally) Calladine" +L["COPYRIGHT"] = "Copyright (c) 2015-2020 Jennifer Calladine (Ebony)" L["COPYRIGHTTWO"] = "Released Under License: All Rights Reserved unless otherwise explicitly stated" L["FRAME_RESET"] = "Frame Reset" -- Msg 8000 @@ -873,6 +873,17 @@ L["REWARDS"] = "Rewards" L["REWARDS_TEXT"] = "Completing This Quest Will \nReward You With:" L["HEADER_MOUSE_OVER_QUESTWATCHER"] = "Hold Down \"ALT\" Key To Move EMA Objectives Tracker" L["UPDATE_MOUSE_OVER_QUESTWATCHER"] = "Force A Update Of The EMA Objectives Tracker" +------------------------ +-- Bank Locale +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" ------------------------ -- Guild Locale diff --git a/Media/BankIcon.tga b/Media/BankIcon.tga new file mode 100644 index 0000000..cd939c7 Binary files /dev/null and b/Media/BankIcon.tga differ diff --git a/Modules/Bank.lua b/Modules/Bank.lua index bdf7649..ab96764 100644 --- a/Modules/Bank.lua +++ b/Modules/Bank.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,47 @@ 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: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 +773,20 @@ 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 ) + --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 +796,35 @@ 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 ) + UseContainerItem( bagID , slotID, nil, true ) 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.lua b/Modules/DisplayTeam.lua index ce04289..d81f3ac 100644 --- a/Modules/DisplayTeam.lua +++ b/Modules/DisplayTeam.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.lua b/Modules/Follow.lua index 5830884..fc85306 100644 --- a/Modules/Follow.lua +++ b/Modules/Follow.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/Guild.lua b/Modules/Guild.lua index 5bdf93d..d3034af 100644 --- a/Modules/Guild.lua +++ b/Modules/Guild.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.lua b/Modules/Information.lua index cbdb0b1..6bb7a78 100644 --- a/Modules/Information.lua +++ b/Modules/Information.lua @@ -20,6 +20,7 @@ local EMA = LibStub( "AceAddon-3.0" ):NewAddon( ) -- Get the EMA Utilities Library. +local AceGUI = LibStub( "AceGUI-3.0" ) local EMAUtilities = LibStub:GetLibrary( "EbonyUtilities-1.0" ) local EMAHelperSettings = LibStub:GetLibrary( "EMAHelperSettings-1.0" ) local LibBagUtils = LibStub:GetLibrary( "LibBagUtils-1.0" ) @@ -91,6 +92,9 @@ EMA.currTypes.HonorboundService = 1716 EMA.currTypes.TitanResiduum = 1718 --8.2 EMA.currTypes.PrismaticManapearl = 1721 +--8.3 +EMA.currTypes.CoalescingVisions = 1755 +EMA.currTypes.CorruptedMementos = 1719 -------------------------------------- End of edit -------------------------------------------------------------- @@ -705,6 +709,7 @@ function EMA:OnInitialize() EMA:SettingsRefresh() -- Create the currency list frame. EMA:CreateEMAToonCurrencyListFrame() + --EMA:CreateEMAToonCurrencyListFrameTwo() end -- Called when the addon is enabled. @@ -810,6 +815,64 @@ function EMA:MatchCurrValue(value) end end +function EMA:CreateEMAToonCurrencyListFrameTwo() + local frameTwo = AceGUI:Create( "Frame" ) + frameTwo:SetTitle( "test" ) + frameTwo:SetWidth(800) + frameTwo:SetHeight(650) + frameTwo:SetLayout("Fill") + + + + local containerWidgetSettings = AceGUI:Create( "SimpleGroup" ) + containerWidgetSettings:SetLayout( "JambaFill" ) + + local widgetSettingsHelp = AceGUI:Create( "ScrollFrame" ) + widgetSettingsHelp:SetLayout( "Flow" ) + + local widgetSettings = AceGUI:Create( "ScrollFrame" ) + widgetSettings:SetLayout( "Flow" ) + + local tabGroupWidgetSettings = AceGUI:Create( "TabGroup" ) + -- Was 'Fill', which causes lockup, started at patch 4.1 (40100). Similar to http://forums.wowace.com/showthread.php?t=17872 + tabGroupWidgetSettings:SetLayout( "Flow" ) + tabGroupWidgetSettings:SetTabs( { {text=L["Options"], value="options"}, {text=L["Commands"], value="help"} } ) + + + + + + frameTwo:AddChild( tabGroupWidgetSettings ) + tabGroupWidgetSettings:AddChild( widgetSettings ) + + -- Callback function for OnGroupSelected + local function SelectGroup(container, event, group) + container:ReleaseChildren() + EMA:Print("test", container, event, group ) + if group == "options" then + EMA:Print("HELLO") + EMA:DrawGroup1(container) + + elseif group == "tab1" then + EMA:Print("Grp1") + DrawGroup1(container) + elseif group == "tab2" then + DrawGroup2(container) + end +end + tabGroupWidgetSettings:SetCallback("OnGroupSelected", SelectGroup) + EMAToonCurrencyListFrameTwo = frameTwo + +end + +function EMA:DrawGroup1(container) + for characterName, currencyFrameCharacterInfo in pairs( EMA.currencyFrameCharacterInfo ) do + EMA:Print("test", characterName) + end + +end + + function EMA:CreateEMAToonCurrencyListFrame() -- The frame. local frame = CreateFrame( "Frame", "EMAToonCurrencyListWindowFrame", UIParent ) @@ -834,17 +897,11 @@ function EMA:CreateEMAToonCurrencyListFrame() EMA.db.currencyFrameRelativePoint = relativePoint EMA.db.currencyFrameXOffset = xOffset EMA.db.currencyFrameYOffset = yOffset - end ) + end ) frame:SetWidth( 500 ) frame:SetHeight( 200 ) frame:ClearAllPoints() frame:SetPoint( EMA.db.currencyFramePoint, UIParent, EMA.db.currencyFrameRelativePoint, EMA.db.currencyFrameXOffset, EMA.db.currencyFrameYOffset ) - frame:SetBackdrop( { - bgFile = "Interface\\DialogFrame\\UI-DialogBox-Background", - edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", - tile = true, tileSize = 10, edgeSize = 10, - insets = { left = 3, right = 3, top = 3, bottom = 3 } - } ) -- Create the title for the frame. local titleName = frame:CreateFontString( "EMAToonCurrencyListWindowFrameTitleText", "OVERLAY", "GameFontNormal" ) @@ -1022,6 +1079,7 @@ function EMA:CreateEMAToonCurrencyListFrame() EMA:CurrencyListSetHeight() end + function EMA:UpdateHendingText() local parentFrame = EMAToonCurrencyListFrame -- Type One @@ -1070,6 +1128,7 @@ function EMA:CurrencyUpdateWindowLock() end end + function EMA:SettingsUpdateBorderStyle() local borderStyle = EMA.SharedMedia:Fetch( "border", EMA.db.currencyBorderStyle ) local backgroundStyle = EMA.SharedMedia:Fetch( "background", EMA.db.currencyBackgroundStyle ) @@ -1533,6 +1592,7 @@ end function EMA:DoShowToonsCurrency( characterName, currencyValues ) --EMA.Print("DoShowCurrency", characterName, currencyValues.currTypeOne, currencyValues.currMaxTypeOne ) local parentFrame = EMAToonCurrencyListFrame + -- Get (or create and get) the character information. local currencyFrameCharacterInfo = EMA.currencyFrameCharacterInfo[characterName] --EMA.Print("Frame", characterName) @@ -1605,6 +1665,7 @@ function EMA:DoShowToonsCurrency( characterName, currencyValues ) -- Update width of currency list. EMA:CurrencyListSetColumnWidth() EMAToonCurrencyListFrame:Show() + EMAToonCurrencyListFrameTwo:Show() end -- A EMA command has been received. 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.lua b/Modules/Mail.lua index 3d1f620..62a0692 100644 --- a/Modules/Mail.lua +++ b/Modules/Mail.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.xml b/Modules/Modules.xml index 8c3ab38..500c106 100644 --- a/Modules/Modules.xml +++ b/Modules/Modules.xml @@ -1,7 +1,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 @@ -19,6 +19,7 @@ <Script file="Interaction.lua" /> <Script file="Trade.lua" /> + <Script file="Bank.lua" /> <Script file="Guild.lua" /> <Script file="Mail.lua" /> diff --git a/Modules/Purchase.lua b/Modules/Purchase.lua index 227be6b..030d7f3 100644 --- a/Modules/Purchase.lua +++ b/Modules/Purchase.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/Quest.lua b/Modules/Quest.lua index f6650c9..aea0bac 100644 --- a/Modules/Quest.lua +++ b/Modules/Quest.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/QuestWatcher.lua b/Modules/QuestWatcher.lua index 09b7781..4fd05d1 100644 --- a/Modules/QuestWatcher.lua +++ b/Modules/QuestWatcher.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/Sell.lua b/Modules/Sell.lua index 19710b7..245a86f 100644 --- a/Modules/Sell.lua +++ b/Modules/Sell.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/Sync.lua b/Modules/Sync.lua index 3960ef6..0f5fd2a 100644 --- a/Modules/Sync.lua +++ b/Modules/Sync.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/Talk.lua b/Modules/Talk.lua index 4455bfb..48f337f 100644 --- a/Modules/Talk.lua +++ b/Modules/Talk.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/Toon.lua b/Modules/Toon.lua index ab34cd2..3ab3909 100644 --- a/Modules/Toon.lua +++ b/Modules/Toon.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/Trade.lua b/Modules/Trade.lua index 4ef4ccf..5f12095 100644 --- a/Modules/Trade.lua +++ b/Modules/Trade.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 --