fix: sluppet dyretur fortsætter til handleren; udkørsel uden planlagt tur kører ved stilstand; AD-navne i STÅR STILLE

This commit is contained in:
2026-10-19 22:25:46 +02:00
parent 2d51732fb6
commit c984784355
5 changed files with 91 additions and 15 deletions
+55 -14
View File
@@ -369,24 +369,51 @@ local function freeTractor(adEnv, trailer)
end
-- Staldens låste traktor, hvis den er ledig lige nu (holder, ingen spiller, intet flow, ikke reserveret) -> {id, vehicle} | nil
-- Er traktoren ledig til en dyretur? ignoreClaim: spillerens 10-min-krav tæller ikke (traktoren kører allerede
-- moddens læssede dyr — brugerønske 19/10 22:21: turen skal fortsætte, når spilleren stiger ud)
local function tractorFree(vehicle, vehicleId, ignoreClaim)
if vehicle == nil or busyVehicles[vehicle] ~= nil or ADPool.isReserved(vehicleId) then return false end
local module = vehicle.ad ~= nil and vehicle.ad.stateModule or nil
if module ~= nil and module:isActive() then return false end
if vehicle.getIsControlled ~= nil and vehicle:getIsControlled() then return false end
if ADRunsController.getRunForVehicle(vehicle) ~= nil then return false end
if not ignoreClaim and ADPlayerClaim ~= nil and ADPlayerClaim.claims(vehicle) then return false end
if ADHitch.isBusy ~= nil and ADHitch.isBusy(vehicle) then return false end
-- samme optaget-regler som puljen (review: en markopgave/CP/marksilo-lån fra før låsen må ikke overtages)
if ADFieldJobs ~= nil and ADFieldJobs.state ~= nil and (ADFieldJobs.state.assignments or {})[vehicleId] ~= nil then return false end
if ADCpBridge ~= nil and ADCpBridge.isWorking ~= nil and ADCpBridge.isWorking(vehicle) then return false end
if ADFieldSilos ~= nil and ADFieldSilos.isLoaned ~= nil and ADFieldSilos.isLoaned(vehicle) then return false end
if ADPool.isReturning ~= nil and ADPool.isReturning(vehicle) then return false end
if ADFlowWagons ~= nil and ADFlowWagons.isEmptying ~= nil and ADFlowWagons.isEmptying(vehicle) then return false end
return true
end
local function lockedTractor(adEnv, vehicleId)
local vehicle = ADRunsController.findVehicleById(adEnv, vehicleId)
if vehicle == nil or busyVehicles[vehicle] ~= nil or ADPool.isReserved(vehicleId) then return nil, vehicle end
local module = vehicle.ad ~= nil and vehicle.ad.stateModule or nil
if module ~= nil and module:isActive() then return nil, vehicle end
if vehicle.getIsControlled ~= nil and vehicle:getIsControlled() then return nil, vehicle end
if ADRunsController.getRunForVehicle(vehicle) ~= nil then return nil, vehicle end
if ADPlayerClaim ~= nil and ADPlayerClaim.claims(vehicle) then return nil, vehicle end
if ADHitch.isBusy ~= nil and ADHitch.isBusy(vehicle) then return nil, vehicle end
-- samme optaget-regler som puljen (review: en markopgave/CP/marksilo-lån fra før låsen må ikke overtages)
if ADFieldJobs ~= nil and ADFieldJobs.state ~= nil and (ADFieldJobs.state.assignments or {})[vehicleId] ~= nil then return nil, vehicle end
if ADCpBridge ~= nil and ADCpBridge.isWorking ~= nil and ADCpBridge.isWorking(vehicle) then return nil, vehicle end
if ADFieldSilos ~= nil and ADFieldSilos.isLoaned ~= nil and ADFieldSilos.isLoaned(vehicle) then return nil, vehicle end
if ADPool.isReturning ~= nil and ADPool.isReturning(vehicle) then return nil, vehicle end
if ADFlowWagons ~= nil and ADFlowWagons.isEmptying ~= nil and ADFlowWagons.isEmptying(vehicle) then return nil, vehicle end
if not tractorFree(vehicle, vehicleId, false) then return nil, vehicle end
return {id = vehicleId, vehicle = vehicle}, vehicle
end
-- Kreaturvogne med dyr, som en dyretur selv har læsset, der stadig sidder på en (nu ledig) traktor — turen blev
-- sluppet, fordi spilleren satte sig i traktoren (in-game 19/10 22:05). -> {{trailerInfo, tractor}}
local function attachedLoaded(farmId)
local list, seen = {}, {}
for trailer in pairs(loadedByUs) do
local attacher = trailer.getAttacherVehicle ~= nil and trailer:getAttacherVehicle() or nil
-- kun en traktor med AutoDrive (ikke vogn nr. 1 i et tog), og én tur pr. traktor (review)
if attacher ~= nil and (attacher.spec_motorized == nil or attacher.ad == nil or seen[attacher]) then attacher = nil end
local tractorId = attacher ~= nil and ADRunsController.getVehicleId(attacher) or nil
local trailerId = ADRunsController.getVehicleId(trailer)
if attacher ~= nil and tractorId ~= nil and trailerId ~= nil and jobs[trailer] == nil
and call(trailer, "getOwnerFarmId") == farmId and (call(trailer, "getNumOfAnimals") or 0) > 0
and (failedUntil[trailer] or 0) <= now() and not ADPool.isReserved(trailerId) and tractorFree(attacher, tractorId, true) then
seen[attacher] = true
table.insert(list, {trailerInfo = {vehicle = trailer, id = trailerId}, tractor = {id = tractorId, vehicle = attacher}})
end
end
return list
end
-- Handlere der tager dyretypen, med AD-markør; pris pr. dyr for et eksempel-cluster
local function dealersFor(adEnv, typeIndex, x, z)
local list = {}
@@ -523,7 +550,8 @@ local function sellAnimals(job)
return count, total
end
local function startJob(adEnv, farmId, barn, trailerInfo, tractor, dealer, size)
-- attached: vognen sidder allerede på traktoren (fortsat salg) -> ingen hentetur
local function startJob(adEnv, farmId, barn, trailerInfo, tractor, dealer, size, attached)
local job = {farmId = farmId, barn = barn and barn.placeable or nil, barnName = barn and placeableName(barn.placeable) or nil,
trailer = trailerInfo.vehicle, tractor = tractor.vehicle, dealer = dealer, size = size, phase = "fetch", since = now(),
sellOnly = barn == nil, typeIndex = barn ~= nil and barn.typeIndex or nil, barnId = barn ~= nil and barn.id or nil,
@@ -531,6 +559,11 @@ local function startJob(adEnv, farmId, barn, trailerInfo, tractor, dealer, size)
jobs[job.trailer] = job
busyVehicles[job.tractor], busyVehicles[job.trailer] = job, job
ADPool.reserve(job, {tractor.id, trailerInfo.id})
if attached then
notify(string.format("dyr i vognen: '%s' kører videre med '%s' — sælges hos '%s'", vname(job.tractor), vname(job.trailer), dealer.title))
driveTo(adEnv, job, dealer.marker, "toDealer")
return
end
notify(string.format("%s: '%s' henter kreaturvognen '%s'%s — sælges hos '%s'", job.barnName or "dyr i vognen", vname(job.tractor),
vname(job.trailer), size > 0 and string.format(" til %d slagteklare dyr", size) or "", dealer.title))
ADHitch.fetch(adEnv, job.tractor, trailerInfo.connectId, function(_, ok, detail)
@@ -684,6 +717,14 @@ end
local function planJobs(adEnv)
local farmId = g_currentMission:getFarmId()
-- sluppet tur med læssede dyr, vognen sidder stadig på traktoren: fortsæt direkte til handleren
for _, entry in ipairs(attachedLoaded(farmId)) do
local trailer = entry.trailerInfo.vehicle
local x, _, z = getWorldTranslation(trailer.rootNode)
local typeObj = call(trailer, "getCurrentAnimalType")
local dealer = ADLivestock.bestDealer(dealersFor(adEnv, typeObj ~= nil and typeObj.typeIndex or nil, x, z))
if dealer ~= nil then startJob(adEnv, farmId, nil, entry.trailerInfo, entry.tractor, dealer, 0, true) end
end
-- vogne der allerede har dyr (afbrudt tur, genindlæsning): sælges først
for _, trailerInfo in ipairs(freeTrailers(adEnv, farmId, nil)) do
local cooling = (failedUntil[trailerInfo.vehicle] or 0) > now()