feat: færdige kontrakter indkasseres selv; AD Fold implements slås til ved start (1.62.349)

This commit is contained in:
2026-10-19 00:15:40 +02:00
parent fa67b9247b
commit 9863e311eb
8 changed files with 100 additions and 2 deletions
+67
View File
@@ -11,6 +11,9 @@
ADContracts = {}
ADContracts.SCAN_MS = 5000
-- færdige kontrakter indkasseres selv (brugerønske 19/10 00:11: "der hænger en gammel der er taget og lavet færdig for
-- længe siden" — F15-gødning stod FINISHED/SUCCESS). Ventetid efter færdig, så lånte maskiner når at slippe.
ADContracts.COLLECT_DELAY_MS = 60000
-- kontrakttype (uden "Mission", små bogstaver) -> markens trin
ADContracts.STAGES = {
@@ -290,6 +293,68 @@ local function ask(entry)
if not ok then ADContracts.onAnswer(ADContracts, false, entry) end
end
-- Ren: hvilke færdige kontrakter skal indkasseres nu? missions = {{key, farmId, finished (status FINISHED), success}};
-- firstSeen = {[key] = ms} (opdateres: ny færdig noteres, forsvundne glemmes). -> liste af nøgler
function ADContracts.toCollect(missions, farmId, firstSeen, now)
local present, due = {}, {}
for _, m in ipairs(missions or {}) do
if m.farmId == farmId and m.finished and m.success then
present[m.key] = true
firstSeen[m.key] = firstSeen[m.key] or now
if now - firstSeen[m.key] >= ADContracts.COLLECT_DELAY_MS then table.insert(due, m.key) end
end
end
for key in pairs(firstSeen) do if not present[key] then firstSeen[key] = nil end end
table.sort(due, function(a, b) return tostring(a) < tostring(b) end)
return due
end
local finishedSeen = {}
-- Er et af kontraktens lånte køretøjer i brug (spilleren sidder i det, AutoDrive eller en hjælper kører)? Så venter
-- indkasseringen — spillet sletter de lånte køretøjer, når kontrakten afsluttes (review 19/10)
local function leasedInUse(mission)
for _, vehicle in ipairs(mission.vehicles or {}) do
local root = vehicle.getRootVehicle ~= nil and vehicle:getRootVehicle() or vehicle
for _, v in ipairs({vehicle, root}) do
if v.getIsControlled ~= nil and v:getIsControlled() then return true end
if v.ad ~= nil and v.ad.stateModule ~= nil and v.ad.stateModule:isActive() then return true end
if v.getIsAIActive ~= nil and v:getIsAIActive() then return true end
end
end
return false
end
local function collectFinished(farmId, nowMs)
if g_missionManager == nil or MissionStatus == nil or MissionFinishState == nil or g_missionManager.dismissMission == nil then return end
if g_currentMission.getIsServer ~= nil and not g_currentMission:getIsServer() then return end
local list, byKey = {}, {}
for _, mission in ipairs(g_missionManager:getMissions() or {}) do
local key = missionKey(mission)
byKey[key] = mission
table.insert(list, {key = key, farmId = mission.farmId, finished = mission.status == MissionStatus.FINISHED,
success = mission.finishState == MissionFinishState.SUCCESS})
end
for _, key in ipairs(ADContracts.toCollect(list, farmId, finishedSeen, nowMs)) do
local mission = byKey[key]
local okUse, inUse = pcall(leasedInUse, mission)
if okUse and not inUse then
local okReward, reward = pcall(function() return mission.getTotalReward ~= nil and mission:getTotalReward() or nil end)
local fieldId = fieldIdOf(mission)
local ok, err = pcall(g_missionManager.dismissMission, g_missionManager, mission)
finishedSeen[key] = nil
if ok then
local text = string.format("Kontrakt%s er færdig og indkasseret%s", fieldId ~= nil and (" på F" .. tostring(fieldId)) or "",
okReward and type(reward) == "number" and string.format(" (%.0f kr)", reward) or "")
Logging.info("ADSmartPickup: %s (%s)", text, tostring(key))
ADFieldJobs.notify(text, false)
else
Logging.warning("ADSmartPickup: kontrakt %s kunne ikke indkasseres: %s", tostring(key), tostring(err))
end
end
end
end
-- Kaldes fra markarbejdets tick.
function ADContracts.tick(adEnv, nowMs)
ADContracts.adEnv = adEnv
@@ -298,6 +363,8 @@ function ADContracts.tick(adEnv, nowMs)
lastScanAt = nowMs
local farmId = g_currentMission ~= nil and g_currentMission:getFarmId() or nil
if farmId == nil then return end
local okCollect, errCollect = pcall(collectFinished, farmId, nowMs)
if not okCollect then Logging.warning("ADSmartPickup: indkassering af kontrakter: %s", tostring(errCollect)) end
local started, ended = ADContracts.diff(ADContracts.tracked, runningContracts(farmId))
for _, entry in ipairs(ended) do finish(adEnv, entry) end
-- "Stop alt"-pause: nye kontrakter startes først, når markarbejdet kører igen
+14
View File
@@ -194,6 +194,7 @@ function ADFieldWork.startAd(adEnv, vehicle, mode, firstId, secondId, fillType)
module.selectedFillTypes = {fillType}
end
module:setStartHelper(false)
ADFieldWork.enableFoldImplements(vehicle)
if module.setActualFarmId ~= nil then module:setActualFarmId(vehicle:getOwnerFarmId()) end
module:raiseDirtyFlag()
local current = module:getCurrentMode()
@@ -227,6 +228,19 @@ local function disableParkAtJobFinished(vehicle)
end
ADFieldWork.disableParkAtJobFinished = disableParkAtJobFinished
-- AutoDrives "Fold implements" (pr. køretøj): AD folder alle redskaber sammen og venter, før turen starter (brugerønske
-- 19/10 00:12). Standard for nye køretøjer er Ja hos spilleren, men 36 ældre stod på Nej. Slås til ved hver start fra moden.
function ADFieldWork.enableFoldImplements(vehicle)
local setting = vehicle ~= nil and vehicle.ad ~= nil and vehicle.ad.settings ~= nil and vehicle.ad.settings.FoldImplements or nil
if setting == nil or setting.values == nil then return false end
local index = nil
for i, value in ipairs(setting.values) do if value == true then index = i end end
if index == nil or setting.current == index then return false end
setting.current = index
setting.new = index
return true
end
-- AD-parkering: sidder på redskabet og kopieres af AD til traktorens stateModule (markør-INDEKS).
local function parkMarkerId(adEnv, vehicle)
local module = stateModule(vehicle)
+6 -1
View File
@@ -33,6 +33,8 @@ function ADFillFold.action(s)
if s.unfoldedByUs then
if s.cpWorking then return "none" end
if not s.loading or (s.distance or math.huge) > ADFillFold.FAR_M then return "fold" end
-- AutoDrives "Fold implements" foldede den sammen igen under læsningen (review 19/10): ud igen
if s.needsUnfold and (s.distance or math.huge) <= ADFillFold.NEAR_M then return "unfold" end
return "none"
end
if s.loading and s.needsUnfold and (s.distance or math.huge) <= ADFillFold.NEAR_M then return "unfold" end
@@ -112,9 +114,12 @@ local function tickVehicle(adEnv, vehicle, now)
local action = ADFillFold.action({loading = loading, distance = distance, needsUnfold = #blocked > 0,
unfoldedByUs = unfolded[vehicle] ~= nil, cpWorking = ADCpBridge ~= nil and ADCpBridge.isWorking(vehicle)})
if action == "unfold" then
local again = unfolded[vehicle] ~= nil
for _, entry in ipairs(blocked) do entry.object:setFoldDirection(entry.direction) end
unfolded[vehicle] = blocked
Logging.info(ADFillFold.LOG_PREFIX .. "'%s' foldes ud, så tanken kan fyldes", tostring(ADRuns.vehicleLabel(vehicle)))
if not again then
Logging.info(ADFillFold.LOG_PREFIX .. "'%s' foldes ud, så tanken kan fyldes", tostring(ADRuns.vehicleLabel(vehicle)))
end
elseif action == "fold" then
foldBack(vehicle)
Logging.info(ADFillFold.LOG_PREFIX .. "'%s' foldes sammen efter påfyldning", tostring(ADRuns.vehicleLabel(vehicle)))
+1
View File
@@ -1254,6 +1254,7 @@ local function applyAndStart(adEnv, run, vehicle, ingredients)
stateModule:setActualFarmId(farmId)
end
stateModule:setLoopsDone(0)
if ADFieldWork ~= nil and ADFieldWork.enableFoldImplements ~= nil then pcall(ADFieldWork.enableFoldImplements, vehicle) end
local mode = stateModule.getCurrentMode ~= nil and stateModule:getCurrentMode() or nil
if mode ~= nil and mode.start ~= nil then
mode:start(adEnv.AutoDrive.USER_PLAYER or 1)
+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.348.0</version>
<version>1.62.349.0</version>
<title>
<en>AD Smart Pickup</en>
</title>