From 5b9a55113cd9673963103e4291cd2551789b53b1 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 25 Oct 2018 14:41:38 +0100 Subject: [PATCH] Few Updates --- modules/ExpGamingCore/Role/config.lua | 7 +++++++ modules/ExpGamingLib/control.lua | 3 +-- modules/ExpGamingPlayer/afkKick/control.lua | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/ExpGamingCore/Role/config.lua b/modules/ExpGamingCore/Role/config.lua index b55ee67f..c5b4bcab 100644 --- a/modules/ExpGamingCore/Role/config.lua +++ b/modules/ExpGamingCore/Role/config.lua @@ -4,6 +4,7 @@ Role.add_flag('is_antiroot',function(player,state) player.character.destructible Role.add_flag('is_admin',function(player,state) player.admin = state end) -- highly recomented but not required Role.add_flag('is_spectator',function(player,state) player.spectator = state end) Role.add_flag('is_jail',function(player,state) player.character.active = not state end) +Role.add_flag('allow_afk_kick') Role.add_flag('is_donator') Role.add_flag('is_timed') Role.add_flag('is_varified') @@ -139,6 +140,7 @@ Role{ group='HiMember', colour={r=230,g=99,b=34}, is_donator=true, + allow_afk_kick=true, allow={ ['set-home']=true, ['home']=true, @@ -151,6 +153,7 @@ Role{ tag='[Partner]', group='HiMember', colour={r=140,g=120,b=200}, + allow_afk_kick=true, allow={ ['global-chat']=true, } @@ -163,6 +166,7 @@ Role{ colour={r=140,g=120,b=200}, is_timed=true, is_varified=true, + allow_afk_kick=true, time=600, -- 10 hours allow={ ['tree-decon']=true, @@ -179,6 +183,7 @@ Role{ group='Member', colour={r=24,g=172,b=188}, is_varified=true, + allow_afk_kick=true, allow={ ['edit-tasklist']=true, ['make-warp']=true, @@ -192,6 +197,7 @@ Role{ tag='[Regular]', group='Member', colour={r=79,g=155,b=163}, + allow_afk_kick=true, is_timed=true, time=180, -- 3 hours allow={ @@ -208,6 +214,7 @@ Role{ tag='', group='Guest', colour={r=185,g=187,b=160}, + allow_afk_kick=true, is_default=true, allow={ ['player-list']=true, diff --git a/modules/ExpGamingLib/control.lua b/modules/ExpGamingLib/control.lua index d7f7c97b..c08eb40c 100644 --- a/modules/ExpGamingLib/control.lua +++ b/modules/ExpGamingLib/control.lua @@ -28,7 +28,7 @@ function ExpLib.get_env(level) local level = level and level+1 or 2 local env = setmetatable({},{__index=_G}) while true do - if not debug.getinfo(level-1) then break end + if not debug.getinfo(level) or debug.getinfo(level).namewhat == 'global' then break end local i = 1 while true do local name, value = debug.getlocal(level,i) @@ -36,7 +36,6 @@ function ExpLib.get_env(level) i=i+1 end level=level+1 - if debug.getinfo(level-2).namewhat == 'global' then break end end return env end diff --git a/modules/ExpGamingPlayer/afkKick/control.lua b/modules/ExpGamingPlayer/afkKick/control.lua index 9920c957..0e302ccf 100644 --- a/modules/ExpGamingPlayer/afkKick/control.lua +++ b/modules/ExpGamingPlayer/afkKick/control.lua @@ -12,7 +12,7 @@ local function get_allowed_afk_time(player) if Role then role = Role.get_highest(player) else if player.admin then return else role = Role.meta.default end end local count = #game.connected_players - local base = role.index or false + local base = not role.allow_afk_kick and role.index or false if not base then return false end return (Role.meta.count/base)*count end