feat: indstillinger waitHomeMinutes + troughRefillPercent (v1.62.143)

This commit is contained in:
2026-10-10 03:42:04 +02:00
parent 00674277e6
commit 9fb6b97b52
11 changed files with 55 additions and 6 deletions
+4
View File
@@ -12,6 +12,10 @@ ADSettings.LOG_PREFIX = "ADSmartPickup: indstilling: "
ADSettings.KEYS = {
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)"},
waitHomeMinutes = {default = 0, min = 0, max = 240, perBuilding = true, choices = {0, 5, 10, 15, 20, 30, 45, 60, 90, 120}, format = "%s min",
text = "min: så længe en vogn venter ved et Wait-punkt med rest, før resten køres hjem i gårdens lager (0 = vent til der er plads)"},
troughRefillPercent = {default = 100, min = 10, max = 100, perBuilding = true, choices = {30, 40, 50, 60, 70, 80, 90, 100}, format = "%s %%",
text = "%: forsyningen kører først, når staldens trug er fyldt højst så meget (100 = så snart der er plads til et læs)"},
}
local values = {global = {}, byBuilding = {}}
+7 -1
View File
@@ -786,11 +786,17 @@ local getTargetLevelAndCapacity = ADSmartPickup.getStationLevelAndCapacity
-- Niveau + kapacitet pr. ingrediens i aflæsningsmålets lager; demand giver forbrug/min.
local function getTargetNeeds(station, ingredients, farmId, demand)
local needs = {}
-- trug-tærskel pr. stald (ADSettings "troughRefillPercent"): kør først når truget er under tærsklen
local placeable = station ~= nil and station.owningPlaceable or nil
local buildingId = placeable ~= nil and ADBuildings ~= nil and ADBuildings.getId ~= nil and ADBuildings.getId(placeable) or nil
local threshold = ADSettings ~= nil and ADSettings.get("troughRefillPercent", buildingId) or 100
for _, fillType in ipairs(ingredients) do
local level, capacity = getTargetLevelAndCapacity(station, fillType, farmId)
if level ~= nil then
local troughScore, priority, troughCapacity = getFoodPriority(station, fillType)
table.insert(needs, {fillType = fillType, level = level, capacity = capacity, litersPerMinute = demand[fillType], scoreOverride = troughScore, priority = priority, troughCapacity = troughCapacity})
if troughScore == nil or ADSupplyPlanner.troughNeedsRefill(troughScore, threshold) then
table.insert(needs, {fillType = fillType, level = level, capacity = capacity, litersPerMinute = demand[fillType], scoreOverride = troughScore, priority = priority, troughCapacity = troughCapacity})
end
end
end
return needs
+9
View File
@@ -425,6 +425,15 @@ function ADSupplyPlanner.filterSupplySources(entries, range)
return near, farm
end
-- Trug-tærskel (brugerønske 10/10): forsyningen kører først, når truget er fyldt højst thresholdPercent.
-- freeFraction = tom andel af truget (0..1). 100 % = altid (så snart der er plads).
function ADSupplyPlanner.troughNeedsRefill(freeFraction, thresholdPercent)
local threshold = tonumber(thresholdPercent) or 100
if threshold >= 100 then return true end
local fillPercent = (1 - math.max(0, math.min(1, freeFraction or 0))) * 100
return fillPercent <= threshold
end
-- Retfærdig fordeling (brugerønske 10/10): skal flere stalde have den samme vare fra gårdens lager, får hver sin andel
-- efter behov (tomt rum i truget), ikke først til mølle. available = gårdens beholdning, myFree = eget behov,
-- totalFree = alle aktuelle behov (inkl. eget). -> liter denne tur højst må tage.
+20
View File
@@ -145,6 +145,12 @@ function ADUnloadWait.isStaleDestination(taskDestination, targetId, hasMarkerAtD
return taskDestination ~= targetId and not hasMarkerAtDestination
end
-- Er ventetiden ved Wait udløbet? minutes = 0 slår reglen fra.
function ADUnloadWait.waitHomeDue(waitedMs, minutes)
local limit = tonumber(minutes) or 0
return limit > 0 and (waitedMs or 0) >= limit * 60000
end
local function startWaiting(adEnv, task)
local vehicle = task.vehicle
-- Kun "fremme ved målet". At AD stadig regner vognen som aflæssende (isActiveAtTrigger)
@@ -254,6 +260,20 @@ local function updateWaiting(adEnv, task, wait, dt)
free = 0
end
wait.isRejected = isRejected
-- ventetid ved Wait (ADSettings "waitHomeMinutes", pr. stald): udløbet -> resten køres hjem i gårdens lager
wait.waitedMs = (wait.waitedMs or 0) + (dt or 0)
local homeBuilding = ADBuildings ~= nil and ADBuildings.byMarker ~= nil and ADBuildings.byMarker(adEnv, g_currentMission:getFarmId(), home, "unload") or nil
local waitMinutes = ADSettings ~= nil and ADSettings.get("waitHomeMinutes", homeBuilding ~= nil and homeBuilding.id or nil) or 0
if ADUnloadWait.waitHomeDue(wait.waitedMs, waitMinutes) and ADLoadSwap ~= nil and ADLoadSwap.findDumpMarker ~= nil then
local marker = ADLoadSwap.findDumpMarker(adEnv, vehicle, fillType, rest, home, function(markerId) return hasRouteTo(adEnv, vehicle, markerId) end)
if marker ~= nil then
release(vehicle)
redirectForUnload(task, marker.id)
Logging.info(ADUnloadWait.LOG_PREFIX .. "'%s' har ventet %d min ved %s — kører resten (%.0f l) hjem i %s", tostring(ADRuns.vehicleLabel(vehicle)), math.floor(wait.waitedMs / 60000), tostring(wait.waitMarker.name), rest, tostring(marker.name))
return
end
wait.waitedMs = 0 -- intet lager tager resten lige nu: prøv igen efter endnu en periode
end
-- run'ets "kør hjem under X %" (fri ≥ (100-X) % af kapaciteten), ellers standardreglen
local run = ADRunsController ~= nil and ADRunsController.getRunForVehicle(vehicle) or nil
local freeFraction = run ~= nil and run.returnBelowPercent ~= nil and (1 - run.returnBelowPercent / 100) or nil
+2
View File
@@ -545,6 +545,8 @@
<text name="spu_set_perBarnTitle" text="%s — pr. stald"/>
<text name="spu_set_asGlobal" text="som globalt"/>
<text name="spu_set_stableSiloRange" text="Stald-silo: afstand fra stald til egen silo"/>
<text name="spu_set_waitHomeMinutes" text="Wait: ventetid før resten køres hjem i gårdens lager"/>
<text name="spu_set_troughRefillPercent" text="Fodertrug: kør først når truget er fyldt højst"/>
<text name="spu_fs_enabled" text="Hent marksiloer hjem automatisk"/>
<text name="spu_fs_maxVehicles" text="Maks. vogne ude"/>
<text name="spu_fs_minLiters" text="Mindste mængde pr. vare"/>
+2
View File
@@ -545,6 +545,8 @@
<text name="spu_set_perBarnTitle" text="%s — per barn"/>
<text name="spu_set_asGlobal" text="as global"/>
<text name="spu_set_stableSiloRange" text="Barn silo: distance from barn to its own silo"/>
<text name="spu_set_waitHomeMinutes" text="Wait: time before the rest is taken home to the farm store"/>
<text name="spu_set_troughRefillPercent" text="Trough: only go when the trough is at most this full"/>
<text name="spu_fs_enabled" text="Bring field silos home automatically"/>
<text name="spu_fs_maxVehicles" text="Max. vehicles out"/>
<text name="spu_fs_minLiters" text="Minimum amount per product"/>
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<modDesc descVersion="107">
<author>masterdraco</author>
<version>1.62.142.0</version>
<version>1.62.143.0</version>
<title>
<en>AD Smart Pickup</en>
</title>