feat: Sælg fra = altid som standard; tom kilde afvises ikke ved Start (1.62.224)

Brugerønske: udkørsels-flows sælger som standard til enhver pris (0) i stedet for 90 % af
årets top; gemte flows beholder deres valg. sellAtValue holder 0 uden for 50-100-klemmen.
Fanen Udkørsel har Altid som første trin (review). In-game: mælke-flowet fra en tom tank
blev afvist med 'ingen vare valgt' — startkontrollen tæller nu valgte varer for tom kilde.
This commit is contained in:
2026-10-12 00:07:46 +02:00
parent 0fa83cb627
commit aa6b3bef27
10 changed files with 28 additions and 13 deletions
+3 -3
View File
@@ -206,7 +206,7 @@ local function findSellQuote(adEnv, vehicle, product, sellMarkers, sellAtPercent
end)
local unreachableName = nil
for _, quote in ipairs(quotes) do
if quote.percent < (sellAtPercent or 90) then
if quote.percent < (sellAtPercent or ADRuns.DEFAULT_SELL_AT_PERCENT) then
break
end
if homeId == nil or ADWaitPool.hasRouteBothWays(adEnv, vehicle, quote.wayPointId, homeId) then
@@ -441,7 +441,7 @@ function ADOutbound.planCargoTarget(adEnv, run, vehicle, fillType, liters)
if wantsSell(policy) then
local homeId = run.sourceWayPointIds ~= nil and run.sourceWayPointIds[1] or nil
local quote = findSellQuote(adEnv, vehicle, product, ADSources.getSellMarkers(adEnv, farmId), run.sellAtPercent, homeId)
if quote ~= nil and quote.percent >= (run.sellAtPercent or 90) then
if quote ~= nil and quote.percent >= (run.sellAtPercent or ADRuns.DEFAULT_SELL_AT_PERCENT) then
return quote.wayPointId
end
end
@@ -621,7 +621,7 @@ function ADOutbound.choosePickup(adEnv, vehicle)
if trip.kind == "sell" then
for _, product in ipairs(input.products) do
if product.fillType == trip.fillTypes[1] and product.quote ~= nil then
Logging.info(ADOutbound.LOG_PREFIX .. "'%s' pris %s: %.0f kr/1000 l ved %s, årets top %.0f -> %d %% (kræver %d)", tostring(ADRuns.vehicleLabel(vehicle)), product.name, (product.quote.price or 0) * 1000, tostring(product.quote.stationName), (product.quote.top or 0) * 1000, product.quote.percent or 0, run.sellAtPercent or 90)
Logging.info(ADOutbound.LOG_PREFIX .. "'%s' pris %s: %.0f kr/1000 l ved %s, årets top %.0f -> %d %% (kræver %d)", tostring(ADRuns.vehicleLabel(vehicle)), product.name, (product.quote.price or 0) * 1000, tostring(product.quote.stationName), (product.quote.top or 0) * 1000, product.quote.percent or 0, run.sellAtPercent or ADRuns.DEFAULT_SELL_AT_PERCENT)
end
end
end
+2 -2
View File
@@ -68,7 +68,7 @@ function ADOutboundPlanner.evaluate(product, input)
storageHigh = storagePercent >= (input.storeAbovePercent or 80),
percent = percent,
-- sælg fra 0 % = "Altid": uanset pris (også uden prisdata)
priceOk = input.sellAtPercent == 0 or (percent ~= nil and percent >= (input.sellAtPercent or 90)),
priceOk = input.sellAtPercent == 0 or (percent ~= nil and percent >= (input.sellAtPercent or 0)),
-- "sælg altid over X %": kilden er så fuld, at der sælges uanset pris
overflow = (input.sellAbovePercent or 0) > 0 and storagePercent >= input.sellAbovePercent,
-- "hent først ved X %": salg venter til kilden er så fuld, eller et fuldt læs ligger klar (0 = fra)
@@ -119,7 +119,7 @@ local function reasonFor(product, e, input)
end
local parts = {}
if wantsSell(product.policy) and e.percent ~= nil then
table.insert(parts, string.format("%d %% af top (kræver %d)", e.percent, input.sellAtPercent or 90))
table.insert(parts, string.format("%d %% af top (kræver %d)", e.percent, input.sellAtPercent or 0))
end
table.insert(parts, string.format("lager %d %%", math.floor(e.storagePercent + 0.5)))
return product.name .. " " .. table.concat(parts, ", ")
+12 -3
View File
@@ -15,7 +15,8 @@ ADRuns.INGREDIENT_MODES = {auto = true, manual = true}
ADRuns.KINDS = {supply = true, outbound = true}
-- Politik pr. vare i et udkørsels-run; "off" = varen er ikke med (fjernes fra listen).
ADRuns.POLICIES = {store = true, sell = true, sellElseStore = true}
ADRuns.DEFAULT_SELL_AT_PERCENT, ADRuns.MIN_SELL_AT_PERCENT, ADRuns.MAX_SELL_AT_PERCENT = 90, 50, 100
-- 0 = sælg altid (enhver pris) — standard (brugerønske 12/10); ellers 50-100 % af årets toppris
ADRuns.DEFAULT_SELL_AT_PERCENT, ADRuns.MIN_SELL_AT_PERCENT, ADRuns.MAX_SELL_AT_PERCENT = 0, 50, 100
ADRuns.DEFAULT_STORE_ABOVE_PERCENT, ADRuns.MIN_STORE_ABOVE_PERCENT, ADRuns.MAX_STORE_ABOVE_PERCENT = 80, 50, 95
-- "Sælg altid over X %": kildens lager over grænsen sælges uanset pris (0 = fra). Så hober f.eks. gylle
-- ved BGA'en sig ikke op, når prisen er lav.
@@ -44,6 +45,14 @@ local function clampRange(value, default, min, max)
return math.max(min, math.min(max, math.floor(number)))
end
-- "Sælg fra": 0 = altid, ellers MIN..MAX; mangler værdien, standarden (der selv kan være 0 = altid)
local function sellAtValue(value)
local number = tonumber(value)
if number == nil then return ADRuns.DEFAULT_SELL_AT_PERCENT end
if number == 0 then return 0 end
return clampRange(number, ADRuns.DEFAULT_SELL_AT_PERCENT, ADRuns.MIN_SELL_AT_PERCENT, ADRuns.MAX_SELL_AT_PERCENT)
end
-- Flow-vogne: {[traktorId] = vognId} (maskinpulje — flowet henter sin egen vogn).
-- Start alle pr. flow: isRunning (traktorer kører AD), stopped (pause fra Stop alt / Stop).
-- -> "queue" (start traktorerne), "resume" (kører allerede: kun pausen ophæves), "skip".
@@ -227,7 +236,7 @@ function ADRuns.updateRun(store, runId, changes)
if changes.storeBuildingIds ~= nil then run.storeBuildingIds = copyList(changes.storeBuildingIds) end
if changes.products ~= nil then run.products = copyProducts(changes.products) end
-- 0 = "Altid" (sælg uanset pris); ellers 50-100 %
if changes.sellAtPercent ~= nil then run.sellAtPercent = tonumber(changes.sellAtPercent) == 0 and 0 or clampRange(changes.sellAtPercent, ADRuns.DEFAULT_SELL_AT_PERCENT, ADRuns.MIN_SELL_AT_PERCENT, ADRuns.MAX_SELL_AT_PERCENT) end
if changes.sellAtPercent ~= nil then run.sellAtPercent = sellAtValue(changes.sellAtPercent) end
if changes.storeAbovePercent ~= nil then run.storeAbovePercent = clampRange(changes.storeAbovePercent, ADRuns.DEFAULT_STORE_ABOVE_PERCENT, ADRuns.MIN_STORE_ABOVE_PERCENT, ADRuns.MAX_STORE_ABOVE_PERCENT) end
if changes.sellAbovePercent ~= nil then run.sellAbovePercent = clampRange(changes.sellAbovePercent, ADRuns.DEFAULT_SELL_ABOVE_PERCENT, ADRuns.MIN_SELL_ABOVE_PERCENT, ADRuns.MAX_SELL_ABOVE_PERCENT) end
if changes.minSourcePercent ~= nil then run.minSourcePercent = clampRange(changes.minSourcePercent, ADRuns.DEFAULT_MIN_SOURCE_PERCENT, ADRuns.MIN_MIN_SOURCE_PERCENT, ADRuns.MAX_MIN_SOURCE_PERCENT) end
@@ -544,7 +553,7 @@ function ADRuns.fromRecords(records)
targetBuildingIds = parseIds(record.targetBuildings),
storeBuildingIds = parseIds(record.storeBuildings),
products = ADRuns.parseProducts(record.products),
sellAtPercent = tonumber(record.sellAt) == 0 and 0 or clampRange(record.sellAt, ADRuns.DEFAULT_SELL_AT_PERCENT, ADRuns.MIN_SELL_AT_PERCENT, ADRuns.MAX_SELL_AT_PERCENT),
sellAtPercent = sellAtValue(record.sellAt),
storeAbovePercent = clampRange(record.storeAbove, ADRuns.DEFAULT_STORE_ABOVE_PERCENT, ADRuns.MIN_STORE_ABOVE_PERCENT, ADRuns.MAX_STORE_ABOVE_PERCENT),
sellAbovePercent = clampRange(record.sellAbove, ADRuns.DEFAULT_SELL_ABOVE_PERCENT, ADRuns.MIN_SELL_ABOVE_PERCENT, ADRuns.MAX_SELL_ABOVE_PERCENT),
minSourcePercent = clampRange(record.minSource, ADRuns.DEFAULT_MIN_SOURCE_PERCENT, ADRuns.MIN_MIN_SOURCE_PERCENT, ADRuns.MAX_MIN_SOURCE_PERCENT),
+3 -1
View File
@@ -775,7 +775,9 @@ local function getOutboundFillTypes(adEnv, run, vehicle)
end
local canLoadPallets = hasAutoload(adEnv, vehicle)
local result, palletCount, chosen = {}, 0, 0
for _, product in ipairs(ADRunsController.getRunProducts(adEnv, run)) do
-- også valgte varer kilden er tom for lige nu (in-game 12/10: mælke-flowet ved tomme kostalde blev afvist med
-- "ingen vare valgt"); flowet starter og venter, til der er noget at hente
for _, product in ipairs(ADRunsController.getRunProducts(adEnv, run, true)) do
if product.policy ~= "off" then
chosen = chosen + 1
if product.isPallet then
@@ -51,7 +51,7 @@ function SmartPickupFrame:flowCells(adEnv, run)
if row.kind == "outbound" then
local sells, stores = ADFlowView.policyUse(row.policies)
local parts = {}
if sells then table.insert(parts, row.sellAtPercent == 0 and i18n:getText("spu_flow_ruleSellAlways") or string.format(i18n:getText("spu_flow_ruleSell"), row.sellAtPercent or 90)) end
if sells then table.insert(parts, (row.sellAtPercent or 0) == 0 and i18n:getText("spu_flow_ruleSellAlways") or string.format(i18n:getText("spu_flow_ruleSell"), row.sellAtPercent)) end
if stores then table.insert(parts, string.format(i18n:getText("spu_flow_ruleStore"), row.storeAbovePercent or 80)) end
rule = table.concat(parts, ", ")
if row.collectRound then rule = rule .. ", " .. i18n:getText("spu_flow_round") end
@@ -139,6 +139,9 @@ function SmartPickupFrame:initialize()
self.returnBelowOption:setTexts(percentTexts)
self.sellAtSteps, self.storeAboveSteps = {}, {}
local sellTexts, storeTexts = {}, {}
-- 0 = sælg altid (standard): første trin, så fanen kan vise og vælge det (review 1.62.224)
table.insert(self.sellAtSteps, 0)
table.insert(sellTexts, self.i18n:getText("spu_sellAt_always"))
for percent = ADRuns.MIN_SELL_AT_PERCENT, ADRuns.MAX_SELL_AT_PERCENT, 5 do
table.insert(self.sellAtSteps, percent)
table.insert(sellTexts, string.format("%d %%", percent))
+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.223.0</version>
<version>1.62.224.0</version>
<title>
<en>AD Smart Pickup</en>
</title>