diff --git a/config.lua b/config.lua index c4243059..bb981e82 100644 --- a/config.lua +++ b/config.lua @@ -1,8 +1,6 @@ global.scenario = {} global.spys = {"valansch", "air20"} global.scenario.variables = {} -global.scenario.variables.mods = require "locale.resources.mods" -global.scenario.variables.regulars = require "locale.resources.regulars" global.scenario.variables.player_positions = {} -- global.scenario.variables.player_walk_distances = {} global.scenario.variables.player_deaths = {} diff --git a/locale/resources/mods.lua b/locale/resources/mods.lua deleted file mode 100644 index 073f3362..00000000 --- a/locale/resources/mods.lua +++ /dev/null @@ -1,10 +0,0 @@ -return -{ -["dpoba"] = "", -["masjazz"] = "", -["-slug-"] = "", -["mbas"] = "", -["selen"] = "", -["sholvo"] = "", -["animal"] = "", -} diff --git a/locale/resources/regulars.lua b/locale/resources/regulars.lua deleted file mode 100644 index 75f16a1d..00000000 --- a/locale/resources/regulars.lua +++ /dev/null @@ -1,126 +0,0 @@ -return -{ -["helpower2"] = "", -["rorror"] = "", -["medival3"] = "", -["dpoba"] = "", -["settdigger"] = "", -["cheeselicker"] = "", -["cpaca0"] = "", -["utidi"] = "", -["jokerofthez"] = "", -["saltlands"] = "", -["maniah"] = "", -["cool"] = "", -["boail"] = "", -["hunter117x"] = "", -["tonytroll"] = "", -["highinfiberoptics"] = "", -["atoms"] = "", -["adlmr"] = "", -["rayijin"] = "", -["sephir"] = "", -["inator1192"] = "", -["tezwo"] = "", -["neumond"] = "", -["bhenoa"] = "", -["jbc363"] = "", -["kaig3n"] = "", -["factorioio"] = "", -["bawz"] = "", -["crazystephen"] = "", -["eithel"] = "", -["coyote101"] = "", -["jedifan"] = "", -["xsidd"] = "", -["maxthespunkymunk"] = "", -["tarpon907"] = "", -["bighamster"] = "", -["sir"] = "", -["arnietom"] = "", -["animal"] = "", -["banakeg"] = "", -["philip017"] = "", -["ninjrkillr"] = "", -["marckhardt"] = "", -["brainclot"] = "", -["blzz"] = "", -["watchinghawk"] = "", -["farcear"] = "", -["selen"] = "", -["trekie4747"] = "", -["gizan"] = "", -["slastraf"] = "", -["zacman0510"] = "", -["theorangeangle"] = "", -["williambellwisdo"] = "", -["extraxyz"] = "", -["markupolioncz"] = "", -["bjhunter"] = "", -["ztx"] = "", -["bigglesthepirate"] = "", -["g-h-o-s-t"] = "", -["wekkka"] = "", -["beelzemon"] = "", -["rododendro"] = "", -["mrkoss"] = "", -["koretego"] = "", -["cogito123"] = "", -["palulukan"] = "", -["radianraze"] = "", -["kostrahb"] = "", -["mafisch3"] = "", -["cydes"] = "", -["ccaspanello"] = "", -["wickvitaminc"] = "", -["newcott"] = "", -["craigrood"] = "", -["lillepallt"] = "", -["skykittena"] = "", -["rico2403"] = "", -["claude47"] = "", -["mrsjaakbraak"] = "", -["heretek"] = "", -["factorian12321"] = "", -["steponitnicejob"] = "", -["cchpucky"] = "", -["rulerofdabacon"] = "", -["tcp"] = "", -["marucan"] = "", -["twltriston"] = "", -["bemm"] = "", -["lordxleasy"] = "", -["judaires"] = "", -["flowild"] = "", -["aalexx"] = "", -["zila"] = "", -["pyroguy"] = "", -["tickterd"] = "", -["trevoqr"] = "", -["pietloke"] = "", -["bloodydevil"] = "", -["mike-_-"] = "", -["asddsa76"] = "", -["tomymy"] = "", -["geckozila"] = "", -["starlite"] = "", -["ducktaperules"] = "", -["tvardero"] = "", -["thethane"] = "", -["lejnel"] = "", -["griffinonetwo"] = "", -["stat0x00"] = "", -["gynox"] = "", -["miniman10000"] = "", -["aliiien0110"] = "", -["gespenstdermaschine"] = "", -["brathahn"] = "", -["leadhades27"] = "", -["sl"] = "", -["phountix"] = "", -["yago2003"] = "", -["saneman"] = "", -["mesohorknee"] = "", -["brl_chacal"] = "", -["spechok"] = "", -} diff --git a/user_groups.lua b/user_groups.lua index a1b69488..61c1455e 100644 --- a/user_groups.lua +++ b/user_groups.lua @@ -1,7 +1,7 @@ function update_group(position) local file = position .. ".lua" game.write_file(file, "{", false, 0) - local group = global.scenario.variables[position] + local group = global[position] local line = "" for player_name,_ in pairs(group) do line = string.format('["%s"] = "",\n', player_name) @@ -16,11 +16,11 @@ function get_actor() end function is_mod(player_name) - return global.scenario.variables.mods[player_name:lower()] + return global.mods[player_name:lower()] end function is_regular(player_name) - return global.scenario.variables.regulars[player_name:lower()] + return global.regulars[player_name:lower()] end function add_regular(player_name) @@ -29,7 +29,7 @@ function add_regular(player_name) else if game.players[player_name] then game.print(actor .. " promoted " .. player_name .. " to regular.") - global.scenario.variables.regulars[player_name:lower()] = "" + global.regulars[player_name:lower()] = "" update_group("regulars") else player_print(player_name .. " does not exist.") @@ -43,7 +43,7 @@ function add_mod(player_name) else if game.players[player_name] then game.print(actor .. " promoted " .. player_name .. " to moderator.") - global.scenario.variables.mods[player_name:lower()] = "" + global.mods[player_name:lower()] = "" update_group("mods") else player_print(player_name .. " does not exist.") @@ -54,25 +54,25 @@ end function remove_regular(player_name) local actor = get_actor() if is_regular(player_name) then game.print(player_name .. " was demoted from regular by " .. actor .. ".") end - global.scenario.variables.regulars[player_name] = nil + global.regulars[player_name] = nil update_group("regulars") end function remove_mod(player_name) local actor = get_actor() if is_mod(player_name) then game.print(player_name .. " was demoted from mod by " .. actor .. ".") end - global.scenario.variables.mods[player_name] = nil + global.mods[player_name] = nil update_group("mods") end function print_regulars() - for k,_ in pairs(global.scenario.variables.regulars) do + for k,_ in pairs(global.regulars) do player_print(k) end end function print_mods() - for k,_ in pairs(global.scenario.variables.mods) do + for k,_ in pairs(global.mods) do player_print(k) end end