fix(påfyldning): tomt lager -> næste påfyldningssted; eget lager kræver 500 l (v1.62.257)
This commit is contained in:
@@ -9,6 +9,15 @@ ADFillFold.LOG_PREFIX = "ADSmartPickup: påfyldning: "
|
||||
ADFillFold.NEAR_M = 15 -- så tæt på påfyldningsmarkøren foldes ud (ikke mens den kører ind mod stationen)
|
||||
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
|
||||
|
||||
-- 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 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"
|
||||
end
|
||||
|
||||
-- Ren: foldens animationstid t og tankens tilladte interval [min, max] -> retning (1/-1) der skal til, eller nil.
|
||||
function ADFillFold.foldDirection(t, min, max)
|
||||
@@ -31,8 +40,9 @@ end
|
||||
|
||||
-- ---- spil-adapter ----
|
||||
|
||||
local refillWatch = setmetatable({}, {__mode = "k"}) -- køretøj -> {level, since} ved påfyldningsmarkøren
|
||||
local unfolded = setmetatable({}, {__mode = "k"}) -- køretøj -> {{object, direction}} vi har foldet ud til påfyldning
|
||||
local timerMs = 0
|
||||
local timerMs, clockMs = 0, 0
|
||||
|
||||
-- Redskaber på traktoren hvis tank ikke kan fyldes i den nuværende foldestilling: {object, direction}
|
||||
local function blockedByFold(vehicle)
|
||||
@@ -74,8 +84,29 @@ local function refillDistance(adEnv, vehicle)
|
||||
return true, math.sqrt((wayPoint.x - x) ^ 2 + (wayPoint.z - z) ^ 2)
|
||||
end
|
||||
|
||||
local function tickVehicle(adEnv, vehicle)
|
||||
local function watchEmptyRefill(adEnv, vehicle, loading, distance, now)
|
||||
local module = vehicle.ad ~= nil and vehicle.ad.stateModule or nil
|
||||
local fillType = module ~= nil and module.getFillType ~= nil and module:getFillType() or nil
|
||||
local level = (fillType ~= nil and ADCpBridge ~= nil and ADCpBridge.getRefillLevel ~= nil) and (ADCpBridge.getRefillLevel(vehicle, fillType) or 0) or 0
|
||||
local watch = refillWatch[vehicle]
|
||||
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
|
||||
elseif check == "wait" then
|
||||
if watch == nil then refillWatch[vehicle] = {level = level, since = now} end
|
||||
else
|
||||
refillWatch[vehicle] = nil
|
||||
if ADFieldWork.retargetEmptyRefill ~= nil then
|
||||
local ok, err = pcall(ADFieldWork.retargetEmptyRefill, adEnv, vehicle)
|
||||
if not ok then Logging.warning(ADFillFold.LOG_PREFIX .. "tomt påfyldningssted: %s", tostring(err)) end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local function tickVehicle(adEnv, vehicle, now)
|
||||
local loading, distance = refillDistance(adEnv, vehicle)
|
||||
watchEmptyRefill(adEnv, vehicle, loading, distance, now)
|
||||
local blocked = (loading and distance ~= nil and distance <= ADFillFold.NEAR_M) and blockedByFold(vehicle) or {}
|
||||
local action = ADFillFold.action({loading = loading, distance = distance, needsUnfold = #blocked > 0,
|
||||
unfoldedByUs = unfolded[vehicle] ~= nil, cpWorking = ADCpBridge ~= nil and ADCpBridge.isWorking(vehicle)})
|
||||
@@ -92,6 +123,7 @@ end
|
||||
function ADFillFold.tick(adEnv, dt)
|
||||
if adEnv == nil or ADFieldJobs == nil or ADFieldJobs.state == nil or ADHitch == nil then return end
|
||||
timerMs = timerMs + (dt or 0)
|
||||
clockMs = clockMs + (dt or 0)
|
||||
if timerMs < ADFillFold.TICK_MS then return end
|
||||
timerMs = 0
|
||||
local seen = {}
|
||||
@@ -99,7 +131,7 @@ function ADFillFold.tick(adEnv, dt)
|
||||
local vehicle = assignment.vehicle
|
||||
if vehicle ~= nil and ADFieldWork.REFILL_ROLES[assignment.role] then
|
||||
seen[vehicle] = true
|
||||
local ok, err = pcall(tickVehicle, adEnv, vehicle)
|
||||
local ok, err = pcall(tickVehicle, adEnv, vehicle, clockMs)
|
||||
if not ok then Logging.warning(ADFillFold.LOG_PREFIX .. "%s", tostring(err)) end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user