Merge pull request #2834 from Courseplay/openPipeForRegisteredUnloader

Open pipe for registered unloader

scripts/ai/AIDriveStrategyCombineCourse.lua

@@ -1410,14 +1410,28 @@ function AIDriveStrategyCombineCourse:handlePipe(dt)
 end
 
 function AIDriveStrategyCombineCourse:handleCombinePipe(dt)
-
-    if self.pipeController:isFillableTrailerUnderPipe() or self:isAutoDriveWaitingForPipe() then
+    if self:isAGoodTrailerInRange() or self:isAutoDriveWaitingForPipe() then
         self.pipeController:openPipe()
     else
         self.pipeController:closePipe(true)
     end
 end
 
+function AIDriveStrategyCombineCourse:isAGoodTrailerInRange()
+    local _, trailer = self.pipeController:isFillableTrailerUnderPipe()
+    local unloaderVehicle = trailer and trailer:getRootVehicle()
+
+    if unloaderVehicle == nil then
+        return false
+    end
+
+    if AIDriveStrategyUnloadCombine.isActiveCpCombineUnloader(unloaderVehicle) then
+        return unloaderVehicle:getCpDriveStrategy():getCombineToUnload() == self.vehicle
+    else
+        return true
+    end
+end
+
 --- Not exactly sure what this does, but without this the chopper just won't move.
 --- Copied from AIDriveStrategyCombine:update()
 function AIDriveStrategyCombineCourse:updateChopperFillType()
@@ -2025,4 +2039,4 @@ function AIDriveStrategyCombineCourse:updateInfoTexts()
             self:clearInfoText(infoText)
         end
     end
-end
+end

scripts/ai/AIDriveStrategyUnloadCombine.lua

@@ -1014,6 +1014,9 @@ function AIDriveStrategyUnloadCombine:isPathFound(path, goalNodeInvalid, goalDes
         end
     end
 end
+function AIDriveStrategyUnloadCombine:getCombineToUnload()
+    return self.combineToUnload
+end
 
 function AIDriveStrategyUnloadCombine:getCombineRootNode()
     -- for attached harvesters this gets the root node of the harvester as that is our reference point to the

scripts/ai/controllers/PipeController.lua

@@ -112,12 +112,13 @@ function PipeController:getFillType()
     return nil
 end
 
-
+---@return boolean true if there is a fillable trailer under the pipe
+---@return table|nil the trailer vehicle, if there is one
 function PipeController:isFillableTrailerUnderPipe()
     for trailer, value in pairs(self.pipeSpec.objectsInTriggers) do
         if value > 0 then
             if FillLevelManager.canLoadTrailer(trailer, self:getFillType()) then
-                return true
+                return true, trailer
             end
         end
     end