fix: husket maskine sendes hjem når en anden med samme rolle allerede arbejder marken (F100 to kalkspredere) — 1.62.278
This commit is contained in:
@@ -2549,12 +2549,28 @@ function ADFieldWork.tickReadopt(adEnv)
|
||||
ADFieldWork.taken[vehicleId] = nil
|
||||
log(entry.fieldId, "'%s' nåede ikke frem (AutoDrive stoppet undervejs) — marken må få et andet sæt", tostring(rig.label))
|
||||
else
|
||||
local otherWorking = false
|
||||
for _, assignment in pairs(ADFieldJobs.state.assignments) do
|
||||
-- høstere undtaget (flere mejetærskere på én mark rører vi ikke ved)
|
||||
if assignment.fieldId == entry.fieldId and assignment.role == entry.role and entry.role ~= "harvester"
|
||||
and (assignment.helper == true) == (entry.helper == true)
|
||||
and assignment.vehicleId ~= rig.id and (assignment.phase == "working" or assignment.phase == "starting") then
|
||||
otherWorking = true
|
||||
end
|
||||
end
|
||||
local action = ADFieldJobs.readoptAction({controlled = rig.controlled, busy = rig.busy, near = near, tripActive = tripActive,
|
||||
sameStage = field.stage == entry.stage,
|
||||
hasRole = rig.role == entry.role or (rig.roles ~= nil and rig.roles[entry.role] == true),
|
||||
ageMs = now() - (entry.at or now())})
|
||||
ageMs = now() - (entry.at or now()), otherWorking = otherWorking})
|
||||
if action == "forget" then
|
||||
ADFieldWork.taken[vehicleId] = nil
|
||||
elseif action == "sendHome" then
|
||||
ADFieldWork.taken[vehicleId] = nil
|
||||
log(entry.fieldId, "'%s' sendes hjem — en anden %s arbejder allerede marken", tostring(rig.label), tostring(entry.role))
|
||||
if not (ADHitch ~= nil and ADHitch.returnHome(adEnv, rig.vehicle)) then
|
||||
local park = parkMarkerId(adEnv, rig.vehicle)
|
||||
if park ~= nil then startAd(adEnv, rig.vehicle, adEnv.AutoDrive.MODE_DRIVETO, park, nil) end
|
||||
end
|
||||
elseif action == "readopt" then
|
||||
ADFieldWork.taken[vehicleId] = nil
|
||||
-- erstatningen der stadig er på vej, sendes hjem
|
||||
|
||||
Reference in New Issue
Block a user