From f0abb18a5f148934014d14fc2d9340b2feedc2ea Mon Sep 17 00:00:00 2001 From: Peter Vaiko Date: Fri, 26 Feb 2021 06:13:24 -0600 Subject: [PATCH] 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 | 4 ++-- BaleToCollect.lua | 8 +++++++- BaleWrapperAIDriver.lua | 4 ++-- fields.lua | 1 + img/iconSprite.dds | Bin 65664 -> 131200 bytes modDesc.xml | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/BaleLoaderAIDriver.lua b/BaleLoaderAIDriver.lua index 48df5096e..63e26dcf5 100644 --- a/BaleLoaderAIDriver.lua +++ b/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) diff --git a/BaleToCollect.lua b/BaleToCollect.lua index 6213f88e6..ff200db0b 100644 --- a/BaleToCollect.lua +++ b/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 diff --git a/BaleWrapperAIDriver.lua b/BaleWrapperAIDriver.lua index 3221d4c01..89fc0795d 100644 --- a/BaleWrapperAIDriver.lua +++ b/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 diff --git a/fields.lua b/fields.lua index 31b5b1e5d..83057c2ea 100644 --- a/fields.lua +++ b/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 diff --git a/img/iconSprite.dds b/img/iconSprite.dds index 5d2ca19485d5bcccd3245653d77d4cf154794b73..3a3a47b165f7a8ff4c6518d8b5738be30f2dc6da 100644 GIT binary patch literal 131200 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 J92zAQ7C2p;Z_?iJ`51n-Dzu;4Ne#coM@orw)%q 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 xz*YygImd*y_Mm2iDes{|D-*cWnRw diff --git a/modDesc.xml b/modDesc.xml index 8f930fc97..49250e935 100644 --- a/modDesc.xml +++ b/modDesc.xml @@ -1,6 +1,6 @@ - 6.03.00045 + 6.03.00046 <!-- 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>