fix: oprydning efter indlæsning splitter ikke stoppet flows sæt med gyllevogn/spreder på — 1.62.319
This commit is contained in:
@@ -892,24 +892,34 @@ local sinceLoad, cleanedUp = 0, false
|
||||
-- forældreløse — får de ingen opgave inden ORPHAN_MS, sættes redskabet tilbage (in-game 29/9: 3 læssevogne).
|
||||
-- Sovende flow med vognen på (dvale pga. gødningsreserven): sættet bliver samlet — også efter genindlæsning
|
||||
-- (review 17/10: oprydningen efter indlæsning ville ellers sende vognen på plads efter 2 min)
|
||||
-- s = {sleeping, stopped, carriesOwnWagon, wagonIsSprayer}: sovende flow med egen vogn på, eller stoppet flow hvis
|
||||
-- vognen er en gyllevogn/spreder (sættet er markflåde, 316/318 — in-game 17/10 12:04: oprydningen efter indlæsning
|
||||
-- splittede Supercis-sættene fra det stoppede 'Slurry'-flow)
|
||||
function ADFlowWagons.keepsSleepingSet(s)
|
||||
return s ~= nil and s.sleeping == true and s.carriesOwnWagon == true
|
||||
if s == nil or s.carriesOwnWagon ~= true then return false end
|
||||
if s.sleeping == true then return true end
|
||||
return s.stopped == true and s.wagonIsSprayer == true
|
||||
end
|
||||
|
||||
-- -> bærer egen vogn?, er vognen en gyllevogn/spreder?
|
||||
local function carriesOwnWagon(run, vehicle, vehicleId)
|
||||
local wagonId = run ~= nil and (run.wagons or {})[vehicleId] or nil
|
||||
if wagonId == nil or vehicle == nil then return false end
|
||||
if wagonId == nil or vehicle == nil then return false, false end
|
||||
for _, implement in ipairs(ADHitch.rearImplementsOf(vehicle)) do
|
||||
if ADRunsController.getVehicleId(implement.object) == wagonId then return true end
|
||||
if ADRunsController.getVehicleId(implement.object) == wagonId then return true, implement.object.spec_sprayer ~= nil end
|
||||
end
|
||||
return false
|
||||
return false, false
|
||||
end
|
||||
|
||||
local function keepsSet(run, vehicle, vehicleId)
|
||||
local carries, sprayer = carriesOwnWagon(run, vehicle, vehicleId)
|
||||
return ADFlowWagons.keepsSleepingSet({sleeping = run.sleeping == true, stopped = run.stopped == true, carriesOwnWagon = carries, wagonIsSprayer = sprayer})
|
||||
end
|
||||
|
||||
local function adoptOrphansAfterLoad(adEnv)
|
||||
for _, vehicle in ipairs(ADRunsController.getFarmVehicles(adEnv)) do
|
||||
local run = ADRunsController.getRunForVehicle(vehicle)
|
||||
local sleepingSet = run ~= nil and ADFlowWagons.keepsSleepingSet({sleeping = run.sleeping == true,
|
||||
carriesOwnWagon = carriesOwnWagon(run, vehicle, ADRunsController.getVehicleId(vehicle))})
|
||||
local sleepingSet = run ~= nil and keepsSet(run, vehicle, ADRunsController.getVehicleId(vehicle))
|
||||
if (run == nil or run.stopped) and not sleepingSet and vehicle.spec_attacherJoints ~= nil and #ADHitch.poolParkIds(adEnv, vehicle) > 0
|
||||
and not ADFlowWagons.isEmptying(vehicle) and not homing[vehicle] then
|
||||
orphans[vehicle] = orphans[vehicle] or 0
|
||||
@@ -924,7 +934,7 @@ local function cleanupAfterLoad(adEnv)
|
||||
local vehicle = ADRunsController.findVehicleById(adEnv, vehicleId)
|
||||
local module = vehicle ~= nil and vehicle.ad ~= nil and vehicle.ad.stateModule or nil
|
||||
local controlled = vehicle ~= nil and vehicle.getIsControlled ~= nil and vehicle:getIsControlled()
|
||||
local sleepingSet = ADFlowWagons.keepsSleepingSet({sleeping = run.sleeping == true, carriesOwnWagon = carriesOwnWagon(run, vehicle, vehicleId)})
|
||||
local sleepingSet = keepsSet(run, vehicle, vehicleId)
|
||||
if module ~= nil and not sleepingSet and not module:isActive() and not controlled and #ADHitch.poolParkIds(adEnv, vehicle) > 0
|
||||
and not ADFlowWagons.isPoolBusy(vehicle, vehicleId) then
|
||||
Logging.info(ADFlowWagons.LOG_PREFIX .. "flow '%s' er stoppet: '%s' tømmer og sætter sin vogn på plads", tostring(run.name),
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.318.0</version>
|
||||
<version>1.62.319.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user