load client and server commands dynamically (issue #51)

timosmit · Feb 18, 2016 · ae8ae5a · ae8ae5a
1 parent f883b92
commit ae8ae5a
Show file tree

Hide file tree

Showing 26 changed files with 123 additions and 80 deletions.
diff --git a/luascripts/commands/balance.lua → luascripts/commands/admin/balance.lua b/luascripts/commands/balance.lua → luascripts/commands/admin/balance.lua
@@ -15,12 +15,12 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local balancer = require "luascripts.wolfadmin.admin.balancer"
 
 function commandBalance(clientId, cmdArguments)
     balancer.balance(true, (cmdArguments[1] and cmdArguments[1] == "force"))
 
     return true
 end
-commands.register("balance", commandBalance, "p", "either asks the players to even up or evens them by moving or shuffling players", "^2!balance ^9(^hforce^9)")
+commands.addadmin("balance", commandBalance, "p", "either asks the players to even up or evens them by moving or shuffling players", "^2!balance ^9(^hforce^9)")
diff --git a/luascripts/commands/dewarn.lua → luascripts/commands/admin/dewarn.lua b/luascripts/commands/dewarn.lua → luascripts/commands/admin/dewarn.lua
@@ -16,7 +16,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local settings = require "luascripts.wolfadmin.util.settings"
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local warns = require "luascripts.wolfadmin.admin.warns"
 
 function commandRemoveWarn(clientId, cmdArguments)
@@ -25,7 +25,7 @@ function commandRemoveWarn(clientId, cmdArguments)
 
         return true
     elseif #cmdArguments < 2 or tonumber(cmdArguments[2]) == nil then
-        et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^ddewarn usage: "..commands.get("dewarn")["syntax"].."\";")
+        et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^ddewarn usage: "..commands.getadmin("dewarn")["syntax"].."\";")
 
         return true
     elseif tonumber(cmdArguments[1]) == nil then
@@ -56,4 +56,4 @@ function commandRemoveWarn(clientId, cmdArguments)
 
     return true
 end
-commands.register("dewarn", commandRemoveWarn, "R", "remove a warning for a certain player", "^9[^3name|slot#^9] ^9[^3warn#^9]", function() return (settings.get("g_warnHistory") == 0 or settings.get("db_type") == "cfg") end)
+commands.addadmin("dewarn", commandRemoveWarn, "R", "remove a warning for a certain player", "^9[^3name|slot#^9] ^9[^3warn#^9]", function() return (settings.get("g_warnHistory") == 0 or settings.get("db_type") == "cfg") end)
diff --git a/luascripts/commands/enablevote.lua → luascripts/commands/admin/enablevote.lua b/luascripts/commands/enablevote.lua → luascripts/commands/admin/enablevote.lua
@@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local voting = require "luascripts.wolfadmin.game.voting"
 
 function commandEnableVote(clientId, cmdArguments)
@@ -25,4 +25,4 @@ function commandEnableVote(clientId, cmdArguments)
 
     return true
 end
-commands.register("enablevote", commandEnableVote, "c", "enables next map voting")
+commands.addadmin("enablevote", commandEnableVote, "c", "enables next map voting")
diff --git a/luascripts/commands/greeting.lua → luascripts/commands/admin/greeting.lua b/luascripts/commands/greeting.lua → luascripts/commands/admin/greeting.lua
@@ -16,7 +16,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local util = require "luascripts.wolfadmin.util.util"
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local settings = require "luascripts.wolfadmin.util.settings"
 local greetings = require "luascripts.wolfadmin.players.greetings"
 
@@ -29,4 +29,4 @@ function commandGreeting(clientId, cmdArguments)
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dgreeting: ^9you do not have a personal greeting.\";")
     end
 end
-commands.register("greeting", commandGreeting, "Q", "display your personal greeting, if you have one")
+commands.addadmin("greeting", commandGreeting, "Q", "display your personal greeting, if you have one")
diff --git a/luascripts/commands/help.lua → luascripts/commands/admin/help.lua b/luascripts/commands/help.lua → luascripts/commands/admin/help.lua
@@ -15,10 +15,10 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 
 function commandHelp(clientId, cmdArguments)
-    local cmds = commands.get()
+    local cmds = commands.getadmin()
 
     if #cmdArguments == 0 then
         local availableCommands = {}
@@ -66,4 +66,4 @@ function commandHelp(clientId, cmdArguments)
 
     return false
 end
