refactor: another generics port

Author: LightDestory

Commands/Commands_Char.lua

@@ -298,9 +298,31 @@ CHAR_genericCommands = {
         [GENERICS_command] = ".damage ",
         [GENERICS_message] = "logCHAR_damage"
     },
+    [CHAR_showAreaCommand] = {
+        [GENERICS_isParametersNeeded] = true,
+        [GENERICS_isTargetCheckNeeded] = true,
+        [GENERICS_command] = ".showarea ",
+        [GENERICS_message] = "logCHAR_showArea"
+    },
+    [CHAR_hideAreaCommand] = {
+        [GENERICS_isParametersNeeded] = true,
+        [GENERICS_isTargetCheckNeeded] = true,
+        [GENERICS_command] = ".hidearea ",
+        [GENERICS_message] = "logCHAR_hideArea"
+    },
+    [CHAR_honorAddCommand] = {
+        [GENERICS_isParametersNeeded] = true,
+        [GENERICS_isTargetCheckNeeded] = true,
+        [GENERICS_command] = ".honor add ",
+        [GENERICS_message] = "logCHAR_honorAdd"
+    },
+    [CHAR_honorUpdateCommand] = {
+        [GENERICS_isTargetCheckNeeded] = true,
+        [GENERICS_command] = ".honor update ",
+        [GENERICS_message] = "logCHAR_honorUpdate"
+    },
 }
 -- Delete
-
 --
 
 function InitModelFrame()
@@ -615,31 +637,3 @@ function ResetDropDownInitialize()
     end
     UIDropDownMenu_SetSelectedValue(ma_resetdropdown, "talents")
 end
-
-function HideAreaButton()
-    local cname = ma_charactertarget:GetText()
-    local npccname = ma_npccharactertarget:GetText()
-    MangAdmin:ChatMsg(".hidearea " .. cname)
-    MangAdmin:LogAction(".hidearea " .. cname .. ".")
-end
-
-function ShowAreaButton()
-    local cname = ma_charactertarget:GetText()
-    local npccname = ma_npccharactertarget:GetText()
-    MangAdmin:ChatMsg(".showarea " .. cname)
-    MangAdmin:LogAction(".showarea " .. cname .. ".")
-end
-
-function HonorAddButton()
-    local cname = ma_charactertarget:GetText()
-    local npccname = ma_npccharactertarget:GetText()
-    MangAdmin:ChatMsg(".honor add " .. cname)
-    MangAdmin:LogAction(".honor add " .. cname .. ".")
-end
-
-function HonorUpdateButton()
-    local cname = ma_charactertarget:GetText()
-    local npccname = ma_npccharactertarget:GetText()
-    MangAdmin:ChatMsg(".honor update ")
-    MangAdmin:LogAction(".honor update.")
-end

Commands/Commands_Generics.lua

@@ -34,8 +34,10 @@ function getCallsDictionary(ID)
 end
 
 function genericClearParametersBox(caller)
-    if (caller == "GM") then
+    if (caller == GM_KEY) then
         GM_parameterInput:SetText("")
+    elseif (caller == CHAR_KEY) then
+        CHAR_parameterInput:setText("")
     end
 end
 

Commands/declarations/command_keys.lua

@@ -98,7 +98,6 @@ CHAR_deleteGuildCommand = "deleteGuild"
 CHAR_inviteGuildCommand = "inviteGuild"
 CHAR_uninviteGuildCommand = "uninviteGuild"
 CHAR_rankGuildCommand = "rankGuild"
-
 CHAR_muteCommand = "mute"
 CHAR_unmuteCommand = "unmute"
 CHAR_auraCommand = "aura"
@@ -110,3 +109,7 @@ CHAR_questAddCommand = "questAdd"
 CHAR_questRemoveCommand = "questRemove"
 CHAR_questCompleteCommand = "questComplete"
 CHAR_damageCommand = "damage"
+CHAR_showAreaCommand = "showArea"
+CHAR_hideAreaCommand = "hideArea"
+CHAR_honorAddCommand = "honorAdd"
+CHAR_honorUpdateCommand = "honorUpdate"

Frames/MangFrames_SectionChar.lua

