merge main (1.62.415 koblingsrettelse) ind i mp — 1.62.415.1

This commit is contained in:
2026-10-26 14:48:59 +01:00
3 changed files with 19 additions and 2 deletions
+17 -1
View File
@@ -167,6 +167,16 @@ function ADHitchCreep.reverseOutStep(s)
return "drive"
end
-- Findes alle noderne stadig? (exists = spillets entityExists; nil i tests). En vogn kan forsvinde midt i en
-- bakning (solgt/nulstillet) -> in-game 26/10: getWorldTranslation på en slettet node gav 7800 Lua-fejl på 2 min.
function ADHitchCreep.nodesExist(exists, ...)
for i = 1, select("#", ...) do
local node = select(i, ...)
if node == nil or (exists ~= nil and not exists(node)) then return false end
end
return true
end
-- ---- spil ----
local function worldPos(node)
@@ -285,6 +295,8 @@ function CreepTask:finish(action, distance)
if sdm ~= nil and sdm.stopVehicle ~= nil then sdm:stopVehicle() end
if action == "done" then
logInfo(ADHitchCreep.LOG_PREFIX .. "'%s' står ved '%s' — kobler på", vehicleName(self.vehicle), vehicleName(self.target.wagon))
elseif action == "gone" then
Logging.warning(ADHitchCreep.LOG_PREFIX .. "'%s' opgav at bakke: vognen eller krogen forsvandt undervejs", vehicleName(self.vehicle))
else
Logging.warning(ADHitchCreep.LOG_PREFIX .. "'%s' opgav at bakke hen til '%s' (%.1f m tilbage efter %d s)", vehicleName(self.vehicle),
vehicleName(self.target.wagon), distance, math.floor(self.elapsedMs / 1000))
@@ -296,6 +308,9 @@ end
function CreepTask:update(dt)
self.elapsedMs = self.elapsedMs + dt
self.checkMs = self.checkMs + dt
if self.target.wagon.isDeleted or not ADHitchCreep.nodesExist(entityExists, self.target.joint, self.target.target) then
return self:finish("gone", 0)
end
if self.target.wagon.getAttacherVehicle ~= nil and self.target.wagon:getAttacherVehicle() ~= nil then
return self:finish("giveUp", 0) -- en anden har taget vognen
end
@@ -331,7 +346,8 @@ function CreepTask:getI18nInfo() return "" end
function CreepTask:getExcludedVehiclesForCollisionCheck() return {self.target.wagon} end
local function isBlocking(vehicle, object)
if object.rootNode == nil then return false end
-- et redskab, der er forsvundet (solgt/nulstillet), spærrer ikke længere
if object.isDeleted or not ADHitchCreep.nodesExist(entityExists, object.rootNode) then return false end
local p = worldPos(object.rootNode)
local lx, _, lz = worldToLocal(vehicle.rootNode, p.x, p.y, p.z)
return ADHitchCreep.isBlockingFront(lx, lz, (vehicle.size ~= nil and vehicle.size.length or 5) / 2)
+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.414.1</version>
<version>1.62.415.1</version>
<title>
<en>AD Smart Pickup</en>
<de>AD Smart Pickup</de>