refactor: GM rework

Author: LightDestory

AzerothCoreAdmin.lua

@@ -31,7 +31,7 @@ gettingGOBinfo=0
 gettingGOBinfoinfo=0
 
 MAJOR_VERSION = "AzerothCoreAdmin"
-MINOR_VERSION = "$Revision: 001 $"
+MINOR_VERSION = "$Revision: 003 $"
 ROOT_PATH     = "Interface\\AddOns\\AzerothCoreAdmin\\"
 local cont = ""
 if not AceLibrary then error(MAJOR_VERSION .. " requires AceLibrary") end

AzerothCoreAdmin.toc

@@ -31,10 +31,9 @@ Libraries\LibGraph-2.0\LibGraph-2.0.lua
 Locales\enUS.lua
 Locales\strings.lua
 models.lua
-Utils\Consts.lua
-Utils\Utils.lua
+Commands\declarations\command_keys.lua
 Commands\Commands_Generics.lua
-Commands\Commands_Main.lua
+Commands\Commands_GM.lua
 Commands\Commands_Tele.lua
 Commands\Commands_Log.lua
 Commands\Commands_Char.lua

Commands/Commands_Main.lua Commands/Commands_GM.luaCommands/Commands_Main.lua renamed to Commands/Commands_GM.lua

@@ -205,6 +205,22 @@ GM_genericCommands = {
   [GM_dismountPlayerCommand] = {
     [GENERICS_command] = ".dismount",
     [GENERICS_message] = "logGM_dismountPlayer"
+  },
+  [GM_playerSpeedCommand] = {
+    [GENERICS_command] = ".modify speed",
+    [GENERICS_message] = "logGM_setSpeed"
+  },
+  [GM_playerScaleCommand] = {
+    [GENERICS_command] = ".modify scale",
+    [GENERICS_message] = "logGM_setScale"
+  },
+  [GM_AllianceJailCommand] = {
+    [GENERICS_command] = "ma_AllianceJail",
+    [GENERICS_message] = "logGM_setJailAlliance"
+  },
+  [GM_HordeJailCommand] = {
+    [GENERICS_command] = "ma_HordeJail",
+    [GENERICS_message] = "logGM_setJailHorde"
   }
 }
 
@@ -351,26 +367,16 @@ function GM_setAccountAddonCommand()
   print(Locale["operationCompleted"])
 end
 
-function setJailAllianceCommand()
-  MangAdmin:ChatMsg(".tele del ma_AllianceJail")
-  local i = 1
-  while i < 100 do
-    i = i + 1
-    MangAdmin:ChatMsg(".")
-  end
-  MangAdmin:ChatMsg(".tele add ma_AllianceJail")
-  MangAdmin:LogAction(Locale["logGM_setJailAlliance"])
-end
-
-function setJailHordeCommand()
-  MangAdmin:ChatMsg(".tele del ma_HordeJail")
+function GM_setJailCommand(factionCommand)
+  local command = GM_genericCommands[factionCommand][GENERICS_command]
+  MangAdmin:ChatMsg(".tele del " .. command)
   local i = 1
   while i < 100 do
     i = i + 1
     MangAdmin:ChatMsg(".")
   end
-  MangAdmin:ChatMsg(".tele add ma_HordeJail")
-  MangAdmin:LogAction(Locale["logGM_setJailHorde"])
+  MangAdmin:ChatMsg(".tele add " .. command)
+  MangAdmin:LogAction(Locale[GM_genericCommands[factionCommand][GENERICS_message]])
 end
 
 function screen()
@@ -388,26 +394,25 @@ function GM_instantKillModeCommand()
   )
 end
 
-function GM_setSpeedCommand()
-  local value = string.format("%.1f", GM_setSpeedSlider:GetValue())
+function GM_setSpeedOrScaleCommand(sliderControl, sliderCommand)
+  local command = GM_genericCommands[sliderCommand][GENERICS_command]
+  local value = string.format("%.1f", sliderControl:GetValue())
   if commandTargetCheck() then
-    MangAdmin:ChatMsg(".modify speed " .. value)
-    MangAdmin:LogAction(getCommandTargetName() .. Locale["logGM_setSpeed"] .. value)
+    MangAdmin:ChatMsg(command .. " " .. value)
+    MangAdmin:LogAction(getCommandTargetName() .. Locale[GM_genericCommands[sliderCommand][GENERICS_message]] .. value)
   else
     MangAdmin:Print(Locale["selectionError"])
-    GM_setSpeedSlider:SetValue(1)
+    sliderControl:SetValue(1)
   end
 end
 
