Merge branch 'patch/6.0.4' into dev

config/preset_player_colours.lua

@@ -24,18 +24,6 @@ return {
 	disallow = { --- @setting disallow colours which will not given to players; the value does not matter it is only the key which is checked
 		black = {r = 0, g = 0, b = 0},
 		white = {r = 255, g = 255, b = 255},
-		jailed = {r = 255, g = 255, b = 255},
-		probation = {r = 255, g = 255, b = 255},
-		guest = {r = 255, g = 255, b = 255},
-		auto_trusted = {r = 192, g = 192, b = 192},
-		regular = {r = 0.155, g = 0.540, b = 0.898},
-		admin = {r = 0.093, g = 0.768, b = 0.172},
-		donator = {r = 172.6, g = 70.2, b = 215.8},
-		[-10] = {r = 255, g = 255, b = 255},
-		[0] = {r = 255, g = 255, b = 255},
-		[10] = {r = 192, g = 192, b = 192},
-		[20] = {r = 0.155, g = 0.540, b = 0.898},
-		[30] = {r = 0.093, g = 0.768, b = 0.172},
 		success = {r = 0, g = 255, b = 0},
 		warning = {r = 255, g = 255, b = 0},
 		fail = {r = 255, g = 0, b = 0},

control.lua

@@ -12,10 +12,10 @@ require 'overrides.stages' -- Data stages used in factorio, often used to test f
 require 'overrides.print' -- Overrides the _G.print function
 require 'overrides.math' -- Omitting the math library is a very bad idea
 require 'overrides.table' -- Adds alot more functions to the table module
+global.version = require 'overrides.version' -- The current version for exp gaming scenario
 inspect = require 'overrides.inspect' -- Used to covert any value into human readable string
 Debug = require 'overrides.debug' -- Global Debug module
-_C = require('expcore.common') -- _C is used to store lots of common functions expected to be used
-global.expgaming_version = '6.0.0' -- The current version for exp gaming scenario
+_C = require 'expcore.common' -- _C is used to store lots of common functions expected to be used
 
 -- Please go to config/file_loader.lua to edit the files that are loaded
 log('[INFO] Getting file loader config')

modules/commands/interface.lua

@@ -29,12 +29,8 @@ end
 
 local interface_env = {} -- used as a persistent sandbox for interface commands
 local interface_callbacks = {} -- saves callbacks which can load new values per use
-Global.register({
-    interface_env = interface_env,
-    interface_callbacks = interface_callbacks
-},function(tbl)
-    interface_env = tbl.interface_env
-    interface_callbacks = tbl.interface_callbacks
+Global.register(interface_env,function(tbl)
+    interface_env = tbl
 end)
 
 --- Adds a callback function when the interface command is used

modules/gui/player-list.lua

@@ -128,6 +128,7 @@ end)
         local old_selected_player_name = Store.get(selected_player_store,player)
         if selected_player_name == old_selected_player_name then
             Store.clear(selected_player_store,player)
+            Store.clear(selected_action_store,player)
         else
             Store.set(selected_player_store,player,selected_player_name)
         end

overrides/version.lua

@@ -0,0 +1,3 @@
+return {
+    expgaming = '6.0.0'
+}

utils/color_presets.lua

@@ -134,28 +134,12 @@ return {
     black = {r = 0, g = 0, b = 0},
     silver = {r = 192, g = 192, b = 192},
     dim_grey = {r = 105, g = 105, b = 105},
-    dim_gray = {r = 105, g = 105, b = 105},
     grey = {r = 128, g = 128, b = 128},
-    gray = {r = 128, g = 128, b = 128},
     dark_grey = {r = 169, g = 169, b = 169},
-    dark_gray = {r = 169, g = 169, b = 169},
     light_grey = {r = 211, g = 211, b = 211},
-    light_gray = {r = 211, g = 211, b = 211},
     gainsboro = {r = 220, g = 220, b = 220},
     white_smoke = {r = 245, g = 245, b = 245},
     white = {r = 255, g = 255, b = 255},
-    jailed = {r = 255, g = 255, b = 255},
-    probation = {r = 255, g = 255, b = 255},
-    guest = {r = 255, g = 255, b = 255},
-    auto_trusted = {r = 192, g = 192, b = 192},
-    regular = {r = 0.155, g = 0.540, b = 0.898},
-    admin = {r = 0.093, g = 0.768, b = 0.172},
-    donator = {r = 172.6, g = 70.2, b = 215.8},
-    [-10] = {r = 255, g = 255, b = 255}, -- probation
-    [0] = {r = 255, g = 255, b = 255}, -- guest
-    [10] = {r = 192, g = 192, b = 192}, -- auto_trusted
-    [20] = {r = 0.155, g = 0.540, b = 0.898}, -- regular
-    [30] = {r = 0.093, g = 0.768, b = 0.172}, -- admin
     success = {r = 0, g = 255, b = 0},
     warning = {r = 255, g = 255, b = 0},
     fail = {r = 255, g = 0, b = 0},