Skip to content

Commit 65a51b5

Browse files
committed
## Team
-- Added A new KeyBinding Toggle Click To Move. -- Added A new CommadLine "/ema-team ctm <group>"
1 parent d4a865a commit 65a51b5

File tree

5 files changed

+99
-43
lines changed

5 files changed

+99
-43
lines changed

Bindings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
<Binding name="TEAMMASTER" category="EMA">
1919
--[[dummy]]
2020
</Binding>
21+
<Binding name="CLICKTOMOVE" category="EMA">
22+
--[[dummy]]
23+
</Binding>
2124
<Binding name="MASTERTARGET" header="ASTERISK" category="EMA">
2225
--[[dummy]]
2326
</Binding>

CHANGELOG.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
---------------------------
22
ChangeLogs:
33
---------------------------
4-
EMA Version: v1.13.5-Release-v0.9(121032)
4+
EMA Version: v1.13.5-Release-v0.9(121033)
55
Game Version: 1.13.5
66
Release Date: 13/11/2020
77

8+
9+
## Team
10+
-- Added A new KeyBinding Toggle Click To Move.
11+
-- Added A new CommadLine "/ema-team ctm <group>"
12+
- dev note: (this is a non-boardcasting key to toggle) as well u can set
13+
groups if use the commandline /ema-team ctm <group>, it will not toggle it "on" the the window you send the command from.
14+
(master free) but it will turn it off so if u change windows it will change.
15+
16+
---------------------------
17+
EMA Version: v1.13.5-Release-v0.9(121032)
18+
Game Version: 1.13.5
19+
Release Date: 13/11/2020
820
## Team
921
-- Added 3 New KeyBindings
1022
-- Focus Master

Core/Team-Classic.lua

Lines changed: 79 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ EMA.moduleOrder = 20
4141
BINDING_NAME_TEAMINVITE = L["INVITE_GROUP"]
4242
BINDING_NAME_TEAMDISBAND = L["DISBAND_GROUP"]
4343
BINDING_NAME_TEAMMASTER = L["SET_MASTER"]
44+
BINDING_NAME_CLICKTOMOVE = L["BINDING_CLICK_TO_MOVE"]
4445
BINDING_NAME_MASTERTARGET = L["SET_MASTER_TARGET"]
4546
BINDING_NAME_MASTERASSIST = L["SET_MASTER_ASSIST"]
4647
--Headers
@@ -174,7 +175,15 @@ function EMA:GetConfiguration()
174175
usage = "/ema-team push",
175176
get = false,
176177
set = "EMASendSettings",
177-
},
178+
},
179+
ctm = {
180+
type = "input",
181+
name = L["COMMANDLINE_CLICK_TO_MOVE"],
182+
desc = L["COMMANDLINE_CLICK_TO_MOVE_HELP"],
183+
usage = "/ema-team ctm <group>",
184+
get = false,
185+
set = "CommandClickToMove",
186+
},
178187
},
179188
}
180189
return configuration
@@ -196,6 +205,8 @@ EMA.COMMAND_SET_MASTER = "EMATeamSetMaster"
196205
-- Set Minion OffLine
197206
EMA.COMMAND_SET_OFFLINE = "EMATeamSetOffline"
198207
EMA.COMMAND_SET_ONLINE = "EMATeamSetOnline"
208+
EMA.COMMAND_CLICK_TO_MOVE = "EMAClickToMove"
209+
199210

200211

201212
-------------------------------------------------------------------------------------------------------------
@@ -1488,6 +1499,27 @@ function EMA:OnMasterChange( message, characterName )
14881499
end
14891500
end
14901501

