merge main (1.62.416 blandet last på lager) ind i mp — 1.62.416.1
This commit is contained in:
@@ -1725,7 +1725,7 @@ local function installLoadWaitHook(adEnv)
|
||||
if run ~= nil and ADRunsController.findWrongCargoDump ~= nil and ADUnloadWait.setDumpTarget ~= nil then
|
||||
local stateModule = loadTask.vehicle.ad.stateModule
|
||||
local current = stateModule.getSecondMarker ~= nil and stateModule:getSecondMarker() or nil
|
||||
local ok, dump = pcall(ADRunsController.findWrongCargoDump, adEnv, run, loadTask.vehicle, current ~= nil and current.id or nil)
|
||||
local ok, dump = pcall(ADRunsController.findWrongCargoDump, adEnv, run, loadTask.vehicle, current ~= nil and current.id or nil, true)
|
||||
if ok and dump ~= nil then
|
||||
ADUnloadWait.setDumpTarget(loadTask.vehicle, dump.marker.id)
|
||||
end
|
||||
@@ -1739,6 +1739,11 @@ local function installLoadWaitHook(adEnv)
|
||||
if loadTask.spuParkedChecked or ADFlowWagons == nil or ADFlowWagons.isDeliveringParkedLoad == nil then return false end
|
||||
loadTask.spuParkedChecked = true
|
||||
if not ADFlowWagons.isDeliveringParkedLoad(adEnv, loadTask.vehicle) then return false end
|
||||
-- en ANDEN vare end den, der skal hentes: som blandet last (hasWrongCargo) — kan målene ikke tage den, køres den
|
||||
-- på lager, så flowet kan hente det, der mangler (in-game 26/10: parkeret hø blokerede ensilagen til TMR-fabrikkerne)
|
||||
local pickup = activePickups[loadTask.vehicle]
|
||||
local cargoType = ADUnloadWait ~= nil and ADUnloadWait.getRestLoad ~= nil and ADUnloadWait.getRestLoad(adEnv, loadTask.vehicle) or nil
|
||||
if pickup ~= nil and pickup.fillType ~= nil and cargoType ~= nil and cargoType ~= pickup.fillType then return false end
|
||||
logInfo(ADSmartPickup.LOG_PREFIX .. "'%s' leverer parkeret læs først", tostring(ADRuns.vehicleLabel(loadTask.vehicle)))
|
||||
return true
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user