@@ -41,6 +41,7 @@ EMA.moduleOrder = 20
41
41
BINDING_NAME_TEAMINVITE = L [" INVITE_GROUP" ]
42
42
BINDING_NAME_TEAMDISBAND = L [" DISBAND_GROUP" ]
43
43
BINDING_NAME_TEAMMASTER = L [" SET_MASTER" ]
44
+ BINDING_NAME_CLICKTOMOVE = L [" BINDING_CLICK_TO_MOVE" ]
44
45
BINDING_NAME_MASTERTARGET = L [" SET_MASTER_TARGET" ]
45
46
BINDING_NAME_MASTERASSIST = L [" SET_MASTER_ASSIST" ]
46
47
-- Headers
@@ -174,7 +175,15 @@ function EMA:GetConfiguration()
174
175
usage = " /ema-team push" ,
175
176
get = false ,
176
177
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
+ },
178
187
},
179
188
}
180
189
return configuration
@@ -196,6 +205,8 @@ EMA.COMMAND_SET_MASTER = "EMATeamSetMaster"
196
205
-- Set Minion OffLine
197
206
EMA .COMMAND_SET_OFFLINE = " EMATeamSetOffline"
198
207
EMA .COMMAND_SET_ONLINE = " EMATeamSetOnline"
208
+ EMA .COMMAND_CLICK_TO_MOVE = " EMAClickToMove"
209
+
199
210
200
211
201
212
---- ---------------------------------------------------------------------------------------------------------
@@ -1488,6 +1499,27 @@ function EMA:OnMasterChange( message, characterName )
1488
1499
end
1489
1500
end
1490
1501
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
+
1491
1523
--[[
1492
1524
function EMA:AddIsboxerMembers()
1493
1525
if IsAddOnLoaded("Isboxer" ) then
@@ -1619,8 +1651,6 @@ function EMA:CheckSlavesOptOutOfLoot()
1619
1651
end
1620
1652
end
1621
1653
1622
-
1623
-
1624
1654
---- ---------------------------------------------------------------------------------------------------------
1625
1655
-- Addon initialization, enabling and disabling.
1626
1656
---- ---------------------------------------------------------------------------------------------------------
@@ -1645,27 +1675,35 @@ function EMA:OnInitialize()
1645
1675
-- Adds DefaultGroups to GUI
1646
1676
EMA .characterGroupList = {}
1647
1677
-- 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 ()
1664
1683
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
1669
1707
EMA :UpdateMacros ()
1670
1708
end
1671
1709
@@ -2161,39 +2199,40 @@ function EMA:UPDATE_BINDINGS()
2161
2199
if key2 then
2162
2200
SetOverrideBindingClick ( EMA .keyBindingFrame , false , key2 , " EMAAssistMaster" )
2163
2201
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
2165
2209
end
2166
2210
2167
2211
---- ---------------------------------------------------------------------------------------------------------
2168
2212
-- Commands.
2169
2213
---- ---------------------------------------------------------------------------------------------------------
2170
2214
2171
2215
function EMA :EMAOnCommandReceived ( sender , commandName , ... )
2216
+ if IsCharacterInTeam ( sender ) == false then
2217
+ return
2218
+ end
2172
2219
if commandName == EMA .COMMAND_LEAVE_PARTY then
2173
- if IsCharacterInTeam ( sender ) == true then
2174
- LeaveTheParty ()
2175
- end
2220
+ LeaveTheParty ()
2176
2221
end
2177
2222
if commandName == EMA .COMMAND_SET_MASTER then
2178
- if IsCharacterInTeam ( sender ) == true then
2179
- EMA :ReceiveCommandSetMaster ( ... )
2180
- end
2223
+ EMA :ReceiveCommandSetMaster ( ... )
2181
2224
end
2182
- -- Ebony
2183
2225
if commandName == EMA .COMMAND_SET_OFFLINE then
2184
- if IsCharacterInTeam ( sender ) == true then
2185
- EMA .ReceivesetOffline ( ... )
2186
- end
2226
+ EMA :ReceivesetOffline ( ... )
2187
2227
end
2188
2228
if commandName == EMA .COMMAND_SET_ONLINE then
2189
- if IsCharacterInTeam ( sender ) == true then
2190
- EMA .ReceivesetOnline ( ... )
2191
- end
2229
+ EMA :ReceivesetOnline ( ... )
2192
2230
end
2193
2231
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 , ... )
2197
2236
end
2198
2237
end
2199
2238
0 commit comments