6.03.00046 Collect bales on merged fields (#6909)

Should now be able to collect bales on merged fields.

Also made some bale related code less confusing.

* Sharper Icons

Thx to @Gonimy-Vetrom

BaleLoaderAIDriver.lua

@@ -63,8 +63,8 @@ function BaleLoaderAIDriver:init(vehicle)
 	self:debug('baleloader %s', tostring(self.baleLoader))
 	-- Bale loaders have no AI markers (as they are not AIImplements according to Giants) so add a function here
 	-- to get the markers
-	self.baleLoader.getAIMarkers = function(self)
-		return UnloadableFieldworkAIDriver.getAIMarkersFromGrabberNode(self, self.spec_baleLoader)
+	self.baleLoader.getAIMarkers = function(object)
+		return UnloadableFieldworkAIDriver.getAIMarkersFromGrabberNode(object, object.spec_baleLoader)
 	end
 
 	self:initStates(BaleLoaderAIDriver.myStates)

BaleToCollect.lua

@@ -29,7 +29,13 @@ BaleToCollect = CpObject()
 function BaleToCollect:init(baleObject)
 	self.bale = baleObject
 	local x, _, z = getWorldTranslation(self.bale.nodeId)
-	self.fieldId = PathfinderUtil.getFieldIdAtWorldPosition(x, z)
+	-- this finds bales on merged fields too, but the bale must be on the field
+	self.fieldId = courseplay.fields:getFieldNumForPosition(x, z)
+	if self.fieldId == 0 then
+		-- this does not find bales on merged fields, but finds them if they are on the
+		-- field border too (just off the field)
+		self.fieldId = PathfinderUtil.getFieldIdAtWorldPosition(x, z)
+	end
 end
 
 --- Call this before attempting to construct a BaleToCollect to check the validity of the object

BaleWrapperAIDriver.lua

@@ -30,8 +30,8 @@ function BaleWrapperAIDriver:init(vehicle)
 	if not self.baler then
 		-- Bale wrappers which aren't balers have no AI markers as they have no pick up so add a function here
 		-- to get the markers
-		self.baleWrapper.getAIMarkers = function(self)
-			return UnloadableFieldworkAIDriver.getAIMarkersFromGrabberNode(self, self.spec_baleWrapper)
+		self.baleWrapper.getAIMarkers = function(object)
+			return UnloadableFieldworkAIDriver.getAIMarkersFromGrabberNode(object, object.spec_baleWrapper)
 		end
 	end
 end

fields.lua

@@ -579,6 +579,7 @@ function courseplay.fields:onWhichFieldAmI(vehicle)
 	return self:getFieldNumForPosition( positionX, positionZ )
 end
 
+---@return number field number at position, 0 if it is not on a field.
 function courseplay.fields:getFieldNumForPosition(positionX, positionZ)
 	local fieldNum = 0
 	for index, field in pairs(courseplay.fields.fieldData) do

modDesc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <modDesc descVersion="47">
-	<version>6.03.00045</version>
+	<version>6.03.00046</version>
 	<author><![CDATA[Courseplay.devTeam]]></author>
 	<title><!-- en=English de=German fr=French es=Spanish ru=Russian pl=Polish it=Italian br=Brazilian-Portuguese cs=Chinese(Simplified) ct=Chinese(Traditional) cz=Czech nl=Netherlands hu=Hungary jp=Japanese kr=Korean pt=Portuguese ro=Romanian tr=Turkish -->
 		<en>CoursePlay SIX</en>