From 5fc8912590e2697b8a4d7536dbb5ed11d0fda725 Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Wed, 26 Feb 2025 13:08:58 -0500 Subject: [PATCH] #480 fixed aux coolant connection to boilers with emergency coolant --- coordinator/startup.lua | 2 +- coordinator/ui/components/unit_flow.lua | 6 ++++-- coordinator/ui/layout/flow_view.lua | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/coordinator/startup.lua b/coordinator/startup.lua index c57db52..72fdef4 100644 --- a/coordinator/startup.lua +++ b/coordinator/startup.lua @@ -19,7 +19,7 @@ local renderer = require("coordinator.renderer") local sounder = require("coordinator.sounder") local threads = require("coordinator.threads") -local COORDINATOR_VERSION = "v1.6.9" +local COORDINATOR_VERSION = "v1.6.10" local CHUNK_LOAD_DELAY_S = 30.0 diff --git a/coordinator/ui/components/unit_flow.lua b/coordinator/ui/components/unit_flow.lua index f9e0fc8..eb00fa5 100644 --- a/coordinator/ui/components/unit_flow.lua +++ b/coordinator/ui/components/unit_flow.lua @@ -98,14 +98,16 @@ local function make(parent, x, y, wide, unit_id) table.insert(rc_pipes, pipe(_wide(46, 39), 3, _wide(72, 58), 3, colors.white, true)) if unit.aux_coolant then - table.insert(rc_pipes, pipe(_wide(51, 41), 0, _wide(51, 41), 1, colors.blue, true)) + local em_water = facility.tank_fluid_types[facility.tank_conns[unit_id]] == COOLANT_TYPE.WATER + local offset = util.trinary(unit.has_tank and em_water, 3, 0) + table.insert(rc_pipes, pipe(_wide(51, 41) + offset, 0, _wide(51, 41) + offset, 0, colors.blue, true)) end else table.insert(rc_pipes, pipe(0, 1, _wide(72, 58), 1, colors.blue, true)) table.insert(rc_pipes, pipe(0, 3, _wide(72, 58), 3, colors.white, true)) if unit.aux_coolant then - table.insert(rc_pipes, pipe(8, 0, 8, 1, colors.blue, true)) + table.insert(rc_pipes, pipe(8, 0, 8, 0, colors.blue, true)) end end diff --git a/coordinator/ui/layout/flow_view.lua b/coordinator/ui/layout/flow_view.lua index 4d1c18f..4de5e4d 100644 --- a/coordinator/ui/layout/flow_view.lua +++ b/coordinator/ui/layout/flow_view.lua @@ -306,12 +306,14 @@ local function init(main) if #emcool_pipes == 0 then vx = util.trinary(units[i].num_boilers == 0, 36, 79) else - vx = util.trinary(units[i].num_boilers == 0, 58, 91) + local em_water = tank_types[tank_conns[i]] == COOLANT_TYPE.WATER + vx = util.trinary(units[i].num_boilers == 0, 58, util.trinary(units[i].has_tank and em_water, 94, 91)) end PipeNetwork{parent=main,x=vx-6,y=vy,pipes={pipe(0,1,9,0,colors.blue,true)},bg=style.theme.bg} TextBox{parent=main,x=vx,y=vy,text="\x10\x11",fg_bg=text_col,width=2} + TextBox{parent=main,x=vx+5,y=vy,text="\x1b",fg_bg=cpair(colors.blue,text_col.bkg),width=1} local conn = IndicatorLight{parent=main,x=vx-3,y=vy+1,label=util.sprintf("PV%02d-AUX", i * 6),colors=style.ind_grn} local open = IndicatorLight{parent=main,x=vx-3,y=vy+2,label="OPEN",colors=style.ind_wht}