From 13c5961d399336506210e64f753dfd81b0d70dd2 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 7 Jun 2018 22:28:42 +0100 Subject: [PATCH] Corrected dependencies --- modules/ExpGamingCore/Gui/src/left.lua | 4 ++-- modules/ExpGamingCore/Ranking/control.lua | 4 ++-- modules/ExpGamingCore/softmod.json | 10 ++++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/ExpGamingCore/Gui/src/left.lua b/modules/ExpGamingCore/Gui/src/left.lua index af76079a..4fa29678 100644 --- a/modules/ExpGamingCore/Gui/src/left.lua +++ b/modules/ExpGamingCore/Gui/src/left.lua @@ -147,13 +147,13 @@ function left._left.toggle(event) if is_type(Ranking,'table') and Ranking.meta.rank_count > 0 then if Ranking.get_rank(player):allowed(_left.name) then open = true else open = {gui.unauthorized} end - end + else open = true end else open = err end else if is_type(Ranking,'table') and Ranking.meta.rank_count > 0 then if Ranking.get_rank(player):allowed(_left.name) then open = true else open = {gui.unauthorized} end - end + else open = true end end if open == true and left.style.visible ~= true then left.style.visible = true diff --git a/modules/ExpGamingCore/Ranking/control.lua b/modules/ExpGamingCore/Ranking/control.lua index afe26af1..b14e0b47 100644 --- a/modules/ExpGamingCore/Ranking/control.lua +++ b/modules/ExpGamingCore/Ranking/control.lua @@ -133,8 +133,8 @@ function Ranking.get_rank(mixed) -- if it is a player name/index, then get player rank; if it is a rank name, get that rank; if it is server or root; return root rank; else nil _return = game and game.players[mixed] and ranks[game.players[mixed].permission_group.name] or table.autokey(ranks,mixed) and table.autokey(ranks,mixed) - or string.contains(mixed,'server') and Ranking.get_rank(Ranking.meta.root) - or string.contains(mixed,'root') and Ranking.get_rank(Ranking.meta.root) + or string.find(mixed,'server') and Ranking.get_rank(Ranking.meta.root) + or string.find(mixed,'root') and Ranking.get_rank(Ranking.meta.root) or nil end return _return diff --git a/modules/ExpGamingCore/softmod.json b/modules/ExpGamingCore/softmod.json index f2a8b377..48771e29 100644 --- a/modules/ExpGamingCore/softmod.json +++ b/modules/ExpGamingCore/softmod.json @@ -3,7 +3,7 @@ "module": "Collection", "description": "Explosive Gaming Core Files", "keywords": ["Library","Lib","ExpGaming","Core"], - "version": "3.4.0", + "version": "4.0.0", "location": "url", "submodules": { "Commands": { @@ -31,7 +31,10 @@ "dependencies": { "FactorioModGui": "^1.0.0", "ExpGamingLib": "^4.0.0", - "ExpGamingCore/Ranking": "^4.0.0", + "FactorioStdLib.Table": "^0.8.0", + "FactorioStdLib.Color": "^0.8.0", + "FactorioStdLib.Game": "^0.8.0", + "ExpGamingCore/Ranking": "?^4.0.0", "ExpGamingCore/Server": "?^4.0.0" } }, @@ -60,6 +63,8 @@ "dependencies": { "ExpGamingLib": "^4.0.0", "FactorioStdLib.Table": "^0.8.0", + "FactorioStdLib.Color": "^0.8.0", + "FactorioStdLib.String": "^0.8.0", "FactorioStdLib.Game": "^0.8.0", "ExpGamingCore.Ranking": "?^4.0.0", "ExpGamingCore.Commands": "?^4.0.0" @@ -75,6 +80,7 @@ "dependencies": { "ExpGamingLib": "^4.0.0", "FactorioStdLib.Color": "^0.8.0", + "FactorioStdLib.Game": "^0.8.0", "FactorioStdLib.Table": "^0.8.0", "ExpGamingCore.Ranking": "?^4.0.0", "ExpGamingCore.Gui": "?^4.0.0"