feat: spillets hjælper kører maskiner uden parkering ud (1.62.214)
This commit is contained in:
@@ -48,6 +48,13 @@ local function hasRole(vehicle, role)
|
||||
return roles ~= nil and roles[role] == true
|
||||
end
|
||||
|
||||
-- Kører spillets hjælper sættet ud (i stedet for spilleren)? Indstillingen playerDrive, og altid på kontraktmarker
|
||||
-- uden AutoDrive-markør.
|
||||
local function useHelper(field, info)
|
||||
local setting = ADSettings ~= nil and ADSettings.get("playerDrive") or 2
|
||||
return ADManualTransport.useHelper(setting, field.contract == true and info.markerId == nil)
|
||||
end
|
||||
|
||||
local function isOnField(adEnv, info, x, z)
|
||||
if #(info.verts or {}) >= 3 and ADFieldJobs.insidePolygon(x, z, info.verts) then return true end
|
||||
if info.markerId == nil then return false end
|
||||
@@ -156,7 +163,8 @@ function ADPlayerTransport.dispatch(adEnv, field, info, role, decision, candidat
|
||||
local vehicle = rig ~= nil and rig.vehicle or implement
|
||||
local id = rig ~= nil and rig.id or ADRunsController.getVehicleId(implement)
|
||||
local assignment = ADPlayerTransport.newAssignment(field, role, vehicle, id, rig == nil)
|
||||
ADPlayerTransport.ask(field, info, assignment, true)
|
||||
-- hjælper-tilstand: er sættet allerede samlet og fyldt, kører hjælperen det ud uden at spørge (ADPlayerTransport.follow)
|
||||
if not useHelper(field, info) then ADPlayerTransport.ask(field, info, assignment, true) end
|
||||
return true
|
||||
end
|
||||
|
||||
@@ -185,10 +193,14 @@ local function fieldsWaitingFor(role)
|
||||
return list
|
||||
end
|
||||
|
||||
function ADPlayerTransport.ask(field, info, assignment, withDialog)
|
||||
function ADPlayerTransport.ask(field, info, assignment, withDialog, missing)
|
||||
local where = tostring(info.markerName or ("F" .. tostring(field.id)))
|
||||
local text
|
||||
if assignment.implementOnly then
|
||||
if useHelper(field, info) then
|
||||
-- spillets hjælper kører: spilleren skal kun gøre sættet klar
|
||||
text = string.format("F%s skal %s med '%s': %s — så kører spillets hjælper den ud, og Smart Pickup overtager",
|
||||
tostring(field.id), ADManualTransport.stageVerb(assignment.stage), label(assignment.vehicle), tostring(missing or "gør den klar"))
|
||||
elseif assignment.implementOnly then
|
||||
text = string.format("F%s skal %s: kobl '%s' på en traktor, kør den til %s og stig ud — så overtager Smart Pickup",
|
||||
tostring(field.id), ADManualTransport.stageVerb(assignment.stage), label(assignment.vehicle), where)
|
||||
else
|
||||
@@ -228,18 +240,43 @@ function ADPlayerTransport.follow(adEnv, field, info, assignment)
|
||||
local x, z = ADFieldWork.vehiclePosition(vehicle)
|
||||
local forced = ADFieldJobs.takeoverRequested[field.id] == true
|
||||
ADFieldJobs.takeoverRequested[field.id] = nil
|
||||
local ok, why = ADManualTransport.playerReadiness({attached = attached, atField = isOnField(adEnv, info, x, z),
|
||||
controlled = ADFieldWork.isControlledByPlayer(vehicle), empty = empty, forced = forced})
|
||||
local helper = useHelper(field, info)
|
||||
local controlled = ADFieldWork.isControlledByPlayer(vehicle)
|
||||
local ok, why
|
||||
if helper then
|
||||
-- spillets hjælper: samlet, fyldt og spilleren ude i HELPER_SETTLE_MS -> den kører ud selv (stedet er
|
||||
-- ligegyldigt). Ventetiden: spilleren står måske af for at koble mere på eller fylde op (review 10/10)
|
||||
ok, why = ADManualTransport.helperReadiness({attached = attached, empty = empty, controlled = controlled and not forced})
|
||||
if ok then
|
||||
assignment.readySince = assignment.readySince or now()
|
||||
if not forced and not ADManualTransport.helperSettled(assignment.readySince, now()) then
|
||||
note(field.id, {reason = {text = string.format("'%s' er klar — spillets hjælper kører den ud om lidt", label(assignment.vehicle))}})
|
||||
return
|
||||
end
|
||||
else
|
||||
assignment.readySince = nil
|
||||
end
|
||||
else
|
||||
ok, why = ADManualTransport.playerReadiness({attached = attached, atField = isOnField(adEnv, info, x, z),
|
||||
controlled = controlled, empty = empty, forced = forced})
|
||||
end
|
||||
if ok then
|
||||
-- uden for marken med hjælperen: Courseplay-jobbets kørsel (spillets vejfinding) tager den derud. Kun med en
|
||||
-- markkant — ellers kan "fremme" (ADFieldWork.follow) aldrig måles, og tømmevognene ville vente for evigt
|
||||
local giants = helper and #(info.verts or {}) >= 3 and not isOnField(adEnv, info, x, z)
|
||||
if assignment.implementOnly then
|
||||
table.insert(ADPlayerTransport.pendingTakeovers, {assignment = assignment, vehicle = vehicle, forced = forced})
|
||||
table.insert(ADPlayerTransport.pendingTakeovers, {assignment = assignment, vehicle = vehicle, forced = forced, giants = giants,
|
||||
helper = helper})
|
||||
return
|
||||
end
|
||||
log(field.id, "overtager '%s'%s", label(vehicle), forced and " ([Overtag])" or "")
|
||||
countTrip(assignment.vehicleId, vehicle)
|
||||
assignment.giants = giants or nil
|
||||
log(field.id, "overtager '%s'%s%s", label(vehicle), forced and " ([Overtag])" or "", giants and " — spillets hjælper kører den ud" or "")
|
||||
-- parkeringsrådgiveren tæller kun ture, spilleren selv har kørt
|
||||
if not helper then countTrip(assignment.vehicleId, vehicle) end
|
||||
return ADFieldWork.beginWork(adEnv, field, info, assignment)
|
||||
end
|
||||
local reason = REASON_TEXT[why] or tostring(why)
|
||||
if helper and why == "playerInside" then reason = "stig ud" end
|
||||
if why == "noTractor" and needsHeader then
|
||||
reason = "montér et skærebord, der kan høste afgrøden"
|
||||
elseif why == "noTractor" and not assignment.implementOnly then
|
||||
@@ -249,7 +286,8 @@ function ADPlayerTransport.follow(adEnv, field, info, assignment)
|
||||
if forced then
|
||||
ADFieldJobs.notify(string.format("F%s: kan ikke starte '%s' endnu — %s", tostring(field.id), label(assignment.vehicle), reason), true)
|
||||
elseif ADManualTransport.shouldRemind(assignment.remindedAt, now()) then
|
||||
ADPlayerTransport.ask(field, info, assignment, false)
|
||||
-- første gang som pop-up (hjælper-tilstand spørger først her, når noget mangler), derefter i hjørnet
|
||||
ADPlayerTransport.ask(field, info, assignment, assignment.remindedAt == nil, reason)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -264,11 +302,17 @@ local function applyContinues()
|
||||
local free = ADFieldJobs.state.assignments[entry.vehicleId] == nil and #ADFieldJobs.assignmentsFor(entry.fieldId) == 0
|
||||
if free and info ~= nil and ADFieldModel.isWorking(field) and ADFieldModel.ROLES[field.stage] == entry.role then
|
||||
local assignment = ADPlayerTransport.newAssignment(field, entry.role, entry.vehicle, entry.vehicleId, false)
|
||||
local text = string.format("F%s er færdig — kør '%s' videre til %s og stig ud, så overtager Smart Pickup",
|
||||
tostring(entry.fromFieldId), label(entry.vehicle), tostring(info.markerName or ("F" .. tostring(entry.fieldId))))
|
||||
assignment.remindedAt = now()
|
||||
log(entry.fieldId, "kør videre fra F%s: %s", tostring(entry.fromFieldId), text)
|
||||
ADFieldWork.tellPlayer(text, true)
|
||||
if useHelper(field, info) then
|
||||
-- hjælperen kører den videre (follow overtager, så snart den er klar) — ingen pop-up
|
||||
-- (mangler noget, spørger follow straks med pop-up — remindedAt forbliver nil)
|
||||
log(entry.fieldId, "kør videre fra F%s: '%s' — spillets hjælper kører den", tostring(entry.fromFieldId), label(entry.vehicle))
|
||||
else
|
||||
local text = string.format("F%s er færdig — kør '%s' videre til %s og stig ud, så overtager Smart Pickup",
|
||||
tostring(entry.fromFieldId), label(entry.vehicle), tostring(info.markerName or ("F" .. tostring(entry.fieldId))))
|
||||
assignment.remindedAt = now()
|
||||
log(entry.fieldId, "kør videre fra F%s: %s", tostring(entry.fromFieldId), text)
|
||||
ADFieldWork.tellPlayer(text, true)
|
||||
end
|
||||
else
|
||||
ADPlayerTransport.finished({vehicle = entry.vehicle, vehicleId = entry.vehicleId, fieldId = entry.fromFieldId, role = entry.role}, true)
|
||||
end
|
||||
@@ -290,13 +334,15 @@ function ADPlayerTransport.applyTakeovers(adEnv)
|
||||
if tractorBusy then
|
||||
note(assignment.fieldId, {reason = {text = string.format("venter: '%s' har en anden opgave — kobl redskabet på en anden traktor", label(vehicle))}})
|
||||
elseif state[assignment.vehicleId] == assignment and tractorId ~= nil and info ~= nil then
|
||||
-- det frakoblede redskab er det, der mangler en parkering (og en Connect-markør)
|
||||
countTrip(assignment.vehicleId, assignment.vehicle)
|
||||
-- det frakoblede redskab er det, der mangler en parkering (og en Connect-markør); kun spillerens egne ture
|
||||
if not entry.giants and not entry.helper then countTrip(assignment.vehicleId, assignment.vehicle) end
|
||||
state[assignment.vehicleId] = nil
|
||||
assignment.vehicleId, assignment.vehicle, assignment.implementOnly = tractorId, vehicle, false
|
||||
assignment.giants = entry.giants or nil
|
||||
assignment.width = ADCpBridge.getWorkWidth(vehicle) or assignment.width
|
||||
state[tractorId] = assignment
|
||||
log(assignment.fieldId, "overtager '%s'%s", label(vehicle), entry.forced and " ([Overtag])" or "")
|
||||
log(assignment.fieldId, "overtager '%s'%s%s", label(vehicle), entry.forced and " ([Overtag])" or "",
|
||||
entry.giants and " — spillets hjælper kører den ud" or "")
|
||||
ADFieldWork.beginWork(adEnv, field, info, assignment)
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user