fix(flow-vogne): stenplukker/såmaskine huskes ikke som flowvogn; husket arbejdsredskab glemmes ved start (v1.62.238)
This commit is contained in:
@@ -24,9 +24,31 @@ function ADFlowWagons.remember(wagons, tractorId, wagonId)
|
||||
end
|
||||
|
||||
-- Må redskabet bag traktoren huskes som flowets vogn? Kun noget der kan rumme last — ikke plov/kultivator (ingen
|
||||
-- plads) og ikke såmaskine (frøtank). s = {capacity, isSowingMachine}. in-game 30/9: 'Sell Slurry 2' huskede ploven.
|
||||
-- plads), ikke såmaskine (frøtank) og ikke stenplukker (STONE-tank). s = {capacity, isSowingMachine, isStonePicker}.
|
||||
-- in-game 30/9: 'Sell Slurry 2' huskede ploven; 16/10: 'Cow Food 2' huskede stenplukkeren Elho Scorpio 550.
|
||||
function ADFlowWagons.isRememberableWagon(s)
|
||||
return (s.capacity or 0) > 0 and not s.isSowingMachine
|
||||
return (s.capacity or 0) > 0 and not s.isSowingMachine and not s.isStonePicker
|
||||
end
|
||||
|
||||
-- Samme vurdering på et køretøj i spillet.
|
||||
function ADFlowWagons.isCargoObject(object)
|
||||
local _, capacity = ADPool.cargoOf(object)
|
||||
return ADFlowWagons.isRememberableWagon({capacity = capacity, isSowingMachine = object.spec_sowingMachine ~= nil,
|
||||
isStonePicker = object.spec_stonePicker ~= nil})
|
||||
end
|
||||
|
||||
-- Arbejdsredskab med tank, der aldrig er en flowvogn (stenplukker, såmaskine). Snævrere end "ikke last":
|
||||
-- en autoload-/pallevogn uden tank må gerne være valgt i guiden.
|
||||
function ADFlowWagons.isWorkTool(object)
|
||||
return object ~= nil and (object.spec_stonePicker ~= nil or object.spec_sowingMachine ~= nil)
|
||||
end
|
||||
|
||||
-- Glem traktorens vogn: ny tabel uden den.
|
||||
function ADFlowWagons.forget(wagons, tractorId)
|
||||
if (wagons or {})[tractorId] == nil then return wagons end
|
||||
local copy = ADRuns.copyWagons(wagons)
|
||||
copy[tractorId] = nil
|
||||
return copy
|
||||
end
|
||||
|
||||
-- s = {hasRear, wagonId, wagonExists, hasConnect, wagonAttached, wagonBusy} -> "start" | "fetch" | "wait"
|
||||
@@ -279,6 +301,7 @@ local function guessFor(adEnv, run, vehicle, tractorId)
|
||||
local index = any.advd ~= nil and any.advd.parkDestination or nil
|
||||
local attached = any.getAttacherVehicle ~= nil and any:getAttacherVehicle() ~= nil
|
||||
if any.spec_motorized == nil and any.spec_attachable ~= nil and not attached and type(index) == "number" and index >= 1
|
||||
and not ADFlowWagons.isWorkTool(any)
|
||||
and any.getOwnerFarmId ~= nil and any:getOwnerFarmId() == farmId then
|
||||
local id = ADRunsController.getVehicleId(any)
|
||||
local park = adEnv.ADGraphManager:getMapMarkerById(index)
|
||||
@@ -352,7 +375,17 @@ function ADFlowWagons.beforeStart(adEnv, run, vehicle)
|
||||
end
|
||||
end
|
||||
local wagonId = (run.wagons or {})[tractorId]
|
||||
if wagonId == nil and #ADHitch.rearImplementsOf(vehicle) == 0 then
|
||||
-- husket før reglen kom (fx stenplukker): glemmes, så en rigtig vogn gættes/huskes igen
|
||||
local remembered = wagonId ~= nil and findAnyVehicle(wagonId) or nil
|
||||
if ADFlowWagons.isWorkTool(remembered) then
|
||||
Logging.warning(ADFlowWagons.LOG_PREFIX .. "flow '%s': '%s' huskede '%s' som vogn, men det er et arbejdsredskab — glemmes",
|
||||
tostring(run.name), tostring(ADRuns.vehicleLabel(vehicle)), tostring(ADRuns.vehicleLabel(remembered)))
|
||||
run.wagons = ADFlowWagons.forget(run.wagons, tractorId)
|
||||
wagonId = nil
|
||||
end
|
||||
-- gæt også når der hænger et arbejdsredskab bagpå (fx stenplukkeren): så byttes det til vognen
|
||||
local rearNow = ADHitch.rearImplementsOf(vehicle)[1]
|
||||
if wagonId == nil and (rearNow == nil or ADFlowWagons.isWorkTool(rearNow.object)) then
|
||||
wagonId = guessFor(adEnv, run, vehicle, tractorId)
|
||||
if wagonId ~= nil then run.wagons = ADFlowWagons.remember(run.wagons, tractorId, wagonId) end
|
||||
end
|
||||
@@ -510,8 +543,7 @@ end
|
||||
-- Husk vognen bag traktoren som flowets (også når flowet lige er stoppet — rememberAll ser kun kørende flows).
|
||||
-- in-game 29/9: Milk Store's tanke blev sat af ved Stop alt uden at være husket -> 'noTrailer' ved næste start.
|
||||
local function isCargoWagon(object)
|
||||
local _, capacity = ADPool.cargoOf(object)
|
||||
return ADFlowWagons.isRememberableWagon({capacity = capacity, isSowingMachine = object.spec_sowingMachine ~= nil})
|
||||
return ADFlowWagons.isCargoObject(object)
|
||||
end
|
||||
|
||||
local function rememberWagonOf(vehicle)
|
||||
@@ -711,7 +743,8 @@ local function rememberAll(adEnv)
|
||||
local wagonId = rear[1] ~= nil and isCargoWagon(rear[1].object) and ADRunsController.getVehicleId(rear[1].object) or nil
|
||||
-- et valgt vogn (fx i guiden, byttes ved start) overskrives ikke af den der hænger på, så længe den findes
|
||||
local chosen = (run.wagons or {})[vehicleId]
|
||||
local keepChoice = chosen ~= nil and chosen ~= wagonId and findAnyVehicle(chosen) ~= nil
|
||||
local chosenVehicle = chosen ~= nil and findAnyVehicle(chosen) or nil
|
||||
local keepChoice = chosen ~= wagonId and chosenVehicle ~= nil and not ADFlowWagons.isWorkTool(chosenVehicle)
|
||||
if wagonId ~= nil and not keepChoice and fetching[vehicle] == nil and emptying[vehicle] == nil then
|
||||
local updated = ADFlowWagons.remember(run.wagons, vehicleId, wagonId)
|
||||
if updated ~= run.wagons then
|
||||
|
||||
Reference in New Issue
Block a user