|
|
|
@@ -817,7 +817,7 @@ end
|
|
|
|
|
-- holdt ved Wait med tomt trug, mens gården havde 6,6 mio. l hø.
|
|
|
|
|
local supplyMissLoggedAt = setmetatable({}, {__mode = "k"})
|
|
|
|
|
ADSmartPickup.SUPPLY_MISS_LOG_MS = 5 * 60 * 1000
|
|
|
|
|
local function logSupplyMiss(driver, ranked, bestFood, markerStations, farmId)
|
|
|
|
|
local function logSupplyMiss(driver, ranked, bestFood, markerStations, farmId, held)
|
|
|
|
|
local t = g_currentMission ~= nil and g_currentMission.time or 0
|
|
|
|
|
if supplyMissLoggedAt[driver] ~= nil and t - supplyMissLoggedAt[driver] < ADSmartPickup.SUPPLY_MISS_LOG_MS then return end
|
|
|
|
|
supplyMissLoggedAt[driver] = t
|
|
|
|
@@ -839,13 +839,53 @@ local function logSupplyMiss(driver, ranked, bestFood, markerStations, farmId)
|
|
|
|
|
local fillType = g_fillTypeManager ~= nil and g_fillTypeManager.getFillTypeByIndex ~= nil and g_fillTypeManager:getFillTypeByIndex(need.fillType) or nil
|
|
|
|
|
table.insert(parts, string.format("%s: fri %.0f l, %s, %d kilder med lager (bedst %.0f l), %d afvist (dyrestaldens eget lager, fabriksreserve, eller triggeren giver varen ikke ud)",
|
|
|
|
|
fillType ~= nil and fillType.name or tostring(need.fillType), need.freeSpace or 0,
|
|
|
|
|
allowed and "tilladt" or "IKKE tilladt (bedre foder findes)", withStock, bestLevel, protected))
|
|
|
|
|
(held or {})[need] and "HOLDT (dyrene først: siloerne dækker ikke dyrene)" or (allowed and "tilladt" or "IKKE tilladt (bedre foder findes)"),
|
|
|
|
|
withStock, bestLevel, protected))
|
|
|
|
|
end
|
|
|
|
|
if #parts == 0 then table.insert(parts, "målet mangler intet (eller varerne kendes ikke)") end
|
|
|
|
|
Logging.info(ADSmartPickup.LOG_PREFIX .. "'%s' forsyning fandt intet: %s (%d markør-stationer)", tostring(ADRuns.vehicleLabel(driver)),
|
|
|
|
|
table.concat(parts, " | "), #(markerStations or {}))
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
-- Dyrenes forbrug af varen pr. måned (kædens data, 0 når dyrene ikke spiser den) og gårdens hentbare lager.
|
|
|
|
|
local function animalPerMonth(fillType)
|
|
|
|
|
local data = ADChain ~= nil and ADChain.last ~= nil and ADChain.last.data or nil
|
|
|
|
|
local name = g_fillTypeManager ~= nil and g_fillTypeManager:getFillTypeNameByIndex(fillType) or nil
|
|
|
|
|
return data ~= nil and name ~= nil and (data.animalDemand or {})[name] or 0
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function ADSmartPickup.factoryMayGet(adEnv, farmId, fillType, loadCapacity)
|
|
|
|
|
local perMonth = animalPerMonth(fillType)
|
|
|
|
|
if perMonth <= 0 or ADStorageStats == nil or ADStorageStats.availableTotals == nil then return true end
|
|
|
|
|
local ok, totals = pcall(function() return ADStorageStats.availableTotals(ADSources.getFarmInventory(adEnv, farmId)) end)
|
|
|
|
|
if not ok or totals == nil then return true end
|
|
|
|
|
return ADSupplyPlanner.mayFeedFactory(totals[fillType] or 0, perMonth, loadCapacity)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
-- Køb dyrefoder ved en købestation, når intet eget lager kan levere: første tilladte trug-behov i rækkefølgen.
|
|
|
|
|
local boughtLoggedAt = setmetatable({}, {__mode = "k"})
|
|
|
|
|
function ADSmartPickup.buyFeed(adEnv, driver, ranked, bestFood, targetWayPoint, wayPointId)
|
|
|
|
|
if ADFieldWork == nil or ADFieldWork.findBuyMarker == nil or targetWayPoint == nil then return nil end
|
|
|
|
|
for _, need in ipairs(ranked or {}) do
|
|
|
|
|
if need.trough and (ADSupplyPlanner.isFoodAllowed == nil or ADSupplyPlanner.isFoodAllowed(need, bestFood)) then
|
|
|
|
|
local markerId = ADFieldWork.findBuyMarker(adEnv, driver, need.fillType, targetWayPoint.x, targetWayPoint.z, driver.ad == nil)
|
|
|
|
|
local marker = markerId ~= nil and adEnv.ADGraphManager:getMapMarkerByWayPointId(markerId) or nil
|
|
|
|
|
if marker ~= nil then
|
|
|
|
|
local t = g_currentMission ~= nil and g_currentMission.time or 0
|
|
|
|
|
if boughtLoggedAt[driver] == nil or t - boughtLoggedAt[driver] > 5 * 60 * 1000 then
|
|
|
|
|
boughtLoggedAt[driver] = t
|
|
|
|
|
Logging.info(ADSmartPickup.LOG_PREFIX .. "'%s' intet eget lager med %s — KØBER ved '%s' (dyrene skal have foder)",
|
|
|
|
|
tostring(ADRuns.vehicleLabel(driver)), tostring(g_fillTypeManager:getFillTypeNameByIndex(need.fillType)), tostring(marker.name))
|
|
|
|
|
end
|
|
|
|
|
return {markerIndex = marker.markerIndex, markerId = marker.id, targetWayPointId = wayPointId, markerName = marker.name,
|
|
|
|
|
group = marker.group, level = math.huge, isOwn = false, fillTypes = {need.fillType}, fillType = need.fillType, need = need,
|
|
|
|
|
pendingLiters = need.freeSpace, bought = true}
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
return nil
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function ADSmartPickup.findSupplyPickup(adEnv, driver, ingredients, targetWayPointId)
|
|
|
|
|
-- med eksplicit mål bruges AD's tilstand ikke (dvale-tjekket kalder med flowets parkerede vogn, der ingen .ad har)
|
|
|
|
|
local wayPointId = targetWayPointId
|
|
|
|
@@ -880,8 +920,15 @@ function ADSmartPickup.findSupplyPickup(adEnv, driver, ingredients, targetWayPoi
|
|
|
|
|
local ranked = ADSupplyPlanner.rankNeeds(needs, loadCapacity)
|
|
|
|
|
-- bedste foder først: lavere foder kun når truget er nødlidende (ADSupplyPlanner.isFoodAllowed)
|
|
|
|
|
local bestFood = ADSupplyPlanner.bestFoodPriority ~= nil and ADSupplyPlanner.bestFoodPriority(ranked) or nil
|
|
|
|
|
-- fabrik som mål: varer dyrene spiser kun når siloerne dækker dyrene først (8/10)
|
|
|
|
|
local feedsFactory = getProductionPoint(target) ~= nil
|
|
|
|
|
local held = {}
|
|
|
|
|
for _, need in ipairs(ranked) do
|
|
|
|
|
local choice = (ADSupplyPlanner.isFoodAllowed == nil or ADSupplyPlanner.isFoodAllowed(need, bestFood)) and findBestSource(markerStations, {need.fillType}, farmId, loadCapacity, need) or nil
|
|
|
|
|
if feedsFactory and not ADSmartPickup.factoryMayGet(adEnv, farmId, need.fillType, loadCapacity) then held[need] = true end
|
|
|
|
|
end
|
|
|
|
|
for _, need in ipairs(ranked) do
|
|
|
|
|
local choice = not held[need] and (ADSupplyPlanner.isFoodAllowed == nil or ADSupplyPlanner.isFoodAllowed(need, bestFood))
|
|
|
|
|
and findBestSource(markerStations, {need.fillType}, farmId, loadCapacity, need) or nil
|
|
|
|
|
if choice ~= nil then
|
|
|
|
|
return {
|
|
|
|
|
markerIndex = choice.markerIndex,
|
|
|
|
@@ -901,7 +948,10 @@ function ADSmartPickup.findSupplyPickup(adEnv, driver, ingredients, targetWayPoi
|
|
|
|
|
}
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
local okLog, errLog = pcall(logSupplyMiss, driver, ranked, bestFood, markerStations, farmId)
|
|
|
|
|
-- dyrene skal have foder: intet eget lager -> køb ved en købestation (sidste udvej, 8/10)
|
|
|
|
|
local bought = ADSmartPickup.buyFeed(adEnv, driver, ranked, bestFood, targetWayPoint, wayPointId)
|
|
|
|
|
if bought ~= nil then return bought end
|
|
|
|
|
local okLog, errLog = pcall(logSupplyMiss, driver, ranked, bestFood, markerStations, farmId, held)
|
|
|
|
|
if not okLog then Logging.warning(ADSmartPickup.LOG_PREFIX .. "forsynings-diagnose: %s", tostring(errLog)) end
|
|
|
|
|
return nil
|
|
|
|
|
end
|
|
|
|
|