feat: kør videre til næste mark og parkeringsrådgiver (1.62.202)
This commit is contained in:
@@ -470,6 +470,7 @@ function ADFieldJobs.load()
|
||||
ADFieldJobs.state.excluded = loaded.excluded or {}
|
||||
ADFieldJobs.state.courseRecords = loaded.courseRecords or {}
|
||||
ADFieldJobs.state.manual = loaded.manual or {}
|
||||
ADFieldJobs.state.playerTrips = loaded.playerTrips or {}
|
||||
ADFieldJobs.state.paused = loaded.paused == true
|
||||
ADFieldJobs.state.resumed = loaded.resumed or {}
|
||||
ADFieldJobs.state.dispatchGapS = ADFieldJobs.normalizeDispatchGap(loaded.dispatchGapS)
|
||||
|
||||
@@ -91,6 +91,15 @@ function ADFieldStorage.save(state)
|
||||
xmlFile:setString(string.format("%s.manual.vehicle(%d)#id", ADFieldStorage.ROOT, manualIndex), vehicleId)
|
||||
manualIndex = manualIndex + 1
|
||||
end
|
||||
-- spillerkørsler pr. maskine (parkeringsrådgiver, ADPlayerTransport)
|
||||
local tripIndex = 0
|
||||
for vehicleId, trip in pairs(state.playerTrips or {}) do
|
||||
local key = string.format("%s.playerTrips.vehicle(%d)", ADFieldStorage.ROOT, tripIndex)
|
||||
xmlFile:setString(key .. "#id", vehicleId)
|
||||
xmlFile:setInt(key .. "#count", trip.count or 0)
|
||||
xmlFile:setString(key .. "#label", tostring(trip.label or ""))
|
||||
tripIndex = tripIndex + 1
|
||||
end
|
||||
local courseIndex = 0
|
||||
for _, record in pairs(state.courseRecords or {}) do
|
||||
ADFieldStorage.writeCourseRecord(xmlFile, string.format("%s.courses.course(%d)", ADFieldStorage.ROOT, courseIndex), record)
|
||||
@@ -130,6 +139,13 @@ function ADFieldStorage.load()
|
||||
local id = xmlFile:getString(key .. "#id")
|
||||
if id ~= nil and id ~= "" then result.manual[id] = true end
|
||||
end)
|
||||
result.playerTrips = {}
|
||||
xmlFile:iterate(ADFieldStorage.ROOT .. ".playerTrips.vehicle", function(_, key)
|
||||
local id = xmlFile:getString(key .. "#id")
|
||||
if id ~= nil and id ~= "" then
|
||||
result.playerTrips[id] = {count = xmlFile:getInt(key .. "#count") or 0, label = xmlFile:getString(key .. "#label")}
|
||||
end
|
||||
end)
|
||||
xmlFile:iterate(ADFieldStorage.ROOT .. ".courses.course", function(_, key)
|
||||
local record = ADCourseCache ~= nil and ADCourseCache.newRecord(ADFieldStorage.readCourseRecord(xmlFile, key)) or nil
|
||||
if record ~= nil then result.courseRecords[record.vehicle] = record end
|
||||
|
||||
@@ -77,3 +77,32 @@ local STAGE_VERBS = {
|
||||
function ADManualTransport.stageVerb(stage)
|
||||
return STAGE_VERBS[stage] or "bearbejdes"
|
||||
end
|
||||
|
||||
-- Kør videre: nærmeste anden mark, der venter på et sæt med rollen (og ikke har et i forvejen).
|
||||
-- fields = {{fieldId, role, x, z, busy}} -> fieldId eller nil
|
||||
function ADManualTransport.nextField(fields, role, x, z, exceptId)
|
||||
local best, bestD = nil, nil
|
||||
for _, entry in ipairs(fields or {}) do
|
||||
if entry.fieldId ~= exceptId and entry.role == role and not entry.busy and entry.x ~= nil then
|
||||
local d = (entry.x - x) ^ 2 + (entry.z - z) ^ 2
|
||||
if bestD == nil or d < bestD then best, bestD = entry.fieldId, d end
|
||||
end
|
||||
end
|
||||
return best
|
||||
end
|
||||
|
||||
-- Parkeringsrådgiver: efter så mange spillerkørsler foreslås en parkering til maskinen.
|
||||
ADManualTransport.PARK_HINT_TRIPS = 3
|
||||
|
||||
-- tripsById = {[id] = {count, label}}, parked = {[id] = true} -> id for maskinen uden parkering med flest kørsler
|
||||
-- (mindst PARK_HINT_TRIPS), eller nil.
|
||||
function ADManualTransport.parkingHint(tripsById, parked)
|
||||
local best, bestCount = nil, ADManualTransport.PARK_HINT_TRIPS - 1
|
||||
for id, trip in pairs(tripsById or {}) do
|
||||
local count = trip.count or 0
|
||||
if not (parked or {})[id] and (count > bestCount or (count == bestCount and best ~= nil and id < best)) then
|
||||
best, bestCount = id, count
|
||||
end
|
||||
end
|
||||
return best
|
||||
end
|
||||
|
||||
@@ -12,6 +12,8 @@ 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 = {}
|
||||
-- "kør videre": færdige sæt der skal direkte til næste mark med samme rolle (oprettes efter opfølgningsløkken)
|
||||
ADPlayerTransport.pendingContinues = {}
|
||||
|
||||
local function log(...) ADFieldJobs.log(...) end
|
||||
local function note(...) ADFieldJobs.note(...) end
|
||||
@@ -19,6 +21,16 @@ local function now() return ADFieldJobs.now end
|
||||
|
||||
local function label(vehicle) return ADRuns.vehicleLabel(vehicle) end
|
||||
|
||||
-- Parkeringsrådgiver: tæl hver gang spilleren har kørt maskinen ud (gemmes med markerne).
|
||||
local function countTrip(id, vehicle)
|
||||
if id == nil then return end
|
||||
local trips = ADFieldJobs.state.playerTrips or {}
|
||||
ADFieldJobs.state.playerTrips = trips
|
||||
local trip = trips[id] or {count = 0}
|
||||
trips[id] = {count = (trip.count or 0) + 1, label = label(vehicle)}
|
||||
ADFieldJobs.save()
|
||||
end
|
||||
|
||||
local function rootOf(vehicle)
|
||||
if vehicle ~= nil and vehicle.getRootVehicle ~= nil then
|
||||
local ok, root = pcall(vehicle.getRootVehicle, vehicle)
|
||||
@@ -130,16 +142,34 @@ function ADPlayerTransport.dispatch(adEnv, field, info, role, decision, candidat
|
||||
end
|
||||
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)
|
||||
return true
|
||||
end
|
||||
|
||||
-- Opgave der venter på spilleren (registreres i state.assignments).
|
||||
function ADPlayerTransport.newAssignment(field, role, vehicle, id, implementOnly)
|
||||
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,
|
||||
phase = "awaitingPlayer", since = now(), width = ADCpBridge.getWorkWidth(vehicle),
|
||||
groupSize = 1, leader = true, manual = true, playerTransport = true, implementOnly = implementOnly == true,
|
||||
startX = x, startZ = z,
|
||||
}
|
||||
ADFieldJobs.state.assignments[id] = assignment
|
||||
ADPlayerTransport.ask(field, info, assignment, true)
|
||||
return true
|
||||
return assignment
|
||||
end
|
||||
|
||||
-- Marker der lige nu venter på et sæt med rollen (seneste beslutning "dispatch"), til "kør videre".
|
||||
local function fieldsWaitingFor(role)
|
||||
local list = {}
|
||||
for _, info in ipairs(ADFields.list()) do
|
||||
local decision = ADFieldJobs.lastDecision[info.id]
|
||||
if decision ~= nil and decision.action == "dispatch" and decision.role == role and not decision.helper then
|
||||
table.insert(list, {fieldId = info.id, role = role, x = info.x, z = info.z, busy = #ADFieldJobs.assignmentsFor(info.id) > 0})
|
||||
end
|
||||
end
|
||||
return list
|
||||
end
|
||||
|
||||
function ADPlayerTransport.ask(field, info, assignment, withDialog)
|
||||
@@ -185,6 +215,7 @@ function ADPlayerTransport.follow(adEnv, field, info, assignment)
|
||||
return
|
||||
end
|
||||
log(field.id, "overtager '%s'%s", label(vehicle), forced and " ([Overtag])" or "")
|
||||
countTrip(assignment.vehicleId, vehicle)
|
||||
return ADFieldWork.beginWork(adEnv, field, info, assignment)
|
||||
end
|
||||
local reason = REASON_TEXT[why] or tostring(why)
|
||||
@@ -197,8 +228,31 @@ function ADPlayerTransport.follow(adEnv, field, info, assignment)
|
||||
end
|
||||
end
|
||||
|
||||
-- Efter opfølgningsløkken: færdige sæt sendes videre til næste mark ("kør videre"); kan det ikke længere, bedes
|
||||
-- spilleren køre det væk som ellers.
|
||||
local function applyContinues()
|
||||
local list = ADPlayerTransport.pendingContinues
|
||||
if #list == 0 then return end
|
||||
ADPlayerTransport.pendingContinues = {}
|
||||
for _, entry in ipairs(list) do
|
||||
local field, info = ADFieldJobs.getField(entry.fieldId), ADFields.getInfo(entry.fieldId)
|
||||
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)
|
||||
else
|
||||
ADPlayerTransport.finished({vehicle = entry.vehicle, vehicleId = entry.vehicleId, fieldId = entry.fromFieldId, role = entry.role}, true)
|
||||
end
|
||||
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)
|
||||
applyContinues()
|
||||
local list = ADPlayerTransport.pendingTakeovers
|
||||
if #list == 0 then return end
|
||||
ADPlayerTransport.pendingTakeovers = {}
|
||||
@@ -211,6 +265,8 @@ 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)
|
||||
state[assignment.vehicleId] = nil
|
||||
assignment.vehicleId, assignment.vehicle, assignment.implementOnly = tractorId, vehicle, false
|
||||
assignment.width = ADCpBridge.getWorkWidth(vehicle) or assignment.width
|
||||
@@ -222,8 +278,19 @@ function ADPlayerTransport.applyTakeovers(adEnv)
|
||||
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)
|
||||
-- noContinue: spring "kør videre" over (bruges når næste mark ikke længere kunne tage den).
|
||||
function ADPlayerTransport.finished(assignment, noContinue)
|
||||
local vehicle = assignment.vehicle
|
||||
-- kør videre: venter en anden mark på samme slags sæt, køres der direkte derhen i stedet for væk (brugerønske 10/10)
|
||||
if assignment.role ~= "harvester" and not noContinue then
|
||||
local x, z = ADFieldWork.vehiclePosition(vehicle)
|
||||
local nextId = ADManualTransport.nextField(fieldsWaitingFor(assignment.role), assignment.role, x, z, assignment.fieldId)
|
||||
if nextId ~= nil then
|
||||
table.insert(ADPlayerTransport.pendingContinues, {vehicle = vehicle, vehicleId = assignment.vehicleId,
|
||||
role = assignment.role, fromFieldId = assignment.fieldId, fieldId = nextId})
|
||||
return
|
||||
end
|
||||
end
|
||||
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))
|
||||
@@ -265,3 +332,29 @@ function ADPlayerTransport.isPickup(vehicle)
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
-- Til statusvinduet: den maskine uden parkering, spilleren har kørt flest gange (mindst 3). Slås op højst hvert
|
||||
-- 10. sekund (gennemløber gårdens køretøjer).
|
||||
local hintCache = {at = nil, entry = nil}
|
||||
ADPlayerTransport.HINT_CACHE_MS = 10000
|
||||
|
||||
function ADPlayerTransport.parkingHintEntry(adEnv)
|
||||
local trips = ADFieldJobs.state.playerTrips
|
||||
if adEnv == nil or trips == nil or next(trips) == nil then return nil end
|
||||
local t = now() or 0
|
||||
if hintCache.at ~= nil and t - hintCache.at < ADPlayerTransport.HINT_CACHE_MS then return hintCache.entry end
|
||||
local vehicles = {}
|
||||
for _, vehicle in pairs(g_currentMission.vehicleSystem.vehicles) do
|
||||
local id = ADRunsController.getVehicleId(vehicle)
|
||||
if id ~= nil and trips[id] ~= nil then vehicles[id] = vehicle end
|
||||
end
|
||||
local parked = {}
|
||||
for id in pairs(trips) do
|
||||
-- solgt/væk tæller som "har parkering" (intet at foreslå)
|
||||
parked[id] = vehicles[id] == nil or ADFieldWork.parkMarkerId(adEnv, vehicles[id]) ~= nil
|
||||
end
|
||||
local id = ADManualTransport.parkingHint(trips, parked)
|
||||
hintCache.at = t
|
||||
hintCache.entry = id ~= nil and {label = trips[id].label or label(vehicles[id]), count = trips[id].count, vehicle = vehicles[id]} or nil
|
||||
return hintCache.entry
|
||||
end
|
||||
|
||||
@@ -303,10 +303,17 @@ function ADStatusHud.pickupEntries()
|
||||
table.insert(entries, {text = string.format(textOf("spu_status_pickup"), tostring(pickup.label), tostring(pickup.fieldId)),
|
||||
level = "waiting", target = pickup.vehicle})
|
||||
end
|
||||
-- parkeringsrådgiver: den maskine, spilleren oftest kører selv, og som stadig mangler en parkering
|
||||
local hint = ADPlayerTransport.parkingHintEntry(ADStatusHud.adEnv)
|
||||
if hint ~= nil then
|
||||
table.insert(entries, {text = string.format(textOf("spu_status_parkHint"), tostring(hint.label), hint.count or 0),
|
||||
level = "waiting", target = hint.vehicle})
|
||||
end
|
||||
return entries
|
||||
end
|
||||
|
||||
function ADStatusHud.snapshot(adEnv)
|
||||
ADStatusHud.adEnv = adEnv
|
||||
local proxy = frameProxy()
|
||||
local snapshot = {missing = {}, flows = {}, fields = {}, chains = {}, warnings = {}}
|
||||
snapshot.missing = guarded("missing", ADStatusHud.missingEntries, proxy) or {}
|
||||
|
||||
@@ -548,6 +548,7 @@
|
||||
<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_status_parkHint" text="Giv '%s' en parkering — du har kørt den selv %d gange"/>
|
||||
<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"/>
|
||||
|
||||
@@ -548,6 +548,7 @@
|
||||
<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_status_parkHint" text="Give '%s' a parking spot — you have driven it yourself %d times"/>
|
||||
<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"/>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.201.0</version>
|
||||
<version>1.62.202.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user