@@ -1294,11 +1294,11 @@ function MangAdmin:CreateCharSection()
     })
 
     FrameLib:BuildButton({
-        name = "ma_hideareabutton",
+        name = "CHAR_hideAreaButton",
         group = "char",
         parent = ma_midframe,
         texture = {
-            name = "ma_hideareabutton_texture",
+            name = "CHAR_hideAreaButton_texture",
             color = { color.btn.r, color.btn.g, color.btn.b, transparency.btn }
         },
         size = {
@@ -1310,15 +1310,15 @@ function MangAdmin:CreateCharSection()
             offX = 548, --charColSix
             offY = -30 --charRowOne
         },
-        text = Locale["ma_HideAreaButton"]
+        text = Locale["labelCHAR_hideAreaButton"]
     })
 
     FrameLib:BuildButton({
-        name = "ma_showareabutton",
+        name = "CHAR_showAreaButton",
         group = "char",
         parent = ma_midframe,
         texture = {
-            name = "ma_showareabutton_texture",
+            name = "CHAR_showAreaButton_texture",
             color = { color.btn.r, color.btn.g, color.btn.b, transparency.btn }
         },
         size = {
@@ -1330,15 +1330,15 @@ function MangAdmin:CreateCharSection()
             offX = 467, --charColFive
             offY = -30 --charRowOne
         },
-        text = Locale["ma_ShowAreaButton"]
+        text = Locale["labelCHAR_showAreaButton"]
     })
 
     FrameLib:BuildButton({
-        name = "ma_honoraddbutton",
+        name = "CHAR_honorAddButton",
         group = "char",
         parent = ma_midframe,
         texture = {
-            name = "ma_honoraddbutton_texture",
+            name = "CHAR_honorAddButton_texture",
             color = { color.btn.r, color.btn.g, color.btn.b, transparency.btn }
         },
         size = {
@@ -1350,15 +1350,15 @@ function MangAdmin:CreateCharSection()
             offX = 467, --charColFive
             offY = -204 --charRowNine
         },
-        text = Locale["ma_HonorAddButton"]
+        text = Locale["labelCHAR_honorAddButton"]
     })
 
     FrameLib:BuildButton({
-        name = "ma_honorupdatebutton",
+        name = "CHAR_honorUpdateButton",
         group = "char",
         parent = ma_midframe,
         texture = {
-            name = "ma_honorupdatebutton_texture",
+            name = "CHAR_honorUpdateButton_texture",
             color = { color.btn.r, color.btn.g, color.btn.b, transparency.btn }
         },
         size = {
@@ -1370,7 +1370,7 @@ function MangAdmin:CreateCharSection()
             offX = 548, --charColSix
             offY = -204 --charRowNine
         },
-        text = Locale["ma_HonorUpdateButton"]
+        text = Locale["labelCHAR_honorUpdateButton"]
     })
 
     FrameLib:BuildFontString({
@@ -1396,7 +1396,7 @@ function MangAdmin:CreateCharSection()
         },
         setpoint = {
             pos = "BOTTOMLEFT",
-            offX = 292,
+            offX = 305,
             offY = 4
         },
         inherits = "InputBoxTemplate"

FunctionInit.lua

@@ -970,31 +970,31 @@ function InitControls()
             end
     )
     MangAdmin:PrepareScript(
-            ma_hideareabutton,
-            Locale["tt_HideAreaButton"],
+            CHAR_hideAreaButton,
+            Locale["ttCHAR_hideArea"],
             function()
-                HideAreaButton()
+                genericCaller(CHAR_KEY, CHAR_hideAreaCommand)
             end
     )
     MangAdmin:PrepareScript(
-            ma_showareabutton,
-            Locale["tt_ShowAreaButton"],
+            CHAR_showAreaButton,
+            Locale["ttCHAR_showArea"],
             function()
-                ShowAreaButton()
+                genericCaller(CHAR_KEY, CHAR_showAreaCommand)
             end
     )
     MangAdmin:PrepareScript(
-            ma_honoraddbutton,
-            Locale["tt_HonorAddButton"],
+            CHAR_honorAddButton,
+            Locale["ttCHAR_honorAdd"],
             function()
-                HonorAddButton()
+                genericCaller(CHAR_KEY, CHAR_honorAddCommand)
             end
     )
     MangAdmin:PrepareScript(
-            ma_honorupdatebutton,
-            Locale["tt_HonorUpdateButton"],
+            CHAR_honorUpdateButton,
+            Locale["ttCHAR_honorUpdate"],
             function()
-                HonorUpdateButton()
+                genericCaller(CHAR_KEY, CHAR_honorUpdateCommand)
             end
     )
 

Locales/enUS.lua

