From 4cbf9e0c41e67d3707270344351f299e195fb1c1 Mon Sep 17 00:00:00 2001
From: Jennifer <ebony@carbonspace.co.uk>
Date: Sat, 7 Nov 2020 18:15:55 +0000
Subject: [PATCH] 0170

---
 CHANGELOG.txt                |   35 +++-
 Core/Team.lua                |   15 +-
 EMA.toc                      |    2 +-
 EbonyUtilities.lua           |    8 +
 GUI/EMAHelperSettings.lua    |   14 +-
 Locales/Core-Locale-enUS.lua |   19 ++
 Media/MacroIcon.tga          |  Bin 0 -> 16428 bytes
 Modules/Follow.lua           |    2 +-
 Modules/Macro.lua            |  441 ++++++++++++++++++++++++++++++++++++++++++
 Modules/Modules.xml          |    6 +-
 Modules/Quest.lua            |   22 ++-
 Modules/QuestWatcher.lua     |    2 +
 Modules/Talk.lua             |    2 +-
 Modules/Toon.lua             |   10 +-
 Modules/Trade.lua            |    4 +-
 15 files changed, 556 insertions(+), 26 deletions(-)
 create mode 100644 Media/MacroIcon.tga
 create mode 100644 Modules/Macro.lua

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 20ab3a5..96ee9da 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,12 +1,45 @@
 ---------------------------
 ChangeLogs:
 ---------------------------
+EMA Version: v9.0.1-Release-v3.1(0170)
+Game Version: 9.0.1
+Release Date: 07/11/2020
+
+## Quest
+	Fix #17
+
+## Isboxer 
+	-- Removed isboxer support for now. due to new policy update.
+
+## Added New Module -- By: RobinFrcd ( edited by me )
+	-- Macro Add and copys Macros to your team!
+
+## Display-team
+	-- Added player level By: RobinFrcd
+	
+---------------------------
+EMA Version: v9.0.1-Release-v3.1(0169-0169)
+Game Version: 9.0.1
+Release Date: 30/10/2020
+
+## Quest
+	- Quests with Gossip options Should Now work in BFA Zones.
+		-- Dev note: Sorry about this one it seems they was not working with the new api like even older zones are? 	
+	
+## Disaply-Team
+	- Can Move the frame again
+		--dev note: BBtC 
+		
+
+
+
+---------------------------
 EMA Version: v9.0.1-Release-v3.1(0164-0166)
 Game Version: 9.0.1
 Release Date: 30/10/2020
 
 ## Information
-	-- Added Support For Bagspace Information
+	-- Added Support For Bag space Information
 	-- Information Panel Can Now Startup On All Team Members
 	-- Added Some Options To Support The Removal Of "Expansions" From Dropdown List.
 	-- Added Shadowlands Currencies.
diff --git a/Core/Team.lua b/Core/Team.lua
index 67f11a5..e4f4527 100644
--- a/Core/Team.lua
+++ b/Core/Team.lua
@@ -332,6 +332,7 @@ local function SettingsCreateTeamList()
 		EMA.SettingsAddPartyClick,
 		L["BUTTON_ADDALL_HELP"]
 	)
