diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b3354df..795d1c6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,19 @@
ChangeLogs:
---------------------------
+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
diff --git a/EMA-Classic.toc b/EMA-Classic.toc
index f58943a..fdaf95f 100644
--- a/EMA-Classic.toc
+++ b/EMA-Classic.toc
@@ -2,7 +2,7 @@
## Title: EMA-Classic
## Notes: Ebony's MultiBoxing Assistant Classic
## Author: Jennifer Calladine 'Ebony'
-## Version: v1.13.2-Release-v0.6(121020)
+## Version: v1.13.2-Release-v0.6(121021)
## 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/Locales/Classic-Core-Locale-enUS.lua b/Locales/Classic-Core-Locale-enUS.lua
index b98e303..dbf1523 100644
--- a/Locales/Classic-Core-Locale-enUS.lua
+++ b/Locales/Classic-Core-Locale-enUS.lua
@@ -622,10 +622,12 @@ L["TRADE_LIST_HEADER"] = "Trade Item List"
L["TRADE_LIST"] = "Trade Items"
L["GLOBAL_TRADE_LIST"] = "Global Trade List"
L["TRADE_LIST_HELP"] = "Trade Items With The Selected EMA-Group Member"
+L["TRADE_GRAY_ITEMS"] = "Trades Gray Items With:"
+L["TRADE_GRAY_ITEMS_HELP"] = "Trades Gray Items With EMA Group Members"
L["TRADE_BOE_ITEMS"] = "Trades Binds When Equipped Items With:"
-L["TRADE_BOE_ITEMS_HELP"] = "Trade All Binds When Equipped Items with EMA Group"
+L["TRADE_BOE_ITEMS_HELP"] = "Trade All Binds When Equipped Items With EMA Group Members"
L["TRADE_REAGENTS"] = "Trades Crafting Reagents Items With:"
-L["TRADE_REAGENTS_HELP"] = "Trades All Crafting Reagent Items"
+L["TRADE_REAGENTS_HELP"] = "Trades All Crafting Reagent Items With EMA Group Members"
L["TRADE_OPTIONS"] = "Trade To Options"
L["TRADE_GOLD"] = "Trade Excess Gold To Master From Minion"
L["TRADE_GOLD_HELP"] = "Trade Excess Gold To Master From Minions \nAlways Be Careful When Auto Trading."
diff --git a/Modules/Information-Classic.lua b/Modules/Information-Classic.lua
index b0e50cc..a07e585 100644
--- a/Modules/Information-Classic.lua
+++ b/Modules/Information-Classic.lua
@@ -43,11 +43,6 @@ EMA.simpleCurrList = {}
-------------------------------------- End of edit --------------------------------------------------------------
-function EMA:CurrencyIconAndName( id )
--- local fullName, amount, icon, earnedThisWeek, weeklyMax, totalMax, isDiscovered, quality = GetCurrencyInfo(id)
--- local currName = strconcat(" |T"..icon..":20|t", L[" "]..fullName)
- return currName
-end
-- Settings - the values to store and their defaults for the settings database.
@@ -686,7 +681,7 @@ function EMA:CreateEMAToonCurrencyListFrame()
frameBagSpaceText:SetJustifyH( "CENTER" )
frame.BagSpaceText = frameBagSpaceText
left = left + spacing
- -- Set the BagSpace font string.
+ -- Set the CharDurr font string.
local frameCharDurr = EMA.globalCurrencyFramePrefix.."TitleBagSpace"
local frameCharDurrText = parentFrame:CreateFontString( frameCharDurr.."Text", "OVERLAY", "GameFontNormal" )
frameCharDurrText:SetText( L["DURR"] )
@@ -835,7 +830,7 @@ function EMA:CurrencyListSetColumnWidth()
haveGold = 0
end
if EMA.db.bagSpace == true then
- parentFrame.BagSpaceText:SetWidth( goldWidth )
+ parentFrame.BagSpaceText:SetWidth( pointsWidth )
parentFrame.BagSpaceText:SetPoint( "TOPLEFT", parentFrame, "TOPLEFT", left, headingRowTopPoint )
left = left + pointsWidth + spacingWidth
numberOfPointsColumns = numberOfPointsColumns + 1
@@ -844,7 +839,7 @@ function EMA:CurrencyListSetColumnWidth()
parentFrame.BagSpaceText:Hide()
end
if EMA.db.charDurr == true then
- parentFrame.CharDurrText:SetWidth( goldWidth )
+ parentFrame.CharDurrText:SetWidth( pointsWidth )
parentFrame.CharDurrText:SetPoint( "TOPLEFT", parentFrame, "TOPLEFT", left, headingRowTopPoint )
left = left + pointsWidth + spacingWidth
numberOfPointsColumns = numberOfPointsColumns + 1
diff --git a/Modules/QuestWatcher-Classic.lua b/Modules/QuestWatcher-Classic.lua
index 2d017bf..ff49230 100644
--- a/Modules/QuestWatcher-Classic.lua
+++ b/Modules/QuestWatcher-Classic.lua
@@ -961,10 +961,12 @@ function EMA:UpdateHideBlizzardWatchFrame()
end
if EMA.db.hideBlizzardWatchFrame == true then
if QuestWatchFrame:IsVisible() then
+ --QuestLogFrame:Hide()
+ QuestWatchFrame:HookScript("OnShow", function(self) self:Hide() end)
QuestWatchFrame:Hide()
end
- --else
- -- QuestWatchFrame:Show()
+ else
+ QuestWatchFrame:Show()
end
end
diff --git a/Modules/Trade-Classic.lua b/Modules/Trade-Classic.lua
index 83dc1c5..ed191b5 100644
--- a/Modules/Trade-Classic.lua
+++ b/Modules/Trade-Classic.lua
@@ -53,9 +53,11 @@ EMA.settings = {
blackListItem = false,
tradeBoEItems = false,
tradeCRItems = false,
+ tradeGrayItems = false,
autoSellOtherItemTag = EMAApi.MasterGroup(),
autoBoEItemTag = EMAApi.MasterGroup(),
autoCRItemTag = EMAApi.MasterGroup(),
+ autoGrayItemsTag = EMAApi.MasterGroup(),
autoTradeItemsList = {},
adjustMoneyWithMasterOnTrade = false,
goldAmountToKeepOnToonTrade = 200,
@@ -307,6 +309,26 @@ function EMA:SettingsCreateTrade( top )
movingTop = movingTop - buttonHeight
EMAHelperSettings:CreateHeading( EMA.settingsControl, L["TRADE_OPTIONS"], movingTop, false )
movingTop = movingTop - headingHeight
+ EMA.settingsControl.checkBoxTradeGrayItems = EMAHelperSettings:CreateCheckBox(
+ EMA.settingsControl,
+ halfWidth,
+ left,
+ movingTop + movingTopEdit,
+ L["TRADE_GRAY_ITEMS"],
+ EMA.SettingsToggleTradeGrayItems,
+ L["TRADE_GRAY_ITEMS_HELP"]
+ )
+ EMA.settingsControl.tradeTradeGrayItemsTag = EMAHelperSettings:CreateDropdown(
+ EMA.settingsControl,
+ dropBoxWidth,
+ left3,
+ movingTop,
+ L["GROUP_LIST"]
+ )
+ EMA.settingsControl.tradeTradeGrayItemsTag:SetList( EMAApi.GroupList() )
+ EMA.settingsControl.tradeTradeGrayItemsTag:SetCallback( "OnValueChanged", EMA.TradeGroupListItemsGrayDropDown )
+
+ movingTop = movingTop - editBoxHeight - 3
EMA.settingsControl.checkBoxTradeBoEItems = EMAHelperSettings:CreateCheckBox(
EMA.settingsControl,
halfWidth,
@@ -324,7 +346,8 @@ function EMA:SettingsCreateTrade( top )
L["GROUP_LIST"]
)
EMA.settingsControl.tradeTradeBoEItemsTag:SetList( EMAApi.GroupList() )
- EMA.settingsControl.tradeTradeBoEItemsTag:SetCallback( "OnValueChanged", EMA.TradeGroupListItemsBoEDropDown )
+ EMA.settingsControl.tradeTradeBoEItemsTag:SetCallback( "OnValueChanged", EMA.TradeGroupListItemsBoEDropDown )
+
movingTop = movingTop - editBoxHeight - 3
EMA.settingsControl.checkBoxTradeCRItems = EMAHelperSettings:CreateCheckBox(
EMA.settingsControl,
@@ -344,7 +367,6 @@ function EMA:SettingsCreateTrade( top )
)
EMA.settingsControl.tradeTradeCRItemsTag:SetList( EMAApi.GroupList() )
EMA.settingsControl.tradeTradeCRItemsTag:SetCallback( "OnValueChanged", EMA.TradeGroupListItemsCRDropDown )
- -- Trade Gold! Keep
movingTop = movingTop - editBoxHeight
EMA.settingsControl.checkBoxAdjustMoneyWithMasterOnTrade = EMAHelperSettings:CreateCheckBox(
EMA.settingsControl,
@@ -490,6 +512,24 @@ function EMA:SettingsToggleShowEMATradeWindow( event, checked )
EMA:SettingsRefresh()
end
+function EMA:SettingsToggleTradeGrayItems(event, checked )
+ EMA.db.tradeGrayItems = checked
+ EMA:SettingsRefresh()
+end
+
+function EMA:TradeGroupListItemsGrayDropDown(event, value )
+ if value == " " or value == nil then
+ return
+ end
+ for index, groupName in ipairs( EMAApi.GroupList() ) do
+ if index == value then
+ EMA.db.autoGrayItemsTag = groupName
+ break
+ end
+ end
+ EMA:SettingsRefresh()
+end
+
function EMA:SettingsToggleTradeBoEItems(event, checked )
EMA.db.tradeBoEItems = checked
EMA:SettingsRefresh()
@@ -527,11 +567,6 @@ function EMA:TradeGroupListItemsCRDropDown(event, value )
end
-function EMA:SettingsToggleAdjustMoneyOnToonViaGuildBank( event, checked )
- EMA.db.adjustMoneyWithGuildBank = checked
- EMA:SettingsRefresh()
-end
-
function EMA:SettingsToggleAdjustMoneyWithMasterOnTrade( event, checked )
EMA.db.adjustMoneyWithMasterOnTrade = checked
EMA:SettingsRefresh()
@@ -568,8 +603,12 @@ function EMA:EMAOnSettingsReceived( characterName, settings )
EMA.db.globalTradeList = settings.globalTradeList
EMA.db.autoSellOtherItemTag = settings.autoSellOtherItemTag
EMA.db.blackListItem = settings.blackListItem
+ EMA.db.tradeGrayItems = settings.tradeGrayItems
EMA.db.tradeBoEItems = settings.tradeBoEItems
EMA.db.tradeCRItems = settings.tradeCRItems
+ EMA.db.autoBoEItemTag = settings.autoBoEItemTag
+ EMA.db.autoCRItemTag = settings.autoCRItemTag
+ EMA.db.autoGrayItemsTag = settings.autoGrayItemsTag
EMA.db.autoTradeItemsList = EMAUtilities:CopyTable( settings.autoTradeItemsList )
EMA.db.global.autoTradeItemsListGlobal = EMAUtilities:CopyTable( settings.global.autoTradeItemsListGlobal )
EMA.db.adjustMoneyWithGuildBank = settings.adjustMoneyWithGuildBank
@@ -596,10 +635,12 @@ function EMA:SettingsRefresh()
EMA.settingsControl.checkBoxGlobalTradeList:SetValue( EMA.db.globalTradeList )
EMA.settingsControl.checkBoxGlobalTradeList:SetDisabled( not EMA.db.showEMATradeWindow )
EMA.settingsControl.listCheckBoxBoxOtherBlackListItem:SetValue( EMA.db.blackListItem )
+ EMA.settingsControl.checkBoxTradeGrayItems:SetValue( EMA.db.tradeGrayItems )
EMA.settingsControl.checkBoxTradeBoEItems:SetValue( EMA.db.tradeBoEItems)
EMA.settingsControl.checkBoxTradeCRItems:SetValue( EMA.db.tradeCRItems)
EMA.settingsControl.dropdownMessageArea:SetValue( EMA.db.messageArea )
EMA.settingsControl.tradeItemsEditBoxToonTag:SetText( EMA.db.autoSellOtherItemTag )
+ EMA.settingsControl.tradeTradeGrayItemsTag:SetText( EMA.db.autoGrayItemsTag )
EMA.settingsControl.tradeTradeBoEItemsTag:SetText( EMA.db.autoBoEItemTag )
EMA.settingsControl.tradeTradeCRItemsTag:SetText( EMA.db.autoCRItemTag )
EMA.settingsControl.checkBoxAdjustMoneyWithMasterOnTrade:SetValue( EMA.db.adjustMoneyWithMasterOnTrade )
@@ -610,6 +651,8 @@ function EMA:SettingsRefresh()
EMA.settingsControl.tradeItemsButtonRemove:SetDisabled( not EMA.db.showEMATradeWindow )
EMA.settingsControl.tradeItemsButtonAdd:SetDisabled( not EMA.db.showEMATradeWindow )
EMA.settingsControl.listCheckBoxBoxOtherBlackListItem:SetDisabled( not EMA.db.showEMATradeWindow )
+ EMA.settingsControl.checkBoxTradeGrayItems:SetDisabled( not EMA.db.showEMATradeWindow )
+ EMA.settingsControl.tradeTradeGrayItemsTag:SetDisabled( not EMA.db.showEMATradeWindow )
EMA.settingsControl.checkBoxTradeBoEItems:SetDisabled( not EMA.db.showEMATradeWindow )
EMA.settingsControl.tradeTradeBoEItemsTag:SetDisabled( not EMA.db.showEMATradeWindow )
EMA.settingsControl.checkBoxTradeCRItems:SetDisabled( not EMA.db.showEMATradeWindow )
@@ -752,6 +795,13 @@ function EMA:TradeAllItems()
local itemRarity = C_Item.GetItemQuality( location )
local _,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,isCraftingReagent = GetItemInfo( bagItemLink )
local canTrade = false
+ if EMA.db.tradeGrayItems == true then
+ if EMAApi.IsCharacterInGroup( characterName, EMA.db.autoBoEItemTag ) == true then
+ if itemRarity == 0 then
+ canTrade = true
+ end
+ end
+ end
if EMA.db.tradeBoEItems == true then
if itemType ~= 0 then
if EMAApi.IsCharacterInGroup( characterName, EMA.db.autoBoEItemTag ) == true then