From e4a3c6fea0d0a990463c8eaadc10ebe6cddb14e8 Mon Sep 17 00:00:00 2001 From: masterdraco Date: Sat, 17 Oct 2026 03:21:58 +0200 Subject: [PATCH] =?UTF-8?q?refactor:=20adFieldWork=20delt=20i=20adFieldSto?= =?UTF-8?q?re/adFieldRefill,=20follow/dispatch/beginWork=20i=20faser,=20f?= =?UTF-8?q?=C3=A6lles=20adUtil=20=E2=80=94=201.62.285?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ingen ændret opførsel. adFieldWork.lua 3087 -> 2598 linjer; lager/salg og ballemål i adFieldStore.lua, påfyldningssteder i adFieldRefill.lua (begge på ADFieldWork-tabellen, indlæses efter adFieldWork). follow (296), dispatch (232) og beginWork (164 linjer) delt i én funktion pr. fase/trin. Ny adUtil.lua erstatter 28 enslydende lokale hjælpere i 22 filer. Alle 93 testfiler grønne; code-review uden fund over LOW. --- CHANGELOG.md | 1 + FS25_ADSmartPickup/adBuildings.lua | 7 +- FS25_ADSmartPickup/adChain.lua | 11 +- FS25_ADSmartPickup/adChainActions.lua | 5 +- FS25_ADSmartPickup/adCpResume.lua | 6 +- FS25_ADSmartPickup/adDependency.lua | 5 +- FS25_ADSmartPickup/adFieldModel.lua | 6 +- FS25_ADSmartPickup/adFieldRefill.lua | 440 ++++ FS25_ADSmartPickup/adFieldSilos.lua | 6 +- FS25_ADSmartPickup/adFieldStore.lua | 203 ++ FS25_ADSmartPickup/adFieldWork.lua | 1847 ++++++----------- FS25_ADSmartPickup/adFlowSleep.lua | 6 +- FS25_ADSmartPickup/adHeaderSwap.lua | 4 +- FS25_ADSmartPickup/adHitchApproach.lua | 11 +- FS25_ADSmartPickup/adHitchCreep.lua | 9 +- FS25_ADSmartPickup/adLoadDiag.lua | 4 +- FS25_ADSmartPickup/adNames.lua | 6 +- FS25_ADSmartPickup/adNaming.lua | 5 +- FS25_ADSmartPickup/adOutbound.lua | 17 +- FS25_ADSmartPickup/adPalletRefill.lua | 6 +- FS25_ADSmartPickup/adParkGuard.lua | 5 +- FS25_ADSmartPickup/adPool.lua | 5 +- FS25_ADSmartPickup/adRuns.lua | 8 +- FS25_ADSmartPickup/adRunsController.lua | 8 +- FS25_ADSmartPickup/adSellBlock.lua | 6 +- FS25_ADSmartPickup/adSettings.lua | 6 +- FS25_ADSmartPickup/adUtil.lua | 44 + .../gui/SmartPickupAttentionFlow.lua | 4 +- FS25_ADSmartPickup/modDesc.xml | 5 +- 29 files changed, 1399 insertions(+), 1297 deletions(-) create mode 100644 FS25_ADSmartPickup/adFieldRefill.lua create mode 100644 FS25_ADSmartPickup/adFieldStore.lua create mode 100644 FS25_ADSmartPickup/adUtil.lua diff --git a/CHANGELOG.md b/CHANGELOG.md index 78cc2dc..526adc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ står i [docs/BRUGERMANUAL.md](docs/BRUGERMANUAL.md) (dansk) og [docs/USER_MANUA ## 1.62 — Kæder slås selv til +- **1.62.285** Kodeoprydning, ingen ændret opførsel (brugerønske 17/10: "samlet kodeoptimering"). **adFieldWork.lua delt i tre**: lager/salg -> `adFieldStore.lua`, påfyldningssteder -> `adFieldRefill.lua` (3.087 -> 2.598 + 203 + 440 linjer). De tre længste funktioner (`follow` 296, `dispatch` 232, `beginWork` 164 linjer) er delt op i én funktion pr. fase/trin; ingen funktion i filen er nu over 120 linjer. Ny `adUtil.lua` med de små hjælpere (`now`, `contains`, `copyList`, `vehicleName`, `fillTypeName`, `positionOf`, `savePath`), der før lå som 28 enslydende kopier i 22 filer. Alle 93 testfiler grønne. - **1.62.284** Rettet: **græs/kløver/lucerne regnet med ét slæt om året** (in-game 17/10: hø-behov 207 ha -> 20 af 28 marker til græs). Afgrøder der gror igen, regnes nu med 3 slæt om året — både i Alt automatisk og i kædens markskift (ellers ville kæden tage salgsmarkerne tilbage). Varige afgrøder (vin, oliven, poppel) høstes stadig én gang. - **1.62.283** "Alt automatisk" er nu en **hel markplan** (brugerønsker 17/10): gårdens forbrug beregnes forfra (12 mdr. + indstillingen **Overskud til gårdens forbrug**, standard 10 %) og dækkes med de marker der **passer bedst i størrelse** (marker der allerede har afgrøden først); resten fordeles jævnt i ha på de 3 mest indbringende salgsafgrøder. **Græsmarker er med** (overskydende græs sås om efter sidste slæt; eng er fast). Nyt link **[Alt automatisk + nulstil mine valg]**. Planen **laves om ved markkøb/-salg** (Til/Fra i Indstillinger). Ingen afgrøder ændres, hvis gården ikke kan læses helt. - **1.62.282** "Alt automatisk" udvidet (brugerønsker 17/10): **gårdens forbrug dækkes først** — kædeplanen (stalde/fabrikker, fx græs/kløver/lucerne til køerne) sætter de marker der skal til, uden kædens loft på skift pr. runde; spillerens egne mål røres aldrig. **Resten spredes skiftevis på de 3 mest indbringende afgrøder** (spredt høst). Afgrøder vurderes over **hele året** (i november kan intet sås før marts). Knappen venter, til markscanningen er færdig. Ny markering **[Gård]** i Auto-kolonnen for marker der dyrker til gårdens eget forbrug. diff --git a/FS25_ADSmartPickup/adBuildings.lua b/FS25_ADSmartPickup/adBuildings.lua index c168a31..9045168 100644 --- a/FS25_ADSmartPickup/adBuildings.lua +++ b/FS25_ADSmartPickup/adBuildings.lua @@ -15,12 +15,7 @@ ADBuildings.CACHE_MS = 30000 local cache = {list = nil, farmId = nil, time = -math.huge} -local function now() - if g_currentMission ~= nil and type(g_currentMission.time) == "number" then - return g_currentMission.time - end - return os.clock() * 1000 -end +local now = ADUtil.now local function getNodePosition(node) if node == nil or (entityExists ~= nil and not entityExists(node)) then diff --git a/FS25_ADSmartPickup/adChain.lua b/FS25_ADSmartPickup/adChain.lua index 8711ded..d5f7c10 100644 --- a/FS25_ADSmartPickup/adChain.lua +++ b/FS25_ADSmartPickup/adChain.lua @@ -36,10 +36,7 @@ ADChain.problemKeys = {} -- hele data). nil efter indlæsning: det der allerede er slukket ved første tjek, advares der ikke om. ADChain.depPrevEnabled = nil -local function contains(list, value) - for _, item in ipairs(list or {}) do if item == value then return true end end - return false -end +local contains = ADUtil.contains local function sortedKeys(map) local keys = {} @@ -606,11 +603,7 @@ end -- ---- gem / indlæs (samme sti-opslag som runs; skrives kun fra ADRunsController.save) ---- -local function getPath() - local path = ADRunsStorage ~= nil and ADRunsStorage.getPath() or nil - if path == nil then return nil end - return (path:gsub(ADRunsStorage.FILE_NAME .. "$", ADChain.FILE_NAME)) -end +local function getPath() return ADUtil.savePath(ADChain.FILE_NAME) end function ADChain.save() local path = getPath() diff --git a/FS25_ADSmartPickup/adChainActions.lua b/FS25_ADSmartPickup/adChainActions.lua index fb65ae8..5717c66 100644 --- a/FS25_ADSmartPickup/adChainActions.lua +++ b/FS25_ADSmartPickup/adChainActions.lua @@ -72,10 +72,7 @@ function ADChainActions.edges(chain, recipes) return list end -local function contains(list, value) - for _, item in ipairs(list or {}) do if item == value then return true end end - return false -end +local contains = ADUtil.contains function ADChainActions.isCovered(edge, runs) for _, run in ipairs(runs or {}) do diff --git a/FS25_ADSmartPickup/adCpResume.lua b/FS25_ADSmartPickup/adCpResume.lua index ee681fa..845642c 100644 --- a/FS25_ADSmartPickup/adCpResume.lua +++ b/FS25_ADSmartPickup/adCpResume.lua @@ -107,11 +107,7 @@ function ADCpResume.takeToStart(adEnv) return ids, byId end -local function getPath() - local path = ADRunsStorage ~= nil and ADRunsStorage.getPath() or nil - if path == nil then return nil end - return (path:gsub(ADRunsStorage.FILE_NAME .. "$", ADCpResume.FILE_NAME)) -end +local function getPath() return ADUtil.savePath(ADCpResume.FILE_NAME) end function ADCpResume.save(adEnv) local path = getPath() diff --git a/FS25_ADSmartPickup/adDependency.lua b/FS25_ADSmartPickup/adDependency.lua index 4950e03..b24e0b0 100644 --- a/FS25_ADSmartPickup/adDependency.lua +++ b/FS25_ADSmartPickup/adDependency.lua @@ -8,10 +8,7 @@ ADDependency = {} ADDependency.STOCK_DAYS_OK = 60 -- lager til mere end så mange døgn: ingen advarsel ADDependency.MAX_USERS = 2 -- brugere nævnt i beskeden; resten "+k" -local function contains(list, value) - for _, item in ipairs(list or {}) do if item == value then return true end end - return false -end +local contains = ADUtil.contains local function sortedKeys(map) local keys = {} diff --git a/FS25_ADSmartPickup/adFieldModel.lua b/FS25_ADSmartPickup/adFieldModel.lua index deb86ad..d7e605d 100644 --- a/FS25_ADSmartPickup/adFieldModel.lua +++ b/FS25_ADSmartPickup/adFieldModel.lua @@ -55,11 +55,7 @@ local STRAW_STAGES = {collect = {"strawCollecting"}, bale = {"baling", "baleColl local SOIL_VALUES = {auto = true, cultivate = true, plow = true, none = true} local PRODUCTS = {auto = true, silage = true, hay = true, harvest = true} -local function copyList(list) - local copy = {} - for index, value in ipairs(list or {}) do copy[index] = value end - return copy -end +local copyList = ADUtil.copyList local function copyPlan(plan) local copy = {} diff --git a/FS25_ADSmartPickup/adFieldRefill.lua b/FS25_ADSmartPickup/adFieldRefill.lua new file mode 100644 index 0000000..d30e595 --- /dev/null +++ b/FS25_ADSmartPickup/adFieldRefill.lua @@ -0,0 +1,440 @@ +-- AD Field Refill +-- Markarbejdets påfyldningssteder (udskilt fra adFieldWork.lua 17/10-2026): hvilken station en AD-markør hører til, +-- nærmeste lager/købestation med varen, og omdirigering når stedet er løbet tørt. +-- Funktionerne ligger på ADFieldWork, så kaldere og tests er uændrede. Indlæses efter adFieldWork.lua. + +local function log(...) ADFieldJobs.log(...) end +local function now() return ADFieldJobs.now end +local function startAd(...) return ADFieldWork.startAd(...) end +local function vehiclePosition(...) return ADFieldWork.vehiclePosition(...) end + +-- Nærmeste påfyldning af varen: en læssestation gården har adgang til, med varen på lager, en AutoDrive- +-- markør ved triggeren og vej fra traktoren. (AutoDrives eget "automatiske påfyldningsmål" er slået fra i +-- AutoDrive — AutoDrive.automaticPickupTarget = false — så vi finder stedet selv, som silovalget.) +-- Sælger købestationen varen? (placeable.spec_buyingStation.buyingStation; FS25-felter varierer, så flere +-- opslag: udbudte varer, triggernes varer, AI-varer.) +function ADFieldWork.buyingSupports(station, fillType) + if station == nil or fillType == nil then return false end + local ok, result = pcall(function() + for _, key in ipairs({"providedFillTypes", "supportedFillTypes", "fillTypes"}) do + local set = station[key] + if type(set) == "table" and set[fillType] then return true end + end + for _, trigger in pairs(station.loadTriggers or {}) do + if type(trigger.fillTypes) == "table" and trigger.fillTypes[fillType] then return true end + end + if station.getAISupportedFillTypes ~= nil then + local set = station:getAISupportedFillTypes() + if type(set) == "table" and set[fillType] then return true end + end + return false + end) + return ok and result == true +end + +-- Parkering, kobling og ventepladser er aldrig en læssemarkør. +local function isServiceMarker(marker) + local name = string.lower(tostring(marker.name or "")) + local group = string.lower(tostring(marker.group or "")) + return string.find(name, "^p ") ~= nil or string.find(name, "^connect ") ~= nil + or string.find(name, "%f[%a]wait%f[%A]") ~= nil or string.find(group, "%f[%a]wait%f[%A]") ~= nil +end + +ADFieldWork.THROUGH_TRIGGER_M = 3 -- AD-vejen før markøren kører gennem triggeren, hvis et punkt er så tæt på + +-- Kører AD-vejen ind til markøren gennem en af triggerne? marker.approach = {{x, z}} (punkter bagud fra markøren). +function ADFieldWork.drivesThrough(marker, points) + local limit = ADFieldWork.THROUGH_TRIGGER_M ^ 2 + for _, p in ipairs(marker.approach or {}) do + for _, point in ipairs(points) do + if (p.x - point.x) ^ 2 + (p.z - point.z) ^ 2 <= limit then return true end + end + end + return false +end + +-- markers = {{id, name, group, x, z, approach?}}, points = triggerpositioner {{x, z}} -> id på læssemarkøren inden +-- for maxDistance m af en af triggerne, ellers nil. En markør hvis AD-vej kører GENNEM triggeren foretrækkes for den +-- blot nærmeste (in-game 6/10: sprøjten til den blå væsketank holdt ved "Palleskur 2 load" på nabosporet, 0,5 m +-- tættere end "Buy All" lige efter tankene). +function ADFieldWork.nearestStationMarker(markers, points, maxDistance) + points = points or {} + local best, bestDistance, bestThrough = nil, maxDistance * maxDistance, false + for _, marker in ipairs(markers or {}) do + if not isServiceMarker(marker) then + local nearest = math.huge + for _, point in ipairs(points) do + nearest = math.min(nearest, (marker.x - point.x) ^ 2 + (marker.z - point.z) ^ 2) + end + if nearest <= maxDistance * maxDistance then + local through = ADFieldWork.drivesThrough(marker, points) + if (through and not bestThrough) or (through == bestThrough and nearest < bestDistance) then + best, bestDistance, bestThrough = marker.id, nearest, through + end + end + end + end + return best, bestThrough +end + +ADFieldWork.STATION_MARKER_M = 30 +ADFieldWork.STATION_MATCH_M = 80 -- markører så tæt på bygningen tjekkes med markør->station-opslaget + +-- Stationens læssetriggere i verden (buying-/loading-station) -> {{x, z}}. +local function loadTriggerPoints(station) + local points = {} + for _, trigger in pairs(station.loadTriggers or {}) do + local node = trigger.triggerNode or trigger.aiNode + if node ~= nil then + local ok, x, _, z = pcall(getWorldTranslation, node) + if ok and x ~= nil then table.insert(points, {x = x, z = z}) end + end + end + return points +end + +ADFieldWork.APPROACH_M = 40 -- så langt bagud ad AD-vejen ledes der efter triggeren + +-- Punkterne AD kører igennem ind til markøren (bagud ad incoming, op til APPROACH_M). +function ADFieldWork.approachPoints(adEnv, startId) + local points, seen, queue = {}, {[startId] = true}, {{id = startId, d = 0}} + local head = 1 + while head <= #queue and #points < 600 do + local item = queue[head] + head = head + 1 + local wayPoint = adEnv.ADGraphManager:getWayPointById(item.id) + if wayPoint ~= nil then + table.insert(points, {x = wayPoint.x, z = wayPoint.z}) + for _, prevId in ipairs(wayPoint.incoming or {}) do + local prev = not seen[prevId] and adEnv.ADGraphManager:getWayPointById(prevId) or nil + if prev ~= nil then + seen[prevId] = true + local step = math.sqrt((prev.x - wayPoint.x) ^ 2 + (prev.z - wayPoint.z) ^ 2) + -- et punkt pr. meter mellem knuderne (AD-knuder ligger flere meter fra hinanden) + for t = 1, math.floor(step) do + local f = t / step + table.insert(points, {x = wayPoint.x + (prev.x - wayPoint.x) * f, z = wayPoint.z + (prev.z - wayPoint.z) * f}) + end + if item.d + step <= ADFieldWork.APPROACH_M then table.insert(queue, {id = prevId, d = item.d + step}) end + end + end + end + end + return points +end + +-- points: kun markører inden for nearM af et af punkterne får deres AD-vej med (approach) +local function markerList(adEnv, points, nearM) + local list = {} + for _, marker in pairs(adEnv.ADGraphManager:getMapMarkers()) do + local wayPoint = adEnv.ADGraphManager:getWayPointById(marker.id) + if wayPoint ~= nil then + local entry = {id = marker.id, name = marker.name, group = marker.group, x = wayPoint.x, z = wayPoint.z} + for _, point in ipairs(points or {}) do + if (wayPoint.x - point.x) ^ 2 + (wayPoint.z - point.z) ^ 2 <= (nearM or 0) ^ 2 then + entry.approach = ADFieldWork.approachPoints(adEnv, marker.id) + break + end + end + table.insert(list, entry) + end + end + return list +end + +-- Stationens markør: den der kører GENNEM en af triggerne (points), ellers den nærmeste inden for maxDistance. +-- accept(marker) filtrerer (fx væk med andre bygningers markører). -> id, through (eller nil). Til salgsstederne: +-- markør->station giver hver markør kun én station ("Buy All" gennem væske- og bulkmarkedet blev kun bulkmarkedets, +-- in-game 7/10), og uden gennemkørsel vandt nabosporets palleskur- eller koblingsmarkør. +function ADFieldWork.stationMarkerAt(adEnv, points, maxDistance, accept) + local list = {} + for _, marker in ipairs(markerList(adEnv, points, maxDistance)) do + if accept == nil or accept(marker) then table.insert(list, marker) end + end + return ADFieldWork.nearestStationMarker(list, points, maxDistance) +end + +ADFieldWork.isServiceMarker = isServiceMarker + + +-- AD-markøren ved stationen: den nærmeste markør ved stationens EGNE læssetriggere, ellers nærmeste ikke-Wait markør +-- inden for 40 m af bygningen ("Liquid Buy Station" står ved tanken, ikke ved triggeren). AutoDrives +-- ADTriggerManager:getMarkerAtStation bruges IKKE: den vil have markøren togets længde + 3..13 m forbi triggeren (et +-- langt sæt fik en anden stations markør: Puma + Kinze 4900 ventede på frø ved "Market Price Liquid Fill Station"), og +-- finder den ingen, OPRETTER den en ny markør med stationens navn (2 ekstra "Buying Station Multifruit", in-game 30/9). +-- Alle læsse-/købsstationer med deres påfyldningstriggeres positioner (lager + købestationer). +local function allLoadStations() + local list = {} + local seen = {} + pcall(function() + for _, station in pairs(g_currentMission.storageSystem:getLoadingStations()) do + if not seen[station] then seen[station] = true; table.insert(list, station) end + end + end) + pcall(function() + for _, placeable in pairs(g_currentMission.placeableSystem.placeables) do + local spec = placeable.spec_buyingStation + local station = spec ~= nil and spec.buyingStation or nil + if station ~= nil and not seen[station] then seen[station] = true; table.insert(list, station) end + end + end) + return list +end + +-- Hører markøren til DENNE station? Den station hvis påfyldningstrigger ligger nærmest markøren (over alle stationer). +-- Retningsløst: markør->station-opslaget (bagud fra næsen) koblede hverken "Solid Buy Silo" eller "Liquid Buy Silo" til +-- bulkstationen, så den gamle regel valgte Liquid Buy til frø (in-game 16/10, efter 1.62.250). +-- stationer + triggerpunkter genbruges kort (markerBelongsTo kaldes pr. kandidatmarkør — review: ellers S²·M) +local stationPointsCache = {at = -math.huge, list = nil} +local STATION_POINTS_TTL_MS = 2000 +local function stationPoints() + local t = now() + if stationPointsCache.list == nil or t - stationPointsCache.at > STATION_POINTS_TTL_MS then + local list = {} + for _, candidate in ipairs(allLoadStations()) do table.insert(list, {station = candidate, points = loadTriggerPoints(candidate)}) end + stationPointsCache.list, stationPointsCache.at = list, t + end + return stationPointsCache.list +end + +-- Stationen hvis påfyldningstrigger ligger nærmest markøren (inden for STATION_MATCH_M), eller nil. +local function markerOwner(adEnv, markerId) + local wayPoint = adEnv.ADGraphManager:getWayPointById(markerId) + if wayPoint == nil then return nil end + local best, bestDistance = nil, math.huge + for _, entry in ipairs(stationPoints()) do + for _, point in ipairs(entry.points) do + local d = (point.x - wayPoint.x) ^ 2 + (point.z - wayPoint.z) ^ 2 + if d < bestDistance then best, bestDistance = entry.station, d end + end + end + if best == nil or bestDistance > ADFieldWork.STATION_MATCH_M * ADFieldWork.STATION_MATCH_M then return nil end + return best +end + +local function sameStation(a, station, placeable) + return a ~= nil and (a == station or (placeable ~= nil and a.owningPlaceable == placeable)) +end + +local function markerBelongsTo(adEnv, farmId, markerId, station, placeable) + return sameStation(markerOwner(adEnv, markerId), station, placeable) +end + +-- Hører markøren til en ANDEN station? (trin 3/4 må ikke låne nabostationens markør — in-game 16/10: gårdens lager +-- "Farma 500 + Obi 1000" fik "Liquid Buy Silo", og sprederne holdt dér uden at blive fyldt) +local function markerOfOther(adEnv, markerId, station, placeable) + local owner = markerOwner(adEnv, markerId) + return owner ~= nil and not sameStation(owner, station, placeable) +end + +local function markerAtStationRaw(adEnv, vehicle, station, placeable) + local farmId = vehicle ~= nil and ADSmartPickup ~= nil and ADSmartPickup.getFarmId ~= nil and ADSmartPickup.getFarmId(vehicle) or nil + -- 1) markør ved stationens egne triggere, der hører til stationen. Uden filteret vandt en markør, hvis vej kører + -- GENNEM triggeren videre til nabostationen (in-game 16/10: frø fra "Bulk Fill Station" ved "Liquid Buy Silo") + local points = nil + local okOwn, ownId = pcall(function() + points = loadTriggerPoints(station) + local list = {} + for _, entry in ipairs(markerList(adEnv, points, ADFieldWork.STATION_MARKER_M)) do + if not isServiceMarker(entry) and markerBelongsTo(adEnv, farmId, entry.id, station, placeable) then table.insert(list, entry) end + end + return ADFieldWork.nearestStationMarker(list, points, ADFieldWork.STATION_MARKER_M) + end) + if okOwn and ownId ~= nil then return ownId, 1 end + local node = placeable ~= nil and placeable.rootNode or nil + local px, pz + if node ~= nil then + local x, _, z = getWorldTranslation(node); px, pz = x, z + end + -- 2) samme filter i større radius (STATION_MATCH_M) om triggerne, rangeret som trin 1 (gennemkørsel, afstand til + -- triggeren); uden kendte triggere: afstand til bygningen + local okMatch, matchId = pcall(function() + local around = (points ~= nil and #points > 0) and points or (px ~= nil and {{x = px, z = pz}} or nil) + if around == nil then return nil end + local list = {} + for _, entry in ipairs(markerList(adEnv, around, ADFieldWork.STATION_MATCH_M)) do + local near = false + for _, point in ipairs(around) do + if (entry.x - point.x) ^ 2 + (entry.z - point.z) ^ 2 <= ADFieldWork.STATION_MATCH_M ^ 2 then near = true break end + end + if near and not isServiceMarker(entry) and markerBelongsTo(adEnv, farmId, entry.id, station, placeable) then table.insert(list, entry) end + end + return ADFieldWork.nearestStationMarker(list, around, ADFieldWork.STATION_MATCH_M) + end) + if okMatch and matchId ~= nil then return matchId, 2 end + -- 3) som før: markør ved triggerne (også gennemkørsel), ellers nærmeste ikke-Wait markør inden for 40 m af bygningen + local okAny, anyId = pcall(function() + local pts = points or loadTriggerPoints(station) + local list = {} + for _, entry in ipairs(markerList(adEnv, pts, ADFieldWork.STATION_MARKER_M)) do + if not markerOfOther(adEnv, entry.id, station, placeable) then table.insert(list, entry) end + end + return ADFieldWork.nearestStationMarker(list, pts, ADFieldWork.STATION_MARKER_M) + end) + if okAny and anyId ~= nil then return anyId, 3 end + if px == nil then return nil end + local best, bestDistance = nil, 40 * 40 + for _, marker in pairs(adEnv.ADGraphManager:getMapMarkers()) do + local isWait = ADSupplyPlanner ~= nil and ADSupplyPlanner.isWaitMarker ~= nil and ADSupplyPlanner.isWaitMarker(marker) + local wayPoint = not isWait and adEnv.ADGraphManager:getWayPointById(marker.id) or nil + if wayPoint ~= nil then + local d = (wayPoint.x - px) ^ 2 + (wayPoint.z - pz) ^ 2 + if d < bestDistance and not markerOfOther(adEnv, marker.id, station, placeable) then best, bestDistance = marker.id, d end + end + end + return best, 4 +end + +-- Til loggen: valgt markør pr. station (kun når valget ændrer sig) — trin 1 = ved triggeren og hører til stationen, +-- 2 = hører til stationen (80 m), 3 = gammel regel ved triggeren, 4 = nærmest bygningen. +local loggedStationMarker = {} +local function markerAtStation(adEnv, vehicle, station, placeable) + local id, step = markerAtStationRaw(adEnv, vehicle, station, placeable) + pcall(function() + local key = placeable or station + if key ~= nil and loggedStationMarker[key] ~= tostring(id) then + loggedStationMarker[key] = tostring(id) + local marker = id ~= nil and adEnv.ADGraphManager:getMapMarkerByWayPointId(id) or nil + local name = placeable ~= nil and placeable.getName ~= nil and placeable:getName() or "?" + Logging.info("ADSmartPickup: påfyldning: station '%s' -> markør '%s' (trin %s)", tostring(name), + tostring(marker ~= nil and marker.name or id), tostring(step)) + end + end) + return id +end + +-- Nærmeste påfyldning af varen med AD-markør og vej: lagre/siloer med varen, og købestationer (købes +-- efter behov — ingen lagerbeholdning, så de fandtes ikke før; in-game 26/9 "Liquid Buy Station"). +-- skipRoute: rutetjekket springes over (frakoblet puljeredskab har ingen .ad, så AD's getPathTo fejler; traktoren +-- tjekkes igen i refillPlan efter påkobling). +-- exclude (valgfri): {[wayPointId] = true} der springes over (fx et lager der er løbet tørt, mens vognen ventede) +ADFieldWork.MIN_REFILL_STOCK_L = 500 -- eget lager skal have mindst så meget af varen for at være påfyldningssted +function ADFieldWork.findRefillMarker(adEnv, vehicle, fillType, x, z, skipRoute, exclude) + local farmId = vehicle:getOwnerFarmId() + local best, bestDistance = nil, math.huge + local function consider(wayPointId) + if exclude ~= nil and wayPointId ~= nil and exclude[wayPointId] then return end + local wayPoint = wayPointId ~= nil and wayPointId > 0 and adEnv.ADGraphManager:getWayPointById(wayPointId) or nil + if wayPoint == nil then return end + local distance = (wayPoint.x - x) ^ 2 + (wayPoint.z - z) ^ 2 + if distance < bestDistance and (skipRoute or ADUnloadWait.hasRouteTo(adEnv, vehicle, wayPointId)) then + best, bestDistance = wayPointId, distance + end + end + -- gårdens egne lagre først (stalde/tanke med gylle, lager med gødning): købes kun når intet eget findes + -- (in-game 26/9: 7 mio. l gylle ved BGA'en, men påfyldningen ville købe ved købestationen) + pcall(function() + for _, station in pairs(g_currentMission.storageSystem:getLoadingStations()) do + local supported = station.getAISupportedFillTypes ~= nil and station:getAISupportedFillTypes() or {} + local isShop = station.owningPlaceable ~= nil and station.owningPlaceable.spec_buyingStation ~= nil + if not isShop and g_currentMission.accessHandler:canFarmAccess(farmId, station) and supported[fillType] + and (station:getFillLevel(fillType, farmId) or 0) >= ADFieldWork.MIN_REFILL_STOCK_L then + consider(markerAtStation(adEnv, vehicle, station, station.owningPlaceable)) + end + end + end) + if best ~= nil then return best end + pcall(function() + for _, placeable in pairs(g_currentMission.placeableSystem.placeables) do + local spec = placeable.spec_buyingStation + local station = spec ~= nil and spec.buyingStation or nil + if station ~= nil and ADFieldWork.buyingSupports(station, fillType) then + consider(markerAtStation(adEnv, vehicle, station, placeable)) + end + end + end) + return best +end + +-- Påfyldningsstedet er løbet tørt, mens vognen venter der (in-game 16/10: kalk-sprederen holdt ved "TMR Silo Farma", +-- der var tom): find næste sted uden det nuværende, og kør derhen. -> true når turen er flyttet. +function ADFieldWork.retargetEmptyRefill(adEnv, vehicle) + local module = vehicle.ad ~= nil and vehicle.ad.stateModule or nil + if module == nil or not module:isActive() or module:getMode() ~= adEnv.AutoDrive.MODE_LOAD then return false end + local first, second = module:getFirstMarker(), module:getSecondMarker() + local fillType = module.getFillType ~= nil and module:getFillType() or nil + if first == nil or second == nil or fillType == nil then return false end + -- kun når stedet BEVISELIGT ikke kan levere (review): eget lager under minimum, eller købestation der ikke sælger + -- varen. Kø ved stationen, langsom pumpe eller fuld tank flytter den ikke. + local station = markerOwner(adEnv, second.id) + if station ~= nil then + local shop = station.owningPlaceable ~= nil and station.owningPlaceable.spec_buyingStation ~= nil + if shop then + if ADFieldWork.buyingSupports(station, fillType) then return false end + else + local farmId = vehicle:getOwnerFarmId() + local okLevel, stock = pcall(station.getFillLevel, station, fillType, farmId) + if okLevel and (stock or 0) >= ADFieldWork.MIN_REFILL_STOCK_L then return false end + end + end + local x, z = vehiclePosition(vehicle) + local right = ADFieldWork.findRefillMarker(adEnv, vehicle, fillType, x, z, true, {[second.id] = true}) + if right == nil then return false end + startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_LOAD, first.id, right, fillType) + local marker = adEnv.ADGraphManager:getMapMarkerByWayPointId(right) + local name = g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeNameByIndex(fillType) or tostring(fillType) + Logging.info("ADSmartPickup: påfyldning: '%s' fik intet %s ved %s — kører til %s", tostring(ADRuns.vehicleLabel(vehicle)), + tostring(name), tostring(second.name), tostring(marker ~= nil and marker.name or right)) + return true +end + +-- Genoptaget AD-tur i påfyldnings-tilstand (LOAD): påfyldningsstedet blev valgt før gem — måske af en ældre version +-- (in-game 16/10: kalk og gødning ved "Liquid Buy Silo", som ikke sælger dem; sprederne holdt der). Find det rigtige +-- sted for varen nu, og genstart turen dertil, hvis det er et andet. +function ADFieldWork.fixResumedRefill(adEnv, vehicle, fieldId) + local module = vehicle.ad ~= nil and vehicle.ad.stateModule or nil + if module == nil or not module:isActive() or module:getMode() ~= adEnv.AutoDrive.MODE_LOAD then return false end + local first, second = module:getFirstMarker(), module:getSecondMarker() + local fillType = module.getFillType ~= nil and module:getFillType() or nil + if first == nil or second == nil or fillType == nil then return false end + -- allerede fyldt: turen ud til marken er i gang — rør den ikke + if ADCpBridge ~= nil and ADCpBridge.getRefillLevel ~= nil and (ADCpBridge.getRefillLevel(vehicle, fillType) or 0) > 0 then return false end + -- det gemte sted har varen (sælger den / lager med varen): spillerens eller et gyldigt valg — behold det (review) + local farmId = ADSmartPickup.getFarmId(vehicle) + local saved = ADSmartPickup.getLoadStationAtWayPointId(adEnv, second.id, farmId) + if saved ~= nil then + local shop = saved.owningPlaceable ~= nil and saved.owningPlaceable.spec_buyingStation ~= nil + and saved.owningPlaceable.spec_buyingStation.buyingStation or nil + if shop ~= nil and ADFieldWork.buyingSupports(shop, fillType) then return false end + if shop == nil and saved.getFillLevel ~= nil and (saved:getFillLevel(fillType, farmId) or 0) > 0 then return false end + end + local x, z = vehiclePosition(vehicle) + -- uden rutetjek: det kører ved indlæsning (AD finder selv vejen; undgå hak) + local right = ADFieldWork.findRefillMarker(adEnv, vehicle, fillType, x, z, true) + if right == nil or right == second.id then return false end + startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_LOAD, first.id, right, fillType) + local marker = adEnv.ADGraphManager:getMapMarkerByWayPointId(right) + local name = g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeNameByIndex(fillType) or tostring(fillType) + log(fieldId, "'%s': påfyldning af %s flyttet fra %s til %s (genoptaget tur)", ADRuns.vehicleLabel(vehicle), tostring(name), + tostring(second.name), tostring(marker ~= nil and marker.name or right)) + return true +end + +-- Kun købestationer der sælger varen (dyrefoder som sidste udvej, 8/10). -> waypoint-id | nil +-- -> waypoint-id | nil, diagnose {stations, withMarker, withRoute} (hvorfor intet købes — til loggen) +function ADFieldWork.findBuyMarker(adEnv, vehicle, fillType, x, z, skipRoute) + local best, bestDistance = nil, math.huge + local info = {stations = 0, withMarker = 0, withRoute = 0} + local ok, err = pcall(function() + for _, placeable in pairs(g_currentMission.placeableSystem.placeables) do + local spec = placeable.spec_buyingStation + local station = spec ~= nil and spec.buyingStation or nil + if station ~= nil and ADFieldWork.buyingSupports(station, fillType) then + info.stations = info.stations + 1 + local wayPointId = markerAtStation(adEnv, vehicle, station, placeable) + local wayPoint = wayPointId ~= nil and wayPointId > 0 and adEnv.ADGraphManager:getWayPointById(wayPointId) or nil + if wayPoint ~= nil then + info.withMarker = info.withMarker + 1 + local distance = (wayPoint.x - x) ^ 2 + (wayPoint.z - z) ^ 2 + local routed = skipRoute or ADUnloadWait.hasRouteTo(adEnv, vehicle, wayPointId) + if routed then info.withRoute = info.withRoute + 1 end + if distance < bestDistance and routed then + best, bestDistance = wayPointId, distance + end + end + end + end + end) + if not ok then info.error = tostring(err) end + return best, info +end diff --git a/FS25_ADSmartPickup/adFieldSilos.lua b/FS25_ADSmartPickup/adFieldSilos.lua index 6c4a7d9..fc2baad 100644 --- a/FS25_ADSmartPickup/adFieldSilos.lua +++ b/FS25_ADSmartPickup/adFieldSilos.lua @@ -706,11 +706,7 @@ end -- ---- gem / indlæs (samme sti-opslag som runs) ---- -local function getPath() - local path = ADRunsStorage ~= nil and ADRunsStorage.getPath() or nil - if path == nil then return nil end - return (path:gsub(ADRunsStorage.FILE_NAME .. "$", ADFieldSilos.FILE_NAME)) -end +local function getPath() return ADUtil.savePath(ADFieldSilos.FILE_NAME) end function ADFieldSilos.save() local path = getPath() diff --git a/FS25_ADSmartPickup/adFieldStore.lua b/FS25_ADSmartPickup/adFieldStore.lua new file mode 100644 index 0000000..20805bf --- /dev/null +++ b/FS25_ADSmartPickup/adFieldStore.lua @@ -0,0 +1,203 @@ +-- AD Field Store +-- Markarbejdets lager og salg (udskilt fra adFieldWork.lua 17/10-2026): hvor markens høst/skår køres hen — +-- gæringssiloer, siloer, kontraktens salgssted eller bedst betalende salgssted — og ballesamlerens mål. +-- Funktionerne ligger på ADFieldWork, så kaldere og tests er uændrede. Indlæses efter adFieldWork.lua. + +local function log(...) ADFieldJobs.log(...) end + + +-- Gårdens gæringssiloer for markens skår, nærmest marken først (produktioner skår -> SILAGE). +function ADFieldWork.getFermenters(adEnv, farmId, windrowFillType, x, z) + local silage = g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeIndexByName("SILAGE") or nil + local result = {} + for _, building in ipairs(ADBuildings.list(adEnv, farmId)) do + local spec = building.kind == "factory" and building.placeable ~= nil and building.placeable.spec_productionPoint or nil + local point = spec ~= nil and spec.productionPoint or nil + if point ~= nil and ADFieldModel.isFermenter(point.productions, windrowFillType, silage) then + local bx, _, bz = getWorldTranslation(building.placeable.rootNode) + table.insert(result, {building = building, distance = (bx - (x or bx)) ^ 2 + (bz - (z or bz)) ^ 2}) + end + end + table.sort(result, function(a, b) return a.distance < b.distance end) + local buildings = {} + for _, entry in ipairs(result) do table.insert(buildings, entry.building) end + return buildings +end + +local function unloadMarkerIds(buildings) + local markerIds = {} + for _, building in ipairs(buildings) do + for _, marker in ipairs(ADBuildings.getMarkers(building, "unload") or {}) do + table.insert(markerIds, marker.id) + end + end + return markerIds +end + +-- Hvilken vare markens trin fører til lager: skår (ensilage), tørskår (hø) eller høstet afgrøde. +function ADFieldWork.storeFillType(field, info) + if field.stage == "harvesting" then return info.harvestFillType end + if field.stage == "baleCollecting" and ADFieldModel.isBaleHarvest(field.lastFruit) then + return g_fillTypeManager:getFillTypeIndexByName(string.upper(field.lastFruit)) + end + if field.stage == "strawCollecting" or field.stage == "baling" or field.stage == "baleCollecting" then + return g_fillTypeManager:getFillTypeIndexByName("STRAW") + end + local product = ADFieldModel.product(field.plan, field.kind or info.kind) + return product == "hay" and info.hay or info.windrow +end + +-- Tvunget lager -> de valgte; ensilage -> gæringssiloer før almindelige siloer (in-game 25/9: græs endte +-- i en Farma-silo); hø og høst -> kun siloer (gæringssiloer laver også hø om til ensilage). +local saleLogged = {} -- fieldId -> salgsmarkør der sidst blev logget (log kun ved skift) + +function ADFieldWork.chooseStore(adEnv, field, info, vehicle, fillType) + local isReachable = function(markerId) return ADUnloadWait.hasRouteTo(adEnv, vehicle, markerId) end + local farmId = vehicle:getOwnerFarmId() + -- høstkontrakt: læssene skal til kontraktens salgssted (ADContracts), aldrig gårdens lager + if field.contract and field.contractSellIds ~= nil then + if #field.contractSellIds == 0 then return nil, "kontraktens salgssted har ingen AutoDrive-markør" end + return ADLoadSwap.findForcedDumpMarker(adEnv, vehicle, fillType, 1, field.contractSellIds, isReachable) + end + if #field.plan.storeBuildingIds > 0 then + local buildings = {} + for _, buildingId in ipairs(field.plan.storeBuildingIds) do + local building = ADBuildings.find(adEnv, farmId, buildingId) + if building ~= nil then table.insert(buildings, building) end + end + return ADLoadSwap.findForcedDumpMarker(adEnv, vehicle, fillType, 1, unloadMarkerIds(buildings), isReachable) + end + local product = ADFieldModel.product(field.plan, field.kind or info.kind) + if field.stage == "collecting" and product == "silage" then + local fermenters = ADFieldWork.getFermenters(adEnv, farmId, fillType, info.x, info.z) + if #fermenters > 0 then + local store, why = ADLoadSwap.findForcedDumpMarker(adEnv, vehicle, fillType, 1, unloadMarkerIds(fermenters), isReachable) + if store ~= nil then return store end + log(field.id, "ingen gæringssilo kan tage græsset (%s) — bruger almindelig silo", tostring(why)) + end + end + local store, why = ADLoadSwap.findDumpMarker(adEnv, vehicle, fillType, 1, info.markerId, isReachable, nil, nil, false) + if store ~= nil then return store end + -- intet lager tager afgrøden: sælg den ved det bedst betalende salgssted med AD-markør og vej (in-game 16/10: + -- sukkerroer fra F36 — gården har intet roelager, og tømmevognene blev sluppet igen og igen) + -- kun når INTET lager tager varen — en fuld eller utilgængelig silo betyder vent, ikke sælg (review 16/10) + local okAny, anyStore = pcall(ADLoadSwap.anyStoreAccepts, adEnv, vehicle, fillType, info.markerId) + if okAny and anyStore then return nil, why end + local sale, price = ADFieldWork.findSaleMarker(adEnv, vehicle, fillType, info.markerId) + if sale ~= nil then + if saleLogged[field.id] ~= sale.id then + saleLogged[field.id] = sale.id + local name = g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeNameByIndex(fillType) or tostring(fillType) + log(field.id, "intet lager tager %s — høsten sælges ved %s (%.0f kr/1000 l)", tostring(name), tostring(sale.name), (price or 0) * 1000) + end + return sale + end + return nil, why +end + +-- Ren: salgstilbud {price, wayPointId, name, routed} -> det bedst betalende der kan nås (nil hvis intet). +function ADFieldWork.pickSaleQuote(quotes) + local best = nil + for _, quote in ipairs(quotes or {}) do + if quote.routed and (best == nil or quote.price > best.price or (quote.price == best.price and quote.wayPointId < best.wayPointId)) then + best = quote + end + end + return best +end + +-- Salgssted for høst uden lager: alle salgsmarkører (som udkørselsflowene: ikke spærrede, ikke P/Connect/Wait) hvis +-- station tager varen; højeste pris med vej fra marken og tilbage. -> AD-markør, pris pr. liter | nil +-- stationOk(station) (valgfri): ekstra krav til stationen (baller: ballestation, ADFieldWork.stationTakesBales) +function ADFieldWork.findSaleMarker(adEnv, vehicle, fillType, fieldMarkerId, stationOk) + if fillType == nil or ADSources == nil or ADSources.getSellMarkers == nil or ADPrices == nil then return nil end + local farmId = vehicle:getOwnerFarmId() + local quotes = {} + for _, entry in ipairs(ADSources.getSellMarkers(adEnv, farmId) or {}) do + if ADSources.stationAccepts(entry.station, fillType) and (stationOk == nil or stationOk(entry.station)) then + local quote = ADPrices.getQuote(entry.station, fillType) + if quote ~= nil and quote.price > 0 then + table.insert(quotes, {price = quote.price, wayPointId = entry.marker.id, name = entry.marker.name, routed = false}) + end + end + end + -- rutetjek kun for de bedste (dyrt): højeste pris først, stop ved første der kan nås + table.sort(quotes, function(a, b) + if a.price ~= b.price then return a.price > b.price end + return a.wayPointId < b.wayPointId + end) + for _, quote in ipairs(quotes) do + local ok, routed = pcall(function() + if fieldMarkerId ~= nil then return ADWaitPool.hasRouteBothWays(adEnv, vehicle, quote.wayPointId, fieldMarkerId) end + return ADUnloadWait.hasRouteTo(adEnv, vehicle, quote.wayPointId) + end) + quote.routed = ok and routed == true + if quote.routed then break end + end + local best = ADFieldWork.pickSaleQuote(quotes) + if best == nil then return nil end + return adEnv.ADGraphManager:getMapMarkerByWayPointId(best.wayPointId), best.price +end + +-- Plads der skal være i fabrikken til et ballelæs (et bomuldsmodul er flere tusinde liter; 1 l sendte vognen til en +-- fuld fabrik — review 16/10) +ADFieldWork.BALE_MIN_FREE_L = 20000 + +-- Tager stationen baller af varen? Spillets egen regel (UnloadingStation: "does not have a BaleUnloadTrigger"): en +-- BaleUnloadTrigger for varen, eller en almindelig UnloadTrigger uden exactFillRootNode. In-game 16/10: bomulds- +-- modulerne blev sendt til TMR Silo Farma (silo der tager COTTON løst, men ingen ballestation). +function ADFieldWork.stationTakesBales(station, fillType) + if station == nil or fillType == nil then return false end + for _, trigger in pairs(station.unloadTriggers or {}) do + if trigger.fillTypes ~= nil and trigger.fillTypes[fillType] ~= nil then + local class = ClassUtil ~= nil and ClassUtil.getClassObjectByObject(trigger) or nil + if BaleUnloadTrigger ~= nil and class == BaleUnloadTrigger then return true end + if UnloadTrigger ~= nil and class == UnloadTrigger and trigger.exactFillRootNode == nil then return true end + end + end + return false +end + +-- Som ADLoadSwap.findDumpMarker (silo eller egen fabrik der bruger varen), men kun stationer med ballestation til +-- varen: stationer uden springes over, og der søges igen (højst MAX_BALE_TRIES gange). +ADFieldWork.MAX_BALE_TRIES = 20 +function ADFieldWork.findBaleDumpMarker(adEnv, vehicle, fillType, rest, homeMarkerId, isReachable, farmId) + local excluded = {} + for _ = 1, ADFieldWork.MAX_BALE_TRIES do + local marker = ADLoadSwap.findDumpMarker(adEnv, vehicle, fillType, rest, homeMarkerId, isReachable, excluded, nil, true) + if marker == nil then return nil end + -- samme gård som findDumpMarker selv slår op med (review: getUnloadStationAtWayPointId caches pr. gård) + local station = ADSmartPickup.getUnloadStationAtWayPointId(adEnv, marker.id, ADSmartPickup.getFarmId(vehicle)) + if station == nil then return nil end + if ADFieldWork.stationTakesBales(station, fillType) then return marker end + -- findDumpMarker udelukker på owningPlaceable; uden en kan stationen ikke springes over + if station.owningPlaceable == nil then return nil end + excluded[station.owningPlaceable] = true + end + return nil +end + +-- Mål for ballesamlerens læs -> {wayPointId, name} | nil. Halm: balle-/palleskur (som før). Bomuldsmoduler +-- (brugerønske 16/10): egen fabrik der bruger dem (spinderiet), ellers skur, ellers salgssted der køber dem. +function ADFieldWork.chooseBaleStore(adEnv, field, info, vehicle, fillType, isReachable, farmId) + if not ADFieldModel.isBaleHarvest(field.lastFruit) then + return ADSources.findPalletStore(adEnv, vehicle, fillType, nil, isReachable, farmId) + end + local takesBales = function(station) return ADFieldWork.stationTakesBales(station, fillType) end + local okFactory, factory = pcall(ADFieldWork.findBaleDumpMarker, adEnv, vehicle, fillType, ADFieldWork.BALE_MIN_FREE_L, + info.markerId, isReachable, farmId) + if not okFactory then log(field.id, "ballemål: fabriksopslag fejlede: %s", tostring(factory)) end + if okFactory and factory ~= nil then return {wayPointId = factory.id, name = factory.name} end + local shed = ADSources.findPalletStore(adEnv, vehicle, fillType, nil, isReachable, farmId) + if shed ~= nil then return shed end + -- en fabrik der bruger varen, men er fuld lige nu: vent, sælg ikke (som chooseStore, review 16/10) + local okAny, anyFactory = pcall(ADFieldWork.findBaleDumpMarker, adEnv, vehicle, fillType, 0, info.markerId, isReachable, farmId) + if okAny and anyFactory ~= nil then + log(field.id, "ballemål: %s har ikke plads lige nu — modulerne venter", tostring(anyFactory.name)) + return nil + end + local okSale, sale = pcall(ADFieldWork.findSaleMarker, adEnv, vehicle, fillType, info.markerId, takesBales) + if not okSale then log(field.id, "ballemål: salgsopslag fejlede: %s", tostring(sale)) end + if okSale and sale ~= nil then return {wayPointId = sale.id, name = sale.name} end + return nil +end diff --git a/FS25_ADSmartPickup/adFieldWork.lua b/FS25_ADSmartPickup/adFieldWork.lua index 1f480cf..4674bc7 100644 --- a/FS25_ADSmartPickup/adFieldWork.lua +++ b/FS25_ADSmartPickup/adFieldWork.lua @@ -27,6 +27,7 @@ ADFieldWork.DRIVE_RETRIES = 2 -- længere fra AD-vejnettet end dette kan AutoDrive ikke finde en rute ("Could not calculate path", in-game 26/9: -- kultivatoren stod 666 m fra nærmeste waypoint); sådan en maskine sendes ikke ud ADFieldWork.MAX_OFF_NETWORK = 60 +ADFieldWork.WIDTH_GUARD_MS = 10000 -- så tit tjekkes at variabel bredde ikke er sprunget tilbage -- flyttede køretøjet sig mindre end dette før AD stoppede, fandt AD ingen rute — ingen genforsøg ADFieldWork.NO_MOVE_DISTANCE = 5 ADFieldWork.REFILL_ROLES = {seeder = true, fertilizer = true, limer = true, weeder = true} @@ -182,7 +183,7 @@ end -- fillType (valgfri, LOAD): varen AutoDrive skal læsse — uden den kører AD til påfyldningen og hjem tom -- (in-game 26/9: sprøjten kom tom tilbage fra Buying Station Multifruit) -local function startAd(adEnv, vehicle, mode, firstId, secondId, fillType) +function ADFieldWork.startAd(adEnv, vehicle, mode, firstId, secondId, fillType) local module = stateModule(vehicle) stopAd(vehicle) module:setMode(mode) @@ -209,6 +210,7 @@ local function startAd(adEnv, vehicle, mode, firstId, secondId, fillType) end wake(vehicle, true) end +local startAd = ADFieldWork.startAd ADFieldWork.startAd = startAd ADFieldWork.enableParkAtJobFinished = enableParkAtJobFinished @@ -262,10 +264,11 @@ local function restLoad(adEnv, vehicle) return ok and tonumber(level) or 0 end -local function vehiclePosition(vehicle) +function ADFieldWork.vehiclePosition(vehicle) local x, _, z = getWorldTranslation(vehicle.rootNode) return x, z end +local vehiclePosition = ADFieldWork.vehiclePosition local function isControlledByPlayer(vehicle) return (vehicle.getIsControlled ~= nil and vehicle:getIsControlled()) or false @@ -356,141 +359,6 @@ function ADFieldWork.getRigs(adEnv) return rigs end --- ---- lager ---- - --- Gårdens gæringssiloer for markens skår, nærmest marken først (produktioner skår -> SILAGE). -function ADFieldWork.getFermenters(adEnv, farmId, windrowFillType, x, z) - local silage = g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeIndexByName("SILAGE") or nil - local result = {} - for _, building in ipairs(ADBuildings.list(adEnv, farmId)) do - local spec = building.kind == "factory" and building.placeable ~= nil and building.placeable.spec_productionPoint or nil - local point = spec ~= nil and spec.productionPoint or nil - if point ~= nil and ADFieldModel.isFermenter(point.productions, windrowFillType, silage) then - local bx, _, bz = getWorldTranslation(building.placeable.rootNode) - table.insert(result, {building = building, distance = (bx - (x or bx)) ^ 2 + (bz - (z or bz)) ^ 2}) - end - end - table.sort(result, function(a, b) return a.distance < b.distance end) - local buildings = {} - for _, entry in ipairs(result) do table.insert(buildings, entry.building) end - return buildings -end - -local function unloadMarkerIds(buildings) - local markerIds = {} - for _, building in ipairs(buildings) do - for _, marker in ipairs(ADBuildings.getMarkers(building, "unload") or {}) do - table.insert(markerIds, marker.id) - end - end - return markerIds -end - --- Hvilken vare markens trin fører til lager: skår (ensilage), tørskår (hø) eller høstet afgrøde. -function ADFieldWork.storeFillType(field, info) - if field.stage == "harvesting" then return info.harvestFillType end - if field.stage == "baleCollecting" and ADFieldModel.isBaleHarvest(field.lastFruit) then - return g_fillTypeManager:getFillTypeIndexByName(string.upper(field.lastFruit)) - end - if field.stage == "strawCollecting" or field.stage == "baling" or field.stage == "baleCollecting" then - return g_fillTypeManager:getFillTypeIndexByName("STRAW") - end - local product = ADFieldModel.product(field.plan, field.kind or info.kind) - return product == "hay" and info.hay or info.windrow -end - --- Tvunget lager -> de valgte; ensilage -> gæringssiloer før almindelige siloer (in-game 25/9: græs endte --- i en Farma-silo); hø og høst -> kun siloer (gæringssiloer laver også hø om til ensilage). -local saleLogged = {} -- fieldId -> salgsmarkør der sidst blev logget (log kun ved skift) - -function ADFieldWork.chooseStore(adEnv, field, info, vehicle, fillType) - local isReachable = function(markerId) return ADUnloadWait.hasRouteTo(adEnv, vehicle, markerId) end - local farmId = vehicle:getOwnerFarmId() - -- høstkontrakt: læssene skal til kontraktens salgssted (ADContracts), aldrig gårdens lager - if field.contract and field.contractSellIds ~= nil then - if #field.contractSellIds == 0 then return nil, "kontraktens salgssted har ingen AutoDrive-markør" end - return ADLoadSwap.findForcedDumpMarker(adEnv, vehicle, fillType, 1, field.contractSellIds, isReachable) - end - if #field.plan.storeBuildingIds > 0 then - local buildings = {} - for _, buildingId in ipairs(field.plan.storeBuildingIds) do - local building = ADBuildings.find(adEnv, farmId, buildingId) - if building ~= nil then table.insert(buildings, building) end - end - return ADLoadSwap.findForcedDumpMarker(adEnv, vehicle, fillType, 1, unloadMarkerIds(buildings), isReachable) - end - local product = ADFieldModel.product(field.plan, field.kind or info.kind) - if field.stage == "collecting" and product == "silage" then - local fermenters = ADFieldWork.getFermenters(adEnv, farmId, fillType, info.x, info.z) - if #fermenters > 0 then - local store, why = ADLoadSwap.findForcedDumpMarker(adEnv, vehicle, fillType, 1, unloadMarkerIds(fermenters), isReachable) - if store ~= nil then return store end - log(field.id, "ingen gæringssilo kan tage græsset (%s) — bruger almindelig silo", tostring(why)) - end - end - local store, why = ADLoadSwap.findDumpMarker(adEnv, vehicle, fillType, 1, info.markerId, isReachable, nil, nil, false) - if store ~= nil then return store end - -- intet lager tager afgrøden: sælg den ved det bedst betalende salgssted med AD-markør og vej (in-game 16/10: - -- sukkerroer fra F36 — gården har intet roelager, og tømmevognene blev sluppet igen og igen) - -- kun når INTET lager tager varen — en fuld eller utilgængelig silo betyder vent, ikke sælg (review 16/10) - local okAny, anyStore = pcall(ADLoadSwap.anyStoreAccepts, adEnv, vehicle, fillType, info.markerId) - if okAny and anyStore then return nil, why end - local sale, price = ADFieldWork.findSaleMarker(adEnv, vehicle, fillType, info.markerId) - if sale ~= nil then - if saleLogged[field.id] ~= sale.id then - saleLogged[field.id] = sale.id - local name = g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeNameByIndex(fillType) or tostring(fillType) - log(field.id, "intet lager tager %s — høsten sælges ved %s (%.0f kr/1000 l)", tostring(name), tostring(sale.name), (price or 0) * 1000) - end - return sale - end - return nil, why -end - --- Ren: salgstilbud {price, wayPointId, name, routed} -> det bedst betalende der kan nås (nil hvis intet). -function ADFieldWork.pickSaleQuote(quotes) - local best = nil - for _, quote in ipairs(quotes or {}) do - if quote.routed and (best == nil or quote.price > best.price or (quote.price == best.price and quote.wayPointId < best.wayPointId)) then - best = quote - end - end - return best -end - --- Salgssted for høst uden lager: alle salgsmarkører (som udkørselsflowene: ikke spærrede, ikke P/Connect/Wait) hvis --- station tager varen; højeste pris med vej fra marken og tilbage. -> AD-markør, pris pr. liter | nil --- stationOk(station) (valgfri): ekstra krav til stationen (baller: ballestation, ADFieldWork.stationTakesBales) -function ADFieldWork.findSaleMarker(adEnv, vehicle, fillType, fieldMarkerId, stationOk) - if fillType == nil or ADSources == nil or ADSources.getSellMarkers == nil or ADPrices == nil then return nil end - local farmId = vehicle:getOwnerFarmId() - local quotes = {} - for _, entry in ipairs(ADSources.getSellMarkers(adEnv, farmId) or {}) do - if ADSources.stationAccepts(entry.station, fillType) and (stationOk == nil or stationOk(entry.station)) then - local quote = ADPrices.getQuote(entry.station, fillType) - if quote ~= nil and quote.price > 0 then - table.insert(quotes, {price = quote.price, wayPointId = entry.marker.id, name = entry.marker.name, routed = false}) - end - end - end - -- rutetjek kun for de bedste (dyrt): højeste pris først, stop ved første der kan nås - table.sort(quotes, function(a, b) - if a.price ~= b.price then return a.price > b.price end - return a.wayPointId < b.wayPointId - end) - for _, quote in ipairs(quotes) do - local ok, routed = pcall(function() - if fieldMarkerId ~= nil then return ADWaitPool.hasRouteBothWays(adEnv, vehicle, quote.wayPointId, fieldMarkerId) end - return ADUnloadWait.hasRouteTo(adEnv, vehicle, quote.wayPointId) - end) - quote.routed = ok and routed == true - if quote.routed then break end - end - local best = ADFieldWork.pickSaleQuote(quotes) - if best == nil then return nil end - return adEnv.ADGraphManager:getMapMarkerByWayPointId(best.wayPointId), best.price -end - -- ---- kurser ---- local function coursesOf(fieldId) @@ -732,9 +600,7 @@ end ADFieldWork.REFILL_ROLES = {seeder = true, fertilizer = true, limer = true, weeder = true} -local function fillTypeName(fillType) - return g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeNameByIndex(fillType) or tostring(fillType) -end +local fillTypeName = ADUtil.fillTypeName -- Før udsendelse: forkert vare af (kalk på, skal gøde), og er sættet tomt, findes påfyldningen. -- Returnerer {fillType, empty, refillId} eller nil (sættet bruger intet fyld: strigle, plov ...). @@ -865,19 +731,9 @@ function ADFieldWork.dispatchPool(adEnv, field, info, role, roleAccept, decision return true end -function ADFieldWork.dispatch(adEnv, field, info, decision) - local role = decision.role - -- marken har afgrøde, men ingen markjord i kortet: Courseplay finder ikke markgrænsen ("Field detection failed", - -- in-game 10/10 Flat Acres 4X F2) — spilleren må høste/bearbejde den selv - if info ~= nil and info.cropOnly then - fail(field.id, "kortet har ingen markjord her — Courseplay kan ikke finde markgrænsen; høst/bearbejd marken selv") - return - end - local ok, reason = preflight(field, role) - if not ok then - note(field.id, {retryAt = now() + ADFieldModel.RETRY_MS, reason = reason}) - return - end +-- Hvilke maskiner må overvejes til rollen: faste maskiner efter markens plan, lånt kontraktudstyr efter reglerne. +-- -> kandidater | nil når sagen allerede er givet videre (spilleren bedes koble det lånte redskab på) +local function dispatchCandidates(adEnv, field, info, role) -- faste maskiner: andre markers faste bruges ikke; har marken selv faste med rollen, kun dem local rigIdsByField = {} for fieldId, other in pairs(ADFieldJobs.state.fields) do rigIdsByField[fieldId] = other.plan ~= nil and other.plan.rigIds or nil end @@ -899,15 +755,17 @@ function ADFieldWork.dispatch(adEnv, field, info, decision) -- intet lånt sæt samlet, men det lånte redskab står løst: bed spilleren koble det på (frem for gårdens eget) if leasedFirst == candidates and ADPlayerTransport ~= nil and ADPlayerTransport.dispatchLeasedImplement(adEnv, field, info, role, ADFieldModel.requiredWidth(field, role), acceptFor(field, info, role)) then - return + return nil end candidates = leasedFirst end - local required = ADFieldModel.requiredWidth(field, role) - local roleAccept = acceptFor(field, info, role) - -- kun maskiner AutoDrive kan køre fra: tæt på vejnettet - local offNetwork = {} - local accept = function(candidate) + return candidates +end + +-- Kan kandidaten tage opgaven herfra? Rollens krav, tankindhold, skærebordets plads og afstand til AutoDrive-vejnettet. +-- Maskiner for langt fra vejnettet noteres i offNetwork (til forklaringen, når ingen kan). +local function dispatchAccept(adEnv, field, info, role, decision, roleAccept, offNetwork) + return function(candidate) if roleAccept ~= nil and not roleAccept(candidate) then return false end -- høster med noget i tanken: kun en mark med samme afgrøde (ellers blandes den i tanken) if role == "harvester" and candidate.tankFillType ~= nil and info.harvestFillType ~= nil @@ -944,73 +802,202 @@ function ADFieldWork.dispatch(adEnv, field, info, decision) end return true end - local rigs, why, args +end + +-- Flådens valg: ét sæt, eller flere til multi-tool. -> {rig...} | nil, why, args +local function pickRigs(candidates, role, decision, info, required, accept) if (decision.count or 1) > 1 then - rigs, why, args = ADFieldFleet.pickMany(candidates, role, decision.count, info.x, info.z, required, accept) - else - local rig - rig, why, args = ADFieldFleet.pick(candidates, role, info.x, info.z, required, accept) - rigs = rig ~= nil and {rig} or nil + return ADFieldFleet.pickMany(candidates, role, decision.count, info.x, info.z, required, accept) end - if rigs == nil then - -- ingen færdig kombination: en ledig solo-traktor henter et puljeredskab (kun hovedopgaver, ikke tømmevogne) - -- marken har egne faste maskiner til rollen: den venter på dem (som uden puljen) - local ownIds, hasOwnForRole = {}, false - for _, id in ipairs(field.plan ~= nil and field.plan.rigIds or {}) do ownIds[id] = true end - for _, candidate in ipairs(candidates) do - if ownIds[candidate.id] and (candidate.role == role or (candidate.roles ~= nil and candidate.roles[role])) then hasOwnForRole = true end - end - if ADPool ~= nil and info.markerId ~= nil and ADPool.mayUsePool(decision, hasOwnForRole) - and (why == "noRig" or why == "allBusy" or why == "cannotDo") then - local pooled, poolWhy, poolArgs = ADFieldWork.dispatchPool(adEnv, field, info, role, roleAccept, decision) - if pooled then return end - if poolWhy == "tooWeak" then - note(field.id, {reason = {text = string.format("ingen ledig traktor med ≥%.0f hk til '%s'", - (poolArgs or {})[1] or 0, tostring((poolArgs or {})[2] or role))}, retryAt = ADPool.alignedRetry(now(), ADFieldWork.NO_RIG_RETRY_MS)}) - return - end - if poolWhy == "noPoolTractor" and why ~= "allBusy" then - why, args = poolWhy, poolArgs - elseif poolWhy == "poolBusy" then - -- puljeredskabet hentes til en anden mark: kø (gul), ikke "ingen maskine" (rød) - 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 - -- ingen stenplukker på gården overhovedet: stenene springes over, så såningen ikke går i stå - if role == "stonePicker" and why == "noRig" then - ADFieldJobs.setField(ADFieldModel.advance(field, info.needs)) - log(field.id, "ingen stenplukker på gården — stenplukning springes over") - 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)", - tostring(role), tostring(info.markerName), table.concat(offNetwork, ", "))}, retryAt = ADPool.alignedRetry(now(), ADFieldWork.NO_RIG_RETRY_MS)}) - return - end - note(field.id, {reason = {key = "spu_field_reason_" .. tostring(why), role = role, args = args}, retryAt = ADPool.alignedRetry(now(), ADFieldWork.NO_RIG_RETRY_MS)}) - -- også i loggen (én gang pr. ændring): før stod grunden kun i fanen, og loggen var tavs (in-game 27/9) - local noRigKey = tostring(role) .. ":" .. tostring(why) - if lastNoRig[field.id] ~= noRigKey then - lastNoRig[field.id] = noRigKey - -- hvem har rollen, og hvorfor kan de ikke bruges (in-game 27/9: "allBusy" uden at sige hvem) - local who = {} - for _, candidate in ipairs(candidates) do - if candidate.role == role or (candidate.roles ~= nil and candidate.roles[role]) then - local state = candidate.controlled and "spiller i førersædet" or candidate.busyWhy - or (not candidate.enabled and "ikke i flåden") or (roleAccept ~= nil and not roleAccept(candidate) and "kan ikke (afgrøde/frø)") or "ledig" - table.insert(who, string.format("'%s': %s", tostring(candidate.label), state)) - end - end - log(field.id, "ingen maskine sendt til %s: %s%s", tostring(role), tostring(why), #who > 0 and (" — " .. table.concat(who, "; ")) or "") + local rig, why, args = ADFieldFleet.pick(candidates, role, info.x, info.z, required, accept) + return rig ~= nil and {rig} or nil, why, args +end + +-- Ingen færdig kombination: en ledig solo-traktor henter et puljeredskab (kun hovedopgaver, ikke tømmevogne). +-- Marken med egne faste maskiner til rollen venter på dem (som uden puljen). +-- -> true når sagen er afgjort (sendt, eller grunden noteret); ellers false og evt. justeret why, args +local function tryPool(adEnv, field, info, role, decision, candidates, roleAccept, why, args) + local ownIds, hasOwnForRole = {}, false + for _, id in ipairs(field.plan ~= nil and field.plan.rigIds or {}) do ownIds[id] = true end + for _, candidate in ipairs(candidates) do + if ownIds[candidate.id] and (candidate.role == role or (candidate.roles ~= nil and candidate.roles[role])) then hasOwnForRole = true end + end + if not (ADPool ~= nil and info.markerId ~= nil and ADPool.mayUsePool(decision, hasOwnForRole) + and (why == "noRig" or why == "allBusy" or why == "cannotDo")) then + return false, why, args + end + local pooled, poolWhy, poolArgs = ADFieldWork.dispatchPool(adEnv, field, info, role, roleAccept, decision) + if pooled then return true end + if poolWhy == "tooWeak" then + note(field.id, {reason = {text = string.format("ingen ledig traktor med ≥%.0f hk til '%s'", + (poolArgs or {})[1] or 0, tostring((poolArgs or {})[2] or role))}, retryAt = ADPool.alignedRetry(now(), ADFieldWork.NO_RIG_RETRY_MS)}) + return true + end + if poolWhy == "noPoolTractor" and why ~= "allBusy" then + return false, poolWhy, poolArgs + elseif poolWhy == "poolBusy" then + -- puljeredskabet hentes til en anden mark: kø (gul), ikke "ingen maskine" (rød) + return false, "allBusy", nil + end + return false, why, args +end + +-- Også i loggen (én gang pr. ændring): før stod grunden kun i fanen, og loggen var tavs (in-game 27/9). +-- Hvem har rollen, og hvorfor kan de ikke bruges (in-game 27/9: "allBusy" uden at sige hvem) +local function logNoRig(field, role, why, candidates, roleAccept) + local noRigKey = tostring(role) .. ":" .. tostring(why) + if lastNoRig[field.id] == noRigKey then return end + lastNoRig[field.id] = noRigKey + local who = {} + for _, candidate in ipairs(candidates) do + if candidate.role == role or (candidate.roles ~= nil and candidate.roles[role]) then + local state = candidate.controlled and "spiller i førersædet" or candidate.busyWhy + or (not candidate.enabled and "ikke i flåden") or (roleAccept ~= nil and not roleAccept(candidate) and "kan ikke (afgrøde/frø)") or "ledig" + table.insert(who, string.format("'%s': %s", tostring(candidate.label), state)) end + end + log(field.id, "ingen maskine sendt til %s: %s%s", tostring(role), tostring(why), #who > 0 and (" — " .. table.concat(who, "; ")) or "") +end + +-- Intet sæt kunne vælges: pulje, spillerkørsel, spring sten over — ellers grunden i fanen og loggen. +local function dispatchNoRig(adEnv, field, info, role, decision, candidates, required, roleAccept, why, args, offNetwork) + local handled + handled, why, args = tryPool(adEnv, field, info, role, decision, candidates, roleAccept, why, args) + if handled then return 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 + -- ingen stenplukker på gården overhovedet: stenene springes over, så såningen ikke går i stå + if role == "stonePicker" and why == "noRig" then + ADFieldJobs.setField(ADFieldModel.advance(field, info.needs)) + log(field.id, "ingen stenplukker på gården — stenplukning springes over") + 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)", + tostring(role), tostring(info.markerName), table.concat(offNetwork, ", "))}, retryAt = ADPool.alignedRetry(now(), ADFieldWork.NO_RIG_RETRY_MS)}) + return + end + note(field.id, {reason = {key = "spu_field_reason_" .. tostring(why), role = role, args = args}, retryAt = ADPool.alignedRetry(now(), ADFieldWork.NO_RIG_RETRY_MS)}) + logNoRig(field, role, why, candidates, roleAccept) +end + +-- Mejetærskeren henter sit skærebord på transporthjul (som puljens "fetching": samme fejl- og karantænevej) og +-- monterer det på marken. Er en anden ved at montere ved markens indkørsel, venter den hjemme. +local function launchHeaderFetch(adEnv, field, rig, assignment, header) + header.taken = true + if (header.width or 0) > 0 then assignment.width = header.width end + assignment.phase, assignment.startX, assignment.startZ = "fetching", rig.x, rig.z + assignment.pool = {implementId = header.id, implementName = header.name, connectId = header.connectId, + implements = {{id = header.id, name = header.name, connectId = header.connectId}}} + assignment.hitch, assignment.headerSwap = {done = false}, {} + ADFieldJobs.state.assignments[rig.id] = assignment + ADPool.reserve(assignment, {header.id, rig.id}) + if ADFieldWork.swapInProgress(field.id, assignment) then + -- en anden mejetærsker er ved at montere sit skærebord ved markens indkørsel: vent hjemme, til den + -- høster — ellers støder de sammen ved markøren (brugerønske 10/10, F14 med 2 maskiner) + assignment.phase = "queuedSwap" + log(field.id, "harvester: '%s' venter med at hente '%s', til den anden mejetærsker har monteret sit skærebord", + rig.label, header.name) + else + ADFieldWork.startHeaderFetch(adEnv, assignment) + log(field.id, "harvester: '%s' henter skærebordet '%s' (%s)", rig.label, header.name, tostring(header.parkName)) + end +end + +-- AutoDrive kører sættet til marken — tomt redskab fyldes på vejen (LOAD), uden påfyldning prøves paller. +-- -> false når udsendelsen skal stoppe her (paller sat i gang, eller tom uden påfyldning: markens status er sat) +local function launchDrive(adEnv, field, info, role, rig, assignment) + local refill = refillPlan(adEnv, field.id, rig.vehicle, role, info.x, info.z) + if refill ~= nil and refill.empty and refill.refillId == nil then + -- tom og ingen station: paller (palleskur/løse); ellers ville den bare køre kurset uden at sprede + ADFieldJobs.state.assignments[rig.id] = assignment + if startPalletRefill(adEnv, assignment, rig.vehicle, refill.fillType, rig.label) then + note(field.id, {reason = false}) + return false + end + ADFieldJobs.state.assignments[rig.id] = nil + fail(field.id, string.format("'%s' er tom for %s og der er ingen påfyldning eller palle med AutoDrive-markør — fyld den op", rig.label, fillTypeName(refill.fillType))) + return false + end + assignment.startX, assignment.startZ = rig.x, rig.z + -- skærebord på transporthjul allerede bag på: monteres på marken — tømmevogne og andre mejetærskere venter + -- (in-game 10/10 SG7: tømmevognen kom, før mejetærskeren havde skiftet) + if role == "harvester" and ADHeaderSwap ~= nil and ADHeaderSwap.headerPosition(rig.vehicle) == "rear" then + assignment.headerSwap = {} + end + ADFieldJobs.state.assignments[rig.id] = assignment + if refill ~= nil and refill.empty then + -- AutoDrive LOAD: påfyldningen (2. markør), fyld op, videre til F-markøren (1.) — så Courseplay + startAd(adEnv, rig.vehicle, adEnv.AutoDrive.MODE_LOAD, info.markerId, refill.refillId, refill.fillType) + assignment.drive = {mode = adEnv.AutoDrive.MODE_LOAD, first = info.markerId, second = refill.refillId, fillType = refill.fillType} + local marker = adEnv.ADGraphManager:getMapMarkerByWayPointId(refill.refillId) + log(field.id, "%s '%s' er tom — fyldes med %s ved %s og kører så til %s", role, rig.label, fillTypeName(refill.fillType), + tostring(marker ~= nil and marker.name or refill.refillId), tostring(info.markerName)) + else + startAd(adEnv, rig.vehicle, adEnv.AutoDrive.MODE_DRIVETO, info.markerId, nil) + assignment.drive = {mode = adEnv.AutoDrive.MODE_DRIVETO, first = info.markerId} + log(field.id, "%s '%s' sendt til %s (%.1f m%s)", role, rig.label, tostring(info.markerName), rig.width or 0, + assignment.lane ~= nil and string.format(", bane %d", assignment.lane) or "") + end + return true +end + +-- Sættet sendes af sted: skærebord hentes først, manuel høster = spilleren kører, kontrakt uden markør = spillets +-- hjælper, ellers AutoDrive. -> false når udsendelsen af marken skal stoppe her +local function launchRig(adEnv, field, info, role, rig, assignment) + local header = role == "harvester" and not rig.manual and not assignment.helper and rig.headerOptions ~= nil + and ADHeaderSwap.pickHeader(rig.headerOptions, info.fruitIndex, info.x, info.z) or nil + if header == nil and rig.headerOptions ~= nil then + -- mejetærsker uden skærebord og intet ledigt skærebord til afgrøden: sendes ikke ud + log(field.id, "harvester: '%s' har intet skærebord, og intet ledigt skærebord kan høste afgrøden", rig.label) + elseif header ~= nil then + launchHeaderFetch(adEnv, field, rig, assignment, header) + elseif role == "harvester" and rig.manual and not assignment.helper then + -- for bred til vejene: spilleren kører den selv til marken og monterer skærebordet + assignment.phase, assignment.manual = "awaitingPlayer", true + assignment.startX, assignment.startZ = rig.x, rig.z + ADFieldJobs.state.assignments[rig.id] = assignment + askPlayer(field, info, assignment, true) + elseif info.markerId == nil then + -- kontraktmark uden AutoDrive-markør: Courseplay startes her, og spillets hjælper kører sættet ud til marken + assignment.startX, assignment.startZ, assignment.giants = rig.x, rig.z, true + ADFieldJobs.state.assignments[rig.id] = assignment + log(field.id, "%s '%s' sendes til F%s med spillets hjælper (ingen AutoDrive-markør)", role, rig.label, tostring(field.id)) + ADFieldWork.beginWork(adEnv, field, info, assignment) + else + return launchDrive(adEnv, field, info, role, rig, assignment) + end + return true +end + +function ADFieldWork.dispatch(adEnv, field, info, decision) + local role = decision.role + -- marken har afgrøde, men ingen markjord i kortet: Courseplay finder ikke markgrænsen ("Field detection failed", + -- in-game 10/10 Flat Acres 4X F2) — spilleren må høste/bearbejde den selv + if info ~= nil and info.cropOnly then + fail(field.id, "kortet har ingen markjord her — Courseplay kan ikke finde markgrænsen; høst/bearbejd marken selv") + return + end + local ok, reason = preflight(field, role) + if not ok then + note(field.id, {retryAt = now() + ADFieldModel.RETRY_MS, reason = reason}) + return + end + local candidates = dispatchCandidates(adEnv, field, info, role) + if candidates == nil then return end + local required = ADFieldModel.requiredWidth(field, role) + local roleAccept = acceptFor(field, info, role) + -- kun maskiner AutoDrive kan køre fra: tæt på vejnettet + local offNetwork = {} + local accept = dispatchAccept(adEnv, field, info, role, decision, roleAccept, offNetwork) + local rigs, why, args = pickRigs(candidates, role, decision, info, required, accept) + if rigs == nil then + return dispatchNoRig(adEnv, field, info, role, decision, candidates, required, roleAccept, why, args, offNetwork) + end lastNoRig[field.id] = nil local count = #rigs local lanes = ADFieldModel.lanePositions(count) @@ -1021,77 +1008,7 @@ function ADFieldWork.dispatch(adEnv, field, info, decision) groupSize = decision.helper and 1 or count, lane = count > 1 and lanes[index] or nil, leader = index == 1, fillType = decision.helper and info.harvestFillType or nil, } - local header = role == "harvester" and not rig.manual and not assignment.helper and rig.headerOptions ~= nil - and ADHeaderSwap.pickHeader(rig.headerOptions, info.fruitIndex, info.x, info.z) or nil - if header == nil and rig.headerOptions ~= nil then - -- mejetærsker uden skærebord og intet ledigt skærebord til afgrøden: sendes ikke ud - log(field.id, "harvester: '%s' har intet skærebord, og intet ledigt skærebord kan høste afgrøden", rig.label) - elseif header ~= nil then - header.taken = true - if (header.width or 0) > 0 then assignment.width = header.width end - -- henter sit skærebord på transporthjul (som puljens "fetching": samme fejl- og karantænevej), monterer det på marken - assignment.phase, assignment.startX, assignment.startZ = "fetching", rig.x, rig.z - assignment.pool = {implementId = header.id, implementName = header.name, connectId = header.connectId, - implements = {{id = header.id, name = header.name, connectId = header.connectId}}} - assignment.hitch, assignment.headerSwap = {done = false}, {} - ADFieldJobs.state.assignments[rig.id] = assignment - ADPool.reserve(assignment, {header.id, rig.id}) - if ADFieldWork.swapInProgress(field.id, assignment) then - -- en anden mejetærsker er ved at montere sit skærebord ved markens indkørsel: vent hjemme, til den - -- høster — ellers støder de sammen ved markøren (brugerønske 10/10, F14 med 2 maskiner) - assignment.phase = "queuedSwap" - log(field.id, "harvester: '%s' venter med at hente '%s', til den anden mejetærsker har monteret sit skærebord", - rig.label, header.name) - else - ADFieldWork.startHeaderFetch(adEnv, assignment) - log(field.id, "harvester: '%s' henter skærebordet '%s' (%s)", rig.label, header.name, tostring(header.parkName)) - end - elseif role == "harvester" and rig.manual and not assignment.helper then - -- for bred til vejene: spilleren kører den selv til marken og monterer skærebordet - assignment.phase, assignment.manual = "awaitingPlayer", true - assignment.startX, assignment.startZ = rig.x, rig.z - ADFieldJobs.state.assignments[rig.id] = assignment - askPlayer(field, info, assignment, true) - elseif info.markerId == nil then - -- kontraktmark uden AutoDrive-markør: Courseplay startes her, og spillets hjælper kører sættet ud til marken - assignment.startX, assignment.startZ, assignment.giants = rig.x, rig.z, true - ADFieldJobs.state.assignments[rig.id] = assignment - log(field.id, "%s '%s' sendes til F%s med spillets hjælper (ingen AutoDrive-markør)", role, rig.label, tostring(field.id)) - ADFieldWork.beginWork(adEnv, field, info, assignment) - else - local refill = refillPlan(adEnv, field.id, rig.vehicle, role, info.x, info.z) - if refill ~= nil and refill.empty and refill.refillId == nil then - -- tom og ingen station: paller (palleskur/løse); ellers ville den bare køre kurset uden at sprede - ADFieldJobs.state.assignments[rig.id] = assignment - if startPalletRefill(adEnv, assignment, rig.vehicle, refill.fillType, rig.label) then - note(field.id, {reason = false}) - return - end - ADFieldJobs.state.assignments[rig.id] = nil - fail(field.id, string.format("'%s' er tom for %s og der er ingen påfyldning eller palle med AutoDrive-markør — fyld den op", rig.label, fillTypeName(refill.fillType))) - return - end - assignment.startX, assignment.startZ = rig.x, rig.z - -- skærebord på transporthjul allerede bag på: monteres på marken — tømmevogne og andre mejetærskere venter - -- (in-game 10/10 SG7: tømmevognen kom, før mejetærskeren havde skiftet) - if role == "harvester" and ADHeaderSwap ~= nil and ADHeaderSwap.headerPosition(rig.vehicle) == "rear" then - assignment.headerSwap = {} - end - ADFieldJobs.state.assignments[rig.id] = assignment - if refill ~= nil and refill.empty then - -- AutoDrive LOAD: påfyldningen (2. markør), fyld op, videre til F-markøren (1.) — så Courseplay - startAd(adEnv, rig.vehicle, adEnv.AutoDrive.MODE_LOAD, info.markerId, refill.refillId, refill.fillType) - assignment.drive = {mode = adEnv.AutoDrive.MODE_LOAD, first = info.markerId, second = refill.refillId, fillType = refill.fillType} - local marker = adEnv.ADGraphManager:getMapMarkerByWayPointId(refill.refillId) - log(field.id, "%s '%s' er tom — fyldes med %s ved %s og kører så til %s", role, rig.label, fillTypeName(refill.fillType), - tostring(marker ~= nil and marker.name or refill.refillId), tostring(info.markerName)) - else - startAd(adEnv, rig.vehicle, adEnv.AutoDrive.MODE_DRIVETO, info.markerId, nil) - assignment.drive = {mode = adEnv.AutoDrive.MODE_DRIVETO, first = info.markerId} - log(field.id, "%s '%s' sendt til %s (%.1f m%s)", role, rig.label, tostring(info.markerName), rig.width or 0, - assignment.lane ~= nil and string.format(", bane %d", assignment.lane) or "") - end - end + if not launchRig(adEnv, field, info, role, rig, assignment) then return end end note(field.id, {reason = false}) end @@ -1118,438 +1035,6 @@ local function prepareCollector(adEnv, field, info, assignment) return true end --- Nærmeste påfyldning af varen: en læssestation gården har adgang til, med varen på lager, en AutoDrive- --- markør ved triggeren og vej fra traktoren. (AutoDrives eget "automatiske påfyldningsmål" er slået fra i --- AutoDrive — AutoDrive.automaticPickupTarget = false — så vi finder stedet selv, som silovalget.) --- Sælger købestationen varen? (placeable.spec_buyingStation.buyingStation; FS25-felter varierer, så flere --- opslag: udbudte varer, triggernes varer, AI-varer.) -function ADFieldWork.buyingSupports(station, fillType) - if station == nil or fillType == nil then return false end - local ok, result = pcall(function() - for _, key in ipairs({"providedFillTypes", "supportedFillTypes", "fillTypes"}) do - local set = station[key] - if type(set) == "table" and set[fillType] then return true end - end - for _, trigger in pairs(station.loadTriggers or {}) do - if type(trigger.fillTypes) == "table" and trigger.fillTypes[fillType] then return true end - end - if station.getAISupportedFillTypes ~= nil then - local set = station:getAISupportedFillTypes() - if type(set) == "table" and set[fillType] then return true end - end - return false - end) - return ok and result == true -end - --- Parkering, kobling og ventepladser er aldrig en læssemarkør. -local function isServiceMarker(marker) - local name = string.lower(tostring(marker.name or "")) - local group = string.lower(tostring(marker.group or "")) - return string.find(name, "^p ") ~= nil or string.find(name, "^connect ") ~= nil - or string.find(name, "%f[%a]wait%f[%A]") ~= nil or string.find(group, "%f[%a]wait%f[%A]") ~= nil -end - -ADFieldWork.THROUGH_TRIGGER_M = 3 -- AD-vejen før markøren kører gennem triggeren, hvis et punkt er så tæt på - --- Kører AD-vejen ind til markøren gennem en af triggerne? marker.approach = {{x, z}} (punkter bagud fra markøren). -function ADFieldWork.drivesThrough(marker, points) - local limit = ADFieldWork.THROUGH_TRIGGER_M ^ 2 - for _, p in ipairs(marker.approach or {}) do - for _, point in ipairs(points) do - if (p.x - point.x) ^ 2 + (p.z - point.z) ^ 2 <= limit then return true end - end - end - return false -end - --- markers = {{id, name, group, x, z, approach?}}, points = triggerpositioner {{x, z}} -> id på læssemarkøren inden --- for maxDistance m af en af triggerne, ellers nil. En markør hvis AD-vej kører GENNEM triggeren foretrækkes for den --- blot nærmeste (in-game 6/10: sprøjten til den blå væsketank holdt ved "Palleskur 2 load" på nabosporet, 0,5 m --- tættere end "Buy All" lige efter tankene). -function ADFieldWork.nearestStationMarker(markers, points, maxDistance) - points = points or {} - local best, bestDistance, bestThrough = nil, maxDistance * maxDistance, false - for _, marker in ipairs(markers or {}) do - if not isServiceMarker(marker) then - local nearest = math.huge - for _, point in ipairs(points) do - nearest = math.min(nearest, (marker.x - point.x) ^ 2 + (marker.z - point.z) ^ 2) - end - if nearest <= maxDistance * maxDistance then - local through = ADFieldWork.drivesThrough(marker, points) - if (through and not bestThrough) or (through == bestThrough and nearest < bestDistance) then - best, bestDistance, bestThrough = marker.id, nearest, through - end - end - end - end - return best, bestThrough -end - -ADFieldWork.STATION_MARKER_M = 30 -ADFieldWork.STATION_MATCH_M = 80 -- markører så tæt på bygningen tjekkes med markør->station-opslaget -ADFieldWork.WIDTH_GUARD_MS = 10000 -- så tit tjekkes at variabel bredde ikke er sprunget tilbage - --- Stationens læssetriggere i verden (buying-/loading-station) -> {{x, z}}. -local function loadTriggerPoints(station) - local points = {} - for _, trigger in pairs(station.loadTriggers or {}) do - local node = trigger.triggerNode or trigger.aiNode - if node ~= nil then - local ok, x, _, z = pcall(getWorldTranslation, node) - if ok and x ~= nil then table.insert(points, {x = x, z = z}) end - end - end - return points -end - -ADFieldWork.APPROACH_M = 40 -- så langt bagud ad AD-vejen ledes der efter triggeren - --- Punkterne AD kører igennem ind til markøren (bagud ad incoming, op til APPROACH_M). -function ADFieldWork.approachPoints(adEnv, startId) - local points, seen, queue = {}, {[startId] = true}, {{id = startId, d = 0}} - local head = 1 - while head <= #queue and #points < 600 do - local item = queue[head] - head = head + 1 - local wayPoint = adEnv.ADGraphManager:getWayPointById(item.id) - if wayPoint ~= nil then - table.insert(points, {x = wayPoint.x, z = wayPoint.z}) - for _, prevId in ipairs(wayPoint.incoming or {}) do - local prev = not seen[prevId] and adEnv.ADGraphManager:getWayPointById(prevId) or nil - if prev ~= nil then - seen[prevId] = true - local step = math.sqrt((prev.x - wayPoint.x) ^ 2 + (prev.z - wayPoint.z) ^ 2) - -- et punkt pr. meter mellem knuderne (AD-knuder ligger flere meter fra hinanden) - for t = 1, math.floor(step) do - local f = t / step - table.insert(points, {x = wayPoint.x + (prev.x - wayPoint.x) * f, z = wayPoint.z + (prev.z - wayPoint.z) * f}) - end - if item.d + step <= ADFieldWork.APPROACH_M then table.insert(queue, {id = prevId, d = item.d + step}) end - end - end - end - end - return points -end - --- points: kun markører inden for nearM af et af punkterne får deres AD-vej med (approach) -local function markerList(adEnv, points, nearM) - local list = {} - for _, marker in pairs(adEnv.ADGraphManager:getMapMarkers()) do - local wayPoint = adEnv.ADGraphManager:getWayPointById(marker.id) - if wayPoint ~= nil then - local entry = {id = marker.id, name = marker.name, group = marker.group, x = wayPoint.x, z = wayPoint.z} - for _, point in ipairs(points or {}) do - if (wayPoint.x - point.x) ^ 2 + (wayPoint.z - point.z) ^ 2 <= (nearM or 0) ^ 2 then - entry.approach = ADFieldWork.approachPoints(adEnv, marker.id) - break - end - end - table.insert(list, entry) - end - end - return list -end - --- Stationens markør: den der kører GENNEM en af triggerne (points), ellers den nærmeste inden for maxDistance. --- accept(marker) filtrerer (fx væk med andre bygningers markører). -> id, through (eller nil). Til salgsstederne: --- markør->station giver hver markør kun én station ("Buy All" gennem væske- og bulkmarkedet blev kun bulkmarkedets, --- in-game 7/10), og uden gennemkørsel vandt nabosporets palleskur- eller koblingsmarkør. -function ADFieldWork.stationMarkerAt(adEnv, points, maxDistance, accept) - local list = {} - for _, marker in ipairs(markerList(adEnv, points, maxDistance)) do - if accept == nil or accept(marker) then table.insert(list, marker) end - end - return ADFieldWork.nearestStationMarker(list, points, maxDistance) -end - -ADFieldWork.isServiceMarker = isServiceMarker - - --- AD-markøren ved stationen: den nærmeste markør ved stationens EGNE læssetriggere, ellers nærmeste ikke-Wait markør --- inden for 40 m af bygningen ("Liquid Buy Station" står ved tanken, ikke ved triggeren). AutoDrives --- ADTriggerManager:getMarkerAtStation bruges IKKE: den vil have markøren togets længde + 3..13 m forbi triggeren (et --- langt sæt fik en anden stations markør: Puma + Kinze 4900 ventede på frø ved "Market Price Liquid Fill Station"), og --- finder den ingen, OPRETTER den en ny markør med stationens navn (2 ekstra "Buying Station Multifruit", in-game 30/9). --- Alle læsse-/købsstationer med deres påfyldningstriggeres positioner (lager + købestationer). -local function allLoadStations() - local list = {} - local seen = {} - pcall(function() - for _, station in pairs(g_currentMission.storageSystem:getLoadingStations()) do - if not seen[station] then seen[station] = true; table.insert(list, station) end - end - end) - pcall(function() - for _, placeable in pairs(g_currentMission.placeableSystem.placeables) do - local spec = placeable.spec_buyingStation - local station = spec ~= nil and spec.buyingStation or nil - if station ~= nil and not seen[station] then seen[station] = true; table.insert(list, station) end - end - end) - return list -end - --- Hører markøren til DENNE station? Den station hvis påfyldningstrigger ligger nærmest markøren (over alle stationer). --- Retningsløst: markør->station-opslaget (bagud fra næsen) koblede hverken "Solid Buy Silo" eller "Liquid Buy Silo" til --- bulkstationen, så den gamle regel valgte Liquid Buy til frø (in-game 16/10, efter 1.62.250). --- stationer + triggerpunkter genbruges kort (markerBelongsTo kaldes pr. kandidatmarkør — review: ellers S²·M) -local stationPointsCache = {at = -math.huge, list = nil} -local STATION_POINTS_TTL_MS = 2000 -local function stationPoints() - local t = now() - if stationPointsCache.list == nil or t - stationPointsCache.at > STATION_POINTS_TTL_MS then - local list = {} - for _, candidate in ipairs(allLoadStations()) do table.insert(list, {station = candidate, points = loadTriggerPoints(candidate)}) end - stationPointsCache.list, stationPointsCache.at = list, t - end - return stationPointsCache.list -end - --- Stationen hvis påfyldningstrigger ligger nærmest markøren (inden for STATION_MATCH_M), eller nil. -local function markerOwner(adEnv, markerId) - local wayPoint = adEnv.ADGraphManager:getWayPointById(markerId) - if wayPoint == nil then return nil end - local best, bestDistance = nil, math.huge - for _, entry in ipairs(stationPoints()) do - for _, point in ipairs(entry.points) do - local d = (point.x - wayPoint.x) ^ 2 + (point.z - wayPoint.z) ^ 2 - if d < bestDistance then best, bestDistance = entry.station, d end - end - end - if best == nil or bestDistance > ADFieldWork.STATION_MATCH_M * ADFieldWork.STATION_MATCH_M then return nil end - return best -end - -local function sameStation(a, station, placeable) - return a ~= nil and (a == station or (placeable ~= nil and a.owningPlaceable == placeable)) -end - -local function markerBelongsTo(adEnv, farmId, markerId, station, placeable) - return sameStation(markerOwner(adEnv, markerId), station, placeable) -end - --- Hører markøren til en ANDEN station? (trin 3/4 må ikke låne nabostationens markør — in-game 16/10: gårdens lager --- "Farma 500 + Obi 1000" fik "Liquid Buy Silo", og sprederne holdt dér uden at blive fyldt) -local function markerOfOther(adEnv, markerId, station, placeable) - local owner = markerOwner(adEnv, markerId) - return owner ~= nil and not sameStation(owner, station, placeable) -end - -local function markerAtStationRaw(adEnv, vehicle, station, placeable) - local farmId = vehicle ~= nil and ADSmartPickup ~= nil and ADSmartPickup.getFarmId ~= nil and ADSmartPickup.getFarmId(vehicle) or nil - -- 1) markør ved stationens egne triggere, der hører til stationen. Uden filteret vandt en markør, hvis vej kører - -- GENNEM triggeren videre til nabostationen (in-game 16/10: frø fra "Bulk Fill Station" ved "Liquid Buy Silo") - local points = nil - local okOwn, ownId = pcall(function() - points = loadTriggerPoints(station) - local list = {} - for _, entry in ipairs(markerList(adEnv, points, ADFieldWork.STATION_MARKER_M)) do - if not isServiceMarker(entry) and markerBelongsTo(adEnv, farmId, entry.id, station, placeable) then table.insert(list, entry) end - end - return ADFieldWork.nearestStationMarker(list, points, ADFieldWork.STATION_MARKER_M) - end) - if okOwn and ownId ~= nil then return ownId, 1 end - local node = placeable ~= nil and placeable.rootNode or nil - local px, pz - if node ~= nil then - local x, _, z = getWorldTranslation(node); px, pz = x, z - end - -- 2) samme filter i større radius (STATION_MATCH_M) om triggerne, rangeret som trin 1 (gennemkørsel, afstand til - -- triggeren); uden kendte triggere: afstand til bygningen - local okMatch, matchId = pcall(function() - local around = (points ~= nil and #points > 0) and points or (px ~= nil and {{x = px, z = pz}} or nil) - if around == nil then return nil end - local list = {} - for _, entry in ipairs(markerList(adEnv, around, ADFieldWork.STATION_MATCH_M)) do - local near = false - for _, point in ipairs(around) do - if (entry.x - point.x) ^ 2 + (entry.z - point.z) ^ 2 <= ADFieldWork.STATION_MATCH_M ^ 2 then near = true break end - end - if near and not isServiceMarker(entry) and markerBelongsTo(adEnv, farmId, entry.id, station, placeable) then table.insert(list, entry) end - end - return ADFieldWork.nearestStationMarker(list, around, ADFieldWork.STATION_MATCH_M) - end) - if okMatch and matchId ~= nil then return matchId, 2 end - -- 3) som før: markør ved triggerne (også gennemkørsel), ellers nærmeste ikke-Wait markør inden for 40 m af bygningen - local okAny, anyId = pcall(function() - local pts = points or loadTriggerPoints(station) - local list = {} - for _, entry in ipairs(markerList(adEnv, pts, ADFieldWork.STATION_MARKER_M)) do - if not markerOfOther(adEnv, entry.id, station, placeable) then table.insert(list, entry) end - end - return ADFieldWork.nearestStationMarker(list, pts, ADFieldWork.STATION_MARKER_M) - end) - if okAny and anyId ~= nil then return anyId, 3 end - if px == nil then return nil end - local best, bestDistance = nil, 40 * 40 - for _, marker in pairs(adEnv.ADGraphManager:getMapMarkers()) do - local isWait = ADSupplyPlanner ~= nil and ADSupplyPlanner.isWaitMarker ~= nil and ADSupplyPlanner.isWaitMarker(marker) - local wayPoint = not isWait and adEnv.ADGraphManager:getWayPointById(marker.id) or nil - if wayPoint ~= nil then - local d = (wayPoint.x - px) ^ 2 + (wayPoint.z - pz) ^ 2 - if d < bestDistance and not markerOfOther(adEnv, marker.id, station, placeable) then best, bestDistance = marker.id, d end - end - end - return best, 4 -end - --- Til loggen: valgt markør pr. station (kun når valget ændrer sig) — trin 1 = ved triggeren og hører til stationen, --- 2 = hører til stationen (80 m), 3 = gammel regel ved triggeren, 4 = nærmest bygningen. -local loggedStationMarker = {} -local function markerAtStation(adEnv, vehicle, station, placeable) - local id, step = markerAtStationRaw(adEnv, vehicle, station, placeable) - pcall(function() - local key = placeable or station - if key ~= nil and loggedStationMarker[key] ~= tostring(id) then - loggedStationMarker[key] = tostring(id) - local marker = id ~= nil and adEnv.ADGraphManager:getMapMarkerByWayPointId(id) or nil - local name = placeable ~= nil and placeable.getName ~= nil and placeable:getName() or "?" - Logging.info("ADSmartPickup: påfyldning: station '%s' -> markør '%s' (trin %s)", tostring(name), - tostring(marker ~= nil and marker.name or id), tostring(step)) - end - end) - return id -end - --- Nærmeste påfyldning af varen med AD-markør og vej: lagre/siloer med varen, og købestationer (købes --- efter behov — ingen lagerbeholdning, så de fandtes ikke før; in-game 26/9 "Liquid Buy Station"). --- skipRoute: rutetjekket springes over (frakoblet puljeredskab har ingen .ad, så AD's getPathTo fejler; traktoren --- tjekkes igen i refillPlan efter påkobling). --- exclude (valgfri): {[wayPointId] = true} der springes over (fx et lager der er løbet tørt, mens vognen ventede) -ADFieldWork.MIN_REFILL_STOCK_L = 500 -- eget lager skal have mindst så meget af varen for at være påfyldningssted -function ADFieldWork.findRefillMarker(adEnv, vehicle, fillType, x, z, skipRoute, exclude) - local farmId = vehicle:getOwnerFarmId() - local best, bestDistance = nil, math.huge - local function consider(wayPointId) - if exclude ~= nil and wayPointId ~= nil and exclude[wayPointId] then return end - local wayPoint = wayPointId ~= nil and wayPointId > 0 and adEnv.ADGraphManager:getWayPointById(wayPointId) or nil - if wayPoint == nil then return end - local distance = (wayPoint.x - x) ^ 2 + (wayPoint.z - z) ^ 2 - if distance < bestDistance and (skipRoute or ADUnloadWait.hasRouteTo(adEnv, vehicle, wayPointId)) then - best, bestDistance = wayPointId, distance - end - end - -- gårdens egne lagre først (stalde/tanke med gylle, lager med gødning): købes kun når intet eget findes - -- (in-game 26/9: 7 mio. l gylle ved BGA'en, men påfyldningen ville købe ved købestationen) - pcall(function() - for _, station in pairs(g_currentMission.storageSystem:getLoadingStations()) do - local supported = station.getAISupportedFillTypes ~= nil and station:getAISupportedFillTypes() or {} - local isShop = station.owningPlaceable ~= nil and station.owningPlaceable.spec_buyingStation ~= nil - if not isShop and g_currentMission.accessHandler:canFarmAccess(farmId, station) and supported[fillType] - and (station:getFillLevel(fillType, farmId) or 0) >= ADFieldWork.MIN_REFILL_STOCK_L then - consider(markerAtStation(adEnv, vehicle, station, station.owningPlaceable)) - end - end - end) - if best ~= nil then return best end - pcall(function() - for _, placeable in pairs(g_currentMission.placeableSystem.placeables) do - local spec = placeable.spec_buyingStation - local station = spec ~= nil and spec.buyingStation or nil - if station ~= nil and ADFieldWork.buyingSupports(station, fillType) then - consider(markerAtStation(adEnv, vehicle, station, placeable)) - end - end - end) - return best -end - --- Påfyldningsstedet er løbet tørt, mens vognen venter der (in-game 16/10: kalk-sprederen holdt ved "TMR Silo Farma", --- der var tom): find næste sted uden det nuværende, og kør derhen. -> true når turen er flyttet. -function ADFieldWork.retargetEmptyRefill(adEnv, vehicle) - local module = vehicle.ad ~= nil and vehicle.ad.stateModule or nil - if module == nil or not module:isActive() or module:getMode() ~= adEnv.AutoDrive.MODE_LOAD then return false end - local first, second = module:getFirstMarker(), module:getSecondMarker() - local fillType = module.getFillType ~= nil and module:getFillType() or nil - if first == nil or second == nil or fillType == nil then return false end - -- kun når stedet BEVISELIGT ikke kan levere (review): eget lager under minimum, eller købestation der ikke sælger - -- varen. Kø ved stationen, langsom pumpe eller fuld tank flytter den ikke. - local station = markerOwner(adEnv, second.id) - if station ~= nil then - local shop = station.owningPlaceable ~= nil and station.owningPlaceable.spec_buyingStation ~= nil - if shop then - if ADFieldWork.buyingSupports(station, fillType) then return false end - else - local farmId = vehicle:getOwnerFarmId() - local okLevel, stock = pcall(station.getFillLevel, station, fillType, farmId) - if okLevel and (stock or 0) >= ADFieldWork.MIN_REFILL_STOCK_L then return false end - end - end - local x, z = vehiclePosition(vehicle) - local right = ADFieldWork.findRefillMarker(adEnv, vehicle, fillType, x, z, true, {[second.id] = true}) - if right == nil then return false end - startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_LOAD, first.id, right, fillType) - local marker = adEnv.ADGraphManager:getMapMarkerByWayPointId(right) - local name = g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeNameByIndex(fillType) or tostring(fillType) - Logging.info("ADSmartPickup: påfyldning: '%s' fik intet %s ved %s — kører til %s", tostring(ADRuns.vehicleLabel(vehicle)), - tostring(name), tostring(second.name), tostring(marker ~= nil and marker.name or right)) - return true -end - --- Genoptaget AD-tur i påfyldnings-tilstand (LOAD): påfyldningsstedet blev valgt før gem — måske af en ældre version --- (in-game 16/10: kalk og gødning ved "Liquid Buy Silo", som ikke sælger dem; sprederne holdt der). Find det rigtige --- sted for varen nu, og genstart turen dertil, hvis det er et andet. -function ADFieldWork.fixResumedRefill(adEnv, vehicle, fieldId) - local module = vehicle.ad ~= nil and vehicle.ad.stateModule or nil - if module == nil or not module:isActive() or module:getMode() ~= adEnv.AutoDrive.MODE_LOAD then return false end - local first, second = module:getFirstMarker(), module:getSecondMarker() - local fillType = module.getFillType ~= nil and module:getFillType() or nil - if first == nil or second == nil or fillType == nil then return false end - -- allerede fyldt: turen ud til marken er i gang — rør den ikke - if ADCpBridge ~= nil and ADCpBridge.getRefillLevel ~= nil and (ADCpBridge.getRefillLevel(vehicle, fillType) or 0) > 0 then return false end - -- det gemte sted har varen (sælger den / lager med varen): spillerens eller et gyldigt valg — behold det (review) - local farmId = ADSmartPickup.getFarmId(vehicle) - local saved = ADSmartPickup.getLoadStationAtWayPointId(adEnv, second.id, farmId) - if saved ~= nil then - local shop = saved.owningPlaceable ~= nil and saved.owningPlaceable.spec_buyingStation ~= nil - and saved.owningPlaceable.spec_buyingStation.buyingStation or nil - if shop ~= nil and ADFieldWork.buyingSupports(shop, fillType) then return false end - if shop == nil and saved.getFillLevel ~= nil and (saved:getFillLevel(fillType, farmId) or 0) > 0 then return false end - end - local x, z = vehiclePosition(vehicle) - -- uden rutetjek: det kører ved indlæsning (AD finder selv vejen; undgå hak) - local right = ADFieldWork.findRefillMarker(adEnv, vehicle, fillType, x, z, true) - if right == nil or right == second.id then return false end - startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_LOAD, first.id, right, fillType) - local marker = adEnv.ADGraphManager:getMapMarkerByWayPointId(right) - local name = g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeNameByIndex(fillType) or tostring(fillType) - log(fieldId, "'%s': påfyldning af %s flyttet fra %s til %s (genoptaget tur)", ADRuns.vehicleLabel(vehicle), tostring(name), - tostring(second.name), tostring(marker ~= nil and marker.name or right)) - return true -end - --- Kun købestationer der sælger varen (dyrefoder som sidste udvej, 8/10). -> waypoint-id | nil --- -> waypoint-id | nil, diagnose {stations, withMarker, withRoute} (hvorfor intet købes — til loggen) -function ADFieldWork.findBuyMarker(adEnv, vehicle, fillType, x, z, skipRoute) - local best, bestDistance = nil, math.huge - local info = {stations = 0, withMarker = 0, withRoute = 0} - local ok, err = pcall(function() - for _, placeable in pairs(g_currentMission.placeableSystem.placeables) do - local spec = placeable.spec_buyingStation - local station = spec ~= nil and spec.buyingStation or nil - if station ~= nil and ADFieldWork.buyingSupports(station, fillType) then - info.stations = info.stations + 1 - local wayPointId = markerAtStation(adEnv, vehicle, station, placeable) - local wayPoint = wayPointId ~= nil and wayPointId > 0 and adEnv.ADGraphManager:getWayPointById(wayPointId) or nil - if wayPoint ~= nil then - info.withMarker = info.withMarker + 1 - local distance = (wayPoint.x - x) ^ 2 + (wayPoint.z - z) ^ 2 - local routed = skipRoute or ADUnloadWait.hasRouteTo(adEnv, vehicle, wayPointId) - if routed then info.withRoute = info.withRoute + 1 end - if distance < bestDistance and routed then - best, bestDistance = wayPointId, distance - end - end - end - end - end) - if not ok then info.error = tostring(err) end - return best, info -end - -- Påfyldning undervejs (såmaskine/sprøjte/spreder): AutoDrive LOAD med hjælper = Courseplay. Når CP melder -- tom (onCpEmpty), kører AD til påfyldningen (2. markør), fylder op, kører tilbage til F-markøren (1. markør) -- og genstarter CP. Findes ingen påfyldning, stopper sættet når det er tomt ("tom for …", se finish). @@ -1656,69 +1141,6 @@ end -- Ballesamler: Courseplays ballefinder; fuld vogn tømmes af AutoDrive i nærmeste ballelager (palleskur der -- tager halmballer), som læssevognen. Uden lager stopper den når den er fuld. --- Plads der skal være i fabrikken til et ballelæs (et bomuldsmodul er flere tusinde liter; 1 l sendte vognen til en --- fuld fabrik — review 16/10) -ADFieldWork.BALE_MIN_FREE_L = 20000 - --- Tager stationen baller af varen? Spillets egen regel (UnloadingStation: "does not have a BaleUnloadTrigger"): en --- BaleUnloadTrigger for varen, eller en almindelig UnloadTrigger uden exactFillRootNode. In-game 16/10: bomulds- --- modulerne blev sendt til TMR Silo Farma (silo der tager COTTON løst, men ingen ballestation). -function ADFieldWork.stationTakesBales(station, fillType) - if station == nil or fillType == nil then return false end - for _, trigger in pairs(station.unloadTriggers or {}) do - if trigger.fillTypes ~= nil and trigger.fillTypes[fillType] ~= nil then - local class = ClassUtil ~= nil and ClassUtil.getClassObjectByObject(trigger) or nil - if BaleUnloadTrigger ~= nil and class == BaleUnloadTrigger then return true end - if UnloadTrigger ~= nil and class == UnloadTrigger and trigger.exactFillRootNode == nil then return true end - end - end - return false -end - --- Som ADLoadSwap.findDumpMarker (silo eller egen fabrik der bruger varen), men kun stationer med ballestation til --- varen: stationer uden springes over, og der søges igen (højst MAX_BALE_TRIES gange). -ADFieldWork.MAX_BALE_TRIES = 20 -function ADFieldWork.findBaleDumpMarker(adEnv, vehicle, fillType, rest, homeMarkerId, isReachable, farmId) - local excluded = {} - for _ = 1, ADFieldWork.MAX_BALE_TRIES do - local marker = ADLoadSwap.findDumpMarker(adEnv, vehicle, fillType, rest, homeMarkerId, isReachable, excluded, nil, true) - if marker == nil then return nil end - -- samme gård som findDumpMarker selv slår op med (review: getUnloadStationAtWayPointId caches pr. gård) - local station = ADSmartPickup.getUnloadStationAtWayPointId(adEnv, marker.id, ADSmartPickup.getFarmId(vehicle)) - if station == nil then return nil end - if ADFieldWork.stationTakesBales(station, fillType) then return marker end - -- findDumpMarker udelukker på owningPlaceable; uden en kan stationen ikke springes over - if station.owningPlaceable == nil then return nil end - excluded[station.owningPlaceable] = true - end - return nil -end - --- Mål for ballesamlerens læs -> {wayPointId, name} | nil. Halm: balle-/palleskur (som før). Bomuldsmoduler --- (brugerønske 16/10): egen fabrik der bruger dem (spinderiet), ellers skur, ellers salgssted der køber dem. -function ADFieldWork.chooseBaleStore(adEnv, field, info, vehicle, fillType, isReachable, farmId) - if not ADFieldModel.isBaleHarvest(field.lastFruit) then - return ADSources.findPalletStore(adEnv, vehicle, fillType, nil, isReachable, farmId) - end - local takesBales = function(station) return ADFieldWork.stationTakesBales(station, fillType) end - local okFactory, factory = pcall(ADFieldWork.findBaleDumpMarker, adEnv, vehicle, fillType, ADFieldWork.BALE_MIN_FREE_L, - info.markerId, isReachable, farmId) - if not okFactory then log(field.id, "ballemål: fabriksopslag fejlede: %s", tostring(factory)) end - if okFactory and factory ~= nil then return {wayPointId = factory.id, name = factory.name} end - local shed = ADSources.findPalletStore(adEnv, vehicle, fillType, nil, isReachable, farmId) - if shed ~= nil then return shed end - -- en fabrik der bruger varen, men er fuld lige nu: vent, sælg ikke (som chooseStore, review 16/10) - local okAny, anyFactory = pcall(ADFieldWork.findBaleDumpMarker, adEnv, vehicle, fillType, 0, info.markerId, isReachable, farmId) - if okAny and anyFactory ~= nil then - log(field.id, "ballemål: %s har ikke plads lige nu — modulerne venter", tostring(anyFactory.name)) - return nil - end - local okSale, sale = pcall(ADFieldWork.findSaleMarker, adEnv, vehicle, fillType, info.markerId, takesBales) - if not okSale then log(field.id, "ballemål: salgsopslag fejlede: %s", tostring(sale)) end - if okSale and sale ~= nil then return {wayPointId = sale.id, name = sale.name} end - return nil -end - local function beginBaleCollector(adEnv, field, info, assignment) local vehicle = assignment.vehicle local farmId = vehicle:getOwnerFarmId() @@ -1790,6 +1212,158 @@ end ADFieldWork.UNFOLD_WAIT_MS = 20000 +-- Høsteren: halmskår efter planen (hakkes = fra; samles op/presses = skår). Vinmark: kurset i gangen (ikke på +-- vinen), ellers kører maskinen ind i stolperne. +local function applyCourseTweaks(field, info, assignment, vehicle) + if assignment.role == "harvester" then + local keepStraw = field.plan.straw == "collect" or field.plan.straw == "bale" + ADCpBridge.setStrawSwath(vehicle, keepStraw) + -- høsteren sendes IKKE selv til lager med resten (in-game 27/9: den er for stor til at komme til lageret). + -- Courseplay venter selv ved kursets ende til tømmevognene har tømt tanken (WAITING_FOR_UNLOAD_AFTER_ + -- FIELDWORK_ENDED), og tømmevognene bliver på marken, så længe høsterens CP-job kører. + end + local vineOffset = ADCpBridge.vineOffsetFor(info.fruitName, assignment.role) + if vineOffset ~= nil and ADCpBridge.setVineOffset(vehicle, vineOffset) then + local skip = ADCpBridge.vineSkipFor(info.fruitName, assignment.role) or 0 + ADCpBridge.setVineSkip(vehicle, skip) + log(field.id, "vinmark: Courseplay-kurset lægges %s, springer %d række(r) over", vineOffset == 0 and "på vinen (høster)" or "til venstre for vinen (i gangen)", skip) + end +end + +-- Redskabet gøres klar til rollen: læssevogn (AutoDrive overtager ved fuld), påfyldning undervejs, frøvalg og +-- sideforskydning. -> false når sættet er sluppet igen (fejl) +local function prepareRoleTools(adEnv, field, info, assignment, source) + local vehicle = assignment.vehicle + if assignment.role == "collector" then + if not prepareCollector(adEnv, field, info, assignment) then return false end + assignment.adHandlesEnd = true + elseif assignment.role == "seeder" or assignment.role == "fertilizer" or assignment.role == "limer" or assignment.role == "weeder" then + prepareRefill(adEnv, field, info, assignment) + end + if assignment.role == "seeder" then + local okSeed, seedError = ADCpBridge.setSeedFruit(vehicle, ADFieldWork.sowFruitIndex(field)) + if not okSeed then + ADFieldWork.release(assignment) + fail(field.id, "såmaskine: " .. tostring(seedError)) + return false + end + end + -- slåmaskine: ingen sideforskydning (en gammel 2,1 m fra et tidligere rive-kursus sad fast på BiG M 450, 9/10) + if assignment.role == "mower" then + local own = ADCpBridge.getToolOffset(vehicle) + if type(own) == "number" and math.abs(own) > 0.05 and ADCpBridge.setToolOffset(vehicle, 0) then + log(field.id, "'%s' sideforskydning %.1f m -> 0 (slåmaskine)", ADRuns.vehicleLabel(vehicle), own) + end + end + -- kun læssevognen følger skårene; en slåmaskine på et genbrugt rive-kursus må ikke forskydes (in-game 9/10: + -- BiG M 450 på F6 kørte med 2,1 m forskydning) + if assignment.role == "collector" and source == "rake" and field.windrowOffset ~= nil and math.abs(field.windrowOffset) > 0.05 then + local own = ADCpBridge.getToolOffset(vehicle) + local target = ADFieldModel.collectorOffset(own, field.windrowOffset) + if ADCpBridge.setToolOffset(vehicle, target) then + assignment.restoreToolOffset = own + log(field.id, "skår ligger %.1f m %s for rivens linje -> læssevognens forskydning %.1f m (var %.1f m)", + math.abs(field.windrowOffset), field.windrowOffset > 0 and "til venstre" or "til højre", target, own) + end + end + return true +end + +-- Punktet nærmest traktoren: CP lægger kursets start dér (ikke i den anden ende af marken). Kontrakt der køres igen: +-- markpunktet længst væk (spillets markkant fandt kun det stykke, maskinen står på). +local function courseStartPoint(field, info, vx, vz) + local cropStage = field.stage == "harvesting" or field.stage == "mowing" + local point = ADFieldJobs.coursePoint(info.points, vx, vz, cropStage and info.fruitIndex or nil) or {x = info.x, z = info.z} + if field.contract and (field.contractPasses or 0) > 0 then + point = ADFieldJobs.farthestPoint(info.points, vx, vz) or point + end + return point +end + +-- Courseplay kører: kurset huskes til genbrug og følgere, høsteren får "Stop for unloading". +local function onCourseStarted(field, assignment, vehicle, source, reason, cacheContext) + assignment.phase = "working" + assignment.since = now() + ADCourseCache.afterStart(vehicle, assignment.vehicleId, cacheContext) + if assignment.role == "mower" then + -- mål bredden igen nu: lige efter koblingen kan Courseplay endnu ikke have talt bagslåmaskinen med + -- (in-game 8/10: KDF 341 + KDD 941 målt 3,4 m 0,2 s efter koblingen, 9,4 m et sekund efter) + local okNow, widthNow = pcall(ADCpBridge.getWorkWidth, vehicle) + if okNow and type(widthNow) == "number" and widthNow > 0 then assignment.width = widthNow end + note(field.id, {mowWidth = assignment.width, mowVehicleId = assignment.vehicleId}) + rememberCourse(field, "mower", vehicle) + elseif assignment.role == "rake" then + note(field.id, {rakeVehicleId = assignment.vehicleId}) + rememberCourse(field, "rake", vehicle) + elseif assignment.role == "harvester" then + note(field.id, {harvestVehicleId = assignment.vehicleId}) + rememberCourse(field, "harvester", vehicle) + ensureHarvesterStops(assignment) + end + if assignment.leader and (assignment.groupSize or 1) > 1 then + rememberCourse(field, field.stage, vehicle) + end + log(field.id, "Courseplay startet (%s%s%s)", assignment.role, + reason == "copied" and source ~= nil and (", " .. tostring(source) .. "-kursus kopieret") or "", + assignment.lane ~= nil and string.format(", bane %d", assignment.lane) or "") +end + +-- Courseplay fejlede: sættet slippes, kursusfejl venter længere, og maskinen kører hjem. +local function onCourseFailed(adEnv, field, assignment, vehicle, reason) + ADFieldWork.release(assignment) + fail(field.id, "Courseplay fejlede: " .. tostring(reason)) + -- kan Courseplay slet ikke lave et kursus (markgrænsen), hjælper et nyt forsøg om 5 min ikke: vent 30 min + -- (in-game 10/10: F2 sendte den næste mejetærsker ud efter 52 s) + if tostring(reason):find("kursus") or tostring(reason):find("markgrænsen") then + note(field.id, {retryAt = now() + ADFieldWork.COURSE_FAIL_RETRY_MS}) + end + -- ikke efterladt på marken med redskabet foldet ud: hjem (skærebord på transporthjul sættes bag på først); + -- in-game 10/10: Mejetærsker 2 blev stående med skærebordet foran og valgt til en anden mark + if not (ADHitch ~= nil and ADHitch.returnHome(adEnv, vehicle)) then + local park = parkMarkerId(adEnv, vehicle) + if park ~= nil and not (ADHeaderSwap ~= nil and ADHeaderSwap.headerPosition(vehicle) == "front") then + startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, park, nil) + end + end +end + +-- Kurset lægges og Courseplay startes (fase "starting"; svaret kommer asynkront i onCourseStarted/onCourseFailed). +local function startCourse(adEnv, field, info, assignment, opts, source) + local vehicle = assignment.vehicle + local vx, vz = vehiclePosition(vehicle) + local point = courseStartPoint(field, info, vx, vz) + -- genbrug af Courseplay-kurser: maskinens eget / en andens matchende kursus frem for ny beregning + local cacheContext + opts, cacheContext = ADCourseCache.prepare(adEnv, field, info, assignment, opts) + -- påbegyndt mark: fortsæt/start nærmest i stedet for forfra (CP's standard) + opts = opts or {} + local remembered = vehicle.getCpLastRememberedWaypointIx ~= nil and vehicle:getCpLastRememberedWaypointIx() ~= nil + opts.startAt = ADFieldJobs.startAtFor({reuse = opts.reuse == true, remembered = remembered, stage = field.stage, + standingRatio = info.standingRatio}) + if opts.startAt ~= "first" then log(field.id, "'%s' starter kurset ved %s punkt (marken er påbegyndt)", ADRuns.vehicleLabel(vehicle), opts.startAt == "last" and "sidste" or "nærmeste") end + -- kursets start inde på marken, ikke ved maskinen ude ved vejen + opts.startX, opts.startZ = ADFieldJobs.startInsideField(info.verts, vx, vz, point.x, point.z, 15) + assignment.phase = "starting" + assignment.since = now() + -- Courseplay lægger kursets start ved markpunktet (ikke ved maskinen): brug punktet på marken lige ved maskinen, så + -- den begynder, hvor den holder (in-game 10/10: markpunktet lå 350 m inde på F14 -> "udflugt", også med 15 m) + local fieldX, fieldZ = opts.startX or point.x, opts.startZ or point.z + if not (#(info.verts or {}) >= 3 and ADFieldJobs.insidePolygon(fieldX, fieldZ, info.verts)) then fieldX, fieldZ = point.x, point.z end + local handle, err = ADCpBridge.start(vehicle, fieldX, fieldZ, function(ok, reason) + if ok then + onCourseStarted(field, assignment, vehicle, source, reason, cacheContext) + else + onCourseFailed(adEnv, field, assignment, vehicle, reason) + end + end, opts) + if handle == nil then + ADFieldWork.release(assignment) + fail(field.id, "Courseplay kunne ikke startes: " .. tostring(err)) + return + end + assignment.handle = handle +end + local function beginWork(adEnv, field, info, assignment) local vehicle = assignment.vehicle -- aldrig Courseplay med tom tank (den kører kurset uden at sprede/så) @@ -1817,21 +1391,7 @@ local function beginWork(adEnv, field, info, assignment) end end assignment.unfoldedForWidth = nil - -- høsteren: halmskår efter planen (hakkes = fra; samles op/presses = skår) - if assignment.role == "harvester" then - local keepStraw = field.plan.straw == "collect" or field.plan.straw == "bale" - ADCpBridge.setStrawSwath(vehicle, keepStraw) - -- høsteren sendes IKKE selv til lager med resten (in-game 27/9: den er for stor til at komme til lageret). - -- Courseplay venter selv ved kursets ende til tømmevognene har tømt tanken (WAITING_FOR_UNLOAD_AFTER_ - -- FIELDWORK_ENDED), og tømmevognene bliver på marken, så længe høsterens CP-job kører. - end - -- vinmark: kurset i gangen (ikke på vinen), ellers kører maskinen ind i stolperne - local vineOffset = ADCpBridge.vineOffsetFor(info.fruitName, assignment.role) - if vineOffset ~= nil and ADCpBridge.setVineOffset(vehicle, vineOffset) then - local skip = ADCpBridge.vineSkipFor(info.fruitName, assignment.role) or 0 - ADCpBridge.setVineSkip(vehicle, skip) - log(field.id, "vinmark: Courseplay-kurset lægges %s, springer %d række(r) over", vineOffset == 0 and "på vinen (høster)" or "til venstre for vinen (i gangen)", skip) - end + applyCourseTweaks(field, info, assignment, vehicle) local opts, source = courseOptions(adEnv, field, assignment) if opts == nil then -- følger uden lederens kursus endnu @@ -1841,113 +1401,8 @@ local function beginWork(adEnv, field, info, assignment) end return end - if assignment.role == "collector" then - if not prepareCollector(adEnv, field, info, assignment) then return end - assignment.adHandlesEnd = true - elseif assignment.role == "seeder" or assignment.role == "fertilizer" or assignment.role == "limer" or assignment.role == "weeder" then - prepareRefill(adEnv, field, info, assignment) - end - if assignment.role == "seeder" then - local okSeed, seedError = ADCpBridge.setSeedFruit(vehicle, ADFieldWork.sowFruitIndex(field)) - if not okSeed then - ADFieldWork.release(assignment) - fail(field.id, "såmaskine: " .. tostring(seedError)) - return - end - end - -- slåmaskine: ingen sideforskydning (en gammel 2,1 m fra et tidligere rive-kursus sad fast på BiG M 450, 9/10) - if assignment.role == "mower" then - local own = ADCpBridge.getToolOffset(vehicle) - if type(own) == "number" and math.abs(own) > 0.05 and ADCpBridge.setToolOffset(vehicle, 0) then - log(field.id, "'%s' sideforskydning %.1f m -> 0 (slåmaskine)", ADRuns.vehicleLabel(vehicle), own) - end - end - -- kun læssevognen følger skårene; en slåmaskine på et genbrugt rive-kursus må ikke forskydes (in-game 9/10: - -- BiG M 450 på F6 kørte med 2,1 m forskydning) - if assignment.role == "collector" and source == "rake" and field.windrowOffset ~= nil and math.abs(field.windrowOffset) > 0.05 then - local own = ADCpBridge.getToolOffset(vehicle) - local target = ADFieldModel.collectorOffset(own, field.windrowOffset) - if ADCpBridge.setToolOffset(vehicle, target) then - assignment.restoreToolOffset = own - log(field.id, "skår ligger %.1f m %s for rivens linje -> læssevognens forskydning %.1f m (var %.1f m)", - math.abs(field.windrowOffset), field.windrowOffset > 0 and "til venstre" or "til højre", target, own) - end - end - -- punktet nærmest traktoren: CP lægger kursets start dér (ikke i den anden ende af marken) - local vx, vz = vehiclePosition(assignment.vehicle) - local cropStage = field.stage == "harvesting" or field.stage == "mowing" - local point = ADFieldJobs.coursePoint(info.points, vx, vz, cropStage and info.fruitIndex or nil) or {x = info.x, z = info.z} - -- kontrakt der køres igen: markpunktet længst væk (spillets markkant fandt kun det stykke, maskinen står på) - if field.contract and (field.contractPasses or 0) > 0 then - point = ADFieldJobs.farthestPoint(info.points, vx, vz) or point - end - -- genbrug af Courseplay-kurser: maskinens eget / en andens matchende kursus frem for ny beregning - local cacheContext - opts, cacheContext = ADCourseCache.prepare(adEnv, field, info, assignment, opts) - -- påbegyndt mark: fortsæt/start nærmest i stedet for forfra (CP's standard) - opts = opts or {} - local remembered = vehicle.getCpLastRememberedWaypointIx ~= nil and vehicle:getCpLastRememberedWaypointIx() ~= nil - opts.startAt = ADFieldJobs.startAtFor({reuse = opts.reuse == true, remembered = remembered, stage = field.stage, - standingRatio = info.standingRatio}) - if opts.startAt ~= "first" then log(field.id, "'%s' starter kurset ved %s punkt (marken er påbegyndt)", ADRuns.vehicleLabel(vehicle), opts.startAt == "last" and "sidste" or "nærmeste") end - -- kursets start inde på marken, ikke ved maskinen ude ved vejen - opts.startX, opts.startZ = ADFieldJobs.startInsideField(info.verts, vx, vz, point.x, point.z, 15) - assignment.phase = "starting" - assignment.since = now() - -- Courseplay lægger kursets start ved markpunktet (ikke ved maskinen): brug punktet på marken lige ved maskinen, så - -- den begynder, hvor den holder (in-game 10/10: markpunktet lå 350 m inde på F14 -> "udflugt", også med 15 m) - local fieldX, fieldZ = opts.startX or point.x, opts.startZ or point.z - if not (#(info.verts or {}) >= 3 and ADFieldJobs.insidePolygon(fieldX, fieldZ, info.verts)) then fieldX, fieldZ = point.x, point.z end - local handle, err = ADCpBridge.start(vehicle, fieldX, fieldZ, function(ok, reason) - if ok then - assignment.phase = "working" - assignment.since = now() - ADCourseCache.afterStart(vehicle, assignment.vehicleId, cacheContext) - if assignment.role == "mower" then - -- mål bredden igen nu: lige efter koblingen kan Courseplay endnu ikke have talt bagslåmaskinen med - -- (in-game 8/10: KDF 341 + KDD 941 målt 3,4 m 0,2 s efter koblingen, 9,4 m et sekund efter) - local okNow, widthNow = pcall(ADCpBridge.getWorkWidth, vehicle) - if okNow and type(widthNow) == "number" and widthNow > 0 then assignment.width = widthNow end - note(field.id, {mowWidth = assignment.width, mowVehicleId = assignment.vehicleId}) - rememberCourse(field, "mower", vehicle) - elseif assignment.role == "rake" then - note(field.id, {rakeVehicleId = assignment.vehicleId}) - rememberCourse(field, "rake", vehicle) - elseif assignment.role == "harvester" then - note(field.id, {harvestVehicleId = assignment.vehicleId}) - rememberCourse(field, "harvester", vehicle) - ensureHarvesterStops(assignment) - end - if assignment.leader and (assignment.groupSize or 1) > 1 then - rememberCourse(field, field.stage, vehicle) - end - log(field.id, "Courseplay startet (%s%s%s)", assignment.role, - reason == "copied" and source ~= nil and (", " .. tostring(source) .. "-kursus kopieret") or "", - assignment.lane ~= nil and string.format(", bane %d", assignment.lane) or "") - else - ADFieldWork.release(assignment) - fail(field.id, "Courseplay fejlede: " .. tostring(reason)) - -- kan Courseplay slet ikke lave et kursus (markgrænsen), hjælper et nyt forsøg om 5 min ikke: vent 30 min - -- (in-game 10/10: F2 sendte den næste mejetærsker ud efter 52 s) - if tostring(reason):find("kursus") or tostring(reason):find("markgrænsen") then - note(field.id, {retryAt = now() + ADFieldWork.COURSE_FAIL_RETRY_MS}) - end - -- ikke efterladt på marken med redskabet foldet ud: hjem (skærebord på transporthjul sættes bag på først); - -- in-game 10/10: Mejetærsker 2 blev stående med skærebordet foran og valgt til en anden mark - if not (ADHitch ~= nil and ADHitch.returnHome(adEnv, vehicle)) then - local park = parkMarkerId(adEnv, vehicle) - if park ~= nil and not (ADHeaderSwap ~= nil and ADHeaderSwap.headerPosition(vehicle) == "front") then - startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, park, nil) - end - end - end - end, opts) - if handle == nil then - ADFieldWork.release(assignment) - fail(field.id, "Courseplay kunne ikke startes: " .. tostring(err)) - return - end - assignment.handle = handle + if not prepareRoleTools(adEnv, field, info, assignment, source) then return end + startCourse(adEnv, field, info, assignment, opts, source) end -- Tom for påfyldningsvaren — kun når redskabet stadig sidder på. AutoDrives parkering efter jobbet kan have sat @@ -2712,37 +2167,40 @@ followHeaderSwap = function(adEnv, field, info, assignment) finishAssignment(adEnv, assignment) end -function ADFieldWork.follow(adEnv, assignment) - local vehicle = assignment.vehicle - -- spillets hjælper fandt ingen vej (kortet mangler AI-veje dertil, in-game 10/10 North Frisian F2): Courseplay står - -- stille uden for marken -> stop, og bed spilleren køre sættet derud (spillerkørsel, uden hjælper for denne opgave) - if assignment.giants and not assignment.arrived and assignment.phase == "working" and not ADCpBridge.isWorking(vehicle) then - assignment.giantsIdleSince = assignment.giantsIdleSince or now() - if now() - assignment.giantsIdleSince >= ADFieldWork.GIANTS_GIVE_UP_MS then - pcall(ADCpBridge.stop, vehicle) - assignment.phase, assignment.since = "awaitingPlayer", now() - assignment.manual, assignment.playerTransport, assignment.giants = true, true, nil - assignment.giantsFailed, assignment.remindedAt, assignment.readySince = true, nil, nil - log(assignment.fieldId, "spillets hjælper fandt ingen vej til F%s med '%s' — spilleren bedes køre den derud", - tostring(assignment.fieldId), ADRuns.vehicleLabel(vehicle)) - return - end - -- (ikke videre til followWorking: dens CP-genstart ville skjule, at hjælperen har opgivet) - return - else +-- Spillets hjælper fandt ingen vej (kortet mangler AI-veje dertil, in-game 10/10 North Frisian F2): Courseplay står +-- stille uden for marken -> stop, og bed spilleren køre sættet derud (spillerkørsel, uden hjælper for denne opgave). +-- -> true når follow skal stoppe her (ikke videre til followWorking: dens CP-genstart ville skjule, at hjælperen har opgivet) +local function followGiants(adEnv, assignment, vehicle) + if not (assignment.giants and not assignment.arrived and assignment.phase == "working" and not ADCpBridge.isWorking(vehicle)) then assignment.giantsIdleSince = nil + return false end - -- spillets hjælper kører ud til kontraktmarken: fremme, når maskinen står inde på marken (tømmevogne venter til da) - if assignment.giants and not assignment.arrived then - local giantsInfo = ADFields.getInfo(assignment.fieldId) - local gx, gz = vehiclePosition(vehicle) - if giantsInfo ~= nil and #(giantsInfo.verts or {}) >= 3 and ADFieldJobs.insidePolygon(gx, gz, giantsInfo.verts) then - assignment.arrived = true - log(assignment.fieldId, "'%s' er fremme på marken (spillets hjælper)", ADRuns.vehicleLabel(vehicle)) - end + assignment.giantsIdleSince = assignment.giantsIdleSince or now() + if now() - assignment.giantsIdleSince >= ADFieldWork.GIANTS_GIVE_UP_MS then + pcall(ADCpBridge.stop, vehicle) + assignment.phase, assignment.since = "awaitingPlayer", now() + assignment.manual, assignment.playerTransport, assignment.giants = true, true, nil + assignment.giantsFailed, assignment.remindedAt, assignment.readySince = true, nil, nil + log(assignment.fieldId, "spillets hjælper fandt ingen vej til F%s med '%s' — spilleren bedes køre den derud", + tostring(assignment.fieldId), ADRuns.vehicleLabel(vehicle)) end - -- Kun når spilleren selv KØRER (bevæger sig uden Courseplay/AutoDrive) slippes sættet — at sidde i - -- førersædet og kigge må ikke slippe det (in-game 25/9). + return true +end + +-- Spillets hjælper kører ud til kontraktmarken: fremme, når maskinen står inde på marken (tømmevogne venter til da). +local function followGiantsArrival(assignment, vehicle) + if not (assignment.giants and not assignment.arrived) then return end + local giantsInfo = ADFields.getInfo(assignment.fieldId) + local gx, gz = vehiclePosition(vehicle) + if giantsInfo ~= nil and #(giantsInfo.verts or {}) >= 3 and ADFieldJobs.insidePolygon(gx, gz, giantsInfo.verts) then + assignment.arrived = true + log(assignment.fieldId, "'%s' er fremme på marken (spillets hjælper)", ADRuns.vehicleLabel(vehicle)) + end +end + +-- Kun når spilleren selv KØRER (bevæger sig uden Courseplay/AutoDrive) slippes sættet — at sidde i førersædet og +-- kigge må ikke slippe det (in-game 25/9). -> true når sættet er sluppet +local function followPlayerTakeover(assignment, vehicle) local steeredByAi = ADCpBridge.isWorking(vehicle) or isAdActive(vehicle) or assignment.phase == "starting" local speed = vehicle.getLastSpeed ~= nil and vehicle:getLastSpeed() or 0 -- skal holde i PLAYER_DRIVING_MS: AutoDrive slipper et øjeblik ved rute-skift/genstart, mens maskinen ruller @@ -2770,241 +2228,294 @@ function ADFieldWork.follow(adEnv, assignment) -- husk den: står spilleren af ved marken, overtager moden igen (ADFieldWork.tickReadopt) ADFieldWork.taken[assignment.vehicleId] = {fieldId = assignment.fieldId, role = assignment.role, stage = assignment.stage, helper = assignment.helper, fillType = assignment.fillType, at = now()} - return ADFieldWork.release(assignment) + ADFieldWork.release(assignment) + return true end + return false +end + +-- Koblingen fejlede: den skyldige i karantæne (kom traktoren ikke frem, er det traktoren), hjem, prøv igen. +-- Kombi: det trin der fejlede afgør redskabet (8/10) +local function fetchFailed(adEnv, assignment, vehicle, hitch) + local pool = assignment.pool + local blamed, failed = ADPool.blame(hitch.detail, assignment.vehicleId, + pool.implements or {{id = pool.implementId, name = pool.implementName}}, hitch.failedIndex) + ADPool.quarantine(blamed, now()) + ADFieldWork.release(assignment) + note(assignment.fieldId, {retryAt = ADPool.alignedRetry(now(), ADFieldWork.NO_RIG_RETRY_MS), + reason = {text = string.format("kunne ikke koble '%s' på (%s) — prøver et andet om lidt", + tostring(failed.name), tostring(hitch.detail))}}) + -- er bagslåmaskinen allerede på (fronten fejlede), sættes den af på sin P før traktoren kører hjem + local dropped = (hitch.failedIndex or 1) > 1 and ADHitch.returnHome(adEnv, vehicle) + local park = parkMarkerId(adEnv, vehicle) + if not dropped and park ~= nil then startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, park, nil) end +end + +-- Koblet på: variabel bredde stilles (Unrealistic), sammenfoldet til vejen, bredden måles med redskabet på. Passer +-- redskabet ikke, sættes det tilbage; tom såmaskine/sprøjte fyldes op på vejen (uden påfyldning køres den hjem igen). +local function fetchDone(adEnv, field, info, assignment, vehicle) + local okVar, errVar = pcall(ADCpBridge.setVariableWidth, vehicle) + if not okVar then Logging.warning("ADSmartPickup: bredde: %s", tostring(errVar)) end + pcall(ADHitch.foldForTransport, vehicle) + local width = ADCpBridge.getWorkWidth(vehicle, assignment.role) + -- skærebord på transporthjul bag mejetærskeren: arbejdsbredden måles først, når det sidder foran + if assignment.headerSwap ~= nil and (width or 0) < ADFieldModel.MIN_WORK_WIDTH then width = assignment.width end + local okWidth, widthReason, widthArgs = ADFieldModel.checkWidth(assignment.role, width, ADFieldModel.requiredWidth(field, assignment.role)) + if not okWidth then + -- redskabet passer ikke til opgaven: karantæne, ellers hentes det igen og igen (in-game 6/10: Servo 25 til F9) + log(assignment.fieldId, "%s: '%s' med '%s' passer ikke (%s, bredde %.1f m) — redskabet sættes tilbage og prøves ikke foreløbig", + tostring(assignment.role), ADRuns.vehicleLabel(vehicle), tostring(assignment.pool.implementName), tostring(widthReason), tonumber(width) or -1) + for _, item in ipairs(assignment.pool.implements or {{id = assignment.pool.implementId}}) do + ADPool.quarantine(item.id, now()) + end + ADFieldWork.release(assignment) + note(assignment.fieldId, {retryAt = now() + ADFieldModel.RETRY_MS, reason = {key = "spu_field_reason_" .. tostring(widthReason), role = assignment.role, args = widthArgs}}) + ADHitch.returnHome(adEnv, vehicle) + return + end + -- som almindelig udsendelse: tom såmaskine/sprøjte fyldes op på vejen, uden påfyldning køres den hjem igen + local refill = refillPlan(adEnv, assignment.fieldId, vehicle, assignment.role, info.x, info.z) + local nextDrive = ADPool.nextDrive(refill) + if nextDrive == "empty" and startPalletRefill(adEnv, assignment, vehicle, refill.fillType, assignment.pool.implementName) then + assignment.width = width + return + end + if nextDrive == "empty" then + ADFieldWork.release(assignment) + ADHitch.returnHome(adEnv, vehicle) + fail(assignment.fieldId, string.format("'%s' er tom for %s og der er ingen påfyldning med AutoDrive-markør — fyld den op", + tostring(assignment.pool.implementName), fillTypeName(refill.fillType))) + return + end + assignment.width, assignment.phase, assignment.since = width, "driving", now() + assignment.startX, assignment.startZ = vehiclePosition(vehicle) + if nextDrive == "load" then + startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_LOAD, info.markerId, refill.refillId, refill.fillType) + assignment.drive = {mode = adEnv.AutoDrive.MODE_LOAD, first = info.markerId, second = refill.refillId, fillType = refill.fillType} + else + startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, info.markerId, nil) + assignment.drive = {mode = adEnv.AutoDrive.MODE_DRIVETO, first = info.markerId} + end + note(assignment.fieldId, {reason = false}) + log(assignment.fieldId, "%s '%s' har '%s' på — kører til %s (%.1f m)", assignment.role, ADRuns.vehicleLabel(vehicle), + tostring(assignment.pool.implementName), tostring(info.markerName), width or 0) +end + +-- Fase "fetching": traktoren henter et puljeredskab (ADHitch melder i assignment.hitch, når koblingen er afgjort). +local function followFetching(adEnv, field, info, assignment, vehicle) + local hitch = assignment.hitch + if not hitch.done then return end + ADPool.release(assignment) + if info == nil or field == nil then + -- marken findes ikke længere (fx solgt): redskabet tilbage, traktoren hjem + ADFieldWork.release(assignment) + if hitch.ok then ADHitch.returnHome(adEnv, vehicle) end + return + end + if not hitch.ok then return fetchFailed(adEnv, assignment, vehicle, hitch) end + fetchDone(adEnv, field, info, assignment, vehicle) +end + +-- AD hænger ved markmarkøren (aktiv, stille ved et af de sidste vejpunkter): stop den, så marken går i gang. +local function stopIfStalled(adEnv, assignment, vehicle, info, px, pz, targetDistance) + local speed = vehicle.getLastSpeed ~= nil and vehicle:getLastSpeed() or 0 + local wpLeft = nil + local dpm = vehicle.ad ~= nil and vehicle.ad.drivePathModule or nil + if dpm ~= nil and dpm.getWayPoints ~= nil then + local okWp, wayPoints, current = pcall(dpm.getWayPoints, dpm) + if okWp and type(wayPoints) == "table" and type(current) == "number" then wpLeft = #wayPoints - current end + end + if speed > ADFieldJobs.STALL_SPEED then + assignment.stillSince = nil + elseif assignment.stillSince == nil then + assignment.stillSince = now() + end + local stillMs = assignment.stillSince ~= nil and now() - assignment.stillSince or 0 + -- påfyldning tæt på marken (LOAD): står den ved påfyldningsstedet, læsser den — det er ikke at hænge + local refillPoint = assignment.drive ~= nil and assignment.drive.second ~= nil and adEnv.ADGraphManager:getWayPointById(assignment.drive.second) or nil + if refillPoint ~= nil and math.sqrt((refillPoint.x - px) ^ 2 + (refillPoint.z - pz) ^ 2) <= ADFieldJobs.STALL_ARRIVE_M then + stillMs = 0 + end + if ADFieldJobs.stalledAtTarget({adActive = true, speed = speed, wpLeft = wpLeft, distance = targetDistance, stillMs = stillMs}) then + log(assignment.fieldId, "'%s' holdt stille %.0f s ved %s (%.0f m, %s vejpunkt(er) tilbage) — AutoDrive stoppes, arbejdet starter", + ADRuns.vehicleLabel(vehicle), stillMs / 1000, tostring(info ~= nil and info.markerName or "?"), targetDistance, tostring(wpLeft)) + assignment.stillSince = nil + stopAd(vehicle) + assignment.since = now() - 2001 + end +end + +-- AutoDrive er stoppet: fremme ved marken -> skærebord/arbejde; ellers ingen rute, kør videre, eller opgiv og kør hjem. +local function afterDrive(adEnv, field, info, assignment, vehicle) + local x, z = vehiclePosition(vehicle) + local wayPoint = info ~= nil and adEnv.ADGraphManager:getWayPointById(info.markerId) or nil + local distance = wayPoint ~= nil and math.sqrt((wayPoint.x - x) ^ 2 + (wayPoint.z - z) ^ 2) or math.huge + if distance <= ADFieldWork.ARRIVE_DISTANCE then + local swapState = ADFieldWork.startHeaderSwap(adEnv, assignment, "front") + if swapState == "none" then + beginWork(adEnv, field, info, assignment) + elseif swapState == "failed" then + headerMountFailed(adEnv, assignment, assignment.headerSwap ~= nil and assignment.headerSwap.text or "?") + end + elseif assignment.startX ~= nil and math.sqrt((x - assignment.startX) ^ 2 + (z - assignment.startZ) ^ 2) < ADFieldWork.NO_MOVE_DISTANCE + and (assignment.driveRetries or 0) >= 1 then + -- AD startede og stoppede uden at flytte sig (to gange): ingen rute — genforsøg hjælper ikke + ADFieldWork.release(assignment) + fail(assignment.fieldId, string.format("AutoDrive fandt ingen rute fra '%s' til %s — står den uden for vejnettet?", ADRuns.vehicleLabel(vehicle), tostring(info ~= nil and info.markerName or "?"))) + elseif assignment.drive ~= nil and (assignment.driveRetries or 0) < ADFieldWork.DRIVE_RETRIES then + -- AutoDrive stoppede undervejs (spilleren byggede, trafik, ...): kør videre i stedet for at opgive + assignment.driveRetries = (assignment.driveRetries or 0) + 1 + assignment.since = now() + local d = assignment.drive + startAd(adEnv, vehicle, d.mode, d.first, d.second, d.fillType) + log(assignment.fieldId, "'%s' stoppede %.0f m fra %s — AutoDrive startes igen (%d/%d)", ADRuns.vehicleLabel(vehicle), distance, + tostring(info ~= nil and info.markerName or "?"), assignment.driveRetries, ADFieldWork.DRIVE_RETRIES) + else + ADFieldWork.release(assignment) + fail(assignment.fieldId, string.format("%s nåede ikke %s (%.0f m væk)", ADRuns.vehicleLabel(vehicle), tostring(info ~= nil and info.markerName or "?"), distance)) + -- ikke efterladt midt på vejen/ved en mark: hjem til parkeringen (puljeredskab sættes af først) + if not (ADHitch ~= nil and ADHitch.returnHome(adEnv, vehicle)) then + local park = parkMarkerId(adEnv, vehicle) + if park ~= nil then startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, park, nil) end + end + end +end + +-- Fase "driving": AutoDrive kører sættet til marken (evt. via påfyldning). Spilleren kan holde pause eller tage over. +local function followDriving(adEnv, field, info, assignment, vehicle) + local px, pz = vehiclePosition(vehicle) + local target = info ~= nil and adEnv.ADGraphManager:getWayPointById(info.markerId) or nil + local targetDistance = target ~= nil and math.sqrt((target.x - px) ^ 2 + (target.z - pz) ^ 2) or math.huge + local arrived = targetDistance <= ADFieldWork.ARRIVE_DISTANCE + local adState = vehicle.ad ~= nil and vehicle.ad.stateModule or nil + local firstMarker = adState ~= nil and adState.getFirstMarker ~= nil and adState:getFirstMarker() or nil + local otherTarget = assignment.drive ~= nil and firstMarker ~= nil and firstMarker.id ~= nil and firstMarker.id ~= assignment.drive.first + local pause = ADFieldJobs.drivePause({adActive = isAdActive(vehicle), controlled = isControlledByPlayer(vehicle), + paused = assignment.playerPaused, arrived = arrived, otherTarget = otherTarget}) + if pause == "release" then + log(assignment.fieldId, "'%s' frigivet — spilleren gav AutoDrive et andet mål (%s)", ADRuns.vehicleLabel(vehicle), tostring(firstMarker.name)) + ADFieldWork.taken[assignment.vehicleId] = {fieldId = assignment.fieldId, role = assignment.role, stage = assignment.stage, + helper = assignment.helper, fillType = assignment.fillType, at = now()} + return ADFieldWork.release(assignment) + elseif pause == "wait" then + -- spilleren har slået AD fra og kører den fri af en anden: vent på ham (in-game 11/10) + assignment.playerPaused, assignment.since, assignment.stillSince = true, now(), nil + return + elseif pause == "clear" then + assignment.playerPaused = nil + elseif pause == "resume" and assignment.drive == nil then + assignment.playerPaused = nil + elseif pause == "resume" then + assignment.playerPaused, assignment.since, assignment.stillSince = nil, now(), nil + assignment.startX, assignment.startZ = vehiclePosition(vehicle) + local d = assignment.drive + startAd(adEnv, vehicle, d.mode, d.first, d.second, d.fillType) + log(assignment.fieldId, "'%s': spilleren steg af — kører videre til %s", ADRuns.vehicleLabel(vehicle), tostring(info ~= nil and info.markerName or "?")) + return + end + if isAdActive(vehicle) then return stopIfStalled(adEnv, assignment, vehicle, info, px, pz, targetDistance) end + assignment.stillSince = nil + if now() - assignment.since > 2000 then afterDrive(adEnv, field, info, assignment, vehicle) end +end + +-- Fase "palletRefill": fyldes fra paller (ADPalletRefill); færdig -> AutoDrive til marken. +local function followPalletRefill(adEnv, field, info, assignment, vehicle) + local okTick, result, why = pcall(ADPalletRefill.tick, adEnv, assignment, ADFieldJobs.TICK_MS or 1000) + if not okTick then + result, why = "failed", tostring(result) + end + if result == "done" then + log(assignment.fieldId, "'%s' fyldt op med %.0f %s fra paller — kører til %s", ADRuns.vehicleLabel(vehicle), assignment.pallet.filled or 0, + ADPalletRefill.fillName(assignment.pallet.fillType), tostring(info ~= nil and info.markerName or "?")) + assignment.pallet = nil + assignment.phase, assignment.since = "driving", now() + assignment.startX, assignment.startZ = vehiclePosition(vehicle) + startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, info.markerId, nil) + assignment.drive = {mode = adEnv.AutoDrive.MODE_DRIVETO, first = info.markerId} + elseif result == "failed" then + ADFieldWork.release(assignment) + fail(assignment.fieldId, string.format("påfyldning fra paller mislykkedes for '%s' (%s)", ADRuns.vehicleLabel(vehicle), tostring(why))) + if not (ADHitch ~= nil and ADHitch.returnHome(adEnv, vehicle)) then + local park = parkMarkerId(adEnv, vehicle) + if park ~= nil then startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, park, nil) end + end + end +end + +-- Fase "unfolding": udfoldet (eller 20 s gået): mål og start. +local function followUnfolding(adEnv, field, info, assignment, vehicle) + if ADCpBridge.variableWidthUnfolded(vehicle) or now() - assignment.since > ADFieldWork.UNFOLD_WAIT_MS then + assignment.unfoldedForWidth = true + beginWork(adEnv, field, info, assignment) + end +end + +-- Fase "waitingCourse": multi-tool-følger venter på lederens kursus. +local function followWaitingCourse(adEnv, field, info, assignment, vehicle) + if now() - assignment.since > ADFieldWork.COURSE_WAIT_MS then + ADFieldWork.release(assignment) + ADHitch.returnHome(adEnv, vehicle) + fail(assignment.fieldId, "multi-tool: lederens kursus kom ikke (3 min)") + elseif coursesOf(field.id)[field.stage] ~= nil then + beginWork(adEnv, field, info, assignment) + end +end + +-- Fase "starting": Courseplay er bedt om at starte (kursus lægges asynkront). +local function followStarting(adEnv, field, info, assignment, vehicle) + local generating = assignment.handle ~= nil and assignment.handle.generating == true + if ADFieldJobs.startTimedOut(now() - assignment.since, generating) then + ADFieldWork.release(assignment) + ADHitch.returnHome(adEnv, vehicle) + fail(assignment.fieldId, generating and "Courseplay blev ikke færdig med kurset (5 min)" or "Courseplay svarede ikke (60 s)") + end +end + +-- Fase "working": bredde-vagt (variabel bredde må ikke springe tilbage), og så arbejdets forløb. +local function followWorkingPhase(adEnv, field, info, assignment, vehicle) + local t = now() + if t - (assignment.widthCheckAt or 0) >= ADFieldWork.WIDTH_GUARD_MS then + assignment.widthCheckAt = t + local okGuard, errGuard = pcall(ADCpBridge.guardVariableWidth, vehicle) + if not okGuard then Logging.warning("ADSmartPickup: bredde-vagt: %s", tostring(errGuard)) end + end + followWorking(adEnv, field, assignment) +end + +-- Fase "queuedSwap": den anden mejetærsker høster nu: hent skærebordet og kør ud. +local function followQueuedSwap(adEnv, field, info, assignment, vehicle) + if field == nil or info == nil then return ADFieldWork.release(assignment) end + if not ADFieldWork.swapInProgress(assignment.fieldId, assignment) then + ADFieldWork.startHeaderFetch(adEnv, assignment) + log(assignment.fieldId, "harvester: '%s' henter nu skærebordet '%s'", ADRuns.vehicleLabel(vehicle), tostring(assignment.pool.implementName)) + end +end + +-- fase -> opfølgning(adEnv, field, info, assignment, vehicle) +local PHASE_FOLLOW = { + fetching = followFetching, + driving = followDriving, + palletRefill = followPalletRefill, + unfolding = followUnfolding, + waitingCourse = followWaitingCourse, + starting = followStarting, + working = followWorkingPhase, + awaitingPlayer = function(adEnv, field, info, assignment) followManual(adEnv, field, info, assignment) end, + mountingHeader = function(adEnv, field, info, assignment) followHeaderSwap(adEnv, field, info, assignment) end, + unmountingHeader = function(adEnv, field, info, assignment) followHeaderSwap(adEnv, field, info, assignment) end, + queuedSwap = followQueuedSwap, +} + +function ADFieldWork.follow(adEnv, assignment) + local vehicle = assignment.vehicle + if followGiants(adEnv, assignment, vehicle) then return end + followGiantsArrival(assignment, vehicle) + if followPlayerTakeover(assignment, vehicle) then return end local field = ADFieldJobs.getField(assignment.fieldId) local info = ADFields.getInfo(assignment.fieldId) wake(vehicle) - if assignment.phase == "fetching" then - local hitch = assignment.hitch - if not hitch.done then return end - ADPool.release(assignment) - if info == nil or field == nil then - -- marken findes ikke længere (fx solgt): redskabet tilbage, traktoren hjem - ADFieldWork.release(assignment) - if hitch.ok then ADHitch.returnHome(adEnv, vehicle) end - return - end - if not hitch.ok then - -- koblingen fejlede: den skyldige i karantæne (kom traktoren ikke frem, er det traktoren), hjem, prøv igen. - -- Kombi: det trin der fejlede afgør redskabet (8/10) - local pool = assignment.pool - local blamed, failed = ADPool.blame(hitch.detail, assignment.vehicleId, - pool.implements or {{id = pool.implementId, name = pool.implementName}}, hitch.failedIndex) - ADPool.quarantine(blamed, now()) - ADFieldWork.release(assignment) - note(assignment.fieldId, {retryAt = ADPool.alignedRetry(now(), ADFieldWork.NO_RIG_RETRY_MS), - reason = {text = string.format("kunne ikke koble '%s' på (%s) — prøver et andet om lidt", - tostring(failed.name), tostring(hitch.detail))}}) - -- er bagslåmaskinen allerede på (fronten fejlede), sættes den af på sin P før traktoren kører hjem - local dropped = (hitch.failedIndex or 1) > 1 and ADHitch.returnHome(adEnv, vehicle) - local park = parkMarkerId(adEnv, vehicle) - if not dropped and park ~= nil then startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, park, nil) end - return - end - -- koblet på: variabel bredde stilles (Unrealistic), sammenfoldet til vejen, bredden med redskabet på - local okVar, errVar = pcall(ADCpBridge.setVariableWidth, vehicle) - if not okVar then Logging.warning("ADSmartPickup: bredde: %s", tostring(errVar)) end - pcall(ADHitch.foldForTransport, vehicle) - local width = ADCpBridge.getWorkWidth(vehicle, assignment.role) - -- skærebord på transporthjul bag mejetærskeren: arbejdsbredden måles først, når det sidder foran - if assignment.headerSwap ~= nil and (width or 0) < ADFieldModel.MIN_WORK_WIDTH then width = assignment.width end - local okWidth, widthReason, widthArgs = ADFieldModel.checkWidth(assignment.role, width, ADFieldModel.requiredWidth(field, assignment.role)) - if not okWidth then - -- redskabet passer ikke til opgaven: karantæne, ellers hentes det igen og igen (in-game 6/10: Servo 25 til F9) - log(assignment.fieldId, "%s: '%s' med '%s' passer ikke (%s, bredde %.1f m) — redskabet sættes tilbage og prøves ikke foreløbig", - tostring(assignment.role), ADRuns.vehicleLabel(vehicle), tostring(assignment.pool.implementName), tostring(widthReason), tonumber(width) or -1) - for _, item in ipairs(assignment.pool.implements or {{id = assignment.pool.implementId}}) do - ADPool.quarantine(item.id, now()) - end - ADFieldWork.release(assignment) - note(assignment.fieldId, {retryAt = now() + ADFieldModel.RETRY_MS, reason = {key = "spu_field_reason_" .. tostring(widthReason), role = assignment.role, args = widthArgs}}) - ADHitch.returnHome(adEnv, vehicle) - return - end - -- som almindelig udsendelse: tom såmaskine/sprøjte fyldes op på vejen, uden påfyldning køres den hjem igen - local refill = refillPlan(adEnv, assignment.fieldId, vehicle, assignment.role, info.x, info.z) - local nextDrive = ADPool.nextDrive(refill) - if nextDrive == "empty" and startPalletRefill(adEnv, assignment, vehicle, refill.fillType, assignment.pool.implementName) then - assignment.width = width - return - end - if nextDrive == "empty" then - ADFieldWork.release(assignment) - ADHitch.returnHome(adEnv, vehicle) - fail(assignment.fieldId, string.format("'%s' er tom for %s og der er ingen påfyldning med AutoDrive-markør — fyld den op", - tostring(assignment.pool.implementName), fillTypeName(refill.fillType))) - return - end - assignment.width, assignment.phase, assignment.since = width, "driving", now() - assignment.startX, assignment.startZ = vehiclePosition(vehicle) - if nextDrive == "load" then - startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_LOAD, info.markerId, refill.refillId, refill.fillType) - assignment.drive = {mode = adEnv.AutoDrive.MODE_LOAD, first = info.markerId, second = refill.refillId, fillType = refill.fillType} - else - startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, info.markerId, nil) - assignment.drive = {mode = adEnv.AutoDrive.MODE_DRIVETO, first = info.markerId} - end - note(assignment.fieldId, {reason = false}) - log(assignment.fieldId, "%s '%s' har '%s' på — kører til %s (%.1f m)", assignment.role, ADRuns.vehicleLabel(vehicle), - tostring(assignment.pool.implementName), tostring(info.markerName), width or 0) - elseif assignment.phase == "driving" then - local px, pz = vehiclePosition(vehicle) - local target = info ~= nil and adEnv.ADGraphManager:getWayPointById(info.markerId) or nil - local targetDistance = target ~= nil and math.sqrt((target.x - px) ^ 2 + (target.z - pz) ^ 2) or math.huge - local arrived = targetDistance <= ADFieldWork.ARRIVE_DISTANCE - local stateModule = vehicle.ad ~= nil and vehicle.ad.stateModule or nil - local firstMarker = stateModule ~= nil and stateModule.getFirstMarker ~= nil and stateModule:getFirstMarker() or nil - local otherTarget = assignment.drive ~= nil and firstMarker ~= nil and firstMarker.id ~= nil and firstMarker.id ~= assignment.drive.first - local pause = ADFieldJobs.drivePause({adActive = isAdActive(vehicle), controlled = isControlledByPlayer(vehicle), - paused = assignment.playerPaused, arrived = arrived, otherTarget = otherTarget}) - if pause == "release" then - log(assignment.fieldId, "'%s' frigivet — spilleren gav AutoDrive et andet mål (%s)", ADRuns.vehicleLabel(vehicle), tostring(firstMarker.name)) - ADFieldWork.taken[assignment.vehicleId] = {fieldId = assignment.fieldId, role = assignment.role, stage = assignment.stage, - helper = assignment.helper, fillType = assignment.fillType, at = now()} - return ADFieldWork.release(assignment) - elseif pause == "wait" then - -- spilleren har slået AD fra og kører den fri af en anden: vent på ham (in-game 11/10) - assignment.playerPaused, assignment.since, assignment.stillSince = true, now(), nil - return - elseif pause == "clear" then - assignment.playerPaused = nil - elseif pause == "resume" and assignment.drive == nil then - assignment.playerPaused = nil - elseif pause == "resume" then - assignment.playerPaused, assignment.since, assignment.stillSince = nil, now(), nil - assignment.startX, assignment.startZ = vehiclePosition(vehicle) - local d = assignment.drive - startAd(adEnv, vehicle, d.mode, d.first, d.second, d.fillType) - log(assignment.fieldId, "'%s': spilleren steg af — kører videre til %s", ADRuns.vehicleLabel(vehicle), tostring(info ~= nil and info.markerName or "?")) - return - end - -- AD hænger ved markmarkøren (aktiv, stille ved et af de sidste vejpunkter): stop den, så marken går i gang - if isAdActive(vehicle) then - local speed = vehicle.getLastSpeed ~= nil and vehicle:getLastSpeed() or 0 - local wpLeft = nil - local dpm = vehicle.ad ~= nil and vehicle.ad.drivePathModule or nil - if dpm ~= nil and dpm.getWayPoints ~= nil then - local okWp, wayPoints, current = pcall(dpm.getWayPoints, dpm) - if okWp and type(wayPoints) == "table" and type(current) == "number" then wpLeft = #wayPoints - current end - end - if speed > ADFieldJobs.STALL_SPEED then - assignment.stillSince = nil - elseif assignment.stillSince == nil then - assignment.stillSince = now() - end - local stillMs = assignment.stillSince ~= nil and now() - assignment.stillSince or 0 - -- påfyldning tæt på marken (LOAD): står den ved påfyldningsstedet, læsser den — det er ikke at hænge - local refillPoint = assignment.drive ~= nil and assignment.drive.second ~= nil and adEnv.ADGraphManager:getWayPointById(assignment.drive.second) or nil - if refillPoint ~= nil and math.sqrt((refillPoint.x - px) ^ 2 + (refillPoint.z - pz) ^ 2) <= ADFieldJobs.STALL_ARRIVE_M then - stillMs = 0 - end - if ADFieldJobs.stalledAtTarget({adActive = true, speed = speed, wpLeft = wpLeft, distance = targetDistance, stillMs = stillMs}) then - log(assignment.fieldId, "'%s' holdt stille %.0f s ved %s (%.0f m, %s vejpunkt(er) tilbage) — AutoDrive stoppes, arbejdet starter", - ADRuns.vehicleLabel(vehicle), stillMs / 1000, tostring(info ~= nil and info.markerName or "?"), targetDistance, tostring(wpLeft)) - assignment.stillSince = nil - stopAd(vehicle) - assignment.since = now() - 2001 - end - return - end - assignment.stillSince = nil - if not isAdActive(vehicle) and now() - assignment.since > 2000 then - local x, z = vehiclePosition(vehicle) - local wayPoint = info ~= nil and adEnv.ADGraphManager:getWayPointById(info.markerId) or nil - local distance = wayPoint ~= nil and math.sqrt((wayPoint.x - x) ^ 2 + (wayPoint.z - z) ^ 2) or math.huge - if distance <= ADFieldWork.ARRIVE_DISTANCE then - local swapState = ADFieldWork.startHeaderSwap(adEnv, assignment, "front") - if swapState == "none" then - beginWork(adEnv, field, info, assignment) - elseif swapState == "failed" then - headerMountFailed(adEnv, assignment, assignment.headerSwap ~= nil and assignment.headerSwap.text or "?") - end - elseif assignment.startX ~= nil and math.sqrt((x - assignment.startX) ^ 2 + (z - assignment.startZ) ^ 2) < ADFieldWork.NO_MOVE_DISTANCE - and (assignment.driveRetries or 0) >= 1 then - -- AD startede og stoppede uden at flytte sig (to gange): ingen rute — genforsøg hjælper ikke - ADFieldWork.release(assignment) - fail(assignment.fieldId, string.format("AutoDrive fandt ingen rute fra '%s' til %s — står den uden for vejnettet?", ADRuns.vehicleLabel(vehicle), tostring(info ~= nil and info.markerName or "?"))) - elseif assignment.drive ~= nil and (assignment.driveRetries or 0) < ADFieldWork.DRIVE_RETRIES then - -- AutoDrive stoppede undervejs (spilleren byggede, trafik, ...): kør videre i stedet for at opgive - assignment.driveRetries = (assignment.driveRetries or 0) + 1 - assignment.since = now() - local d = assignment.drive - startAd(adEnv, vehicle, d.mode, d.first, d.second, d.fillType) - log(assignment.fieldId, "'%s' stoppede %.0f m fra %s — AutoDrive startes igen (%d/%d)", ADRuns.vehicleLabel(vehicle), distance, - tostring(info ~= nil and info.markerName or "?"), assignment.driveRetries, ADFieldWork.DRIVE_RETRIES) - else - ADFieldWork.release(assignment) - fail(assignment.fieldId, string.format("%s nåede ikke %s (%.0f m væk)", ADRuns.vehicleLabel(vehicle), tostring(info ~= nil and info.markerName or "?"), distance)) - -- ikke efterladt midt på vejen/ved en mark: hjem til parkeringen (puljeredskab sættes af først) - if not (ADHitch ~= nil and ADHitch.returnHome(adEnv, vehicle)) then - local park = parkMarkerId(adEnv, vehicle) - if park ~= nil then startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, park, nil) end - end - end - end - elseif assignment.phase == "palletRefill" then - local okTick, result, why = pcall(ADPalletRefill.tick, adEnv, assignment, ADFieldJobs.TICK_MS or 1000) - if not okTick then - result, why = "failed", tostring(result) - end - if result == "done" then - log(assignment.fieldId, "'%s' fyldt op med %.0f %s fra paller — kører til %s", ADRuns.vehicleLabel(vehicle), assignment.pallet.filled or 0, - ADPalletRefill.fillName(assignment.pallet.fillType), tostring(info ~= nil and info.markerName or "?")) - assignment.pallet = nil - assignment.phase, assignment.since = "driving", now() - assignment.startX, assignment.startZ = vehiclePosition(vehicle) - startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, info.markerId, nil) - assignment.drive = {mode = adEnv.AutoDrive.MODE_DRIVETO, first = info.markerId} - elseif result == "failed" then - ADFieldWork.release(assignment) - fail(assignment.fieldId, string.format("påfyldning fra paller mislykkedes for '%s' (%s)", ADRuns.vehicleLabel(vehicle), tostring(why))) - if not (ADHitch ~= nil and ADHitch.returnHome(adEnv, vehicle)) then - local park = parkMarkerId(adEnv, vehicle) - if park ~= nil then startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, park, nil) end - end - end - elseif assignment.phase == "unfolding" then - -- udfoldet (eller 20 s gået): mål og start - if ADCpBridge.variableWidthUnfolded(vehicle) or now() - assignment.since > ADFieldWork.UNFOLD_WAIT_MS then - assignment.unfoldedForWidth = true - beginWork(adEnv, field, info, assignment) - end - elseif assignment.phase == "waitingCourse" then - if now() - assignment.since > ADFieldWork.COURSE_WAIT_MS then - ADFieldWork.release(assignment) - ADHitch.returnHome(adEnv, vehicle) - fail(assignment.fieldId, "multi-tool: lederens kursus kom ikke (3 min)") - elseif coursesOf(field.id)[field.stage] ~= nil then - beginWork(adEnv, field, info, assignment) - end - elseif assignment.phase == "starting" then - local generating = assignment.handle ~= nil and assignment.handle.generating == true - if ADFieldJobs.startTimedOut(now() - assignment.since, generating) then - ADFieldWork.release(assignment) - ADHitch.returnHome(adEnv, vehicle) - fail(assignment.fieldId, generating and "Courseplay blev ikke færdig med kurset (5 min)" or "Courseplay svarede ikke (60 s)") - end - elseif assignment.phase == "working" then - local t = now() - if t - (assignment.widthCheckAt or 0) >= ADFieldWork.WIDTH_GUARD_MS then - assignment.widthCheckAt = t - local okGuard, errGuard = pcall(ADCpBridge.guardVariableWidth, vehicle) - if not okGuard then Logging.warning("ADSmartPickup: bredde-vagt: %s", tostring(errGuard)) end - end - followWorking(adEnv, field, assignment) - elseif assignment.phase == "awaitingPlayer" then - followManual(adEnv, field, info, assignment) - elseif assignment.phase == "mountingHeader" or assignment.phase == "unmountingHeader" then - followHeaderSwap(adEnv, field, info, assignment) - elseif assignment.phase == "queuedSwap" then - -- den anden mejetærsker høster nu: hent skærebordet og kør ud - if field == nil or info == nil then return ADFieldWork.release(assignment) end - if not ADFieldWork.swapInProgress(assignment.fieldId, assignment) then - ADFieldWork.startHeaderFetch(adEnv, assignment) - log(assignment.fieldId, "harvester: '%s' henter nu skærebordet '%s'", ADRuns.vehicleLabel(vehicle), tostring(assignment.pool.implementName)) - end - end + local followPhase = PHASE_FOLLOW[assignment.phase] + if followPhase ~= nil then return followPhase(adEnv, field, info, assignment, vehicle) end end -- Høsten er færdig: aflæsningsvognene stoppes; har de rest, kører den til lager, ellers parkering. diff --git a/FS25_ADSmartPickup/adFlowSleep.lua b/FS25_ADSmartPickup/adFlowSleep.lua index b73bd70..11aaabd 100644 --- a/FS25_ADSmartPickup/adFlowSleep.lua +++ b/FS25_ADSmartPickup/adFlowSleep.lua @@ -234,11 +234,7 @@ function ADFlowSleep.hasWork(adEnv, run, byId, onlyTractorId) return false, nil end -local function positionOf(vehicle) - if vehicle == nil or vehicle.rootNode == nil then return nil, nil end - local x, _, z = getWorldTranslation(vehicle.rootNode) - return x, z -end +local positionOf = ADUtil.positionOf local function isOwnFree(vehicle, tractorId, run) if vehicle == nil then return false end diff --git a/FS25_ADSmartPickup/adHeaderSwap.lua b/FS25_ADSmartPickup/adHeaderSwap.lua index 389f4c4..317dbfa 100644 --- a/FS25_ADSmartPickup/adHeaderSwap.lua +++ b/FS25_ADSmartPickup/adHeaderSwap.lua @@ -167,9 +167,7 @@ local function liveSwap(combine) return swap end -local function vehicleName(vehicle) - return vehicle ~= nil and vehicle.getName ~= nil and vehicle:getName() or "?" -end +local vehicleName = ADUtil.vehicleName local function jointTypes() if AttacherJoints == nil then return nil, nil end diff --git a/FS25_ADSmartPickup/adHitchApproach.lua b/FS25_ADSmartPickup/adHitchApproach.lua index 4563281..61a7dde 100644 --- a/FS25_ADSmartPickup/adHitchApproach.lua +++ b/FS25_ADSmartPickup/adHitchApproach.lua @@ -16,12 +16,7 @@ ADHitchApproach.ENABLED = false -- ---- ren logik ---- -local function contains(list, value) - for _, item in ipairs(list or {}) do - if item == value then return true end - end - return false -end +local contains = ADUtil.contains -- graph = {out(id) -> {id}, incoming(id) -> {id}, pos(id) -> x, z}; avoidId = båsens P-knude (søg ikke den vej). -- -> startknude S for den nærmeste bak-kant, eller nil @@ -89,9 +84,7 @@ local function parkWayPointId(adEnv, connectName) return nil end -local function vehicleName(vehicle) - return vehicle ~= nil and vehicle.getName ~= nil and vehicle:getName() or "?" -end +local vehicleName = ADUtil.vehicleName -- Bak-stikkets startknude for traktorens kobl-på-tur, eller nil (ingen tur, intet bak-stik, står der allerede). local function backEntryFor(adEnv, vehicle, destinationId) diff --git a/FS25_ADSmartPickup/adHitchCreep.lua b/FS25_ADSmartPickup/adHitchCreep.lua index 4c3a6ac..1e86e09 100644 --- a/FS25_ADSmartPickup/adHitchCreep.lua +++ b/FS25_ADSmartPickup/adHitchCreep.lua @@ -97,10 +97,7 @@ ADHitchCreep.REVERSE_OUT_TIMEOUT_MS = 90000 ADHitchCreep.REVERSE_OUT_STUCK_MS = 10000 ADHitchCreep.STILL_MOVE_M = 0.5 -- m: så langt skal den være kommet, før "står stille"-uret nulstilles -local function contains(list, value) - for _, item in ipairs(list or {}) do if item == value then return true end end - return false -end +local contains = ADUtil.contains -- Bakkekant: AD's konvention — fra står i fra.out, men ikke i til.incoming. function ADHitchCreep.isReverseEdge(fromId, toWp) @@ -174,9 +171,7 @@ local function worldPos(node) return {x = x, y = y, z = z} end -local function vehicleName(vehicle) - return vehicle ~= nil and vehicle.getName ~= nil and vehicle:getName() or "?" -end +local vehicleName = ADUtil.vehicleName -- Traktorens ledige krog-noder på den ene side: bag (lz < 0) eller front (lz > 0, frontslåmaskine 8/10). local function freeJoints(vehicle, front) diff --git a/FS25_ADSmartPickup/adLoadDiag.lua b/FS25_ADSmartPickup/adLoadDiag.lua index e4fb1ac..4c48071 100644 --- a/FS25_ADSmartPickup/adLoadDiag.lua +++ b/FS25_ADSmartPickup/adLoadDiag.lua @@ -40,9 +40,7 @@ end -- ---- spil ---- -local function fillTypeName(fillType) - return g_fillTypeManager ~= nil and fillType ~= nil and g_fillTypeManager:getFillTypeNameByIndex(fillType) or tostring(fillType) -end +local fillTypeName = ADUtil.fillTypeName local function inBox(trigger, trailer) for key, entry in pairs(trigger.fillableObjects or {}) do diff --git a/FS25_ADSmartPickup/adNames.lua b/FS25_ADSmartPickup/adNames.lua index 0e499ab..2efbc5f 100644 --- a/FS25_ADSmartPickup/adNames.lua +++ b/FS25_ADSmartPickup/adNames.lua @@ -18,11 +18,7 @@ function ADNames.fromRecords(records) return byId end -local function getPath() - local path = ADRunsStorage ~= nil and ADRunsStorage.getPath() or nil - if path == nil then return nil end - return (path:gsub(ADRunsStorage.FILE_NAME .. "$", ADNames.FILE_NAME)) -end +local function getPath() return ADUtil.savePath(ADNames.FILE_NAME) end function ADNames.load() ADNames.byId = {} diff --git a/FS25_ADSmartPickup/adNaming.lua b/FS25_ADSmartPickup/adNaming.lua index e3efca3..e6794ec 100644 --- a/FS25_ADSmartPickup/adNaming.lua +++ b/FS25_ADSmartPickup/adNaming.lua @@ -21,10 +21,7 @@ function ADNaming.nextNumber(names, prefix) return highest + 1 end -local function contains(names, wanted) - for _, name in ipairs(names) do if name == wanted then return true end end - return false -end +local contains = ADUtil.contains -- Et fast navn der kan være brugt: "X", ellers "X 2", "X 3" ... local function uniqueFixed(names, base) diff --git a/FS25_ADSmartPickup/adOutbound.lua b/FS25_ADSmartPickup/adOutbound.lua index 910deb6..c889d1f 100644 --- a/FS25_ADSmartPickup/adOutbound.lua +++ b/FS25_ADSmartPickup/adOutbound.lua @@ -83,12 +83,7 @@ function ADOutbound.resetEmptySources() emptyUntil = {} end -local function now() - if g_currentMission ~= nil and type(g_currentMission.time) == "number" then - return g_currentMission.time - end - return os.clock() * 1000 -end +local now = ADUtil.now local function getRun(vehicle) return ADRunsController ~= nil and ADRunsController.getRunForVehicle ~= nil and activeRunOf(vehicle) or nil @@ -99,9 +94,7 @@ function ADOutbound.isOutboundVehicle(vehicle) return run ~= nil and run.kind == "outbound" end -local function fillTypeName(fillType) - return g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeNameByIndex(fillType) or tostring(fillType) -end +local fillTypeName = ADUtil.fillTypeName -- Lagrene en kildes læssestation trækker fra (FS25: sourceStorages = {[storage] = storage}); nil = ukendt. local function sourceStorages(source) @@ -456,11 +449,7 @@ end -- ---- tur ---- -local function copyList(list) - local copy = {} - for index, value in ipairs(list or {}) do copy[index] = value end - return copy -end +local copyList = ADUtil.copyList local function choiceFor(marker, source, trip) return { diff --git a/FS25_ADSmartPickup/adPalletRefill.lua b/FS25_ADSmartPickup/adPalletRefill.lua index 066e9a5..f7e3c02 100644 --- a/FS25_ADSmartPickup/adPalletRefill.lua +++ b/FS25_ADSmartPickup/adPalletRefill.lua @@ -82,11 +82,7 @@ end -- ---- spil ---- -local function positionOf(object) - if object == nil or object.rootNode == nil then return nil end - local x, _, z = getWorldTranslation(object.rootNode) - return x, z -end +local positionOf = ADUtil.positionOf local function isPallet(vehicle) return vehicle.spec_pallet ~= nil or vehicle.typeName == "pallet" diff --git a/FS25_ADSmartPickup/adParkGuard.lua b/FS25_ADSmartPickup/adParkGuard.lua index de02188..9916ff4 100644 --- a/FS25_ADSmartPickup/adParkGuard.lua +++ b/FS25_ADSmartPickup/adParkGuard.lua @@ -58,10 +58,7 @@ end -- ---- spil-adapter ---- -local function now() - if g_currentMission ~= nil and type(g_currentMission.time) == "number" then return g_currentMission.time end - return os.clock() * 1000 -end +local now = ADUtil.now local function label(vehicle) return tostring(ADRuns ~= nil and ADRuns.vehicleLabel(vehicle) or (vehicle.getName ~= nil and vehicle:getName()) or "?") diff --git a/FS25_ADSmartPickup/adPool.lua b/FS25_ADSmartPickup/adPool.lua index e06f0e4..1d80f09 100644 --- a/FS25_ADSmartPickup/adPool.lua +++ b/FS25_ADSmartPickup/adPool.lua @@ -397,10 +397,7 @@ local function parkMarker(adEnv, vehicle) return adEnv.ADGraphManager:getMapMarkerById(index) end -local function positionOf(vehicle) - local x, _, z = getWorldTranslation(vehicle.rootNode) - return x, z -end +local positionOf = ADUtil.positionOf -- Butiksdata: redskabets krævede effekt (hk). specs indlæses først, når butikken har vist varen. local neededHpCache = {} -- configFileName -> hk eller false (butiksdata ændrer sig ikke i et spil) diff --git a/FS25_ADSmartPickup/adRuns.lua b/FS25_ADSmartPickup/adRuns.lua index cca3faf..f629b20 100644 --- a/FS25_ADSmartPickup/adRuns.lua +++ b/FS25_ADSmartPickup/adRuns.lua @@ -24,13 +24,7 @@ ADRuns.DEFAULT_SELL_ABOVE_PERCENT, ADRuns.MIN_SELL_ABOVE_PERCENT, ADRuns.MAX_SEL -- "hent først ved X % i kilden" (0 = fra): salg venter til kilden er så fuld eller et fuldt læs ligger klar ADRuns.DEFAULT_MIN_SOURCE_PERCENT, ADRuns.MIN_MIN_SOURCE_PERCENT, ADRuns.MAX_MIN_SOURCE_PERCENT = 0, 0, 95 -local function copyList(list) - local copy = {} - for index, value in ipairs(list or {}) do - copy[index] = value - end - return copy -end +local copyList = ADUtil.copyList local function copyProducts(products) local copy = {} diff --git a/FS25_ADSmartPickup/adRunsController.lua b/FS25_ADSmartPickup/adRunsController.lua index e574f0c..d006f64 100644 --- a/FS25_ADSmartPickup/adRunsController.lua +++ b/FS25_ADSmartPickup/adRunsController.lua @@ -16,13 +16,7 @@ ADRunsController.MIN_LOAD_CAPACITY = 100 -- traktorerne tilfældigvis kører AutoDrive — en manuelt startet traktor må ikke vende knappen). ADRunsController.runningRuns = {} -local function copyList(list) - local copy = {} - for index, value in ipairs(list or {}) do - copy[index] = value - end - return copy -end +local copyList = ADUtil.copyList -- Stabil nøgle: FS25's uniqueId ("vehicle…"), ellers savegame-id. Navne bruges aldrig. function ADRunsController.getVehicleId(vehicle) diff --git a/FS25_ADSmartPickup/adSellBlock.lua b/FS25_ADSmartPickup/adSellBlock.lua index 813f2bf..5947535 100644 --- a/FS25_ADSmartPickup/adSellBlock.lua +++ b/FS25_ADSmartPickup/adSellBlock.lua @@ -113,11 +113,7 @@ function ADSellBlock:consoleSellBlock(...) return table.concat(lines, "\n") end -local function getPath() - local path = ADRunsStorage ~= nil and ADRunsStorage.getPath() or nil - if path == nil then return nil end - return (path:gsub(ADRunsStorage.FILE_NAME .. "$", ADSellBlock.FILE_NAME)) -end +local function getPath() return ADUtil.savePath(ADSellBlock.FILE_NAME) end function ADSellBlock.save() local path = getPath() diff --git a/FS25_ADSmartPickup/adSettings.lua b/FS25_ADSmartPickup/adSettings.lua index 466f1a5..5a815ff 100644 --- a/FS25_ADSmartPickup/adSettings.lua +++ b/FS25_ADSmartPickup/adSettings.lua @@ -96,11 +96,7 @@ function ADSettings.restore(snapshot) values = snapshot or {global = {}, byBuild -- ---- lagring ---- -function ADSettings.getPath() - local runsPath = ADRunsStorage ~= nil and ADRunsStorage.getPath ~= nil and ADRunsStorage.getPath() or nil - if runsPath == nil then return nil end - return (string.gsub(runsPath, ADRunsStorage.FILE_NAME .. "$", ADSettings.FILE_NAME)) -end +function ADSettings.getPath() return ADUtil.savePath(ADSettings.FILE_NAME) end function ADSettings.save() local path = ADSettings.getPath() diff --git a/FS25_ADSmartPickup/adUtil.lua b/FS25_ADSmartPickup/adUtil.lua new file mode 100644 index 0000000..7f01308 --- /dev/null +++ b/FS25_ADSmartPickup/adUtil.lua @@ -0,0 +1,44 @@ +-- AD Util +-- Små fælles hjælpere, samlet 17/10-2026 fra 20+ enslydende lokale kopier i modulerne. Indlæses først (modDesc), +-- og i tests med dofile før de moduler der bruger dem. Ingen spil-afhængighed ved indlæsning. + +ADUtil = {} + +-- Spiltid i ms (g_currentMission.time); uden spil (tests) processorens tid. +function ADUtil.now() + if g_currentMission ~= nil and type(g_currentMission.time) == "number" then return g_currentMission.time end + return os.clock() * 1000 +end + +function ADUtil.contains(list, value) + for _, item in ipairs(list or {}) do if item == value then return true end end + return false +end + +function ADUtil.copyList(list) + local copy = {} + for index, value in ipairs(list or {}) do copy[index] = value end + return copy +end + +function ADUtil.vehicleName(vehicle) + return vehicle ~= nil and vehicle.getName ~= nil and vehicle:getName() or "?" +end + +function ADUtil.fillTypeName(fillType) + return g_fillTypeManager ~= nil and fillType ~= nil and g_fillTypeManager:getFillTypeNameByIndex(fillType) or tostring(fillType) +end + +-- x, z for et objekt med rootNode (nil, nil uden). +function ADUtil.positionOf(object) + if object == nil or object.rootNode == nil then return nil, nil end + local x, _, z = getWorldTranslation(object.rootNode) + return x, z +end + +-- Sti til en af modens filer i savegamet, ved siden af ADRunsStorage's fil (nil før savegamet kendes). +function ADUtil.savePath(fileName) + local path = ADRunsStorage ~= nil and ADRunsStorage.getPath ~= nil and ADRunsStorage.getPath() or nil + if path == nil then return nil end + return (path:gsub(ADRunsStorage.FILE_NAME .. "$", fileName)) +end diff --git a/FS25_ADSmartPickup/gui/SmartPickupAttentionFlow.lua b/FS25_ADSmartPickup/gui/SmartPickupAttentionFlow.lua index 30eeeb1..6a0408b 100644 --- a/FS25_ADSmartPickup/gui/SmartPickupAttentionFlow.lua +++ b/FS25_ADSmartPickup/gui/SmartPickupAttentionFlow.lua @@ -12,9 +12,7 @@ function SmartPickupFrame.tabOfKind(kind) return SmartPickupFrame.TAB_OVERVIEW end -local function fillTypeName(fillType) - return g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeNameByIndex(fillType) or tostring(fillType) -end +local fillTypeName = ADUtil.fillTypeName -- Forsyningsflow der allerede leverer varen til en af forbrugerne -> run eller nil. local function existingSupplyRun(consumerIds, name) diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml index c074b1c..bf8a83f 100644 --- a/FS25_ADSmartPickup/modDesc.xml +++ b/FS25_ADSmartPickup/modDesc.xml @@ -1,7 +1,7 @@ masterdraco - 1.62.284.0 + 1.62.285.0 <en>AD Smart Pickup</en> @@ -12,6 +12,7 @@ + @@ -50,6 +51,8 @@ + +