fix: tom såmaskine accepteres når frø kan fyldes på ved lager/købestation (v1.62.27)

This commit is contained in:
2026-10-05 13:31:34 +02:00
parent 0bf524faf3
commit d7d67b8801
3 changed files with 23 additions and 4 deletions
+21 -3
View File
@@ -173,6 +173,7 @@ function ADFieldWork.getRigs(adEnv)
rig.seedFruits = ADCpBridge.getSeedFruits(vehicle)
rig.hasSeeds = ADCpBridge.hasSeeds(vehicle)
rig.seedsOnPallets = not rig.hasSeeds and ADFieldWork.seedsOnPallets(vehicle)
rig.seedsRefill = not rig.hasSeeds and not rig.seedsOnPallets and ADFieldWork.seedsRefillable(adEnv, vehicle, x, z)
end
if role == "weeder" then rig.mechanical = ADCpBridge.isMechanicalWeeder(vehicle) end
table.insert(rigs, rig)
@@ -360,6 +361,23 @@ function ADFieldWork.unloaderAccepts(vehicle)
return not (vehicle.spec_motorized ~= nil and vehicle.spec_trailer ~= nil)
end
-- Såmaskinen kan afgrøden og har frø på, på paller eller ved en påfyldning (lager/købestation med AD-markør);
-- en tom maskine fyldes op på vejen (refillPlan). In-game 5/10: nykøbt, tom NS 3030 blev afvist ("none can do it").
function ADFieldWork.seederAccepts(candidate, fruitIndex)
local seeds = candidate.hasSeeds or candidate.seedsOnPallets or candidate.seedsRefill
return seeds == true and fruitIndex ~= nil and type(candidate.seedFruits) == "table" and candidate.seedFruits[fruitIndex] == true
end
-- Findes en påfyldning med såmaskinens frø (AD-markør ved lager/købestation)?
function ADFieldWork.seedsRefillable(adEnv, vehicle, x, z)
if adEnv == nil or vehicle == nil then return false end
local ok, result = pcall(function()
local fillType = ADCpBridge.getRefillFillType(vehicle, "seeder")
return fillType ~= nil and ADFieldWork.findRefillMarker(adEnv, vehicle, fillType, x, z) ~= nil
end)
return ok and result == true
end
local function acceptFor(field, info, role)
if role == "harvester" then
local fruit = info.fruitIndex
@@ -367,9 +385,7 @@ local function acceptFor(field, info, role)
elseif role == "seeder" then
local fruitIndex = ADFieldWork.sowFruitIndex(field)
-- tom såmaskine er med, når dens frø findes på paller (risplanter + stiklingepaller, in-game 4/10)
return function(candidate)
return (candidate.hasSeeds or candidate.seedsOnPallets) and fruitIndex ~= nil and candidate.seedFruits[fruitIndex] == true
end
return function(candidate) return ADFieldWork.seederAccepts(candidate, fruitIndex) end
elseif role == "unloader" then
return function(candidate) return ADFieldWork.unloaderAccepts(candidate.vehicle) end
elseif role == "weeder" then
@@ -472,6 +488,8 @@ function ADFieldWork.dispatchPool(adEnv, field, info, role, roleAccept, decision
candidate.seedFruits = ADCpBridge.getSeedFruits(implement.vehicle)
candidate.hasSeeds = ADCpBridge.hasSeeds(implement.vehicle)
candidate.seedsOnPallets = not candidate.hasSeeds and ADFieldWork.seedsOnPallets(implement.vehicle)
candidate.seedsRefill = not candidate.hasSeeds and not candidate.seedsOnPallets
and ADFieldWork.seedsRefillable(adEnv, implement.vehicle, info.x, info.z)
end
if role == "weeder" then candidate.mechanical = ADCpBridge.isMechanicalWeeder(implement.vehicle) end
if roleAccept ~= nil and not roleAccept(candidate) then return false 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.26.0</version>
<version>1.62.27.0</version>
<title>
<en>AD Smart Pickup</en>
</title>