@@ -58,7 +58,7 @@ function Return_enUS()
     ["tt_languageButton"] = "Reload AzerothCoreAdmin.", --Removed locals. Updated tooltip to just reload
     ["tt_closeWindow"] = "Close AzerothCoreAdmin",
     ["tt_clearParameterBox"] = "Clears the parameter box.",
-    ["tt_bag"] = "Show the bag of the selected character or yours [[Parameters: $bagSlot: 1-4]]",
+    ["tt_bag"] = "Show the bag of the selected character or yours [[Parameters: $bagSlot: 0-4]]",
     --[[General-Control Labels]]
     ["label_languageButton"] = "Change language",
     ["label_infoRevision"] = "|cFF00FF00AzerothCore rev:|r ", --Updated: Matched string output to AzerothCore
@@ -328,6 +328,10 @@ function Return_enUS()
     ["ttCHAR_questRemove"] = "Removes the specified quest from **selected** player [[Parameters: $questID]]",
     ["ttCHAR_questComplete"] = "Marks the specified quest as complete for **selected** player [[Parameters: $questID]]",
     ["ttCHAR_damage"] = "Applies the specified amount of damage to the selected Unit [[Parameters: #damageAmount]]",
+    ["ttCHAR_showArea"] = "Shows the specified area to the **selected** player [[Parameters: $areaID]]",
+    ["ttCHAR_hideArea"] = "Hides the specified area to the **selected** player [[Parameters: $areaID]]",
+    ["ttCHAR_honorAdd"] = "Adds the specified amount of honor points to the **selected** player [[ParameterS: $pointsAmount]]",
+    ["ttCHAR_honorUpdate"] = "Saves Honor for **selected** player",
 
     --[[CHAR-Control-Labels]]
     ["labelCHAR_killButton"] = "Kill",
@@ -380,6 +384,10 @@ function Return_enUS()
     ["labelCHAR_questRemoveButton"] = "QuestRem",
     ["labelCHAR_questCompleteButton"] = "QuestCompl",
     ["labelCHAR_damageButton"] = "Damage",
+    ["labelCHAR_showAreaButton"] = "ShowArea",
+    ["labelCHAR_hideAreaButton"] = "HideArea",
+    ["labelCHAR_honorAddButton"] = "HonorAdd",
+    ["labelCHAR_honorUpdateButton"] = "HonorUpdt",
 
     --[[CHAR-Commands Output]]
     ["logCHAR_kill"] = "_T_ has been killed",
@@ -433,6 +441,11 @@ function Return_enUS()
     ["logCHAR_questComplete"] = "Set questID _V1_ as completed to _T_",
     ["logCHAR_damage"] = "Applied _V1_ damage to _T_",
 
+    ["logCHAR_showArea"] = "Showed areaID _V1_ to _T_",
+    ["logCHAR_hideArea"] = "Hide areaID _V1_ to _T_",
+    ["logCHAR_honorAdd"] = "Added _V1_ honor points to _T_",
+    ["logCHAR_honorUpdate"] = "Updated honor of _T_",
+
     ["tt_RotateLeft"] = "Rotate left.",
     ["tt_RotateRight"] = "Rotate right.",
     ["tt_ShowMapsCharButton"] = "Reveals maps for the selected character.",
@@ -442,10 +455,6 @@ function Return_enUS()
     ["tt_resetbutton"] = "Reset the selected attribute",
     ["tt_modelzoominbutton"] = "Zoom in the selected model",
     ["tt_modelzoomoutbutton"] = "Zoom out the selected model",
-    ["tt_HideAreaButton"] = "Hides #areaid from **selected** player.",
-    ["tt_ShowAreaButton"] = "Shows #areaid to **selected** player.",
-    ["tt_HonorAddButton"] = "Adds #honorpoints to **selected** player.",
-    ["tt_HonorUpdateButton"] = "No parameter required. Saves Honor for **selected** player.",
 
     ["ma_ShowMapsButton"] = "Show Maps",
     ["ma_HideMapsButton"] = "Hide Maps",
@@ -456,12 +465,6 @@ function Return_enUS()
     ["ma_Modify"] = "Modify",
     ["ma_Reset"] = "Reset",
 
-
-
-    ["ma_HideAreaButton"] = "HideArea",
-    ["ma_ShowAreaButton"] = "ShowArea",
-    ["ma_HonorAddButton"] = "HonorAdd",
-    ["ma_HonorUpdateButton"] = "HonorUpdt",
     --[[Other]]
     ["ma_LevelUp"] = "Level up",
     ["ma_LevelDown"] = "Level down",