fix: trug tømmer ikke en kørende TMR-fabrik for råvarer

This commit is contained in:
2026-10-25 02:01:09 +02:00
parent ce50abce6c
commit d0db7a25b9
4 changed files with 43 additions and 3 deletions
+15 -2
View File
@@ -464,6 +464,14 @@ local function getProductionPoint(station)
return nil
end
-- Fabrikkens eget lager af varen (liter); 0 når lageret ikke kan læses.
local function productionLevel(productionPoint, fillType)
local storage = productionPoint ~= nil and productionPoint.storage or nil
if storage == nil or storage.getFillLevel == nil then return 0 end
local ok, level = pcall(storage.getFillLevel, storage, fillType)
return ok and level or 0
end
-- En fabriks læssestation udleverer også dens INPUTS (fx halm i en TMR-fabrik).
-- Dem stjæler vi aldrig — fabrikken ville løbe tør for det, den skal bruge.
-- Outputs (og varer der både er input og output i en kæde) må gerne hentes.
@@ -512,6 +520,10 @@ local function mayUseSource(station, fillTypes, level, loadCapacity, need)
if ADSupplyPlanner.isProductionInput(productionPoint.productions, fillType) then
local perMinute = ADSupplyPlanner.inputUsePerMinute(productionPoint.productions, fillType)
if not ADSupplyPlanner.mayTakeInput(level, loadCapacity, perMinute, need) then return false end
if need ~= nil and need.trough and ADSupplyPlanner.inputMakesBetterFood(productionPoint.activeProductions, fillType,
need.priority, need.foodWeights, function(inputType) return productionLevel(productionPoint, inputType) end) then
return false
end
end
end
return true
@@ -920,7 +932,8 @@ local function getTargetNeeds(station, ingredients, farmId, demand)
if level ~= nil then
local troughScore, priority, troughCapacity = getFoodPriority(station, fillType)
if troughScore == nil or ADSupplyPlanner.troughNeedsRefill(troughScore, threshold) then
table.insert(needs, {fillType = fillType, level = level, capacity = capacity, litersPerMinute = demand[fillType], scoreOverride = troughScore, priority = priority, troughCapacity = troughCapacity})
local foodWeights = troughScore ~= nil and getHusbandryFoodFillTypes(getHusbandry(station)) or nil
table.insert(needs, {fillType = fillType, level = level, capacity = capacity, litersPerMinute = demand[fillType], scoreOverride = troughScore, priority = priority, troughCapacity = troughCapacity, foodWeights = foodWeights})
end
end
end
@@ -1228,7 +1241,7 @@ local function logSupplyMiss(driver, ranked, bestFood, markerStations, farmId, h
end
end
local fillType = g_fillTypeManager ~= nil and g_fillTypeManager.getFillTypeByIndex ~= nil and g_fillTypeManager:getFillTypeByIndex(need.fillType) or nil
table.insert(parts, string.format("%s: fri %.0f l, %s, %d kilder med lager (bedst %.0f l), %d afvist (dyrestaldens eget lager, fabriksreserve, eller triggeren giver varen ikke ud)%s",
table.insert(parts, string.format("%s: fri %.0f l, %s, %d kilder med lager (bedst %.0f l), %d afvist (dyrestaldens eget lager, fabriksreserve, fabrikken laver bedre foder af den, eller triggeren giver varen ikke ud)%s",
fillType ~= nil and fillType.name or tostring(need.fillType), need.freeSpace or 0,
(held or {})[need] and ((held or {})[need] == "stable" and "HOLDT (bedre foder på lager — prioriteringslisten)"
or (held or {})[need] == "trigger" and "HOLDT (triggeren ved målmarkøren tager ikke varen)"