fix: salgsmarkør uden P/Connect/Wait og fremmede bygningers markører; breddevagt måler aktive sektioner (v1.62.59)

This commit is contained in:
2026-10-07 19:15:43 +02:00
parent dd434a2fc1
commit e8e742faaa
5 changed files with 130 additions and 25 deletions
+43 -2
View File
@@ -508,13 +508,54 @@ function ADCpBridge.needsWidthReset(current, target)
return type(current) == "number" and current > (target or ADCpBridge.VARIABLE_TARGET_WIDTH) + ADCpBridge.WIDTH_GUARD_TOLERANCE
end
-- sections = {{isCenter, isLeft, d (afstand fra midten), isActive}} -> de aktive sektioners bredde (yderkant venstre +
-- højre); nil når sektionerne ikke oplyser isActive (så må spillets måling bruges).
function ADCpBridge.activeSectionWidth(sections)
local left, right, known = 0, 0, false
for _, section in ipairs(sections or {}) do
if type(section.isActive) == "boolean" then known = true end
if section.isActive and not section.isCenter then
if section.isLeft then left = math.max(left, section.d or 0) else right = math.max(right, section.d or 0) end
end
end
return known and left + right or nil
end
-- Skal vagten nulstille? -> reset, ny "sidst nulstillede måling". En måling der står præcis stille efter en
-- nulstilling er ubrugelig (Unrealistic-redskaber svarer altid 120 m; in-game 7/10 nulstillet hvert 10. s).
function ADCpBridge.guardDecision(current, target, lastReset)
if not ADCpBridge.needsWidthReset(current, target) then return false, nil end
if lastReset ~= nil and current == lastReset then return false, lastReset end
return true, current
end
local function sectionDistance(object, section)
local ref = section.maxWidthNode or section.node
if ref == nil or object.rootNode == nil then return 0 end
local okD, x = pcall(function() local lx = localToLocal(ref, object.rootNode, 0, 0, 0) return lx end)
return okD and math.abs(x or 0) or 0
end
-- Aktiv bredde ud fra sektionerne (som setVariableWidth regner), ellers spillets måling.
local function guardedWidth(object, spec)
local list = {}
for _, section in ipairs(spec.sections) do
table.insert(list, {isCenter = section.isCenter, isLeft = section.isLeft, isActive = section.isActive, d = sectionDistance(object, section)})
end
return ADCpBridge.activeSectionWidth(list) or currentVariableWidth(object)
end
local lastGuardReset = setmetatable({}, {__mode = "k"}) -- redskab -> måling ved sidste nulstilling
function ADCpBridge.guardVariableWidth(vehicle)
for _, object in ipairs(collect(vehicle)) do
local spec = object.spec_variableWorkWidth
if spec ~= nil and type(spec.sections) == "table" and #spec.sections > 0 and object.setSectionsActive ~= nil
and object.getVariableWorkWidth ~= nil then
local current = currentVariableWidth(object)
if ADCpBridge.needsWidthReset(current, ADCpBridge.VARIABLE_TARGET_WIDTH) then
local current = guardedWidth(object, spec)
local reset
reset, lastGuardReset[object] = ADCpBridge.guardDecision(current, ADCpBridge.VARIABLE_TARGET_WIDTH, lastGuardReset[object])
if reset then
Logging.warning("ADSmartPickup: bredde: '%s' er sprunget tilbage til %.1f m under arbejdet — stilles igen",
tostring(object.getName ~= nil and object:getName() or "?"), current)
ADCpBridge.setVariableWidth(vehicle)
+13 -5
View File
@@ -852,13 +852,21 @@ local function markerList(adEnv, points, nearM)
return list
end
-- Markøren hvis AD-vej kører GENNEM en af triggerne (points), ellers nil. Til salgsstederne: markør->station giver hver
-- markør kun én station, og "Buy All" (gennem væske- og bulkmarkedet) blev bulkmarkedets (in-game 7/10 gylle).
function ADFieldWork.throughMarkerAt(adEnv, points, maxDistance)
local id, through = ADFieldWork.nearestStationMarker(markerList(adEnv, points, maxDistance), points, maxDistance)
return through and id or nil
-- Stationens markør: den der kører GENNEM en af triggerne (points), ellers den nærmeste inden for maxDistance.
-- accept(marker) filtrerer (fx væk med andre bygningers markører). -> id, through (eller nil). Til salgsstederne:
-- markør->station giver hver markør kun én station ("Buy All" gennem væske- og bulkmarkedet blev kun bulkmarkedets,
-- in-game 7/10), og uden gennemkørsel vandt nabosporets palleskur- eller koblingsmarkør.
function ADFieldWork.stationMarkerAt(adEnv, points, maxDistance, accept)
local list = {}
for _, marker in ipairs(markerList(adEnv, points, maxDistance)) do
if accept == nil or accept(marker) then table.insert(list, marker) end
end
return ADFieldWork.nearestStationMarker(list, points, maxDistance)
end
ADFieldWork.isServiceMarker = isServiceMarker
-- AD-markøren ved stationen: den nærmeste markør ved stationens EGNE læssetriggere, ellers nærmeste ikke-Wait markør
-- inden for 40 m af bygningen ("Liquid Buy Station" står ved tanken, ikke ved triggeren). AutoDrives
-- ADTriggerManager:getMarkerAtStation bruges IKKE: den vil have markøren togets længde + 3..13 m forbi triggeren (et
+72 -17
View File
@@ -654,41 +654,94 @@ function ADSources.getSellMarkers(adEnv, farmId)
return cacheGet("sellMarkers", tostring(farmId), 10000, function() return ADSources.findSellMarkers(adEnv, farmId) end)
end
-- entries = {{marker, station, through}} -> samme liste, men har en station flere markører, beholdes kun dem
-- hvis AD-vej kører gennem stationens trigger (findes nogen). In-game 6/10: mælkebilerne solgte ved væske-
-- markedet via "Palleskur 2 load" på nabosporet (lavere waypoint-id end "Buy All") og holdt ved palleskuret.
-- Lag pr. salgsmarkør: AD-vej gennem stationens trigger (2) > almindelig markør (1) > en anden bygnings læsse-/
-- aflæsningsmarkør (0, fx "Palleskur 2 load" på nabosporet).
local function markerTier(entry)
if entry.through then return 2 end
return entry.foreign and 0 or 1
end
-- entries = {{marker, station, through, foreign}} -> samme liste, men pr. station kun markørerne i det bedste lag.
-- In-game 6/10: mælkebilerne solgte ved væskemarkedet via "Palleskur 2 load" (lavere waypoint-id end "Buy All")
-- og holdt ved palleskuret.
function ADSources.pickStationMarkers(entries)
local hasThrough = {}
local best = {}
for _, entry in ipairs(entries) do
if entry.through then hasThrough[entry.station] = true end
best[entry.station] = math.max(best[entry.station] or 0, markerTier(entry))
end
local result = {}
for _, entry in ipairs(entries) do
if entry.through or not hasThrough[entry.station] then table.insert(result, entry) end
if markerTier(entry) == best[entry.station] then table.insert(result, entry) end
end
return result
end
local function isServiceMarker(marker)
return ADFieldWork ~= nil and ADFieldWork.isServiceMarker ~= nil and ADFieldWork.isServiceMarker(marker) == true
end
-- Andre (ikke-salgs) bygningers læsse- og aflæsningsmarkører (palleskur, silo, stald, fabrik): {[waypoint-id] = true}.
local function foreignMarkerIds(adEnv, farmId)
local ids = {}
if ADBuildings == nil or ADBuildings.list == nil then return ids end
local ok, buildings = pcall(ADBuildings.list, adEnv, farmId)
for _, building in ipairs(ok and buildings or {}) do
if building.kind ~= "sell" then
for _, marker in ipairs(building.loadMarkers or {}) do ids[marker.id] = true end
if building.unloadMarker ~= nil then ids[building.unloadMarker.id] = true end
end
end
return ids
end
function ADSources.findSellMarkers(adEnv, farmId)
local entries = {}
local foreign = foreignMarkerIds(adEnv, farmId)
for _, marker in pairs(adEnv.ADGraphManager:getMapMarkers()) do
local station = ADSmartPickup.getUnloadStationAtWayPointId(adEnv, marker.id, farmId)
-- parkering/kobling/Wait er aldrig et salgssted (in-game 7/10: gylle solgt ved "Connect P Tippevogn 2")
local station = not isServiceMarker(marker) and ADSmartPickup.getUnloadStationAtWayPointId(adEnv, marker.id, farmId) or nil
if station ~= nil and ADPrices.isSellingStation(station) and not ADSources.isSellBlocked(station) then
local okThrough, through = pcall(function()
return ADFieldWork.drivesThrough({approach = ADFieldWork.approachPoints(adEnv, marker.id)},
ADSmartPickup.unloadTriggerPoints(station))
end)
table.insert(entries, {marker = marker, station = station, through = okThrough and through == true})
table.insert(entries, {marker = marker, station = station, through = okThrough and through == true,
foreign = foreign[marker.id] == true})
end
end
return ADSources.pickStationMarkers(ADSources.addThroughMarkers(adEnv, entries))
local picked = ADSources.pickStationMarkers(ADSources.addStationMarkers(adEnv, foreign, entries))
pcall(ADSources.logSellMarkers, picked)
return picked
end
-- Markør->station giver hver markør kun den nærmeste station. Kører en anden markørs AD-vej gennem stationens
-- trigger, kommer den med for stationen (pickStationMarkers dropper så dem der ikke gør). In-game 7/10: "Buy All"
-- kører gennem både væske- og bulkmarkedet, men var kun bulkmarkedets -> gyllen skulle sælges ved "Palleskur 2 load".
function ADSources.addThroughMarkers(adEnv, entries)
if ADFieldWork == nil or ADFieldWork.throughMarkerAt == nil then
-- Loggen: salgsstedets valgte markør(er), kun når valget ændrer sig (salgsmarkørerne genberegnes hvert 10. s).
local loggedSellMarkers = {}
function ADSources.logSellMarkers(entries)
local byStation, order = {}, {}
for _, entry in ipairs(entries) do
if byStation[entry.station] == nil then byStation[entry.station] = {}; table.insert(order, entry.station) end
local tag = entry.through and "gennem trigger" or (entry.foreign and "anden bygnings" or "nærmest")
table.insert(byStation[entry.station], string.format("%s (%s)", tostring(entry.marker.name), tag))
end
for _, station in ipairs(order) do
local okName, name = pcall(function() return station.getName ~= nil and station:getName() or nil end)
local key = tostring(okName and name or station)
local text = table.concat(byStation[station], ", ")
if loggedSellMarkers[key] ~= text then
loggedSellMarkers[key] = text
if Logging ~= nil and Logging.info ~= nil then
Logging.info("ADSmartPickup: salgssted '%s' -> %s", key, text)
end
end
end
end
-- Markør->station giver hver markør kun den nærmeste station. Derfor slås stationens egen markør også op fra
-- stationen: den der kører gennem triggeren, ellers den nærmeste der ikke er en anden bygnings eller en
-- parkering/kobling (pickStationMarkers vælger så laget). In-game 7/10: "Buy All" blev kun bulkmarkedets, og
-- senere vandt "Connect P Tippevogn 2" over spillerens nye "Liquid Buy" ved væsketanken.
function ADSources.addStationMarkers(adEnv, foreign, entries)
if ADFieldWork == nil or ADFieldWork.stationMarkerAt == nil then
return entries
end
local byStation, stations = {}, {}
@@ -699,17 +752,19 @@ function ADSources.addThroughMarkers(adEnv, entries)
end
byStation[entry.station][entry.marker.id] = entry
end
local accept = function(marker) return not isServiceMarker(marker) and not (foreign or {})[marker.id] end
local result = {}
for _, entry in ipairs(entries) do table.insert(result, entry) end
for _, station in ipairs(stations) do
local ok, id = pcall(ADFieldWork.throughMarkerAt, adEnv, ADSmartPickup.unloadTriggerPoints(station), ADSmartPickup.MAX_MARKER_TO_TRIGGER_DISTANCE or 40)
local ok, id, through = pcall(ADFieldWork.stationMarkerAt, adEnv, ADSmartPickup.unloadTriggerPoints(station),
ADSmartPickup.MAX_MARKER_TO_TRIGGER_DISTANCE or 40, accept)
local marker = ok and id ~= nil and adEnv.ADGraphManager:getMapMarkerByWayPointId(id) or nil
if marker ~= nil then
local existing = byStation[station][id]
if existing ~= nil then
existing.through = true
existing.through = existing.through or through == true
else
table.insert(result, {marker = marker, station = station, through = true})
table.insert(result, {marker = marker, station = station, through = through == true, foreign = false})
end
end
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.58.0</version>
<version>1.62.59.0</version>
<title>
<en>AD Smart Pickup</en>
</title>