diff --git a/luamods/wolfadmin/admin/admin.lua b/luamods/wolfadmin/admin/admin.lua index 0b7bac6..09fdbf5 100644 --- a/luamods/wolfadmin/admin/admin.lua +++ b/luamods/wolfadmin/admin/admin.lua @@ -15,16 +15,16 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local db = require "luamods.wolfadmin.db.db" +local db = require (wolfa_getLuaPath()..".db.db") -local players = require "luamods.wolfadmin.players.players" --- local stats = require "luamods.wolfadmin.players.stats" +local players = require (wolfa_getLuaPath()..".players.players") +-- local stats = require (wolfa_getLuaPath()..".players.stats") -local constants = require "luamods.wolfadmin.util.constants" -local events = require "luamods.wolfadmin.util.events" -local files = require "luamods.wolfadmin.util.files" -local settings = require "luamods.wolfadmin.util.settings" -local util = require "luamods.wolfadmin.util.util" +local constants = require (wolfa_getLuaPath()..".util.constants") +local events = require (wolfa_getLuaPath()..".util.events") +local files = require (wolfa_getLuaPath()..".util.files") +local settings = require (wolfa_getLuaPath()..".util.settings") +local util = require (wolfa_getLuaPath()..".util.util") local admin = {} diff --git a/luamods/wolfadmin/admin/balancer.lua b/luamods/wolfadmin/admin/balancer.lua index 2b118f5..97f6299 100644 --- a/luamods/wolfadmin/admin/balancer.lua +++ b/luamods/wolfadmin/admin/balancer.lua @@ -15,17 +15,17 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local constants = require "luamods.wolfadmin.util.constants" -local util = require "luamods.wolfadmin.util.util" -local bits = require "luamods.wolfadmin.util.bits" -local tables = require "luamods.wolfadmin.util.tables" -local events = require "luamods.wolfadmin.util.events" -local timers = require "luamods.wolfadmin.util.timers" -local settings = require "luamods.wolfadmin.util.settings" +local constants = require (wolfa_getLuaPath()..".util.constants") +local util = require (wolfa_getLuaPath()..".util.util") +local bits = require (wolfa_getLuaPath()..".util.bits") +local tables = require (wolfa_getLuaPath()..".util.tables") +local events = require (wolfa_getLuaPath()..".util.events") +local timers = require (wolfa_getLuaPath()..".util.timers") +local settings = require (wolfa_getLuaPath()..".util.settings") -local admin = require "luamods.wolfadmin.admin.admin" +local admin = require (wolfa_getLuaPath()..".admin.admin") -local teams = require "luamods.wolfadmin.game.teams" +local teams = require (wolfa_getLuaPath()..".game.teams") local balancer = {} diff --git a/luamods/wolfadmin/admin/bans.lua b/luamods/wolfadmin/admin/bans.lua index a8376ec..b1d6f01 100644 --- a/luamods/wolfadmin/admin/bans.lua +++ b/luamods/wolfadmin/admin/bans.lua @@ -15,12 +15,12 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local db = require "luamods.wolfadmin.db.db" +local db = require (wolfa_getLuaPath()..".db.db") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local events = require "luamods.wolfadmin.util.events" -local settings = require "luamods.wolfadmin.util.settings" +local events = require (wolfa_getLuaPath()..".util.events") +local settings = require (wolfa_getLuaPath()..".util.settings") local bans = {} diff --git a/luamods/wolfadmin/admin/history.lua b/luamods/wolfadmin/admin/history.lua index f0a36ea..0f1d446 100644 --- a/luamods/wolfadmin/admin/history.lua +++ b/luamods/wolfadmin/admin/history.lua @@ -15,12 +15,12 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local db = require "luamods.wolfadmin.db.db" +local db = require (wolfa_getLuaPath()..".db.db") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local events = require "luamods.wolfadmin.util.events" -local settings = require "luamods.wolfadmin.util.settings" +local events = require (wolfa_getLuaPath()..".util.events") +local settings = require (wolfa_getLuaPath()..".util.settings") local history = {} diff --git a/luamods/wolfadmin/admin/mutes.lua b/luamods/wolfadmin/admin/mutes.lua index 68f713f..5ea0a4e 100644 --- a/luamods/wolfadmin/admin/mutes.lua +++ b/luamods/wolfadmin/admin/mutes.lua @@ -15,12 +15,12 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local db = require "luamods.wolfadmin.db.db" +local db = require (wolfa_getLuaPath()..".db.db") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local events = require "luamods.wolfadmin.util.events" -local timers = require "luamods.wolfadmin.util.timers" +local events = require (wolfa_getLuaPath()..".util.events") +local timers = require (wolfa_getLuaPath()..".util.timers") local mutes = {} diff --git a/luamods/wolfadmin/admin/rules.lua b/luamods/wolfadmin/admin/rules.lua index ebb8d95..0eb574d 100644 --- a/luamods/wolfadmin/admin/rules.lua +++ b/luamods/wolfadmin/admin/rules.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local events = require "luamods.wolfadmin.util.events" -local files = require "luamods.wolfadmin.util.files" -local settings = require "luamods.wolfadmin.util.settings" +local events = require (wolfa_getLuaPath()..".util.events") +local files = require (wolfa_getLuaPath()..".util.files") +local settings = require (wolfa_getLuaPath()..".util.settings") local rules = {} diff --git a/luamods/wolfadmin/auth/acl.lua b/luamods/wolfadmin/auth/acl.lua index 754644c..2654693 100644 --- a/luamods/wolfadmin/auth/acl.lua +++ b/luamods/wolfadmin/auth/acl.lua @@ -15,15 +15,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local db = require "luamods.wolfadmin.db.db" +local db = require (wolfa_getLuaPath()..".db.db") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local events = require "luamods.wolfadmin.util.events" -local files = require "luamods.wolfadmin.util.files" -local tables = require "luamods.wolfadmin.util.tables" +local events = require (wolfa_getLuaPath()..".util.events") +local files = require (wolfa_getLuaPath()..".util.files") +local tables = require (wolfa_getLuaPath()..".util.tables") local acl = {} diff --git a/luamods/wolfadmin/auth/auth.lua b/luamods/wolfadmin/auth/auth.lua index 1e5ce4a..9ef003a 100644 --- a/luamods/wolfadmin/auth/auth.lua +++ b/luamods/wolfadmin/auth/auth.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local events = require "luamods.wolfadmin.util.events" -local files = require "luamods.wolfadmin.util.files" -local settings = require "luamods.wolfadmin.util.settings" +local events = require (wolfa_getLuaPath()..".util.events") +local files = require (wolfa_getLuaPath()..".util.files") +local settings = require (wolfa_getLuaPath()..".util.settings") local auth = {} @@ -114,9 +114,9 @@ auth.PERM_IMMUNE = "immune" -- this, but it will suffice. function auth.oninit() if settings.get("g_standalone") == 1 then - srv = require "luamods.wolfadmin.auth.acl" + srv = require (wolfa_getLuaPath()..".auth.acl") else - srv = require "luamods.wolfadmin.auth.shrubbot" + srv = require (wolfa_getLuaPath()..".auth.shrubbot") end if settings.get("g_standalone") == 1 and et.trap_Cvar_Get("g_shrubbot") ~= "" then diff --git a/luamods/wolfadmin/auth/shrubbot.lua b/luamods/wolfadmin/auth/shrubbot.lua index 917e382..f305fd5 100644 --- a/luamods/wolfadmin/auth/shrubbot.lua +++ b/luamods/wolfadmin/auth/shrubbot.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local events = require "luamods.wolfadmin.util.events" -local files = require "luamods.wolfadmin.util.files" +local events = require (wolfa_getLuaPath()..".util.events") +local files = require (wolfa_getLuaPath()..".util.files") -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") local shrubbot = {} diff --git a/luamods/wolfadmin/commands/admin/admintest.lua b/luamods/wolfadmin/commands/admin/admintest.lua index e1b342e..f6f7d24 100644 --- a/luamods/wolfadmin/commands/admin/admintest.lua +++ b/luamods/wolfadmin/commands/admin/admintest.lua @@ -15,13 +15,13 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local settings = require "luamods.wolfadmin.util.settings" +local settings = require (wolfa_getLuaPath()..".util.settings") function commandAdminTest(clientId, cmdArguments) local level = auth.getlevel(clientId) diff --git a/luamods/wolfadmin/commands/admin/balance.lua b/luamods/wolfadmin/commands/admin/balance.lua index deaf442..073b6f6 100644 --- a/luamods/wolfadmin/commands/admin/balance.lua +++ b/luamods/wolfadmin/commands/admin/balance.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luamods.wolfadmin.commands.commands" -local auth = require "luamods.wolfadmin.auth.auth" -local balancer = require "luamods.wolfadmin.admin.balancer" +local commands = require (wolfa_getLuaPath()..".commands.commands") +local auth = require (wolfa_getLuaPath()..".auth.auth") +local balancer = require (wolfa_getLuaPath()..".admin.balancer") function commandBalance(clientId, cmdArguments) if cmdArguments[1] == "enable" then diff --git a/luamods/wolfadmin/commands/admin/ban.lua b/luamods/wolfadmin/commands/admin/ban.lua index bf47ec0..e637c8f 100644 --- a/luamods/wolfadmin/commands/admin/ban.lua +++ b/luamods/wolfadmin/commands/admin/ban.lua @@ -15,15 +15,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local bans = require "luamods.wolfadmin.admin.bans" -local history = require "luamods.wolfadmin.admin.history" +local bans = require (wolfa_getLuaPath()..".admin.bans") +local history = require (wolfa_getLuaPath()..".admin.history") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local util = require "luamods.wolfadmin.util.util" -local settings = require "luamods.wolfadmin.util.settings" +local util = require (wolfa_getLuaPath()..".util.util") +local settings = require (wolfa_getLuaPath()..".util.settings") function commandBan(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luamods/wolfadmin/commands/admin/enablevote.lua b/luamods/wolfadmin/commands/admin/enablevote.lua index e1cf2fe..448c9d1 100644 --- a/luamods/wolfadmin/commands/admin/enablevote.lua +++ b/luamods/wolfadmin/commands/admin/enablevote.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luamods.wolfadmin.commands.commands" -local auth = require "luamods.wolfadmin.auth.auth" -local voting = require "luamods.wolfadmin.game.voting" +local commands = require (wolfa_getLuaPath()..".commands.commands") +local auth = require (wolfa_getLuaPath()..".auth.auth") +local voting = require (wolfa_getLuaPath()..".game.voting") function commandEnableVote(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "chat \"^denablevote: ^9next map voting has been enabled.\";") diff --git a/luamods/wolfadmin/commands/admin/finger.lua b/luamods/wolfadmin/commands/admin/finger.lua index a1ff602..4c6195a 100644 --- a/luamods/wolfadmin/commands/admin/finger.lua +++ b/luamods/wolfadmin/commands/admin/finger.lua @@ -15,14 +15,14 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local settings = require "luamods.wolfadmin.util.settings" -local util = require "luamods.wolfadmin.util.util" +local settings = require (wolfa_getLuaPath()..".util.settings") +local util = require (wolfa_getLuaPath()..".util.util") function commandFinger(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luamods/wolfadmin/commands/admin/gib.lua b/luamods/wolfadmin/commands/admin/gib.lua index 82b559f..239dddc 100644 --- a/luamods/wolfadmin/commands/admin/gib.lua +++ b/luamods/wolfadmin/commands/admin/gib.lua @@ -15,13 +15,13 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local settings = require "luamods.wolfadmin.util.settings" +local settings = require (wolfa_getLuaPath()..".util.settings") function commandGib(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luamods/wolfadmin/commands/admin/greeting.lua b/luamods/wolfadmin/commands/admin/greeting.lua index a76c8ff..22c8d37 100644 --- a/luamods/wolfadmin/commands/admin/greeting.lua +++ b/luamods/wolfadmin/commands/admin/greeting.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local util = require "luamods.wolfadmin.util.util" -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local settings = require "luamods.wolfadmin.util.settings" -local greetings = require "luamods.wolfadmin.players.greetings" +local util = require (wolfa_getLuaPath()..".util.util") +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local settings = require (wolfa_getLuaPath()..".util.settings") +local greetings = require (wolfa_getLuaPath()..".players.greetings") function commandGreeting(clientId, cmdArguments) local greeting = greetings.get(clientId) diff --git a/luamods/wolfadmin/commands/admin/help.lua b/luamods/wolfadmin/commands/admin/help.lua index 47d1529..156d061 100644 --- a/luamods/wolfadmin/commands/admin/help.lua +++ b/luamods/wolfadmin/commands/admin/help.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local settings = require "luamods.wolfadmin.util.settings" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local settings = require (wolfa_getLuaPath()..".util.settings") function commandHelp(clientId, cmdArguments) local cmds = commands.getadmin() diff --git a/luamods/wolfadmin/commands/admin/incognito.lua b/luamods/wolfadmin/commands/admin/incognito.lua index d8d1027..c5807fc 100644 --- a/luamods/wolfadmin/commands/admin/incognito.lua +++ b/luamods/wolfadmin/commands/admin/incognito.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") function commandIncognito(clientId, cmdArguments) local fileName = et.trap_Cvar_Get("g_shrubbot") diff --git a/luamods/wolfadmin/commands/admin/kick.lua b/luamods/wolfadmin/commands/admin/kick.lua index e2c8a08..8e5e044 100644 --- a/luamods/wolfadmin/commands/admin/kick.lua +++ b/luamods/wolfadmin/commands/admin/kick.lua @@ -15,14 +15,14 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local admin = require "luamods.wolfadmin.admin.admin" -local history = require "luamods.wolfadmin.admin.history" +local admin = require (wolfa_getLuaPath()..".admin.admin") +local history = require (wolfa_getLuaPath()..".admin.history") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local settings = require "luamods.wolfadmin.util.settings" +local settings = require (wolfa_getLuaPath()..".util.settings") function commandKick(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luamods/wolfadmin/commands/admin/kickbots.lua b/luamods/wolfadmin/commands/admin/kickbots.lua index 3475379..21a7fae 100644 --- a/luamods/wolfadmin/commands/admin/kickbots.lua +++ b/luamods/wolfadmin/commands/admin/kickbots.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local bots = require "luamods.wolfadmin.game.bots" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local bots = require (wolfa_getLuaPath()..".game.bots") function commandBotsOff(clientId, cmdArguments) bots.enable(false) diff --git a/luamods/wolfadmin/commands/admin/listaliases.lua b/luamods/wolfadmin/commands/admin/listaliases.lua index 6182cd7..cb40514 100644 --- a/luamods/wolfadmin/commands/admin/listaliases.lua +++ b/luamods/wolfadmin/commands/admin/listaliases.lua @@ -15,17 +15,17 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local db = require "luamods.wolfadmin.db.db" +local db = require (wolfa_getLuaPath()..".db.db") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local pagination = require "luamods.wolfadmin.util.pagination" -local settings = require "luamods.wolfadmin.util.settings" -local util = require "luamods.wolfadmin.util.util" +local pagination = require (wolfa_getLuaPath()..".util.pagination") +local settings = require (wolfa_getLuaPath()..".util.settings") +local util = require (wolfa_getLuaPath()..".util.util") function commandListAliases(clientId, cmdArguments) if not db.isconnected() then diff --git a/luamods/wolfadmin/commands/admin/listlevels.lua b/luamods/wolfadmin/commands/admin/listlevels.lua index c62cb02..718b98e 100644 --- a/luamods/wolfadmin/commands/admin/listlevels.lua +++ b/luamods/wolfadmin/commands/admin/listlevels.lua @@ -15,17 +15,17 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local db = require "luamods.wolfadmin.db.db" +local db = require (wolfa_getLuaPath()..".db.db") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local pagination = require "luamods.wolfadmin.util.pagination" -local settings = require "luamods.wolfadmin.util.settings" -local util = require "luamods.wolfadmin.util.util" +local pagination = require (wolfa_getLuaPath()..".util.pagination") +local settings = require (wolfa_getLuaPath()..".util.settings") +local util = require (wolfa_getLuaPath()..".util.util") function commandListLevels(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luamods/wolfadmin/commands/admin/listmaps.lua b/luamods/wolfadmin/commands/admin/listmaps.lua index 14f3bbd..01eafdd 100644 --- a/luamods/wolfadmin/commands/admin/listmaps.lua +++ b/luamods/wolfadmin/commands/admin/listmaps.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local util = require "luamods.wolfadmin.util.util" -local commands = require "luamods.wolfadmin.commands.commands" -local game = require "luamods.wolfadmin.game.game" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local util = require (wolfa_getLuaPath()..".util.util") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local game = require (wolfa_getLuaPath()..".game.game") function commandListMaps(clientId, cmdArguments) local output = "" diff --git a/luamods/wolfadmin/commands/admin/listplayers.lua b/luamods/wolfadmin/commands/admin/listplayers.lua index c2954d0..5e49ced 100644 --- a/luamods/wolfadmin/commands/admin/listplayers.lua +++ b/luamods/wolfadmin/commands/admin/listplayers.lua @@ -15,18 +15,18 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local game = require "luamods.wolfadmin.game.game" -local fireteams = require "luamods.wolfadmin.game.fireteams" +local game = require (wolfa_getLuaPath()..".game.game") +local fireteams = require (wolfa_getLuaPath()..".game.fireteams") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local constants = require "luamods.wolfadmin.util.constants" -local settings = require "luamods.wolfadmin.util.settings" -local util = require "luamods.wolfadmin.util.util" +local constants = require (wolfa_getLuaPath()..".util.constants") +local settings = require (wolfa_getLuaPath()..".util.settings") +local util = require (wolfa_getLuaPath()..".util.util") function commandListPlayers(clientId, cmdArguments) local playersOnline = {} diff --git a/luamods/wolfadmin/commands/admin/lock.lua b/luamods/wolfadmin/commands/admin/lock.lua index 01ef975..4792f21 100644 --- a/luamods/wolfadmin/commands/admin/lock.lua +++ b/luamods/wolfadmin/commands/admin/lock.lua @@ -15,15 +15,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local teams = require "luamods.wolfadmin.game.teams" +local teams = require (wolfa_getLuaPath()..".game.teams") -local util = require "luamods.wolfadmin.util.util" -local constants = require "luamods.wolfadmin.util.constants" -local settings = require "luamods.wolfadmin.util.settings" +local util = require (wolfa_getLuaPath()..".util.util") +local constants = require (wolfa_getLuaPath()..".util.constants") +local settings = require (wolfa_getLuaPath()..".util.settings") function commandLock(clientId, cmdArguments) if cmdArguments[1] == nil or (cmdArguments[1] ~= constants.TEAM_AXIS_SC and cmdArguments[1] ~= constants.TEAM_ALLIES_SC and cmdArguments[1] ~= constants.TEAM_SPECTATORS_SC and cmdArguments[1] ~= "all") then diff --git a/luamods/wolfadmin/commands/admin/mute.lua b/luamods/wolfadmin/commands/admin/mute.lua index 28586f5..14f2d27 100644 --- a/luamods/wolfadmin/commands/admin/mute.lua +++ b/luamods/wolfadmin/commands/admin/mute.lua @@ -15,18 +15,18 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local admin = require "luamods.wolfadmin.admin.admin" -local history = require "luamods.wolfadmin.admin.history" -local mutes = require "luamods.wolfadmin.admin.mutes" +local admin = require (wolfa_getLuaPath()..".admin.admin") +local history = require (wolfa_getLuaPath()..".admin.history") +local mutes = require (wolfa_getLuaPath()..".admin.mutes") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local util = require "luamods.wolfadmin.util.util" -local settings = require "luamods.wolfadmin.util.settings" +local util = require (wolfa_getLuaPath()..".util.util") +local settings = require (wolfa_getLuaPath()..".util.settings") function commandMute(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luamods/wolfadmin/commands/admin/needbots.lua b/luamods/wolfadmin/commands/admin/needbots.lua index 735e5c4..3ca7d0e 100644 --- a/luamods/wolfadmin/commands/admin/needbots.lua +++ b/luamods/wolfadmin/commands/admin/needbots.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local bots = require "luamods.wolfadmin.game.bots" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local bots = require (wolfa_getLuaPath()..".game.bots") function commandBotsOn(clientId, cmdArguments) bots.enable(true) diff --git a/luamods/wolfadmin/commands/admin/nextmap.lua b/luamods/wolfadmin/commands/admin/nextmap.lua index e146ffd..bbcd540 100644 --- a/luamods/wolfadmin/commands/admin/nextmap.lua +++ b/luamods/wolfadmin/commands/admin/nextmap.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local settings = require "luamods.wolfadmin.util.settings" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local settings = require (wolfa_getLuaPath()..".util.settings") function commandNextMap(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dnextmap: ^9next map was loaded.\";") diff --git a/luamods/wolfadmin/commands/admin/pause.lua b/luamods/wolfadmin/commands/admin/pause.lua index 1ae6259..016b824 100644 --- a/luamods/wolfadmin/commands/admin/pause.lua +++ b/luamods/wolfadmin/commands/admin/pause.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local game = require "luamods.wolfadmin.game.game" -local settings = require "luamods.wolfadmin.util.settings" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local game = require (wolfa_getLuaPath()..".game.game") +local settings = require (wolfa_getLuaPath()..".util.settings") function commandPause(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dpause: ^9map paused.\";") diff --git a/luamods/wolfadmin/commands/admin/plock.lua b/luamods/wolfadmin/commands/admin/plock.lua index 9799233..5c59308 100644 --- a/luamods/wolfadmin/commands/admin/plock.lua +++ b/luamods/wolfadmin/commands/admin/plock.lua @@ -15,13 +15,13 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local util = require "luamods.wolfadmin.util.util" +local util = require (wolfa_getLuaPath()..".util.util") function commandPlayerLock(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luamods/wolfadmin/commands/admin/punlock.lua b/luamods/wolfadmin/commands/admin/punlock.lua index 96daa45..35f36aa 100644 --- a/luamods/wolfadmin/commands/admin/punlock.lua +++ b/luamods/wolfadmin/commands/admin/punlock.lua @@ -15,13 +15,13 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local util = require "luamods.wolfadmin.util.util" +local util = require (wolfa_getLuaPath()..".util.util") function commandPlayerUnlock(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luamods/wolfadmin/commands/admin/put.lua b/luamods/wolfadmin/commands/admin/put.lua index e98f785..72bd816 100644 --- a/luamods/wolfadmin/commands/admin/put.lua +++ b/luamods/wolfadmin/commands/admin/put.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local admin = require "luamods.wolfadmin.admin.admin" -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local constants = require "luamods.wolfadmin.util.constants" -local util = require "luamods.wolfadmin.util.util" +local admin = require (wolfa_getLuaPath()..".admin.admin") +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local constants = require (wolfa_getLuaPath()..".util.constants") +local util = require (wolfa_getLuaPath()..".util.util") function commandPlayerLock(clientId, cmdArguments) if cmdArguments[2] == nil or (cmdArguments[2] ~= constants.TEAM_AXIS_SC and cmdArguments[2] ~= constants.TEAM_ALLIES_SC and cmdArguments[2] ~= constants.TEAM_SPECTATORS_SC) then diff --git a/luamods/wolfadmin/commands/admin/putbots.lua b/luamods/wolfadmin/commands/admin/putbots.lua index 135222f..de4ab96 100644 --- a/luamods/wolfadmin/commands/admin/putbots.lua +++ b/luamods/wolfadmin/commands/admin/putbots.lua @@ -15,12 +15,12 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local constants = require "luamods.wolfadmin.util.constants" -local util = require "luamods.wolfadmin.util.util" -local balancer = require "luamods.wolfadmin.admin.balancer" -local commands = require "luamods.wolfadmin.commands.commands" -local bots = require "luamods.wolfadmin.game.bots" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local constants = require (wolfa_getLuaPath()..".util.constants") +local util = require (wolfa_getLuaPath()..".util.util") +local balancer = require (wolfa_getLuaPath()..".admin.balancer") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local bots = require (wolfa_getLuaPath()..".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 diff --git a/luamods/wolfadmin/commands/admin/readconfig.lua b/luamods/wolfadmin/commands/admin/readconfig.lua index 467beaf..0af3432 100644 --- a/luamods/wolfadmin/commands/admin/readconfig.lua +++ b/luamods/wolfadmin/commands/admin/readconfig.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local settings = require "luamods.wolfadmin.util.settings" -local commands = require "luamods.wolfadmin.commands.commands" -local rules = require "luamods.wolfadmin.admin.rules" -local greetings = require "luamods.wolfadmin.players.greetings" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local settings = require (wolfa_getLuaPath()..".util.settings") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local rules = require (wolfa_getLuaPath()..".admin.rules") +local greetings = require (wolfa_getLuaPath()..".players.greetings") function commandReadconfig(clientId, cmdArguments) settings.load() diff --git a/luamods/wolfadmin/commands/admin/reset.lua b/luamods/wolfadmin/commands/admin/reset.lua index a17e2c9..3179d04 100644 --- a/luamods/wolfadmin/commands/admin/reset.lua +++ b/luamods/wolfadmin/commands/admin/reset.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local settings = require "luamods.wolfadmin.util.settings" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local settings = require (wolfa_getLuaPath()..".util.settings") function commandReset(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dreset: ^9match reset.\";") diff --git a/luamods/wolfadmin/commands/admin/resetsprees.lua b/luamods/wolfadmin/commands/admin/resetsprees.lua index b59a1af..3bb32b9 100644 --- a/luamods/wolfadmin/commands/admin/resetsprees.lua +++ b/luamods/wolfadmin/commands/admin/resetsprees.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local db = require "luamods.wolfadmin.db.db" -local commands = require "luamods.wolfadmin.commands.commands" -local game = require "luamods.wolfadmin.game.game" -local sprees = require "luamods.wolfadmin.game.sprees" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local db = require (wolfa_getLuaPath()..".db.db") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local game = require (wolfa_getLuaPath()..".game.game") +local sprees = require (wolfa_getLuaPath()..".game.sprees") function commandResetSprees(clientId, cmdArguments) if not db.isconnected() then diff --git a/luamods/wolfadmin/commands/admin/restart.lua b/luamods/wolfadmin/commands/admin/restart.lua index ec237f9..6fcab25 100644 --- a/luamods/wolfadmin/commands/admin/restart.lua +++ b/luamods/wolfadmin/commands/admin/restart.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local game = require "luamods.wolfadmin.game.game" -local settings = require "luamods.wolfadmin.util.settings" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local game = require (wolfa_getLuaPath()..".game.game") +local settings = require (wolfa_getLuaPath()..".util.settings") function commandRestart(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^drestart: ^9map restarted.\";") diff --git a/luamods/wolfadmin/commands/admin/rules.lua b/luamods/wolfadmin/commands/admin/rules.lua index 7607213..6263f1c 100644 --- a/luamods/wolfadmin/commands/admin/rules.lua +++ b/luamods/wolfadmin/commands/admin/rules.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local rules = require "luamods.wolfadmin.admin.rules" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local rules = require (wolfa_getLuaPath()..".admin.rules") function commandRules(clientId, cmdArguments) if #cmdArguments == 0 then diff --git a/luamods/wolfadmin/commands/admin/setlevel.lua b/luamods/wolfadmin/commands/admin/setlevel.lua index a26b22a..9a1dacd 100644 --- a/luamods/wolfadmin/commands/admin/setlevel.lua +++ b/luamods/wolfadmin/commands/admin/setlevel.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local settings = require "luamods.wolfadmin.util.settings" -local db = require "luamods.wolfadmin.db.db" -local commands = require "luamods.wolfadmin.commands.commands" -local admin = require "luamods.wolfadmin.admin.admin" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local settings = require (wolfa_getLuaPath()..".util.settings") +local db = require (wolfa_getLuaPath()..".db.db") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local admin = require (wolfa_getLuaPath()..".admin.admin") function commandSetLevel(clientId, cmdArguments) if #cmdArguments < 2 then diff --git a/luamods/wolfadmin/commands/admin/showbans.lua b/luamods/wolfadmin/commands/admin/showbans.lua index 93f88c6..6a4d335 100644 --- a/luamods/wolfadmin/commands/admin/showbans.lua +++ b/luamods/wolfadmin/commands/admin/showbans.lua @@ -15,17 +15,17 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local bans = require "luamods.wolfadmin.admin.bans" +local bans = require (wolfa_getLuaPath()..".admin.bans") -local db = require "luamods.wolfadmin.db.db" +local db = require (wolfa_getLuaPath()..".db.db") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local pagination = require "luamods.wolfadmin.util.pagination" -local settings = require "luamods.wolfadmin.util.settings" -local util = require "luamods.wolfadmin.util.util" +local pagination = require (wolfa_getLuaPath()..".util.pagination") +local settings = require (wolfa_getLuaPath()..".util.settings") +local util = require (wolfa_getLuaPath()..".util.util") function commandShowBans(clientId, cmdArguments) if not db.isconnected() then diff --git a/luamods/wolfadmin/commands/admin/showhistory.lua b/luamods/wolfadmin/commands/admin/showhistory.lua index b1950c9..a4f5eb8 100644 --- a/luamods/wolfadmin/commands/admin/showhistory.lua +++ b/luamods/wolfadmin/commands/admin/showhistory.lua @@ -15,17 +15,17 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local history = require "luamods.wolfadmin.admin.history" +local history = require (wolfa_getLuaPath()..".admin.history") -local db = require "luamods.wolfadmin.db.db" +local db = require (wolfa_getLuaPath()..".db.db") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local util = require "luamods.wolfadmin.util.util" -local pagination = require "luamods.wolfadmin.util.pagination" -local settings = require "luamods.wolfadmin.util.settings" +local util = require (wolfa_getLuaPath()..".util.util") +local pagination = require (wolfa_getLuaPath()..".util.pagination") +local settings = require (wolfa_getLuaPath()..".util.settings") function commandListHistory(clientId, cmdArguments) if settings.get("g_standalone") == 0 or not db.isconnected() then diff --git a/luamods/wolfadmin/commands/admin/shuffle.lua b/luamods/wolfadmin/commands/admin/shuffle.lua index 7b6b5e6..fd63023 100644 --- a/luamods/wolfadmin/commands/admin/shuffle.lua +++ b/luamods/wolfadmin/commands/admin/shuffle.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local settings = require "luamods.wolfadmin.util.settings" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local settings = require (wolfa_getLuaPath()..".util.settings") function commandShuffle(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dshuffle: ^9teams were shuffled.\";") diff --git a/luamods/wolfadmin/commands/admin/slap.lua b/luamods/wolfadmin/commands/admin/slap.lua index 3e9e5db..2487ca6 100644 --- a/luamods/wolfadmin/commands/admin/slap.lua +++ b/luamods/wolfadmin/commands/admin/slap.lua @@ -15,13 +15,13 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local settings = require "luamods.wolfadmin.util.settings" +local settings = require (wolfa_getLuaPath()..".util.settings") function commandSlap(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luamods/wolfadmin/commands/admin/sprees.lua b/luamods/wolfadmin/commands/admin/sprees.lua index f91b51e..3661b03 100644 --- a/luamods/wolfadmin/commands/admin/sprees.lua +++ b/luamods/wolfadmin/commands/admin/sprees.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local db = require "luamods.wolfadmin.db.db" -local sprees = require "luamods.wolfadmin.game.sprees" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local db = require (wolfa_getLuaPath()..".db.db") +local sprees = require (wolfa_getLuaPath()..".game.sprees") function commandShowSprees(clientId, cmdArguments) if not db.isconnected() then diff --git a/luamods/wolfadmin/commands/admin/stats.lua b/luamods/wolfadmin/commands/admin/stats.lua index b079607..c0087f5 100644 --- a/luamods/wolfadmin/commands/admin/stats.lua +++ b/luamods/wolfadmin/commands/admin/stats.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local util = require "luamods.wolfadmin.util.util" -local commands = require "luamods.wolfadmin.commands.commands" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local util = require (wolfa_getLuaPath()..".util.util") +local commands = require (wolfa_getLuaPath()..".commands.commands") function commandShowStats(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luamods/wolfadmin/commands/admin/swap.lua b/luamods/wolfadmin/commands/admin/swap.lua index c89ff17..b81ad64 100644 --- a/luamods/wolfadmin/commands/admin/swap.lua +++ b/luamods/wolfadmin/commands/admin/swap.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local settings = require "luamods.wolfadmin.util.settings" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local settings = require (wolfa_getLuaPath()..".util.settings") function commandSwap(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dswap: ^9teams swapped.\";") diff --git a/luamods/wolfadmin/commands/admin/time.lua b/luamods/wolfadmin/commands/admin/time.lua index 522af76..d9077df 100644 --- a/luamods/wolfadmin/commands/admin/time.lua +++ b/luamods/wolfadmin/commands/admin/time.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local settings = require "luamods.wolfadmin.util.settings" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local settings = require (wolfa_getLuaPath()..".util.settings") function commandTime(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dtime: ^9current time is ^7"..os.date("%H:%M:%S").."^9.\";") diff --git a/luamods/wolfadmin/commands/admin/unban.lua b/luamods/wolfadmin/commands/admin/unban.lua index 85062f7..1f104a4 100644 --- a/luamods/wolfadmin/commands/admin/unban.lua +++ b/luamods/wolfadmin/commands/admin/unban.lua @@ -15,15 +15,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local bans = require "luamods.wolfadmin.admin.bans" +local bans = require (wolfa_getLuaPath()..".admin.bans") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local db = require "luamods.wolfadmin.db.db" +local db = require (wolfa_getLuaPath()..".db.db") -local settings = require "luamods.wolfadmin.util.settings" +local settings = require (wolfa_getLuaPath()..".util.settings") function commandRemoveBan(clientId, cmdArguments) if settings.get("g_standalone") == 0 or not db.isconnected() then diff --git a/luamods/wolfadmin/commands/admin/unlock.lua b/luamods/wolfadmin/commands/admin/unlock.lua index e02191b..60f4357 100644 --- a/luamods/wolfadmin/commands/admin/unlock.lua +++ b/luamods/wolfadmin/commands/admin/unlock.lua @@ -15,15 +15,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local teams = require "luamods.wolfadmin.game.teams" +local teams = require (wolfa_getLuaPath()..".game.teams") -local util = require "luamods.wolfadmin.util.util" -local constants = require "luamods.wolfadmin.util.constants" -local settings = require "luamods.wolfadmin.util.settings" +local util = require (wolfa_getLuaPath()..".util.util") +local constants = require (wolfa_getLuaPath()..".util.constants") +local settings = require (wolfa_getLuaPath()..".util.settings") function commandUnlock(clientId, cmdArguments) if cmdArguments[1] == nil or (cmdArguments[1] ~= constants.TEAM_AXIS_SC and cmdArguments[1] ~= constants.TEAM_ALLIES_SC and cmdArguments[1] ~= constants.TEAM_SPECTATORS_SC and cmdArguments[1] ~= "all") then diff --git a/luamods/wolfadmin/commands/admin/unmute.lua b/luamods/wolfadmin/commands/admin/unmute.lua index 20cdcdf..0fc8feb 100644 --- a/luamods/wolfadmin/commands/admin/unmute.lua +++ b/luamods/wolfadmin/commands/admin/unmute.lua @@ -15,15 +15,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local mutes = require "luamods.wolfadmin.admin.mutes" +local mutes = require (wolfa_getLuaPath()..".admin.mutes") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local settings = require "luamods.wolfadmin.util.settings" +local settings = require (wolfa_getLuaPath()..".util.settings") function commandUnmute(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luamods/wolfadmin/commands/admin/unpause.lua b/luamods/wolfadmin/commands/admin/unpause.lua index 18fcea7..10402a8 100644 --- a/luamods/wolfadmin/commands/admin/unpause.lua +++ b/luamods/wolfadmin/commands/admin/unpause.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" -local game = require "luamods.wolfadmin.game.game" -local settings = require "luamods.wolfadmin.util.settings" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") +local game = require (wolfa_getLuaPath()..".game.game") +local settings = require (wolfa_getLuaPath()..".util.settings") function commandUnpause(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dpause: ^9map unpaused.\";") diff --git a/luamods/wolfadmin/commands/admin/vmute.lua b/luamods/wolfadmin/commands/admin/vmute.lua index e076056..aaccbb1 100644 --- a/luamods/wolfadmin/commands/admin/vmute.lua +++ b/luamods/wolfadmin/commands/admin/vmute.lua @@ -15,16 +15,16 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local history = require "luamods.wolfadmin.admin.history" -local mutes = require "luamods.wolfadmin.admin.mutes" +local history = require (wolfa_getLuaPath()..".admin.history") +local mutes = require (wolfa_getLuaPath()..".admin.mutes") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local util = require "luamods.wolfadmin.util.util" +local util = require (wolfa_getLuaPath()..".util.util") function commandVoiceMute(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luamods/wolfadmin/commands/admin/vunmute.lua b/luamods/wolfadmin/commands/admin/vunmute.lua index 2812298..4040868 100644 --- a/luamods/wolfadmin/commands/admin/vunmute.lua +++ b/luamods/wolfadmin/commands/admin/vunmute.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") function commandVoiceUnmute(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luamods/wolfadmin/commands/admin/warn.lua b/luamods/wolfadmin/commands/admin/warn.lua index 18a82d5..e3ea66f 100644 --- a/luamods/wolfadmin/commands/admin/warn.lua +++ b/luamods/wolfadmin/commands/admin/warn.lua @@ -15,18 +15,18 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local admin = require "luamods.wolfadmin.admin.admin" -local history = require "luamods.wolfadmin.admin.history" +local admin = require (wolfa_getLuaPath()..".admin.admin") +local history = require (wolfa_getLuaPath()..".admin.history") -local db = require "luamods.wolfadmin.db.db" +local db = require (wolfa_getLuaPath()..".db.db") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local settings = require "luamods.wolfadmin.util.settings" +local settings = require (wolfa_getLuaPath()..".util.settings") function commandWarn(clientId, cmdArguments) if settings.get("g_warnHistory") == 0 or not db.isconnected() then diff --git a/luamods/wolfadmin/commands/client/ac.lua b/luamods/wolfadmin/commands/client/ac.lua index 93ac448..6094e30 100644 --- a/luamods/wolfadmin/commands/client/ac.lua +++ b/luamods/wolfadmin/commands/client/ac.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") function commandAdminChat(clientId, cmdArguments) if #cmdArguments == 0 then diff --git a/luamods/wolfadmin/commands/client/pm.lua b/luamods/wolfadmin/commands/client/pm.lua index 01a0e40..773d247 100644 --- a/luamods/wolfadmin/commands/client/pm.lua +++ b/luamods/wolfadmin/commands/client/pm.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") function commandPersonalMessage(clientId, cmdArguments) if #cmdArguments > 1 then diff --git a/luamods/wolfadmin/commands/client/r.lua b/luamods/wolfadmin/commands/client/r.lua index 000e201..0f9d6ec 100644 --- a/luamods/wolfadmin/commands/client/r.lua +++ b/luamods/wolfadmin/commands/client/r.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local commands = require "luamods.wolfadmin.commands.commands" +local commands = require (wolfa_getLuaPath()..".commands.commands") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") function commandR(clientId, cmdArguments) if #cmdArguments == 0 then diff --git a/luamods/wolfadmin/commands/client/wolfadmin.lua b/luamods/wolfadmin/commands/client/wolfadmin.lua index 8c3cb58..3b35589 100644 --- a/luamods/wolfadmin/commands/client/wolfadmin.lua +++ b/luamods/wolfadmin/commands/client/wolfadmin.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luamods.wolfadmin.commands.commands" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local commands = require (wolfa_getLuaPath()..".commands.commands") function commandWolfAdmin(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^3This server is running ^7Wolf^1Admin ^7"..wolfa_getVersion().." ^3("..wolfa_getRelease().."^3)\";") diff --git a/luamods/wolfadmin/commands/commands.lua b/luamods/wolfadmin/commands/commands.lua index d33fda1..729ce19 100644 --- a/luamods/wolfadmin/commands/commands.lua +++ b/luamods/wolfadmin/commands/commands.lua @@ -15,19 +15,19 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -require "luamods.wolfadmin.util.debug" +require (wolfa_getLuaPath()..".util.debug") -local admin = require "luamods.wolfadmin.admin.admin" +local admin = require (wolfa_getLuaPath()..".admin.admin") -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local teams = require "luamods.wolfadmin.game.teams" +local teams = require (wolfa_getLuaPath()..".game.teams") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local util = require "luamods.wolfadmin.util.util" -local events = require "luamods.wolfadmin.util.events" -local files = require "luamods.wolfadmin.util.files" +local util = require (wolfa_getLuaPath()..".util.util") +local events = require (wolfa_getLuaPath()..".util.events") +local files = require (wolfa_getLuaPath()..".util.files") local commands = {} @@ -91,7 +91,7 @@ function commands.loadfiles(dir) for _, file in pairs(files) do if string.match(string.lower(file), "^[a-z]+%.lua$") then - require ("luamods.wolfadmin.commands."..dir.."."..string.sub(file, 1, string.len(file) - 4)) + require (wolfa_getLuaPath()..".commands."..dir.."."..string.sub(file, 1, string.len(file) - 4)) amount = amount + 1 end diff --git a/luamods/wolfadmin/commands/server/cannounce.lua b/luamods/wolfadmin/commands/server/cannounce.lua index 16499b0..462076a 100644 --- a/luamods/wolfadmin/commands/server/cannounce.lua +++ b/luamods/wolfadmin/commands/server/cannounce.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luamods.wolfadmin.commands.commands" -local util = require "luamods.wolfadmin.util.util" +local commands = require (wolfa_getLuaPath()..".commands.commands") +local util = require (wolfa_getLuaPath()..".util.util") function commandClientAnnounce(clientId, cmdArguments) local clientId = tonumber(cmdArguments[1]) diff --git a/luamods/wolfadmin/commands/server/cchat.lua b/luamods/wolfadmin/commands/server/cchat.lua index 4bd2017..c7b6e69 100644 --- a/luamods/wolfadmin/commands/server/cchat.lua +++ b/luamods/wolfadmin/commands/server/cchat.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luamods.wolfadmin.commands.commands" -local util = require "luamods.wolfadmin.util.util" +local commands = require (wolfa_getLuaPath()..".commands.commands") +local util = require (wolfa_getLuaPath()..".util.util") function commandClientChatPrint(clientId, cmdArguments) local clientId = tonumber(cmdArguments[1]) diff --git a/luamods/wolfadmin/commands/server/ccp.lua b/luamods/wolfadmin/commands/server/ccp.lua index 6f2ba22..3a1d7a7 100644 --- a/luamods/wolfadmin/commands/server/ccp.lua +++ b/luamods/wolfadmin/commands/server/ccp.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luamods.wolfadmin.commands.commands" -local util = require "luamods.wolfadmin.util.util" +local commands = require (wolfa_getLuaPath()..".commands.commands") +local util = require (wolfa_getLuaPath()..".util.util") function commandClientCenterPrint(clientId, cmdArguments) local clientId = tonumber(cmdArguments[1]) diff --git a/luamods/wolfadmin/commands/server/ccpm.lua b/luamods/wolfadmin/commands/server/ccpm.lua index 9c698d4..d49302d 100644 --- a/luamods/wolfadmin/commands/server/ccpm.lua +++ b/luamods/wolfadmin/commands/server/ccpm.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luamods.wolfadmin.commands.commands" -local util = require "luamods.wolfadmin.util.util" +local commands = require (wolfa_getLuaPath()..".commands.commands") +local util = require (wolfa_getLuaPath()..".util.util") function commandClientCPM(clientId, cmdArguments) local clientId = tonumber(cmdArguments[1]) diff --git a/luamods/wolfadmin/commands/server/cmusic.lua b/luamods/wolfadmin/commands/server/cmusic.lua index 2950f34..904da77 100644 --- a/luamods/wolfadmin/commands/server/cmusic.lua +++ b/luamods/wolfadmin/commands/server/cmusic.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luamods.wolfadmin.commands.commands" -local util = require "luamods.wolfadmin.util.util" +local commands = require (wolfa_getLuaPath()..".commands.commands") +local util = require (wolfa_getLuaPath()..".util.util") function commandClientPlayMusic(clientId, cmdArguments) local clientId = tonumber(cmdArguments[1]) diff --git a/luamods/wolfadmin/commands/server/csay.lua b/luamods/wolfadmin/commands/server/csay.lua index 2746feb..18b2800 100644 --- a/luamods/wolfadmin/commands/server/csay.lua +++ b/luamods/wolfadmin/commands/server/csay.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luamods.wolfadmin.commands.commands" -local util = require "luamods.wolfadmin.util.util" +local commands = require (wolfa_getLuaPath()..".commands.commands") +local util = require (wolfa_getLuaPath()..".util.util") function commandClientConsolePrint(clientId, cmdArguments) local clientId = tonumber(cmdArguments[1]) diff --git a/luamods/wolfadmin/db/db.lua b/luamods/wolfadmin/db/db.lua index 92cce2f..eebbbfc 100644 --- a/luamods/wolfadmin/db/db.lua +++ b/luamods/wolfadmin/db/db.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local util = require "luamods.wolfadmin.util.util" -local events = require "luamods.wolfadmin.util.events" -local settings = require "luamods.wolfadmin.util.settings" +local util = require (wolfa_getLuaPath()..".util.util") +local events = require (wolfa_getLuaPath()..".util.events") +local settings = require (wolfa_getLuaPath()..".util.settings") local db = {} @@ -28,9 +28,9 @@ local con -- this, but it will suffice. function db.oninit() if settings.get("db_type") == "mysql" then - con = require "luamods.wolfadmin.db.mysql" + con = require (wolfa_getLuaPath()..".db.mysql") elseif settings.get("db_type") == "sqlite3" then - con = require "luamods.wolfadmin.db.sqlite3" + con = require (wolfa_getLuaPath()..".db.sqlite3") else error("invalid database system (choose mysql, sqlite3)") end diff --git a/luamods/wolfadmin/db/mysql.lua b/luamods/wolfadmin/db/mysql.lua index f731693..5198459 100644 --- a/luamods/wolfadmin/db/mysql.lua +++ b/luamods/wolfadmin/db/mysql.lua @@ -15,12 +15,12 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local constants = require "luamods.wolfadmin.util.constants" -local util = require "luamods.wolfadmin.util.util" -local settings = require "luamods.wolfadmin.util.settings" -local tables = require "luamods.wolfadmin.util.tables" +local constants = require (wolfa_getLuaPath()..".util.constants") +local util = require (wolfa_getLuaPath()..".util.util") +local settings = require (wolfa_getLuaPath()..".util.settings") +local tables = require (wolfa_getLuaPath()..".util.tables") local luasql = require "luasql.mysql" diff --git a/luamods/wolfadmin/db/sqlite3.lua b/luamods/wolfadmin/db/sqlite3.lua index e549b9e..8462412 100644 --- a/luamods/wolfadmin/db/sqlite3.lua +++ b/luamods/wolfadmin/db/sqlite3.lua @@ -15,12 +15,12 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local constants = require "luamods.wolfadmin.util.constants" -local util = require "luamods.wolfadmin.util.util" -local settings = require "luamods.wolfadmin.util.settings" -local tables = require "luamods.wolfadmin.util.tables" +local constants = require (wolfa_getLuaPath()..".util.constants") +local util = require (wolfa_getLuaPath()..".util.util") +local settings = require (wolfa_getLuaPath()..".util.settings") +local tables = require (wolfa_getLuaPath()..".util.tables") local luasql = require "luasql.sqlite3" diff --git a/luamods/wolfadmin/game/bots.lua b/luamods/wolfadmin/game/bots.lua index a9237d3..db31cce 100644 --- a/luamods/wolfadmin/game/bots.lua +++ b/luamods/wolfadmin/game/bots.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local events = require "luamods.wolfadmin.util.events" -local settings = require "luamods.wolfadmin.util.settings" -local util = require "luamods.wolfadmin.util.util" +local events = require (wolfa_getLuaPath()..".util.events") +local settings = require (wolfa_getLuaPath()..".util.settings") +local util = require (wolfa_getLuaPath()..".util.util") local bots = {} diff --git a/luamods/wolfadmin/game/fireteams.lua b/luamods/wolfadmin/game/fireteams.lua index 037a230..e50e2e9 100644 --- a/luamods/wolfadmin/game/fireteams.lua +++ b/luamods/wolfadmin/game/fireteams.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local teams = require "luamods.wolfadmin.game.teams" +local teams = require (wolfa_getLuaPath()..".game.teams") -local bits = require "luamods.wolfadmin.util.bits" -local constants = require "luamods.wolfadmin.util.constants" -local events = require "luamods.wolfadmin.util.events" +local bits = require (wolfa_getLuaPath()..".util.bits") +local constants = require (wolfa_getLuaPath()..".util.constants") +local events = require (wolfa_getLuaPath()..".util.events") local fireteams = {} diff --git a/luamods/wolfadmin/game/game.lua b/luamods/wolfadmin/game/game.lua index b59419c..809d616 100644 --- a/luamods/wolfadmin/game/game.lua +++ b/luamods/wolfadmin/game/game.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local events = require "luamods.wolfadmin.util.events" -local settings = require "luamods.wolfadmin.util.settings" -local util = require "luamods.wolfadmin.util.util" +local events = require (wolfa_getLuaPath()..".util.events") +local settings = require (wolfa_getLuaPath()..".util.settings") +local util = require (wolfa_getLuaPath()..".util.util") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") local game = {} diff --git a/luamods/wolfadmin/game/sprees.lua b/luamods/wolfadmin/game/sprees.lua index f18b2d2..44cced8 100644 --- a/luamods/wolfadmin/game/sprees.lua +++ b/luamods/wolfadmin/game/sprees.lua @@ -15,17 +15,17 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local db = require "luamods.wolfadmin.db.db" +local db = require (wolfa_getLuaPath()..".db.db") -local game = require "luamods.wolfadmin.game.game" +local game = require (wolfa_getLuaPath()..".game.game") -local players = require "luamods.wolfadmin.players.players" --- local stats = require "luamods.wolfadmin.players.stats" +local players = require (wolfa_getLuaPath()..".players.players") +-- local stats = require (wolfa_getLuaPath()..".players.stats") -local constants = require "luamods.wolfadmin.util.constants" -local events = require "luamods.wolfadmin.util.events" -local files = require "luamods.wolfadmin.util.files" -local settings = require "luamods.wolfadmin.util.settings" +local constants = require (wolfa_getLuaPath()..".util.constants") +local events = require (wolfa_getLuaPath()..".util.events") +local files = require (wolfa_getLuaPath()..".util.files") +local settings = require (wolfa_getLuaPath()..".util.settings") local sprees = {} diff --git a/luamods/wolfadmin/game/teams.lua b/luamods/wolfadmin/game/teams.lua index f4cfea1..406ac35 100644 --- a/luamods/wolfadmin/game/teams.lua +++ b/luamods/wolfadmin/game/teams.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local constants = require "luamods.wolfadmin.util.constants" -local tables = require "luamods.wolfadmin.util.tables" -local events = require "luamods.wolfadmin.util.events" +local constants = require (wolfa_getLuaPath()..".util.constants") +local tables = require (wolfa_getLuaPath()..".util.tables") +local events = require (wolfa_getLuaPath()..".util.events") local teams = {} diff --git a/luamods/wolfadmin/game/voting.lua b/luamods/wolfadmin/game/voting.lua index 34ff657..386d893 100644 --- a/luamods/wolfadmin/game/voting.lua +++ b/luamods/wolfadmin/game/voting.lua @@ -15,13 +15,13 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" -local constants = require "luamods.wolfadmin.util.constants" -local util = require "luamods.wolfadmin.util.util" -local events = require "luamods.wolfadmin.util.events" -local timers = require "luamods.wolfadmin.util.timers" -local settings = require "luamods.wolfadmin.util.settings" -local bots = require "luamods.wolfadmin.game.bots" +local auth = require (wolfa_getLuaPath()..".auth.auth") +local constants = require (wolfa_getLuaPath()..".util.constants") +local util = require (wolfa_getLuaPath()..".util.util") +local events = require (wolfa_getLuaPath()..".util.events") +local timers = require (wolfa_getLuaPath()..".util.timers") +local settings = require (wolfa_getLuaPath()..".util.settings") +local bots = require (wolfa_getLuaPath()..".game.bots") local voting = {} diff --git a/luamods/wolfadmin/main.lua b/luamods/wolfadmin/main.lua index f4d58aa..c309c29 100644 --- a/luamods/wolfadmin/main.lua +++ b/luamods/wolfadmin/main.lua @@ -15,40 +15,39 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -require "luamods.wolfadmin.util.debug" +local constants +local util +local events +local timers +local settings -local constants = require "luamods.wolfadmin.util.constants" -local util = require "luamods.wolfadmin.util.util" -local events = require "luamods.wolfadmin.util.events" -local timers = require "luamods.wolfadmin.util.timers" -local settings = require "luamods.wolfadmin.util.settings" +local db -local db = require "luamods.wolfadmin.db.db" +local admin +local balancer +local bans +local history +local mutes +local rules -local admin = require "luamods.wolfadmin.admin.admin" -local balancer = require "luamods.wolfadmin.admin.balancer" -local bans = require "luamods.wolfadmin.admin.bans" -local history = require "luamods.wolfadmin.admin.history" -local mutes = require "luamods.wolfadmin.admin.mutes" -local rules = require "luamods.wolfadmin.admin.rules" +local commands -local commands = require "luamods.wolfadmin.commands.commands" +local game +local bots +local sprees +local teams +local voting -local game = require "luamods.wolfadmin.game.game" -local bots = require "luamods.wolfadmin.game.bots" -local sprees = require "luamods.wolfadmin.game.sprees" -local teams = require "luamods.wolfadmin.game.teams" -local voting = require "luamods.wolfadmin.game.voting" - -local greetings = require "luamods.wolfadmin.players.greetings" -local players = require "luamods.wolfadmin.players.players" -local stats = require "luamods.wolfadmin.players.stats" +local greetings +local players +local stats local version = "1.2.0-dev" local release = "TBD" local basepath = nil local homepath = nil +local luapath = nil -- game related data local currentLevelTime = nil @@ -74,15 +73,51 @@ function wolfa_getHomePath() return homepath end +function wolfa_getLuaPath() + return luapath +end + function et_InitGame(levelTime, randomSeed, restartMap) - et.RegisterModname("WolfAdmin "..wolfa_getVersion()) - - outputDebug("Module "..wolfa_getVersion().." ("..wolfa_getRelease()..") loaded successfully. Created by Timo 'Timothy' Smit.") - - et.trap_SendConsoleCommand(et.EXEC_APPEND, "sets mod_wolfadmin "..wolfa_getVersion()..";") - + -- set up paths basepath = string.gsub(et.trap_Cvar_Get("fs_basepath"), "\\", "/").."/"..et.trap_Cvar_Get("fs_game").."/" homepath = string.gsub(et.trap_Cvar_Get("fs_homepath"), "\\", "/").."/"..et.trap_Cvar_Get("fs_game").."/" + luapath = string.gsub(debug.getinfo(1).source, "[\\/]", "."):sub(0, -10) + + -- load modules + require (wolfa_getLuaPath()..".util.debug") + + constants = require (wolfa_getLuaPath()..".util.constants") + util = require (wolfa_getLuaPath()..".util.util") + events = require (wolfa_getLuaPath()..".util.events") + timers = require (wolfa_getLuaPath()..".util.timers") + settings = require (wolfa_getLuaPath()..".util.settings") + + db = require (wolfa_getLuaPath()..".db.db") + + admin = require (wolfa_getLuaPath()..".admin.admin") + balancer = require (wolfa_getLuaPath()..".admin.balancer") + bans = require (wolfa_getLuaPath()..".admin.bans") + history = require (wolfa_getLuaPath()..".admin.history") + mutes = require (wolfa_getLuaPath()..".admin.mutes") + rules = require (wolfa_getLuaPath()..".admin.rules") + + commands = require (wolfa_getLuaPath()..".commands.commands") + + game = require (wolfa_getLuaPath()..".game.game") + bots = require (wolfa_getLuaPath()..".game.bots") + sprees = require (wolfa_getLuaPath()..".game.sprees") + teams = require (wolfa_getLuaPath()..".game.teams") + voting = require (wolfa_getLuaPath()..".game.voting") + + greetings = require (wolfa_getLuaPath()..".players.greetings") + players = require (wolfa_getLuaPath()..".players.players") + stats = require (wolfa_getLuaPath()..".players.stats") + + -- register the module + et.RegisterModname("WolfAdmin "..wolfa_getVersion()) + et.trap_SendConsoleCommand(et.EXEC_APPEND, "sets mod_wolfadmin "..wolfa_getVersion()..";") + + outputDebug("Module "..wolfa_getVersion().." ("..wolfa_getRelease()..") loaded successfully. Created by Timo 'Timothy' Smit.") currentLevelTime = levelTime diff --git a/luamods/wolfadmin/players/greetings.lua b/luamods/wolfadmin/players/greetings.lua index cb1e2a0..8cda2f6 100644 --- a/luamods/wolfadmin/players/greetings.lua +++ b/luamods/wolfadmin/players/greetings.lua @@ -15,15 +15,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luamods.wolfadmin.auth.auth" +local auth = require (wolfa_getLuaPath()..".auth.auth") -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") -local constants = require "luamods.wolfadmin.util.constants" -local util = require "luamods.wolfadmin.util.util" -local events = require "luamods.wolfadmin.util.events" -local settings = require "luamods.wolfadmin.util.settings" -local files = require "luamods.wolfadmin.util.files" +local constants = require (wolfa_getLuaPath()..".util.constants") +local util = require (wolfa_getLuaPath()..".util.util") +local events = require (wolfa_getLuaPath()..".util.events") +local settings = require (wolfa_getLuaPath()..".util.settings") +local files = require (wolfa_getLuaPath()..".util.files") local greetings = {} diff --git a/luamods/wolfadmin/players/players.lua b/luamods/wolfadmin/players/players.lua index 6d4adc2..9afd97d 100644 --- a/luamods/wolfadmin/players/players.lua +++ b/luamods/wolfadmin/players/players.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local db = require "luamods.wolfadmin.db.db" +local db = require (wolfa_getLuaPath()..".db.db") -local bits = require "luamods.wolfadmin.util.bits" -local events = require "luamods.wolfadmin.util.events" +local bits = require (wolfa_getLuaPath()..".util.bits") +local events = require (wolfa_getLuaPath()..".util.events") local players = {} diff --git a/luamods/wolfadmin/players/stats.lua b/luamods/wolfadmin/players/stats.lua index c79eb3f..17ddd91 100644 --- a/luamods/wolfadmin/players/stats.lua +++ b/luamods/wolfadmin/players/stats.lua @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local players = require "luamods.wolfadmin.players.players" +local players = require (wolfa_getLuaPath()..".players.players") local stats = {} diff --git a/luamods/wolfadmin/util/debug.lua b/luamods/wolfadmin/util/debug.lua index 809b0f7..b55e0df 100644 --- a/luamods/wolfadmin/util/debug.lua +++ b/luamods/wolfadmin/util/debug.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local constants = require "luamods.wolfadmin.util.constants" -local util = require "luamods.wolfadmin.util.util" -local settings = require "luamods.wolfadmin.util.settings" +local constants = require (wolfa_getLuaPath()..".util.constants") +local util = require (wolfa_getLuaPath()..".util.util") +local settings = require (wolfa_getLuaPath()..".util.settings") local SEVERITY_LEVELS = { [1] = "^_", -- termination diff --git a/luamods/wolfadmin/util/events.lua b/luamods/wolfadmin/util/events.lua index 75741f0..143fc44 100644 --- a/luamods/wolfadmin/util/events.lua +++ b/luamods/wolfadmin/util/events.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local constants = require "luamods.wolfadmin.util.constants" -local util = require "luamods.wolfadmin.util.util" +local constants = require (wolfa_getLuaPath()..".util.constants") +local util = require (wolfa_getLuaPath()..".util.util") local events = {} diff --git a/luamods/wolfadmin/util/files.lua b/luamods/wolfadmin/util/files.lua index 16b2080..2ceada7 100644 --- a/luamods/wolfadmin/util/files.lua +++ b/luamods/wolfadmin/util/files.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local util = require "luamods.wolfadmin.util.util" -local settings = require "luamods.wolfadmin.util.settings" +local util = require (wolfa_getLuaPath()..".util.util") +local settings = require (wolfa_getLuaPath()..".util.settings") local files = {} @@ -25,9 +25,9 @@ function files.ls(directory) local entries = {} if platform == "unix" then - command = 'ls -1 "'..wolfa_getBasePath()..'luamods/wolfadmin/'..directory..'"' + command = 'ls -1 "'..wolfa_getBasePath()..wolfa_getLuaPath():gsub("%.", "/").."/"..directory..'"' elseif platform == "windows" then - command = 'dir "'..wolfa_getBasePath()..'luamods/wolfadmin/'..directory..'" /b' + command = 'dir "'..wolfa_getBasePath()..wolfa_getLuaPath():gsub("%.", "/").."/"..directory..'" /b' end for filename in io.popen(command):lines() do diff --git a/luamods/wolfadmin/util/settings.lua b/luamods/wolfadmin/util/settings.lua index 9fe8d66..693ab60 100644 --- a/luamods/wolfadmin/util/settings.lua +++ b/luamods/wolfadmin/util/settings.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local util = require "luamods.wolfadmin.util.util" -local events = require "luamods.wolfadmin.util.events" +local util = require (wolfa_getLuaPath()..".util.util") +local events = require (wolfa_getLuaPath()..".util.events") local settings = {} @@ -73,7 +73,7 @@ function settings.load() end end - local files = require "luamods.wolfadmin.util.files" + local files = require (wolfa_getLuaPath()..".util.files") local amount, array = files.loadCFG("wolfadmin.cfg", "[a-z]+", true) for blocksname, settings in pairs(array) do diff --git a/luamods/wolfadmin/util/timers.lua b/luamods/wolfadmin/util/timers.lua index 867f479..5c57222 100644 --- a/luamods/wolfadmin/util/timers.lua +++ b/luamods/wolfadmin/util/timers.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local constants = require "luamods.wolfadmin.util.constants" -local util = require "luamods.wolfadmin.util.util" -local events = require "luamods.wolfadmin.util.events" -local tables = require "luamods.wolfadmin.util.tables" +local constants = require (wolfa_getLuaPath()..".util.constants") +local util = require (wolfa_getLuaPath()..".util.util") +local events = require (wolfa_getLuaPath()..".util.events") +local tables = require (wolfa_getLuaPath()..".util.tables") local timers = {} diff --git a/luamods/wolfadmin/util/util.lua b/luamods/wolfadmin/util/util.lua index 1a0a71a..1848064 100644 --- a/luamods/wolfadmin/util/util.lua +++ b/luamods/wolfadmin/util/util.lua @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local constants = require "luamods.wolfadmin.util.constants" +local constants = require (wolfa_getLuaPath()..".util.constants") local util = {}