|
|
|
@@ -190,6 +190,7 @@ ADFieldWork.isBusyVehicle = isBusyVehicle
|
|
|
|
|
function ADFieldWork.getRigs(adEnv)
|
|
|
|
|
local rigs = {}
|
|
|
|
|
local state = ADFieldJobs.state
|
|
|
|
|
local parkedHeaders = nil -- skærebord på transporthjul (ADHeaderSwap), slås op én gang
|
|
|
|
|
for _, vehicle in ipairs(ADRunsController.getFarmVehicles(adEnv)) do
|
|
|
|
|
local specs = ADCpBridge.getSpecs(vehicle)
|
|
|
|
|
local role = ADFieldFleet.roleFromSpecs(specs)
|
|
|
|
@@ -217,6 +218,22 @@ function ADFieldWork.getRigs(adEnv)
|
|
|
|
|
roles = ADPool.rolesOf(role, specs.sprayRoles), filledRole = specs.filledRole, dumpable = specs.dumpable,
|
|
|
|
|
}
|
|
|
|
|
if role == "harvester" then rig.fruits = ADCpBridge.getHarvestFruits(vehicle) or {} end
|
|
|
|
|
-- mejetærsker uden skærebord, men et skærebord på transporthjul står parkeret ved en Connect-markør: den kan
|
|
|
|
|
-- hente det selv (brugerønske 10/10) — dens afgrøder er de parkerede skærebords
|
|
|
|
|
if role == "harvester" and not rig.manual and next(rig.fruits) == nil and ADHeaderSwap ~= nil and ADHeaderSwap.canTowHeader(vehicle) then
|
|
|
|
|
if parkedHeaders == nil then
|
|
|
|
|
local okH, list = pcall(ADHeaderSwap.parkedHeaders, adEnv, vehicle:getOwnerFarmId())
|
|
|
|
|
parkedHeaders = okH and list or {}
|
|
|
|
|
end
|
|
|
|
|
if #parkedHeaders > 0 then
|
|
|
|
|
rig.headerOptions = parkedHeaders
|
|
|
|
|
-- bredden: skærebordets (mejetærskeren alene har 0 m og ville blive valgt fra)
|
|
|
|
|
for _, option in ipairs(parkedHeaders) do
|
|
|
|
|
for fruit in pairs(option.fruits or {}) do rig.fruits[fruit] = true end
|
|
|
|
|
if (option.width or 0) > (rig.width or 0) then rig.width = option.width end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
if role == "seeder" then
|
|
|
|
|
rig.seedFruits = ADCpBridge.getSeedFruits(vehicle)
|
|
|
|
|
rig.hasSeeds = ADCpBridge.hasSeeds(vehicle)
|
|
|
|
@@ -343,6 +360,10 @@ function ADFieldWork.release(assignment, phase)
|
|
|
|
|
if assignment.phase == "fetching" and assignment.hitch ~= nil and not assignment.hitch.done and ADHitch ~= nil then
|
|
|
|
|
ADHitch.cancel(assignment.vehicle)
|
|
|
|
|
end
|
|
|
|
|
-- skærebords-skift i gang: stop det, så det ikke kører videre uden en opgave
|
|
|
|
|
if (assignment.phase == "mountingHeader" or assignment.phase == "unmountingHeader") and ADHeaderSwap ~= nil then
|
|
|
|
|
pcall(ADHeaderSwap.cancel, assignment.vehicle)
|
|
|
|
|
end
|
|
|
|
|
assignment.phase = phase or "released"
|
|
|
|
|
if ADPool ~= nil and assignment.pool ~= nil then ADPool.release(assignment) end
|
|
|
|
|
ADFieldJobs.state.assignments[assignment.vehicleId] = nil
|
|
|
|
@@ -678,7 +699,26 @@ function ADFieldWork.dispatch(adEnv, field, info, decision)
|
|
|
|
|
groupSize = decision.helper and 1 or count, lane = count > 1 and lanes[index] or nil, leader = index == 1,
|
|
|
|
|
fillType = decision.helper and info.harvestFillType or nil,
|
|
|
|
|
}
|
|
|
|
|
if role == "harvester" and rig.manual and not assignment.helper then
|
|
|
|
|
local header = role == "harvester" and not rig.manual and not assignment.helper and rig.headerOptions ~= nil
|
|
|
|
|
and ADHeaderSwap.pickHeader(rig.headerOptions, info.fruitIndex, info.x, info.z) or nil
|
|
|
|
|
if header == nil and rig.headerOptions ~= nil then
|
|
|
|
|
-- mejetærsker uden skærebord og intet ledigt skærebord til afgrøden: sendes ikke ud
|
|
|
|
|
log(field.id, "harvester: '%s' har intet skærebord, og intet ledigt skærebord kan høste afgrøden", rig.label)
|
|
|
|
|
elseif header ~= nil then
|
|
|
|
|
header.taken = true
|
|
|
|
|
if (header.width or 0) > 0 then assignment.width = header.width end
|
|
|
|
|
-- henter sit skærebord på transporthjul (som puljens "fetching": samme fejl- og karantænevej), monterer det på marken
|
|
|
|
|
assignment.phase, assignment.startX, assignment.startZ = "fetching", rig.x, rig.z
|
|
|
|
|
assignment.pool = {implementId = header.id, implementName = header.name, connectId = header.connectId,
|
|
|
|
|
implements = {{id = header.id, name = header.name, connectId = header.connectId}}}
|
|
|
|
|
assignment.hitch, assignment.headerSwap = {done = false}, {}
|
|
|
|
|
ADFieldJobs.state.assignments[rig.id] = assignment
|
|
|
|
|
ADPool.reserve(assignment, {header.id, rig.id})
|
|
|
|
|
ADHitch.fetch(adEnv, rig.vehicle, header.connectId, function(_, ok, detail, failedIndex)
|
|
|
|
|
assignment.hitch = {done = true, ok = ok, detail = detail, failedIndex = failedIndex}
|
|
|
|
|
end)
|
|
|
|
|
log(field.id, "harvester: '%s' henter skærebordet '%s' (%s)", rig.label, header.name, tostring(header.parkName))
|
|
|
|
|
elseif role == "harvester" and rig.manual and not assignment.helper then
|
|
|
|
|
-- for bred til vejene: spilleren kører den selv til marken og monterer skærebordet
|
|
|
|
|
assignment.phase, assignment.manual = "awaitingPlayer", true
|
|
|
|
|
assignment.startX, assignment.startZ = rig.x, rig.z
|
|
|
|
@@ -1271,8 +1311,21 @@ local function beginWork(adEnv, field, info, assignment)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
-- Sættet er færdigt: rest til lager (læsse-/aflæsningsvogn), ellers parkering.
|
|
|
|
|
local followHeaderSwap
|
|
|
|
|
|
|
|
|
|
local function finishAssignment(adEnv, assignment)
|
|
|
|
|
local vehicle = assignment.vehicle
|
|
|
|
|
-- skærebord på transporthjul foran: bag på først, så hjem (followHeaderSwap kalder tilbage hertil)
|
|
|
|
|
if not assignment.headerUnmounted then
|
|
|
|
|
local swapState = ADFieldWork.startHeaderSwap(adEnv, assignment, "rear")
|
|
|
|
|
if swapState == "started" then return end
|
|
|
|
|
if swapState == "failed" then
|
|
|
|
|
-- kunne ikke startes: ikke ud på vejen med skærebordet foran
|
|
|
|
|
assignment.headerUnmounted, assignment.manual = true, true
|
|
|
|
|
ADFieldJobs.notify(string.format("F%s: '%s' kunne ikke sætte skærebordet bag på — gør det selv og kør den hjem",
|
|
|
|
|
tostring(assignment.fieldId), ADRuns.vehicleLabel(vehicle)), true)
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
-- høster der stadig har korn efter rest-turen: AutoDrive kunne ikke tømme den — sig det tydeligt
|
|
|
|
|
if assignment.role == "harvester" and restLoad(adEnv, vehicle) > 0 then
|
|
|
|
|
local text = string.format("'%s' har stadig korn i tanken (%.0f l) — tøm den (AutoDrive kunne ikke aflæsse den)",
|
|
|
|
@@ -1623,6 +1676,65 @@ function ADFieldWork.tickReadopt(adEnv)
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
-- Skærebord på transporthjul (ADHeaderSwap): "front" = montér før høst (sidder bag), "rear" = sæt bag på efter høst
|
|
|
|
|
-- (sidder foran). -> "started" (fasen venter på skiftet) | "none" (intet at skifte) | "failed" (kunne ikke startes).
|
|
|
|
|
function ADFieldWork.startHeaderSwap(adEnv, assignment, toward)
|
|
|
|
|
if ADHeaderSwap == nil or assignment.role ~= "harvester" or assignment.manual then return "none" end
|
|
|
|
|
local position = ADHeaderSwap.headerPosition(assignment.vehicle)
|
|
|
|
|
if (toward == "front" and position ~= "rear") or (toward == "rear" and position ~= "front") then return "none" end
|
|
|
|
|
local swap = {done = false}
|
|
|
|
|
local mount = toward == "front" and ADHeaderSwap.mountFront or ADHeaderSwap.mountRear
|
|
|
|
|
local ok, started, why = pcall(mount, adEnv, assignment.vehicle, function(_, okSwap, text)
|
|
|
|
|
swap.done, swap.ok, swap.text = true, okSwap, text
|
|
|
|
|
end)
|
|
|
|
|
if not ok or not started then
|
|
|
|
|
log(assignment.fieldId, "'%s': skærebordet kunne ikke %s (%s)", ADRuns.vehicleLabel(assignment.vehicle),
|
|
|
|
|
toward == "front" and "monteres foran" or "sættes bag på", tostring(ok and why or started))
|
|
|
|
|
assignment.headerSwap = {done = true, ok = false, text = tostring(ok and why or started)}
|
|
|
|
|
return "failed"
|
|
|
|
|
end
|
|
|
|
|
assignment.headerSwap = swap
|
|
|
|
|
assignment.phase, assignment.since = toward == "front" and "mountingHeader" or "unmountingHeader", now()
|
|
|
|
|
log(assignment.fieldId, "'%s' %s", ADRuns.vehicleLabel(assignment.vehicle), toward == "front" and "monterer skærebordet foran" or "sætter skærebordet bag på")
|
|
|
|
|
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)
|
|
|
|
|
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)))
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
followHeaderSwap = function(adEnv, field, info, assignment)
|
|
|
|
|
local swap = assignment.headerSwap
|
|
|
|
|
if swap == nil or not swap.done then return end
|
|
|
|
|
local vehicle = assignment.vehicle
|
|
|
|
|
if assignment.phase == "mountingHeader" then
|
|
|
|
|
if swap.ok and field ~= nil and info ~= nil then
|
|
|
|
|
beginWork(adEnv, field, info, assignment)
|
|
|
|
|
elseif swap.ok then
|
|
|
|
|
-- marken findes ikke længere: skærebordet bag på igen og hjem
|
|
|
|
|
assignment.phase = "working"
|
|
|
|
|
finishAssignment(adEnv, assignment)
|
|
|
|
|
else
|
|
|
|
|
headerMountFailed(adEnv, assignment, swap.text)
|
|
|
|
|
end
|
|
|
|
|
return
|
|
|
|
|
end
|
|
|
|
|
-- efter høst: bag på og hjem; lykkedes det ikke, må mejetærskeren ikke ud på vejen med skærebordet foran
|
|
|
|
|
assignment.headerUnmounted = true
|
|
|
|
|
if not swap.ok then
|
|
|
|
|
assignment.manual = true
|
|
|
|
|
ADFieldJobs.notify(string.format("F%s: '%s' kunne ikke sætte skærebordet bag på (%s) — gør det selv og kør den hjem",
|
|
|
|
|
tostring(assignment.fieldId), ADRuns.vehicleLabel(vehicle), tostring(swap.text)), true)
|
|
|
|
|
end
|
|
|
|
|
finishAssignment(adEnv, assignment)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function ADFieldWork.follow(adEnv, assignment)
|
|
|
|
|
local vehicle = assignment.vehicle
|
|
|
|
|
-- Kun når spilleren selv KØRER (bevæger sig uden Courseplay/AutoDrive) slippes sættet — at sidde i
|
|
|
|
@@ -1671,6 +1783,8 @@ function ADFieldWork.follow(adEnv, assignment)
|
|
|
|
|
if not okVar then Logging.warning("ADSmartPickup: bredde: %s", tostring(errVar)) end
|
|
|
|
|
pcall(ADHitch.foldForTransport, vehicle)
|
|
|
|
|
local width = ADCpBridge.getWorkWidth(vehicle)
|
|
|
|
|
-- skærebord på transporthjul bag mejetærskeren: arbejdsbredden måles først, når det sidder foran
|
|
|
|
|
if assignment.headerSwap ~= nil and (width or 0) < ADFieldModel.MIN_WORK_WIDTH then width = assignment.width end
|
|
|
|
|
local okWidth, widthReason, widthArgs = ADFieldModel.checkWidth(assignment.role, width, ADFieldModel.requiredWidth(field, assignment.role))
|
|
|
|
|
if not okWidth then
|
|
|
|
|
-- redskabet passer ikke til opgaven: karantæne, ellers hentes det igen og igen (in-game 6/10: Servo 25 til F9)
|
|
|
|
@@ -1716,7 +1830,12 @@ function ADFieldWork.follow(adEnv, assignment)
|
|
|
|
|
local wayPoint = info ~= nil and adEnv.ADGraphManager:getWayPointById(info.markerId) or nil
|
|
|
|
|
local distance = wayPoint ~= nil and math.sqrt((wayPoint.x - x) ^ 2 + (wayPoint.z - z) ^ 2) or math.huge
|
|
|
|
|
if distance <= ADFieldWork.ARRIVE_DISTANCE then
|
|
|
|
|
beginWork(adEnv, field, info, assignment)
|
|
|
|
|
local swapState = ADFieldWork.startHeaderSwap(adEnv, assignment, "front")
|
|
|
|
|
if swapState == "none" then
|
|
|
|
|
beginWork(adEnv, field, info, assignment)
|
|
|
|
|
elseif swapState == "failed" then
|
|
|
|
|
headerMountFailed(adEnv, assignment, assignment.headerSwap ~= nil and assignment.headerSwap.text or "?")
|
|
|
|
|
end
|
|
|
|
|
elseif assignment.startX ~= nil and math.sqrt((x - assignment.startX) ^ 2 + (z - assignment.startZ) ^ 2) < ADFieldWork.NO_MOVE_DISTANCE
|
|
|
|
|
and (assignment.driveRetries or 0) >= 1 then
|
|
|
|
|
-- AD startede og stoppede uden at flytte sig (to gange): ingen rute — genforsøg hjælper ikke
|
|
|
|
@@ -1792,6 +1911,8 @@ function ADFieldWork.follow(adEnv, assignment)
|
|
|
|
|
followWorking(adEnv, field, assignment)
|
|
|
|
|
elseif assignment.phase == "awaitingPlayer" then
|
|
|
|
|
followManual(adEnv, field, info, assignment)
|
|
|
|
|
elseif assignment.phase == "mountingHeader" or assignment.phase == "unmountingHeader" then
|
|
|
|
|
followHeaderSwap(adEnv, field, info, assignment)
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|