From 8604b3fced8b5bb9c2f812bf55cacdb1e349eb94 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 21 May 2020 15:50:34 +0100 Subject: [PATCH 1/4] Added version override --- control.lua | 4 ++-- overrides/version.lua | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 overrides/version.lua diff --git a/control.lua b/control.lua index 5658ba42..78565269 100644 --- a/control.lua +++ b/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') diff --git a/overrides/version.lua b/overrides/version.lua new file mode 100644 index 00000000..5afe94d9 --- /dev/null +++ b/overrides/version.lua @@ -0,0 +1,3 @@ +return { + expgaming = '6.0.0' +} \ No newline at end of file From e252d04c2487e7a3f890bc2cd7bde4bc2fd43c28 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 21 May 2020 15:50:53 +0100 Subject: [PATCH 2/4] Fixed desync with interface --- modules/commands/interface.lua | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/commands/interface.lua b/modules/commands/interface.lua index 5f105d45..a826d286 100644 --- a/modules/commands/interface.lua +++ b/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 From 431fe5b89ecb9f70b04b939ebf122173a58191d1 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 21 May 2020 15:51:47 +0100 Subject: [PATCH 3/4] Removed erroneous colours --- config/preset_player_colours.lua | 12 ------------ utils/color_presets.lua | 16 ---------------- 2 files changed, 28 deletions(-) diff --git a/config/preset_player_colours.lua b/config/preset_player_colours.lua index b7e0bde7..4d27adc7 100644 --- a/config/preset_player_colours.lua +++ b/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}, diff --git a/utils/color_presets.lua b/utils/color_presets.lua index 0dd965e4..738b7b73 100644 --- a/utils/color_presets.lua +++ b/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}, From 4aa9aa546632089476b126312026529d631f4bbc Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 21 May 2020 15:53:11 +0100 Subject: [PATCH 4/4] Fixed reason bar on player list --- modules/gui/player-list.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/gui/player-list.lua b/modules/gui/player-list.lua index 3eea3587..5565ca0a 100644 --- a/modules/gui/player-list.lua +++ b/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