-commands.register("help", commandHelp, "h", "display commands available to you or help on a specific command", "^9(^hcommand^9)", true)
+commands.addadmin("help", commandHelp, "h", "display commands available to you or help on a specific command", "^9(^hcommand^9)", true)
diff --git a/luascripts/commands/incognito.lua → luascripts/commands/admin/incognito.lua b/luascripts/commands/incognito.lua → luascripts/commands/admin/incognito.lua
@@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local stats = require "luascripts.wolfadmin.players.stats"
 
 function commandIncognito(clientId, cmdArguments)
@@ -74,4 +74,4 @@ function commandIncognito(clientId, cmdArguments)
 
     return true
 end
-commands.register("incognito", commandIncognito, "s", "fakes your level to guest (no aka)")
+commands.addadmin("incognito", commandIncognito, "s", "fakes your level to guest (no aka)")
diff --git a/luascripts/commands/kickbots.lua → luascripts/commands/admin/kickbots.lua b/luascripts/commands/kickbots.lua → luascripts/commands/admin/kickbots.lua
@@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local bots = require "luascripts.wolfadmin.game.bots"
 
 function commandBotsOff(clientId, cmdArguments)
@@ -25,4 +25,4 @@ function commandBotsOff(clientId, cmdArguments)
 
     return true
 end
-commands.register("kickbots", commandBotsOff, "O", "kicks all bots from the game")
+commands.addadmin("kickbots", commandBotsOff, "O", "kicks all bots from the game")
diff --git a/luascripts/commands/listaliases.lua → luascripts/commands/admin/listaliases.lua b/luascripts/commands/listaliases.lua → luascripts/commands/admin/listaliases.lua
@@ -18,7 +18,7 @@
 local util = require "luascripts.wolfadmin.util.util"
 local settings = require "luascripts.wolfadmin.util.settings"
 local db = require "luascripts.wolfadmin.db.db"
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local stats = require "luascripts.wolfadmin.players.stats"
 
 function commandListAliases(clientId, cmdArguments)
@@ -27,7 +27,7 @@ function commandListAliases(clientId, cmdArguments)
 
         return true
     elseif cmdArguments[1] == nil then
-        et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dlistaliases usage: "..commands.get("listaliases")["syntax"].."\";")
+        et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dlistaliases usage: "..commands.getadmin("listaliases")["syntax"].."\";")
 
         return true
     elseif tonumber(cmdArguments[1]) == nil then
@@ -71,4 +71,4 @@ function commandListAliases(clientId, cmdArguments)
 
     return true
 end
-commands.register("listaliases", commandListAliases, "f", "display all known aliases for a player", "^9[^3name|slot#^9]", function() return (settings.get("db_type") == "cfg") end)
+commands.addadmin("listaliases", commandListAliases, "f", "display all known aliases for a player", "^9[^3name|slot#^9]", function() return (settings.get("db_type") == "cfg") end)
diff --git a/luascripts/commands/listlevels.lua → luascripts/commands/admin/listlevels.lua b/luascripts/commands/listlevels.lua → luascripts/commands/admin/listlevels.lua
@@ -18,7 +18,7 @@
 local util = require "luascripts.wolfadmin.util.util"
 local settings = require "luascripts.wolfadmin.util.settings"
 local db = require "luascripts.wolfadmin.db.db"
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local stats = require "luascripts.wolfadmin.players.stats"
 
 function commandListLevels(clientId, cmdArguments)
@@ -88,4 +88,4 @@ function commandListLevels(clientId, cmdArguments)
 
     return true
 end
-commands.register("listlevels", commandListLevels, "s", "display all levels on the server")
+commands.addadmin("listlevels", commandListLevels, "s", "display all levels on the server")
diff --git a/luascripts/commands/listmaps.lua → luascripts/commands/admin/listmaps.lua b/luascripts/commands/listmaps.lua → luascripts/commands/admin/listmaps.lua
@@ -16,7 +16,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local util = require "luascripts.wolfadmin.util.util"
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local game = require "luascripts.wolfadmin.game.game"
 
 function commandListMaps(clientId, cmdArguments)
@@ -35,4 +35,4 @@ function commandListMaps(clientId, cmdArguments)
 
     return true
 end
-commands.register("listmaps", commandListMaps, "C", "display the maps in the rotation")
+commands.addadmin("listmaps", commandListMaps, "C", "display the maps in the rotation")
diff --git a/luascripts/commands/needbots.lua → luascripts/commands/admin/needbots.lua b/luascripts/commands/needbots.lua → luascripts/commands/admin/needbots.lua
@@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local bots = require "luascripts.wolfadmin.game.bots"
 
 function commandBotsOn(clientId, cmdArguments)
