fix: skærebord afkobles først når foldningen står stille, med genforsøg — 1.62.157

This commit is contained in:
2026-10-10 06:00:22 +02:00
parent b90cb60772
commit 6e5bf05fa2
3 changed files with 23 additions and 11 deletions
+21 -10
View File
@@ -18,6 +18,7 @@ ADHeaderSwap.ATTACH_TIMEOUT_MS = 4000
ADHeaderSwap.FOLD_TIMEOUT_MS = 30000
ADHeaderSwap.FOLD_DONE_EPS = 0.01
ADHeaderSwap.LIFT_MS = 2000 -- skærebordet hæves, før det foldes til transport
ADHeaderSwap.DETACH_RETRY_MS = 10000 -- afkobling forsøges igen så længe (spillet: "Detach while folding is not allowed")
-- ---- ren logik ----
@@ -62,9 +63,10 @@ function ADHeaderSwap.foldTarget(turnOnFoldDirection, toWork)
return direction, direction > 0 and 1 or 0
end
-- s = {animTime, target, elapsedMs} -> "done" | "wait" | "timeout"
-- s = {animTime, target, elapsedMs, moving} -> "done" | "wait" | "timeout"
-- Færdig først når animationen også står stille (in-game 10/10: 99 % foldet -> "Detach while folding is not allowed").
function ADHeaderSwap.foldStep(s)
if s.animTime ~= nil and math.abs(s.animTime - s.target) <= ADHeaderSwap.FOLD_DONE_EPS then return "done" end
if s.animTime ~= nil and math.abs(s.animTime - s.target) <= ADHeaderSwap.FOLD_DONE_EPS and not s.moving then return "done" end
if (s.elapsedMs or 0) >= ADHeaderSwap.FOLD_TIMEOUT_MS then return "timeout" end
return "wait"
end
@@ -334,7 +336,10 @@ local function foldTask(swap, toWork)
return
end
local foldable = swap.header.spec_foldable
local action = ADHeaderSwap.foldStep({animTime = foldable ~= nil and foldable.foldAnimTime or nil, target = self.target, elapsedMs = self.elapsedMs})
local moving = foldable ~= nil and foldable.foldMoveDirection ~= nil and foldable.foldMoveDirection ~= 0
and swap.header.getIsAnimationPlaying ~= nil and foldable.foldingParts ~= nil and foldable.foldingParts[1] ~= nil
and swap.header:getIsAnimationPlaying(foldable.foldingParts[1].animationName) or false
local action = ADHeaderSwap.foldStep({animTime = foldable ~= nil and foldable.foldAnimTime or nil, target = self.target, elapsedMs = self.elapsedMs, moving = moving})
if action == "done" then return taskDone(swap) end
if action == "timeout" then return finish(swap, false, "skærebordet blev ikke foldet " .. (toWork and "til arbejde" or "til transport")) end
end
@@ -344,16 +349,22 @@ end
-- Kobl skærebordet af (foran) — det står nu på transporthjulene.
local function detachTask(swap)
local task = newTask(swap, "Kobler skærebordet af")
function task:setUp()
local allowed, warning = true, nil
if swap.header.isDetachAllowed ~= nil then allowed, warning = swap.header:isDetachAllowed() end
if not allowed then return finish(swap, false, "må ikke kobles af: " .. tostring(warning)) end
swap.combine:detachImplementByObject(swap.header)
end
function task:setUp() stopDriving(swap.combine) end
function task:update(dt)
self.elapsedMs = self.elapsedMs + dt
stopDriving(swap.combine)
if self.elapsedMs >= ADHeaderSwap.SETTLE_MS then taskDone(swap) end
if self.detachedAt == nil then
local allowed, warning = true, nil
if swap.header.isDetachAllowed ~= nil then allowed, warning = swap.header:isDetachAllowed() end
if not allowed then
if self.elapsedMs >= ADHeaderSwap.DETACH_RETRY_MS then return finish(swap, false, "må ikke kobles af: " .. tostring(warning)) end
return
end
swap.combine:detachImplementByObject(swap.header)
self.detachedAt = self.elapsedMs
return
end
if self.elapsedMs - self.detachedAt >= ADHeaderSwap.SETTLE_MS then taskDone(swap) end
end
return task
end