fix: læssemarkør med varens navn vinder over nærmeste neutrale markør (Kostald 4 Milk) — 1.62.277

This commit is contained in:
2026-10-16 23:12:44 +02:00
parent 6fab312415
commit 3c6e87f43b
3 changed files with 61 additions and 7 deletions
+59 -6
View File
@@ -101,7 +101,9 @@ local function collectNodes(placeable, loadStations, unloadStations)
for _, station in pairs(loadStations) do
if station.owningPlaceable == placeable then
for _, trigger in pairs(station.loadTriggers or {}) do
if trigger.triggerNode ~= nil then table.insert(loadGroups, {trigger.triggerNode}) end
if trigger.triggerNode ~= nil then
table.insert(loadGroups, {trigger.triggerNode, fillWords = ADBuildings.fillWords(trigger.fillTypes)})
end
end
end
end
@@ -300,12 +302,55 @@ function ADBuildings.preferByName(candidates, wantRole)
return list
end
-- Varenavne (små bogstaver) for en læssetriggers fillTypes {[index] = true}: titel og internt navn.
function ADBuildings.fillWords(fillTypes)
local words = {}
if g_fillTypeManager == nil then return words end
for index in pairs(fillTypes or {}) do
local fillType = g_fillTypeManager:getFillTypeByIndex(index)
if fillType ~= nil then
for _, word in ipairs({fillType.title, fillType.name}) do
if type(word) == "string" and #word >= 3 then table.insert(words, word:lower()) end
end
end
end
return words
end
-- Står en markør med triggerens varenavn inden for FILL_WINDOW_M af den nærmeste, flyttes den forrest —
-- aldrig en aflæsnings-markør ("Milk Unload"). (in-game 16/10 Kostald 4: mælketriggeren 1 m fra "Straw",
-- 5 m fra "Milk" -> Milk Run fandt aldrig "Milk")
ADBuildings.FILL_WINDOW_M = 10
function ADBuildings.preferByFillType(candidates, words)
local list = candidates or {}
if #list < 2 or words == nil or #words == 0 then return list end
local limit = (list[1].distance or 0) + ADBuildings.FILL_WINDOW_M
for index, candidate in ipairs(list) do
if (candidate.distance or math.huge) > limit then break end
local lower = tostring(candidate.name or ""):lower()
local isUnloadName = ADBuildings.nameRole(candidate.name) == "unload"
for _, word in ipairs(isUnloadName and {} or words) do
if lower:find(word, 1, true) then
if index == 1 then return list end
local reordered = {candidate}
for other, item in ipairs(list) do if other ~= index then table.insert(reordered, item) end end
return reordered
end
end
end
return list
end
-- Læssemarkør for én læssegruppe. En pallespawner (upræcist startpunkt) får aldrig aflæsningens nærmeste markør —
-- den tager sin næstnærmeste. Rigtige læssetriggere beholder markøren (Sugarbeet Crusher: pickup står tættere på
-- aflæsningstriggeren end drop). Gælder alle bygningstyper. (in-game 27/9 fårestald: spawner 9 m fra "Sheep Food",
-- foderindkast 5 m -> Goat Food fik "Sheep Milk"; i stald 3 og 5 stod spawneren endda tættest, 5 mod 9 m)
function ADBuildings.pickLoadMarker(candidates, unloadBest, yieldsToUnload)
for _, candidate in ipairs(ADBuildings.preferByName(candidates, "load")) do
function ADBuildings.pickLoadMarker(candidates, unloadBest, yieldsToUnload, fillWords)
local ordered = ADBuildings.preferByName(candidates, "load")
if ADBuildings.nameRole(ordered[1] ~= nil and ordered[1].name or nil) ~= "load" then
ordered = ADBuildings.preferByFillType(ordered, fillWords)
end
for _, candidate in ipairs(ordered) do
local isUnloads = yieldsToUnload and unloadBest ~= nil and candidate.id == unloadBest.id
if not isUnloads then
return {id = candidate.id, name = candidate.name, distance = math.floor(candidate.distance + 0.5)}
@@ -498,23 +543,31 @@ local function build(adEnv, farmId)
local id = ADBuildings.getId(placeable)
if id ~= nil then
local loadGroups, unloadNodes = collectNodes(placeable, loadStations, unloadStations)
local loadMarkers, seen = {}, {}
local loadMarkers, seen, skipForUnload = {}, {}, {}
if kind == "silo" then
local marker = siloLoadMarker(adEnv, farmId, placeable, loadStations)
if marker ~= nil then table.insert(loadMarkers, marker) end
else
local unloadBest = markerCandidates(adEnv, unloadNodes)[1]
for _, nodes in ipairs(loadGroups) do
local marker = ADBuildings.pickLoadMarker(markerCandidates(adEnv, nodes), unloadBest, nodes.isSpawner == true)
local candidates = markerCandidates(adEnv, nodes)
local marker = ADBuildings.pickLoadMarker(candidates, unloadBest, nodes.isSpawner == true, nodes.fillWords)
if marker ~= nil and not seen[marker.id] then
seen[marker.id] = true
table.insert(loadMarkers, marker)
end
-- aflæsningen springer stadig over markøren læssepunktet ellers ville have fået, så et
-- varenavns-valg ikke flytter staldens foder-markør (Kostald 4: "Straw" ved mælketriggeren)
local plain = ADBuildings.pickLoadMarker(candidates, unloadBest, nodes.isSpawner == true)
if plain ~= nil then table.insert(skipForUnload, plain) end
end
table.sort(loadMarkers, function(a, b) return ADBuildings.naturalLess(a.name, b.name) end)
end
-- siloer og palleskure læsser og aflæsser samme sted: altid nærmeste markør
local unloadMarker = unloadMarkerFor(adEnv, unloadNodes, loadMarkers, kind ~= "silo" and kind ~= "objectStorage")
local skipMarkers = {}
for _, marker in ipairs(loadMarkers) do table.insert(skipMarkers, marker) end
for _, marker in ipairs(skipForUnload) do table.insert(skipMarkers, marker) end
local unloadMarker = unloadMarkerFor(adEnv, unloadNodes, skipMarkers, kind ~= "silo" and kind ~= "objectStorage")
if kind == "husbandry" then pcall(diagnoseHusbandry, adEnv, id, getName(placeable, id), loadGroups, unloadNodes, loadMarkers, unloadMarker) end
-- silo der kun kan FYLDES (fx drive-on-bunker der fodrer en biogas-fermentor): aflæsning,
-- ingen læssestation -> et forsyningsmål, aldrig en kilde