feat(påfyldning): fold ud ved påfyldning når tanken kræver det (Bednar Omega), fold sammen bagefter (v1.62.249)

This commit is contained in:
2026-10-16 04:07:42 +02:00
parent 28ad9985ab
commit a574945495
4 changed files with 116 additions and 1 deletions
+112
View File
@@ -0,0 +1,112 @@
-- AD Fill Fold
-- Redskaber hvis tank kun kan fyldes udfoldet (FillUnit#foldMinLimit/foldMaxLimit, fx Bednar Omega-såmaskinen): AutoDrive
-- folder ikke ud ved påfyldning, så maskinen holdt ved stationen uden at blive fyldt (in-game 16/10). Når en markopgaves
-- AD-tur i påfyldnings-tilstand er ved påfyldningsmarkøren, foldes redskabet så meget ud at tanken kan fyldes; når den
-- kører derfra igen (og Courseplay ikke arbejder), foldes det sammen til vejen. Ren logik øverst, spil-adapter nederst.
ADFillFold = {}
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
-- Ren: foldens animationstid t og tankens tilladte interval [min, max] -> retning (1/-1) der skal til, eller nil.
function ADFillFold.foldDirection(t, min, max)
if t == nil or min == nil or max == nil then return nil end
if t < min then return 1 end
if t > max then return -1 end
return nil
end
-- Ren: s = {loading, distance, needsUnfold, unfoldedByUs, cpWorking} -> "unfold" | "fold" | "none"
function ADFillFold.action(s)
if s.unfoldedByUs then
if s.cpWorking then return "none" end
if not s.loading or (s.distance or math.huge) > ADFillFold.FAR_M then return "fold" end
return "none"
end
if s.loading and s.needsUnfold and (s.distance or math.huge) <= ADFillFold.NEAR_M then return "unfold" end
return "none"
end
-- ---- spil-adapter ----
local unfolded = setmetatable({}, {__mode = "k"}) -- køretøj -> {{object, direction}} vi har foldet ud til påfyldning
local timerMs = 0
-- Redskaber på traktoren hvis tank ikke kan fyldes i den nuværende foldestilling: {object, direction}
local function blockedByFold(vehicle)
local list = {}
for _, implement in ipairs(ADHitch.directImplementsOf(vehicle) or {}) do
local object = implement.object
local fillSpec = object ~= nil and object.spec_fillUnit or nil
if fillSpec ~= nil and object.spec_foldable ~= nil and object.getFoldAnimTime ~= nil and object.setFoldDirection ~= nil then
local t = object:getFoldAnimTime()
for _, unit in ipairs(fillSpec.fillUnits or {}) do
local direction = ADFillFold.foldDirection(t, unit.foldMinLimit, unit.foldMaxLimit)
if direction ~= nil then
table.insert(list, {object = object, direction = direction})
break
end
end
end
end
return list
end
-- Præcis den modsatte vej af udfoldningen (foldForTransport folder kun et helt udfoldet redskab — halvt åbent blev
-- stående, review 16/10).
local function foldBack(vehicle)
local entries = unfolded[vehicle]
unfolded[vehicle] = nil
for _, entry in ipairs(entries or {}) do
pcall(function() entry.object:setFoldDirection(-entry.direction) end)
end
end
local function refillDistance(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, nil end
local marker = module.getSecondMarker ~= nil and module:getSecondMarker() or nil
local wayPoint = marker ~= nil and marker.id ~= nil and adEnv.ADGraphManager:getWayPointById(marker.id) or nil
if wayPoint == nil or vehicle.rootNode == nil then return true, nil end
local x, _, z = getWorldTranslation(vehicle.rootNode)
return true, math.sqrt((wayPoint.x - x) ^ 2 + (wayPoint.z - z) ^ 2)
end
local function tickVehicle(adEnv, vehicle)
local loading, distance = refillDistance(adEnv, vehicle)
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)})
if action == "unfold" then
for _, entry in ipairs(blocked) do entry.object:setFoldDirection(entry.direction) end
unfolded[vehicle] = blocked
Logging.info(ADFillFold.LOG_PREFIX .. "'%s' foldes ud, så tanken kan fyldes", tostring(ADRuns.vehicleLabel(vehicle)))
elseif action == "fold" then
foldBack(vehicle)
Logging.info(ADFillFold.LOG_PREFIX .. "'%s' foldes sammen efter påfyldning", tostring(ADRuns.vehicleLabel(vehicle)))
end
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)
if timerMs < ADFillFold.TICK_MS then return end
timerMs = 0
local seen = {}
for _, assignment in pairs(ADFieldJobs.state.assignments or {}) do
local vehicle = assignment.vehicle
if vehicle ~= nil and ADFieldWork.REFILL_ROLES[assignment.role] then
seen[vehicle] = true
local ok, err = pcall(tickVehicle, adEnv, vehicle)
if not ok then Logging.warning(ADFillFold.LOG_PREFIX .. "%s", tostring(err)) 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
foldBack(vehicle)
end
end
end
+1
View File
@@ -1747,6 +1747,7 @@ function ADSmartPickup:update(dt)
Logging.warning(ADSmartPickup.LOG_PREFIX .. "marksilo-flow fejlede: %s", tostring(errSilos))
end
end
if ADFillFold ~= nil then pcall(ADFillFold.tick, getAutoDriveEnv(), dt) end
if ADFieldJobs ~= nil then
local okFields, errFields = pcall(ADFieldJobs.tick, getAutoDriveEnv(), dt)
if not okFields then
+2 -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.248.0</version>
<version>1.62.249.0</version>
<title>
<en>AD Smart Pickup</en>
</title>
@@ -49,6 +49,7 @@
<sourceFile filename="adManualTransport.lua"/>
<sourceFile filename="adPalletRefill.lua"/>
<sourceFile filename="adFieldWork.lua"/>
<sourceFile filename="adFillFold.lua"/>
<sourceFile filename="adPlayerTransport.lua"/>
<sourceFile filename="adFieldSiloPlanner.lua"/>
<sourceFile filename="adFieldSiloConfig.lua"/>