fix: stald hentes kun ved valgte læssemarkører eller læsse-navne, ikke foder-markør (1.62.335)
In-game 18/10 17:03: begge mælkebiler sendt til 'Cattle Barn 1 Feed' ad en rute gennem kostalden, fast i 35 min.
This commit is contained in:
@@ -358,6 +358,54 @@ function ADSmartPickup.dropUnloadDuplicates(entries, roleOf)
|
||||
return kept
|
||||
end
|
||||
|
||||
-- Ren: en stald hentes kun fra ved de læssemarkører, staldanalysen valgte (ADBuildings: loadMarkers), eller ved en
|
||||
-- markør med læsse-navn (Collection/Pickup/Load …). En foder-markør ved samme læssestation fjernes (in-game 18/10
|
||||
-- 17:03: begge mælkebiler sendt til "Cattle Barn 1 Feed" — ruten gik gennem kostalden, de sad fast i 35 min).
|
||||
-- Valgte markører kendes på id ELLER navn (review: AD omnummererer vejpunkter, bygningslisten caches 30 s).
|
||||
-- loadIds = {[placeable] = {ids = {[id] = true}, names = {[navn] = true}}}; placeables uden opslag eller uden
|
||||
-- valgte markører (ukendt) bevares urørt. roleOf(navn) -> "load" | "unload" | nil.
|
||||
function ADSmartPickup.keepOwnLoadMarkers(entries, loadIds, roleOf)
|
||||
if loadIds == nil then return entries end
|
||||
local kept = {}
|
||||
for _, entry in ipairs(entries) do
|
||||
local placeable = entry.station ~= nil and entry.station.owningPlaceable or nil
|
||||
local chosen = placeable ~= nil and loadIds[placeable] or nil
|
||||
local marker = entry.marker
|
||||
local keep = chosen == nil or next(chosen.ids or {}) == nil
|
||||
or (chosen.ids or {})[marker.id] or (chosen.names or {})[marker.name]
|
||||
or (roleOf ~= nil and roleOf(marker.name) == "load")
|
||||
if keep then table.insert(kept, entry) end
|
||||
end
|
||||
return kept
|
||||
end
|
||||
|
||||
-- Staldenes valgte læssemarkører pr. placeable (kun stalde; andre bygningstyper filtreres ikke).
|
||||
local loadIdsWarned = false
|
||||
local function husbandryLoadIds(adEnv, farmId)
|
||||
if ADBuildings == nil or ADBuildings.list == nil then return nil end
|
||||
local ok, buildings = pcall(ADBuildings.list, adEnv, farmId)
|
||||
if not ok then
|
||||
if not loadIdsWarned then
|
||||
loadIdsWarned = true
|
||||
Logging.warning(ADSmartPickup.LOG_PREFIX .. "staldenes læssemarkører kunne ikke læses: %s", tostring(buildings))
|
||||
end
|
||||
return nil
|
||||
end
|
||||
local loadIds = {}
|
||||
for _, building in ipairs(buildings or {}) do
|
||||
if building.kind == "husbandry" and building.placeable ~= nil then
|
||||
local ids, names = {}, {}
|
||||
for _, marker in ipairs(building.loadMarkers or {}) do
|
||||
if marker.id ~= nil then ids[marker.id] = true end
|
||||
if marker.name ~= nil then names[marker.name] = true end
|
||||
end
|
||||
loadIds[building.placeable] = {ids = ids, names = names}
|
||||
end
|
||||
end
|
||||
return loadIds
|
||||
end
|
||||
ADSmartPickup.husbandryLoadIds = husbandryLoadIds -- til test
|
||||
|
||||
local function collectMarkerStations(adEnv, candidateMarkers, farmId, excludedPlaceable)
|
||||
local markerStations = {}
|
||||
for _, marker in pairs(candidateMarkers) do
|
||||
@@ -371,6 +419,10 @@ local function collectMarkerStations(adEnv, candidateMarkers, farmId, excludedPl
|
||||
if ADBuildings ~= nil and ADBuildings.nameRole ~= nil then
|
||||
markerStations = ADSmartPickup.dropUnloadDuplicates(markerStations, ADBuildings.nameRole)
|
||||
end
|
||||
if #markerStations > 0 then
|
||||
markerStations = ADSmartPickup.keepOwnLoadMarkers(markerStations, husbandryLoadIds(adEnv, farmId),
|
||||
ADBuildings ~= nil and ADBuildings.nameRole or nil)
|
||||
end
|
||||
return markerStations
|
||||
end
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.334.0</version>
|
||||
<version>1.62.335.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user