-function GM_setScaleCommand()
-  local value = string.format("%.1f", GM_setScaleSlider:GetValue())
-  if commandTargetCheck() then
-    MangAdmin:ChatMsg(".modify scale " .. value)
-    MangAdmin:LogAction(getCommandTargetName() .. Locale["logGM_setScale"] .. value)
-  else
-    MangAdmin:Print(Locale["selectionError"])
-    GM_setScaleSlider:SetValue(1)
-  end
+function GM_resetSpeedOrScaleSlider(sliderControl, sliderText, sliderCommand)
+  local command = GM_genericCommands[sliderCommand][GENERICS_command]
+  local title = (command:find('scale') and "Scale" or "Speed")
+  sliderControl:SetValue(1)
+  sliderText:SetText(title .. ": 1.0")
+  MangAdmin:ChatMsg(command .." 1")
+  MangAdmin:LogAction(Locale["log_resetSlider"])
 end
 
 function GridNavigate(x, y)
@@ -446,17 +451,3 @@ function GridNavigate(x, y)
     end
   end
 end
-
-function GM_resetSpeed()
-  GM_setSpeedSlider:SetValue(1)
-  GM_setSpeedSliderText:SetText("Speed: 1.0")
-  MangAdmin:ChatMsg(".mod speed 1")
-  MangAdmin:LogAction(Locale["log_resetSlider"])
-end
-
-function GM_resetScale()
-  GM_setScaleSlider:SetValue(1)
-  GM_setScaleSliderText:SetText("Scale: 1.0")
-  MangAdmin:ChatMsg(".mod scale 1")
-  MangAdmin:LogAction(Locale["log_resetSlider"])
-end

Commands/Commands_Generics.lua

@@ -15,12 +15,50 @@
 --
 -------------------------------------------------------------------------------------------------------------
 
+function commandTargetCheck()
+    return (MangAdmin:Selection("player") or MangAdmin:Selection("self") or MangAdmin:Selection("none"))
+end
+
+function getCommandTargetName()
+    return (UnitName("target") or UnitName("player"))
+end
+
+function getCallsDictionary(ID)
+    if ID == GM_KEY then
+        return GM_genericCommands
+    elseif ID == CHAR_KEY then
+        return CHAR_genericCommands
+    else
+        return nil
+    end
+end
+
 function genericClearParametersBox(caller)
     if (caller == "GM") then
         GM_parameterInput:SetText("")
     end
 end
 
+function genericLogGenerator(textID, data)
+    local log = Locale[textID]
+    local params = {}
+    if(textID ~= "logGM_GMNotify" and textID ~= "logGM_GMMessage") then
+        for w in data['value']:gmatch("%w+") do
+            table.insert(params, w)
+        end
+    else
+        params[1] = data['value']
+    end
+    for i = #params, 1, -1 do
+        local pattern = "_V" .. i .. "_"
+        log = string.gsub(log, pattern, params[i])
+    end
+    if data['target'] ~=nil then
+        log = string.gsub(log, "_T_", data['target'])
+    end
+    return log
+end
+
 function genericBagCommand(caller)
     local player = UnitName("player") or UnitName("target")
     local param = nil
@@ -54,4 +92,4 @@ function genericCaller(dictionaryID, callID, value)
     end
     MangAdmin:ChatMsg(call[GENERICS_command].. data['value'])
     MangAdmin:LogAction(genericLogGenerator(call[GENERICS_message], data))
-end
+end

Utils/Consts.lua Commands/declarations/command_keys.luaUtils/Consts.lua renamed to Commands/declarations/command_keys.lua

@@ -4,8 +4,9 @@ OFF_OPTION = "off"
 
 -- Role identity Keys
 GM_KEY = "GM"
+CHAR_KEY = "CHAR"
 
--- Generic Spells Action Keys
+-- Generic Commands Action Keys
 GENERICS_parametersGet = "parametersGet"
 GENERICS_isValueNeeded = "isValueNeeded"
 GENERICS_isParametersNeeded = "isParametersNeeded"
@@ -50,3 +51,20 @@ GM_petUnLearnCommand = "petUnLearn"
 GM_petTalentsLearnCommand = "petTalentsLearn"
 GM_bankCommand = "bank"
 GM_dismountPlayerCommand = "dismountPlayer"
+GM_playerSpeedCommand = "playerSpeed"
+GM_playerScaleCommand = "playerScale"
+GM_AllianceJailCommand = "allianceJail"
+GM_HordeJailCommand = "hordeJail"
+
+CHAR_reviveCommand = "revive"
+CHAR_saveCommand = "save"
+CHAR_kickCommand = "kick"
+CHAR_cooldownCommand = "cooldown"
+CHAR_GUIDCommand = "GUID"
+CHAR_playerInfoCommand = "playerInfo"
+CHAR_distanceCommand = "distance"
+CHAR_dieCommand = "die"
+CHAR_recallCommand = "recall"
+CHAR_morphCommand = "morph"
+CHAR_morphResetCommand = "morphReset"
+