fix: fuldt mål fanger tipning før markøren og drypvis aflæsning (1.62.370)
This commit is contained in:
@@ -26,11 +26,21 @@ function ADStrayUnload.isFull(free, capacity)
|
||||
return type(free) == "number" and type(capacity) == "number" and capacity > 0 and free < ADStrayUnload.MIN_FREE
|
||||
end
|
||||
|
||||
-- Er der aflæsset nok siden mark til, at tiden starter forfra?
|
||||
function ADStrayUnload.progressed(mark, rest)
|
||||
return type(mark) == "number" and type(rest) == "number" and mark - rest >= ADStrayUnload.PROGRESS_LITERS
|
||||
end
|
||||
|
||||
-- ---- spil-adapter ----
|
||||
|
||||
local timerMs = 0
|
||||
local held = setmetatable({}, {__mode = "k"}) -- køretøj -> ms ved fuldt mål
|
||||
local lastRest = setmetatable({}, {__mode = "k"}) -- køretøj -> liter ved sidste tjek (falder læsset, tømmer den)
|
||||
local restMark = setmetatable({}, {__mode = "k"}) -- køretøj -> liter da tiden sidst startede forfra
|
||||
-- Så meget skal læsset falde, før tiden starter forfra: et fuldt mål, der kun æder lidt (oliemølle: ~3 l/15 s), er
|
||||
-- stadig fuldt (review før: hver liter nulstillede tiden)
|
||||
ADStrayUnload.PROGRESS_LITERS = 1000
|
||||
ADStrayUnload.GRACE_MS = 15000
|
||||
local gap = setmetatable({}, {__mode = "k"}) -- køretøj -> ms uden "fast" mens tiden løber
|
||||
|
||||
local function label(vehicle)
|
||||
return ADRuns ~= nil and tostring(ADRuns.vehicleLabel(vehicle)) or tostring(vehicle.getName ~= nil and vehicle:getName() or "?")
|
||||
@@ -58,7 +68,11 @@ local function stuckAtFullTarget(adEnv, vehicle)
|
||||
if ad == nil or ad.stateModule == nil or not ad.stateModule:isActive() then return false end
|
||||
local task = ad.taskModule ~= nil and ad.taskModule.activeTask or nil
|
||||
if task == nil or task.taskType ~= ADStrayUnload.UNLOAD_TASK then return false end
|
||||
if ad.drivePathModule == nil or not ad.drivePathModule:isTargetReached() then return false end
|
||||
-- ved målet: AD er fremme, ELLER AD tipper ved triggeren før markøren (in-game 19/10 11:35: 'Series 8 TTV 5' holdt
|
||||
-- 14 m før "Oil Mill Deliveries" og dryppede raps i en fuld oliemølle)
|
||||
local reached = ad.drivePathModule ~= nil and ad.drivePathModule:isTargetReached()
|
||||
local tipping = ad.trailerModule ~= nil and ad.trailerModule.isUnloading == true
|
||||
if not reached and not tipping then return false end
|
||||
if owned(vehicle) then return false end
|
||||
local fillType, rest = ADUnloadWait.getRestLoad(adEnv, vehicle)
|
||||
if fillType == nil or (rest or 0) < ADStrayUnload.MIN_CARGO then return false end
|
||||
@@ -94,13 +108,19 @@ function ADStrayUnload.tick(adEnv, dt)
|
||||
local ok, stuck, targetName, rest, fillType = false, false, nil, nil, nil
|
||||
if mine and vehicle.ad ~= nil then ok, stuck, targetName, rest, fillType = pcall(stuckAtFullTarget, adEnv, vehicle) end
|
||||
stuck = ok and stuck == true
|
||||
-- læsset falder: den aflæsser (langsomt) — tæl forfra
|
||||
if stuck and lastRest[vehicle] ~= nil and rest < lastRest[vehicle] - 1 then held[vehicle] = 0 end
|
||||
lastRest[vehicle] = stuck and rest or nil
|
||||
held[vehicle] = stuck and (held[vehicle] or 0) + elapsed or nil
|
||||
local action = ADStrayUnload.step({stuck = stuck, heldMs = held[vehicle], limitMs = (tonumber(minutes) or 0) * 60000})
|
||||
-- et kort hul (AD's tippe-flag blinker mellem tip) nulstiller ikke tiden — først efter GRACE_MS (review 19/10)
|
||||
gap[vehicle] = (not stuck and held[vehicle] ~= nil) and (gap[vehicle] or 0) + elapsed or nil
|
||||
local keep = gap[vehicle] ~= nil and gap[vehicle] < ADStrayUnload.GRACE_MS
|
||||
if not stuck and not keep then
|
||||
restMark[vehicle], held[vehicle], gap[vehicle] = nil, nil, nil
|
||||
elseif stuck then
|
||||
-- læsset falder mærkbart: den aflæsser — tæl forfra
|
||||
if restMark[vehicle] == nil or ADStrayUnload.progressed(restMark[vehicle], rest) then restMark[vehicle], held[vehicle] = rest, 0 end
|
||||
held[vehicle] = (held[vehicle] or 0) + elapsed
|
||||
end
|
||||
local action = stuck and ADStrayUnload.step({stuck = true, heldMs = held[vehicle], limitMs = (tonumber(minutes) or 0) * 60000}) or "wait"
|
||||
if action == "act" then
|
||||
held[vehicle] = nil
|
||||
held[vehicle], restMark[vehicle], gap[vehicle] = nil, nil, nil
|
||||
local okAct, err = pcall(act, adEnv, vehicle, targetName, rest, fillType, minutes)
|
||||
if not okAct then Logging.warning(ADStrayUnload.LOG_PREFIX .. "'%s': %s", label(vehicle), tostring(err)) end
|
||||
end
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.369.0</version>
|
||||
<version>1.62.370.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user