+--[[	
 	EMA.settingsControl.teamListButtonAddIsboxerList = EMAHelperSettings:Icon( 
 		EMA.settingsControl, 
 		iconSize,
@@ -343,13 +344,14 @@ local function SettingsCreateTeamList()
 		EMA.SettingsAddIsboxerListClick,
 		L["BUTTON_ISBOXER_ADD_HELP"]
 	)
+]]	
 	EMA.settingsControl.teamListButtonMoveUp = EMAHelperSettings:Icon( 
 		EMA.settingsControl, 
 		iconSize,
 		iconSize,
 		"Interface\\Addons\\EMA\\Media\\CharUp.tga", --icon Image
 		left - iconSize - 11,
-		topOfList - verticalSpacing - iconHight * 3, 
+		topOfList - verticalSpacing - iconHight * 2, 
 		L[""], 
 		EMA.SettingsMoveUpClick,
 		L["BUTTON_UP_HELP"]
@@ -360,7 +362,7 @@ local function SettingsCreateTeamList()
 		iconSize,	
 		"Interface\\Addons\\EMA\\Media\\CharDown.tga", --icon Image
 		left - iconSize - 11,
-		topOfList - verticalSpacing - iconHight * 4,
+		topOfList - verticalSpacing - iconHight * 3,
 		L[""],
 		EMA.SettingsMoveDownClick,
 		L["BUTTON_DOWN_HELP"]		
@@ -371,7 +373,7 @@ local function SettingsCreateTeamList()
 		iconSize,
 		"Interface\\Addons\\EMA\\Media\\CharRemove.tga", --icon Image
 		left - iconSize - 11 , 
-		topOfList - verticalSpacing - iconHight * 5,
+		topOfList - verticalSpacing - iconHight * 4,
 		L[""], 
 		EMA.SettingsRemoveClick,
 		L["BUTTON_REMOVE_HELP"]
@@ -382,7 +384,7 @@ local function SettingsCreateTeamList()
 		iconSize,
 		"Interface\\Addons\\EMA\\Media\\CharMaster.tga", --icon Image
 		left - iconSize - 11 , 
-		topOfList - verticalSpacing - iconHight * 6,
+		topOfList - verticalSpacing - iconHight * 5,
 		L[""], 
 		EMA.SettingsSetMasterClick,
 		L["BUTTON_MASTER_HELP"]
@@ -1341,6 +1343,7 @@ function EMA:OnMasterChange( message, characterName )
 	end
 end
 
+--[[
 function EMA:AddIsboxerMembers()
 	if IsAddOnLoaded("Isboxer" ) then
 		for slot, characterName in EMAApi.IsboxerTeamList() do
@@ -1350,7 +1353,7 @@ function EMA:AddIsboxerMembers()
 		EMA:Print(L["ISBOXER_ADDON_NOT_LOADED"])
 	end	
 end
-
+]]
 
 -------------------------------------------------------------------------------------------------------------
 -- Addon initialization, enabling and disabling.
@@ -1738,9 +1741,11 @@ function EMA.SettingsAddPartyClick( event )
 	EMA:AddPartyMembers()
 end
 
+--[[
 function EMA:SettingsAddIsboxerListClick( event )
 	EMA:AddIsboxerMembers()
 end
+]]
 
 function EMA:SettingsInviteClick( event )
 	EMA:InviteTeamToParty(nil)
diff --git a/EMA.toc b/EMA.toc
index 4b5b193..00ba644 100644
--- a/EMA.toc
+++ b/EMA.toc
@@ -2,7 +2,7 @@
 ## Title: EMA
 ## Notes: Ebony's MultiBoxing Assistant
 ## Author: Jennifer Calladine 'Ebony'
-## Version: v9.0.1-Release-v3.1(0166)
+## Version: v9.0.1-Release-v3.1(0170)
 ## SavedVariables: CoreProfileDB, CommunicationsProfileDB, TeamProfileDB, TagProfileDB, MessageProfileDB, InformationProfileDB, DisplayTeamProfileDB, FollowProfileDB, GuildProfileDB, InteractionProfileDB, ItemUseProfileDB, PurchaseProfileDB, QuestProfileDB,  QuestWatcherProfileDB, SellProfileDB, TalkProfileDB, ToonProfileDB, TradeProfileDB, MailProfileDB, BankProfileDB, ISBoxerProfileDB
 
 #Libs
diff --git a/EbonyUtilities.lua b/EbonyUtilities.lua
index 659db19..c82724d 100644
--- a/EbonyUtilities.lua
+++ b/EbonyUtilities.lua
@@ -334,3 +334,11 @@ function EbonyUtilities:getPetOwner( petName )
 	--	print(owner)
 	end
 end
+
+function EbonyUtilities:endsWith(str, ending)
+	if str ~= nil then
+		return str:match(ending .. '$')
+	else
+		return false
+	end
+end
diff --git a/GUI/EMAHelperSettings.lua b/GUI/EMAHelperSettings.lua
index 016e14b..0876f0e 100644
--- a/GUI/EMAHelperSettings.lua
+++ b/GUI/EMAHelperSettings.lua
@@ -347,9 +347,21 @@ function EMAHelperSettings:CreateIcon( settingsControl, width, left, top, iconNa
 	return icon
 end
 
+-------------------------------------------------------------------------------------------------------------
+-- FreeLabel.
+-------------------------------------------------------------------------------------------------------------
+
+function EMAHelperSettings:CreateFreeLabel( settingsControl, width, left, top, text )
+	local label = AceGUI:Create( "Label" )
+	label:SetText( text )
+	settingsControl.widgetSettings:AddChild( label )
+	label:SetWidth( width )
+	label:SetPoint( "TOPLEFT", settingsControl.widgetSettings.content, "TOPLEFT", left, top )
+	return label
+end
 
 -------------------------------------------------------------------------------------------------------------
--- Label.
+-- NormalLabel.
 -------------------------------------------------------------------------------------------------------------
 
 function EMAHelperSettings:GetLabelHeight()
diff --git a/Locales/Core-Locale-enUS.lua b/Locales/Core-Locale-enUS.lua
index c4e78d3..e95cb26 100644
--- a/Locales/Core-Locale-enUS.lua
+++ b/Locales/Core-Locale-enUS.lua
@@ -128,6 +128,7 @@ L["QUEST"] = "Quest"
 L["COMPLETION"] = "Completion"
 L["TRACKER"] = "Tracker"
 L["ISBOXER"] = "ISBoxer"
+L["MACRO"] = "Macro"
 
 --------------------------
 -- Pecoded String Formats
@@ -1009,4 +1010,22 @@ L["LDBBAR_CONFIG_TEAM"] = "To Open Team Settings"
 L["LDBBAR_PUSH"] = "To Push All Settings"
 
 -----------------------
+-- Macro Local
+local ema_macro_tail = "_EMA_AUTO"
+L["MACRO_TAIL"] = ema_macro_tail -- Don't change this one, used to identify EMA macros
+
+L["MACRO_TITLE"] = "Duplicate Macros"
+L["SELECT_MACRO_TITLE"] = "Select macro to edit and clone" 
+L["LOAD_MACRO_BUTTON"] = "Load macros"
+L["LOAD_MACRO_BUTTON_HELP"] = "Get current character macros"
+L["MACRO_NAME_AREA"] = "Macro name"
+L["MACRO_BODY"] = "Macro content"
+L["DELETE_MACROS"] = "Delete ALL EMA macros"
+L["SEND_MACRO_ALL_CHARACTERS"] = "Send to all characters"
+L["SEND_MACRO"] = "Send to character"
+L["LOCAL_MACRO"] = "Local Macro ?"
+L["LOCAL_MACRO_HELP"] = "If not local, it's global"
+L["DELETE_MACROS_HELP"] = "It will delete all macros ending with " .. ema_macro_tail .. " on all your characters"
+
+-----------------------
 -- X Locale
\ No newline at end of file
diff --git a/Media/MacroIcon.tga b/Media/MacroIcon.tga
new file mode 100644
index 0000000000000000000000000000000000000000..50e81433608103cfed8505c610f83ef4db9c4e07
GIT binary patch
literal 16428
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
bhTNr7*Jj;Xb#B$6{kJ`uw`$w0LWchXHA0?t

literal 0
HcmV?d00001

diff --git a/Modules/Follow.lua b/Modules/Follow.lua
index 2b529c9..1ebe81f 100644
--- a/Modules/Follow.lua
+++ b/Modules/Follow.lua
@@ -33,7 +33,7 @@ EMA.moduleDisplayName = L["FOLLOW"]
 -- Icon 
 EMA.moduleIcon = "Interface\\Addons\\EMA\\Media\\FollowIcon.tga"
 -- order
-EMA.moduleOrder = 50
+EMA.moduleOrder = 20
 
 -- EMA key bindings.
 
diff --git a/Modules/Macro.lua b/Modules/Macro.lua
new file mode 100644
index 0000000..0fe1b8e
--- /dev/null
+++ b/Modules/Macro.lua
@@ -0,0 +1,441 @@
+-- ================================================================================ --
+--				EMA - ( Ebony's MultiBoxing Assistant )    							--
+--				Current Author: Jennifer Cally (Ebony)								--
+--																					--
+--				License: All Rights Reserved 2018-2020 Jennifer Cally					--
+--																					--
+--				Some Code Used from "Jamba" that is 								--
+--				Released under the MIT License 										--
+--				"Jamba" Copyright 2008-2015  Michael "Jafula" Miller				--
+--																					--
+-- ================================================================================ --
+
+-- Create the addon using AceAddon-3.0 and embed some libraries.
+local EMA = LibStub( "AceAddon-3.0" ):NewAddon( 
+	"Macro", 
+	"Module-1.0", 
+	"AceConsole-3.0", 
+	"AceEvent-3.0",
+	"AceHook-3.0"
+)
+
+-- Load libraries.
+local EMAUtilities = LibStub:GetLibrary( "EbonyUtilities-1.0" )
+local EMAHelperSettings = LibStub:GetLibrary( "EMAHelperSettings-1.0" )
+
+--  Constants and Locale for this module.
+EMA.moduleName = "Macro"
+EMA.settingsDatabaseName = "MacroProfileDB"
+EMA.chatCommand = "ema-macro"
+local L = LibStub( "AceLocale-3.0" ):GetLocale( "Core" )
+EMA.parentDisplayName = L["TOON"]
+EMA.moduleDisplayName = L["MACRO"]
+-- Icon 
+EMA.moduleIcon = "Interface\\Addons\\EMA\\Media\\MacroIcon.tga"
+-- order
+EMA.moduleOrder = 30
+
+
+-- Settings - the values to store and their defaults for the settings database.
+local myMacros = {}
+local currentMacro = {isLocal=false}
+local teamNames = {}
+local minionNames = {}
+local currentToonValue
+local MacroListLocal = {isLocal=false}
+
+-- Configuration.
+function EMA:GetConfiguration()
+	local configuration = {
+		name = EMA.moduleDisplayName,
+		handler = EMA,
+		type = 'group',
+		childGroups  = "tab",
+		get = "EMAConfigurationGetSetting",
+		set = "EMAConfigurationSetSetting",
+		args = {	
+			config = {
+				type = "input",
+				name = L["OPEN_CONFIG"],
+				desc = L["OPEN_CONFIG_HELP"],
+				usage = "/ema-macro config",
+				get = false,
+				set = "",				
+			},
+			push = {
+				type = "input",
+				name = L["PUSH_ALL_SETTINGS"],
+				desc = L["PUSH_SETTINGS_INFO"],
+				usage = "/ema-macro push",
+				get = false,
+				set = "EMASendSettings",
+			},
+		},
+	}
+	return configuration
+end
+
+-------------------------------------------------------------------------------------------------------------
+-- Command this module sends.
+-------------------------------------------------------------------------------------------------------------
+
+EMA.COMMAND_SEND_MACRO = "SEND_MACRO"
+EMA.COMMAND_DELETE_EMA_MACRO = "DELETE_EMA_MACRO"
+EMA.MACRO_TAIL = L["MACRO_TAIL"]
+
+-------------------------------------------------------------------------------------------------------------
+-- Macro Management.
+-------------------------------------------------------------------------------------------------------------
+
+function EMA:BeforeEMAProfileChanged()	
+end
+
+function EMA:OnEMAProfileChanged()	
+	EMA:SettingsRefresh()
+end
+
+function EMA:SettingsRefresh()
+	-- Set values.
+	-- EMA.settingsControl.checkBoxForwardWhispers:SetValue( EMA.db.forwardWhispers )
+	-- Set state.
+	EMA.settingsControl.buttonRefreshMacroList:SetDisabled( false )
+	EMA.settingsControl.checkBoxRefreshMacroListLocal:SetValue ( MacroListLocal.isLocal )
+	EMA.settingsControl.checkBoxisLocal:SetValue( currentMacro.isLocal )
+--	EMA:SettingsScrollRefresh()
+end
+
+-- Settings received.
+function EMA:EMAOnSettingsReceived( characterName, settings )	
+	if characterName ~= EMA.characterName then
+		-- Update the settings.
+		-- Refresh the settings.
+		EMA:SettingsRefresh()
+		-- Tell the player.
+		EMA:Print( L["SETTINGS_RECEIVED_FROM_A"]( characterName ) )
+		end
+end
+
+-------------------------------------------------------------------------------------------------------------
+-- Settings Dialogs.
+-------------------------------------------------------------------------------------------------------------
+
+local function SettingsCreateOptions( top )
+	-- Position and size constants.
+	local buttonControlWidth = 130
+	local checkBoxHeight = EMAHelperSettings:GetCheckBoxHeight()
+	local buttonHeight = EMAHelperSettings:GetButtonHeight() - 8
+	local editBoxHeight = EMAHelperSettings:GetEditBoxHeight()
+	local dropdownHeight = EMAHelperSettings:GetDropdownHeight()
+	local left = EMAHelperSettings:LeftOfSettings()
+	local headingHeight = EMAHelperSettings:HeadingHeight()
+	local headingWidth = EMAHelperSettings:HeadingWidth( false )
+	local horizontalSpacing = EMAHelperSettings:GetHorizontalSpacing()
+	local verticalSpacing = EMAHelperSettings:GetVerticalSpacing()
+	local halfWidth = (headingWidth - horizontalSpacing) / 2
+	local left2 = left + halfWidth + horizontalSpacing
+	local indent = horizontalSpacing * 10
+	local movingTop = top
+	-- A blank to get layout to show right?
+	EMAHelperSettings:CreateHeading( EMA.settingsControl, "", movingTop, false )
+	movingTop = movingTop - headingHeight	
+	EMAHelperSettings:CreateHeading( EMA.settingsControl, L["MACRO_TITLE"], movingTop, false )
+	movingTop = movingTop - headingHeight
+	EMA.settingsControl.macroInformationlabel = EMAHelperSettings:CreateFreeLabel( 
+		EMA.settingsControl, 
+		headingWidth, 
+		left + indent, 
+		movingTop,
+		"You can load your current macros to use them as a model. \n" ..
+		"Changing the macro title/content and hitting 'Save' will only change the " ..
+		"macro you're sending to other toons, not the one you're currently editing. \n" ..
+		"All macros created within this tab will be named 'name"..EMA.MACRO_TAIL.."'. \n" ..
+		"Clicking '".. L["DELETE_MACROS"] .."' will delete all macros ending with '"..EMA.MACRO_TAIL.."' on all your characters."
+	)	
+	movingTop = movingTop - 70
+	EMA.settingsControl.dropDownMacroSelect = EMAHelperSettings:CreateDropdown( 
+		EMA.settingsControl,
+		(headingWidth - indent) / 2, 
+		left + indent, 
+		movingTop, 
+		L["SELECT_MACRO_TITLE"]
+	)
+	EMA.settingsControl.dropDownMacroSelect:SetList( myMacros )
+	EMA.settingsControl.dropDownMacroSelect:SetCallback( "OnValueChanged", EMA.EditCurrentMacroValue )
+	EMA.settingsControl.buttonRefreshMacroList = EMAHelperSettings:CreateButton(
+		EMA.settingsControl, 
+		buttonControlWidth, 
+		left + indent + (headingWidth - indent) / 2 + horizontalSpacing, 
+		movingTop - buttonHeight,
+		L["LOAD_MACRO_BUTTON"],
+		EMA.RefreshMacroList,
+		L["LOAD_MACRO_BUTTON_HELP"]
+	)
+	EMA.settingsControl.checkBoxRefreshMacroListLocal = EMAHelperSettings:CreateCheckBox( 
+		EMA.settingsControl, 
+		halfWidth, 
+		left + indent + (headingWidth - indent) / 2 + horizontalSpacing + buttonControlWidth, 
+		movingTop  - buttonHeight, 
+		L["LOCAL_MACRO"],
+		EMA.checkBoxRefreshMacroListLocal,
+		L["LOCAL_MACRO_HELP"]
+	)
+	movingTop = movingTop - dropdownHeight - verticalSpacing
+	EMA.settingsControl.editBoxMacroTitle = EMAHelperSettings:CreateEditBox( 
+		EMA.settingsControl,
+		headingWidth / 3,
+		left + indent,
+		movingTop,
+		L["MACRO_NAME_AREA"]
+	)		
+	EMA.settingsControl.editBoxMacroTitle:SetCallback( "OnEnterPressed", EMA.SaveCurrentMacroTitle )
+	movingTop = movingTop - editBoxHeight
+	EMA.settingsControl.editCurrentMacro = EMAHelperSettings:CreateMultiEditBox( 
+		EMA.settingsControl,
+		headingWidth,
+		left + indent,
+		movingTop,
+		L["MACRO_BODY"],
+		10
+	)
+	EMA.settingsControl.editCurrentMacro.button:SetText( "Save macro to send" )
+	EMA.settingsControl.editCurrentMacro.button:SetWidth( 180 )
+	EMA.settingsControl.editCurrentMacro:SetCallback( "OnEnterPressed", EMA.SaveCurrentMacroBody )
+	movingTop = movingTop - editBoxHeight * 3.7
+	EMA.settingsControl.checkBoxisLocal = EMAHelperSettings:CreateCheckBox( 
+		EMA.settingsControl, 
+		halfWidth, 
+		left + indent + halfWidth, 
+		movingTop, 
+		L["LOCAL_MACRO"],
+		EMA.setCurrentMacroIsLocal,
+		L["LOCAL_MACRO_HELP"]
+	)	
+	movingTop = movingTop - checkBoxHeight - 5
+	EMA.settingsControl.dropDownMacroToonSelect = EMAHelperSettings:CreateDropdown( 
+		EMA.settingsControl,
+		(headingWidth - indent) / 3, 
+		left + indent, 
+		movingTop, 
+		"Select toon" 
+	)
+	for characterName, position in EMAApi.TeamList() do
+		table.insert( teamNames, characterName )
+	end
+	EMA.settingsControl.dropDownMacroToonSelect:SetList( teamNames )
+	EMA.settingsControl.dropDownMacroToonSelect:SetCallback( "OnValueChanged", EMA.EditCurrentToonValue )
+	EMA.settingsControl.buttonSendToonMacro = EMAHelperSettings:CreateButton(
+		EMA.settingsControl, 
+		160, 
+		left + indent + (headingWidth - indent) / 3 + horizontalSpacing, 
+		movingTop - buttonHeight,
+		L["SEND_MACRO"],
+		EMA.SendMacroToToon
+	)
+	EMA.settingsControl.buttonSendToonMacro = EMAHelperSettings:CreateButton(
+		EMA.settingsControl, 
+		170, 
+		385, 
+		movingTop - buttonHeight,
+		L["SEND_MACRO_ALL_CHARACTERS"],
+		EMA.SendMacroAllMinions
+	)
+	movingTop = movingTop - dropdownHeight - verticalSpacing
+
+	EMA.settingsControl.buttonSendToonMacro = EMAHelperSettings:CreateButton(
+		EMA.settingsControl, 
+		200, 
+		left + indent, 
+		movingTop - buttonHeight,
+		L["DELETE_MACROS"],
+		EMA.DeleteMacroTeam,
+		L["DELETE_MACROS_HELP"]
+	)
+	movingTop = movingTop - dropdownHeight - verticalSpacing
+	return movingTop
+end
+
+local function SettingsCreate()
+	EMA.settingsControl = {}
+	EMAHelperSettings:CreateSettings( 
+		EMA.settingsControl, 
+		EMA.moduleDisplayName, 
+		EMA.parentDisplayName, 
+		EMA.SettingsPushSettingsClick,
+		EMA.moduleIcon,
+		EMA.moduleOrder		
+	)
+	local bottomOfSettings = SettingsCreateOptions( EMAHelperSettings:TopOfSettings() )
+	EMA.settingsControl.widgetSettings.content:SetHeight( -bottomOfSettings )	
+end
+
+function EMA:SettingsPushSettingsClick( event )
+	EMA:EMASendSettings()
+end
+
+function EMA:SettingsSetMessageArea( event, value )
+	EMA.db.whisperMessageArea = value
+	EMA:SettingsRefresh()
+end
+
+function EMA:RefreshMacroList()
+	local name, icon, body, isLocal
+	local macrosNames = {}
+	myMacros = {}
+	local nbGalobalMacro, nbLocalMacro = GetNumMacros()
+	if MacroListLocal.isLocal == false then
+	-- Global Macros
+		for macroIndex = 1, nbGalobalMacro do
+			name, icon, body = GetMacroInfo(macroIndex)
+			myMacros[#macrosNames+1] = {
+				name=name, 
+				body=body, 
+				icon=icon, 
+				isLocal=false
+			} 
+			macrosNames[#macrosNames+1] = name
+		end
+	end	
+	
+	-- Local macros
+	for macroIndex = 1, nbLocalMacro do
+		-- local macros start at 121 
+		name, icon, body = GetMacroInfo( 120  + macroIndex)
+		myMacros[#macrosNames+1] = {
+			name=name, 
+			body=body, 
+			icon=icon, 
+			isLocal=true
+		} 
+		macrosNames[#macrosNames+1] = name
+	end
+
+	EMA.settingsControl.dropDownMacroSelect:SetList( macrosNames )
+end
+
+function EMA:EditCurrentMacroValue ( event, value )
+	currentMacro.isLocal = myMacros[value].isLocal
+	currentMacro.body = myMacros[value].body
+	currentMacro.name = myMacros[value].name
+	currentMacro.icon = myMacros[value].icon
+	currentMacro.id = value
+	EMA.settingsControl.editCurrentMacro:SetText( currentMacro.body )
+	EMA.settingsControl.checkBoxisLocal:SetValue( currentMacro.isLocal )
+	EMA.settingsControl.editBoxMacroTitle:SetText( currentMacro.name )
+end
+
+function EMA:EditCurrentToonValue(event, value) 
+	currentToonValue = teamNames[value]
+end
+
+function EMA:SaveCurrentMacroBody(event, value)
+	currentMacro.body = value
+end
+
+function EMA:SaveCurrentMacroTitle( event, value )
+	currentMacro.name = value
+	EMA.settingsControl.editBoxMacroTitle:SetText(value)
+end
+
+function EMA:setCurrentMacroIsLocal(event, checked)
+	currentMacro.isLocal = checked
+end
+
+function EMA:checkBoxRefreshMacroListLocal(event, checked)
+	MacroListLocal.isLocal = checked
+end
+
+function EMA:SendMacroToToon()
+	if (currentToonValue ~= nil and currentMacro.name ~= nil) then
+		EMA:Print("Sending Macro " .. currentMacro.name .. " To " .. currentToonValue)
+		EMA:EMASendCommandToToon( currentToonValue, EMA.COMMAND_SEND_MACRO, currentMacro )
+	elseif currentToonValue == nil then
+		EMA:Print("Please select a character to send the macro to")
+	elseif currentMacro.name == nil then
+		EMA:Print("Please fill macro information you want to send")
+	end
+end
+
+function EMA:SendMacroAllMinions()
+	for characterName, position in EMAApi.TeamList() do
+		if characterName ~= EMA.characterName and EMAApi.GetCharacterOnlineStatus( characterName ) == true then
+			EMA:Print("Sending Macro " .. currentMacro.name .. " To " .. characterName)
+			EMA:EMASendCommandToToon( characterName, EMA.COMMAND_SEND_MACRO, currentMacro )
+		end
+	end
+end
+
+function EMA:DeleteMacroTeam()
+	for characterName, position in EMAApi.TeamList() do
+		if EMAApi.GetCharacterOnlineStatus( characterName )	 == true then
+			EMA:Print("Deleting Macros on " .. characterName)
+			EMA:EMASendCommandToToon( characterName, EMA.COMMAND_DELETE_EMA_MACRO )
+		end	
+	end
+end
+
+local function create_macro( macro )
+	local macro_name = macro.name .. EMA.MACRO_TAIL
+	CreateMacro( macro_name, macro.icon, macro.body, macro.isLocal )
+end
+
+local function delete_macros()
+	local name, icon, body, isLocal
+	local macrosToDelete = {}
+	local nbGalobalMacro, nbLocalMacro = GetNumMacros()
+
+	-- Global Macros
+	for macroIndex = 1, nbGalobalMacro do
+		name, icon, body = GetMacroInfo(macroIndex)
+		if EMAUtilities:endsWith(name, EMA.MACRO_TAIL) then
+			EMA:Print("Deleting Macro " .. name)
+			table.insert( macrosToDelete, name)
+		end
+	end
+
+	-- Local macros
+	for macroIndex = 1, nbLocalMacro do
+		-- local macros start at 121 
+		name, icon, body = GetMacroInfo( 120  + macroIndex)
+		if EMAUtilities:endsWith(name, EMA.MACRO_TAIL) then
+			EMA:Print("Deleting Macro " .. name)
+			table.insert( macrosToDelete, name)
+		end
+	end
+
+	for id, name in pairs(macrosToDelete) do
+		DeleteMacro(name)
+	end
+end
+
+function EMA:EMAOnCommandReceived( characterName, commandName, ... )
+	if commandName == EMA.COMMAND_SEND_MACRO then
+		currentMacro = ...
+		EMA:Print("Macro " .. currentMacro.name .. " received from " .. characterName)
+		create_macro(currentMacro)
+	end
+	if commandName == EMA.COMMAND_DELETE_EMA_MACRO then
+		delete_macros()
+	end
+end
+
+-------------------------------------------------------------------------------------------------------------
+-- Addon initialization, enabling and disabling.
+-------------------------------------------------------------------------------------------------------------
+
+-- Initialise the module.
+function EMA:OnInitialize()
+	-- Create the settings control.
+	SettingsCreate()
+	-- Initialise the EMAModule part of this module.
+	EMA:EMAModuleInitialize( EMA.settingsControl.widgetSettings.frame )
+	-- Populate the settings.
+	EMA:SettingsRefresh()	
+end
+
+-- Called when the addon is enabled.
+function EMA:OnEnable()
+end
+
+-- Called when the addon is disabled.
+function EMA:OnDisable()
+end
diff --git a/Modules/Modules.xml b/Modules/Modules.xml
index 500c106..09f163d 100644
--- a/Modules/Modules.xml
+++ b/Modules/Modules.xml
@@ -13,9 +13,9 @@
 	<Script file="Purchase.lua" />
 
 	<Script file="Toon.lua" />
-	<Script file="Talk.lua" />	
-	
 	<Script file="Follow.lua" />
+	<Script file="Talk.lua" />
+	<Script file="Macro.lua" />
 	
 	<Script file="Interaction.lua" />	
 	<Script file="Trade.lua" />
@@ -29,6 +29,6 @@
 	<Script file="DisplayTeam.lua" />
 	<Script file="Information.lua" />
 	<Script file="ItemUse.lua" />
-	<Script file="ISBoxer.lua" />
+<!--	<Script file="ISBoxer.lua" /> -->
 	<Script file="LDBBar.lua" />
 </Ui>
diff --git a/Modules/Quest.lua b/Modules/Quest.lua
index 3c8a117..c174a98 100644
--- a/Modules/Quest.lua
+++ b/Modules/Quest.lua
@@ -253,8 +253,10 @@ function EMA:OnEnable()
    -- Quest post hooks.
 	EMA:SecureHook( C_GossipInfo, "SelectOption", "SelectGossipOption")
 	EMA:SecureHook( C_GossipInfo, "SelectActiveQuest" )
+	EMA:SecureHook( "SelectActiveQuest" ) -- Seems bfa uses the old API?
 	EMA:SecureHook( C_GossipInfo, "SelectAvailableQuest" )
-    EMA:SecureHook( "AcceptQuest" )
+	EMA:SecureHook( "SelectAvailableQuest" ) -- Seems bfa uses the old API?
+	EMA:SecureHook( "AcceptQuest" )
 	EMA:SecureHook( "AcknowledgeAutoAcceptQuest" )
     EMA:SecureHook( "CompleteQuest" )
 	EMA:SecureHook( "GetQuestReward" )
@@ -1107,7 +1109,7 @@ function EMA:ChurnNpcGossip()
 	local numberActiveQuestInfo = 5
     local index
 	--EMA:Print("test" )
-   EMA:DebugMessage( "GetNumAvailableQuests", GetNumAvailableQuests() )
+    EMA:DebugMessage( "GetNumAvailableQuests", GetNumAvailableQuests() )
     EMA:DebugMessage( "GetNumActiveQuests", GetNumActiveQuests() )
     EMA:DebugMessage( "GetGossipAvailableQuests", C_GossipInfo.GetAvailableQuests() )
     EMA:DebugMessage( "GetGossipActiveQuests", C_GossipInfo.GetActiveQuests() )
@@ -1236,6 +1238,7 @@ function EMA:DoSelectGossipActiveQuest( sender, gossipIndex )
 end
 
 function EMA:SelectGossipAvailableQuest( gossipIndex )
+	--EMA:Print("test")
 	if EMA.db.mirrorMasterQuestSelectionAndDeclining == true then
 		if EMA.isInternalCommand == false then
 			EMA:DebugMessage( "SelectGossipAvailableQuest" )
@@ -1254,6 +1257,7 @@ function EMA:DoSelectGossipAvailableQuest( sender, gossipIndex )
 end
 
 function EMA:SelectActiveQuest( questIndex )
+	--EMA:Print("test")
 	if EMA.db.mirrorMasterQuestSelectionAndDeclining == true then
 		if EMA.isInternalCommand == false then
             EMA:DebugMessage( "SelectActiveQuest" )
@@ -1265,7 +1269,6 @@ end
 function EMA:DoSelectActiveQuest( sender, questIndex )
 	if EMA.db.mirrorMasterQuestSelectionAndDeclining == true then
 		EMA.isInternalCommand = true
-        
 		--EMA:Print( "DoSelectActiveQuest" )
 		C_GossipInfo.SelectActiveQuest( questIndex )
 		EMA.isInternalCommand = false
@@ -1273,6 +1276,7 @@ function EMA:DoSelectActiveQuest( sender, questIndex )
 end
 
 function EMA:SelectAvailableQuest( questIndex )
+	--EMA:Print("test")
 	if EMA.db.mirrorMasterQuestSelectionAndDeclining == true then	
 		if EMA.isInternalCommand == false then
 			EMA:DebugMessage( "SelectAvailableQuest" )
@@ -1286,12 +1290,12 @@ function EMA:DoSelectAvailableQuest( sender, questIndex )
 	if EMA.db.mirrorMasterQuestSelectionAndDeclining == true then
 		EMA.isInternalCommand = true
         EMA:DebugMessage( "DoSelectAvailableQuest" )
-		-- TODO KEEP?
-		--if C_GossipInfo.GetNumAvailableQuests() > 1 then 	
+		-- BFA npcs are not using the c_gossipInfo?????
+		if C_GossipInfo.GetNumAvailableQuests() > 1 then 	
 			C_GossipInfo.SelectAvailableQuest( questIndex )
-		--else
-		--	EMA:EMASendMessageToTeam( EMA.db.warningArea, L["AM_I_TALKING_TO_A_NPC"], false )	
-		--end
+		else
+		SelectAvailableQuest( questIndex )
+		end
 		EMA.isInternalCommand = false
 	end
 end
@@ -1587,7 +1591,7 @@ function EMA:CanAutoAcceptSharedQuestFromPlayer()
 		end
 		if EMA.db.acceptFromFriends == true then	
 			for friendIndex = 1, C_FriendList.GetNumFriends() do
-				local info = C_FriendList.GetFriendInfo( friendIndex )
+				local info = C_FriendList.GetFriendInfoByIndex( friendIndex )
 				if questSourceName == info.name then
 					canAccept = true
 					break
diff --git a/Modules/QuestWatcher.lua b/Modules/QuestWatcher.lua
index efd8b1c..cd80cac 100644
--- a/Modules/QuestWatcher.lua
+++ b/Modules/QuestWatcher.lua
@@ -2440,11 +2440,13 @@ function EMA:DisplayAutoQuestPopUps()
 			popUpType = characterPopUpType
 		end
 		-- If the current character does not have the quest, show the character names that do have it.
+		--[[
 		local clickToViewText = QUEST_WATCH_POPUP_CLICK_TO_VIEW
 			if not (title and title ~= "") then
 				title = characterList
 				clickToViewText = ""
 			end
+		]]
 		local frame = EMA:AutoQuestGetOrCreateFrame( parentFrame, countPopUps + 1 )
 		frame:Show()
 		frame:ClearAllPoints()
diff --git a/Modules/Talk.lua b/Modules/Talk.lua
index 48f337f..9334196 100644
--- a/Modules/Talk.lua
+++ b/Modules/Talk.lua
@@ -33,7 +33,7 @@ EMA.moduleDisplayName = L["TALK"]
 -- Icon 
 EMA.moduleIcon = "Interface\\Addons\\EMA\\Media\\ChatIcon.tga"
 -- order
-EMA.moduleOrder = 99
+EMA.moduleOrder = 40
 
 
 -- Settings - the values to store and their defaults for the settings database.
diff --git a/Modules/Toon.lua b/Modules/Toon.lua
index bfc8d19..c151890 100644
--- a/Modules/Toon.lua
+++ b/Modules/Toon.lua
@@ -41,7 +41,8 @@ EMA.moduleIconWarnings = "Interface\\Addons\\EMA\\Media\\WarningIcon.tga"
 EMA.moduleIconRepair = "Interface\\Addons\\EMA\\Media\\moduleIconRepair.tga"
 -- order
 EMA.moduleOrder = 40
-
+EMA.moduleWarningsOrder = 1
+EMA.moduleRepairOrder = 1
 
 -- Settings - the values to store and their defaults for the settings database.
 EMA.settings = {
@@ -610,14 +611,17 @@ local function SettingsCreate()
 		L["WARNINGS"],
 		EMA.parentDisplayNameToon, 
 		EMA.SettingsPushSettingsClick,
-		EMA.moduleIconWarnings
+		EMA.moduleIconWarnings,
+		EMA.moduleWarningsOrder
+		
 	)
 	EMAHelperSettings:CreateSettings( 
 		EMA.settingsControlMerchant, 
 		L["REPAIR"], 
 		EMA.parentDisplayNameMerchant, 
 		EMA.SettingsPushSettingsClick,
-		EMA.moduleIconRepair		
+		EMA.moduleIconRepair,
+		EMA.moduleRepairOrder	
 	)
 	local bottomOfToon = SettingsCreateToon( EMAHelperSettings:TopOfSettings() )
 	EMA.settingsControlToon.widgetSettings.content:SetHeight( -bottomOfToon )
diff --git a/Modules/Trade.lua b/Modules/Trade.lua
index be4db5c..3b78a28 100644
--- a/Modules/Trade.lua
+++ b/Modules/Trade.lua
@@ -799,7 +799,9 @@ function EMA:TradeAllItems()
 					local inventoryType = C_Item.GetItemInventoryType( location )
 					local isBop = C_Item.IsBound( location )
 					local itemRarity =  C_Item.GetItemQuality( location )
-					local itemName, itemLink, itemRarity, itemLevel, itemMinLevel, itemType, itemSubType, itemStackCount, itemEquipLoc, itemIcon, itemSellPrice, itemClassID, itemSubClassID, bindType, expacID, itemSetID, isCraftingReagent = GetItemInfo(bagItemLink)
+					--itemName, itemLink, itemRarity, itemLevel, itemMinLevel, itemType, itemSubType, itemStackCount, itemEquipLoc, itemIcon, itemSellPrice, itemClassID, itemSubClassID, bindType, expacID, itemSetID, isCraftingReagent
+					local itemClassID = select(12, GetItemInfo(bagItemLink) )
+					local isCraftingReagent = select(17, GetItemInfo(bagItemLink) )
 					local canTrade = false
 					if EMA.db.tradeBoEItems == true then
 						if inventoryType ~= 0 then
-- 
1.7.9.5