fix: aflæs-markør vinder over læs ved samme silo; lastbiler er ingen puljetraktorer (v1.62.20)
This commit is contained in:
@@ -110,6 +110,23 @@ function ADLoadSwap.isLiquid(fillType)
|
||||
return ADLoadSwap.isLiquidName(name)
|
||||
end
|
||||
|
||||
-- Silo med både en læs- og en aflæs-markør: aflæs-markøren ("aflæs"/"unload"/"drop") vinder, læs-markøren for
|
||||
-- samme station fjernes (in-game 4/10: tømmevognen blev sendt til "Kornsilo 2 læs" — forkert spor forbi graven)
|
||||
function ADLoadSwap.preferUnloadNamed(candidates)
|
||||
if ADBuildings == nil or ADBuildings.nameRole == nil then return candidates end
|
||||
local hasUnload = {}
|
||||
for _, c in ipairs(candidates) do
|
||||
if c.station ~= nil and ADBuildings.nameRole(c.marker.name) == "unload" then hasUnload[c.station] = true end
|
||||
end
|
||||
local result = {}
|
||||
for _, c in ipairs(candidates) do
|
||||
if not (c.station ~= nil and hasUnload[c.station] and ADBuildings.nameRole(c.marker.name) == "load") then
|
||||
table.insert(result, c)
|
||||
end
|
||||
end
|
||||
return result
|
||||
end
|
||||
|
||||
function ADLoadSwap.findDumpMarker(adEnv, vehicle, fillType, rest, homeWayPointId, isReachable, excludedPlaceables, avoidMarkers, allowFactories)
|
||||
if vehicle.rootNode == nil then
|
||||
return nil, "køretøjet har ingen position"
|
||||
@@ -130,7 +147,7 @@ function ADLoadSwap.findDumpMarker(adEnv, vehicle, fillType, rest, homeWayPointI
|
||||
if wayPoint ~= nil then
|
||||
local dx, dz = wayPoint.x - x, wayPoint.z - z
|
||||
table.insert(candidates, {
|
||||
marker = marker,
|
||||
marker = marker, station = station.owningPlaceable or station,
|
||||
hasFillType = ADSmartPickup.getOwnStorageLevel(station, {fillType}) > 0,
|
||||
distance = dx * dx + dz * dz,
|
||||
})
|
||||
@@ -138,7 +155,7 @@ function ADLoadSwap.findDumpMarker(adEnv, vehicle, fillType, rest, homeWayPointI
|
||||
end
|
||||
end
|
||||
end
|
||||
candidates = ADLoadSwap.rankDumpCandidates(candidates, avoidMarkers)
|
||||
candidates = ADLoadSwap.rankDumpCandidates(ADLoadSwap.preferUnloadNamed(candidates), avoidMarkers)
|
||||
for _, candidate in ipairs(candidates) do
|
||||
if isReachable(candidate.marker.id) then
|
||||
return candidate.marker
|
||||
|
||||
@@ -125,6 +125,14 @@ end
|
||||
|
||||
-- Kun maskiner uden egen arbejdsrolle (almindelige traktorer) henter puljeredskaber — ikke mejetærskere,
|
||||
-- selvkørende sprøjter o.l., selv om de har koblingspunkter.
|
||||
-- Kan køretøjet hente puljevogne? Ikke lastbiler (butikskategori) eller køretøjer med eget lad/tank
|
||||
-- (in-game 4/10: pallebil og mælkebil sendt efter en GX 520). s = {category, ownBody}
|
||||
ADPool.NON_PULLER_CATEGORIES = {trucks = true, cars = true}
|
||||
function ADPool.isPuller(s)
|
||||
if s.ownBody then return false end
|
||||
return not ADPool.NON_PULLER_CATEGORIES[tostring(s.category or "")]
|
||||
end
|
||||
|
||||
function ADPool.canPull(role)
|
||||
return role == nil
|
||||
end
|
||||
@@ -427,7 +435,8 @@ function ADPool.collect(adEnv, isBusy)
|
||||
if id ~= nil and park ~= nil and vehicle.spec_attacherJoints ~= nil and #ADHitch.rearImplementsOf(vehicle) == 0
|
||||
and ADPool.isFreeFromFlows(vehicle) and not controlled and not isBusy(vehicle)
|
||||
and not ADPool.isReturning(vehicle) and ADFieldFleet.isEnabled(state.fleetMode, state.fleet, id)
|
||||
and ADPool.canPull(ADPool.ownRole(vehicle)) then
|
||||
and ADPool.canPull(ADPool.ownRole(vehicle))
|
||||
and ADPool.isPuller({category = categoryOf(vehicle), ownBody = vehicle.spec_trailer ~= nil or vehicle.spec_dischargeable ~= nil}) then
|
||||
local x, z = positionOf(vehicle)
|
||||
-- uden for AD-vejnettet: den kan ikke køre ud efter redskabet (ville sende redskaber i karantæne)
|
||||
local networkDistance = ADFieldWork.distanceToNetwork(adEnv, x, z)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.19.0</version>
|
||||
<version>1.62.20.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user