From a1ef38fcbd4c64700e0ef60bd6b2112304cb4c33 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 28 May 2020 14:51:36 +0100 Subject: [PATCH 1/4] Fixed Player List --- modules/gui/player-list.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gui/player-list.lua b/modules/gui/player-list.lua index 5565ca0a..3ceeb0df 100644 --- a/modules/gui/player-list.lua +++ b/modules/gui/player-list.lua @@ -57,7 +57,7 @@ Gui.element{ type = 'sprite-button', sprite = 'utility/close_black', tooltip = {'player-list.close-action-bar'}, - style = 'shortcut_bar_button_red' + style = 'slot_sized_button_red' } :style(Gui.sprite_style(30,-1,{ top_margin = -1, right_margin = -1 })) :on_click(function(player,_) @@ -72,7 +72,7 @@ Gui.element{ type = 'sprite-button', sprite = 'utility/confirm_slot', tooltip = {'player-list.reason-confirm'}, - style = 'shortcut_bar_button_green' + style = 'slot_sized_button_green' } :style(Gui.sprite_style(30,-1,{ left_margin = -2, right_margin = -1 })) :on_click(function(player,element) From 20312156c39f0fb82b72d5e98fc5ac10e09ef781 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 28 May 2020 16:05:10 +0100 Subject: [PATCH 2/4] Fix for science gui --- modules/gui/science-info.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/gui/science-info.lua b/modules/gui/science-info.lua index da43c749..f905761d 100644 --- a/modules/gui/science-info.lua +++ b/modules/gui/science-info.lua @@ -58,7 +58,7 @@ end) -- Get the data that is used with the production label local function get_production_label_data(name,tooltip,value,secondary) local data_colour = Production.get_color(config.color_clamp, value, secondary) - local surfix,caption = Production.format_number(value) + local surfix, caption = Production.format_number(value) return { name = name, @@ -108,8 +108,9 @@ Gui.element(function(_,parent,science_pack_data) -- Change the style of the icon local pack_icon_style = pack_icon.style + pack_icon.ignored_by_interaction = true pack_icon_style.height = 55 - if icon_style == 'quick_bar_slot_button' then + if icon_style == 'slot_button' then pack_icon_style.padding = {0,-2} pack_icon_style.width = 36 end @@ -152,14 +153,14 @@ local function get_science_pack_data(player,science_pack) end -- Get the icon style - local icon_style = 'quick_bar_slot_button' + local icon_style = 'slot_button' local flux = Production.get_fluctuations(force, science_pack, defines.flow_precision_index.one_minute) if minute.net > 0 and flux.net > -config.color_flux/2 then - icon_style = 'green_slot_button' + icon_style = 'slot_sized_button_green' elseif flux.net < -config.color_flux then - icon_style = 'red_slot_button' + icon_style = 'slot_sized_button_red' elseif minute.made > 0 then - icon_style = 'selected_slot_button' + icon_style = 'yellow_slot_button' end -- Return the pack data @@ -198,7 +199,7 @@ local function update_science_pack(pack_table,science_pack_data) local pack_icon_style = pack_icon.style pack_icon_style.height = 55 - if icon_style == 'quick_bar_slot_button' then + if icon_style == 'slot_button' then pack_icon_style.padding = {0,-2} pack_icon_style.width = 36 end From 019104e76def3b59311f62b42e04404e8bb59dbb Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 28 May 2020 16:41:34 +0100 Subject: [PATCH 3/4] Fixed Warps and Tasks --- modules/gui/task-list.lua | 2 +- modules/gui/warp-list.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gui/task-list.lua b/modules/gui/task-list.lua index a346bfe9..6bac376c 100644 --- a/modules/gui/task-list.lua +++ b/modules/gui/task-list.lua @@ -139,7 +139,7 @@ local task_editing local confirm_edit = Gui.element{ type = 'sprite-button', - sprite = 'utility/downloaded', + sprite = 'utility/confirm_slot', tooltip = {'task-list.confirm-tooltip'}, style = 'shortcut_bar_button_green' } diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua index 6f25fac1..afac7522 100644 --- a/modules/gui/warp-list.lua +++ b/modules/gui/warp-list.lua @@ -159,7 +159,7 @@ local warp_icon_button local confirm_edit = Gui.element{ type = 'sprite-button', - sprite = 'utility/downloaded', + sprite = 'utility/confirm_slot', tooltip = {'warp-list.confirm-tooltip'}, style = 'shortcut_bar_button_green' } @@ -258,7 +258,7 @@ Gui.element(function(event_trigger,parent,warp) type = 'sprite-button', sprite = 'item/'..warp.icon, tooltip = {'warp-list.goto-tooltip',warp_position.x,warp_position.y}, - style = 'quick_bar_slot_button' + style = 'slot_sized_button' } end) :style(Styles.sprite32) From 5955036c34f7c93d23fd558f11e387e752ebfa9e Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 28 May 2020 16:56:24 +0100 Subject: [PATCH 4/4] Moved discord to ext --- modules/addons/discord-alerts.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/addons/discord-alerts.lua b/modules/addons/discord-alerts.lua index a76c4a79..ab124d84 100644 --- a/modules/addons/discord-alerts.lua +++ b/modules/addons/discord-alerts.lua @@ -69,7 +69,7 @@ local function emit_event(args) end end - write_json('log/discord.log',{ + write_json('ext/discord.out',{ title=title, description=description, color=color,