@@ -25,4 +25,4 @@ function commandBotsOn(clientId, cmdArguments)
 
     return true
 end
-commands.register("needbots", commandBotsOn, "O", "adds bots to the game")
+commands.addadmin("needbots", commandBotsOn, "O", "adds bots to the game")
diff --git a/luascripts/commands/plock.lua → luascripts/commands/admin/plock.lua b/luascripts/commands/plock.lua → luascripts/commands/admin/plock.lua
@@ -16,13 +16,13 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local util = require "luascripts.wolfadmin.util.util"
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local admin = require "luascripts.wolfadmin.admin.admin"
 local stats = require "luascripts.wolfadmin.players.stats"
 
 function commandPlayerLock(clientId, cmdArguments)
     if cmdArguments[1] == nil then
-        et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dplock usage: "..commands.get("vmute")["syntax"].."\";")
+        et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dplock usage: "..commands.getadmin("vmute")["syntax"].."\";")
 
         return true
     elseif tonumber(cmdArguments[1]) == nil then
@@ -61,4 +61,4 @@ function commandPlayerLock(clientId, cmdArguments)
 
     return true
 end
-commands.register("plock", commandPlayerLock, "K", "locks a player to a specific team", "^9[^3name|slot#^9]")
+commands.addadmin("plock", commandPlayerLock, "K", "locks a player to a specific team", "^9[^3name|slot#^9]")
diff --git a/luascripts/commands/punlock.lua → luascripts/commands/admin/punlock.lua b/luascripts/commands/punlock.lua → luascripts/commands/admin/punlock.lua
@@ -16,13 +16,13 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local util = require "luascripts.wolfadmin.util.util"
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local admin = require "luascripts.wolfadmin.admin.admin"
 local stats = require "luascripts.wolfadmin.players.stats"
 
 function commandPlayerUnlock(clientId, cmdArguments)
     if cmdArguments[1] == nil then
-        et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dpunlock usage: "..commands.get("vmute")["syntax"].."\";")
+        et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dpunlock usage: "..commands.getadmin("vmute")["syntax"].."\";")
 
         return true
     elseif tonumber(cmdArguments[1]) == nil then
@@ -53,4 +53,4 @@ function commandPlayerUnlock(clientId, cmdArguments)
 
     return true
 end
-commands.register("punlock", commandPlayerUnlock, "K", "unlocks a player", "^9[^3name|slot#^9]")
+commands.addadmin("punlock", commandPlayerUnlock, "K", "unlocks a player", "^9[^3name|slot#^9]")
diff --git a/luascripts/commands/putbots.lua → luascripts/commands/admin/putbots.lua b/luascripts/commands/putbots.lua → luascripts/commands/admin/putbots.lua
@@ -17,12 +17,12 @@
 
 local constants = require "luascripts.wolfadmin.util.constants"
 local util = require "luascripts.wolfadmin.util.util"
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local bots = require "luascripts.wolfadmin.game.bots"
 
 function commandPutBots(clientId, cmdArguments)
     if cmdArguments[1] == nil and cmdArguments[1] ~= constants.TEAM_AXIS_SC and cmdArguments[1] ~= constants.TEAM_ALLIES_SC and cmdArguments[1] ~= constants.TEAM_SPECTATORS_SC then
-        et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dputbots usage: "..commands.get("vmute")["syntax"].."\";")
+        et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dputbots usage: "..commands.getadmin("vmute")["syntax"].."\";")
 
         return true
     end
@@ -44,4 +44,4 @@ function commandPutBots(clientId, cmdArguments)
 
     return true
 end
-commands.register("putbots", commandPutBots, "p", "puts all bots into a specific team", "^9[r|b|s]")
+commands.addadmin("putbots", commandPutBots, "p", "puts all bots into a specific team", "^9[r|b|s]")
diff --git a/luascripts/commands/readconfig.lua → luascripts/commands/admin/readconfig.lua b/luascripts/commands/readconfig.lua → luascripts/commands/admin/readconfig.lua
@@ -16,7 +16,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local settings = require "luascripts.wolfadmin.util.settings"
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local rules = require "luascripts.wolfadmin.admin.rules"
 local greetings = require "luascripts.wolfadmin.players.greetings"
 
@@ -29,4 +29,4 @@ function commandReadconfig(clientId, cmdArguments)
 
     return false
 end
