feat: frontklipper alene og front+bag som ét sæt; puljen henter/parkerer frontredskaber (v1.62.74)

This commit is contained in:
2026-10-08 09:11:44 +02:00
parent 7c950d066c
commit 678ceb1e8b
6 changed files with 279 additions and 68 deletions
+41 -19
View File
@@ -3,6 +3,7 @@
-- lige bag traktorens krog, lægges en lille bakke-opgave i AD's kø før stop. Traktoren bakker i krybefart og
-- standser, så snart spillet ser vognen inden for koblingsrækkevidde; ADHitch kobler derefter på som før.
-- AD's egen bak-kollisionssensor bruges ikke: den ser vognen selv som forhindring.
-- Frontredskab ("Connect P Front Mower", in-game 8/10): samme, men med traktorens frontkrog, og den kører frem.
ADHitchCreep = {}
ADHitchCreep.LOG_PREFIX = "ADSmartPickup: kobling: "
@@ -19,11 +20,13 @@ ADHitchCreep.RANGE_CHECK_MS = 250
-- ---- ren logik ----
-- offset = {x, z}: vognens trækøje i traktorens rum set fra krogen (z < 0 = bagved) -> "attach" | "creep" | "none"
function ADHitchCreep.plan(offset)
-- front = frontkrog (in-game 8/10: frontslåmaskine): redskabet skal stå foran krogen, traktoren kører frem.
function ADHitchCreep.plan(offset, front)
if offset == nil then return "none" end
local distance = math.sqrt(offset.x ^ 2 + offset.z ^ 2)
if distance <= ADHitchCreep.DIRECT_ATTACH_DISTANCE then return "attach" end
if offset.z >= 0 or distance > ADHitchCreep.CREEP_MAX_DISTANCE or math.abs(offset.x) > ADHitchCreep.CREEP_MAX_LATERAL then
local wrongSide = (front and offset.z <= 0) or (not front and offset.z >= 0)
if wrongSide or distance > ADHitchCreep.CREEP_MAX_DISTANCE or math.abs(offset.x) > ADHitchCreep.CREEP_MAX_LATERAL then
return "none"
end
return "creep"
@@ -38,6 +41,17 @@ function ADHitchCreep.isBetter(a, b)
return a.distance < b.distance
end
-- Kørt forbi trækøjet uden kobling? Bag: trækøjet er kommet foran krogen; front: bag krogen.
function ADHitchCreep.passed(offset, front)
if front then return offset.z < -0.5 end
return offset.z > 0.5
end
-- Hente-markøren for et frontredskab ("Connect P Front Mower"): så bruges frontkrogen og der køres frem.
function ADHitchCreep.isFrontMarker(name)
return ADHitch ~= nil and ADHitch.isFrontName(name) or false
end
-- s = {inRange, distance, startDistance, elapsedMs, passed} -> "done" | "drive" | "giveUp"
function ADHitchCreep.step(s)
if s.inRange then return "done" end
@@ -58,8 +72,8 @@ local function vehicleName(vehicle)
return vehicle ~= nil and vehicle.getName ~= nil and vehicle:getName() or "?"
end
-- Traktorens ledige bagerste krog-noder.
local function freeRearJoints(vehicle)
-- Traktorens ledige krog-noder på den ene side: bag (lz < 0) eller front (lz > 0, frontslåmaskine 8/10).
local function freeJoints(vehicle, front)
local spec = vehicle.spec_attacherJoints
if spec == nil or spec.attacherJoints == nil or vehicle.rootNode == nil then return {} end
local used = {}
@@ -71,7 +85,7 @@ local function freeRearJoints(vehicle)
if not used[index] and joint.jointTransform ~= nil then
local p = worldPos(joint.jointTransform)
local _, _, lz = worldToLocal(vehicle.rootNode, p.x, p.y, p.z)
if lz < 0 then table.insert(joints, {node = joint.jointTransform, jointType = joint.jointType}) end
if (front and lz > 0) or (not front and lz < 0) then table.insert(joints, {node = joint.jointTransform, jointType = joint.jointType}) end
end
end
return joints
@@ -84,9 +98,10 @@ local function offsetOf(vehicle, jointNode, targetNode)
return {x = x, z = z}
end
-- Nærmeste frakoblede redskab (samme gård) med et trækøje bag en ledig krog. -> {wagon, joint, target, offset, plan} | nil
function ADHitchCreep.findTarget(vehicle)
local joints = freeRearJoints(vehicle)
-- Nærmeste frakoblede redskab (samme gård) med et trækøje bag (front: foran) en ledig krog.
-- -> {wagon, joint, target, offset, plan, front} | nil
function ADHitchCreep.findTarget(vehicle, front)
local joints = freeJoints(vehicle, front)
if #joints == 0 or g_currentMission == nil or g_currentMission.vehicleSystem == nil then return nil end
local farmId = vehicle.getOwnerFarmId ~= nil and vehicle:getOwnerFarmId() or nil
local best = nil
@@ -100,8 +115,8 @@ function ADHitchCreep.findTarget(vehicle)
for _, joint in ipairs(joints) do
if input.jointType == nil or joint.jointType == nil or input.jointType == joint.jointType then
local offset = offsetOf(vehicle, joint.node, input.node)
local candidate = {wagon = object, joint = joint.node, target = input.node, offset = offset,
distance = math.sqrt(offset.x ^ 2 + offset.z ^ 2), plan = ADHitchCreep.plan(offset)}
local candidate = {wagon = object, joint = joint.node, target = input.node, offset = offset, front = front,
distance = math.sqrt(offset.x ^ 2 + offset.z ^ 2), plan = ADHitchCreep.plan(offset, front)}
if candidate.distance <= ADHitchCreep.CREEP_MAX_DISTANCE + 2 and ADHitchCreep.isBetter(candidate, best) then
best = candidate
end
@@ -133,8 +148,8 @@ end
function CreepTask:setUp()
local offset = offsetOf(self.vehicle, self.target.joint, self.target.target)
self.startDistance = math.sqrt(offset.x ^ 2 + offset.z ^ 2)
Logging.info(ADHitchCreep.LOG_PREFIX .. "'%s' bakker %.1f m hen til '%s' (%.1f m til siden)", vehicleName(self.vehicle),
self.startDistance, vehicleName(self.target.wagon), offset.x)
Logging.info(ADHitchCreep.LOG_PREFIX .. "'%s' %s %.1f m hen til '%s' (%.1f m til siden)", vehicleName(self.vehicle),
self.target.front and "kører frem" or "bakker", self.startDistance, vehicleName(self.target.wagon), offset.x)
end
function CreepTask:finish(action, distance)
@@ -163,7 +178,7 @@ function CreepTask:update(dt)
self.inRange = isInRange(self.vehicle, self.target.wagon)
end
local action = ADHitchCreep.step({inRange = self.inRange or distance <= ADHitchCreep.DIRECT_ATTACH_DISTANCE, distance = distance, startDistance = self.startDistance,
elapsedMs = self.elapsedMs, passed = offset.z > 0.5})
elapsedMs = self.elapsedMs, passed = ADHitchCreep.passed(offset, self.target.front)})
if action ~= "drive" then return self:finish(action, distance) end
local autoDrive, vehicle = self.adEnv.AutoDrive, self.vehicle
@@ -172,13 +187,18 @@ function CreepTask:update(dt)
local sdm = vehicle.ad.specialDrivingModule
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
-- som AD's ADSpecialDrivingModule:driveReverse (ikke-guidet): retning spejles ved bakning
autoDrive.driveInDirection(vehicle, dt, 30, 0.3, 0.2, 20, true, false, -lx, -lz, ADHitchCreep.CREEP_SPEED, 1)
if self.target.front then
-- frontkrog: kør frem mod frontredskabet (in-game 8/10)
autoDrive.driveInDirection(vehicle, dt, 30, 0.3, 0.2, 20, true, true, lx, lz, ADHitchCreep.CREEP_SPEED, 1)
else
-- som AD's ADSpecialDrivingModule:driveReverse (ikke-guidet): retning spejles ved bakning
autoDrive.driveInDirection(vehicle, dt, 30, 0.3, 0.2, 20, true, false, -lx, -lz, ADHitchCreep.CREEP_SPEED, 1)
end
end
function CreepTask:abort() end
function CreepTask:finished() end
function CreepTask:getInfoText() return "Bakker hen til vognen" end
function CreepTask:getInfoText() return self.target.front and "Kører frem til frontredskabet" or "Bakker hen til vognen" end
function CreepTask:getI18nInfo() return "" end
function CreepTask:getExcludedVehiclesForCollisionCheck() return {self.target.wagon} end
@@ -194,12 +214,14 @@ function ADHitchCreep.install(adEnv)
local ok, err = pcall(function()
local job = self.driveToDestinationTask ~= nil and ADHitch.pendingAttach(self.vehicle) or nil
if job == nil or job.markerId ~= self.destinationID then return end
local target = ADHitchCreep.findTarget(self.vehicle)
-- "Connect P Front Mower": frontkrogen og frem; ellers bagkrogen og bak (uændret)
local front = ADHitchCreep.isFrontMarker(job.markerName)
local target = ADHitchCreep.findTarget(self.vehicle, front)
if target == nil or target.plan ~= "creep" then
-- hvorfor der ikke bakkes (in-game 6/10: Læssevogn 2 'noAttachable' uden bakning)
if target == nil then
Logging.info(ADHitchCreep.LOG_PREFIX .. "'%s' ved '%s': intet frakoblet redskab med trækøje inden for %d m bag krogen",
vehicleName(self.vehicle), tostring(job.markerName), ADHitchCreep.CREEP_MAX_DISTANCE + 2)
Logging.info(ADHitchCreep.LOG_PREFIX .. "'%s' ved '%s': intet frakoblet redskab med trækøje inden for %d m %s krogen",
vehicleName(self.vehicle), tostring(job.markerName), ADHitchCreep.CREEP_MAX_DISTANCE + 2, front and "foran" or "bag")
else
Logging.info(ADHitchCreep.LOG_PREFIX .. "'%s' ved '%s': bakker ikke (%s) — '%s' trækøje %.1f m %s, %.1f m til siden",
vehicleName(self.vehicle), tostring(job.markerName), tostring(target.plan), vehicleName(target.wagon),