diff --git a/.pkgmeta b/.pkgmeta deleted file mode 100644 index b0d3690..0000000 --- a/.pkgmeta +++ /dev/null @@ -1,5 +0,0 @@ -package-as: EMA-Classic - -manual-changelog: CHANGELOG.txt - -enable-nolib-creation: no \ No newline at end of file diff --git a/Bindings.xml b/Bindings.xml deleted file mode 100644 index 26ef301..0000000 --- a/Bindings.xml +++ /dev/null @@ -1,95 +0,0 @@ -<!-- - EMA - ( Ebony's MultiBoxing Assistant ) - Current Author: Jennifer Cally (Ebony) - License: MIT License 2018-2019 Jennifer Cally - - Some Code Used from 'Jamba' that is - Released under the MIT License - 'Jamba' Copyright 2008-2015 Michael "Jafula" Miller ---> -<Bindings> - <!-- Team Bindings --> - <Binding name="TEAMINVITE" header="TEAM" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="TEAMDISBAND" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="TEAMMASTER" category="EMA"> - --[[dummy]] - </Binding> - <!-- Follow Bindings--> - <Binding name="FOLLOWME" header="FOLLOW" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="FOLLOWSTROBEME" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="FOLLOWSTROBEOFF" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="FOLLOWTEAIN" category="EMA"> - --[[dummy]] - </Binding> - <!-- ItemUse Bindings--> - <Binding name="ITEMUSE1" header="ITEMUSE" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE2" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE3" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE4" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE5" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE6" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE7" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE8" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE9" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE10" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE11" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE12" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE13" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE14" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE15" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE16" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE17" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE18" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE19" category="EMA"> - --[[dummy]] - </Binding> - <Binding name="ITEMUSE20" category="EMA"> - --[[dummy]] - </Binding> -</Bindings> diff --git a/CHANGELOG.txt b/CHANGELOG.txt deleted file mode 100644 index cc8fb56..0000000 --- a/CHANGELOG.txt +++ /dev/null @@ -1,169 +0,0 @@ ---------------------------- -ChangeLogs: ---------------------------- - -EMA Version: v1.13.2-Release-v0.6(121022) -Game Version: 1.13.2 -Release Date: 3/10/2019 - -## Purchase - -- Should No Longer Multiple The Count Cost Of Stacked Items. - -- Issue #26 - -## Team - -- Fixed Issue #20 Again! - - Dev Note: Fixed The Lua Error But Did Not Fix The Friend System. ( Is a MixInTable Now) - ---------------------------- - -EMA Version: v1.13.2-Release-v0.6(121021) -Game Version: 1.13.2 -Release Date: 24/9/2019 - -## Information - -- Fixed Issue #23 - -## Trade - -- Fixed A Bug Where The Groups On Boe And Crafting Reagents Was Not Getting Send To Other Team Members - -- Added Gray Item Support ( So You Can Have A Trash Character ) - ---------------------------- - -EMA Version: v1.13.2-Release-v0.6(121020) -Game Version: 1.13.2 -Release Date: 22/9/2019 - -## Information - -- Can show current Team Members: - - Gold - - Durability - - BagSpace - -## Team - -- Fixed Issue #20 - -## DisplayTeam - -- Fixed Issue #22 - -##Toon - -- Cleaned Up Old Bfa Code - --Fixed Issue #13 - ---------------------------- - -EMA Version: v1.13.2-Release-v0.5(121019) -Game Version: 1.13.2 -Release Date: 14/9/2019 - -## Quest - - Can Now Use Blizzard Ui Abandon Button And After It Ask If You Like To Do This On All Toons. - - Added Track And Untrack Quest Buttons For Single Quests For All Of Team. - - Fixed a bug where it was not showing at the bottom of the EvlUI frame. - - ---------------------------- - -EMA Version: v1.13.2-Release-v0.5(121018) -Game Version: 1.13.2 -Release Date: 14/9/2019 - -## Trade, Purchase, Mail - - Fixed A Global Error Where It Was Not Removing The Item From The Right Selected Item - -## Trade, Purchase, Mail, Sell - - Now Support Shift Mouse Click A Item From Your Bags - ---------------------------- - -EMA Version: v1.13.2-Release-v0.4(121016/121017) -Game Version: 1.13.2 -Release Date: 09/9/2019 - -## Item_Bar - - Fixed a Lag bug i hope when you have quest items added to bar, added 121017 Now fixed the UI from crashing! - ---------------------------- - -EMA Version: v1.13.2-Release-v0.3(121015) -Game Version: 1.13.2 -Release Date: 10/8/2019 - -## Toon - - Set Auto Repair defualt to false. - - Removed Guild Repair. - - Removed Toy and Mounts. - - -## Quest-watcher - - Should be able to untrack quests - -- dev note: But there is no auto tracking in classic intell you track or have a item from the quest to track this is how classic is to work. - - ---------------------------- - -EMA Version: v1.13.2-Beta-v0.3(1210013) -Game Version: 1.13.2 -Release Date: 10/8/2019 - -## Item-Use - - Should Now Add Useable Quest Items - ---------------------------- - -EMA Version: v1.13.2-Beta-v0.3(1210012) -Game Version: 1.13.2 -Release Date: 9/8/2019 - - -## Team - - Set Loot Options Are Back!! - -## Quest-watcher - -Should Now Hide Blizzard Tracker (again!) - - ---------------------------- - - -EMA Version: v1.13.2-Beta-v0.2(1210010) -Game Version: 1.13.2 -Release Date: 7/8/2019 - -## Quest-watcher - -Should now Hide blizzard tracker - -## Quest - - Share all quests should work again - -## DisplayTeam - - Cleared up Retil Stuff - ---------------------------- - -EMA Version: v1.13.2-Alpha-v0.1(1210007) -Game Version: 1.13.2 -Release Date: 16/6/2019 - --- Renamed Files so i don't get Confused what am working on -- jennifer - -## DisplayTeam - -- Rouges and Druilds Combo Points added, Removed all other classess. -- Renamed to support Combo Points Olny - -- Removed Artifact Power - -## Interaction - -- Removed Mount As They Are Nolonger Supported By The Mount System! - -- Removed Taxi Stop As They Are Not Support In Classic - - - ---------------------------- - -EMA Version: v1.13.2-Alpha-v0.1(1210000) -Game Version: 1.13.2 -Release Date: 23/5/2019 - -Port from v8.1.5-Release-v2.0(0122) > Version: v1.13.2-Alpha-v0.1(1210000) - -Builds without change logs setting up from Retil > Classic 1210000-121000* - -Initial release. \ No newline at end of file diff --git a/Core/Communications-Classic.lua b/Core/Communications-Classic.lua index c355936..d271993 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 755e8f5..742a746 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 b089f10..912c657 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 3edcac6..54dfb70 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 b985334..940fff5 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 f46f8cc..0cf6fc3 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- @@ -1517,9 +1517,9 @@ function EMA:PARTY_LEADER_CHANGED( event, ... ) if IsCharacterInTeam( character ) == false then if EMA.db.lootToGroupFriendsAreNotStrangers == true then local isAFriend = false - for friendIndex = 1, C_FriendList.GetNumOnlineFriends() do - local f = C_FriendList.GetFriendInfoByIndex( friendIndex ) - if inviter == f.name then + for friendIndex = 1, GetNumFriends() do + local friendName = GetFriendInfo( friendIndex ) + if partyMemberName == friendName then isAFriend = true end end diff --git a/EMA-Classic.toc b/EMA-Classic.toc deleted file mode 100644 index fbbc99d..0000000 --- a/EMA-Classic.toc +++ /dev/null @@ -1,28 +0,0 @@ -## Interface: 11302 -## Title: EMA-Classic -## Notes: Ebony's MultiBoxing Assistant Classic -## Author: Jennifer Calladine 'Ebony' -## Version: v1.13.2-Release-v0.6(121022) -## SavedVariables: CoreProfileDB, CommunicationsProfileDB, TeamProfileDB, TagProfileDB, MessageProfileDB, CurrProfileDB, DisplayTeamProfileDB, FollowProfileDB, GuildProfileDB, InteractionProfileDB, ItemUseProfileDB, PurchaseProfileDB, QuestProfileDB, QuestWatcherProfileDB, SellProfileDB, TalkProfileDB, ToonProfileDB, TradeProfileDB, MailProfileDB, ISBoxerProfileDB - -#Libs -Embeds.xml -EbonyUtilities.lua - -#Locales -Locales\Locales.xml - -#GUI -GUI\EMAHelperSettings.lua - -#Core -Core\Core-Classic.lua -Core\Module-Classic.lua -Core\Communications-Classic.lua - -Core\Team-Classic.lua -Core\Tag-Classic.lua -Core\Message-Classic.lua - -#Modules -Modules\Modules-Classic.xml \ No newline at end of file diff --git a/EbonyUtilities.lua b/EbonyUtilities.lua deleted file mode 100644 index d643f23..0000000 --- a/EbonyUtilities.lua +++ /dev/null @@ -1,312 +0,0 @@ --- ================================================================================ -- --- EMA - ( Ebony's MultiBoxing Assistant ) -- --- Current Author: Jennifer Cally (Ebony) -- --- -- --- License: MIT License 2018-2019 Jennifer Cally -- --- -- --- Some Code Used from "Jamba" that is -- --- Released under the MIT License -- --- "Jamba" Copyright 2008-2015 Michael "Jafula" Miller -- --- -- --- ================================================================================ -- - --- Localization debugging. ---GAME_LOCALE = "frFR" - -local MAJOR, MINOR = "EbonyUtilities-1.0", 1 -local EbonyUtilities, oldMinor = LibStub:NewLibrary( MAJOR, MINOR ) - -if not EbonyUtilities then - return -end - --- Code modified from http://lua-users.org/wiki/CopyTable -function EbonyUtilities:CopyTable(object) - local lookup_table = {} - local function _copy(object) - if type(object) ~= "table" then - return object - elseif lookup_table[object] then - return lookup_table[object] - end - local new_table = {} - lookup_table[object] = new_table - for index, value in pairs(object) do - new_table[_copy(index)] = _copy(value) - end - return setmetatable(new_table, getmetatable(object)) - end - return _copy(object) -end - -function EbonyUtilities:ClearTable( object ) - for key in next, object do - if type( object[key] ) == "table" then - EbonyUtilities:ClearTable( object[key] ) - end - object[key] = nil - end -end - -function EbonyUtilities:Lowercase( name ) - if name ~= nil then - return string.utf8lower( name ) - end -end - -function EbonyUtilities:AddRealmToNameIfMissing( name ) - if name == nil then - return - end - Name = name:gsub("^%l", string.upper ) - fullName = Name:gsub( "%s+", "") - local matchDash = fullName:find( "-" ) - if not matchDash then - local k = GetRealmName() - local realm = k:gsub( "%s+", "") - fullName = fullName.."-"..realm - end - return fullName -end - --- Capitalise the name. -function EbonyUtilities:Capitalise( name ) - if name ~= nil then - return string.utf8upper( string.utf8sub( name, 1, 1 ) )..string.utf8lower( string.utf8sub( name, 2 ) ) - end -end - -function EbonyUtilities:AddRealmToNameIfNotNil( name, realm ) - local fullName = name - if realm ~= nil and realm:trim() ~= "" then - fullName = name.."-"..realm - end - return fullName -end - --- Money constants. -EbonyUtilities.COLOUR_COPPER = "eda55f" -EbonyUtilities.COLOUR_SILVER = "c7c7cf" -EbonyUtilities.COLOUR_GOLD = "ffd700" -EbonyUtilities.COPPER_PER_SILVER = 100; -EbonyUtilities.SILVER_PER_GOLD = 100; -EbonyUtilities.COPPER_PER_GOLD = EbonyUtilities.COPPER_PER_SILVER * EbonyUtilities.SILVER_PER_GOLD; - --- value - the amount of money to display formatted. --- Creates a money string from the value passed; don't pass negative values! -function EbonyUtilities:FormatMoneyString( value ) - local gold = floor( value / ( EbonyUtilities.COPPER_PER_SILVER * EbonyUtilities.SILVER_PER_GOLD ) ); - local silver = floor( ( value - ( gold * EbonyUtilities.COPPER_PER_SILVER * EbonyUtilities.SILVER_PER_GOLD ) ) / EbonyUtilities.COPPER_PER_SILVER ); - local copper = mod( value, EbonyUtilities.COPPER_PER_SILVER ); - local goldFormat = format( "|cff%s%d|r", EbonyUtilities.COLOUR_GOLD, gold ) - local silverFormat = format( "|cff%s%02d|r", EbonyUtilities.COLOUR_SILVER, silver ) - local copperFormat = format( "|cff%s%02d|r", EbonyUtilities.COLOUR_COPPER, copper ) - if gold <=0 then - goldFormat = "" - if silver <= 0 then - silverFormat = "" - end - end - return strtrim(goldFormat.." "..silverFormat.." "..copperFormat) -end - --- A little toy to retun Gold, silver and copper for mail use -function EbonyUtilities:MoneyString( value ) - local gold = floor( value / ( EbonyUtilities.COPPER_PER_SILVER * EbonyUtilities.SILVER_PER_GOLD ) ); - local silver = floor( ( value - ( gold * EbonyUtilities.COPPER_PER_SILVER * EbonyUtilities.SILVER_PER_GOLD ) ) / EbonyUtilities.COPPER_PER_SILVER ); - local copper = mod( value, EbonyUtilities.COPPER_PER_SILVER ); - if gold <=0 then - goldFormat = "" - if silver <= 0 then - silverFormat = "" - end - end - return gold, silver, copper -end - - --- itemLink - the item link to extract an item id from. --- Gets an item id from an item link. Returns nil, if an item id could not be found. -function EbonyUtilities:GetItemIdFromItemLink( itemLink ) - if itemLink == nil then - return - end - local itemIdFound = nil - local itemStringStart, itemStringEnd, itemString = itemLink:find( "^|c%x+|H(.+)|h%[.*%]" ) - if itemStringStart then - local matchStart, matchEnd, itemId = itemString:find( "(item:%d+)" ) - if matchStart then - itemIdFound = itemId - end - end - return itemIdFound -end - --- itemLink1 - the first item link to compare. --- itemLink2 - the second item link to compare. --- Compares two itemlinks to see if they both refer to the same item. Return true if they do, false if they don't. -function EbonyUtilities:DoItemLinksContainTheSameItem( itemLink1, itemLink2 ) - local theSame = false - local itemId1 = EbonyUtilities:GetItemIdFromItemLink( itemLink1 ) - local itemId2 = EbonyUtilities:GetItemIdFromItemLink( itemLink2 ) - if itemId1 ~= nil and itemId2 ~= nil then - if itemId1 == itemId2 then - theSame = true - end - end - return theSame -end - --- state - string value containing "on" or "off". --- onCommand - string that is equivalent to true, like "on". --- offCommand - string that is equivalent to false, like "off". --- Returns true for "on"; false for "off"; nil for invalid. -function EbonyUtilities:GetOnOrOffFromCommand( state, onCommand, offCommand ) - local setToOn = nil - state = state:lower():trim() - if state == onCommand then - setToOn = true - end - if state == offCommand then - setToOn = false - end - return setToOn -end - --- Check for a buff. -function EbonyUtilities:DoesThisCharacterHaveBuff( buffName ) - local hasBuff = false - local iterateBuffs = 1 - local buff = UnitBuff( "player", iterateBuffs ) - while buff ~= nil do - if buff == buffName then - hasBuff = true - break - end - iterateBuffs = iterateBuffs + 1 - buff = UnitBuff( "player", iterateBuffs ) - end - return hasBuff -end - -function EbonyUtilities:FixValueToRange( value, minValue, maxValue ) - if value < minValue then - value = minValue - end - if value > maxValue then - value = maxValue - end - return value -end - -function EbonyUtilities:MerchantFrameIsShown() - local Show = false - if MerchantFrame:IsVisible() == true then - Show = true - else - if IsAddOnLoaded("TradeSkillMaster" ) == true then - if TSM_API.IsUIVisible("VENDORING") == true then - Show = true - end - end - end - return Show -end - -function EbonyUtilities:CheckIsFromMyRealm( name ) - --print("test", name) - local sameRealm = false - if name ~= nil then - local player, realm = strsplit( "-", name, 2 ) - local myRealm = string.gsub(GetRealmName(), "%s+", "") - if realm == myRealm then - --print("Real SameRealm") - sameRealm = true - else - local connectedServers = GetAutoCompleteRealms() - if connectedServers then --Check if realm matches any realm in our connection - for i = 1, #connectedServers do - if realm == connectedServers[i] then - --print("connectedRealm") - sameRealm = true - end - end - else - --print("NotFromARealm") - sameRealm = false - end - end - end - return sameRealm -end - -function EbonyUtilities:InTagList( tag ) - local isInTagList = false - if JambaApi.DoesGroupExist( tag ) then - isInTagList = true - end - return isInTagList -end - -function EbonyUtilities:TooltipScaner(item) - local text = nil - local text2 = nil - if item ~= nil then - local tooltipName = "EMAScanner" - local tooltipScanner = CreateFrame("GameTooltip", tooltipName, nil, "GameTooltipTemplate") - tooltipScanner:SetOwner(UIParent, "ANCHOR_NONE") - tooltipScanner:SetHyperlink(item) - local tooltipText = _G[tooltipName.."TextLeft2"]:GetText() - local tooltipTextTwo = _G[tooltipName.."TextLeft3"]:GetText() - --print("test", tooltipTextTwo) - text = tooltipText - text2 = tooltipTextTwo - --print("test9", text, text2) - tooltipScanner:Hide() - tooltipScanner:ClearLines() - end - return text, text2 -end - --- We should Not need this anymore but its always here incase! using ItemMixIn -function EbonyUtilities:ToolTipBagScaner(item, bag, slot) - --print("test", item, bag, slot ) - if item ~= nil or bag ~= nil or slot ~= nil then - local boe = nil - local ilvl = nil - local tooltipName = "EMABagScanner" - local tooltipbagScanner = CreateFrame("GameTooltip", tooltipName , nil, "GameTooltipTemplate") - tooltipbagScanner:SetOwner(UIParent, "ANCHOR_NONE") - tooltipbagScanner:SetBagItem(bag, slot) - tooltipbagScanner:Show() - for i = 1,6 do - local t = _G[tooltipName.."TextLeft"..i]:GetText() - --print("test", t) - if (t == ITEM_SOULBOUND) then - boe = ITEM_SOULBOUND - end - end - tooltipbagScanner:Hide() - return boe - end -end - --- GetPetOwner -function EbonyUtilities:getPetOwner( petName ) - --print(petName) - if petName ~= nil then - local tooltipName = "EMAPetScanner" - local tooltipPetScanner = CreateFrame("GameTooltip", tooltipName, nil, "GameTooltipTemplate") - tooltipPetScanner:ClearLines() - tooltipPetScanner:SetOwner(WorldFrame, "ANCHOR_NONE") - tooltipPetScanner:SetUnit( petName ) - local ownerName = _G[tooltipName.."TextLeft2"]:GetText() -- This is the line with <[Player]'s Pet> - if not ownerName then - return nil - end - local owner, _ = string.split("'",ownerName) - tooltipPetScanner:Hide() - return owner -- This is the pet's owner - -- print(owner) - end -end diff --git a/Embeds.xml b/Embeds.xml deleted file mode 100644 index 17a3bf6..0000000 --- a/Embeds.xml +++ /dev/null @@ -1,41 +0,0 @@ -<!-- - EMA - ( Ebony's MultiBoxing Assistant ) - Current Author: Jennifer Cally (Ebony) - License: MIT License 2018-2019 Jennifer Cally - - Some Code Used from 'Jamba' that is - Released under the MIT License - 'Jamba' Copyright 2008-2015 Michael "Jafula" Miller ---> - -<Ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd" xmlns="http://www.blizzard.com/wow/ui/"> - <Script file="Libs\LibStub\LibStub.lua" /> - <Include file="Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml" /> - <Include file="Libs\AceAddon-3.0\AceAddon-3.0.xml" /> - <Include file="Libs\AceGUI-3.0\AceGUI-3.0.xml" /> - <Include file="Libs\AceConfig-3.0\AceConfig-3.0.xml" /> - <Include file="Libs\AceConsole-3.0\AceConsole-3.0.xml" /> - <Include file="Libs\AceDB-3.0\AceDB-3.0.xml" /> - <Include file="Libs\AceDBOptions-3.0\AceDBOptions-3.0.xml" /> - <Include file="Libs\AceEvent-3.0\AceEvent-3.0.xml" /> - <Include file="Libs\AceLocale-3.0\AceLocale-3.0.xml" /> - <Include file="Libs\AceTimer-3.0\AceTimer-3.0.xml" /> - <Include file="Libs\AceComm-3.0\AceComm-3.0.xml" /> - <Include file="Libs\AceHook-3.0\AceHook-3.0.xml" /> - <Include file="Libs\AceSerializer-3.0\AceSerializer-3.0.xml" /> - <Include file="Libs\LibSharedMedia-3.0\lib.xml" /> - <Include file="Libs\AceGUI-3.0-SharedMediaWidgets\widget.xml" /> - <Include file="Libs\LibBagUtils-1.0\LibBagUtils-1.0.xml" /> - <Include file="Libs\LibItemUpgradeInfo-1.0\LibItemUpgradeInfo-1.0.xml" /> - <Script file="Libs\LibAuras\LibAuras.lua" /> - <Script file="Libs\EMALibActionButton-1.0.lua" /> - <Script file="Libs\LibButtonGlow-1.0\LibButtonGlow-1.0.lua" /> - <Script file="Libs\UTF8\utf8data.lua" /> - <Script file="Libs\UTF8\utf8.lua" /> - <Script file="Libs\libdatabroker-1-1-1.1.4\LibDataBroker-1.1.lua" /> - <Script file="GUI\AceGUIContainer-EMAWindow.lua" /> - <Script file="GUI\AceGUIContainer-EMATreeGroup.lua" /> - <Script file="GUI\AceGUIWidget-EMANormalLabel.lua" /> - <Script file="GUI\AceGUIWidget-EMAContinueLabel.lua" /> - <Script file="GUI\AceGUIWidget-EMAKeybinding.lua" /> -</Ui> diff --git a/GUI/AceGUIContainer-EMATreeGroup.lua b/GUI/AceGUIContainer-EMATreeGroup.lua index 5aeeff6..3923807 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 feca9b6..2a78275 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 c8edb63..1c38461 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 c88d1dd..e18be20 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 36731db..4c56e02 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 79846aa..0000000 --- a/LICENSE +++ /dev/null @@ -1,43 +0,0 @@ -All Rights Reserved - -Copyright (c) 2018-2019 Jennifer Cally - -All Rights Reserved unless otherwise explicitly stated. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - ---------------- -Most Core Code: Uses "Jamba" and When "Jamba" Name is Used in EMA uses the following License: ---------------- - -The MIT License (MIT) - -Copyright (c) 2008-2016 Michael "Jafula" Miller - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/Locales/Classic-Core-Locale-deDE.lua b/Locales/Classic-Core-Locale-deDE.lua index 5171671..7ec287b 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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) 2018-2020 Jennifer Cally" +L["COPYRIGHT"] = "Copyright (c) 2015-2018 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 de280f5..482214e 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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) 2018-2020 Jennifer Cally" +L["COPYRIGHT"] = "Copyright (c) 2015-2019 Jennifer Cally" L["COPYRIGHTTWO"] = "Released Under License: All Rights Reserved unless otherwise explicitly stated" L["FRAME_RESET"] = "Frame Reset" -- Msg 8000 @@ -964,18 +964,14 @@ 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"] = "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" +L["REMOVE_BANK_LIST"] = "Remove Item From Bank List" + + + ----------------------- -- LDBBar Locale diff --git a/Locales/Locales.xml b/Locales/Locales.xml index 5f1f6e4..f44003f 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-2020 Jennifer Cally + License: All Rights Reserved 2018-2019 Jennifer Cally --> <Ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd" xmlns="http://www.blizzard.com/wow/ui/"> diff --git a/Media/BankIcon.tga b/Media/BankIcon.tga deleted file mode 100644 index cd939c7..0000000 Binary files a/Media/BankIcon.tga and /dev/null differ diff --git a/Modules/Bank-Classic.lua b/Modules/Bank-Classic.lua index c8f239d..35ee266 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- @@ -41,27 +41,20 @@ 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 = {}, --- autoBankItemsAmount = "", --- adjustMoneyWithBankBank = false, --- goldAmountToKeepOnToon = 250, + adjustMoneyWithBankBank = false, + goldAmountToKeepOnToon = 250, }, } @@ -134,8 +127,7 @@ function EMA:OnInitialize() -- Initialise the popup dialogs. InitializePopupDialogs() EMA.autoBankItemLink = nil --- EMA.autoBankToonName = nil --- EMA.autoBankItemsAmount = nil + EMA.autoBankToonName = nil EMA.BankItemTable = {} EMA.ShiftkeyDown = false --EMA.putItemsInGB = {} @@ -205,26 +197,17 @@ 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, - halfWidth, - left, + headingWidth, + left2, 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 @@ -286,16 +269,15 @@ function EMA:SettingsCreateBank( top ) EMA.SettingsToggleBlackListItem, L["BLACKLIST_ITEM_HELP"] ) ---[[ - EMA.settingsControl.autoBankItemsAmount = EMAHelperSettings:CreateEditBox( + + EMA.settingsControl.tabNumListDropDownList = EMAHelperSettings:CreateEditBox( EMA.settingsControl, thirdWidth, left2, movingTop, - L["AMOUNT"] - ) - EMA.settingsControl.autoBankItemsAmount:SetCallback( "OnEnterPressed", EMA.EditBankItemsAmount ) -]] + L["BankTOON"] + ) + EMA.settingsControl.tabNumListDropDownList:SetCallback( "OnEnterPressed", EMA.EditBankToonName ) --Group EMA.settingsControl.BankItemsEditBoxBankTag = EMAHelperSettings:CreateDropdown( EMA.settingsControl, @@ -316,7 +298,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( @@ -324,20 +306,18 @@ 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, @@ -354,11 +334,10 @@ 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, @@ -366,9 +345,7 @@ function EMA:SettingsCreateBank( top ) movingTop, L["BankTOON"] ) - EMA.settingsControl.tabNumListDropDownListCR:SetCallback( "OnEnterPressed", EMA.EditBankToonNameCR ) -]] EMA.settingsControl.BankTradeCRItemsTagCR = EMAHelperSettings:CreateDropdown( EMA.settingsControl, thirdWidth, @@ -381,7 +358,7 @@ function EMA:SettingsCreateBank( top ) movingTop = movingTop - editBoxHeight movingTop = movingTop - editBoxHeight ---[[ + EMA.settingsControl.labelComingSoon = EMAHelperSettings:CreateContinueLabel( EMA.settingsControl, headingWidth, @@ -389,6 +366,7 @@ function EMA:SettingsCreateBank( top ) movingTop, L["Bank_GOLD_COMING_SOON"] ) +--[[ EMA.settingsControl.checkBoxAdjustMoneyOnToonViaBankBank = EMAHelperSettings:CreateCheckBox( EMA.settingsControl, headingWidth, @@ -457,7 +435,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.amount ) + EMA.settingsControl.BankItems.rows[iterateDisplayRows].columns[2].textString:SetText( BankItemsInformation.GBTab ) 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. @@ -476,22 +454,17 @@ 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.db.BankTagName ~= nil then - EMA:AddItem( EMA.autoBankItemLink, EMA.db.BankTagName, EMA.db.blackListItem ) + 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 ) EMA.autoBankItemLink = nil EMA:SettingsRefresh() end @@ -517,12 +490,12 @@ function EMA:SettingsToggleBlackListItem( event, checked ) end -function EMA:EditBankItemsAmount (event, value ) +function EMA:EditBankToonName (event, value ) -- if nil or the blank group then don't get Name. if value == " " or value == nil then return end - EMA.autoBankItemsAmount = value + EMA.autoBankToonName = value EMA:SettingsRefresh() end @@ -531,16 +504,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 @@ -560,7 +533,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 @@ -569,7 +542,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 @@ -603,7 +576,7 @@ function EMA:SettingsToggleShowEMABankWindow( event, checked ) EMA.db.showEMABankWindow = checked EMA:SettingsRefresh() end ---[[ + function EMA:SettingsToggleAdjustMoneyOnToonViaBankBank( event, checked ) EMA.db.adjustMoneyWithBankBank = checked EMA:SettingsRefresh() @@ -621,21 +594,19 @@ 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.autoBankItemsAmount = settings.autoBankItemsAmount --- EMA.db.autoBankToonNameBoE = settings.autoBankToonNameBoE + 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 @@ -656,16 +627,13 @@ 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 ) @@ -673,16 +641,15 @@ 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() @@ -701,23 +668,15 @@ end ------------------------------------------------------------------------------------------------------------- function EMA:GetBankItemsMaxPosition() - if EMA.db.globalBankList == true then - return #EMA.db.global.autoBankItemsListGlobal - else - return #EMA.db.autoBankItemsList - end + return #EMA.db.autoBankItemsList end function EMA:GetBankItemsAtPosition( position ) - if EMA.db.globalBankList == true then - return EMA.db.global.autoBankItemsListGlobal[position] - else - return EMA.db.autoBankItemsList[position] - end + return EMA.db.autoBankItemsList[position] end -function EMA:AddItem( itemLink, itemTag, blackList ) - --EMA:Print("testDBAdd", itemLink, itemTag ) +function EMA:AddItem( itemLink, GBTab, itemTag, blackList ) + --EMA:Print("testDBAdd", itemLink, GBTab, 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. @@ -725,59 +684,48 @@ function EMA:AddItem( itemLink, 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 ) - end - - EMA:SettingsRefresh() - EMA:SettingsBankItemsRowClick( 1, 1 ) + EMA:SettingsRefresh() + EMA:SettingsBankItemsRowClick( 1, 1 ) end end function EMA:RemoveItem() - 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 + table.remove( EMA.db.autoBankItemsList, EMA.settingsControl.BankItemsHighlightRow ) EMA:SettingsRefresh() EMA:SettingsBankItemsRowClick( EMA.settingsControl.BankItemsHighlightRow - 1, 1 ) end -function EMA:BANKFRAME_OPENED(event, ...) +function EMA:Bank_SHOW(event, ...) --EMA:Print("test") if EMA.db.showEMABankWindow == true then if not IsShiftKeyDown() then - EMA:AddAllToBank() + EMA:AddAllToBankBox() else EMA.ShiftkeyDown = true end end + --[[ + if EMA.db.adjustMoneyWithBankBank == true then + AddGoldToBankBox() + end + ]] end -function EMA:BANKFRAME_CLOSED(event, ...) +function EMA:Bank_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() +function EMA:AddAllToBankBox() --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 ) @@ -785,21 +733,21 @@ function EMA:AddAllToBank() 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 _,_,_,_,_,_,_, itemStackCount,_,_,_,_,_,_,_,_,isCraftingReagent = GetItemInfo( bagItemLink ) - --local countBank = EMA:AmountInBank( itemLink ) - --EMA:Print("I have", itemLink, countBank, "inMyBank") + local _,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,isCraftingReagent = GetItemInfo( bagItemLink ) + local canSend = false + local toonName = nil 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 @@ -809,40 +757,76 @@ function EMA:AddAllToBank() if isCraftingReagent == true then if EMAApi.IsCharacterInGroup( EMA.characterName, EMA.db.autoCRItemTag ) == true then if isBop == false then - canSend = true + canSend = true + toonName = EMA.db.autoBankToonNameCR end end end end - 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 ) + for position, itemInformation in pairs( EMA.db.autoBankItemsList ) do 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 - if itemInformation.blackList == true then - canSend = false - end - end + toonName = itemInformation.GBTab + end + if itemInformation.blackList == true then + canSend = false + end 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 + 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 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 d8b23f1..0168745 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 7752b76..4830d31 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 de443cc..060dbff 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 bf5b935..a07e585 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 c9f64fa..f6cc318 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 1b8e2e2..922775e 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 974f876..3eb7351 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 4bccb62..6aae728 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-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 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 5e22cd4..52b56dc 100644 --- a/Modules/Modules-Classic.xml +++ b/Modules/Modules-Classic.xml @@ -1,7 +1,7 @@ <!-- EMA - ( Ebony's MultiBoxing Assistant ) Current Author: Jennifer Cally (Ebony) - License: All Rights Reserved 2018-2020 Jennifer Cally + License: All Rights Reserved 2018-2019 Jennifer Cally Some Code Used from 'Jamba' that is Released under the MIT License @@ -9,7 +9,6 @@ --> <Ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd" xmlns="http://www.blizzard.com/wow/ui/"> - <Script file="Sell-Classic.lua" /> <Script file="Purchase-Classic.lua" /> @@ -18,14 +17,11 @@ <Script file="Follow-Classic.lua" /> - <Script file="Interaction-Classic.lua" /> - + <Script file="Interaction-Classic.lua" /> <Script file="Trade-Classic.lua" /> <Script file="Mail-Classic.lua" /> - <Script file="Bank-Classic.lua" /> - <Script file="Quest-Classic.lua" /> <Script file="QuestWatcher-Classic.lua" /> diff --git a/Modules/Purchase-Classic.lua b/Modules/Purchase-Classic.lua index 5709bb8..18aa4c2 100644 --- a/Modules/Purchase-Classic.lua +++ b/Modules/Purchase-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/Quest-Classic.lua b/Modules/Quest-Classic.lua index 22aeb76..d6b6d99 100644 --- a/Modules/Quest-Classic.lua +++ b/Modules/Quest-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/QuestWatcher-Classic.lua b/Modules/QuestWatcher-Classic.lua index a4a4dd5..ff49230 100644 --- a/Modules/QuestWatcher-Classic.lua +++ b/Modules/QuestWatcher-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/Sell-Classic.lua b/Modules/Sell-Classic.lua index af9ba08..6a60581 100644 --- a/Modules/Sell-Classic.lua +++ b/Modules/Sell-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/Sync-Classic.lua b/Modules/Sync-Classic.lua index 0f5fd2a..3960ef6 100644 --- a/Modules/Sync-Classic.lua +++ b/Modules/Sync-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/Talk-Classic.lua b/Modules/Talk-Classic.lua index a4e4fd9..a22c2be 100644 --- a/Modules/Talk-Classic.lua +++ b/Modules/Talk-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/Toon-Classic.lua b/Modules/Toon-Classic.lua index 98d378f..8bd375c 100644 --- a/Modules/Toon-Classic.lua +++ b/Modules/Toon-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- diff --git a/Modules/Trade-Classic.lua b/Modules/Trade-Classic.lua index 71bd1b5..ed191b5 100644 --- a/Modules/Trade-Classic.lua +++ b/Modules/Trade-Classic.lua @@ -2,7 +2,7 @@ -- EMA - ( Ebony's MultiBoxing Assistant ) -- -- Current Author: Jennifer Cally (Ebony) -- -- -- --- License: All Rights Reserved 2018-2020 Jennifer Cally -- +-- License: All Rights Reserved 2018-2019 Jennifer Cally -- -- -- -- Some Code Used from "Jamba" that is -- -- Released under the MIT License -- @@ -796,7 +796,7 @@ function EMA:TradeAllItems() local _,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,isCraftingReagent = GetItemInfo( bagItemLink ) local canTrade = false if EMA.db.tradeGrayItems == true then - if EMAApi.IsCharacterInGroup( characterName, EMA.db.autoGrayItemsTag ) == true then + if EMAApi.IsCharacterInGroup( characterName, EMA.db.autoBoEItemTag ) == true then if itemRarity == 0 then canTrade = true end