fix: flow-guiden viser varer for en tom silo som kilde (1.62.223)

In-game: mælketanken ved nye kostalde uden dyr gav ingen varer i trin Varer, så mælke-flowet
kunne ikke sættes op, og beskeden bad om at vælge kilde, selvom den var valgt. Guiden viser nu
de varer en helt tom silo kan rumme (0 l); kørslen er uændret. Ny besked når kilden intet kan
levere. Review: kapacitet tælles ikke dobbelt; 0-varer kun når siloen er helt tom.
This commit is contained in:
2026-10-11 23:50:06 +02:00
parent ade868568c
commit 0fa83cb627
8 changed files with 31 additions and 8 deletions
+5 -1
View File
@@ -296,7 +296,11 @@ local function rowsGoods(guide)
local draft, context, rows = guide.draft, guide.context, {}
if isOut(guide) then
local products = context.products or {}
if #products == 0 then return {text("spu_guide_flow_noProducts")} end
if #products == 0 then
-- kilde valgt, men den kan intet levere — ikke "vælg først en kilde" (in-game 11/10)
local chosenSources = buildingIds(draft) or {}
return {text(#chosenSources > 0 and "spu_guide_flow_noProductsAtSource" or "spu_guide_flow_noProducts")}
end
local options = {}
for _, policy in ipairs(ADFlowGuide.POLICIES) do table.insert(options, {label = L("spu_policy_" .. policy), value = policy}) end
for _, product in ipairs(products) do
+2 -2
View File
@@ -747,11 +747,11 @@ end
-- Alle varer kilderne rummer/producerer med run'ets politik (uanset vogn) — til fanen Udkørsel.
-- {fillType, name, title, policy, isPallet, available, level, capacity}, sorteret på titel.
function ADRunsController.getRunProducts(adEnv, run)
function ADRunsController.getRunProducts(adEnv, run, includeEmpty)
local farmId = g_currentMission:getFarmId()
local byName, result = {}, {}
for _, source in ipairs(getRunSources(adEnv, run, farmId)) do
for _, item in ipairs(ADSources.getProducts(adEnv, source, farmId)) do
for _, item in ipairs(ADSources.getProducts(adEnv, source, farmId, includeEmpty)) do
local product = byName[item.name]
if product == nil then
product = {fillType = item.fillType, name = item.name, title = item.title or item.name, policy = ADRuns.getProductPolicy(run, item.name), isPallet = item.isPallet, canPallet = item.canPallet, available = 0, level = 0, capacity = 0}
+17 -3
View File
@@ -407,7 +407,7 @@ local function getFactoryProducts(source, farmId)
return products
end
local function getSiloProducts(source)
local function getSiloProducts(source, includeEmpty)
local storages = source.placeable.spec_silo ~= nil and source.placeable.spec_silo.storages or {}
local levels, capacities = {}, {}
for _, storage in pairs(storages) do
@@ -433,6 +433,19 @@ local function getSiloProducts(source)
end
end
end
-- includeEmpty (flow-guiden): er siloen helt tom, vises de varer den kan rumme (0 l) — in-game 11/10: mælketanken
-- ved nye kostalde uden dyr gav ingen varer at vælge, så mælke-flowet kunne ikke sættes op. Kun når den er tom,
-- ellers fylder en kornsilo listen med alle afgrøder.
if includeEmpty and next(levels) == nil then
for _, storage in pairs(storages) do
for fillType, supported in pairs(storage.fillTypes or {}) do
if supported == true and levels[fillType] == nil then
levels[fillType] = 0
capacities[fillType] = storage.getCapacity ~= nil and (storage:getCapacity(fillType) or 0) or 0
end
end
end
end
local products = {}
for fillType, level in pairs(levels) do
table.insert(products, newProduct(fillType, level, level, capacities[fillType] or 0, false))
@@ -579,11 +592,12 @@ local function getStationProducts(source)
end
-- Varer ved kilden med tilgængelig mængde: { {fillType, name, title, available, level, capacity, isPallet} }.
function ADSources.getProducts(adEnv, source, farmId)
-- includeEmpty: også siloens varer med 0 (kun flow-guiden; kørslen henter kun det der er)
function ADSources.getProducts(adEnv, source, farmId, includeEmpty)
if source.kind == "factory" then
return getFactoryProducts(source, farmId)
elseif source.kind == "silo" then
return getSiloProducts(source)
return getSiloProducts(source, includeEmpty)
elseif source.kind == "husbandry" then
return getHusbandryProducts(adEnv, source)
elseif source.kind == "storage" then
@@ -214,7 +214,7 @@ function SmartPickupFrame:flowGuideContext(adEnv, draft)
context.wagons = self:flowWagonContext(adEnv, preview)
context.vehicles = self:flowVehicleContext(adEnv, preview, context.wagons)
if draft.kind == "outbound" then
for _, product in ipairs(ADRunsController.getRunProducts(adEnv, preview)) do
for _, product in ipairs(ADRunsController.getRunProducts(adEnv, preview, true)) do
local title = tostring(product.title)
table.insert(context.products, {name = product.name, title = title,
text = string.format("%s — %s l", title, SmartPickupFrame.formatCompact(product.available or 0))})
+2
View File
@@ -520,6 +520,8 @@
<text name="spu_guide_flow_goodsAutoText" text=" Hver tur hentes den vare målet mangler mest."/>
<text name="spu_guide_flow_noGoodsTo" text=" Vælg først hvor der skal køres til (trinnet Til)"/>
<text name="spu_guide_flow_noProducts" text=" Vælg først hvor der hentes fra (trinnet Fra)"/>
<text name="spu_guide_flow_noProductsAtSource" text=" Det valgte sted har ingen varer, det kan levere"/>
<text name="spu_guide_flow_storeAutoChoice" text="Automatisk (nærmeste med plads)"/>
<text name="spu_guide_flow_storeAutoText" text=" Lagerturene kører til nærmeste lager med plads."/>
<text name="spu_guide_flow_noTractors" text=" Ingen ledige traktorer"/>
+2
View File
@@ -520,6 +520,8 @@
<text name="spu_guide_flow_goodsAutoText" text=" Each trip fetches the good the target lacks most."/>
<text name="spu_guide_flow_noGoodsTo" text=" First choose where to deliver (step To)"/>
<text name="spu_guide_flow_noProducts" text=" First choose where to pick up (step From)"/>
<text name="spu_guide_flow_noProductsAtSource" text=" The chosen place has no goods it can deliver"/>
<text name="spu_guide_flow_storeAutoChoice" text="Automatic (nearest with room)"/>
<text name="spu_guide_flow_storeAutoText" text=" Storage trips go to the nearest store with room."/>
<text name="spu_guide_flow_noTractors" text=" No free tractors"/>
+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.222.0</version>
<version>1.62.223.0</version>
<title>
<en>AD Smart Pickup</en>
</title>