fix: kæden kører palle-varer i udkørselsflows (forsyning kan ikke hente paller)
This commit is contained in:
@@ -44,6 +44,18 @@ local function producerKeys(node)
|
||||
return keys
|
||||
end
|
||||
|
||||
-- Bygningerne der laver varen (fabrikker, stalde): kilder for et udkørselsflow med palle-varer
|
||||
local function producerBuildings(node)
|
||||
local list, seen = {}, {}
|
||||
for _, maker in ipairs(node.producers or {}) do
|
||||
if maker.building ~= nil and not seen[maker.building] then seen[maker.building] = true table.insert(list, maker.building) end
|
||||
end
|
||||
for _, herd in ipairs(node.herds or {}) do
|
||||
if herd.building ~= nil and not seen[herd.building] then seen[herd.building] = true table.insert(list, herd.building) end
|
||||
end
|
||||
return list
|
||||
end
|
||||
|
||||
-- recipes (valgfri): gårdens opskrifter med outputModes -> kanten får delivery (se ADChainActions.delivery).
|
||||
function ADChainActions.edges(chain, recipes)
|
||||
local list, seen, byKey = {}, {}, nil
|
||||
@@ -57,7 +69,7 @@ function ADChainActions.edges(chain, recipes)
|
||||
if SUPPLIED[node.source] and node.consumer ~= nil and not seen[id] then
|
||||
seen[id] = true
|
||||
local edge = {fillType = node.fillType, consumer = node.consumer, consumerName = node.consumerName, rootKey = rootKey,
|
||||
producers = producerKeys(node)}
|
||||
producers = producerKeys(node), producerBuildings = producerBuildings(node)}
|
||||
edge.delivery = ADChainActions.delivery(edge, byKey)
|
||||
edge.soldBy = {}
|
||||
for _, key in ipairs(edge.producers) do
|
||||
@@ -74,12 +86,41 @@ end
|
||||
|
||||
local contains = ADUtil.contains
|
||||
|
||||
-- Palle-varer kører i et UDKØRSELSFLOW (20/10: forsyningen henter kun fra læssestationer, så "Kæde: Canola Oil" fandt
|
||||
-- aldrig olien ved Oil Mill's pallepladser): Fra = producenten, varen på Lager (palleskur når forbrugeren er fyldt),
|
||||
-- "Lever også til" = forbrugeren (et palleflows Lager-trin tilbyder kun palleskure).
|
||||
-- Bygningerne et flow leverer til: forsyning = målene, udkørsel = "Lever også til" + "Lager til".
|
||||
function ADChainActions.deliversTo(run)
|
||||
if run.kind ~= "outbound" then return run.targetBuildingIds or {} end
|
||||
local list = {}
|
||||
for _, key in ipairs({"feedBuildingIds", "storeBuildingIds"}) do
|
||||
for _, id in ipairs(run[key] or {}) do if not contains(list, id) then table.insert(list, id) end end
|
||||
end
|
||||
return list
|
||||
end
|
||||
|
||||
-- Varerne et flow leverer: forsyning = ingredienserne, udkørsel = varer med lager-politik. nil = alt (automatisk forsyning)
|
||||
function ADChainActions.goodsOf(run)
|
||||
if run.kind == "outbound" then
|
||||
local names = {}
|
||||
for _, product in ipairs(run.products or {}) do
|
||||
if product.policy == "store" or product.policy == "sellElseStore" then table.insert(names, product.fillType) end
|
||||
end
|
||||
return names
|
||||
end
|
||||
if run.ingredientMode ~= "manual" then return nil end
|
||||
return run.ingredients or {}
|
||||
end
|
||||
|
||||
function ADChainActions.coversEdge(run, edge)
|
||||
if not contains(ADChainActions.deliversTo(run), edge.consumer) then return false end
|
||||
local goods = ADChainActions.goodsOf(run)
|
||||
return goods == nil or contains(goods, edge.fillType)
|
||||
end
|
||||
|
||||
function ADChainActions.isCovered(edge, runs)
|
||||
for _, run in ipairs(runs or {}) do
|
||||
if run.kind == "supply" and contains(run.targetBuildingIds, edge.consumer)
|
||||
and (run.ingredientMode ~= "manual" or contains(run.ingredients, edge.fillType)) then
|
||||
return true
|
||||
end
|
||||
if ADChainActions.coversEdge(run, edge) then return true end
|
||||
end
|
||||
return false
|
||||
end
|
||||
@@ -124,22 +165,51 @@ end
|
||||
-- ---- ét kædeflow pr. bygning (in-game 30/9: ét flow pr. vare og bygning gav mange stoppede flows) ----
|
||||
|
||||
-- Manglende kanter samlet pr. modtagerbygning: {consumer, consumerName, rootKey, fillTypes} i fundet rækkefølge.
|
||||
-- group.producers = {[vare] = {bygning, ...}}: kilderne til et palle-flow
|
||||
function ADChainActions.groupMissing(missing)
|
||||
local groups, byConsumer = {}, {}
|
||||
for _, edge in ipairs(missing or {}) do
|
||||
local group = byConsumer[edge.consumer]
|
||||
if group == nil then
|
||||
group = {consumer = edge.consumer, consumerName = edge.consumerName, rootKey = edge.rootKey, fillTypes = {}}
|
||||
group = {consumer = edge.consumer, consumerName = edge.consumerName, rootKey = edge.rootKey, fillTypes = {}, producers = {}}
|
||||
byConsumer[edge.consumer] = group
|
||||
table.insert(groups, group)
|
||||
end
|
||||
if not contains(group.fillTypes, edge.fillType) then table.insert(group.fillTypes, edge.fillType) end
|
||||
local list = group.producers[edge.fillType] or {}
|
||||
for _, building in ipairs(edge.producerBuildings or {}) do
|
||||
if not contains(list, building) then table.insert(list, building) end
|
||||
end
|
||||
group.producers[edge.fillType] = list
|
||||
end
|
||||
return groups
|
||||
end
|
||||
|
||||
-- Kildebygningerne for varerne (i fundet rækkefølge, uden dubletter). producers = group.producers
|
||||
function ADChainActions.sourcesFor(producers, fillTypes)
|
||||
local list = {}
|
||||
for _, name in ipairs(fillTypes or {}) do
|
||||
for _, building in ipairs((producers or {})[name] or {}) do
|
||||
if not contains(list, building) then table.insert(list, building) end
|
||||
end
|
||||
end
|
||||
return list
|
||||
end
|
||||
|
||||
-- Ændringer der gør et (nyt eller gammelt) kædeflow til et palle-flow: udkørsel fra producenterne, varerne på Lager
|
||||
-- (palleskur, når forbrugeren er fyldt), forbrugeren under "Lever også til". Ren -> changes til ADRuns.updateRun
|
||||
function ADChainActions.palletFlowChanges(consumer, fillTypes, sources, rootKey, waitPoolGroup)
|
||||
local products = {}
|
||||
for _, name in ipairs(fillTypes or {}) do table.insert(products, {fillType = name, policy = "store"}) end
|
||||
return {kind = "outbound", sourceBuildingIds = sources or {}, products = products, feedBuildingIds = {consumer},
|
||||
storeBuildingIds = {}, targetBuildingIds = {}, ingredients = {}, collectRound = true, chain = rootKey,
|
||||
waitPoolGroup = waitPoolGroup or ""}
|
||||
end
|
||||
|
||||
-- Kædens egne flows: forsyning med manuelle varer, eller udkørsel (palle-varer)
|
||||
local function isChainRun(run)
|
||||
return run.chain ~= nil and run.chain ~= "" and run.kind == "supply" and run.ingredientMode == "manual"
|
||||
if run.chain == nil or run.chain == "" then return false end
|
||||
return run.kind == "outbound" or (run.kind == "supply" and run.ingredientMode == "manual")
|
||||
end
|
||||
|
||||
-- Kædens eget flow (manuelle varer) til bygningen -> run-id, så nye varer lægges i det i stedet for et nyt flow.
|
||||
@@ -149,7 +219,7 @@ function ADChainActions.chainRunFor(runs, consumer, kind, kindOf)
|
||||
for _, run in ipairs(runs or {}) do
|
||||
local runKind = kindOf ~= nil and kindOf(run) or nil
|
||||
-- et kombineret flow (én traktor, tipvogn + pallevogn: "mixed") tager begge slags
|
||||
if isChainRun(run) and contains(run.targetBuildingIds, consumer) and (kindOf == nil or runKind == kind or runKind == "mixed") then return run.id end
|
||||
if isChainRun(run) and contains(ADChainActions.deliversTo(run), consumer) and (kindOf == nil or runKind == kind or runKind == "mixed") then return run.id end
|
||||
end
|
||||
return nil
|
||||
end
|
||||
@@ -170,9 +240,11 @@ end
|
||||
function ADChainActions.mergeIdle(runs, kindOf)
|
||||
local byConsumer, order = {}, {}
|
||||
for _, run in ipairs(runs or {}) do
|
||||
local target = (run.targetBuildingIds or {})[1]
|
||||
if isChainRun(run) and target ~= nil and #(run.targetBuildingIds or {}) == 1 and #(run.vehicleIds or {}) == 0 then
|
||||
local key = kindOf ~= nil and (tostring(target) .. "|" .. tostring(kindOf(run))) or target
|
||||
local consumers = ADChainActions.deliversTo(run)
|
||||
local target = consumers[1]
|
||||
if isChainRun(run) and target ~= nil and #consumers == 1 and #(run.vehicleIds or {}) == 0 then
|
||||
-- forsyning og udkørsel lægges aldrig sammen (forskellige flowtyper)
|
||||
local key = tostring(target) .. "|" .. tostring(run.kind) .. (kindOf ~= nil and ("|" .. tostring(kindOf(run))) or "")
|
||||
if byConsumer[key] == nil then byConsumer[key] = {}; table.insert(order, key) end
|
||||
table.insert(byConsumer[key], run)
|
||||
end
|
||||
@@ -181,14 +253,18 @@ function ADChainActions.mergeIdle(runs, kindOf)
|
||||
for _, target in ipairs(order) do
|
||||
local list = byConsumer[target]
|
||||
if #list > 1 then
|
||||
local keep, add, deleteIds = list[1], {}, {}
|
||||
local keep, add, deleteIds, addSources = list[1], {}, {}, {}
|
||||
for index = 2, #list do
|
||||
for _, name in ipairs(list[index].ingredients or {}) do
|
||||
if not contains(keep.ingredients, name) and not contains(add, name) then table.insert(add, name) end
|
||||
-- palle-flows (udkørsel): de slettede flows' kilder følger med
|
||||
for _, building in ipairs(list[index].sourceBuildingIds or {}) do
|
||||
if not contains(keep.sourceBuildingIds or {}, building) and not contains(addSources, building) then table.insert(addSources, building) end
|
||||
end
|
||||
for _, name in ipairs(ADChainActions.goodsOf(list[index]) or {}) do
|
||||
if not contains(ADChainActions.goodsOf(keep) or {}, name) and not contains(add, name) then table.insert(add, name) end
|
||||
end
|
||||
table.insert(deleteIds, list[index].id)
|
||||
end
|
||||
table.insert(merges, {keepId = keep.id, add = add, deleteIds = deleteIds})
|
||||
table.insert(merges, {keepId = keep.id, add = add, deleteIds = deleteIds, addSources = addSources})
|
||||
end
|
||||
end
|
||||
return merges
|
||||
@@ -213,6 +289,10 @@ function ADChainActions.farmUses(data, runs)
|
||||
if run.kind ~= "outbound" and run.ingredientMode == "manual" then
|
||||
for _, name in ipairs(run.ingredients or {}) do uses[name] = true end
|
||||
end
|
||||
-- kædens palle-flows (udkørsel til en forbruger) kører varen til gårdens egen fabrik
|
||||
if run.kind == "outbound" and run.chain ~= nil and run.chain ~= "" then
|
||||
for _, name in ipairs(ADChainActions.goodsOf(run)) do uses[name] = true end
|
||||
end
|
||||
end
|
||||
return uses
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user