chore: ModHub-forberedelse — MIT-licens, AutoDrive-afhængighed, beskrivelse EN/DE/DA, multiplayer fra, Detaljeret log
This commit is contained in:
@@ -9,6 +9,9 @@
|
||||
-- Hvert trin er en AD-opgave i mejetærskerens kø (samme form som ADHitchCreep's krybning).
|
||||
-- Konsol (maskinen du sidder i): spuHeaderFront / spuHeaderRear. Ren logik øverst (testes med luajit).
|
||||
|
||||
-- info-log bag "Detaljeret log" (ADLog i adSettings.lua; uden ADLog — tests — direkte til Logging)
|
||||
local function logInfo(...) return (ADLog or Logging).info(...) end
|
||||
|
||||
ADHeaderSwap = {}
|
||||
ADHeaderSwap.LOG_PREFIX = "ADSmartPickup: skærebord: "
|
||||
-- m før koblingen, stifinderen sigter efter. AD's rute ender ca. 7 m forskudt langs retningen (in-game 10/10 med 12 m:
|
||||
@@ -261,7 +264,7 @@ local function finish(swap, ok, text)
|
||||
if not ok and swap.kind == "rear" and not swap.recovering and startRecovery ~= nil and startRecovery(swap, text) then return end
|
||||
active[swap.combine] = nil
|
||||
if ok then
|
||||
Logging.info(ADHeaderSwap.LOG_PREFIX .. "'%s': %s", vehicleName(swap.combine), text)
|
||||
logInfo(ADHeaderSwap.LOG_PREFIX .. "'%s': %s", vehicleName(swap.combine), text)
|
||||
else
|
||||
Logging.warning(ADHeaderSwap.LOG_PREFIX .. "'%s': %s — opgivet", vehicleName(swap.combine), text)
|
||||
local taskModule = swap.combine.ad ~= nil and swap.combine.ad.taskModule or nil
|
||||
@@ -288,7 +291,7 @@ local function settleTask(swap)
|
||||
function task:setUp()
|
||||
stopDriving(swap.combine)
|
||||
swap.combine:detachImplementByObject(swap.header)
|
||||
Logging.info(ADHeaderSwap.LOG_PREFIX .. "'%s' koblede '%s' af bag og kører rundt for at montere det foran", vehicleName(swap.combine), vehicleName(swap.header))
|
||||
logInfo(ADHeaderSwap.LOG_PREFIX .. "'%s' koblede '%s' af bag og kører rundt for at montere det foran", vehicleName(swap.combine), vehicleName(swap.header))
|
||||
end
|
||||
function task:update(dt)
|
||||
self.elapsedMs = self.elapsedMs + dt
|
||||
@@ -320,7 +323,7 @@ local function pathTask(swap, reverse)
|
||||
pathFinder:reset()
|
||||
pathFinder:startPathPlanningTo(target, vector)
|
||||
local x, _, z = getWorldTranslation(swap.combine.components[1].node)
|
||||
Logging.info(ADHeaderSwap.LOG_PREFIX .. "'%s' planlægger vej til (%.0f, %.0f), %.0f m væk, %s", vehicleName(swap.combine),
|
||||
logInfo(ADHeaderSwap.LOG_PREFIX .. "'%s' planlægger vej til (%.0f, %.0f), %.0f m væk, %s", vehicleName(swap.combine),
|
||||
target.x, target.z, math.sqrt((target.x - x) ^ 2 + (target.z - z) ^ 2), reverse and "bagkrogen mod trækstangen" or "fronten mod skærebordet")
|
||||
end
|
||||
function task:update(dt)
|
||||
@@ -336,7 +339,7 @@ local function pathTask(swap, reverse)
|
||||
point.y = getTerrainHeightAtWorldPos(g_currentMission.terrainRootNode, point.x, 1, point.z)
|
||||
end
|
||||
end
|
||||
Logging.info(ADHeaderSwap.LOG_PREFIX .. "'%s' kører %d vejpunkter", vehicleName(swap.combine), #path)
|
||||
logInfo(ADHeaderSwap.LOG_PREFIX .. "'%s' kører %d vejpunkter", vehicleName(swap.combine), #path)
|
||||
ad.drivePathModule:setWayPoints(path)
|
||||
self.planning = false
|
||||
else
|
||||
@@ -376,7 +379,7 @@ local function driveToSpotTask(swap, spot)
|
||||
local pathFinder = swap.combine.ad.pathFinderModule
|
||||
pathFinder:reset()
|
||||
pathFinder:startPathPlanningTo({x = spot.x, y = y, z = spot.z}, {x = spot.dirX, z = spot.dirZ})
|
||||
Logging.info(ADHeaderSwap.LOG_PREFIX .. "'%s' kører ind på marken (%.0f, %.0f) for at skifte skærebord", vehicleName(swap.combine), spot.x, spot.z)
|
||||
logInfo(ADHeaderSwap.LOG_PREFIX .. "'%s' kører ind på marken (%.0f, %.0f) for at skifte skærebord", vehicleName(swap.combine), spot.x, spot.z)
|
||||
end
|
||||
function task:update(dt)
|
||||
self.elapsedMs = self.elapsedMs + dt
|
||||
@@ -387,7 +390,7 @@ local function driveToSpotTask(swap, spot)
|
||||
local path = ad.pathFinderModule:getPath()
|
||||
if path == nil or #path == 0 then
|
||||
-- ingen vej derind (stor vendediameter med skærebordet på slæb, in-game 10/10): skift her i stedet
|
||||
Logging.info(ADHeaderSwap.LOG_PREFIX .. "'%s': ingen vej ind på marken — skifter skærebord, hvor den holder", vehicleName(swap.combine))
|
||||
logInfo(ADHeaderSwap.LOG_PREFIX .. "'%s': ingen vej ind på marken — skifter skærebord, hvor den holder", vehicleName(swap.combine))
|
||||
stopDriving(swap.combine)
|
||||
return taskDone(swap)
|
||||
end
|
||||
@@ -424,7 +427,7 @@ moveAwayTask = function(swap, forward)
|
||||
local moved = math.sqrt((x - self.start[1]) ^ 2 + (z - self.start[3]) ^ 2)
|
||||
if moved >= ADHeaderSwap.MOVE_AWAY_M or self.elapsedMs >= ADHeaderSwap.MOVE_AWAY_TIMEOUT_MS then
|
||||
stopDriving(combine)
|
||||
Logging.info(ADHeaderSwap.LOG_PREFIX .. "'%s' kørte %.1f m %s", vehicleName(combine), moved, forward and "frem" or "tilbage")
|
||||
logInfo(ADHeaderSwap.LOG_PREFIX .. "'%s' kørte %.1f m %s", vehicleName(combine), moved, forward and "frem" or "tilbage")
|
||||
return taskDone(swap)
|
||||
end
|
||||
local sdm = combine.ad.specialDrivingModule
|
||||
@@ -454,7 +457,7 @@ approachTask = function(swap, front)
|
||||
math.abs(target.offset.z), target.offset.z >= 0 and "foran" or "bag", target.offset.x)
|
||||
if (swap.approachRetries or 0) < ADHeaderSwap.APPROACH_RETRIES then
|
||||
swap.approachRetries = (swap.approachRetries or 0) + 1
|
||||
Logging.info(ADHeaderSwap.LOG_PREFIX .. "'%s' %s — kører fri og prøver en ny rute (%d/%d)", vehicleName(swap.combine), text,
|
||||
logInfo(ADHeaderSwap.LOG_PREFIX .. "'%s' %s — kører fri og prøver en ny rute (%d/%d)", vehicleName(swap.combine), text,
|
||||
swap.approachRetries, ADHeaderSwap.APPROACH_RETRIES)
|
||||
-- først væk fra skærebordet: rutens mål lå kun 5 m væk, AD meldte den kørt med det samme, og begge
|
||||
-- forsøg brugte 40 ms uden at mejetærskeren flyttede sig (in-game 10/10)
|
||||
@@ -482,7 +485,7 @@ local function attachTask(swap, front)
|
||||
stopDriving(swap.combine)
|
||||
local header, _, isFront = attachedHeader(swap.combine)
|
||||
if header == swap.header and isFront == front then
|
||||
Logging.info(ADHeaderSwap.LOG_PREFIX .. "'%s' har koblet '%s' på %s", vehicleName(swap.combine), vehicleName(header), front and "foran" or "bag")
|
||||
logInfo(ADHeaderSwap.LOG_PREFIX .. "'%s' har koblet '%s' på %s", vehicleName(swap.combine), vehicleName(header), front and "foran" or "bag")
|
||||
return taskDone(swap)
|
||||
end
|
||||
if header == nil then
|
||||
@@ -563,7 +566,7 @@ local function backOffTask(swap)
|
||||
local task = newTask(swap, "Bakker fri af skærebordet")
|
||||
function task:setUp()
|
||||
self.start = {getWorldTranslation(swap.combine.rootNode)}
|
||||
Logging.info(ADHeaderSwap.LOG_PREFIX .. "'%s' bakker fri af '%s' (til %d m fri plads foran)", vehicleName(swap.combine), vehicleName(swap.header), ADHeaderSwap.BACKOFF_CLEAR_M)
|
||||
logInfo(ADHeaderSwap.LOG_PREFIX .. "'%s' bakker fri af '%s' (til %d m fri plads foran)", vehicleName(swap.combine), vehicleName(swap.header), ADHeaderSwap.BACKOFF_CLEAR_M)
|
||||
end
|
||||
function task:update(dt)
|
||||
self.elapsedMs = self.elapsedMs + dt
|
||||
@@ -579,7 +582,7 @@ local function backOffTask(swap)
|
||||
if action ~= "drive" then
|
||||
stopDriving(combine)
|
||||
if action == "done" then
|
||||
Logging.info(ADHeaderSwap.LOG_PREFIX .. "'%s' er fri af skærebordet efter %.1f m (%.1f m fri foran)", vehicleName(combine), moved, gap)
|
||||
logInfo(ADHeaderSwap.LOG_PREFIX .. "'%s' er fri af skærebordet efter %.1f m (%.1f m fri foran)", vehicleName(combine), moved, gap)
|
||||
else
|
||||
Logging.warning(ADHeaderSwap.LOG_PREFIX .. "'%s' kom kun %.1f m tilbage (%.1f m fri foran) — kører videre", vehicleName(combine), moved, gap)
|
||||
end
|
||||
@@ -723,7 +726,7 @@ function ADHeaderSwap.mountRear(adEnv, combine, onDone, opts)
|
||||
})
|
||||
if not okLoose then return false, whyLoose end
|
||||
active[combine] = swapLoose
|
||||
Logging.info(ADHeaderSwap.LOG_PREFIX .. "'%s' henter det løse '%s' bag på", vehicleName(combine), vehicleName(loose))
|
||||
logInfo(ADHeaderSwap.LOG_PREFIX .. "'%s' henter det løse '%s' bag på", vehicleName(combine), vehicleName(loose))
|
||||
return true
|
||||
end
|
||||
if not isFront then return false, "skærebordet sidder allerede bag" end
|
||||
@@ -740,7 +743,7 @@ function ADHeaderSwap.mountRear(adEnv, combine, onDone, opts)
|
||||
local ok, why = runTasks(adEnv, combine, tasks)
|
||||
if not ok then return false, why end
|
||||
active[combine] = swap
|
||||
Logging.info(ADHeaderSwap.LOG_PREFIX .. "'%s' folder '%s' til transport og sætter det bag på", vehicleName(combine), vehicleName(header))
|
||||
logInfo(ADHeaderSwap.LOG_PREFIX .. "'%s' folder '%s' til transport og sætter det bag på", vehicleName(combine), vehicleName(header))
|
||||
return true
|
||||
end
|
||||
|
||||
@@ -791,7 +794,7 @@ function ADHeaderSwap.cancel(combine)
|
||||
if taskModule ~= nil then pcall(taskModule.abortAllTasks, taskModule) end
|
||||
stopDriving(combine)
|
||||
if combine.stopAutoDrive ~= nil then pcall(combine.stopAutoDrive, combine) end
|
||||
Logging.info(ADHeaderSwap.LOG_PREFIX .. "'%s': skiftet afbrudt", vehicleName(combine))
|
||||
logInfo(ADHeaderSwap.LOG_PREFIX .. "'%s': skiftet afbrudt", vehicleName(combine))
|
||||
return true
|
||||
end
|
||||
|
||||
@@ -820,7 +823,7 @@ local function consoleRun(name, fn)
|
||||
local ok, result, why = pcall(fn, adEnv, combine)
|
||||
if not ok then return name .. ": fejl: " .. tostring(result) end
|
||||
if not result then return name .. ": " .. tostring(why) end
|
||||
return name .. ": " .. vehicleName(combine) .. " er i gang (se loggen)"
|
||||
return name .. ": " .. vehicleName(combine) .. " er i gang (forløbet i log.txt med Detaljeret log slået til)"
|
||||
end
|
||||
|
||||
function ADHeaderSwap:consoleFront()
|
||||
|
||||
Reference in New Issue
Block a user