fix: køb af dyrefoder kun til markør hvis trigger tager varen

This commit is contained in:
2026-10-25 01:24:23 +02:00
parent 3e30b30c92
commit ce50abce6c
3 changed files with 13 additions and 6 deletions
+11 -5
View File
@@ -1275,8 +1275,10 @@ ADSmartPickup.carriedLiters = carriedLiters
-- Køb dyrefoder ved en købestation, når intet eget lager kan levere: første tilladte trug-behov i rækkefølgen.
-- Aldrig når vognen allerede har varen (in-game 8/10: EDK 650 på 1 mio. l blev fyldt ved Solid Buy, truget tog
-- 150.000 l — med 848.000 l rest ville den købe igen i stedet for at aflevere resten).
-- held (valgfri): behov findSupplyPickup holder tilbage; "trigger" = triggeren ved målmarkøren tager ikke varen
-- (in-game 25/10: TMR købt til '102 Cow Barn Straw', halmtriggeren afviste den, Kostald 3 sultede).
local boughtLoggedAt = setmetatable({}, {__mode = "k"})
function ADSmartPickup.buyFeed(adEnv, driver, ranked, bestFood, targetWayPoint, wayPointId)
function ADSmartPickup.buyFeed(adEnv, driver, ranked, bestFood, targetWayPoint, wayPointId, held)
if ADFieldWork == nil or ADFieldWork.findBuyMarker == nil or targetWayPoint == nil then
buyMissReason[driver] = "intet mål"
return nil
@@ -1289,9 +1291,11 @@ function ADSmartPickup.buyFeed(adEnv, driver, ranked, bestFood, targetWayPoint,
return nil
end
end
local reasons = {}
local reasons, triggerHeld = {}, 0
for _, need in ipairs(ranked or {}) do
if need.trough and (ADSupplyPlanner.isFoodAllowed == nil or ADSupplyPlanner.isFoodAllowed(need, bestFood)) then
if need.trough and (held or {})[need] == "trigger" then triggerHeld = triggerHeld + 1 end
if need.trough and (held or {})[need] ~= "trigger"
and (ADSupplyPlanner.isFoodAllowed == nil or ADSupplyPlanner.isFoodAllowed(need, bestFood)) then
local markerId, info = 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 and #reasons < 4 then
@@ -1313,7 +1317,9 @@ function ADSmartPickup.buyFeed(adEnv, driver, ranked, bestFood, targetWayPoint,
end
end
end
buyMissReason[driver] = #reasons > 0 and table.concat(reasons, "; ") or "intet trug-foder mangler"
buyMissReason[driver] = #reasons > 0 and table.concat(reasons, "; ")
or triggerHeld > 0 and string.format("%d trug-varer afvist: triggeren ved målmarkøren tager dem ikke", triggerHeld)
or "intet trug-foder mangler"
return nil
end
@@ -1447,7 +1453,7 @@ function ADSmartPickup.findSupplyPickup(adEnv, driver, ingredients, targetWayPoi
end
end
-- 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)
local bought = ADSmartPickup.buyFeed(adEnv, driver, ranked, bestFood, targetWayPoint, wayPointId, held)
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
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<modDesc descVersion="107">
<author>masterdraco</author>
<version>1.62.411.0</version>
<version>1.62.412.0</version>
<title>
<en>AD Smart Pickup</en>
<de>AD Smart Pickup</de>