fix(flåde): plov før kultivator i rolle-tabellen (FS25-plove har også spec_cultivator); en plov må også tage kultivering (v1.48.2.0)

This commit is contained in:
2026-09-28 18:46:13 +02:00
parent 0e714d2968
commit 7730f68dec
5 changed files with 19 additions and 4 deletions
+9 -1
View File
@@ -18,8 +18,9 @@ ADFieldFleet.ROLE_SPECS = {
{role = "weeder", spec = "spec_weeder"},
{role = "sprayRole"},
{role = "mulcher", spec = "spec_mulcher"},
{role = "cultivator", spec = "spec_cultivator"},
-- plov før kultivator: FS25-plove har også spec_cultivator (in-game 28/9: POV 5 XL blev "kultivator")
{role = "plow", spec = "spec_plow"},
{role = "cultivator", spec = "spec_cultivator"},
{role = "baleCollector", spec = "canBaleCollect"},
{role = "unloader", spec = "canUnload"},
}
@@ -35,6 +36,13 @@ function ADFieldFleet.roleFromSpecs(specs)
return nil
end
-- Ekstra opgaver en rolle kan tage: pløjning klargør jorden lige så godt som kultivering (ikke omvendt).
ADFieldFleet.EXTRA_ROLES = {plow = {plow = true, cultivator = true}}
function ADFieldFleet.rolesFor(role)
return ADFieldFleet.EXTRA_ROLES[role]
end
-- Kandidater med rollen, sorteret nærmest først, delt i brugbare og afviste (med første grund).
local function sortCandidates(candidates, role, x, z, requiredWidth, accept)
local usable, sawRole, sawAccepted = {}, false, false
+1 -1
View File
@@ -162,7 +162,7 @@ function ADFieldWork.getRigs(adEnv)
manual = (state.manual or {})[id] == true,
width = ADCpBridge.getWorkWidth(vehicle), x = x, z = z,
-- tom spreder kan flere ting (gødning og kalk): alle dens roller
roles = specs.sprayRoles, filledRole = specs.filledRole, dumpable = specs.dumpable,
roles = specs.sprayRoles or ADFieldFleet.rolesFor(role), filledRole = specs.filledRole, dumpable = specs.dumpable,
}
if role == "harvester" then rig.fruits = ADCpBridge.getHarvestFruits(vehicle) or {} end
if role == "seeder" then
+1 -1
View File
@@ -231,7 +231,7 @@ function ADPool.collect(adEnv, isBusy)
local x, z = positionOf(vehicle)
table.insert(implements, {
id = ADRunsController.getVehicleId(vehicle), vehicle = vehicle, name = ADRuns.vehicleLabel(vehicle),
role = role, roles = specs.sprayRoles, x = x, z = z, width = ADCpBridge.getWorkWidth(vehicle),
role = role, roles = specs.sprayRoles or ADFieldFleet.rolesFor(role), x = x, z = z, width = ADCpBridge.getWorkWidth(vehicle),
neededHp = neededHpOf(vehicle), connectId = connect.id, parkId = park.id,
})
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.48.1.0</version>
<version>1.48.2.0</version>
<title>
<en>AD Smart Pickup</en>
</title>