feat(pulje): flådefanen viser puljetraktorer og -redskaber med status og hvorfor de ikke er med; puljetraktorer omdøbes ikke efter lånte redskaber (v1.48.3.0)

2026-09-28 18:52:43 +02:00
parent 7730f68dec
commit 6eff1dcae8
8 changed files with 207 additions and 4 deletions
@@ -95,6 +95,29 @@ function ADPool.mayUsePool(decision, hasOwnForRole)
    return not decision.helper and (decision.count or 1) == 1 and not hasOwnForRole
 end

+-- Status til flådefanen. s = {parkName, hasConnect, attachedTo, quarantineMin, reserved} -> nøgle, argument
+function ADPool.implementStatus(s)
+    if s.parkName == nil then return "noPark" end
+    if not s.hasConnect then return "noConnect", s.parkName end
+    if s.attachedTo ~= nil then return "attached", s.attachedTo end
+    if (s.quarantineMin or 0) > 0 then return "quarantine", s.quarantineMin end
+    if s.reserved then return "reserved" end
+    return "parked", s.parkName
+end
+
+-- s = {hasPark, enabled, controlled, returning, fieldId, busy, offNetwork, hitched} -> nøgle, argument
+function ADPool.tractorStatus(s)
+    if not s.hasPark then return "noPark" end
+    if s.controlled then return "player" end
+    if s.returning then return "returning" end
+    if s.fieldId ~= nil then return "job", s.fieldId end
+    if s.busy then return "busy" end
+    if not s.enabled then return "notInFleet" end
+    if s.offNetwork then return "offNetwork" end
+    if s.hitched then return "hitched" end
+    return "free"
+end
+
 -- Redskab med rollen nærmest marken, derefter nærmeste ledige traktor med nok hk til redskabet.
 -- blocked = {[id] = true} (reserverede og redskaber i karantæne). accept (valgfri): implement -> bool.
 function ADPool.pairFor(role, fieldX, fieldZ, implements, tractors, blocked, accept)
@@ -153,6 +176,19 @@ function ADPool.quarantine(id, nowMs)
    quarantined[id] = nowMs + ADPool.QUARANTINE_MS
 end

+function ADPool.quarantineMinutes(id, nowMs)
+    local untilMs = quarantined[id]
+    if untilMs == nil or nowMs >= untilMs then return 0 end
+    return math.ceil((untilMs - nowMs) / 60000)
+end
+
+function ADPool.isReserved(id)
+    for _, ids in pairs(reservations) do
+        for _, reserved in ipairs(ids) do if reserved == id then return true end end
+    end
+    return false
+end
+
 function ADPool.blocked(nowMs)
    local result = {}
    for _, ids in pairs(reservations) do
@@ -213,6 +249,15 @@ local function isAttached(vehicle)
    return vehicle.getAttacherVehicle ~= nil and vehicle:getAttacherVehicle() ~= nil
 end

+-- Traktorens egen rolle uden de redskaber der hænger på (mejetærsker/selvkørende har en, en traktor ikke).
+function ADPool.ownRole(vehicle)
+    local specs = {}
+    for _, name in ipairs(ADCpBridge.SPECS) do
+        if vehicle[name] ~= nil then specs[name] = true end
+    end
+    return ADFieldFleet.roleFromSpecs(specs)
+end
+
 -- Puljeredskaber (frakoblet, parkering "X", markør "Connect X") og puljetraktorer.
 -- isBusy(vehicle): markarbejdets optaget-regel (opgave, AD/CP kører, lånt af marksilo, på hjemtur).
 function ADPool.collect(adEnv, isBusy)
@@ -245,7 +290,7 @@ function ADPool.collect(adEnv, isBusy)
        if id ~= nil and park ~= nil and vehicle.spec_attacherJoints ~= nil and #ADHitch.rearImplementsOf(vehicle) == 0
            and ADRunsController.getRunForVehicle(vehicle) == nil and not controlled and not isBusy(vehicle)
            and not ADPool.isReturning(vehicle) and ADFieldFleet.isEnabled(state.fleetMode, state.fleet, id)
