feat: kontrakter kører selv + review-rettelser (1.62.208)

This commit is contained in:
2026-10-10 18:17:26 +02:00
parent b241db9728
commit ceca255fd4
15 changed files with 207 additions and 17 deletions
+5 -3
View File
@@ -119,8 +119,10 @@ function ADPlayerTransport.dispatch(adEnv, field, info, role, decision, candidat
for _, assignment in ipairs(ADFieldJobs.assignmentsFor(field.id)) do
if assignment.phase == "awaitingPlayer" then return true end
end
-- uden F-markør (kontraktmark) kan AutoDrive ikke køre derud: alt køres af spilleren
local forcePlayer = info.markerId == nil
-- kun når INTET kan køre selv: et optaget sæt eller puljeredskab med parkering betyder kø, ikke spillerkørsel
if selfDrivingExists(adEnv, candidates, role, decision, roleAccept) then return false end
if not forcePlayer and selfDrivingExists(adEnv, candidates, role, decision, roleAccept) then return false end
-- sidder spilleren allerede i sættet, er det netop det, spilleren skal køre (pick springer ellers førersædet over)
local playerCandidates = {}
for index, candidate in ipairs(candidates) do
@@ -130,11 +132,11 @@ function ADPlayerTransport.dispatch(adEnv, field, info, role, decision, candidat
playerCandidates[index] = copy
end
local rig = ADFieldFleet.pick(playerCandidates, role, info.x, info.z, required, function(candidate)
return (roleAccept == nil or roleAccept(candidate)) and ADPlayerTransport.needsPlayer(adEnv, candidate, role, decision)
return (roleAccept == nil or roleAccept(candidate)) and (forcePlayer or ADPlayerTransport.needsPlayer(adEnv, candidate, role, decision))
end)
local implement, parkedExists = nil, false
if rig == nil then implement, parkedExists = looseImplement(adEnv, role, info.x, info.z, required, roleAccept) end
if parkedExists or (rig == nil and implement == nil) then return false end
if (parkedExists and not forcePlayer) or (rig == nil and implement == nil) then return false end
if not ADManualTransport.mayAskPlayer(waitingList(), field.id) then
note(field.id, {reason = {text = "venter på dig — kør først den maskine, du allerede er bedt om"},
retryAt = now() + ADFieldWork.NO_RIG_RETRY_MS})