feat: mislykket skærebordsmontering beder spilleren montere og stige ud, modden overtager — 1.62.173

This commit is contained in:
2026-10-10 07:14:44 +02:00
parent d2a811f9ff
commit b5a4934701
5 changed files with 27 additions and 14 deletions
+19 -11
View File
@@ -517,6 +517,10 @@ end
local function askPlayer(field, info, assignment, withDialog)
local text = string.format("F%s skal høstes: kør '%s' til %s, montér skærebordet og stig ud — så overtager Smart Pickup",
tostring(field.id), ADRuns.vehicleLabel(assignment.vehicle), tostring(info.markerName or ("F" .. tostring(field.id))))
if assignment.manualMount then
text = string.format("F%s: '%s' kunne ikke selv montere skærebordet — montér det foran og stig ud, så overtager Smart Pickup",
tostring(field.id), ADRuns.vehicleLabel(assignment.vehicle))
end
assignment.remindedAt = now()
log(field.id, "venter på spilleren: %s", text)
if withDialog and InfoDialog ~= nil and InfoDialog.show ~= nil then
@@ -1386,7 +1390,10 @@ local function followManual(adEnv, field, info, assignment)
end
local forced = ADFieldJobs.takeoverRequested[field.id] == true
ADFieldJobs.takeoverRequested[field.id] = nil
local ok, why = ADManualTransport.readiness({atField = atField, fruits = ADCpBridge.getHarvestFruits(vehicle) or {},
-- skærebord på transporthjul skal sidde FORAN (bag mejetærskeren kan det ikke høste)
local fruits = ADCpBridge.getHarvestFruits(vehicle) or {}
if ADHeaderSwap ~= nil and ADHeaderSwap.headerPosition(vehicle) == "rear" then fruits = {} end
local ok, why = ADManualTransport.readiness({atField = atField, fruits = fruits,
fruit = info.fruitIndex, controlled = isControlledByPlayer(vehicle), forced = forced})
if ok then
log(field.id, "overtager '%s'%s", ADRuns.vehicleLabel(vehicle), forced and " (Start nu)" or "")
@@ -1680,9 +1687,7 @@ function ADFieldWork.tickReadopt(adEnv)
if swapState == "none" then
beginWork(adEnv, field, info, assignment)
elseif swapState == "failed" then
ADFieldWork.release(assignment)
fail(entry.fieldId, string.format("'%s' kunne ikke montere skærebordet: %s", tostring(rig.label),
tostring(assignment.headerSwap ~= nil and assignment.headerSwap.text or "?")))
ADFieldWork.headerMountFailed(adEnv, assignment, assignment.headerSwap ~= nil and assignment.headerSwap.text or "?")
end
end
end
@@ -1712,15 +1717,18 @@ function ADFieldWork.startHeaderSwap(adEnv, assignment, toward)
return "started"
end
-- Skærebordet kunne ikke monteres foran: tilbage på sin plads (i karantæne, så det ikke hentes igen og igen), marken
-- prøver igen senere.
local function headerMountFailed(adEnv, assignment, text)
-- Skærebordet kunne ikke monteres foran (fx ingen plads ved markens indkørsel, træer): spilleren bedes montere det og
-- stige ud — så overtager modden som ved manuel transport, og efter høst sætter den selv skærebordet bag på og kører hjem
-- (brugerønske 10/10). Fasen "awaitingPlayer" + followManual (skærebordet skal sidde FORAN).
function ADFieldWork.headerMountFailed(adEnv, assignment, text)
local vehicle = assignment.vehicle
if ADPool ~= nil and assignment.pool ~= nil and assignment.pool.implementId ~= nil then ADPool.quarantine(assignment.pool.implementId, now()) end
ADFieldWork.release(assignment)
if ADHitch ~= nil then ADHitch.returnHome(adEnv, vehicle) end
fail(assignment.fieldId, string.format("'%s' kunne ikke montere skærebordet: %s", ADRuns.vehicleLabel(vehicle), tostring(text)))
assignment.phase, assignment.since, assignment.manualMount = "awaitingPlayer", now(), true
assignment.remindedAt = nil
log(assignment.fieldId, "'%s' kunne ikke selv montere skærebordet (%s) — venter på spilleren", ADRuns.vehicleLabel(vehicle), tostring(text))
local field, info = ADFieldJobs.getField(assignment.fieldId), ADFields.getInfo(assignment.fieldId)
if field ~= nil and info ~= nil then askPlayer(field, info, assignment, true) end
end
local headerMountFailed = ADFieldWork.headerMountFailed
followHeaderSwap = function(adEnv, field, info, assignment)
local swap = assignment.headerSwap
+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.172.0</version>
<version>1.62.173.0</version>
<title>
<en>AD Smart Pickup</en>
</title>