From 4887e3925d4a1cc79ebdef9b3b7cd356402d760a Mon Sep 17 00:00:00 2001 From: Monica Moniot Date: Thu, 27 Oct 2022 15:11:11 -0400 Subject: [PATCH] added penalty for no power --- cybersyn/scripts/controller.lua | 6 +++--- cybersyn/scripts/gui.lua | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cybersyn/scripts/controller.lua b/cybersyn/scripts/controller.lua index 592874c..e277e6d 100644 --- a/cybersyn/scripts/controller.lua +++ b/cybersyn/scripts/controller.lua @@ -64,9 +64,9 @@ end ---@param station Station local function get_signals(station) - if station.entity_comb1.valid then - local signals = station.entity_comb1.get_merged_signals(defines.circuit_connector_id.combinator_input) - return signals + local comb = station.entity_comb1 + if comb.valid and (comb.status == defines.entity_status.working or comb.status == defines.entity_status.low_power) then + return comb.get_merged_signals(defines.circuit_connector_id.combinator_input) else return nil end diff --git a/cybersyn/scripts/gui.lua b/cybersyn/scripts/gui.lua index 42aff8c..cdea2fa 100644 --- a/cybersyn/scripts/gui.lua +++ b/cybersyn/scripts/gui.lua @@ -43,9 +43,7 @@ function gui_opened(comb, player) end local window = flib_gui.build(rootgui, { - {type="frame", direction="vertical", ref={"main_window"}, name=COMBINATOR_NAME, actions={ - on_close = {"test"} - }, children={ + {type="frame", direction="vertical", ref={"main_window"}, name=COMBINATOR_NAME, children={ --title bar {type="flow", ref={"titlebar"}, children={ {type="label", style="frame_title", caption={"cybersyn-gui.combinator-title"}, elem_mods={ignored_by_interaction=true}},