From a6a0dbf1215747dbaf9501b94ef5ff35f0cceda4 Mon Sep 17 00:00:00 2001 From: masterdraco Date: Sun, 27 Sep 2026 13:52:51 +0200 Subject: [PATCH] =?UTF-8?q?fix(markarbejde):=20genoptaget=20h=C3=B8ster/l?= =?UTF-8?q?=C3=A6ssevogn=20f=C3=A5r=20lager=20til=20resten=20som=20ved=20n?= =?UTF-8?q?ormal=20start=20=E2=80=94=20ellers=20stod=20h=C3=B8steren=20med?= =?UTF-8?q?=20korn=20i=20tanken=20efter=20kurset=20(v1.37.1.0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FS25_ADSmartPickup/adFieldWork.lua | 14 +++++++++++++- FS25_ADSmartPickup/modDesc.xml | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/FS25_ADSmartPickup/adFieldWork.lua b/FS25_ADSmartPickup/adFieldWork.lua index c19f671..7b42037 100644 --- a/FS25_ADSmartPickup/adFieldWork.lua +++ b/FS25_ADSmartPickup/adFieldWork.lua @@ -863,7 +863,19 @@ function ADFieldWork.resumeAfterLoad(adEnv) ADFieldJobs.state.assignments[rig.id] = {vehicleId = rig.id, vehicle = vehicle, fieldId = fieldId, role = rig.role, stage = stageById[fieldId], helper = false, phase = "working", since = now(), width = rig.width, groupSize = 1, leader = true, resumed = true} - log(fieldId, "'%s' fortsætter efter genindlæsning (Courseplay fra sidste waypoint)", tostring(rig.label)) + -- lager til resten (høsterens tank / læssevognens læs), som ved en normal start — ellers står + -- høsteren med korn i tanken, når kurset er færdigt + local assignment = ADFieldJobs.state.assignments[rig.id] + local field, info = ADFieldJobs.getField(fieldId), ADFields.getInfo(fieldId) + local fillType = nil + if rig.role == "harvester" then fillType = info ~= nil and info.harvestFillType or nil + elseif rig.role == "collector" then fillType = ADFieldWork.storeFillType(field, info) end + if fillType ~= nil then + local okStore, store = pcall(ADFieldWork.chooseStore, adEnv, field, info, vehicle, fillType) + if okStore and store ~= nil then assignment.storeId = store.id end + end + log(fieldId, "'%s' fortsætter efter genindlæsning (Courseplay fra sidste waypoint)%s", tostring(rig.label), + assignment.storeId ~= nil and "" or (fillType ~= nil and " — intet lager til resten fundet" or "")) else Logging.info(ADFieldJobs.LOG_PREFIX .. "'%s' genstartet fra sidste waypoint efter genindlæsning", tostring(rig.label)) end diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml index 20cae25..b936f69 100644 --- a/FS25_ADSmartPickup/modDesc.xml +++ b/FS25_ADSmartPickup/modDesc.xml @@ -1,7 +1,7 @@ masterdraco - 1.37.0.0 + 1.37.1.0 <en>AD Smart Pickup</en>