feat: 'kan ikke bære' nævner målets varer + diagnose i loggen (1.62.225)
This commit is contained in:
@@ -376,6 +376,40 @@ function ADRunsController.getTargetFillTypes(adEnv, run, vehicle)
|
||||
return result
|
||||
end
|
||||
|
||||
-- Til "kan ikke bære": målets varer (titler, til skærmen) og en diagnose til loggen
|
||||
-- (målet tager / vognen bærer / stald-silo-filter / Auto-listen). -> wantedText, detail
|
||||
local function fillTypeNames(list, useTitle)
|
||||
local names = {}
|
||||
for _, fillType in ipairs(list or {}) do
|
||||
local index = type(fillType) == "table" and fillType.index or fillType
|
||||
local name = g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeNameByIndex(index) or tostring(index)
|
||||
if useTitle and g_fillTypeManager.getFillTypeTitleByIndex ~= nil then name = g_fillTypeManager:getFillTypeTitleByIndex(index) or name end
|
||||
table.insert(names, tostring(name))
|
||||
end
|
||||
return names
|
||||
end
|
||||
|
||||
function ADRunsController.describeCarryMismatch(adEnv, run, vehicle, carriable)
|
||||
local accepted = ADRunsController.getTargetAcceptedFillTypes(adEnv, run)
|
||||
local wantedTitles = fillTypeNames(accepted, true)
|
||||
local shown = {}
|
||||
for i = 1, math.min(5, #wantedTitles) do shown[i] = wantedTitles[i] end
|
||||
local wantedText = #wantedTitles == 0 and nil or (table.concat(shown, ", ") .. (#wantedTitles > 5 and ", …" or ""))
|
||||
local farmId = ADSmartPickup.getFarmId(vehicle)
|
||||
local stations = getTargetStations(adEnv, run, farmId)
|
||||
local stableOnly = ADSmartPickup.getStableSiloFillTypes ~= nil and ADSmartPickup.getStableSiloFillTypes(adEnv, stations, farmId) or nil
|
||||
local stableNames = nil
|
||||
if stableOnly ~= nil then
|
||||
local list = {}
|
||||
for fillType in pairs(stableOnly) do table.insert(list, fillType) end
|
||||
stableNames = table.concat(fillTypeNames(list), " ")
|
||||
end
|
||||
local detail = string.format("mål (%d stationer) tager: %s | vognen bærer: %s | stald-silo-filter: %s | Auto-varer: %s",
|
||||
#stations, table.concat(fillTypeNames(accepted), " "), table.concat(fillTypeNames(carriable), " "),
|
||||
tostring(stableNames or "intet"), table.concat(fillTypeNames(ADRunsController.getRunIngredients(adEnv, run, vehicle)), " "))
|
||||
return wantedText, detail
|
||||
end
|
||||
|
||||
function ADRunsController.getRunIngredients(adEnv, run, vehicle)
|
||||
if run.ingredientMode == "manual" then
|
||||
local result = {}
|
||||
@@ -918,6 +952,9 @@ function ADRunsController.validateVehicle(adEnv, run, vehicle)
|
||||
-- AutoLoad slået til: AutoDrive regner vognen som ren palle-/ballevogn (in-game 27/9: tipvogn med UAL
|
||||
-- aktiv blev afvist i Goat Food som "kan ikke bære") — sig det, så spilleren kan slå det fra
|
||||
result.reason = result.isAutoload and "autoloadOn" or "cannotCarry"
|
||||
-- hvilke varer det drejer sig om (in-game 12/10: "kan ikke bære run'ets varer" uden at sige hvilke)
|
||||
local okDiag, wanted, detail = pcall(ADRunsController.describeCarryMismatch, adEnv, run, vehicle, carriable)
|
||||
if okDiag then result.goodsText, result.detail = wanted, detail end
|
||||
return result
|
||||
end
|
||||
if isFarFromNetwork(adEnv, vehicle) then
|
||||
@@ -1173,7 +1210,8 @@ function ADRunsController.startVehicle(adEnv, run, vehicle)
|
||||
local validation = ADRunsController.validateVehicle(adEnv, run, vehicle)
|
||||
local result = {vehicle = vehicle, ok = validation.ok, reason = validation.reason, missingBuilding = validation.missingBuilding}
|
||||
if not validation.ok then
|
||||
Logging.info(ADRunsController.LOG_PREFIX .. "run '%s': '%s' sprunget over (%s)", tostring(run.name), tostring(ADRuns.vehicleLabel(vehicle)), tostring(validation.reason))
|
||||
Logging.info(ADRunsController.LOG_PREFIX .. "run '%s': '%s' sprunget over (%s)%s", tostring(run.name), tostring(ADRuns.vehicleLabel(vehicle)), tostring(validation.reason),
|
||||
validation.detail ~= nil and (" — " .. validation.detail) or "")
|
||||
return result
|
||||
end
|
||||
local ingredients = ADRunsController.getRunIngredients(adEnv, run, vehicle)
|
||||
|
||||
Reference in New Issue
Block a user