From d92dd1a6dd3123c669b92bc35c3a32d6c7dc1bd9 Mon Sep 17 00:00:00 2001 From: Maik Wild Date: Tue, 11 Sep 2018 16:00:49 +0200 Subject: [PATCH] implemented enabled_player_list --- cave_miner.lua | 6 +++++- config.lua | 2 ++ player_list.lua | 21 +++++++++++++-------- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/cave_miner.lua b/cave_miner.lua index 53875e24..1f72844e 100644 --- a/cave_miner.lua +++ b/cave_miner.lua @@ -17,6 +17,10 @@ local simplex_noise = require 'map_gen.shared.simplex_noise' local Event = require 'utils.event' local market_items = require "cave_miner_market_items" +if global.scenario and global.config and global.config.player_list then + global.scenario.config.player_list.enable_coin_col = nil +end + local function create_cave_miner_button(player) local button = player.gui.top.add({ type = "sprite-button", name = "caver_miner_stats_toggle_button", sprite = "item/iron-axe" }) button.style.minimal_height = 38 @@ -952,4 +956,4 @@ Event.add(defines.events.on_pre_player_mined_item, pre_player_mined_item) Event.add(defines.events.on_marked_for_deconstruction, on_marked_for_deconstruction) Event.add(defines.events.on_chunk_generated, on_chunk_generated) Event.add(defines.events.on_tick, on_tick) -Event.add(defines.events.on_player_joined_game, on_player_joined_game) \ No newline at end of file +Event.add(defines.events.on_player_joined_game, on_player_joined_game) diff --git a/config.lua b/config.lua index 0516029c..29a46d9a 100644 --- a/config.lua +++ b/config.lua @@ -7,6 +7,8 @@ global.scenario.variables.player_positions = {} global.player_walk_distances = {} global.scenario.variables.player_deaths = {} global.scenario.config = {} +global.scenario.config.player_list = {} +global.scenario.config.player_list.enable_coin_col = true global.scenario.custom_functions = {} global.scenario.config.nuke_min_time_hours = 3 --how long a player must be on the server to be allowed to use the nuke global.newline = '\n' diff --git a/player_list.lua b/player_list.lua index 590964ae..8933fc9d 100644 --- a/player_list.lua +++ b/player_list.lua @@ -437,18 +437,23 @@ local column_builders = { } local function get_default_player_settings() - return { - columns = { + columns = { sprite_heading_name, player_name_heading_name, time_heading_name, rank_heading_name, - distance_heading_name, - --coin_heading_name, - deaths_heading_name, - poke_name_heading_name, - report_heading_name - }, + distance_heading_name + } + local offset = 6 + if global.scenario.config.player_list.enable_coin_col then + columns[6] = coin_heading_name + offset = 7 + end + columns[offset] = deaths_heading_name, + columns[offset + 1] = poke_name_heading_name, + columns[offset + 2] = report_heading_name + return { + columns = columns, sort = -3 } end