fix: klippersæt kræver hk til samlet reelt PTO-forbrug (v1.62.80)

This commit is contained in:
2026-10-08 09:54:21 +02:00
parent a530bd2927
commit 6762faaa7f
3 changed files with 22 additions and 10 deletions
+20 -9
View File
@@ -213,17 +213,20 @@ local function frontTractors(tractors)
return list
end
-- Kombiens hk-behov: det tungeste redskab (nil = ingen data). Spillets hk-tal er en anbefaling pr. redskab, ikke for
-- sættet — summen udelukkede T7.300 (~300 hk) fra KDD 941 (220) + KDF 341 (110), og puljen hentede kun fronten (8/10).
local function neededHpMax(list)
local most = nil
-- Kombiens hk-behov: spillet lægger redskabernes reelle PTO-forbrug sammen på motoren (powerConsumer, kW), så det
-- summeres. Butikkens "anbefalet hk" er for hvert redskab alene og alt for højt for sættet (KDD 941 220 + KDF 341 110
-- = 330 > T7.300, mens PTO er 70 + 35 kW ≈ 143 hk — in-game 8/10). Mangler PTO-tal, bruges summen af anbefalingerne.
function ADPool.comboNeededHp(list)
local pto, ptoKnown, store, storeKnown = 0, true, 0, false
for _, implement in ipairs(list) do
if implement.neededHp ~= nil and implement.neededHp > 0 then most = math.max(most or 0, implement.neededHp) end
if implement.ptoHp ~= nil and implement.ptoHp > 0 then pto = pto + implement.ptoHp else ptoKnown = false end
if implement.neededHp ~= nil and implement.neededHp > 0 then store, storeKnown = store + implement.neededHp, true end
end
return most
if ptoKnown and #list > 0 then return pto end
return storeKnown and store or nil
end
-- Kombi: nærmeste bag- og frontredskab med én traktor med ledig frontkrog og hk nok til det tungeste. -> par | nil
-- Kombi: nærmeste bag- og frontredskab med én traktor med ledig frontkrog og hk nok til begges samlede PTO-forbrug. -> par | nil
local function pairCombo(role, candidates, free)
local rear, front = nil, nil
for _, implement in ipairs(candidates) do
@@ -231,7 +234,7 @@ local function pairCombo(role, candidates, free)
end
if rear == nil or front == nil then return nil end
local both = {rear, front}
local tractor = ADPool.bestFit(frontTractors(free), {x = rear.x, z = rear.z, neededHp = neededHpMax(both)}, role)
local tractor = ADPool.bestFit(frontTractors(free), {x = rear.x, z = rear.z, neededHp = ADPool.comboNeededHp(both)}, role)
if tractor == nil then return nil end
return {implement = rear, implements = both, tractor = tractor}
end
@@ -403,6 +406,14 @@ local function neededHpOf(vehicle)
return value
end
-- Redskabets reelle PTO-forbrug i hk (powerConsumer neededMaxPtoPower er kW), nil uden PTO.
function ADPool.readPtoHp(vehicle)
local spec = vehicle.spec_powerConsumer
local kw = spec ~= nil and tonumber(spec.neededMaxPtoPower) or nil
if kw == nil or kw <= 0 then return nil end
return kw * 1.35962
end
function ADPool.readNeededHp(vehicle)
local item = g_storeManager:getItemByXMLFilename(vehicle.configFileName)
if item == nil then return nil end
@@ -506,7 +517,7 @@ function ADPool.collect(adEnv, isBusy)
table.insert(implements, {carries = carries, capacity = capacity,
id = ADRunsController.getVehicleId(vehicle), vehicle = vehicle, name = ADRuns.vehicleLabel(vehicle),
role = role, roles = ADPool.rolesOf(role, specs.sprayRoles), x = x, z = z, width = ADCpBridge.getWorkWidth(vehicle),
neededHp = neededHpOf(vehicle), connectId = connect.id, parkId = park.id,
neededHp = neededHpOf(vehicle), ptoHp = ADPool.readPtoHp(vehicle), connectId = connect.id, parkId = park.id,
front = ADPool.isFrontImplement(park.name),
})
end