fix: stalds fodertrug med, også når stationen har andre triggere (1.62.226)
In-game: CM-freestallens station har halm/gylle/mælk; fodertruget ligger kun under spec_husbandryFood og blev sprunget over -> forsyningsflowet fandt 0 stationer ved foder-markøren. Fodernoder tilføjes nu altid (dedup) i getUnloadCandidates og adBuildings.
This commit is contained in:
@@ -126,12 +126,16 @@ local function collectNodes(placeable, loadStations, unloadStations)
|
||||
table.insert(loadGroups, nodes)
|
||||
end
|
||||
end
|
||||
-- stald uden aflæsningsnoder i stationen (hønsehus: kun foder-triggeren) -> søg i staldens foderdata
|
||||
if #unloadNodes == 0 and placeable.getHusbandryFillLevel ~= nil then
|
||||
-- staldens foder-trigger fra foderdataene (hønsehus: kun den; CM-freestall: stationen har kun halm/gylle/mælk,
|
||||
-- fodertruget ligger for sig — in-game 12/10). Kun noder der ikke allerede er med.
|
||||
if placeable.getHusbandryFillLevel ~= nil then
|
||||
local had = #unloadNodes
|
||||
local known = {}
|
||||
for _, node in ipairs(unloadNodes) do known[node] = true end
|
||||
for _, node in ipairs(ADSupplyPlanner.findTriggerNodes(placeable.spec_husbandryFood)) do
|
||||
table.insert(unloadNodes, node)
|
||||
if not known[node] then known[node] = true table.insert(unloadNodes, node) end
|
||||
end
|
||||
if #unloadNodes == 0 then
|
||||
if had == 0 and #unloadNodes == 0 then
|
||||
logHusbandryFoodOnce(placeable)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -221,8 +221,19 @@ local function getUnloadCandidates()
|
||||
local placeables = g_currentMission.placeableSystem ~= nil and g_currentMission.placeableSystem.placeables or {}
|
||||
for _, placeable in pairs(placeables) do
|
||||
local ownStation = byPlaceable[placeable]
|
||||
local ownHasNodes = ownStation ~= nil and ownStation.unloadTriggers ~= nil and #ADSupplyPlanner.findTriggerNodes(ownStation.unloadTriggers, 1) > 0
|
||||
local foodNodes = (placeable.getHusbandryFillLevel ~= nil and not ownHasNodes) and ADSupplyPlanner.findTriggerNodes(placeable.spec_husbandryFood) or {}
|
||||
-- foder-triggeren med, også når stalden har sin egen station med andre triggere (in-game 12/10: CM-freestallens
|
||||
-- station har kun halm/gylle/mælk — fodertruget ligger for sig under spec_husbandryFood, og flowet fandt
|
||||
-- "0 stationer"). Kun noder stationen ikke allerede har, så intet tælles to gange.
|
||||
local ownNodes = {}
|
||||
if ownStation ~= nil and ownStation.unloadTriggers ~= nil then
|
||||
for _, node in ipairs(ADSupplyPlanner.findTriggerNodes(ownStation.unloadTriggers, 1)) do ownNodes[node] = true end
|
||||
end
|
||||
local foodNodes = {}
|
||||
if placeable.getHusbandryFillLevel ~= nil then
|
||||
for _, node in ipairs(ADSupplyPlanner.findTriggerNodes(placeable.spec_husbandryFood)) do
|
||||
if not ownNodes[node] then table.insert(foodNodes, node) end
|
||||
end
|
||||
end
|
||||
if #foodNodes > 0 then
|
||||
local triggers = {}
|
||||
for _, foodNode in ipairs(foodNodes) do table.insert(triggers, {exactFillRootNode = foodNode}) end
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.225.0</version>
|
||||
<version>1.62.226.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user