fix(påfyldning): tomt-sted-tjek også for genoptagne ture; 25 m (v1.62.258)

This commit is contained in:
2026-10-16 06:28:52 +02:00
parent 4e009c5100
commit fb3324fadc
3 changed files with 18 additions and 3 deletions
+16 -2
View File
@@ -10,10 +10,11 @@ ADFillFold.NEAR_M = 15 -- så tæt på påfyldningsmarkøren foldes ud (i
ADFillFold.FAR_M = 60 -- så langt væk igen foldes sammen
ADFillFold.TICK_MS = 1000
ADFillFold.EMPTY_WAIT_MS = 45000 -- holder vognen ved påfyldningen så længe uden at fyldet stiger: stedet er tomt
ADFillFold.EMPTY_NEAR_M = 25 -- "ved påfyldningen" for tom-tjekket (AD holder ved triggeren, ikke altid ved markøren)
-- Ren: er påfyldningsstedet tomt? s = {loading, distance, level, lastLevel, stillMs} -> "wait" | "empty" | "none"
function ADFillFold.emptyCheck(s)
if not s.loading or (s.distance or math.huge) > ADFillFold.NEAR_M then return "none" end
if not s.loading or (s.distance or math.huge) > ADFillFold.EMPTY_NEAR_M then return "none" end
if s.lastLevel ~= nil and (s.level or 0) > s.lastLevel + 1 then return "none" end -- fyldes: alt vel
if (s.stillMs or 0) >= ADFillFold.EMPTY_WAIT_MS then return "empty" end
return "wait"
@@ -92,7 +93,7 @@ local function watchEmptyRefill(adEnv, vehicle, loading, distance, now)
local check = ADFillFold.emptyCheck({loading = loading, distance = distance, level = level,
lastLevel = watch ~= nil and watch.level or nil, stillMs = watch ~= nil and (now - watch.since) or 0})
if check == "none" then
refillWatch[vehicle] = (loading and distance ~= nil and distance <= ADFillFold.NEAR_M) and {level = level, since = now} or nil
refillWatch[vehicle] = (loading and distance ~= nil and distance <= ADFillFold.EMPTY_NEAR_M) and {level = level, since = now} or nil
elseif check == "wait" then
if watch == nil then refillWatch[vehicle] = {level = level, since = now} end
else
@@ -135,6 +136,19 @@ function ADFillFold.tick(adEnv, dt)
if not ok then Logging.warning(ADFillFold.LOG_PREFIX .. "%s", tostring(err)) end
end
end
-- genoptagne ture efter indlæsning (ADFieldWork.taken): ingen opgave før ankomst — men de kan holde ved et tomt
-- påfyldningssted (in-game 16/10: kalk-sprederen ved "TMR Silo Farma" efter genstart)
for vehicleId, entry in pairs(ADFieldWork.taken or {}) do
-- kun genoptagne ture (trip), ikke spillerens overtagelser; opslag kun for dem (review: findVehicleById er O(n))
if entry.trip ~= nil and ADFieldWork.REFILL_ROLES[entry.role] and ADFieldJobs.state.assignments[vehicleId] == nil then
local vehicle = ADRunsController.findVehicleById(adEnv, vehicleId)
if vehicle ~= nil and not seen[vehicle] then
seen[vehicle] = true
local ok, err = pcall(tickVehicle, adEnv, vehicle, clockMs)
if not ok then Logging.warning(ADFillFold.LOG_PREFIX .. "%s", tostring(err)) end
end
end
end
-- opgaven sluttede, mens den var foldet ud: fold sammen, hvis CP ikke arbejder
for vehicle in pairs(unfolded) do
if not seen[vehicle] and not (ADCpBridge ~= nil and ADCpBridge.isWorking(vehicle)) then