fix(bomuld): ballesamler skal kunne bære bomuldsmoduler (v1.62.269)

This commit is contained in:
2026-10-16 15:14:44 +02:00
parent 0d34ea43e7
commit f99ad6c518
4 changed files with 48 additions and 1 deletions
+25
View File
@@ -629,6 +629,26 @@ function ADFieldWork.seedsRefillable(adEnv, vehicle, x, z)
return ok and result == true
end
-- Ballelasterens fyldtyper for en ballehøst-afgrøde: {SQUAREBALE_COTTON, ROUNDBALE_COTTON} som indeks (de findes).
function ADFieldWork.baleFillTypes(fruit)
local result = {}
if fruit == nil or g_fillTypeManager == nil then return result end
for _, prefix in ipairs({"SQUAREBALE_", "ROUNDBALE_"}) do
local index = g_fillTypeManager:getFillTypeIndexByName(prefix .. string.upper(tostring(fruit)))
if index ~= nil then table.insert(result, index) end
end
return result
end
-- Kan sættet (traktor med opsamler, eller løs opsamler) bære en af balletyperne? Uden kendte typer: nej.
function ADFieldWork.carriesAnyBale(vehicle, baleTypes)
if vehicle == nil or #(baleTypes or {}) == 0 then return false end
for _, fillType in ipairs(baleTypes) do
if ADPool.rigHasCargoFor(vehicle, fillType) then return true end
end
return false
end
local function acceptFor(field, info, role)
if role == "harvester" then
local fruit = info.fruitIndex
@@ -643,6 +663,11 @@ local function acceptFor(field, info, role)
return function(candidate)
return ADFieldWork.unloaderAccepts(candidate.vehicle) and ADPool.rigCarries(candidate.vehicle, fillType)
end
elseif role == "baleCollector" and ADFieldModel.isBaleHarvest(field.lastFruit) then
-- bomuldsmoduler: kun en opsamler der kan bære dem (SQUAREBALE_/ROUNDBALE_COTTON) — in-game 16/10 F39 tog
-- spillerens Pickup 2017, Courseplay fandt intet at samle, og marken gik videre med modulerne liggende
local baleTypes = ADFieldWork.baleFillTypes(field.lastFruit)
return function(candidate) return ADFieldWork.carriesAnyBale(candidate.vehicle, baleTypes) end
elseif role == "weeder" then
local large = (info.weed or 0) > ADFieldModel.WEED_MECHANICAL_MAX
return function(candidate) return not (large and candidate.mechanical) end
+21
View File
@@ -498,6 +498,27 @@ function ADPool.rigCarries(vehicle, fillType)
return not ok or not found or carries
end
-- Har sættet (eller den løse vogn) en fyldenhed der bærer varen? Som rigCarries, men ukendt/ingen fyldenheder = nej
-- (rigCarries siger ja ved "ukendt" — til tømmevogne; ballelasteren skal beviseligt kunne).
function ADPool.rigHasCargoFor(vehicle, fillType)
if vehicle == nil or fillType == nil then return false end
local found = false
local function check(object)
if object.spec_fillUnit ~= nil and ADPool.canCarry({carries = (ADPool.cargoOf(object))}, fillType) then found = true end
end
local function visit(object)
if object.getAttachedImplements == nil then return end
for _, implement in ipairs(object:getAttachedImplements() or {}) do
if implement.object ~= nil then check(implement.object); visit(implement.object) end
end
end
local ok = pcall(function()
if vehicle.spec_motorized == nil then check(vehicle) end
visit(vehicle)
end)
return ok and found
end
-- Ikke bundet af et kørende flow (traktorer i stoppede flows er ledige).
function ADPool.isFreeFromFlows(vehicle)
if ADFlowWagons ~= nil then return ADFlowWagons.isFreeTractor(vehicle) 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.268.0</version>
<version>1.62.269.0</version>
<title>
<en>AD Smart Pickup</en>
</title>