refactor(GM): clean up code

Author: LightDestory

Commands/Commands_Char.lua

@@ -14,6 +14,27 @@
 -- Official repository: https://github.com/LightDestory/AzerothCoreAdmin
 --
 -------------------------------------------------------------------------------------------------------------
+-- Generic Command Template
+--[[
+  [COMMAND_NAME_KEY] = {
+    [GENERICS_isValueNeeded] = false|true,
+    [GENERICS_isParametersNeeded] = false|true,
+    [GENERICS_isTargetCheckNeeded] = false|true,
+    [GENERICS_command] = "command",
+    [GENERICS_message] = "messageID"
+  }
+]]
+CHAR_genericCommands = {
+  [GENERICS_parametersGet] = function()
+    return ma_charactertarget:GetText()
+  end,
+}
+function InitModelFrame()
+  ma_modelframe:SetScript("OnUpdate", function() MangAdminModelOnUpdate(arg1) end)
+  ma_modelframe.rotation = 0.61;
+  ma_modelframe:SetRotation(ma_modelframe.rotation)
+  ma_modelframe:SetUnit("player")
+end
 
 function ModelRotateLeft()
   ma_modelframe.rotation = ma_modelframe.rotation - 0.03
@@ -27,12 +48,20 @@ function ModelRotateRight()
   PlaySound("igInventoryRotateCharacter")
 end
 
-function InitModelFrame()
-  ma_modelframe:SetScript("OnUpdate", function() MangAdminModelOnUpdate(arg1) end)
-  ma_modelframe.rotation = 0.61;
-  ma_modelframe:SetRotation(ma_modelframe.rotation)
-  ma_modelframe:SetUnit("player")
+function CharModelZoomIn()
+  ma_modelframe:SetCamera(0)
+  --ma_modelframe:SetModelScale(ma_modelframe:GetModelScale() + .1)
+  --ma_modelframe:SetPosition(1,ma_modelframe:GetModelScale()*3,0)
+  --ma_modelframe:RefreshUnit()
+end
 
+function CharModelZoomOut()
+  ma_modelframe:SetCamera(1)
+  ma_modelframe:RefreshUnit()
+ -- ma_modelframe:SetCamera(2)
+  --ma_modelframe:SetModelScale(ma_modelframe:GetModelScale() * .5)
+  --ma_modelframe:SetPosition(0,0,0)
+  --ma_modelframe:RefreshUnit()
 end
 
 function MangAdminModelOnUpdate(elapsedTime)
@@ -382,22 +411,6 @@ function ResetDropDownInitialize()
     UIDropDownMenu_SetSelectedValue(ma_resetdropdown, "talents")
 end
 
-function CharModelZoomIn()
-    ma_modelframe:SetCamera(0)
-    --ma_modelframe:SetModelScale(ma_modelframe:GetModelScale() + .1)
-    --ma_modelframe:SetPosition(1,ma_modelframe:GetModelScale()*3,0)
-    --ma_modelframe:RefreshUnit()
-end
-
-function CharModelZoomOut()
-    ma_modelframe:SetCamera(1)
-    ma_modelframe:RefreshUnit()
-   -- ma_modelframe:SetCamera(2)
-    --ma_modelframe:SetModelScale(ma_modelframe:GetModelScale() * .5)
-    --ma_modelframe:SetPosition(0,0,0)
-    --ma_modelframe:RefreshUnit()
-end
-
 function CharBindSight()
     local cname = ma_charactertarget:GetText()
     MangAdmin:ChatMsg(".bindsight")

Commands/Commands_Generics.lua

@@ -17,15 +17,15 @@
 
 function genericClearParametersBox(caller)
     if (caller == "GM") then
-        ma_gmParametersInput:SetText("")
+        GM_parameterInput:SetText("")
     end
 end
 
 function genericBagCommand(caller)
     local player = UnitName("player") or UnitName("target")
     local param = nil
     if (caller == "GM") then
-        param = ma_gmParametersInput:GetText()
+        param = GM_genericCommands[GENERICS_parametersGet]()
     end
     param = (param == nil or param == "" and "0" or param)
     MangAdmin:ChatMsg(".character check bag " .. param)

Commands/Commands_Main.lua

@@ -21,13 +21,14 @@
   [COMMAND_NAME_KEY] = {
     [GENERICS_isValueNeeded] = false|true,
     [GENERICS_isParametersNeeded] = false|true,
+    [GENERICS_isTargetCheckNeeded] = false|true,
     [GENERICS_command] = "command",
     [GENERICS_message] = "messageID"
   }
 ]]
 GM_genericCommands = {
   [GENERICS_parametersGet] = function()
-    return ma_gmParametersInput:GetText()
+    return GM_parameterInput:GetText()
   end,
   [GM_displayAccountGMLevelCommand] = {
     [GENERICS_command] = ".account",
@@ -214,7 +215,7 @@ function GM_GMModeCommand(value)
 end
 
 function GM_createAccountCommand()
-  local input = ma_gmParametersInput:GetText()
+  local input = GM_genericCommands[GENERICS_parametersGet]()
   local params = {}
   local fail = false
   for w in input:gmatch("%w+") do
@@ -242,7 +243,7 @@ function GM_createAccountCommand()
 end
 
 function GM_deleteAccountCommand()
-  local input = ma_gmParametersInput:GetText()
+  local input = GM_genericCommands[GENERICS_parametersGet]()
   local params = {}
   local fail = false
   for w in input:gmatch("%w+") do
@@ -263,7 +264,7 @@ function GM_deleteAccountCommand()
 end
 
 function GM_setAccountGMLevelCommand()
-  local input = ma_gmParametersInput:GetText()
+  local input = GM_genericCommands[GENERICS_parametersGet]()
   local params = {}
   local fail = false
   for w in input:gmatch("%w+") do
@@ -291,7 +292,7 @@ function GM_setAccountGMLevelCommand()
 end
 
 function GM_setAccountPasswordCommand()
-  local input = ma_gmParametersInput:GetText()
+  local input = GM_genericCommands[GENERICS_parametersGet]()
   local params = {}
   local fail = false
   for w in input:gmatch("%w+") do
@@ -323,7 +324,7 @@ function GM_setAccountPasswordCommand()
 end
 
 function GM_setAccountAddonCommand()
-  local input = ma_gmParametersInput:GetText()
+  local input = GM_genericCommands[GENERICS_parametersGet]()
   local params = {}
   local fail = false
   for w in input:gmatch("%w+") do