Fix for targeting incorrect chopper

Hopefully, there are a lot of nil checks that may be aborting the function and I am not changing anything. Always fun altering giants functions

Author: pops64

scripts/ai/AIDriveStrategyChopperCourse.lua

@@ -781,27 +781,28 @@ end
 
 
 -- TODO Fix this currently any trailer in range will cause the chopper to drive
--- This is current broken and any trailer nearby will cause it to be true. Maybe it is not .vehicle but a get implements to return the trailer object instead?
 function AIDriveStrategyChopperCourse:isChopperWaitingForUnloader()
     local trailer, targetObject = self:nearestChopperTrailer()
     local dischargeNode = self.pipeController:getDischargeNode()
     self:debugSparse('%s %s', dischargeNode, self:isAnyWorkAreaProcessing())
     if not (targetObject == nil or trailer == nil) then 
-        -- if targetObject and targetObject.rootVehicle.getIsCpActive and targetObject.rootVehicle:getIsCpActive() then
-        --     local strategy = targetObject.rootVehicle:getCpDriveStrategy()
-        --     if strategy.isAChopperUnloadAIDriver
-        --         and self:getCurrentUnloader()
-        --         and self:getCurrentUnloader().vehicle == targetObject.rootVehicle 
-        --         and self:getCurrentUnloader():readyToReceive() then
-        --             self:debugSparse('Chopper has a CP Driven trailer now, continue')
-        --             return false
-        --     end
-        -- else
+        if targetObject and targetObject.rootVehicle.getIsCpActive and targetObject.rootVehicle:getIsCpActive() then
+            local strategy = targetObject.rootVehicle:getCpDriveStrategy()
+            if strategy.isAChopperUnloadAIDriver
+                and self:getCurrentUnloader()
+                and self:getCurrentUnloader().vehicle == targetObject.rootVehicle 
+                and self:getCurrentUnloader():readyToReceive() then
+                    self:debugSparse('Chopper has a CP Driven trailer now, continue')
+                    return false
+            end
+        else
             self:debugSparse('Chopper has a trailer now, continue')
             return false
-        -- end
+        end
     end
     self:debugSparse('Chopper waiting for trailer, discharge node %s, target object %s, trailer %s',
                 tostring(dischargeNode), tostring(targetObject), tostring(trailer))
     return true
 end
+
+

scripts/ai/controllers/ChopperController.lua

@@ -27,6 +27,7 @@ end
 function ChopperController:updateChopperFillType()
     --- Not exactly sure what this does, but without this the chopper just won't move.
     --- Copied from AIDriveStrategyCombine:update()
+    -- This also exists in Giants AI drive strategy 
     -- no pipe, no discharge node
     local capacity = 0
     local dischargeNode = self.implement:getCurrentDischargeNode()
@@ -59,4 +60,82 @@ function ChopperController:updateChopperFillType()
             end
         end
     end
-end
+end
+
+-- Hack to force the chopper to only target CP unload drivers unless there is a human or none CP trailer in range
+function ChopperController:updateNearestObjectInTriggers(superFunc, ...)
+    local spec = self.spec_pipe
+	spec.nearestObjectInTriggers.objectId = nil
+	spec.nearestObjectInTriggers.fillUnitIndex = 0
+	local minDistance = math.huge
+	local dischargeNode = self:getDischargeNodeByIndex(self:getPipeDischargeNodeIndex())
+    local rootVehicle = self.getRootVehicle and self:getRootVehicle()
+
+    if not rootVehicle then
+        return superFunc(self, ...)
+    end
+    -- We only want to use our modified version of this function when CP Chopper is driving
+    if  not (rootVehicle.getIsCpActive or rootVehicle:getIsCpActive()) then
+        return superFunc(self, ...)
+    end
+        
+    local chopperDriver = rootVehicle:getCpDriveStrategy() 
+
+    if not chopperDriver or not chopperDriver.isAChopperUnloadAIDriver then
+        return superFunc(self, ...)
+    end
+
+	if dischargeNode ~= nil then
+        
+		local checkNode = Utils.getNoNil(dischargeNode.node, self.components[1].node)
+
+		for object, _ in pairs(spec.objectsInTriggers) do
+			local outputFillType = self:getFillUnitLastValidFillType(dischargeNode.fillUnitIndex)
+
+			for fillUnitIndex, _ in ipairs(object.spec_fillUnit.fillUnits) do
+				local allowedToFillByPipe = object:getFillUnitSupportsToolType(fillUnitIndex, ToolType.DISCHARGEABLE)
+				local supportsFillType = object:getFillUnitSupportsFillType(fillUnitIndex, outputFillType) or outputFillType == FillType.UNKNOWN
+				local fillLevel = object:getFillUnitFreeCapacity(fillUnitIndex, outputFillType, self:getOwnerFarmId())
+
+				if allowedToFillByPipe and supportsFillType and fillLevel > 0 then
+					local targetPoint = object:getFillUnitAutoAimTargetNode(fillUnitIndex)
+					local exactFillRootNode = object:getFillUnitExactFillRootNode(fillUnitIndex)
+
+					if targetPoint == nil then
+						targetPoint = exactFillRootNode
+					end
+
+					if targetPoint ~= nil then
+                        -- We have a target check to see if it is a CP driver, if not default to going to closest in range. Original functionality
+                        if targetPoint and targetPoint.rootVehicle.getIsCpActive and targetPoint.rootVehicle:getIsCpActive() then
+                            local strategy = targetPoint.rootVehicle:getCpDriveStrategy()
+                            if  strategy.isAChopperUnloadAIDriver
+                                    and chopperDriver:getCurrentUnloader()
+                                    and chopperDriver:getCurrentUnloader().vehicle == targetPoint.rootVehicle then
+                                spec.nearestObjectInTriggers.objectId = NetworkUtil.getObjectId(object)
+                                spec.nearestObjectInTriggers.fillUnitIndex = fillUnitIndex
+                                break
+                                    
+                            end
+                        else
+                            local distance = calcDistanceFrom(checkNode, targetPoint)
+
+                            if distance < minDistance then
+                                minDistance = distance
+                                spec.nearestObjectInTriggers.objectId = NetworkUtil.getObjectId(object)
+                                spec.nearestObjectInTriggers.fillUnitIndex = fillUnitIndex
+
+                                break
+                            end
+                        end
+						
+					end
+				end
+			end
+		end
+	else
+		Logging.xmlWarning(self.xmlFile, "Unable to find discharge node index '%d' for pipe", self:getPipeDischargeNodeIndex())
+	end
+end
+
+Pipe.updateNearestObjectInTriggers = Utils.overwrittenFunction(Pipe.updateNearestObjectInTriggers, ChopperController.updateNearestObjectInTriggers)