fix(påfyldning): tomt lager -> næste påfyldningssted; eget lager kræver 500 l (v1.62.257)
This commit is contained in:
@@ -1335,10 +1335,13 @@ end
|
||||
-- efter behov — ingen lagerbeholdning, så de fandtes ikke før; in-game 26/9 "Liquid Buy Station").
|
||||
-- skipRoute: rutetjekket springes over (frakoblet puljeredskab har ingen .ad, så AD's getPathTo fejler; traktoren
|
||||
-- tjekkes igen i refillPlan efter påkobling).
|
||||
function ADFieldWork.findRefillMarker(adEnv, vehicle, fillType, x, z, skipRoute)
|
||||
-- exclude (valgfri): {[wayPointId] = true} der springes over (fx et lager der er løbet tørt, mens vognen ventede)
|
||||
ADFieldWork.MIN_REFILL_STOCK_L = 500 -- eget lager skal have mindst så meget af varen for at være påfyldningssted
|
||||
function ADFieldWork.findRefillMarker(adEnv, vehicle, fillType, x, z, skipRoute, exclude)
|
||||
local farmId = vehicle:getOwnerFarmId()
|
||||
local best, bestDistance = nil, math.huge
|
||||
local function consider(wayPointId)
|
||||
if exclude ~= nil and wayPointId ~= nil and exclude[wayPointId] then return end
|
||||
local wayPoint = wayPointId ~= nil and wayPointId > 0 and adEnv.ADGraphManager:getWayPointById(wayPointId) or nil
|
||||
if wayPoint == nil then return end
|
||||
local distance = (wayPoint.x - x) ^ 2 + (wayPoint.z - z) ^ 2
|
||||
@@ -1353,7 +1356,7 @@ function ADFieldWork.findRefillMarker(adEnv, vehicle, fillType, x, z, skipRoute)
|
||||
local supported = station.getAISupportedFillTypes ~= nil and station:getAISupportedFillTypes() or {}
|
||||
local isShop = station.owningPlaceable ~= nil and station.owningPlaceable.spec_buyingStation ~= nil
|
||||
if not isShop and g_currentMission.accessHandler:canFarmAccess(farmId, station) and supported[fillType]
|
||||
and (station:getFillLevel(fillType, farmId) or 0) > 0 then
|
||||
and (station:getFillLevel(fillType, farmId) or 0) >= ADFieldWork.MIN_REFILL_STOCK_L then
|
||||
consider(markerAtStation(adEnv, vehicle, station, station.owningPlaceable))
|
||||
end
|
||||
end
|
||||
@@ -1371,6 +1374,38 @@ function ADFieldWork.findRefillMarker(adEnv, vehicle, fillType, x, z, skipRoute)
|
||||
return best
|
||||
end
|
||||
|
||||
-- Påfyldningsstedet er løbet tørt, mens vognen venter der (in-game 16/10: kalk-sprederen holdt ved "TMR Silo Farma",
|
||||
-- der var tom): find næste sted uden det nuværende, og kør derhen. -> true når turen er flyttet.
|
||||
function ADFieldWork.retargetEmptyRefill(adEnv, vehicle)
|
||||
local module = vehicle.ad ~= nil and vehicle.ad.stateModule or nil
|
||||
if module == nil or not module:isActive() or module:getMode() ~= adEnv.AutoDrive.MODE_LOAD then return false end
|
||||
local first, second = module:getFirstMarker(), module:getSecondMarker()
|
||||
local fillType = module.getFillType ~= nil and module:getFillType() or nil
|
||||
if first == nil or second == nil or fillType == nil then return false end
|
||||
-- kun når stedet BEVISELIGT ikke kan levere (review): eget lager under minimum, eller købestation der ikke sælger
|
||||
-- varen. Kø ved stationen, langsom pumpe eller fuld tank flytter den ikke.
|
||||
local station = markerOwner(adEnv, second.id)
|
||||
if station ~= nil then
|
||||
local shop = station.owningPlaceable ~= nil and station.owningPlaceable.spec_buyingStation ~= nil
|
||||
if shop then
|
||||
if ADFieldWork.buyingSupports(station, fillType) then return false end
|
||||
else
|
||||
local farmId = vehicle:getOwnerFarmId()
|
||||
local okLevel, stock = pcall(station.getFillLevel, station, fillType, farmId)
|
||||
if okLevel and (stock or 0) >= ADFieldWork.MIN_REFILL_STOCK_L then return false end
|
||||
end
|
||||
end
|
||||
local x, z = vehiclePosition(vehicle)
|
||||
local right = ADFieldWork.findRefillMarker(adEnv, vehicle, fillType, x, z, true, {[second.id] = true})
|
||||
if right == nil then return false end
|
||||
startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_LOAD, first.id, right, fillType)
|
||||
local marker = adEnv.ADGraphManager:getMapMarkerByWayPointId(right)
|
||||
local name = g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeNameByIndex(fillType) or tostring(fillType)
|
||||
Logging.info("ADSmartPickup: påfyldning: '%s' fik intet %s ved %s — kører til %s", tostring(ADRuns.vehicleLabel(vehicle)),
|
||||
tostring(name), tostring(second.name), tostring(marker ~= nil and marker.name or right))
|
||||
return true
|
||||
end
|
||||
|
||||
-- Genoptaget AD-tur i påfyldnings-tilstand (LOAD): påfyldningsstedet blev valgt før gem — måske af en ældre version
|
||||
-- (in-game 16/10: kalk og gødning ved "Liquid Buy Silo", som ikke sælger dem; sprederne holdt der). Find det rigtige
|
||||
-- sted for varen nu, og genstart turen dertil, hvis det er et andet.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.256.0</version>
|
||||
<version>1.62.257.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user