filigreed/cc-stuff
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: fix startup logic

Browse source 
Previous: if a KEEP_STOCKED material was between lower and upper, it would
sit there on startup, regardless of whether material was needed in export.

New logic is that materials between the lower and upper bound will try to
export until the lower bound is reached on startup.
This commit is contained in:
Emerson Rosen-Jones 2026-01-17 19:02:39 -05:00
parent 4e2fdccc49
commit e82591297c
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
oregen-manager.lua
View file

@ -200,7 +200,7 @@ function createModes (items)
return result return result
end end
function updateModes (current_modes, current_stock) function updateModes (current_modes, current_stock, first_run)
local lower_lim, upper_lim local lower_lim, upper_lim
local limits = {} local limits = {}
for item, _ in pairs(current_modes) do for item, _ in pairs(current_modes) do
@ -221,7 +221,7 @@ function updateModes (current_modes, current_stock)
if count == nil then count = 0 end if count == nil then count = 0 end
if count <= limits.lower then if count <= limits.lower then
current_modes[item] = {"recipe"} current_modes[item] = {"recipe"}
elseif count >= limits.upper then elseif count >= limits.upper or first_run then
current_modes[item] = { current_modes[item] = {
"export", "export",
count - limits.lower, count - limits.lower,
@ -324,14 +324,14 @@ function export (ticker, item, amt)
ticker.requestFiltered(EXPORT_ADDR, request) ticker.requestFiltered(EXPORT_ADDR, request)
end end
function run (ticker, export_storage, current_modes) function run (ticker, export_storage, current_modes, first_run)
if SPEEDOMETER ~= "" and peripheral.call(SPEEDOMETER, "getSpeed") == 0 then if SPEEDOMETER ~= "" and peripheral.call(SPEEDOMETER, "getSpeed") == 0 then
os.sleep(SLEEP_T) os.sleep(SLEEP_T)
return run (ticker, export_storage, current_modes) return run (ticker, export_storage, current_modes, first_run)
end end
local export_amounts = getAmounts(export_storage.list) local export_amounts = getAmounts(export_storage.list)
local stock_amounts = getAmounts(ticker.stock) local stock_amounts = getAmounts(ticker.stock)
updateModes(current_modes, stock_amounts) updateModes(current_modes, stock_amounts, first_run)
for item, mode in pairs(current_modes) do for item, mode in pairs(current_modes) do
-- mode[1] is mode, mode[2] is amt_extra when exporting -- mode[1] is mode, mode[2] is amt_extra when exporting
if mode[1] == "recipe" then if mode[1] == "recipe" then
@ -355,5 +355,5 @@ if arg ~= nil and arg[1] == "run" then
local ticker = peripheral.wrap(STOCK_TICKER) local ticker = peripheral.wrap(STOCK_TICKER)
local export_storage = peripheral.wrap(EXPORT_STORAGE) local export_storage = peripheral.wrap(EXPORT_STORAGE)
local current_modes = createModes(KEEP_STOCKED) local current_modes = createModes(KEEP_STOCKED)
run(ticker, export_storage, current_modes) run(ticker, export_storage, current_modes, true)
end end