fix: alle foderfabrikker begrænses (også til 0); lige gode foder efter truget (v1.62.110)

This commit is contained in:
2026-10-08 20:50:36 +02:00
parent e636f990ac
commit 2988566e3c
5 changed files with 32 additions and 3 deletions
+3 -1
View File
@@ -185,7 +185,9 @@ function ADChainModel.build(recipes, husbandry, crops, fieldGoods, goodCrops, an
local sells, feeds, feedCycles = false, false, 0
for name, perCycle in pairs(root.outputs or {}) do
if (root.outputModes or {})[name] == "sell" then sells = true end
if (animalLeft[name] or 0) > 0 and (perCycle or 0) > 0 then
-- også når behovet allerede er dækket af en anden rod (rest 0): så kører denne slet ikke for dyrene
-- (in-game 8/10: tmr1 dækkede køerne, tmr2 blev derfor regnet som ikke-foder og kørte fuldt)
if animalLeft[name] ~= nil and (perCycle or 0) > 0 then
feeds = true
feedCycles = math.max(feedCycles, animalLeft[name] / perCycle)
end
+2 -1
View File
@@ -1160,7 +1160,8 @@ function ADSources.getHusbandryDemand(placeable)
pcall(function()
local food, straw = placeable.spec_husbandryFood, placeable.spec_husbandryStraw
if food ~= nil and (food.litersPerHour or 0) > 0 then
for fillType, liters in pairs(ADStorageStats.splitTroughConsumption(food.litersPerHour * 24, {}, getFoodWeights(placeable))) do
local split = ADStorageStats.splitBestFood or function(perDay, _, weights) return ADStorageStats.splitTroughConsumption(perDay, {}, weights) end
for fillType, liters in pairs(split(food.litersPerHour * 24, food.fillLevels, getFoodWeights(placeable))) do
result[fillType] = (result[fillType] or 0) + liters
end
end
+25
View File
@@ -92,6 +92,31 @@ function ADStorageStats.splitTroughConsumption(perDay, levels, weights)
return result
end
-- Staldens behov på bedste foder: højeste fodervægt. Er flere varer lige gode (fx korn til høns), fordeles efter det
-- truget har af dem nu, ellers den første (in-game 8/10: hønsene fik sorghum i planen, men æder hvede).
function ADStorageStats.splitBestFood(perDay, levels, weights)
local bestWeight = -1
for _, weight in pairs(weights or {}) do if weight > bestWeight then bestWeight = weight end end
local best, total = {}, 0
for fillType, weight in pairs(weights or {}) do
if weight == bestWeight then
best[fillType] = (levels or {})[fillType] or 0
total = total + best[fillType]
end
end
local result = {}
if total > 0 then
for fillType, level in pairs(best) do
if level > 0 then result[fillType] = perDay * level / total end
end
return result
end
local first = nil
for fillType in pairs(best) do if first == nil or fillType < first then first = fillType end end
if first ~= nil then result[first] = perDay end
return result
end
-- Deler en liste i rækker á `size` celler (gitter i fanen Lagre). Tom liste giver én tom række,
-- så bygningen stadig får sin navnerække.
function ADStorageStats.chunk(list, size)
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<modDesc descVersion="107">
<author>masterdraco</author>
<version>1.62.109.0</version>
<version>1.62.110.0</version>
<title>
<en>AD Smart Pickup</en>
</title>