From fc67cc9308080d538a64e4d88e51cd8859a90dab Mon Sep 17 00:00:00 2001 From: masterdraco Date: Sat, 10 Oct 2026 02:40:17 +0200 Subject: [PATCH] feat: fanen Indstillinger (ADSettings globalt + pr. stald) (v1.62.140) --- CHANGELOG.md | 1 + FS25_ADSmartPickup/adSettings.lua | 14 ++- FS25_ADSmartPickup/adSmartPickup.lua | 1 + FS25_ADSmartPickup/gui/SmartPickupFrame.lua | 19 +++- .../gui/SmartPickupSettingsTab.lua | 93 +++++++++++++++++++ FS25_ADSmartPickup/l10n/l10n_da.xml | 6 ++ FS25_ADSmartPickup/l10n/l10n_en.xml | 6 ++ FS25_ADSmartPickup/modDesc.xml | 2 +- 8 files changed, 136 insertions(+), 6 deletions(-) create mode 100644 FS25_ADSmartPickup/gui/SmartPickupSettingsTab.lua diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a8020e..d333bd4 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.140** Ny fane "Indstillinger" i ESC-menuen: moddens justeringer globalt og pr. stald (første: stald-siloens afstand, 40–300 m; pr. stald kan vælge "som globalt"). Nye nøgler i ADSettings.KEYS vises automatisk. - **1.62.139** Stald-siloer og fordeling (brugerønske 10/10): (1) en silo kan vælges som mål for en forsyningskørsel, og med "auto" fyldes den kun med det foder og halm, staldene inden for stableSiloRange bruger; (2) retfærdig fordeling: skal flere kørsler have den samme vare fra gårdens lager, får hver en andel efter sit behov i stedet for først til mølle (loggen: "deles med N andre behov"); (3) ny indstillingsmodul ADSettings (ADSmartPickup_settings.xml) med konsol `spuSet [bygningsnavn]` — første nøgle `stableSiloRange` (standard 80 m, pr. stald). Grundlag for en kommende indstillingsside. - **1.62.138** Forsyningskørsler henter kun på gården eller i en silo ved stalden (inden for 80 m af målet). Marksiloer bruges ikke som kilde: dem flytter marksilo-flowet hjem. Stald-siloen prøves først; er den tom, hentes på gården (brugerønske 10/10). - **1.62.137** Marksilo: køretøjer i en kørsel overtages ikke længere som marksilo-lån efter genindlæsning, selv om de henter ved en marksilo. In-game 10/10: "Cow Barn 1 Food and Straw" blev overtaget, fordi forsyningen valgte F9-siloen som kilde. diff --git a/FS25_ADSmartPickup/adSettings.lua b/FS25_ADSmartPickup/adSettings.lua index a55c970..437f88c 100644 --- a/FS25_ADSmartPickup/adSettings.lua +++ b/FS25_ADSmartPickup/adSettings.lua @@ -10,7 +10,8 @@ ADSettings.LOG_PREFIX = "ADSmartPickup: indstilling: " -- nøgle -> {default, min, max, text}. Nye indstillinger tilføjes her, så de får standardværdi, grænser og hjælpetekst. ADSettings.KEYS = { - stableSiloRange = {default = 80, min = 10, max = 500, text = "m: en silo inden for denne afstand af en stald er staldens egen silo (forsyning henter der først)"}, + stableSiloRange = {default = 80, min = 10, max = 500, perBuilding = true, choices = {40, 60, 80, 100, 120, 150, 200, 300}, format = "%s m", + text = "m: en silo inden for denne afstand af en stald er staldens egen silo (forsyning henter der først)"}, } local values = {global = {}, byBuilding = {}} @@ -51,6 +52,17 @@ function ADSettings.set(key, value, buildingId) return clamped end +-- Bygningens egen værdi (nil = ingen, så den globale gælder). +function ADSettings.getOwn(key, buildingId) + local own = buildingId ~= nil and values.byBuilding[buildingId] or nil + return own ~= nil and own[key] or nil +end + +function ADSettings.clear(key, buildingId) + if buildingId == nil then values.global[key] = nil + elseif values.byBuilding[buildingId] ~= nil then values.byBuilding[buildingId][key] = nil end +end + function ADSettings.snapshot() return values end function ADSettings.restore(snapshot) values = snapshot or {global = {}, byBuilding = {}} end diff --git a/FS25_ADSmartPickup/adSmartPickup.lua b/FS25_ADSmartPickup/adSmartPickup.lua index 0db74e3..8ec915f 100644 --- a/FS25_ADSmartPickup/adSmartPickup.lua +++ b/FS25_ADSmartPickup/adSmartPickup.lua @@ -28,6 +28,7 @@ if ADSmartPickup.dir ~= nil and source ~= nil then source(ADSmartPickup.dir .. "gui/SmartPickupFieldTab.lua") source(ADSmartPickup.dir .. "gui/SmartPickupMonthTab.lua") source(ADSmartPickup.dir .. "gui/SmartPickupFieldSiloTab.lua") + source(ADSmartPickup.dir .. "gui/SmartPickupSettingsTab.lua") source(ADSmartPickup.dir .. "gui/SmartPickupChainTab.lua") source(ADSmartPickup.dir .. "gui/SmartPickupGuide.lua") source(ADSmartPickup.dir .. "gui/SmartPickupFieldGuide.lua") diff --git a/FS25_ADSmartPickup/gui/SmartPickupFrame.lua b/FS25_ADSmartPickup/gui/SmartPickupFrame.lua index 32303a8..d6807e4 100644 --- a/FS25_ADSmartPickup/gui/SmartPickupFrame.lua +++ b/FS25_ADSmartPickup/gui/SmartPickupFrame.lua @@ -18,11 +18,12 @@ SmartPickupFrame.MONTH_REBUILD_TICKS = 5 SmartPickupFrame.FIELDSILO_REBUILD_TICKS = 30 -- Kæder-fanen (gui/SmartPickupChainTab.lua): klikbare forslag/pause, så genopbygning sjældent (som Marksiloer) SmartPickupFrame.TAB_CHAINS = 10 +SmartPickupFrame.TAB_SETTINGS = 11 SmartPickupFrame.CHAIN_REBUILD_TICKS = 30 -- Lagerfaner: én pr. bygningstype (indeks -> kind i ADSources.getFarmInventory) -SmartPickupFrame.TAB_NAMES = {"spu_tab_overview", "spu_tab_flows", "spu_tab_fields", "spu_tab_month", "spu_tab_fieldsilos", "spu_tab_factories", "spu_tab_silos", "spu_tab_barns", "spu_tab_sheds", "spu_tab_chains"} +SmartPickupFrame.TAB_NAMES = {"spu_tab_overview", "spu_tab_flows", "spu_tab_fields", "spu_tab_month", "spu_tab_fieldsilos", "spu_tab_factories", "spu_tab_silos", "spu_tab_barns", "spu_tab_sheds", "spu_tab_chains", "spu_tab_settings"} -- Visningsrækkefølge (fane-id'erne ovenfor er faste og bruges overalt): Kæder står efter Marker (in-game 30/9). -SmartPickupFrame.TAB_DISPLAY = {1, 2, 3, 10, 4, 5, 6, 7, 8, 9} +SmartPickupFrame.TAB_DISPLAY = {1, 2, 3, 10, 4, 5, 6, 7, 8, 9, 11} function SmartPickupFrame.tabPosition(tabId) for position, id in ipairs(SmartPickupFrame.TAB_DISPLAY) do if id == tabId then return position end @@ -474,6 +475,14 @@ function SmartPickupFrame:rebuild() self:restoreFocusIfLost() return end + if self.currentTab == SmartPickupFrame.TAB_SETTINGS then + if adEnv ~= nil then self:fillSettingsRows(adEnv) end + self:colorRows() + self.boxLayout:invalidateLayout() + self:refreshButtons() + self:restoreFocusIfLost() + return + end if self.currentTab == SmartPickupFrame.TAB_FIELDSILOS then if adEnv ~= nil then self:fillFieldSiloRows(adEnv) @@ -685,7 +694,7 @@ function SmartPickupFrame:refreshButtons() elseif self.currentTab == SmartPickupFrame.TAB_FIELDS then wanted = self:getFieldButtons() elseif self.currentTab == SmartPickupFrame.TAB_MONTH or self.currentTab == SmartPickupFrame.TAB_FIELDSILOS - or self.currentTab == SmartPickupFrame.TAB_CHAINS then + or self.currentTab == SmartPickupFrame.TAB_CHAINS or self.currentTab == SmartPickupFrame.TAB_SETTINGS then wanted = self.monthButtons elseif SmartPickupFrame.getTabKind(self.currentTab) ~= nil then wanted = self.storageButtons @@ -711,7 +720,7 @@ function SmartPickupFrame:refreshLive() return end if self.currentTab == SmartPickupFrame.TAB_MONTH or self.currentTab == SmartPickupFrame.TAB_FIELDSILOS - or self.currentTab == SmartPickupFrame.TAB_CHAINS then + or self.currentTab == SmartPickupFrame.TAB_CHAINS or self.currentTab == SmartPickupFrame.TAB_SETTINGS then if self.currentTab == SmartPickupFrame.TAB_CHAINS then -- "forslaget gælder ikke længere" står STATUS_OVERRIDE_TICKS sekunder self.statusOverrideTicks = (self.statusOverrideTicks or 0) - 1 @@ -816,6 +825,8 @@ function SmartPickupFrame:onClickIngredient(state, element) return self:onClickGuideRow(state, data) elseif data ~= nil and SmartPickupFrame.FIELDSILO_ROW_KINDS ~= nil and SmartPickupFrame.FIELDSILO_ROW_KINDS[data.kind] then return self:onClickFieldSiloRow(state, data) + elseif data ~= nil and SmartPickupFrame.SETTINGS_ROW_KINDS ~= nil and SmartPickupFrame.SETTINGS_ROW_KINDS[data.kind] then + return self:onClickSettingsRow(state, data) elseif data ~= nil and SmartPickupFrame.FIELD_ROW_KINDS[data.kind] then return self:onClickFieldRow(state, data) end diff --git a/FS25_ADSmartPickup/gui/SmartPickupSettingsTab.lua b/FS25_ADSmartPickup/gui/SmartPickupSettingsTab.lua new file mode 100644 index 0000000..915bfab --- /dev/null +++ b/FS25_ADSmartPickup/gui/SmartPickupSettingsTab.lua @@ -0,0 +1,93 @@ +-- Smart Pickup — fanen Indstillinger +-- Moddens justeringer (ADSettings): én række pr. nøgle globalt, og pr. stald en række der kan afvige fra det globale +-- ("som globalt" = ingen egen værdi). Nye nøgler i ADSettings.KEYS (med choices) dukker op af sig selv. +-- Klik går til onClickSettingsRow. + +SmartPickupFrame.SETTINGS_ROW_KINDS = {setGlobal = true, setBuilding = true} + +local function choiceTexts(spec, i18n, withGlobal) + local texts = {} + if withGlobal then table.insert(texts, i18n:getText("spu_set_asGlobal")) end + for _, value in ipairs(spec.choices or {}) do + table.insert(texts, string.format(spec.format or "%s", tostring(value))) + end + return texts +end + +local function choiceIndex(spec, value) + local best, bestDiff = 1, math.huge + for index, choice in ipairs(spec.choices or {}) do + local diff = math.abs(choice - (value or spec.default)) + if diff < bestDiff then best, bestDiff = index, diff end + end + return best +end + +local function keyTitle(i18n, key) + local text = i18n:getText("spu_set_" .. key) + if text == nil or text == "" or text == ("spu_set_" .. key) then return key end + return text +end + +local function sortedKeys() + local keys = {} + for key, spec in pairs(ADSettings.KEYS) do + if spec.choices ~= nil then table.insert(keys, key) end + end + table.sort(keys) + return keys +end + +function SmartPickupFrame:fillSettingsRows(adEnv) + local i18n = self.i18n + if ADSettings == nil then + self:addTextRow("ADSettings mangler") + return + end + local keys = sortedKeys() + self:addTextRow(i18n:getText("spu_set_globalTitle")) + for _, key in ipairs(keys) do + local spec = ADSettings.KEYS[key] + local option = self:addFieldSiloChoiceRow("setGlobal", keyTitle(i18n, key), choiceTexts(spec, i18n, false), choiceIndex(spec, ADSettings.get(key))) + self.rowData[option] = {kind = "setGlobal", key = key} + end + self:addTextRow(i18n:getText("spu_set_globalHelp")) + + -- pr. stald: kun nøgler med perBuilding = true + local farmId = g_currentMission:getFarmId() + local barns = {} + for _, building in ipairs(ADBuildings.list(adEnv, farmId) or {}) do + if building.kind == "husbandry" then table.insert(barns, building) end + end + table.sort(barns, function(a, b) return tostring(a.name) < tostring(b.name) end) + for _, key in ipairs(keys) do + local spec = ADSettings.KEYS[key] + if spec.perBuilding and #barns > 0 then + self:addTextRow(string.format(i18n:getText("spu_set_perBarnTitle"), keyTitle(i18n, key))) + for _, barn in ipairs(barns) do + local own = ADSettings.getOwn(key, barn.id) + local state = own ~= nil and (choiceIndex(spec, own) + 1) or 1 + local option = self:addFieldSiloChoiceRow("setBuilding", tostring(barn.name), choiceTexts(spec, i18n, true), state) + self.rowData[option] = {kind = "setBuilding", key = key, buildingId = barn.id} + end + end + end +end + +function SmartPickupFrame:onClickSettingsRow(state, data) + self:safe(function(frame) + local spec = ADSettings.KEYS[data.key] + if spec == nil then return end + if data.kind == "setGlobal" then + ADSettings.set(data.key, spec.choices[state], nil) + elseif data.kind == "setBuilding" then + if state == 1 then + ADSettings.clear(data.key, data.buildingId) + else + ADSettings.set(data.key, spec.choices[state - 1], data.buildingId) + end + end + pcall(ADSettings.save) + frame:requestRebuild() + end) +end diff --git a/FS25_ADSmartPickup/l10n/l10n_da.xml b/FS25_ADSmartPickup/l10n/l10n_da.xml index a1b45e5..65b557b 100644 --- a/FS25_ADSmartPickup/l10n/l10n_da.xml +++ b/FS25_ADSmartPickup/l10n/l10n_da.xml @@ -539,6 +539,12 @@ + + + + + + diff --git a/FS25_ADSmartPickup/l10n/l10n_en.xml b/FS25_ADSmartPickup/l10n/l10n_en.xml index 9c1c980..0f73276 100644 --- a/FS25_ADSmartPickup/l10n/l10n_en.xml +++ b/FS25_ADSmartPickup/l10n/l10n_en.xml @@ -539,6 +539,12 @@ + + + + + + diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml index 74c307a..6b2ee06 100644 --- a/FS25_ADSmartPickup/modDesc.xml +++ b/FS25_ADSmartPickup/modDesc.xml @@ -1,7 +1,7 @@ masterdraco - 1.62.139.0 + 1.62.140.0 <en>AD Smart Pickup</en>