-            and ADPool.canPull(ADFieldFleet.roleFromSpecs(ADCpBridge.getSpecs(vehicle))) then
+            and ADPool.canPull(ADPool.ownRole(vehicle)) then
            local x, z = positionOf(vehicle)
            -- uden for AD-vejnettet: den kan ikke køre ud efter redskabet (ville sende redskaber i karantæne)
            local networkDistance = ADFieldWork.distanceToNetwork(adEnv, x, z)
@@ -256,3 +301,56 @@ function ADPool.collect(adEnv, isBusy)
    end
    return implements, tractors
 end
+
+-- Oversigt til flådefanen: alle redskaber med en markrolle (også dem der mangler parkering/Connect, så
+-- spilleren kan se hvorfor) og alle traktorer uden egen arbejdsrolle, der ikke hører til et flow.
+function ADPool.overview(adEnv)
+    local markers = adEnv.ADGraphManager:getMapMarkers()
+    local farmId = g_currentMission:getFarmId()
+    local nowMs = ADFieldJobs.now or 0
+    local implements, tractors = {}, {}
+    for _, vehicle in pairs(g_currentMission.vehicleSystem.vehicles) do
+        local owned = vehicle.getOwnerFarmId ~= nil and vehicle:getOwnerFarmId() == farmId
+        if owned and vehicle.spec_motorized == nil and vehicle.spec_attachable ~= nil then
+            local role = ADPool.roleOf(ADCpBridge.getSpecs(vehicle))
+            if role ~= nil then
+                local id = ADRunsController.getVehicleId(vehicle)
+                local park = parkMarker(adEnv, vehicle)
+                local attacher = isAttached(vehicle) and vehicle:getAttacherVehicle() or nil
+                local key, arg = ADPool.implementStatus({
+                    parkName = park ~= nil and park.name or nil,
+                    hasConnect = park ~= nil and ADPool.connectFor(park.name, markers) ~= nil,
+                    attachedTo = attacher ~= nil and ADRuns.vehicleLabel(attacher) or nil,
+                    quarantineMin = id ~= nil and ADPool.quarantineMinutes(id, nowMs) or 0,
+                    reserved = id ~= nil and ADPool.isReserved(id),
+                })
+                table.insert(implements, {id = id, label = ADRuns.vehicleLabel(vehicle), role = role, status = key, arg = arg})
+            end
+        end
+    end
+    local state = ADFieldJobs.state
+    for _, vehicle in ipairs(ADRunsController.getFarmVehicles(adEnv)) do
+        local id = ADRunsController.getVehicleId(vehicle)
+        if id ~= nil and vehicle.spec_attacherJoints ~= nil and ADRunsController.getRunForVehicle(vehicle) == nil
+            and ADPool.canPull(ADPool.ownRole(vehicle)) then
+            local x, z = positionOf(vehicle)
+            local distance = ADFieldWork.distanceToNetwork(adEnv, x, z)
+            local assignment = state.assignments[id]
+            local rear = ADHitch.rearImplementsOf(vehicle)
+            local key, arg = ADPool.tractorStatus({
+                hasPark = parkMarker(adEnv, vehicle) ~= nil,
+                enabled = ADFieldFleet.isEnabled(state.fleetMode, state.fleet, id),
+                controlled = vehicle.getIsControlled ~= nil and vehicle:getIsControlled(),
+                returning = ADPool.isReturning(vehicle),
+                fieldId = assignment ~= nil and assignment.fieldId or nil,
+                busy = ADFieldWork.isBusyVehicle(vehicle, id),
+                offNetwork = distance ~= nil and distance > ADFieldWork.MAX_OFF_NETWORK,
+                hitched = #rear > 0,
+            })
+            table.insert(tractors, {id = id, label = ADRuns.vehicleLabel(vehicle), hp = tractorHpOf(vehicle), status = key, arg = arg,
+                enabled = ADFieldFleet.isEnabled(state.fleetMode, state.fleet, id)})
+        end
+    end
+    return implements, tractors
+end
+