fix: pause mens spilleren kører en traktor fri med AD slået fra (1.62.220)

Kobling og køretur ud til marken opgav før med stoppedAway/genstart under spilleren,
når AutoDrive blev slået fra. Nu ventes der, mens spilleren sitter i maskinen; AD til
igen = videre mod samme mål, af = moden starter AD igen, andet mål = sættet slippes.
Spillerkørsel slipper på vej først efter 75 m.
This commit is contained in:
2026-10-11 22:54:24 +02:00
parent 606d08ac57
commit af16e1aefd
7 changed files with 94 additions and 5 deletions
+25
View File
@@ -251,6 +251,31 @@ function ADFieldJobs.shouldResume(s)
return type(s.distance) == "number" and s.distance <= ADFieldJobs.RESUME_NEAR_M
end
-- Spilleren kører en maskine selv (AD/CP slået fra). På vej hen at hente redskabet eller ud til marken er det oftest
-- for at køre den fri af en anden (in-game 11/10) — sættet slippes først, når han har kørt et rigtigt stykke.
-- s = {phase, movedM}
ADFieldJobs.PLAYER_TAKEOVER_M = 75
ADFieldJobs.TRANSPORT_PHASES = {fetching = true, driving = true}
function ADFieldJobs.playerTakesOver(s)
if not ADFieldJobs.TRANSPORT_PHASES[s.phase] then return true end
return type(s.movedM) == "number" and s.movedM >= ADFieldJobs.PLAYER_TAKEOVER_M
end
-- Køreturen ud med AD slået fra. s = {adActive, controlled, paused, arrived, otherTarget}
-- -> "wait" | "resume" | "clear" | "release" | nil
-- (wait: spilleren sidder i den; resume: han stod af — start AD igen; clear: han slog AD til selv mod samme mål;
-- release: han gav AD et andet mål — så kører han den; nil: almindelig håndtering, også fremme ved markøren)
function ADFieldJobs.drivePause(s)
if s.adActive then
if not s.paused then return nil end
return s.otherTarget and "release" or "clear"
end
if s.arrived then return nil end
if s.controlled then return "wait" end
if s.paused then return "resume" end
return nil
end
-- Højst én maskine sendt ud pr. DISPATCH_GAP_MS på tværs af alle marker (in-game 27/9: 6 maskiner kørte fra
-- parkeringen i samme sekund efter Start alle).
-- Justerbart pr. savegame (brugerønske 6/10): få maskiner kan nøjes med 1–5 s, mange har brug for 30 s eller mere.
+42 -1
View File
@@ -2024,7 +2024,19 @@ function ADFieldWork.follow(adEnv, assignment)
elseif assignment.playerDrivingSince == nil then
assignment.playerDrivingSince = now()
end
if playerDriving and now() - assignment.playerDrivingSince >= ADFieldWork.PLAYER_DRIVING_MS then
-- hvor spilleren tog over (AD/CP fra, han i sædet): kort kørsel på vej ud er at køre den fri, ikke at overtage
if isControlledByPlayer(vehicle) and not steeredByAi then
if assignment.playerFromX == nil then assignment.playerFromX, assignment.playerFromZ = vehiclePosition(vehicle) end
else
assignment.playerFromX, assignment.playerFromZ = nil, nil
end
local movedM = nil
if assignment.playerFromX ~= nil then
local px, pz = vehiclePosition(vehicle)
movedM = math.sqrt((px - assignment.playerFromX) ^ 2 + (pz - assignment.playerFromZ) ^ 2)
end
if playerDriving and now() - assignment.playerDrivingSince >= ADFieldWork.PLAYER_DRIVING_MS
and ADFieldJobs.playerTakesOver({phase = assignment.phase, movedM = movedM}) then
log(assignment.fieldId, "'%s' frigivet — spilleren kører det", ADRuns.vehicleLabel(vehicle))
-- husk den: står spilleren af ved marken, overtager moden igen (ADFieldWork.tickReadopt)
ADFieldWork.taken[assignment.vehicleId] = {fieldId = assignment.fieldId, role = assignment.role, stage = assignment.stage,
@@ -2108,6 +2120,35 @@ function ADFieldWork.follow(adEnv, assignment)
log(assignment.fieldId, "%s '%s' har '%s' på — kører til %s (%.1f m)", assignment.role, ADRuns.vehicleLabel(vehicle),
tostring(assignment.pool.implementName), tostring(info.markerName), width or 0)
elseif assignment.phase == "driving" then
local px, pz = vehiclePosition(vehicle)
local target = info ~= nil and adEnv.ADGraphManager:getWayPointById(info.markerId) or nil
local arrived = target ~= nil and math.sqrt((target.x - px) ^ 2 + (target.z - pz) ^ 2) <= ADFieldWork.ARRIVE_DISTANCE
local stateModule = vehicle.ad ~= nil and vehicle.ad.stateModule or nil
local firstMarker = stateModule ~= nil and stateModule.getFirstMarker ~= nil and stateModule:getFirstMarker() or nil
local otherTarget = assignment.drive ~= nil and firstMarker ~= nil and firstMarker.id ~= nil and firstMarker.id ~= assignment.drive.first
local pause = ADFieldJobs.drivePause({adActive = isAdActive(vehicle), controlled = isControlledByPlayer(vehicle),
paused = assignment.playerPaused, arrived = arrived, otherTarget = otherTarget})
if pause == "release" then
log(assignment.fieldId, "'%s' frigivet — spilleren gav AutoDrive et andet mål (%s)", ADRuns.vehicleLabel(vehicle), tostring(firstMarker.name))
ADFieldWork.taken[assignment.vehicleId] = {fieldId = assignment.fieldId, role = assignment.role, stage = assignment.stage,
helper = assignment.helper, fillType = assignment.fillType, at = now()}
return ADFieldWork.release(assignment)
elseif pause == "wait" then
-- spilleren har slået AD fra og kører den fri af en anden: vent på ham (in-game 11/10)
assignment.playerPaused, assignment.since = true, now()
return
elseif pause == "clear" then
assignment.playerPaused = nil
elseif pause == "resume" and assignment.drive == nil then
assignment.playerPaused = nil
elseif pause == "resume" then
assignment.playerPaused, assignment.since = nil, now()
assignment.startX, assignment.startZ = vehiclePosition(vehicle)
local d = assignment.drive
startAd(adEnv, vehicle, d.mode, d.first, d.second, d.fillType)
log(assignment.fieldId, "'%s': spilleren steg af — kører videre til %s", ADRuns.vehicleLabel(vehicle), tostring(info ~= nil and info.markerName or "?"))
return
end
if not isAdActive(vehicle) and now() - assignment.since > 2000 then
local x, z = vehiclePosition(vehicle)
local wayPoint = info ~= nil and adEnv.ADGraphManager:getWayPointById(info.markerId) or nil
+17 -3
View File
@@ -208,7 +208,7 @@ function ADHitch.step(job, state, dt, succeeded)
return
end
if state.adActive then
job.seenActive = true
job.seenActive, job.pausedByPlayer = true, nil
-- AD bliver aldrig færdig når krogen rammer trækøjet før traktorens midte når markøren (in-game 4/10):
-- stille ved sidste waypoint inden for ankomstafstanden et stykke tid = fremme; adapteren stopper AD
if state.atLastWaypoint and state.speed <= ADHitch.STILL_SPEED and state.distance <= arriveDistanceOf(state) then
@@ -227,6 +227,13 @@ function ADHitch.step(job, state, dt, succeeded)
end
elseif ADHitch.hasArrived(state) then
job.state = "acting"
elseif state.controlled then
-- spilleren har slået AD fra og kører traktoren fri af en anden (in-game 11/10: tre traktorer opgav koblingen
-- med 'stoppedAway' og kørte hjem): vent — videre når AD slås til, eller når spilleren står af
job.pausedByPlayer, job.elapsed = true, 0
elseif job.pausedByPlayer then
job.pausedByPlayer, job.elapsed, job.seenActive = nil, 0, false
job.restart, job.resumed = true, true
elseif state.distance > arriveDistanceOf(state) and not job.seenActive and job.elapsed >= ADHitch.START_GRACE_MS
and (job.restarts or 0) < ADHitch.START_RETRIES then
-- AD kom aldrig i gang: AD afviser start, mens Courseplays job endnu ikke er afsluttet (in-game 8/10 F53:
@@ -304,6 +311,7 @@ local function vehicleState(adEnv, vehicle, markerId)
local mode = module ~= nil and module.getMode ~= nil and module:getMode() or nil
return {
adActive = module ~= nil and module:isActive(),
controlled = vehicle.getIsControlled ~= nil and vehicle:getIsControlled() or false,
-- hele sættet: med en lang vogn bag (CARGOS 760) holder traktoren 14 m fra båsens P-markør, når den lige har
-- koblet vognen på ved Connect og AD straks melder fremme (in-game 10/10: 'stoppedAway (14 m)' fire gange)
lengthSlack = ADHitch.lengthSlack(combinedLength),
@@ -755,8 +763,14 @@ function ADHitch.tick(adEnv, dt)
if job.restart then
job.restart = nil
local okStart, errStart = pcall(ADFieldWork.startAd, adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, job.markerId)
Logging.info(ADHitch.LOG_PREFIX .. "'%s' kom ikke i gang mod '%s' — starter AD igen (forsøg %d)%s", vehicleName(vehicle),
tostring(job.markerName), job.restarts, okStart and "" or (": " .. tostring(errStart)))
if job.resumed then
job.resumed = nil
Logging.info(ADHitch.LOG_PREFIX .. "'%s': spilleren steg af — kører videre mod '%s'%s", vehicleName(vehicle),
tostring(job.markerName), okStart and "" or (": " .. tostring(errStart)))
else
Logging.info(ADHitch.LOG_PREFIX .. "'%s' kom ikke i gang mod '%s' — starter AD igen (forsøg %d)%s", vehicleName(vehicle),
tostring(job.markerName), job.restarts, okStart and "" or (": " .. tostring(errStart)))
end
end
if job.endTask then
job.endTask = nil
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<modDesc descVersion="107">
<author>masterdraco</author>
<version>1.62.219.0</version>
<version>1.62.220.0</version>
<title>
<en>AD Smart Pickup</en>
</title>