feat: maskiner uden parkering — spilleren kører dem til og fra marken, pop-up eller statusvindue (1.62.201)

This commit is contained in:
2026-10-10 17:56:11 +02:00
parent 7a3d6184bc
commit 78651d8b2f
13 changed files with 457 additions and 20 deletions
+7
View File
@@ -735,6 +735,13 @@ function ADFieldJobs.tick(adEnv, dt)
end
local okRe, errRe = pcall(ADFieldWork.tickReadopt, adEnv)
if not okRe then Logging.warning(ADFieldJobs.LOG_PREFIX .. "genoptag: %s", tostring(errRe)) end
if ADPlayerTransport ~= nil then
-- spillerkørsel: redskaber spilleren har koblet på (flyttes til traktoren efter løkken) og maskiner der er hentet
local okTake, errTake = pcall(ADPlayerTransport.applyTakeovers, adEnv)
if not okTake then Logging.warning(ADFieldJobs.LOG_PREFIX .. "overtagelse efter spillerkørsel: %s", tostring(errTake)) end
local okPick, errPick = pcall(ADPlayerTransport.tickPickups, adEnv)
if not okPick then Logging.warning(ADFieldJobs.LOG_PREFIX .. "maskiner der skal hentes: %s", tostring(errPick)) end
end
local t2 = clockMs()
-- de første minutter efter indlæsning sendes intet ud: Courseplay/AutoDrive genoptager deres egne jobs
-- lidt efter start, og indtil da ligner de maskiner ledige (in-game 26/9: kultivatoren blev taget midt
+59 -17
View File
@@ -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
+45
View File
@@ -32,3 +32,48 @@ end
function ADManualTransport.shouldRemind(lastAt, now)
return lastAt == nil or now - lastAt >= ADManualTransport.REMIND_MS
end
-- ---- spillerkørsel for alle markredskaber (brugerønske 10/10: ny gård uden parkeringer) ----
-- Et sæt uden AutoDrive-parkering (eller langt fra vejnettet) kører ikke selv: spilleren kører det til marken og
-- stiger ud, så overtager Courseplay. Kun redskaber der arbejder på marken alene — tømmevogne, læssevogne og
-- ballesamlere skal køre til et lager og kræver vejnettet; mejetærskere bruger deres eget flueben (som før).
ADManualTransport.PLAYER_ROLES = {
mower = true, tedder = true, rake = true, mulcher = true, limer = true, plow = true, cultivator = true,
seeder = true, roller = true, weeder = true, fertilizer = true, baler = true,
}
-- s = {role, hasPark, nearNetwork, helper}
function ADManualTransport.needsPlayer(s)
if s.helper or not ADManualTransport.PLAYER_ROLES[s.role] then return false end
return not s.hasPark or s.nearNetwork == false
end
-- Klar til overtagelse? s = {attached, atField, controlled, empty, forced}.
-- Returnerer true, eller false + grund: "noTractor" | "empty" | "notThere" | "playerInside".
-- forced ([Overtag]): sted og fører springes over; traktor og fyld tjekkes stadig.
function ADManualTransport.playerReadiness(s)
if not s.attached then return false, "noTractor" end
if s.empty then return false, "empty" end
if not s.forced and not s.atField then return false, "notThere" end
if not s.forced and s.controlled then return false, "playerInside" end
return true
end
-- Én opgave ad gangen til spilleren: venter en anden mark allerede på ham, venter denne.
-- waiting = liste {fieldId} over sæt i fasen awaitingPlayer.
function ADManualTransport.mayAskPlayer(waiting, fieldId)
for _, entry in ipairs(waiting or {}) do
if entry.fieldId ~= fieldId then return false end
end
return true
end
local STAGE_VERBS = {
mowing = "slås", tedding = "vendes", raking = "rives", mulching = "mulches", liming = "kalkes", careLiming = "kalkes",
plowing = "pløjes", cultivating = "kultiveres", sowing = "sås", rolling = "tromles", weeding = "renses for ukrudt",
fertilizing = "gødes", baling = "presses",
}
function ADManualTransport.stageVerb(stage)
return STAGE_VERBS[stage] or "bearbejdes"
end
+267
View File
@@ -0,0 +1,267 @@
-- AD Player Transport
-- Spillerkørsel for alle markredskaber (brugerønske 10/10: ny gård uden plads til parkeringer). Et sæt uden
-- AutoDrive-parkering kører ikke selv: moden beder spilleren køre det (eller koble et frakoblet redskab på en
-- traktor) til marken og stige ud; så kører Courseplay marken. Når det er færdigt, beder moden spilleren køre det
-- væk, indtil det har forladt marken. Én opgave ad gangen. Reglerne ligger i ADManualTransport (testbare);
-- dette er spil-delen. Pop-up eller kun statusvinduet: indstillingen playerPopup (ADFieldWork.tellPlayer).
ADPlayerTransport = {}
-- maskiner der er færdige og skal køres væk: vehicleId -> {vehicle, fieldId, label}
ADPlayerTransport.pickups = {}
-- overtagelser hvor spilleren har koblet et frakoblet redskab på en traktor: opgaven flyttes til traktorens id
-- EFTER opfølgningsløkken (en ny nøgle i state.assignments under pairs-gennemløbet er udefineret i Lua)
ADPlayerTransport.pendingTakeovers = {}
local function log(...) ADFieldJobs.log(...) end
local function note(...) ADFieldJobs.note(...) end
local function now() return ADFieldJobs.now end
local function label(vehicle) return ADRuns.vehicleLabel(vehicle) end
local function rootOf(vehicle)
if vehicle ~= nil and vehicle.getRootVehicle ~= nil then
local ok, root = pcall(vehicle.getRootVehicle, vehicle)
if ok and root ~= nil then return root end
end
return vehicle
end
-- Har køretøjet (med det der hænger på) rollen? (traktor + plov = plov; plov + kultivator-rolle via EXTRA_ROLES)
local function hasRole(vehicle, role)
local specs = ADCpBridge.getSpecs(vehicle)
local own = ADFieldFleet.roleFromSpecs(specs)
if own == role then return true end
local roles = ADPool.rolesOf(own, specs.sprayRoles)
return roles ~= nil and roles[role] == true
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
local wayPoint = adEnv.ADGraphManager:getWayPointById(info.markerId)
return wayPoint ~= nil and math.sqrt((wayPoint.x - x) ^ 2 + (wayPoint.z - z) ^ 2) <= ADFieldWork.ARRIVE_DISTANCE
end
-- Skal sættet køres af spilleren? Kun markredskaber (ADManualTransport.PLAYER_ROLES), uden parkering eller langt
-- fra vejnettet.
function ADPlayerTransport.needsPlayer(adEnv, candidate, role, decision)
if not ADManualTransport.PLAYER_ROLES[role] or (decision ~= nil and decision.helper) then return false end
local d = candidate.x ~= nil and ADFieldWork.distanceToNetwork(adEnv, candidate.x, candidate.z) or nil
return ADManualTransport.needsPlayer({role = role, hasPark = candidate.hasPark == true,
nearNetwork = d == nil or d <= ADFieldWork.MAX_OFF_NETWORK})
end
local function waitingList()
local list = {}
for _, assignment in pairs(ADFieldJobs.state.assignments) do
if assignment.phase == "awaitingPlayer" then table.insert(list, {fieldId = assignment.fieldId}) end
end
return list
end
-- Frakoblede redskaber med rollen. Returnerer det nærmeste uden AutoDrive-parkering (spilleren kobler det på) og
-- om der findes et MED parkering — det henter puljen selv (også når det er i brug), så spilleren spørges ikke.
local function looseImplement(adEnv, role, x, z, required, roleAccept)
local farmId = g_currentMission:getFarmId()
local best, bestD, parkedExists = nil, nil, false
for _, vehicle in pairs(g_currentMission.vehicleSystem.vehicles) do
local owned = vehicle.getOwnerFarmId ~= nil and vehicle:getOwnerFarmId() == farmId
local free = owned and vehicle.spec_motorized == nil and vehicle.spec_attachable ~= nil
and not (vehicle.getAttacherVehicle ~= nil and vehicle:getAttacherVehicle() ~= nil)
local id = free and ADRunsController.getVehicleId(vehicle) or nil
local specs = id ~= nil and ADCpBridge.getSpecs(vehicle) or nil
local own = specs ~= nil and ADPool.roleOf(specs) or nil
local roles = own ~= nil and ADPool.rolesOf(own, specs.sprayRoles) or nil
if own ~= nil and (own == role or (roles ~= nil and roles[role])) then
if ADFieldWork.parkMarkerId(adEnv, vehicle) ~= nil then
parkedExists = true
elseif ADFieldJobs.state.assignments[id] == nil and not ADPool.isReserved(id)
and (roleAccept == nil or roleAccept({role = own, roles = roles, vehicle = vehicle}))
and ADFieldModel.checkWidth(role, ADCpBridge.getWorkWidth(vehicle) or 0, required) then
local vx, _, vz = getWorldTranslation(vehicle.rootNode)
local d = (vx - x) ^ 2 + (vz - z) ^ 2
if bestD == nil or d < bestD then best, bestD = vehicle, d end
end
end
end
return best, parkedExists
end
-- Kan et sæt med rollen køre selv (parkering, ved vejnettet)? Også når det er optaget: så venter marken i kø.
local function selfDrivingExists(adEnv, candidates, role, decision, roleAccept)
for _, candidate in ipairs(candidates) do
local hasRole = candidate.role == role or (candidate.roles ~= nil and candidate.roles[role] == true)
if hasRole and candidate.enabled and (roleAccept == nil or roleAccept(candidate))
and not ADPlayerTransport.needsPlayer(adEnv, candidate, role, decision) then
return true
end
end
return false
end
-- Intet sæt kan køre selv: bed spilleren køre et (eller koble et frakoblet redskab på). true = håndteret
-- (spurgt, eller venter på at en anden opgave til spilleren er klaret).
function ADPlayerTransport.dispatch(adEnv, field, info, role, decision, candidates, required, roleAccept)
if not ADManualTransport.PLAYER_ROLES[role] or (decision ~= nil and decision.helper) then return false end
for _, assignment in ipairs(ADFieldJobs.assignmentsFor(field.id)) do
if assignment.phase == "awaitingPlayer" then return true end
end
-- kun når INTET kan køre selv: et optaget sæt eller puljeredskab med parkering betyder kø, ikke spillerkørsel
if selfDrivingExists(adEnv, candidates, role, decision, roleAccept) then return false end
-- sidder spilleren allerede i sættet, er det netop det, spilleren skal køre (pick springer ellers førersædet over)
local playerCandidates = {}
for index, candidate in ipairs(candidates) do
local copy = {}
for key, value in pairs(candidate) do copy[key] = value end
copy.controlled = false
playerCandidates[index] = copy
end
local rig = ADFieldFleet.pick(playerCandidates, role, info.x, info.z, required, function(candidate)
return (roleAccept == nil or roleAccept(candidate)) and ADPlayerTransport.needsPlayer(adEnv, candidate, role, decision)
end)
local implement, parkedExists = nil, false
if rig == nil then implement, parkedExists = looseImplement(adEnv, role, info.x, info.z, required, roleAccept) end
if parkedExists or (rig == nil and implement == nil) then return false end
if not ADManualTransport.mayAskPlayer(waitingList(), field.id) then
note(field.id, {reason = {text = "venter på dig — kør først den maskine, du allerede er bedt om"},
retryAt = now() + ADFieldWork.NO_RIG_RETRY_MS})
return true
end
local vehicle = rig ~= nil and rig.vehicle or implement
local id = rig ~= nil and rig.id or ADRunsController.getVehicleId(implement)
local x, z = ADFieldWork.vehiclePosition(vehicle)
local assignment = {
vehicleId = id, vehicle = vehicle, fieldId = field.id, role = role, stage = field.stage, helper = false,
phase = "awaitingPlayer", since = now(), width = rig ~= nil and rig.width or ADCpBridge.getWorkWidth(implement),
groupSize = 1, leader = true, manual = true, playerTransport = true, implementOnly = rig == nil,
startX = x, startZ = z,
}
ADFieldJobs.state.assignments[id] = assignment
ADPlayerTransport.ask(field, info, assignment, true)
return true
end
function ADPlayerTransport.ask(field, info, assignment, withDialog)
local where = tostring(info.markerName or ("F" .. tostring(field.id)))
local text
if 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
text = string.format("F%s skal %s: kør '%s' til %s og stig ud — så overtager Smart Pickup",
tostring(field.id), ADManualTransport.stageVerb(assignment.stage), label(assignment.vehicle), where)
end
assignment.remindedAt = now()
log(field.id, "venter på spilleren: %s", text)
ADFieldWork.tellPlayer(text, withDialog)
end
local REASON_TEXT = {
noTractor = "kobl redskabet på en traktor",
empty = "fyld den op",
notThere = "kør den til marken",
playerInside = "stig ud, så overtager Smart Pickup",
}
-- Venter på spilleren: overtag, når sættet står på marken med redskabet på, er fyldt, og spilleren er steget ud
-- (eller [Overtag] i marklisten). Påmindelse hvert 5. minut.
function ADPlayerTransport.follow(adEnv, field, info, assignment)
local vehicle = assignment.implementOnly and rootOf(assignment.vehicle) or assignment.vehicle
local attached = vehicle ~= nil and vehicle.spec_motorized ~= nil and hasRole(vehicle, assignment.role)
local empty = false
if attached and ADFieldWork.REFILL_ROLES[assignment.role] then
local fillType = ADCpBridge.getRefillFillType(vehicle, assignment.role)
empty = fillType ~= nil and ADCpBridge.getRefillLevel(vehicle, fillType) <= 0
end
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})
if ok then
if assignment.implementOnly then
table.insert(ADPlayerTransport.pendingTakeovers, {assignment = assignment, vehicle = vehicle, forced = forced})
return
end
log(field.id, "overtager '%s'%s", label(vehicle), forced and " ([Overtag])" or "")
return ADFieldWork.beginWork(adEnv, field, info, assignment)
end
local reason = REASON_TEXT[why] or tostring(why)
if why == "noTractor" and not assignment.implementOnly then reason = "kobl redskabet på igen" end
note(field.id, {reason = {text = string.format("venter på dig: '%s' — %s", label(assignment.vehicle), reason)}})
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)
end
end
-- Efter opfølgningsløkken: opgaven på et frakoblet redskab flyttes til traktoren, det nu hænger på, og startes.
function ADPlayerTransport.applyTakeovers(adEnv)
local list = ADPlayerTransport.pendingTakeovers
if #list == 0 then return end
ADPlayerTransport.pendingTakeovers = {}
for _, entry in ipairs(list) do
local assignment, vehicle = entry.assignment, entry.vehicle
local state = ADFieldJobs.state.assignments
local tractorId = ADRunsController.getVehicleId(vehicle)
local field, info = ADFieldJobs.getField(assignment.fieldId), ADFields.getInfo(assignment.fieldId)
local tractorBusy = tractorId ~= nil and state[tractorId] ~= nil and state[tractorId] ~= assignment
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
state[assignment.vehicleId] = nil
assignment.vehicleId, assignment.vehicle, assignment.implementOnly = tractorId, vehicle, false
assignment.width = ADCpBridge.getWorkWidth(vehicle) or assignment.width
state[tractorId] = assignment
log(assignment.fieldId, "overtager '%s'%s", label(vehicle), entry.forced and " ([Overtag])" or "")
ADFieldWork.beginWork(adEnv, field, info, assignment)
end
end
end
-- Færdig uden parkering: bed spilleren køre den væk; den står i statusvinduet, til den har forladt marken.
function ADPlayerTransport.finished(assignment)
local vehicle = assignment.vehicle
local text = string.format("F%s: '%s' er færdig — kør den væk fra marken", tostring(assignment.fieldId), label(vehicle))
if assignment.role == "harvester" then
text = string.format("F%s er høstet — afmontér skærebordet og kør '%s' væk fra marken", tostring(assignment.fieldId), label(vehicle))
end
log(assignment.fieldId, "%s", text)
ADPlayerTransport.pickups[assignment.vehicleId] = {vehicle = vehicle, fieldId = assignment.fieldId, label = label(vehicle)}
ADFieldWork.tellPlayer(text, true)
end
-- Ryd op: en maskine er hentet, når den har forladt marken, er væk, eller har fået en ny opgave.
function ADPlayerTransport.tickPickups(adEnv)
for vehicleId, pickup in pairs(ADPlayerTransport.pickups) do
local vehicle = pickup.vehicle
local gone = vehicle == nil or vehicle.isDeleted or vehicle.rootNode == nil
or (entityExists ~= nil and not entityExists(vehicle.rootNode))
local info = not gone and ADFields.getInfo(pickup.fieldId) or nil
local away = gone or info == nil or ADFieldJobs.state.assignments[vehicleId] ~= nil
if not away then
local x, z = ADFieldWork.vehiclePosition(vehicle)
away = not isOnField(adEnv, info, x, z)
end
if away then ADPlayerTransport.pickups[vehicleId] = nil end
end
end
-- Til statusvinduet: én gul linje pr. maskine, der skal køres væk.
function ADPlayerTransport.pickupEntries()
local entries = {}
for _, pickup in pairs(ADPlayerTransport.pickups) do
table.insert(entries, {fieldId = pickup.fieldId, label = pickup.label, vehicle = pickup.vehicle})
end
table.sort(entries, function(a, b) return (a.fieldId or 0) < (b.fieldId or 0) end)
return entries
end
function ADPlayerTransport.isPickup(vehicle)
for _, pickup in pairs(ADPlayerTransport.pickups) do
if pickup.vehicle == vehicle then return true end
end
return false
end
+3
View File
@@ -14,6 +14,9 @@ ADSettings.KEYS = {
text = "m: en silo inden for denne afstand af en stald er staldens egen silo (forsyning henter der først)"},
waitHomeMinutes = {default = 0, min = 0, max = 240, perBuilding = true, choices = {0, 5, 10, 15, 20, 30, 45, 60, 90, 120}, format = "%s min",
text = "min: så længe en vogn venter ved et Wait-punkt med rest, før resten køres hjem i gårdens lager (0 = vent til der er plads)"},
-- spillerkørsel (maskiner uden parkering): 1 = pop-up man klikker væk, 0 = kun i statusvinduet
playerPopup = {default = 1, min = 0, max = 1, choices = {1, 0}, labels = {"spu_set_playerPopup_on", "spu_set_playerPopup_off"},
text = "1/0: besked når du skal køre en maskine til eller fra en mark — 1 = pop-up, 0 = kun i statusvinduet"},
troughRefillPercent = {default = 100, min = 10, max = 100, perBuilding = true, choices = {30, 40, 50, 60, 70, 80, 90, 100}, format = "%s %%",
text = "%: forsyningen kører først, når staldens trug er fyldt højst så meget (100 = så snart der er plads til et læs)"},
}
+14
View File
@@ -285,6 +285,8 @@ function ADStatusHud.stuckEntries()
local owned = not isGone(vehicle) and (farmId == nil or (vehicle.getOwnerFarmId ~= nil and vehicle:getOwnerFarmId() == farmId))
local held = owned and ((ADUnloadWait ~= nil and ADUnloadWait.getWaitFor ~= nil and ADUnloadWait.getWaitFor(vehicle) ~= nil)
or (ADOutbound ~= nil and ADOutbound.getHoldFor ~= nil and ADOutbound.getHoldFor(vehicle) ~= nil))
-- en maskine der venter på at blive hentet efter spillerkørsel står allerede som "kør væk" (pickupEntries)
held = held or (owned and ADPlayerTransport ~= nil and ADPlayerTransport.isPickup(vehicle))
if owned and not held then
table.insert(entries, {text = string.format(textOf("spu_status_stuck"), tostring(ADRuns.vehicleLabel(vehicle)),
math.floor(still.ms / 60000)), level = "error", target = vehicle})
@@ -293,6 +295,17 @@ function ADStatusHud.stuckEntries()
return entries
end
-- Maskiner uden parkering der er færdige på en mark: "kør X væk fra F38" (gul) til de har forladt marken.
function ADStatusHud.pickupEntries()
local entries = {}
if ADPlayerTransport == nil then return entries end
for _, pickup in ipairs(ADPlayerTransport.pickupEntries()) do
table.insert(entries, {text = string.format(textOf("spu_status_pickup"), tostring(pickup.label), tostring(pickup.fieldId)),
level = "waiting", target = pickup.vehicle})
end
return entries
end
function ADStatusHud.snapshot(adEnv)
local proxy = frameProxy()
local snapshot = {missing = {}, flows = {}, fields = {}, chains = {}, warnings = {}}
@@ -304,6 +317,7 @@ function ADStatusHud.snapshot(adEnv)
local chainResult = guarded("chains", ADStatusHud.chainEntries, proxy) or {}
snapshot.chains = chainResult.chains or {}
for _, entry in ipairs(chainResult.dependencies or {}) do table.insert(snapshot.warnings, entry) end
for _, entry in ipairs(guarded("pickups", ADStatusHud.pickupEntries) or {}) do table.insert(snapshot.warnings, entry) end
for _, entry in ipairs(guarded("stuck", ADStatusHud.stuckEntries) or {}) do table.insert(snapshot.warnings, entry) end
for _, entry in ipairs(chainResult.suggestions or {}) do table.insert(snapshot.warnings, entry) end
return snapshot
@@ -8,8 +8,10 @@ SmartPickupFrame.SETTINGS_ROW_KINDS = {setGlobal = true, setBuilding = true}
local function choiceTexts(spec, i18n, withGlobal)
local texts = {}
if withGlobal then table.insert(texts, i18n:getText("spu_set_asGlobal")) end
for _, value in ipairs(spec.choices or {}) do
table.insert(texts, string.format(spec.format or "%s", tostring(value)))
for index, value in ipairs(spec.choices or {}) do
-- valg med navne (fx pop-up/statusvindue) i stedet for et tal
local labelKey = spec.labels ~= nil and spec.labels[index] or nil
table.insert(texts, labelKey ~= nil and i18n:getText(labelKey) or string.format(spec.format or "%s", tostring(value)))
end
return texts
end
+4
View File
@@ -544,6 +544,10 @@
<text name="spu_set_globalHelp" text="Pr. stald nedenfor: &quot;som globalt&quot; bruger værdien ovenfor."/>
<text name="spu_set_perBarnTitle" text="%s — pr. stald"/>
<text name="spu_set_asGlobal" text="som globalt"/>
<text name="spu_set_playerPopup" text="Besked når du skal køre en maskine"/>
<text name="spu_set_playerPopup_on" text="Pop-up"/>
<text name="spu_set_playerPopup_off" text="Kun statusvinduet"/>
<text name="spu_status_pickup" text="Kør '%s' væk fra F%s"/>
<text name="spu_set_stableSiloRange" text="Stald-silo: afstand fra stald til egen silo"/>
<text name="spu_set_waitHomeMinutes" text="Wait: ventetid før resten køres hjem i gårdens lager"/>
<text name="spu_set_troughRefillPercent" text="Fodertrug: kør først når truget er fyldt højst"/>
+4
View File
@@ -544,6 +544,10 @@
<text name="spu_set_globalHelp" text="Per barn below: &quot;as global&quot; uses the value above."/>
<text name="spu_set_perBarnTitle" text="%s — per barn"/>
<text name="spu_set_asGlobal" text="as global"/>
<text name="spu_set_playerPopup" text="Message when you must drive a machine"/>
<text name="spu_set_playerPopup_on" text="Pop-up"/>
<text name="spu_set_playerPopup_off" text="Status window only"/>
<text name="spu_status_pickup" text="Drive '%s' away from F%s"/>
<text name="spu_set_stableSiloRange" text="Barn silo: distance from barn to its own silo"/>
<text name="spu_set_waitHomeMinutes" text="Wait: time before the rest is taken home to the farm store"/>
<text name="spu_set_troughRefillPercent" text="Trough: only go when the trough is at most this full"/>
+2 -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.200.0</version>
<version>1.62.201.0</version>
<title>
<en>AD Smart Pickup</en>
</title>
@@ -48,6 +48,7 @@
<sourceFile filename="adManualTransport.lua"/>
<sourceFile filename="adPalletRefill.lua"/>
<sourceFile filename="adFieldWork.lua"/>
<sourceFile filename="adPlayerTransport.lua"/>
<sourceFile filename="adFieldSiloPlanner.lua"/>
<sourceFile filename="adFieldSiloConfig.lua"/>
<sourceFile filename="adFieldSilos.lua"/>