feat: markørvagt genstarter flowkøretøjer med P/Connect-mål fra et gem (v1.62.67)

This commit is contained in:
2026-10-07 23:21:05 +02:00
parent d38bdc6b2f
commit 31b8b19b9c
3 changed files with 53 additions and 4 deletions
+51 -3
View File
@@ -11,7 +11,12 @@ ADMarkerGuard = {}
ADMarkerGuard.LOG_PREFIX = "ADSmartPickup: markørvagt: "
ADMarkerGuard.RESTART_DELAY_MS = 3000 -- spilleren er måske midt i at flytte markøren
ADMarkerGuard.SCAN_MS = 30000 -- så tit flowkøretøjer tjekkes for et forkert mål (fra et gem)
ADMarkerGuard.STRAY_RESTART_MS = 5 * 60 * 1000 -- højst én genstart pr. køretøj så tit
local queue = setmetatable({}, {__mode = "k"}) -- køretøj -> tid (ms) den blev berørt
local strayRestartAt = setmetatable({}, {__mode = "k"}) -- køretøj -> tid for sidste genstart pga. forkert mål
local lastScan = nil
local strayCount = 0
-- ids = {first, second, current} (AutoDrive-markørindeks) -> peger køretøjet på den slettede markør?
@@ -24,6 +29,43 @@ function ADMarkerGuard.isDue(queuedAt, nowMs)
return nowMs - queuedAt >= ADMarkerGuard.RESTART_DELAY_MS
end
-- names = {firstName, secondName}: er et af målene en parkering ("P ...") eller kobling ("Connect ...")? Et flows
-- læsse-/aflæsningsmål er aldrig det (Wait-punkter er lovlige).
function ADMarkerGuard.isStrayTarget(names)
for _, name in ipairs({names.firstName, names.secondName}) do
local lower = string.lower(tostring(name or ""))
if lower:find("^p ") ~= nil or lower:find("^connect ") ~= nil then return true end
end
return false
end
local function markerName(state, getter)
if state[getter] == nil then return nil end
local ok, marker = pcall(state[getter], state)
return ok and marker ~= nil and marker.name or nil
end
-- Flowkøretøjer i læs-og-aflever med et forkert mål (fx gemt efter en markør-sletning) genstartes i flowet.
-- "Kør til" (kobling, hjemtur) springes over: dér er P/Connect netop målet.
function ADMarkerGuard.scanStrays(env)
local now = env.now()
for _, vehicle in ipairs(env.vehicles()) do
local state = vehicle.ad ~= nil and vehicle.ad.stateModule or nil
local run = state ~= nil and env.runOf(vehicle) or nil
local active = state ~= nil and state.isActive ~= nil and state:isActive() == true
local mode = state ~= nil and state.getMode ~= nil and state:getMode() or nil
if run ~= nil and not run.stopped and active and mode == env.pickupMode
and ADMarkerGuard.isStrayTarget({firstName = markerName(state, "getFirstMarker"), secondName = markerName(state, "getSecondMarker")})
and (strayRestartAt[vehicle] == nil or now - strayRestartAt[vehicle] >= ADMarkerGuard.STRAY_RESTART_MS) then
strayRestartAt[vehicle] = now
if env.restart ~= nil then
local ok, err = pcall(env.restart, vehicle, run, "forkert mål (parkering/kobling)")
if not ok and Logging ~= nil then Logging.warning(ADMarkerGuard.LOG_PREFIX .. "genstart fejlede: %s", tostring(err)) end
end
end
end
end
function ADMarkerGuard.queued() return queue end
function ADMarkerGuard.lastStrayCount() return strayCount end
@@ -73,6 +115,11 @@ end
function ADMarkerGuard.tick(env)
local now = env.now()
if lastScan == nil or now - lastScan >= ADMarkerGuard.SCAN_MS then
lastScan = now
local ok, err = pcall(ADMarkerGuard.scanStrays, env)
if not ok and Logging ~= nil then Logging.warning(ADMarkerGuard.LOG_PREFIX .. "%s", tostring(err)) end
end
for vehicle, queuedAt in pairs(queue) do
if ADMarkerGuard.isDue(queuedAt, now) then
queue[vehicle] = nil
@@ -104,9 +151,10 @@ function ADMarkerGuard.gameEnv(adEnv)
if g_currentMission ~= nil and type(g_currentMission.time) == "number" then return g_currentMission.time end
return os.clock() * 1000
end,
restart = function(vehicle, run)
Logging.info(ADMarkerGuard.LOG_PREFIX .. "AutoDrive-markør slettet — '%s' genstartes i flowet '%s' (ellers kører den til markør nr. 1)",
label(vehicle), tostring(run.name))
pickupMode = adEnv.AutoDrive ~= nil and adEnv.AutoDrive.MODE_PICKUPANDDELIVER or nil,
restart = function(vehicle, run, why)
Logging.info(ADMarkerGuard.LOG_PREFIX .. "%s — '%s' genstartes i flowet '%s'",
tostring(why or "AutoDrive-markør slettet (ellers kører den til markør nr. 1)"), label(vehicle), tostring(run.name))
ADRunsController.startVehicle(adEnv, run, vehicle)
end,
warnStray = function(vehicle)
+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.66.0</version>
<version>1.62.67.0</version>
<title>
<en>AD Smart Pickup</en>
</title>