feat: kontrakter kører selv + review-rettelser (1.62.208)

This commit is contained in:
2026-10-10 18:17:26 +02:00
parent b241db9728
commit ceca255fd4
15 changed files with 207 additions and 17 deletions
+10 -2
View File
@@ -659,7 +659,9 @@ function ADFieldWork.dispatch(adEnv, field, info, decision)
and not (candidate.x ~= nil and #(info.verts or {}) >= 3 and ADFieldJobs.insidePolygon(candidate.x, candidate.z, info.verts)) then
return false
end
-- uden parkering (eller langt fra vejnettet): spilleren kører den (ADPlayerTransport), ikke AutoDrive
-- uden parkering (eller langt fra vejnettet): spilleren kører den (ADPlayerTransport), ikke AutoDrive.
-- Kontraktmark uden F-markør: AutoDrive har intet mål — kun spillerkørsel.
if info.markerId == nil then return false end
if ADPlayerTransport ~= nil and ADPlayerTransport.needsPlayer(adEnv, candidate, role, decision) then return false end
local d = candidate.x ~= nil and ADFieldWork.distanceToNetwork(adEnv, candidate.x, candidate.z) or nil
if d ~= nil and d > ADFieldWork.MAX_OFF_NETWORK then
@@ -684,7 +686,7 @@ function ADFieldWork.dispatch(adEnv, field, info, decision)
for _, candidate in ipairs(candidates) do
if ownIds[candidate.id] and (candidate.role == role or (candidate.roles ~= nil and candidate.roles[role])) then hasOwnForRole = true end
end
if ADPool ~= nil and ADPool.mayUsePool(decision, hasOwnForRole)
if ADPool ~= nil and info.markerId ~= nil and ADPool.mayUsePool(decision, hasOwnForRole)
and (why == "noRig" or why == "allBusy" or why == "cannotDo") then
local pooled, poolWhy, poolArgs = ADFieldWork.dispatchPool(adEnv, field, info, role, roleAccept, decision)
if pooled then return end
@@ -705,6 +707,12 @@ function ADFieldWork.dispatch(adEnv, field, info, decision)
lastNoRig[field.id] = nil
return
end
-- ingen stenplukker på gården overhovedet: stenene springes over, så såningen ikke går i stå
if role == "stonePicker" and why == "noRig" then
ADFieldJobs.setField(ADFieldModel.advance(field, info.needs))
log(field.id, "ingen stenplukker på gården — stenplukning springes over")
return
end
if #offNetwork > 0 and (why == "cannotDo" or why == "noRig") then
-- de eneste med rollen står uden for AD-vejnettet
note(field.id, {reason = {text = string.format("ingen %s kan køre til %s — står for langt fra AutoDrive-vejnettet (%s)",