1502+
function EMA:CommandClickToMove( info, parameters )
1503+
local tag = parameters
1504+
if tag ~= nil and tag:trim() ~= "" then
1505+
EMA:EMASendCommandToTeam( EMA.COMMAND_CLICK_TO_MOVE, tag )
1506+
end
1507+
end
1508+
1509+
function EMA:ReceiveClickToMove( characterName, tag )
1510+
local clickToMove = GetCVar("Autointeract")
1511+
--EMA:Print("test", characterName, tag, clickToMove )
1512+
if EMAApi.DoesCharacterHaveTag( EMA.characterName, tag ) then
1513+
if clickToMove == "1" then
1514+
ConsoleExec("Autointeract 0")
1515+
else
1516+
if characterName ~= EMA.characterName then
1517+
ConsoleExec("Autointeract 1")
1518+
end
1519+
end
1520+
end
1521+
end
1522+
14911523
--[[
14921524
function EMA:AddIsboxerMembers()
14931525
if IsAddOnLoaded("Isboxer" ) then
@@ -1619,8 +1651,6 @@ function EMA:CheckSlavesOptOutOfLoot()
16191651
end
16201652
end
16211653

1622-
1623-
16241654
-------------------------------------------------------------------------------------------------------------
16251655
-- Addon initialization, enabling and disabling.
16261656
-------------------------------------------------------------------------------------------------------------
@@ -1645,27 +1675,35 @@ function EMA:OnInitialize()
16451675
-- Adds DefaultGroups to GUI
16461676
EMA.characterGroupList = {}
16471677
-- Key bindings.
1648-
EMATeamSecureButtonInvite = CreateFrame( "CheckButton", "EMATeamSecureButtonInvite", nil, "SecureActionButtonTemplate" )
1649-
EMATeamSecureButtonInvite:SetAttribute( "type", "macro" )
1650-
EMATeamSecureButtonInvite:SetAttribute( "macrotext", "/ema-team invite" )
1651-
EMATeamSecureButtonInvite:Hide()
1652-
EMATeamSecureButtonDisband = CreateFrame( "CheckButton", "EMATeamSecureButtonDisband", nil, "SecureActionButtonTemplate" )
1653-
EMATeamSecureButtonDisband:SetAttribute( "type", "macro" )
1654-
EMATeamSecureButtonDisband:SetAttribute( "macrotext", "/ema-team disband" )
1655-
EMATeamSecureButtonDisband:Hide()
1656-
EMATeamSecureButtonMaster = CreateFrame( "CheckButton", "EMATeamSecureButtonMaster", nil, "SecureActionButtonTemplate" )
1657-
EMATeamSecureButtonMaster:SetAttribute( "type", "macro" )
1658-
EMATeamSecureButtonMaster:SetAttribute( "macrotext", "/ema-team iammaster" )
1659-
EMATeamSecureButtonMaster:Hide()
1660-
1661-
EMATargetMaster = CreateFrame( "CheckButton", "EMATargetMaster", nil, "SecureActionButtonTemplate" )
1662-
EMATargetMaster:SetAttribute( "type", "macro" )
1663-
EMATargetMaster:Hide()
1678+
if InCombatLockdown() == false then
1679+
EMATeamSecureButtonInvite = CreateFrame( "CheckButton", "EMATeamSecureButtonInvite", nil, "SecureActionButtonTemplate" )
1680+
EMATeamSecureButtonInvite:SetAttribute( "type", "macro" )
1681+
EMATeamSecureButtonInvite:SetAttribute( "macrotext", "/ema-team invite" )
1682+
EMATeamSecureButtonInvite:Hide()
16641683

1665-
EMAAssistMaster = CreateFrame( "CheckButton", "EMAAssistMaster", nil, "SecureActionButtonTemplate" )
1666-
EMAAssistMaster:SetAttribute( "type", "macro" )
1667-
EMAAssistMaster:Hide()
1668-
1684+
EMATeamSecureButtonDisband = CreateFrame( "CheckButton", "EMATeamSecureButtonDisband", nil, "SecureActionButtonTemplate" )
1685+
EMATeamSecureButtonDisband:SetAttribute( "type", "macro" )
1686+
EMATeamSecureButtonDisband:SetAttribute( "macrotext", "/ema-team disband" )
1687+
EMATeamSecureButtonDisband:Hide()
1688+
1689+
EMATeamSecureButtonMaster = CreateFrame( "CheckButton", "EMATeamSecureButtonMaster", nil, "SecureActionButtonTemplate" )
1690+
EMATeamSecureButtonMaster:SetAttribute( "type", "macro" )
1691+
EMATeamSecureButtonMaster:SetAttribute( "macrotext", "/ema-team iammaster" )
1692+
EMATeamSecureButtonMaster:Hide()
1693+
1694+
EMATeamSecureButtonClickToMove = CreateFrame( "CheckButton", "EMATeamSecureButtonClickToMove", nil, "SecureActionButtonTemplate" )
1695+
EMATeamSecureButtonClickToMove:SetAttribute( "type", "macro" )
1696+
EMATeamSecureButtonClickToMove:SetAttribute( "macrotext", "/ema-team ctm all" )
1697+
EMATeamSecureButtonClickToMove:Hide()
1698+
1699+
EMATargetMaster = CreateFrame( "CheckButton", "EMATargetMaster", nil, "SecureActionButtonTemplate" )
1700+
EMATargetMaster:SetAttribute( "type", "macro" )
1701+
EMATargetMaster:Hide()
1702+
1703+
EMAAssistMaster = CreateFrame( "CheckButton", "EMAAssistMaster", nil, "SecureActionButtonTemplate" )
1704+
EMAAssistMaster:SetAttribute( "type", "macro" )
1705+
EMAAssistMaster:Hide()
1706+
end
16691707
EMA:UpdateMacros()
16701708
end
16711709

@@ -2161,39 +2199,40 @@ function EMA:UPDATE_BINDINGS()
21612199
if key2 then
21622200
SetOverrideBindingClick( EMA.keyBindingFrame, false, key2, "EMAAssistMaster" )
21632201
end
2164-
2202+
local key1, key2 = GetBindingKey( "CLICKTOMOVE" )
2203+
if key1 then
2204+
SetOverrideBindingClick( EMA.keyBindingFrame, false, key1, "EMATeamSecureButtonClickToMove" )
2205+
end
2206+
if key2 then
2207+
SetOverrideBindingClick( EMA.keyBindingFrame, false, key2, "EMATeamSecureButtonClickToMove" )
2208+
end
21652209
end
21662210

21672211
-------------------------------------------------------------------------------------------------------------
21682212
-- Commands.
21692213
-------------------------------------------------------------------------------------------------------------
21702214

21712215
function EMA:EMAOnCommandReceived( sender, commandName, ... )
2216+
if IsCharacterInTeam( sender ) == false then
2217+
return
2218+
end
21722219
if commandName == EMA.COMMAND_LEAVE_PARTY then
2173-
if IsCharacterInTeam( sender ) == true then
2174-
LeaveTheParty()
2175-
end
2220+
LeaveTheParty()
21762221
end
21772222
if commandName == EMA.COMMAND_SET_MASTER then
2178-
if IsCharacterInTeam( sender ) == true then
2179-
EMA:ReceiveCommandSetMaster( ... )
2180-
end
2223+
EMA:ReceiveCommandSetMaster( ... )
21812224
end
2182-
--Ebony
21832225
if commandName == EMA.COMMAND_SET_OFFLINE then
2184-
if IsCharacterInTeam( sender ) == true then
2185-
EMA.ReceivesetOffline( ... )
2186-
end
2226+
EMA:ReceivesetOffline( ... )
21872227
end
21882228
if commandName == EMA.COMMAND_SET_ONLINE then
2189-
if IsCharacterInTeam( sender ) == true then
2190-
EMA.ReceivesetOnline( ... )
2191-
end
2229+
EMA:ReceivesetOnline( ... )
21922230
end
21932231
if commandName == EMA.COMMAND_TAG_PARTY then
2194-
if IsCharacterInTeam( sender ) == true then
2195-
EMA.doTagParty( characterName, tag, ... )
2196-
end
2232+
EMA:doTagParty( characterName, tag, ... )
2233+
end
2234+
if commandName == EMA.COMMAND_CLICK_TO_MOVE then
2235+
EMA:ReceiveClickToMove( sender, ... )
21972236
end
21982237
end
21992238

EMA-Classic.toc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## Title: EMA-Classic
33
## Notes: Ebony's MultiBoxing Assistant Classic
44
## Author: Jennifer Calladine 'Ebony'
5-
## Version: v1.13.5-Release-v0.9(121032)
5+
## Version: v1.13.5-Release-v0.9(121033)
66
## SavedVariables: CoreProfileDB, CommunicationsProfileDB, TeamProfileDB, TagProfileDB, MessageProfileDB, CurrProfileDB, DisplayTeamProfileDB, FollowProfileDB, GuildProfileDB, InteractionProfileDB, ItemUseProfileDB, PurchaseProfileDB, QuestProfileDB, QuestWatcherProfileDB, SellProfileDB, TalkProfileDB, BankProfileDB, ToonProfileDB, TradeProfileDB, MailProfileDB, ISBoxerProfileDB
77

88
#Libs

Locales/Classic-Core-Locale-enUS.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,9 @@ L["SET_FOCUS_MASTER"] = "Sets Focus To Master* "
283283
L["SET_MASTER_TARGET"] = "Sets Target To Master* "
284284
L["SET_MASTER_ASSIST"] = "Sets Assist To Master* "
285285
L["FAKE_KEY_BINDING"] = "* Needs to Press the key on all clones"
286-
286+
L["BINDING_CLICK_TO_MOVE"] = "Toggle Click To Move"
287+
L["COMMANDLINE_CLICK_TO_MOVE"] = "Toggles Click To Move <Group> "
288+
L["COMMANDLINE_CLICK_TO_MOVE_HELP"] = "Toggles Click To Move By <Group>"
287289
--------------------------
288290
-- Message Locale
289291
L["DEFAULT_CHAT_WINDOW"] = "Default Chat Window"

0 commit comments

Comments
 (0)