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 @@
|
||||
-- frontredskab, "P Front Mower" — in-game 8/10).
|
||||
-- ADHitch.fetch()/ADHitch.drop() er indgangen for flows/markarbejde: kør til markøren, kobl på/af, meld tilbage.
|
||||
|
||||
-- info-log bag "Detaljeret log" (ADLog i adSettings.lua; uden ADLog — tests — direkte til Logging)
|
||||
local function logInfo(...) return (ADLog or Logging).info(...) end
|
||||
|
||||
ADHitch = {}
|
||||
ADHitch.LOG_PREFIX = "ADSmartPickup: kobling: "
|
||||
-- afkobling tjekkes først, så "Kobl af X" ikke læses som "Kobl <af X>"
|
||||
@@ -468,7 +471,7 @@ function ADHitch.stow(vehicle, why)
|
||||
if not ok then
|
||||
Logging.warning(ADHitch.LOG_PREFIX .. "'%s': kunne ikke gøre redskaber klar til vej: %s", vehicleName(vehicle), tostring(count))
|
||||
elseif count > 0 then
|
||||
Logging.info(ADHitch.LOG_PREFIX .. "'%s': %d redskab(er) slukket, løftet og foldet (%s)", vehicleName(vehicle), count, tostring(why))
|
||||
logInfo(ADHitch.LOG_PREFIX .. "'%s': %d redskab(er) slukket, løftet og foldet (%s)", vehicleName(vehicle), count, tostring(why))
|
||||
end
|
||||
end
|
||||
|
||||
@@ -559,7 +562,7 @@ local function start(adEnv, vehicle, markerId, action, onDone)
|
||||
job.onDone, job.adEnv = onDone, adEnv
|
||||
jobs[vehicle] = job
|
||||
ADFieldWork.startAd(adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, markerId)
|
||||
Logging.info(ADHitch.LOG_PREFIX .. "'%s' kører til '%s'", vehicleName(vehicle), job.markerName)
|
||||
logInfo(ADHitch.LOG_PREFIX .. "'%s' kører til '%s'", vehicleName(vehicle), job.markerName)
|
||||
return job
|
||||
end
|
||||
|
||||
@@ -622,7 +625,7 @@ function ADHitch.route(adEnv, vehicle, markerIds, onDone)
|
||||
end
|
||||
local function runStep(index)
|
||||
if index > #markerIds then
|
||||
Logging.info(ADHitch.LOG_PREFIX .. "'%s' er færdig med turen (%d trin)", vehicleName(vehicle), #markerIds)
|
||||
logInfo(ADHitch.LOG_PREFIX .. "'%s' er færdig med turen (%d trin)", vehicleName(vehicle), #markerIds)
|
||||
if onDone ~= nil then pcall(onDone, vehicle, true) end
|
||||
return
|
||||
end
|
||||
@@ -638,7 +641,7 @@ function ADHitch.route(adEnv, vehicle, markerIds, onDone)
|
||||
end
|
||||
local waitMs = ADHitch.waitAfter(action, index, #markerIds)
|
||||
if waitMs > 0 then
|
||||
Logging.info(ADHitch.LOG_PREFIX .. "'%s' holder %d s ved '%s'", vehicleName(vehicle), waitMs / 1000,
|
||||
logInfo(ADHitch.LOG_PREFIX .. "'%s' holder %d s ved '%s'", vehicleName(vehicle), waitMs / 1000,
|
||||
marker ~= nil and marker.name or "?")
|
||||
table.insert(waits, {vehicle = vehicle, leftMs = waitMs, continue = function() runStep(index + 1) end})
|
||||
else
|
||||
@@ -730,7 +733,7 @@ local FAIL_TEXT = {attach = "kunne ikke koble på", detach = "kunne ikke koble a
|
||||
local function finish(vehicle, job, ok, detail, adEnv)
|
||||
jobs[vehicle] = nil
|
||||
if ok then
|
||||
Logging.info(ADHitch.LOG_PREFIX .. "'%s' " .. DONE_TEXT[job.action] .. " ved '%s'", vehicleName(vehicle),
|
||||
logInfo(ADHitch.LOG_PREFIX .. "'%s' " .. DONE_TEXT[job.action] .. " ved '%s'", vehicleName(vehicle),
|
||||
vehicleName(detail), job.markerName)
|
||||
else
|
||||
Logging.warning(ADHitch.LOG_PREFIX .. "'%s' %s ved '%s': %s", vehicleName(vehicle), FAIL_TEXT[job.action],
|
||||
@@ -750,7 +753,7 @@ local function finish(vehicle, job, ok, detail, adEnv)
|
||||
local okHome, errHome = pcall(ADFieldWork.startAd, adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, home)
|
||||
if okHome then
|
||||
local marker = adEnv.ADGraphManager:getMapMarkerByWayPointId(home)
|
||||
Logging.info(ADHitch.LOG_PREFIX .. "'%s' kører til sin egen parkering '%s'", vehicleName(vehicle), tostring(marker ~= nil and marker.name or home))
|
||||
logInfo(ADHitch.LOG_PREFIX .. "'%s' kører til sin egen parkering '%s'", vehicleName(vehicle), tostring(marker ~= nil and marker.name or home))
|
||||
else
|
||||
Logging.warning(ADHitch.LOG_PREFIX .. "'%s' kunne ikke sendes til sin parkering: %s", vehicleName(vehicle), tostring(errHome))
|
||||
end
|
||||
@@ -785,10 +788,10 @@ function ADHitch.tick(adEnv, dt)
|
||||
local okStart, errStart = pcall(ADFieldWork.startAd, adEnv, vehicle, adEnv.AutoDrive.MODE_DRIVETO, job.markerId)
|
||||
if job.resumed then
|
||||
job.resumed = nil
|
||||
Logging.info(ADHitch.LOG_PREFIX .. "'%s': spilleren steg af — kører videre mod '%s'%s", vehicleName(vehicle),
|
||||
logInfo(ADHitch.LOG_PREFIX .. "'%s': spilleren steg af — kører videre mod '%s'%s", vehicleName(vehicle),
|
||||
tostring(job.markerName), okStart and "" or (": " .. tostring(errStart)))
|
||||
else
|
||||
Logging.info(ADHitch.LOG_PREFIX .. "'%s' kom ikke i gang mod '%s' — starter AD igen (forsøg %d)%s", vehicleName(vehicle),
|
||||
logInfo(ADHitch.LOG_PREFIX .. "'%s' kom ikke i gang mod '%s' — starter AD igen (forsøg %d)%s", vehicleName(vehicle),
|
||||
tostring(job.markerName), job.restarts, okStart and "" or (": " .. tostring(errStart)))
|
||||
end
|
||||
end
|
||||
@@ -798,7 +801,7 @@ function ADHitch.tick(adEnv, dt)
|
||||
local ok = taskModule ~= nil and taskModule.getActiveTask ~= nil and taskModule:getActiveTask() ~= nil
|
||||
and pcall(taskModule.setCurrentTaskFinished, taskModule)
|
||||
if ok then
|
||||
Logging.info(ADHitch.LOG_PREFIX .. "'%s' holdt stille ved sidste waypoint %.1f m fra '%s' — afslutter turen, bakker det sidste stykke", vehicleName(vehicle), state.distance, tostring(job.markerName))
|
||||
logInfo(ADHitch.LOG_PREFIX .. "'%s' holdt stille ved sidste waypoint %.1f m fra '%s' — afslutter turen, bakker det sidste stykke", vehicleName(vehicle), state.distance, tostring(job.markerName))
|
||||
else
|
||||
job.state, job.stopAd = "acting", true
|
||||
end
|
||||
@@ -806,7 +809,7 @@ function ADHitch.tick(adEnv, dt)
|
||||
if job.stopAd then
|
||||
job.stopAd = nil
|
||||
if vehicle.stopAutoDrive ~= nil then pcall(vehicle.stopAutoDrive, vehicle) end
|
||||
Logging.info(ADHitch.LOG_PREFIX .. "'%s' holdt stille ved sidste waypoint %.1f m fra '%s' — AutoDrive stoppet, kobler", vehicleName(vehicle), state.distance, tostring(job.markerName))
|
||||
logInfo(ADHitch.LOG_PREFIX .. "'%s' holdt stille ved sidste waypoint %.1f m fra '%s' — AutoDrive stoppet, kobler", vehicleName(vehicle), state.distance, tostring(job.markerName))
|
||||
end
|
||||
if job.state == "done" then
|
||||
finish(vehicle, job, true, detail, adEnv)
|
||||
|
||||
Reference in New Issue
Block a user