fix: CP-startpunkt skiftes til sidste waypoint efter start og ved genstart (v1.62.14)
This commit is contained in:
@@ -153,6 +153,16 @@ function ADCpBridge.emptySprayerIfWrong(vehicle, role)
|
||||
return liters, name
|
||||
end
|
||||
|
||||
-- Når jobbet er startet (fx fra første waypoint): maskinens eget CP-startpunkt sættes til "sidste", så enhver
|
||||
-- senere genstart — spillerens, efter tømning eller efter indlæsning — fortsætter hvor den slap (in-game 4/10:
|
||||
-- mejetærskeren sprang stykker over, fordi startpunktet stod på "nærmeste").
|
||||
function ADCpBridge.resumeFromLast(vehicle)
|
||||
if CpFieldWorkJobParameters == nil or vehicle == nil or vehicle.getCpStartingPointSetting == nil then return false end
|
||||
local ok, setting = pcall(vehicle.getCpStartingPointSetting, vehicle)
|
||||
if not ok or setting == nil or setting.setValue == nil then return false end
|
||||
return (pcall(setting.setValue, setting, CpFieldWorkJobParameters.START_AT_LAST_POINT))
|
||||
end
|
||||
|
||||
function ADCpBridge.getSpecs(vehicle)
|
||||
local specs = {}
|
||||
for _, object in ipairs(collect(vehicle)) do
|
||||
@@ -621,6 +631,7 @@ function ADCpBridge.start(vehicle, fieldX, fieldZ, onDone, opts)
|
||||
local ok, err = job:validate(farmId)
|
||||
if not ok then return finish(false, "Courseplay: " .. tostring(err)) end
|
||||
g_currentMission.aiSystem:startJob(job, farmId)
|
||||
ADCpBridge.resumeFromLast(vehicle)
|
||||
finish(true, handle.copiedCourse and "copied" or (handle.reusedCourse and "reused" or nil))
|
||||
end
|
||||
local function generateAndStart()
|
||||
|
||||
@@ -74,17 +74,31 @@ local function farmVehicles(adEnv)
|
||||
return list, byId
|
||||
end
|
||||
|
||||
-- Starter CP fra nærmeste waypoint (HUD-startpunktet sættes som spillerens "start ved nærmeste"-tast).
|
||||
function ADCpResume.startNearest(vehicle)
|
||||
-- Starter CP med et bestemt startpunkt (HUD-startpunktet sættes som spillerens egen startpunkt-tast).
|
||||
local function startWith(vehicle, value)
|
||||
if vehicle.cpStartStopDriver == nil or (vehicle.getIsAIActive ~= nil and vehicle:getIsAIActive()) then return false end
|
||||
if vehicle.getCpStartingPointSetting ~= nil and CpFieldWorkJobParameters ~= nil and vehicle.hasCpCourse ~= nil and vehicle:hasCpCourse() then
|
||||
if value ~= nil and vehicle.getCpStartingPointSetting ~= nil and vehicle.hasCpCourse ~= nil and vehicle:hasCpCourse() then
|
||||
local setting = vehicle:getCpStartingPointSetting()
|
||||
if setting ~= nil then setting:setValue(CpFieldWorkJobParameters.START_AT_NEAREST_POINT) end
|
||||
if setting ~= nil then setting:setValue(value) end
|
||||
end
|
||||
vehicle:cpStartStopDriver(true)
|
||||
return true
|
||||
end
|
||||
|
||||
-- Starter CP fra nærmeste waypoint (CP-job uden markrolle: balleopsamler, tømmevogn i CP-job).
|
||||
function ADCpResume.startNearest(vehicle)
|
||||
return startWith(vehicle, CpFieldWorkJobParameters ~= nil and CpFieldWorkJobParameters.START_AT_NEAREST_POINT or nil)
|
||||
end
|
||||
|
||||
-- Markmaskine: fortsæt fra SIDSTE (huskede) waypoint, så intet springes over; uden husket waypoint nærmeste
|
||||
-- (in-game 4/10: F5-mejetærskeren sprang stykker over, fordi genstarten satte "nærmeste").
|
||||
function ADCpResume.startAtLast(vehicle)
|
||||
if CpFieldWorkJobParameters == nil then return startWith(vehicle, nil) end
|
||||
local ok, ix = pcall(function() return vehicle.getCpLastRememberedWaypointIx ~= nil and vehicle:getCpLastRememberedWaypointIx() or nil end)
|
||||
local remembered = ok and type(ix) == "number" and ix > 1
|
||||
return startWith(vehicle, remembered and CpFieldWorkJobParameters.START_AT_LAST_POINT or CpFieldWorkJobParameters.START_AT_NEAREST_POINT)
|
||||
end
|
||||
|
||||
-- Id'er der skal startes nu (nil = ingen gemt liste). Listen bruges kun én gang.
|
||||
function ADCpResume.takeToStart(adEnv)
|
||||
local list, byId = farmVehicles(adEnv)
|
||||
|
||||
@@ -1142,7 +1142,7 @@ function ADFieldWork.resumeAfterLoad(adEnv)
|
||||
tostring(rig.label), distance ~= nil and string.format("%.0f m", distance) or "ukendt afstand")
|
||||
elseif wasWorking and not rig.busy and not rig.controlled then
|
||||
local ok, started
|
||||
if toStart ~= nil then ok, started = pcall(ADCpResume.startNearest, vehicle)
|
||||
if toStart ~= nil then ok, started = pcall(ADCpResume.startAtLast, vehicle)
|
||||
else ok, started = pcall(vehicle.startCpAtLastWp, vehicle) end
|
||||
if not ok then
|
||||
Logging.warning(ADFieldJobs.LOG_PREFIX .. "'%s' kunne ikke genstartes: %s", tostring(rig.label), tostring(started))
|
||||
@@ -1164,8 +1164,7 @@ function ADFieldWork.resumeAfterLoad(adEnv)
|
||||
log(fieldId, "'%s' fortsætter efter genindlæsning (Courseplay fra sidste waypoint)%s", tostring(rig.label),
|
||||
assignment.storeId ~= nil and "" or (fillType ~= nil and " — intet lager til resten fundet" or ""))
|
||||
else
|
||||
Logging.info(ADFieldJobs.LOG_PREFIX .. "'%s' genstartet fra %s waypoint efter genindlæsning", tostring(rig.label),
|
||||
toStart ~= nil and "nærmeste" or "sidste")
|
||||
Logging.info(ADFieldJobs.LOG_PREFIX .. "'%s' genstartet fra sidste waypoint efter genindlæsning", tostring(rig.label))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.13.0</version>
|
||||
<version>1.62.14.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user