feat(marksilo): 'Kør overskud til produktion' — foder først: staldenes forbrug × valgt antal døgn bliver på gården, overskud køres til gårdens fabrikker (v1.44.0.0)

FS25_ADSmartPickup/adFieldSiloConfig.lua

@@ -7,11 +7,15 @@ ADFieldSiloConfig.MAX_VEHICLES = 10
 ADFieldSiloConfig.DEFAULT_MAX_VEHICLES = 2
 ADFieldSiloConfig.MIN_LITERS_CHOICES = {5000, 10000, 25000, 50000}
 ADFieldSiloConfig.DEFAULT_MIN_LITERS = 10000
+-- foderreserve: staldenes forbrug i så mange døgn bliver på gården, før overskud køres til fabrik
+ADFieldSiloConfig.RESERVE_DAYS_CHOICES = {3, 7, 14, 30}
+ADFieldSiloConfig.DEFAULT_RESERVE_DAYS = 7
 
 local function copy(cfg)
     local ids = {}
     for index, id in ipairs(cfg.storeIds or {}) do ids[index] = id end
-    return {enabled = cfg.enabled == true, storeIds = ids, maxVehicles = cfg.maxVehicles, minLiters = cfg.minLiters}
+    return {enabled = cfg.enabled == true, storeIds = ids, maxVehicles = cfg.maxVehicles, minLiters = cfg.minLiters,
+        toProduction = cfg.toProduction == true, reserveDays = cfg.reserveDays}
 end
 
 local function clampVehicles(value)
@@ -19,19 +23,28 @@ local function clampVehicles(value)
     return math.max(1, math.min(ADFieldSiloConfig.MAX_VEHICLES, math.floor(value)))
 end
 
-local function snapLiters(value)
+local function snap(value, choices, default)
     value = tonumber(value)
-    if value == nil then return ADFieldSiloConfig.DEFAULT_MIN_LITERS end
+    if value == nil then return default end
     local best, bestDiff = nil, nil
-    for _, choice in ipairs(ADFieldSiloConfig.MIN_LITERS_CHOICES) do
+    for _, choice in ipairs(choices) do
         local diff = math.abs(choice - value)
         if bestDiff == nil or diff < bestDiff then best, bestDiff = choice, diff end
     end
     return best
 end
 
+local function snapLiters(value)
+    return snap(value, ADFieldSiloConfig.MIN_LITERS_CHOICES, ADFieldSiloConfig.DEFAULT_MIN_LITERS)
+end
+
+local function snapDays(value)
+    return snap(value, ADFieldSiloConfig.RESERVE_DAYS_CHOICES, ADFieldSiloConfig.DEFAULT_RESERVE_DAYS)
+end
+
 function ADFieldSiloConfig.new()
-    return {enabled = false, storeIds = {}, maxVehicles = ADFieldSiloConfig.DEFAULT_MAX_VEHICLES, minLiters = ADFieldSiloConfig.DEFAULT_MIN_LITERS}
+    return {enabled = false, storeIds = {}, maxVehicles = ADFieldSiloConfig.DEFAULT_MAX_VEHICLES, minLiters = ADFieldSiloConfig.DEFAULT_MIN_LITERS,
+        toProduction = false, reserveDays = ADFieldSiloConfig.DEFAULT_RESERVE_DAYS}
 end
 
 function ADFieldSiloConfig.with(cfg, changes)
@@ -39,6 +52,8 @@ function ADFieldSiloConfig.with(cfg, changes)
     if changes.enabled ~= nil then new.enabled = changes.enabled == true end
     if changes.maxVehicles ~= nil then new.maxVehicles = clampVehicles(changes.maxVehicles) end
     if changes.minLiters ~= nil then new.minLiters = snapLiters(changes.minLiters) end
+    if changes.toProduction ~= nil then new.toProduction = changes.toProduction == true end
+    if changes.reserveDays ~= nil then new.reserveDays = snapDays(changes.reserveDays) end
     return new
 end
 
@@ -62,7 +77,8 @@ end
 
 function ADFieldSiloConfig.toRecord(cfg)
     return {enabled = cfg.enabled and 1 or 0, stores = table.concat(cfg.storeIds or {}, " "),
-        maxVehicles = cfg.maxVehicles, minLiters = cfg.minLiters}
+        maxVehicles = cfg.maxVehicles, minLiters = cfg.minLiters, toProduction = cfg.toProduction and 1 or 0,
+        reserveDays = cfg.reserveDays}
 end
 
 function ADFieldSiloConfig.fromRecord(record)
@@ -72,5 +88,7 @@ function ADFieldSiloConfig.fromRecord(record)
     cfg.enabled = tonumber(record.enabled) == 1
     cfg.maxVehicles = clampVehicles(record.maxVehicles)
     cfg.minLiters = snapLiters(record.minLiters)
+    cfg.toProduction = tonumber(record.toProduction) == 1
+    cfg.reserveDays = snapDays(record.reserveDays)
     return cfg
 end