fix: bak fri af løst frontredskab før AD-turen starter (v1.62.76)
This commit is contained in:
@@ -467,6 +467,13 @@ function ADHitch.tryDetach(vehicle, job)
|
||||
return false, "stillAttached: " .. table.concat(names, ", ")
|
||||
end
|
||||
|
||||
-- Frontredskab lige sat af: bak fri, før AD kører (ADHitchCreep, in-game 8/10 "P Front Mower").
|
||||
local function backOffIfBlocked(adEnv, vehicle)
|
||||
if ADHitchCreep == nil or ADHitchCreep.backOffIfBlocked == nil then return end
|
||||
local ok, err = pcall(ADHitchCreep.backOffIfBlocked, adEnv, vehicle)
|
||||
if not ok then Logging.warning(ADHitch.LOG_PREFIX .. "bak fri af frontredskab: %s", tostring(err)) end
|
||||
end
|
||||
|
||||
local function start(adEnv, vehicle, markerId, action, onDone)
|
||||
local marker = adEnv.ADGraphManager:getMapMarkerByWayPointId(markerId)
|
||||
local job = ADHitch.newJob(markerId, marker ~= nil and marker.name or tostring(markerId), action)
|
||||
@@ -474,6 +481,7 @@ local function start(adEnv, vehicle, markerId, action, onDone)
|
||||
jobs[vehicle] = job
|
||||
ADFieldWork.startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, markerId)
|
||||
Logging.info(ADHitch.LOG_PREFIX .. "'%s' kører til '%s'", vehicleName(vehicle), job.markerName)
|
||||
backOffIfBlocked(adEnv, vehicle)
|
||||
return job
|
||||
end
|
||||
|
||||
@@ -643,6 +651,7 @@ local function finish(vehicle, job, ok, detail, adEnv)
|
||||
if home ~= nil and home ~= job.markerId and ADFieldWork ~= nil and ADFieldWork.startAd ~= nil then
|
||||
local okHome, errHome = pcall(ADFieldWork.startAd, adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, home)
|
||||
if okHome then
|
||||
backOffIfBlocked(adEnv, vehicle)
|
||||
local marker = adEnv.ADGraphManager:getMapMarkerByWayPointId(home)
|
||||
Logging.info(ADHitch.LOG_PREFIX .. "'%s' kører til sin egen parkering '%s'", vehicleName(vehicle), tostring(marker ~= nil and marker.name or home))
|
||||
else
|
||||
|
||||
@@ -61,6 +61,25 @@ function ADHitchCreep.step(s)
|
||||
return "drive"
|
||||
end
|
||||
|
||||
-- Bak fri af et frontredskab der lige er sat af (in-game 8/10: T7 stod fast ved "P Front Mower" — AD's sensor ser
|
||||
-- kun fremad, også når ruten bakker, og så frontslåmaskinen lige foran som forhindring).
|
||||
ADHitchCreep.BACKOFF_MAX_M = 12 -- m: højst så langt lige bagud; AD kører videre ad båsens egne vejpunkter
|
||||
ADHitchCreep.BACKOFF_FRONT_M = 6 -- m foran traktorens front, hvor et løst redskab blokerer (AD-sensoren er ~2 m ved krybefart)
|
||||
ADHitchCreep.BACKOFF_LATERAL = 3 -- m til siden
|
||||
ADHitchCreep.BACKOFF_TIMEOUT_MS = 20000
|
||||
|
||||
-- Løst redskab i traktorens rum (lx, lz fra midten); halfLength = halv traktorlængde -> blokerer det fronten?
|
||||
function ADHitchCreep.isBlockingFront(lx, lz, halfLength)
|
||||
return lz > 0 and lz < (halfLength or 0) + ADHitchCreep.BACKOFF_FRONT_M and math.abs(lx) < ADHitchCreep.BACKOFF_LATERAL
|
||||
end
|
||||
|
||||
-- s = {blocking, moved, elapsedMs} -> "done" (redskabet står ikke længere foran) | "drive" | "giveUp"
|
||||
function ADHitchCreep.backOffStep(s)
|
||||
if not s.blocking then return "done" end
|
||||
if (s.moved or 0) >= ADHitchCreep.BACKOFF_MAX_M or (s.elapsedMs or 0) >= ADHitchCreep.BACKOFF_TIMEOUT_MS then return "giveUp" end
|
||||
return "drive"
|
||||
end
|
||||
|
||||
-- ---- spil ----
|
||||
|
||||
local function worldPos(node)
|
||||
@@ -202,6 +221,85 @@ function CreepTask:getInfoText() return self.target.front and "Kører frem til f
|
||||
function CreepTask:getI18nInfo() return "" end
|
||||
function CreepTask:getExcludedVehiclesForCollisionCheck() return {self.target.wagon} end
|
||||
|
||||
local function isBlocking(vehicle, object)
|
||||
if object.rootNode == nil then return false end
|
||||
local p = worldPos(object.rootNode)
|
||||
local lx, _, lz = worldToLocal(vehicle.rootNode, p.x, p.y, p.z)
|
||||
return ADHitchCreep.isBlockingFront(lx, lz, (vehicle.size ~= nil and vehicle.size.length or 5) / 2)
|
||||
end
|
||||
|
||||
-- Bak lige ud fra et løst frontredskab, før AD's tur starter (AD-opgave, lægges forrest i køen).
|
||||
local BackOffTask = {}
|
||||
BackOffTask.__index = BackOffTask
|
||||
|
||||
function BackOffTask.new(adEnv, vehicle, implement)
|
||||
return setmetatable({adEnv = adEnv, vehicle = vehicle, implement = implement, elapsedMs = 0}, BackOffTask)
|
||||
end
|
||||
|
||||
function BackOffTask:setUp()
|
||||
self.start = worldPos(self.vehicle.rootNode)
|
||||
Logging.info(ADHitchCreep.LOG_PREFIX .. "'%s' bakker fri af '%s'", vehicleName(self.vehicle), vehicleName(self.implement))
|
||||
end
|
||||
|
||||
function BackOffTask:update(dt)
|
||||
self.elapsedMs = self.elapsedMs + dt
|
||||
local vehicle, autoDrive = self.vehicle, self.adEnv.AutoDrive
|
||||
local p = worldPos(vehicle.rootNode)
|
||||
local moved = math.sqrt((p.x - self.start.x) ^ 2 + (p.z - self.start.z) ^ 2)
|
||||
local action = ADHitchCreep.backOffStep({blocking = isBlocking(vehicle, self.implement), moved = moved, elapsedMs = self.elapsedMs})
|
||||
local sdm = vehicle.ad.specialDrivingModule
|
||||
if action ~= "drive" then
|
||||
if sdm ~= nil and sdm.stopVehicle ~= nil then sdm:stopVehicle() end
|
||||
if action == "done" then
|
||||
Logging.info(ADHitchCreep.LOG_PREFIX .. "'%s' er fri af '%s' efter %.1f m", vehicleName(vehicle), vehicleName(self.implement), moved)
|
||||
else
|
||||
Logging.warning(ADHitchCreep.LOG_PREFIX .. "'%s' kom kun %.1f m fri af '%s' — AD overtager", vehicleName(vehicle), moved,
|
||||
vehicleName(self.implement))
|
||||
end
|
||||
local taskModule = self.adEnv.ADTaskModule
|
||||
vehicle.ad.taskModule:setCurrentTaskFinished(taskModule ~= nil and taskModule.DONT_PROPAGATE or 1)
|
||||
return
|
||||
end
|
||||
if sdm ~= nil and sdm.releaseVehicle ~= nil then sdm:releaseVehicle() end
|
||||
if vehicle.startMotor ~= nil and not vehicle:getIsMotorStarted() and vehicle:getCanMotorRun() then vehicle:startMotor() end
|
||||
local bx, by, bz = localToWorld(vehicle.rootNode, 0, 0, -20)
|
||||
local lx, lz = autoDrive.getDriveDirection(vehicle, bx, by, bz)
|
||||
autoDrive.driveInDirection(vehicle, dt, 30, 0.3, 0.2, 20, true, false, -lx, -lz, ADHitchCreep.CREEP_SPEED, 1)
|
||||
end
|
||||
|
||||
function BackOffTask:abort() end
|
||||
function BackOffTask:finished() end
|
||||
function BackOffTask:getInfoText() return "Bakker fri af frontredskabet" end
|
||||
function BackOffTask:getI18nInfo() return "" end
|
||||
function BackOffTask:getExcludedVehiclesForCollisionCheck() return {self.implement} end
|
||||
|
||||
-- Løst redskab (samme gård) lige foran traktoren, ellers nil.
|
||||
local function blockingFrontImplement(vehicle)
|
||||
if vehicle.rootNode == nil or g_currentMission == nil or g_currentMission.vehicleSystem == nil then return nil end
|
||||
local farmId = vehicle.getOwnerFarmId ~= nil and vehicle:getOwnerFarmId() or nil
|
||||
for _, object in pairs(g_currentMission.vehicleSystem.vehicles or {}) do
|
||||
if object ~= vehicle and object.spec_attachable ~= nil and object.spec_motorized == nil and object.rootNode ~= nil
|
||||
and (object.getAttacherVehicle == nil or object:getAttacherVehicle() == nil)
|
||||
and (farmId == nil or object.getOwnerFarmId == nil or object:getOwnerFarmId() == farmId) then
|
||||
if isBlocking(vehicle, object) then return object end
|
||||
end
|
||||
end
|
||||
return nil
|
||||
end
|
||||
|
||||
-- Kaldes lige efter AD er startet: står et løst redskab foran, bakkes der fri først (opgaven lægges forrest).
|
||||
function ADHitchCreep.backOffIfBlocked(adEnv, vehicle)
|
||||
local taskModule = vehicle ~= nil and vehicle.ad ~= nil and vehicle.ad.taskModule or nil
|
||||
if taskModule == nil or taskModule.tasks == nil or taskModule:getActiveTask() ~= nil then return false end
|
||||
local implement = blockingFrontImplement(vehicle)
|
||||
if implement == nil then return false end
|
||||
local queued = {}
|
||||
while taskModule.tasks:Count() > 0 do table.insert(queued, taskModule.tasks:Dequeue()) end
|
||||
taskModule.tasks:Enqueue(BackOffTask.new(adEnv, vehicle, implement))
|
||||
for _, task in ipairs(queued) do taskModule.tasks:Enqueue(task) end
|
||||
return true
|
||||
end
|
||||
|
||||
local isInstalled = false
|
||||
|
||||
-- DriveToMode:handleFinishedTask lægger StopAndDisableADTask i køen; bakningen lægges ind lige før.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.75.0</version>
|
||||
<version>1.62.76.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user