fix: fordeling regner behov som turens størrelse (v1.62.145)
This commit is contained in:
@@ -1068,9 +1068,13 @@ function ADSmartPickup.findSupplyPickup(adEnv, driver, ingredients, targetWayPoi
|
||||
if choice ~= nil then
|
||||
-- retfærdig fordeling af gårdens lager mellem alle, der mangler varen lige nu (brugerønske 10/10)
|
||||
local pending = math.min(loadCapacity or math.huge, choice.level or math.huge, need.freeSpace or math.huge)
|
||||
local totalFree, others = registerDemand(need.fillType, driver, need.freeSpace)
|
||||
-- behovet er det, denne tur kan tage (vognens størrelse), ikke målets samlede frie plads: ellers tæller en
|
||||
-- 20 mio. l-silo som ét kæmpe behov, og alle andre får smuler (in-game 10/10: 3.110 l af 334.730 l)
|
||||
local tripNeed = math.min(need.freeSpace or math.huge, loadCapacity or math.huge)
|
||||
if tripNeed == math.huge then tripNeed = need.freeSpace or 0 end
|
||||
local totalFree, others = registerDemand(need.fillType, driver, tripNeed)
|
||||
if choice.isOwn and others > 0 then
|
||||
local share = ADSupplyPlanner.fairShare(choice.level or 0, need.freeSpace or 0, totalFree)
|
||||
local share = ADSupplyPlanner.fairShare(choice.level or 0, tripNeed, totalFree)
|
||||
if share < pending then
|
||||
Logging.info(ADSmartPickup.LOG_PREFIX .. "'%s': %s deles med %d andre behov — tager %.0f l af %.0f l i %s",
|
||||
tostring(ADRuns.vehicleLabel(driver)), tostring(g_fillTypeManager:getFillTypeNameByIndex(need.fillType)), others, share, choice.level or 0, tostring(choice.markerName))
|
||||
|
||||
Reference in New Issue
Block a user