diff --git a/modules/addons/discord-alerts.lua b/modules/addons/discord-alerts.lua index a62f81cb..4d5f95c8 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, diff --git a/modules/gui/player-list.lua b/modules/gui/player-list.lua index 82f31503..497c6793 100644 --- a/modules/gui/player-list.lua +++ b/modules/gui/player-list.lua @@ -58,7 +58,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, _) @@ -73,7 +73,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) diff --git a/modules/gui/science-info.lua b/modules/gui/science-info.lua index b341268e..92a08eee 100644 --- a/modules/gui/science-info.lua +++ b/modules/gui/science-info.lua @@ -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 diff --git a/modules/gui/task-list.lua b/modules/gui/task-list.lua index b450a23e..bdc57818 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 3f7aa51a..7ea20b12 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)