fix: fabrikkers aflæsningsmarkør følger AD-trigger og bygningens nærhed (Young Fish Breeding)
This commit is contained in:
@@ -453,7 +453,9 @@ function ADBuildings.preferOwned(chosen, nearby, owned, isLoad)
|
||||
if chosen == nil or owned == nil or owned[chosen.marker.id] ~= false then return chosen end
|
||||
local best = nil
|
||||
for _, entry in ipairs(nearby or {}) do
|
||||
-- egen markør, men ikke en "Pickup" og inden for aflæsningsrækkevidde (review 20/10: fabrikker står tæt)
|
||||
if owned[entry.marker.id] == true and not (isLoad or {})[entry.marker.id]
|
||||
and ADBuildings.nameRole(entry.marker.name) ~= "load" and entry.distance <= ADBuildings.MAX_DROP_DISTANCE
|
||||
and (best == nil or entry.distance < best.distance) then best = entry end
|
||||
end
|
||||
return best or chosen
|
||||
@@ -500,12 +502,33 @@ function ADBuildings.acceptsOtherUnload(other)
|
||||
return other ~= nil and other.distance <= ADBuildings.MAX_DROP_DISTANCE and ADBuildings.nameRole(other.marker.name) ~= "load"
|
||||
end
|
||||
|
||||
-- Ren: to næsten lige tætte aflæsningsmarkører (inden for ROOT_TIE_M) -> den der står nærmest bygningen selv. Samme
|
||||
-- navnerolle som den valgte, ikke en læssemarkør. (in-game 20/10: Young Fish Breeding-husene står 16,6 m fra hinanden,
|
||||
-- hver fodertragt ~8 m fra både sin egen og naboens "Fish Breader N Dropoff"; to huse fik 'Breader 1', ét ingen)
|
||||
ADBuildings.ROOT_TIE_M = 3
|
||||
function ADBuildings.preferNearRoot(chosen, nearby, rootX, rootZ, isLoad)
|
||||
if chosen == nil or rootX == nil or chosen.x == nil then return chosen end
|
||||
local role = ADBuildings.nameRole(chosen.marker.name)
|
||||
local function rootDistance(entry) return (entry.x - rootX) ^ 2 + (entry.z - rootZ) ^ 2 end
|
||||
local best, bestRoot = chosen, rootDistance(chosen)
|
||||
for _, entry in ipairs(nearby or {}) do
|
||||
if entry.x ~= nil and entry.distance <= chosen.distance + ADBuildings.ROOT_TIE_M and not (isLoad or {})[entry.marker.id]
|
||||
and ADBuildings.nameRole(entry.marker.name) == role then
|
||||
local d = rootDistance(entry)
|
||||
if d < bestRoot then best, bestRoot = entry, d end
|
||||
end
|
||||
end
|
||||
return best
|
||||
end
|
||||
|
||||
local function toMarkerRecord(entry)
|
||||
return {id = entry.marker.id, name = tostring(entry.marker.name), distance = math.floor(entry.distance + 0.5)}
|
||||
end
|
||||
|
||||
-- -> aflæsningsmarkør | nil, og listen af bygningens egne aflæsningsmarkører (kun når placeable er givet)
|
||||
local function unloadMarkerFor(adEnv, nodes, loadMarkers, allowSkipLoad, placeable, farmId)
|
||||
-- root: fabrikken, til at skelne mellem næsten lige tætte markører (preferNearRoot). Kun stalde får flere egne
|
||||
-- aflæsningsmarkører (foder/halm); en fabrik har ét mål (review 20/10: flere mål ændrede gemte fabriksflows)
|
||||
local function unloadMarkerFor(adEnv, nodes, loadMarkers, allowSkipLoad, placeable, farmId, root)
|
||||
if #nodes == 0 then
|
||||
return nil, {}
|
||||
end
|
||||
@@ -525,10 +548,11 @@ local function unloadMarkerFor(adEnv, nodes, loadMarkers, allowSkipLoad, placeab
|
||||
local dx, dz = wayPoint.x - position.x, wayPoint.z - position.z
|
||||
local distance = math.sqrt(dx * dx + dz * dz)
|
||||
if distance < ADBuildings.MAX_MARKER_DISTANCE then
|
||||
table.insert(nearbyAll, {marker = marker, distance = distance})
|
||||
if best == nil or distance < best.distance then best = {marker = marker, distance = distance} end
|
||||
local entry = {marker = marker, distance = distance, x = wayPoint.x, z = wayPoint.z}
|
||||
table.insert(nearbyAll, entry)
|
||||
if best == nil or distance < best.distance then best = entry end
|
||||
if not isLoad[marker.id] and (bestOther == nil or distance < bestOther.distance) then
|
||||
bestOther = {marker = marker, distance = distance}
|
||||
bestOther = entry
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -553,12 +577,20 @@ local function unloadMarkerFor(adEnv, nodes, loadMarkers, allowSkipLoad, placeab
|
||||
end
|
||||
-- bygningens egen markør frem for nabobygningens (kun når bygningen er givet — stalde)
|
||||
local owned = ownershipOf(adEnv, nearbyAll, placeable, farmId)
|
||||
chosen = ADBuildings.preferOwned(chosen, nearbyAll, owned, isLoad)
|
||||
local ownedChoice = ADBuildings.preferOwned(chosen, nearbyAll, owned, isLoad)
|
||||
if ownedChoice ~= chosen then
|
||||
chosen = ownedChoice
|
||||
elseif root ~= nil and root.rootNode ~= nil and (owned == nil or chosen == nil or owned[chosen.marker.id] ~= true) then
|
||||
-- AD's eget trigger-opslag afgjorde intet: markøren nærmest bygningen af de næsten lige tætte
|
||||
local rootX, rootZ = getNodePosition(root.rootNode)
|
||||
chosen = ADBuildings.preferNearRoot(chosen, nearbyAll, rootX, rootZ, isLoad)
|
||||
end
|
||||
if chosen == nil then
|
||||
return nil, {}
|
||||
end
|
||||
local list = {}
|
||||
for _, entry in ipairs(ADBuildings.ownedUnloadMarkers(chosen, nearbyAll, owned, isLoad)) do table.insert(list, toMarkerRecord(entry)) end
|
||||
local entries = root == nil and ADBuildings.ownedUnloadMarkers(chosen, nearbyAll, owned, isLoad) or {chosen}
|
||||
for _, entry in ipairs(entries) do table.insert(list, toMarkerRecord(entry)) end
|
||||
return toMarkerRecord(chosen), list
|
||||
end
|
||||
|
||||
@@ -738,8 +770,10 @@ local function build(adEnv, farmId)
|
||||
local skipMarkers = {}
|
||||
for _, marker in ipairs(loadMarkers) do table.insert(skipMarkers, marker) end
|
||||
for _, marker in ipairs(skipForUnload) do table.insert(skipMarkers, marker) end
|
||||
-- stalde og fabrikker: bygningens egen markør frem for naboens (fabrikker fra 20/10: Young Fish Breeding)
|
||||
local ownsMarkers = kind == "husbandry" or kind == "factory"
|
||||
local unloadMarker, unloadMarkers = unloadMarkerFor(adEnv, unloadNodes, skipMarkers, kind ~= "silo" and kind ~= "objectStorage",
|
||||
kind == "husbandry" and placeable or nil, farmId)
|
||||
ownsMarkers and placeable or nil, farmId, kind == "factory" and placeable or nil)
|
||||
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
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.397.0</version>
|
||||
<version>1.62.398.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user