Merge branch 'core'

Addons/playerRanks.lua

@@ -98,7 +98,7 @@ groups['Root']:add_rank{
     time=nil,
     colour={r=170,g=0,b=0},
     is_admin = true,
-    max_afk_time=false
+    base_afk_time=false
 }
 groups['Root']:add_rank{
     name='Community Manager',
@@ -106,7 +106,7 @@ groups['Root']:add_rank{
     tag='[Com Mngr]',
     colour={r=150,g=68,b=161},
     is_admin = true,
-    max_afk_time=false
+    base_afk_time=false
 }
 groups['Root']:add_rank{
     name='Developer',
@@ -114,7 +114,7 @@ groups['Root']:add_rank{
     tag='[Dev]',
     colour={r=179,g=125,b=46},
     is_admin = true,
-    max_afk_time=false
+    base_afk_time=false
 }
 
 groups['Admin']:add_rank{
@@ -126,7 +126,7 @@ groups['Admin']:add_rank{
         'server_command'
     },
     is_admin = true,
-    max_afk_time=false
+    base_afk_time=false
 }
 
 groups['User']:add_rank{
@@ -135,7 +135,7 @@ groups['User']:add_rank{
     tag='[P2W]',
     colour={r=233,g=63,b=233},
     power=0,
-    max_afk_time=120
+    base_afk_time=120
 }
 groups['User']:add_rank{
     name='Veteran',
@@ -144,7 +144,7 @@ groups['User']:add_rank{
     time=600,
     colour={r=140,g=120,b=200},
     power=1,
-    max_afk_time=60
+    base_afk_time=60
 }
 groups['User']:add_rank{
     name='Regular',
@@ -153,7 +153,7 @@ groups['User']:add_rank{
     time=180,
     colour={r=24,g=172,b=188},
     power=3,
-    max_afk_time=30
+    base_afk_time=30
 }
 
 local ranks = Ranking._ranks(true)

ExpCore/ranking.lua

@@ -21,7 +21,7 @@ function Ranking.output_ranks(player)
         local admin = 'No'; if rank.is_root then admin = 'Root' elseif rank.is_admin then admin = 'Yes' end
         output=output..' Admin: '..admin
         output=output..' Group: '..rank.group.name
-        output=output..' AFK: '..tostring(rank.max_afk_time)
+        output=output..' AFK: '..tostring(rank.base_afk_time)
         player_return(output,rank.colour,player)
     end
 end

ExpCore/ranks.lua

@@ -109,7 +109,7 @@ root:add_rank{
     colour=defines.color.white,
     is_root=true,
     is_admin = true,
-    max_afk_time=false
+    base_afk_time=false
 }
 
 admin:add_rank{
@@ -119,7 +119,7 @@ admin:add_rank{
     colour={r=233,g=63,b=233},
     is_admin = true
     ,
-    max_afk_time=false
+    base_afk_time=false
 }
 
 user:add_rank{
@@ -132,7 +132,7 @@ user:add_rank{
         'change_programmable_speaker_alert_parameters',
         'drop_item'
     },
-    max_afk_time=60
+    base_afk_time=60
 }
 user:add_rank{
     name='Guest',
@@ -147,7 +147,7 @@ user:add_rank{
         'reset_assembling_machine',
         'cancel_research'
     },
-    max_afk_time=10
+    base_afk_time=10
 }
 
 jail:add_rank{
@@ -156,7 +156,7 @@ jail:add_rank{
     tag='[Jail]',
     colour={r=50,g=50,b=50},
     disallow={},
-    max_afk_time=false
+    base_afk_time=false
 }
 
 function Ranking._auto_edit_ranks()