diff --git a/supervisor/startup.lua b/supervisor/startup.lua index 99ac055..ff2ec5b 100644 --- a/supervisor/startup.lua +++ b/supervisor/startup.lua @@ -22,7 +22,7 @@ local supervisor = require("supervisor.supervisor") local svsessions = require("supervisor.session.svsessions") -local SUPERVISOR_VERSION = "v1.5.16" +local SUPERVISOR_VERSION = "v1.5.17" local println = util.println local println_ts = util.println_ts diff --git a/supervisor/unit.lua b/supervisor/unit.lua index 16f065a..ebb4111 100644 --- a/supervisor/unit.lua +++ b/supervisor/unit.lua @@ -986,7 +986,8 @@ function unit.new(reactor_id, num_boilers, num_turbines, ext_idle) local db = self.snas[i].get_db() total_peak = total_peak + db.state.peak_production total_avail = total_avail + db.state.production_rate - total_out = total_out + math.min(db.tanks.input.amount / 10, db.state.production_rate) + local out_from_in = util.trinary(db.tanks.input.amount >= 10, db.tanks.input.amount / 10, 0) + total_out = total_out + math.min(out_from_in, db.state.production_rate) end status.sna = { #self.snas, total_peak, total_avail, total_out }