feat: maskiner uden parkering — spilleren kører dem til og fra marken, pop-up eller statusvindue (1.62.201)
This commit is contained in:
@@ -218,6 +218,8 @@ function ADFieldWork.getRigs(adEnv)
|
||||
controlled = isControlledByPlayer(vehicle),
|
||||
-- manuel transport: spilleren kører den til marken (for bred til vejene med skærebord)
|
||||
manual = (state.manual or {})[id] == true,
|
||||
-- AutoDrive-parkering: uden den kører sættet ikke selv — spilleren kører det (ADPlayerTransport)
|
||||
hasPark = parkMarkerId(adEnv, vehicle) ~= nil,
|
||||
width = ADCpBridge.getWorkWidth(vehicle), x = x, z = z,
|
||||
-- tom spreder kan flere ting (gødning og kalk): alle dens roller
|
||||
roles = ADPool.rolesOf(role, specs.sprayRoles), filledRole = specs.filledRole, dumpable = specs.dumpable,
|
||||
@@ -527,6 +529,14 @@ local function askPlayer(field, info, assignment, withDialog)
|
||||
end
|
||||
assignment.remindedAt = now()
|
||||
log(field.id, "venter på spilleren: %s", text)
|
||||
ADFieldWork.tellPlayer(text, withDialog)
|
||||
end
|
||||
|
||||
-- Besked til spilleren om at køre en maskine: pop-up (første gang) eller kun statusvinduet, efter indstillingen
|
||||
-- playerPopup. Påmindelser (withDialog = false) kommer i hjørnet — med "kun statusvindue" slet ikke.
|
||||
function ADFieldWork.tellPlayer(text, withDialog)
|
||||
local popup = ADSettings == nil or ADSettings.get("playerPopup") ~= 0
|
||||
if not popup then return end
|
||||
if withDialog and InfoDialog ~= nil and InfoDialog.show ~= nil then
|
||||
pcall(InfoDialog.show, "Smart Pickup: " .. text)
|
||||
else
|
||||
@@ -649,6 +659,8 @@ function ADFieldWork.dispatch(adEnv, field, info, decision)
|
||||
and not (candidate.x ~= nil and #(info.verts or {}) >= 3 and ADFieldJobs.insidePolygon(candidate.x, candidate.z, info.verts)) then
|
||||
return false
|
||||
end
|
||||
-- uden parkering (eller langt fra vejnettet): spilleren kører den (ADPlayerTransport), ikke AutoDrive
|
||||
if ADPlayerTransport ~= nil and ADPlayerTransport.needsPlayer(adEnv, candidate, role, decision) then return false end
|
||||
local d = candidate.x ~= nil and ADFieldWork.distanceToNetwork(adEnv, candidate.x, candidate.z) or nil
|
||||
if d ~= nil and d > ADFieldWork.MAX_OFF_NETWORK then
|
||||
table.insert(offNetwork, string.format("'%s' %.0f m", tostring(candidate.label), d))
|
||||
@@ -688,6 +700,11 @@ function ADFieldWork.dispatch(adEnv, field, info, decision)
|
||||
why, args = "allBusy", nil
|
||||
end
|
||||
end
|
||||
-- intet kan køre selv: bed spilleren køre et sæt (eller et frakoblet redskab) til marken
|
||||
if ADPlayerTransport ~= nil and ADPlayerTransport.dispatch(adEnv, field, info, role, decision, candidates, required, roleAccept) then
|
||||
lastNoRig[field.id] = nil
|
||||
return
|
||||
end
|
||||
if #offNetwork > 0 and (why == "cannotDo" or why == "noRig") then
|
||||
-- de eneste med rollen står uden for AD-vejnettet
|
||||
note(field.id, {reason = {text = string.format("ingen %s kan køre til %s — står for langt fra AutoDrive-vejnettet (%s)",
|
||||
@@ -1410,7 +1427,10 @@ local function finishAssignment(adEnv, assignment)
|
||||
local park = not pooled and not assignment.adHandlesEnd and not assignment.manual and parkMarkerId(adEnv, vehicle) or nil
|
||||
if park ~= nil then startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, park, nil) end
|
||||
if pooled then log(assignment.fieldId, "'%s' sætter redskabet af og kører hjem", ADRuns.vehicleLabel(vehicle)) end
|
||||
if assignment.manual then
|
||||
if assignment.playerTransport and ADPlayerTransport ~= nil then
|
||||
-- ingen parkering: spilleren henter den (pop-up/statusvindue, indtil den er kørt væk fra marken)
|
||||
ADPlayerTransport.finished(assignment)
|
||||
elseif assignment.manual then
|
||||
ADFieldJobs.notify(string.format("F%s høstet — afmontér skærebordet og kør '%s' hjem", tostring(assignment.fieldId), ADRuns.vehicleLabel(vehicle)), true)
|
||||
end
|
||||
restoreToolOffset(assignment)
|
||||
@@ -1430,6 +1450,7 @@ local MANUAL_REASON_TEXT = {
|
||||
-- (eller når spilleren trykker "Start nu"); påmind hvert 5. minut indtil da.
|
||||
local function followManual(adEnv, field, info, assignment)
|
||||
if field == nil or info == nil then return ADFieldWork.release(assignment) end
|
||||
if assignment.playerTransport and ADPlayerTransport ~= nil then return ADPlayerTransport.follow(adEnv, field, info, assignment) end
|
||||
local vehicle = assignment.vehicle
|
||||
local x, z = vehiclePosition(vehicle)
|
||||
local atField = #(info.verts or {}) >= 3 and ADFieldJobs.insidePolygon(x, z, info.verts)
|
||||
@@ -2125,28 +2146,49 @@ function ADFieldWork.stopAllAssignments(adEnv)
|
||||
local list = {}
|
||||
for _, assignment in pairs(ADFieldJobs.state.assignments) do table.insert(list, assignment) end
|
||||
for _, assignment in ipairs(list) do
|
||||
pcall(stopAd, assignment.vehicle)
|
||||
pcall(ADCpBridge.stop, assignment.vehicle)
|
||||
ADHitch.stow(assignment.vehicle, "stop alt")
|
||||
ADFieldWork.release(assignment)
|
||||
-- puljeredskab: sættes af på sin plads og traktoren kører hjem (i stedet for almindelig parkering)
|
||||
local okPool, pooled = pcall(ADHitch.returnHome, adEnv, assignment.vehicle)
|
||||
table.insert(stopped, {vehicle = assignment.vehicle, manual = assignment.manual == true, pooled = okPool and pooled == true})
|
||||
if assignment.playerTransport and assignment.phase == "awaitingPlayer" then
|
||||
-- venter på spilleren: intet kører (og et frakoblet redskab er ingen traktor) — bare slip opgaven
|
||||
ADFieldWork.release(assignment)
|
||||
else
|
||||
pcall(stopAd, assignment.vehicle)
|
||||
pcall(ADCpBridge.stop, assignment.vehicle)
|
||||
ADHitch.stow(assignment.vehicle, "stop alt")
|
||||
ADFieldWork.release(assignment)
|
||||
-- puljeredskab: sættes af på sin plads og traktoren kører hjem (i stedet for almindelig parkering)
|
||||
local okPool, pooled = pcall(ADHitch.returnHome, adEnv, assignment.vehicle)
|
||||
table.insert(stopped, {vehicle = assignment.vehicle, manual = assignment.manual == true, pooled = okPool and pooled == true})
|
||||
end
|
||||
end
|
||||
return stopped
|
||||
end
|
||||
|
||||
function ADFieldWork.stopAll(adEnv, fieldId)
|
||||
for _, assignment in ipairs(ADFieldJobs.assignmentsFor(fieldId)) do
|
||||
pcall(stopAd, assignment.vehicle)
|
||||
ADCpBridge.stop(assignment.vehicle)
|
||||
ADHitch.stow(assignment.vehicle, "marken stoppet")
|
||||
local wasFetching = assignment.phase == "fetching"
|
||||
ADFieldWork.release(assignment)
|
||||
local okHome, pooled = pcall(ADHitch.returnHome, adEnv, assignment.vehicle)
|
||||
if wasFetching and not (okHome and pooled) then
|
||||
local park = parkMarkerId(adEnv, assignment.vehicle)
|
||||
if park ~= nil then pcall(startAd, adEnv, assignment.vehicle, adEnv.AutoDrive.MODE_DRIVETO, park, nil) end
|
||||
if assignment.playerTransport and assignment.phase == "awaitingPlayer" then
|
||||
ADFieldWork.release(assignment)
|
||||
else
|
||||
ADFieldWork.stopOne(adEnv, assignment)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Stop ét sæt på marken: AutoDrive/Courseplay af, redskabet foldes, puljeredskab sættes af (ellers hjem).
|
||||
function ADFieldWork.stopOne(adEnv, assignment)
|
||||
pcall(stopAd, assignment.vehicle)
|
||||
ADCpBridge.stop(assignment.vehicle)
|
||||
ADHitch.stow(assignment.vehicle, "marken stoppet")
|
||||
local wasFetching = assignment.phase == "fetching"
|
||||
ADFieldWork.release(assignment)
|
||||
local okHome, pooled = pcall(ADHitch.returnHome, adEnv, assignment.vehicle)
|
||||
if wasFetching and not (okHome and pooled) then
|
||||
local park = parkMarkerId(adEnv, assignment.vehicle)
|
||||
if park ~= nil then pcall(startAd, adEnv, assignment.vehicle, adEnv.AutoDrive.MODE_DRIVETO, park, nil) end
|
||||
end
|
||||
end
|
||||
|
||||
-- til ADPlayerTransport (spillerkørsel): samme opstart, besked og påfyldningsplan som de øvrige sæt
|
||||
ADFieldWork.beginWork = beginWork
|
||||
ADFieldWork.askPlayer = askPlayer
|
||||
ADFieldWork.refillPlan = refillPlan
|
||||
ADFieldWork.vehiclePosition = vehiclePosition
|
||||
ADFieldWork.isControlledByPlayer = isControlledByPlayer
|
||||
|
||||
Reference in New Issue
Block a user