diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a7fcc9..c58e5a3 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.41** Nyt: *Tid mellem hver maskine der sendes ud* i markflåden (1, 5, 10, 15, 20, 30, 45 eller 60 s; standard nu 15 s, før fast 10 s), gemt pr. savegame. - **1.62.40** Rettet: traktoren bakker nu op til 12 m (før 8 m) hen til et puljeredskab — AutoDrive holdt 9–10 m før vognen (River 1, Plov 1), og så blev der ikke bakket. - **1.62.39** Tilbage: turen via båsens bak-stik er slået fra. Bak-kanten er kun ca. 1,5 m, og bagefter kørte AutoDrive fremad igen, så traktoren kom næsen først frem til vognen. Uden omvejen ankommer den oftest baglæns og bakker selv det sidste stykke. - **1.62.38** Nyt: når du selv sender en traktor til et redskabs parkering, og moden kobler redskabet af, kører traktoren bagefter videre til sin egen parkering i stedet for at blive holdende ved redskabet. diff --git a/FS25_ADSmartPickup/adFieldJobs.lua b/FS25_ADSmartPickup/adFieldJobs.lua index 854a2a1..fa3fe6c 100644 --- a/FS25_ADSmartPickup/adFieldJobs.lua +++ b/FS25_ADSmartPickup/adFieldJobs.lua @@ -102,9 +102,30 @@ end -- Højst én maskine sendt ud pr. DISPATCH_GAP_MS på tværs af alle marker (in-game 27/9: 6 maskiner kørte fra -- parkeringen i samme sekund efter Start alle). -ADFieldJobs.DISPATCH_GAP_MS = 10000 -function ADFieldJobs.mayDispatch(now, lastAt) - return lastAt == nil or now - lastAt >= ADFieldJobs.DISPATCH_GAP_MS +-- Justerbart pr. savegame (brugerønske 6/10): få maskiner kan nøjes med 1–5 s, mange har brug for 30 s eller mere. +ADFieldJobs.DISPATCH_GAP_CHOICES = {1, 5, 10, 15, 20, 30, 45, 60} -- sekunder +ADFieldJobs.DISPATCH_GAP_DEFAULT_S = 15 +ADFieldJobs.DISPATCH_GAP_MS = ADFieldJobs.DISPATCH_GAP_DEFAULT_S * 1000 + +-- Gyldigt valg (sekunder) eller standarden. +function ADFieldJobs.normalizeDispatchGap(seconds) + for _, s in ipairs(ADFieldJobs.DISPATCH_GAP_CHOICES) do + if s == seconds then return s end + end + return ADFieldJobs.DISPATCH_GAP_DEFAULT_S +end + +function ADFieldJobs.dispatchGapMs() + return ADFieldJobs.normalizeDispatchGap(ADFieldJobs.state ~= nil and ADFieldJobs.state.dispatchGapS or nil) * 1000 +end + +function ADFieldJobs.mayDispatch(now, lastAt, gapMs) + return lastAt == nil or now - lastAt >= (gapMs or ADFieldJobs.dispatchGapMs()) +end + +function ADFieldJobs.setDispatchGap(seconds) + ADFieldJobs.state.dispatchGapS = ADFieldJobs.normalizeDispatchGap(seconds) + ADFieldJobs.save() end function ADFieldJobs.assignmentCount() @@ -286,6 +307,7 @@ function ADFieldJobs.load() ADFieldJobs.state.courseRecords = loaded.courseRecords or {} ADFieldJobs.state.manual = loaded.manual or {} ADFieldJobs.state.paused = loaded.paused == true + ADFieldJobs.state.dispatchGapS = ADFieldJobs.normalizeDispatchGap(loaded.dispatchGapS) else Logging.warning(ADFieldJobs.LOG_PREFIX .. "marker kunne ikke indlæses: %s", tostring(loaded)) end diff --git a/FS25_ADSmartPickup/adFieldStorage.lua b/FS25_ADSmartPickup/adFieldStorage.lua index 8c9c759..639da20 100644 --- a/FS25_ADSmartPickup/adFieldStorage.lua +++ b/FS25_ADSmartPickup/adFieldStorage.lua @@ -70,6 +70,7 @@ function ADFieldStorage.save(state) end xmlFile:setString(ADFieldStorage.ROOT .. "#fleetMode", state.fleetMode or "all") xmlFile:setInt(ADFieldStorage.ROOT .. "#paused", state.paused == true and 1 or 0) + xmlFile:setInt(ADFieldStorage.ROOT .. "#dispatchGap", state.dispatchGapS or 15) -- marker er auto som standard; flaget gør engangs-omlægningen nedenfor (load) færdig xmlFile:setInt(ADFieldStorage.ROOT .. "#autoDefault", 1) local vehicleIndex = 0 @@ -105,6 +106,7 @@ function ADFieldStorage.load() if xmlFile == nil then return result end result.fleetMode = xmlFile:getString(ADFieldStorage.ROOT .. "#fleetMode") == "ticked" and "ticked" or "all" result.paused = xmlFile:getInt(ADFieldStorage.ROOT .. "#paused") == 1 + result.dispatchGapS = xmlFile:getInt(ADFieldStorage.ROOT .. "#dispatchGap") -- engangs: en fil fra før "auto som standard" (brugerønske 5/10) får alle manuelle marker sat til auto local migrateAuto = xmlFile:getInt(ADFieldStorage.ROOT .. "#autoDefault") ~= 1 xmlFile:iterate(ADFieldStorage.ROOT .. ".field", function(_, key) diff --git a/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua b/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua index aa26855..295908d 100644 --- a/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua +++ b/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua @@ -6,7 +6,7 @@ -- Funktionerne lægges på SmartPickupFrame (indlæses efter SmartPickupFrame.lua). -- Markflådens rækker (vehiclePrefab/ingredientPrefab) routes til onClickFieldRow. -SmartPickupFrame.FIELD_ROW_KINDS = {fleetVehicle = true, fleetMode = true, fleetManual = true} +SmartPickupFrame.FIELD_ROW_KINDS = {fleetVehicle = true, fleetMode = true, fleetManual = true, dispatchGap = true} SmartPickupFrame.ROLE_KEYS = { mower = "spu_field_role_mower", tedder = "spu_field_role_tedder", rake = "spu_field_role_rake", collector = "spu_field_role_collector", harvester = "spu_field_role_harvester", unloader = "spu_field_role_unloader", @@ -268,6 +268,13 @@ function SmartPickupFrame:fillFleetRows(adEnv) self:addTextRow(i18n:getText("spu_field_section_fleet")) local useAll = ADFieldJobs.state.fleetMode ~= "ticked" self:addToggleRow("fleetMode", i18n:getText("spu_field_fleetAll"), {i18n:getText("ui_no"), i18n:getText("ui_yes")}, useAll) + local gapTexts, gapState = {}, 1 + local gap = ADFieldJobs.normalizeDispatchGap(ADFieldJobs.state.dispatchGapS) + for index, seconds in ipairs(ADFieldJobs.DISPATCH_GAP_CHOICES) do + table.insert(gapTexts, string.format("%d s", seconds)) + if seconds == gap then gapState = index end + end + self:addFieldSiloChoiceRow("dispatchGap", i18n:getText("spu_field_dispatchGap"), gapTexts, gapState) local rigs = {} for _, rig in ipairs(ADFieldJobs.getRigs(adEnv)) do table.insert(rigs, rig) end table.sort(rigs, function(a, b) @@ -359,6 +366,8 @@ function SmartPickupFrame:onClickFieldRow(state, data) ADFieldJobs.toggleFleet(data.vehicleId) elseif data.kind == "fleetMode" then ADFieldJobs.setFleetMode(isOn and "all" or "ticked") + elseif data.kind == "dispatchGap" then + ADFieldJobs.setDispatchGap(ADFieldJobs.DISPATCH_GAP_CHOICES[state]) elseif data.kind == "fleetManual" then local wantManual = not isOn -- Ja = kører selv på vejen if ((ADFieldJobs.state.manual or {})[data.vehicleId] == true) ~= wantManual then ADFieldJobs.toggleManual(data.vehicleId) end diff --git a/FS25_ADSmartPickup/l10n/l10n_da.xml b/FS25_ADSmartPickup/l10n/l10n_da.xml index f6cf859..318c17a 100644 --- a/FS25_ADSmartPickup/l10n/l10n_da.xml +++ b/FS25_ADSmartPickup/l10n/l10n_da.xml @@ -231,6 +231,7 @@ + diff --git a/FS25_ADSmartPickup/l10n/l10n_en.xml b/FS25_ADSmartPickup/l10n/l10n_en.xml index 1e37837..fe572d9 100644 --- a/FS25_ADSmartPickup/l10n/l10n_en.xml +++ b/FS25_ADSmartPickup/l10n/l10n_en.xml @@ -231,6 +231,7 @@ + diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml index 767081e..15b46ac 100644 --- a/FS25_ADSmartPickup/modDesc.xml +++ b/FS25_ADSmartPickup/modDesc.xml @@ -1,7 +1,7 @@ masterdraco - 1.62.40.0 + 1.62.41.0 <en>AD Smart Pickup</en> diff --git a/docs/BRUGERMANUAL.md b/docs/BRUGERMANUAL.md index 4e9d0e7..e0e0729 100644 --- a/docs/BRUGERMANUAL.md +++ b/docs/BRUGERMANUAL.md @@ -1054,6 +1054,7 @@ Vælg *Behold det der gror* for at styre marken selv med **Kør automatisk** ell Knappen **Markflåde** viser den fælles markflåde (**Til marker** går tilbage): +- **Tid mellem hver maskine der sendes ud** (1–60 s, standard 15 s). Moden sender højst én maskine ud ad gangen på tværs af alle marker. Har du få maskiner, kan 1–5 s være nok; med mange maskiner der skal ud samtidig giver 30 s eller mere plads mellem dem på vejen. Gemmes pr. savegame. - **Brug alle ledige maskiner (Nej = kun med flueben)**. Med Ja (standard) finder moden selv maskinerne; fjern fluebenet ved en maskine for at tage netop den ud (den huskes pr. savegame). Med Nej bruges kun maskiner med flueben. diff --git a/docs/USER_MANUAL.md b/docs/USER_MANUAL.md index 7cff9d4..7220616 100644 --- a/docs/USER_MANUAL.md +++ b/docs/USER_MANUAL.md @@ -1086,6 +1086,7 @@ Choose *Keep what grows* to run the field yourself with **Run automatically** or The **Field fleet** button shows the shared field fleet (**Back to fields** returns): +- **Time between each machine sent out** (1–60 s, default 15 s). The mod sends at most one machine at a time across all fields. With few machines 1–5 s may be enough; with many leaving at once, 30 s or more gives room between them on the road. Saved per savegame. - **Use all free machines (No = only ticked ones)**. With Yes (default) the mod finds the machines itself; untick a machine to leave just that one out (remembered per savegame). With No, only ticked machines are used.