Skip to content
This repository has been archived by the owner on May 23, 2023. It is now read-only.

Commit

Permalink
6.03.00022 Minor fixes
Browse files Browse the repository at this point in the history
- fix all hybrid A* pathfinder failing
- fix reset fill level after making pocket
  • Loading branch information
pvaiko committed Jan 5, 2021
1 parent 1c856ad commit ffdc95e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 1 addition & 2 deletions CombineAIDriver.lua
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ function CombineAIDriver:start(startingPoint)
local total, pipeInFruit = self.fieldworkCourse:setPipeInFruitMap(self.pipeOffsetX, self.vehicle.cp.workWidth)
local ix = self.fieldworkCourse:getStartingWaypointIx(AIDriverUtil.getDirectionNode(self.vehicle), startingPoint)
self:shouldStrawSwathBeOn(ix)
self.fillLevelFullPercentage = self.normalFillLevelFullPercentage
self:debug('Pipe in fruit map created, there are %d non-headland waypoints, of which at %d the pipe will be in the fruit',
total, pipeInFruit)
end
Expand Down Expand Up @@ -247,8 +248,6 @@ function CombineAIDriver:onWaypointPassed(ix)
-- harvesting fruit while making the pocket unless we have self unload turned on
if self:shouldMakePocket() and self.vehicle.cp.settings.selfUnload:is(false) then
self.fillLevelFullPercentage = self.pocketFillLevelFullPercentage
else
self.fillLevelFullPercentage = self.normalFillLevelFullPercentage
end

self:shouldStrawSwathBeOn(ix)
Expand Down
3 changes: 3 additions & 0 deletions course-generator/HybridAStar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,9 @@ function HybridAStarWithAStarInTheMiddle:resume(...)
self.allHybridRetries = self.allHybridRetries + 1
self.constraints:relaxConstraints()
return self:findHybridStartToEnd()
else
self:debug('all hybrid: we already tried with relaxed constraints, this did not work out')
return true, nil, goalNodeInvalid
end
end
elseif self.phase == self.MIDDLE then
Expand Down
2 changes: 1 addition & 1 deletion modDesc.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no" ?>
<modDesc descVersion="47">
<version>6.03.00021</version>
<version>6.03.00022</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>
Expand Down

0 comments on commit ffdc95e

Please sign in to comment.