feat: markmaskiner hedder efter deres aktuelle job (Fertilizer F23 - 2) og får eget navn igen bagefter (1.62.352)

This commit is contained in:
2026-10-19 00:51:18 +02:00
parent bf7f9862f1
commit 0b406d2623
9 changed files with 192 additions and 5 deletions
+134
View File
@@ -0,0 +1,134 @@
-- AD Job Names
-- Markmaskiner hedder efter det job, de har lige nu (brugerønske 19/10 00:46: "mange af dem hedder tømmevogn eller noget
-- andet i stedet for det job de har ... hvis mega er på vej til f23 så kunne den 'Fertilizer F23 - x'"). Under et markjob:
-- "<Job> F<mark>", flere på samme job og mark: " - 1", " - 2" …; når jobbet slutter: maskinens faste navn fra dens P-plads
-- (som flowene, ADRuns.ownNameFromPark). Flow-traktorer beholder flow-navnet. Ren logik øverst, spil-adapter nederst.
ADJobNames = {}
ADJobNames.ROLE_KEYS = {
mower = "spu_jobname_mower", tedder = "spu_jobname_tedder", rake = "spu_jobname_rake", collector = "spu_jobname_collector",
harvester = "spu_jobname_harvester", unloader = "spu_jobname_unloader", mulcher = "spu_jobname_mulcher",
limer = "spu_jobname_limer", plow = "spu_jobname_plow", cultivator = "spu_jobname_cultivator", seeder = "spu_jobname_seeder",
roller = "spu_jobname_roller", weeder = "spu_jobname_weeder", fertilizer = "spu_jobname_fertilizer", baler = "spu_jobname_baler",
baleCollector = "spu_jobname_baleCollector", stonePicker = "spu_jobname_stonePicker",
}
-- ---- ren logik ----
-- jobs = {{key, role, fieldId, order}}; labelOf(role) -> tekst. -> {[key] = navn}. Flere med samme rolle og mark nummereres
-- efter order (stabil rækkefølge), ellers intet nummer.
function ADJobNames.desired(jobs, labelOf)
local groups, order = {}, {}
for _, job in ipairs(jobs or {}) do
local label = labelOf(job.role)
if label ~= nil and job.fieldId ~= nil then
local groupKey = label .. "|" .. tostring(job.fieldId)
if groups[groupKey] == nil then
groups[groupKey] = {}
table.insert(order, groupKey)
end
table.insert(groups[groupKey], {key = job.key, label = label, fieldId = job.fieldId, order = job.order or 0})
end
end
local result = {}
for _, groupKey in ipairs(order) do
local list = groups[groupKey]
table.sort(list, function(a, b) if a.order ~= b.order then return a.order < b.order end return tostring(a.key) < tostring(b.key) end)
for i, item in ipairs(list) do
local name = string.format("%s F%s", item.label, tostring(item.fieldId))
if #list > 1 then name = string.format("%s - %d", name, i) end
result[item.key] = name
end
end
return result
end
-- Er navnet et jobnavn (sat af os)? labels = {[tekst] = true}
function ADJobNames.isJobName(name, labels)
if type(name) ~= "string" then return false end
local prefix = name:match("^(.+) F%d+ %- %d+$") or name:match("^(.+) F%d+$")
return prefix ~= nil and labels[prefix] == true
end
-- ---- spil-adapter ----
-- uniqueId -> navnet før jobbet (sættes tilbage bagefter; review: et eget navn som "Bertha" gik ellers tabt)
local beforeJob = {}
-- "uniqueId|rolle|mark" -> løbenummer for hvornår maskinen kom på jobbet (stabil nummerering; assignment.since flytter
-- sig ved hver fase, og så byttede "- 1" og "- 2" plads)
local firstSeen, seenCounter = {}, 0
local function labelOf(role)
local key = ADJobNames.ROLE_KEYS[role]
if key == nil or g_i18n == nil then return nil end
local ok, text = pcall(g_i18n.getText, g_i18n, key)
return ok and type(text) == "string" and text ~= "" and text or nil
end
local function allLabels()
local labels = {}
for role in pairs(ADJobNames.ROLE_KEYS) do
local label = labelOf(role)
if label ~= nil then labels[label] = true end
end
return labels
end
local function setName(stateModule, name)
stateModule:setName(name)
if stateModule.raiseDirtyFlag ~= nil then stateModule:raiseDirtyFlag() end
end
function ADJobNames.apply(adEnv)
if ADFieldJobs == nil or ADFieldJobs.state == nil or ADRunsController == nil then return end
local store = ADRunsController.store
local runNames = ADRuns.vehicleNames(store)
local jobs, assigned, seenNow = {}, {}, {}
for _, assignment in pairs(ADFieldJobs.state.assignments or {}) do
local vehicle = assignment.vehicle
local key = vehicle ~= nil and ADRunsController.getVehicleId(vehicle) or nil
-- flow-traktorer (også udlånte) beholder flow-navnet; spilleren i førersædet: rør det ikke
local controlled = vehicle ~= nil and vehicle.getIsControlled ~= nil and vehicle:getIsControlled()
if key ~= nil then assigned[key] = true end
if key ~= nil and runNames[key] == nil and not controlled then
local seenKey = string.format("%s|%s|%s", key, tostring(assignment.role), tostring(assignment.fieldId))
if firstSeen[seenKey] == nil then
seenCounter = seenCounter + 1
firstSeen[seenKey] = seenCounter
end
seenNow[seenKey] = true
table.insert(jobs, {key = key, role = assignment.role, fieldId = assignment.fieldId, order = firstSeen[seenKey]})
end
end
for seenKey in pairs(firstSeen) do if not seenNow[seenKey] then firstSeen[seenKey] = nil end end
local wanted = ADJobNames.desired(jobs, labelOf)
local labels = allLabels()
for _, vehicle in ipairs(ADRunsController.getFarmVehicles(adEnv)) do
local stateModule = vehicle.ad ~= nil and vehicle.ad.stateModule or nil
local key = ADRunsController.getVehicleId(vehicle)
if stateModule ~= nil and stateModule.setName ~= nil and key ~= nil then
local current = stateModule.getName ~= nil and stateModule:getName() or stateModule.driverName
local name = wanted[key]
if runNames[key] ~= nil then beforeJob[key] = nil end -- gået over i et flow: det huskede navn er forældet
if name ~= nil then
if current ~= name then
-- gamle rollenavne ("Tømmevogn 6") huskes ikke — de afløses af P-pladsens navn bagefter
local oldRole = ADNaming ~= nil and ADNaming.isOldRoleName ~= nil and ADNaming.isOldRoleName(current)
if beforeJob[key] == nil and current ~= nil and not oldRole and not ADJobNames.isJobName(current, labels) then beforeJob[key] = current end
setName(stateModule, name)
end
elseif runNames[key] == nil and not assigned[key] and ADJobNames.isJobName(current, labels) then
-- jobbet er slut: navnet fra før jobbet, ellers det faste navn fra P-pladsen (ellers modelnavnet)
local own = beforeJob[key]
if own == nil then
local parkIndex = vehicle.advd ~= nil and vehicle.advd.parkDestination or nil
local marker = type(parkIndex) == "number" and parkIndex >= 1 and adEnv.ADGraphManager:getMapMarkerById(parkIndex) or nil
own = ADRuns.ownNameFromPark(marker ~= nil and marker.name or nil, tostring(vehicle:getName()), store)
end
setName(stateModule, own)
beforeJob[key] = nil
end
end
end
end
+12
View File
@@ -77,6 +77,18 @@ ADNaming.ROLE_PREFIX = {collector = "Læssevogn", mower = "Skårlægger", tedder
mulcher = "Stubhakker", cultivator = "Kultivator", plow = "Plov", unloader = "Tømmevogn"}
ADNaming.HARVESTER_PREFIX = {beet = "Roeoptager", forage = "Finsnitter"}
-- Gammelt engangs-rollenavn for en traktor ("Tømmevogn 6", "Skårlægger 4")? Traktorer skifter redskab, så navnet bliver
-- forkert (19/10) — det sættes ikke tilbage efter et job. Høstere ("Mejetærsker 6") er altid høstere og beholdes.
function ADNaming.isOldRoleName(name)
if type(name) ~= "string" then return false end
local prefix = name:match("^(.-) %d+$")
if prefix == nil then return false end
for _, value in pairs(ADNaming.ROLE_PREFIX) do
if value == prefix then return true end
end
return false
end
function ADNaming.fleetName(role, subtype, names)
local prefix
if role == "harvester" then
+5 -4
View File
@@ -272,10 +272,11 @@ function ADRunsController.applyVehicleNamesThrottled(adEnv, dt)
if nameTimerMs < ADRunsController.NAME_INTERVAL_MS then return end
nameTimerMs = 0
ADRunsController.applyVehicleNames(adEnv)
-- markmaskiner uden eget navn (stadig modelnavnet) får et rollenavn
if ADFieldWork ~= nil and ADFieldWork.autoNameFleet ~= nil and ADFieldJobs ~= nil and ADFieldJobs.loaded then
local ok, err = pcall(ADFieldWork.autoNameFleet, adEnv)
if not ok then Logging.warning(ADRunsController.LOG_PREFIX .. "navne til markflåden fejlede: %s", tostring(err)) end
-- markmaskiner hedder efter deres aktuelle job ("Fertilizer F23 - 2"), og får deres faste navn igen bagefter (ADJobNames).
-- Den gamle engangs-rollenavngivning (ADFieldWork.autoNameFleet: "Tømmevogn 6" der kørte sprøjte) er slået fra (19/10).
if ADJobNames ~= nil and ADFieldJobs ~= nil and ADFieldJobs.loaded then
local ok, err = pcall(ADJobNames.apply, adEnv)
if not ok then Logging.warning(ADRunsController.LOG_PREFIX .. "jobnavne fejlede: %s", tostring(err)) end
end
end
+17
View File
@@ -120,6 +120,23 @@
<text name="spu_field_reason_tooWide" text="%s for bred: %.1f m &gt; %.0f m (Courseplay)"/>
<text name="spu_field_reason_widthUnknown" text="%s: arbejdsbredde %.1f m kan ikke være rigtig — sæt bredden i Courseplay (sendes ikke ud)"/>
<text name="spu_field_reason_tooNarrow" text="%s for smal: %.1f m &lt; slåbredde %.1f m — sæt Riv til eller brug en bredere"/>
<text name="spu_jobname_mower" text="Skårlægger"/>
<text name="spu_jobname_tedder" text="Vender"/>
<text name="spu_jobname_rake" text="Rive"/>
<text name="spu_jobname_collector" text="Læssevogn"/>
<text name="spu_jobname_harvester" text="Høster"/>
<text name="spu_jobname_unloader" text="Tømmevogn"/>
<text name="spu_jobname_mulcher" text="Mulcher"/>
<text name="spu_jobname_limer" text="Kalk"/>
<text name="spu_jobname_plow" text="Plov"/>
<text name="spu_jobname_cultivator" text="Kultivator"/>
<text name="spu_jobname_seeder" text="Såmaskine"/>
<text name="spu_jobname_roller" text="Tromle"/>
<text name="spu_jobname_weeder" text="Ukrudt"/>
<text name="spu_jobname_fertilizer" text="Gødning"/>
<text name="spu_jobname_baler" text="Ballepresser"/>
<text name="spu_jobname_baleCollector" text="Ballesamler"/>
<text name="spu_jobname_stonePicker" text="Stenplukker"/>
<text name="spu_field_role_mower" text="slåmaskine"/>
<text name="spu_field_role_tedder" text="vender"/>
<text name="spu_field_role_rake" text="river"/>
+17
View File
@@ -120,6 +120,23 @@
<text name="spu_field_reason_tooWide" text="%s too wide: %.1f m &gt; %.0f m (Courseplay)"/>
<text name="spu_field_reason_widthUnknown" text="%s: work width %.1f m cannot be right — set the width in Courseplay (not sent out)"/>
<text name="spu_field_reason_tooNarrow" text="%s too narrow: %.1f m &lt; mowing width %.1f m — turn on Rake or use a wider one"/>
<text name="spu_jobname_mower" text="Mower"/>
<text name="spu_jobname_tedder" text="Tedder"/>
<text name="spu_jobname_rake" text="Rake"/>
<text name="spu_jobname_collector" text="Loader wagon"/>
<text name="spu_jobname_harvester" text="Harvester"/>
<text name="spu_jobname_unloader" text="Unloader"/>
<text name="spu_jobname_mulcher" text="Mulcher"/>
<text name="spu_jobname_limer" text="Lime"/>
<text name="spu_jobname_plow" text="Plow"/>
<text name="spu_jobname_cultivator" text="Cultivator"/>
<text name="spu_jobname_seeder" text="Seeder"/>
<text name="spu_jobname_roller" text="Roller"/>
<text name="spu_jobname_weeder" text="Weeder"/>
<text name="spu_jobname_fertilizer" text="Fertilizer"/>
<text name="spu_jobname_baler" text="Baler"/>
<text name="spu_jobname_baleCollector" text="Bale collector"/>
<text name="spu_jobname_stonePicker" text="Stone picker"/>
<text name="spu_field_role_mower" text="mower"/>
<text name="spu_field_role_tedder" text="tedder"/>
<text name="spu_field_role_rake" text="rake"/>
+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.351.0</version>
<version>1.62.352.0</version>
<title>
<en>AD Smart Pickup</en>
</title>
@@ -20,6 +20,7 @@
<sourceFile filename="adHeadOn.lua"/>
<sourceFile filename="adTargetGuard.lua"/>
<sourceFile filename="adCpFieldGuard.lua"/>
<sourceFile filename="adJobNames.lua"/>
<sourceFile filename="adUnloadKick.lua"/>
<sourceFile filename="adSettings.lua"/>
<sourceFile filename="adLaunchGate.lua"/>