-commands.register("readconfig", commandReadconfig, "G", "reloads the shrubbot config file and refreshes user flags", nil, true)
+commands.addadmin("readconfig", commandReadconfig, "G", "reloads the shrubbot config file and refreshes user flags", nil, true)
diff --git a/luascripts/commands/resetsprees.lua → luascripts/commands/admin/resetsprees.lua b/luascripts/commands/resetsprees.lua → luascripts/commands/admin/resetsprees.lua
@@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local game = require "luascripts.wolfadmin.game.game"
 local sprees = require "luascripts.wolfadmin.game.sprees"
 
@@ -32,4 +32,4 @@ function commandResetSprees(clientId, cmdArguments)
 
     return true
 end
-commands.register("resetsprees", commandResetSprees, "G", "resets the spree records")
+commands.addadmin("resetsprees", commandResetSprees, "G", "resets the spree records")
diff --git a/luascripts/commands/rules.lua → luascripts/commands/admin/rules.lua b/luascripts/commands/rules.lua → luascripts/commands/admin/rules.lua
@@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local rules = require "luascripts.wolfadmin.admin.rules"
 
 function commandRules(clientId, cmdArguments)
@@ -42,4 +42,4 @@ function commandRules(clientId, cmdArguments)
 
     return true
 end
-commands.register("rules", commandRules, "C", "display the rules on the server", "^9(^hrule^9)")
+commands.addadmin("rules", commandRules, "C", "display the rules on the server", "^9(^hrule^9)")
diff --git a/luascripts/commands/setlevel.lua → luascripts/commands/admin/setlevel.lua b/luascripts/commands/setlevel.lua → luascripts/commands/admin/setlevel.lua
@@ -16,7 +16,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 local settings = require "luascripts.wolfadmin.util.settings"
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local admin = require "luascripts.wolfadmin.admin.admin"
 
 function commandSetLevel(clientId, cmdArguments)
@@ -45,4 +45,4 @@ function commandSetLevel(clientId, cmdArguments)
 
     return false
 end
-commands.register("setlevel", commandSetLevel, "s", "sets the admin level of a player", "^9[^3name|slot#^9] ^9[^3level^9]", true)
+commands.addadmin("setlevel", commandSetLevel, "s", "sets the admin level of a player", "^9[^3name|slot#^9] ^9[^3level^9]", true)
diff --git a/luascripts/commands/showwarns.lua → luascripts/commands/admin/showwarns.lua b/luascripts/commands/showwarns.lua → luascripts/commands/admin/showwarns.lua
@@ -19,7 +19,7 @@ local util = require "luascripts.wolfadmin.util.util"
 local settings = require "luascripts.wolfadmin.util.settings"
 local db = require "luascripts.wolfadmin.db.db"
 
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local warns = require "luascripts.wolfadmin.admin.warns"
 
 function commandShowWarns(clientId, cmdArguments)
@@ -28,7 +28,7 @@ function commandShowWarns(clientId, cmdArguments)
 
         return true
     elseif cmdArguments[1] == nil then
-        et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dshowwarns usage: "..commands.get("showwarns")["syntax"].."\";")
+        et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dshowwarns usage: "..commands.getadmin("showwarns")["syntax"].."\";")
 
         return true
     elseif tonumber(cmdArguments[1]) == nil then
@@ -62,4 +62,4 @@ function commandShowWarns(clientId, cmdArguments)
 
     return true
 end
-commands.register("showwarns", commandShowWarns, "R", "display warnings for a specific player", "^9[^3name|slot#^9]", function() return (settings.get("g_warnHistory") == 0 or settings.get("db_type") == "cfg") end)
+commands.addadmin("showwarns", commandShowWarns, "R", "display warnings for a specific player", "^9[^3name|slot#^9]", function() return (settings.get("g_warnHistory") == 0 or settings.get("db_type") == "cfg") end)
diff --git a/luascripts/commands/sprees.lua → luascripts/commands/admin/sprees.lua b/luascripts/commands/sprees.lua → luascripts/commands/admin/sprees.lua
@@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-local commands = require "luascripts.wolfadmin.commands"
+local commands = require "luascripts.wolfadmin.commands.commands"
 local sprees = require "luascripts.wolfadmin.game.sprees"
 
 function commandShowSprees(clientId, cmdArguments)
@@ -37,4 +37,4 @@ function commandShowSprees(clientId, cmdArguments)
 
     return true
 end
-commands.register("sprees", commandShowSprees, "I", "display the current spree records")
+commands.addadmin("sprees", commandShowSprees, "I", "display the current spree records")