refactor(GM): Convert cheatTaxi into genericCall

Author: LightDestory

Commands/Commands_Generics.lua

@@ -34,12 +34,23 @@ end
 function genericCaller(dictionaryID, callID, value)
     local dictionary = getCallsDictionary(dictionaryID)
     local call = dictionary[callID]
-    local param = "";
+    local data = {
+        ["value"] = "",
+        ["target"] = nil
+    }
     if call[GENERICS_isValueNeeded] then
-        param = value
+        data['value'] = value
     elseif call[GENERICS_isParametersNeeded] then
-        param = dictionary[GENERICS_parametersGet]()
+        data['value'] = dictionary[GENERICS_parametersGet]()
     end
-    MangAdmin:ChatMsg(call[GENERICS_command].. param)
-    MangAdmin:LogAction(genericLogGenerator(call[GENERICS_message], param))
+    if call[GENERICS_isTargetCheckNeeded] then
+        if commandTargetCheck() then
+            data['target'] = getCommandTargetName()
+        else
+            MangAdmin:Print(Locale["selectionError"])
+            return
+        end
+    end
+    MangAdmin:ChatMsg(call[GENERICS_command].. data['value'])
+    MangAdmin:LogAction(genericLogGenerator(call[GENERICS_message], data))
 end

Commands/Commands_Main.lua

@@ -51,6 +51,12 @@ GM_genericCommands = {
     [GENERICS_isValueNeeded] = true,
     [GENERICS_command] = ".gm visible ",
     [GENERICS_message] = "ma_InvisOnoutput"
+  },
+  [GM_cheatTaxi] = {
+    [GENERICS_isValueNeeded] = true,
+    [GENERICS_isTargetCheckNeeded] = true,
+    [GENERICS_command] = ".cheat taxi ",
+    [GENERICS_message] = "ma_TaxiOnoutput"
   }
 }
 
@@ -60,18 +66,6 @@ function ToggleGMMode(value)
   MangAdmin:LogAction(genericLogGenerator("ma_GMOnoutput",value))
 end
 
-function ToggleTaxicheat(value)
-  if commandTargetCheck() then
-    MangAdmin:ChatMsg(".cheat taxi " .. value)
-    MangAdmin:LogAction(
-      (value == "on" and Locale["genericEnabledText"] or Locale["genericDisabledText"]) ..
-        Locale["ma_TaxiOnoutput"] .. getCommandTargetName()
-    )
-  else
-    MangAdmin:Print(Locale["selectionError"])
-  end
-end
-
 function ToggleMaps(value)
   if commandTargetCheck() then
     MangAdmin:ChatMsg(".cheat explore " .. value)

FunctionInit.lua

@@ -32,8 +32,8 @@ function InitControls()
   MangAdmin:PrepareScript(ma_whisperoffbutton                , Locale["tt_WhispOffButton"]             , function() genericCaller("GM", GM_acceptWhispers, "off") end)
   MangAdmin:PrepareScript(ma_invisibleonbutton               , Locale["tt_InvisOnButton"]              , function() genericCaller("GM", GM_visibility, "off") end)
   MangAdmin:PrepareScript(ma_invisibleoffbutton              , Locale["tt_InvisOffButton"]             , function() genericCaller("GM", GM_visibility, "on") end)
-  MangAdmin:PrepareScript(ma_taxicheatonbutton               , Locale["tt_TaxiOnButton"]               , function() ToggleTaxicheat("on") end)
-  MangAdmin:PrepareScript(ma_taxicheatoffbutton              , Locale["tt_TaxiOffButton"]              , function() ToggleTaxicheat("off") end)
+  MangAdmin:PrepareScript(ma_taxicheatonbutton               , Locale["tt_TaxiOnButton"]               , function() genericCaller("GM", GM_cheatTaxi, "on") end)
+  MangAdmin:PrepareScript(ma_taxicheatoffbutton              , Locale["tt_TaxiOffButton"]              , function() genericCaller("GM", GM_cheatTaxi, "off") end)
   MangAdmin:PrepareScript(ma_mapsonbutton                    , Locale["tt_ShowMapsButton"]             , function() ToggleMaps(1) end)
   MangAdmin:PrepareScript(ma_mapsoffbutton                   , Locale["tt_HideMapsButton"]             , function() ToggleMaps(0) end)
   MangAdmin:PrepareScript(ma_instantkillbutton               , Locale["tt_instakill"]                  , function() InstantKill() end)

Locales/enUS.lua

@@ -224,7 +224,7 @@ function Return_enUS()
     ["ma_GodOnoutput"] = "Turned God-mode to _V1_",
     ["ma_WhisperOnoutput"] = "Turned accepting whispers to _V1_",
     ["ma_InvisOnoutput"] = "Turned your visibility to _V1_",
-    ["ma_TaxiOnoutput"] = " taxi cheat to ",
+    ["ma_TaxiOnoutput"] = "Taxi chat for _T_ has been set to _V1_",
     ["ma_mapsoutput"] = " discover all maps cheat to ",
     ["ma_waterwalkoutput"] = " waterwalk cheat to",
     ["ma_NoCastTimeOnoutput"] = "Turned NoCastTime to ",

Utils/Consts.lua

@@ -5,6 +5,7 @@ GM_KEY = "GM"
 GENERICS_parametersGet = "parametersGet"
 GENERICS_isValueNeeded = "isValueNeeded"
 GENERICS_isParametersNeeded = "isParametersNeeded"
+GENERICS_isTargetCheckNeeded = "isTargetCheckNeeded"
 GENERICS_command = "command"
 GENERICS_message = "message"
 
@@ -14,3 +15,4 @@ GM_flyMode = "flyMode"
 GM_godMode = "godMode"
 GM_acceptWhispers = "acceptWhispers"
 GM_visibility = "visibility"
+GM_cheatTaxi = "cheatTaxi"

Utils/Utils.lua

@@ -23,21 +23,26 @@ function getCommandTargetName()
     return (UnitName("target") or UnitName("player"))
 end
 
-function genericLogGenerator(textID, values)
+function genericLogGenerator(textID, data)
     local log = Locale[textID]
     local params = {}
-    for w in values:gmatch("%w+") do
+    for w in data['value']:gmatch("%w+") do
         table.insert(params, w)
-      end
-    for i=#params, 1, -1 do
+    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 getCallsDictionary(ID)
-    if ID == GM_KEY then return GM_genericCommands
-    else return nil
+    if ID == GM_KEY then
+        return GM_genericCommands
+    else
+        return nil
     end
-end
+end