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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user