Skip to content

fix: fill level for harvesters #821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tensuko merged 1 commit into from
May 2, 2025
Merged

fix: fill level for harvesters #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions scripts/ai/controllers/CombineController.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,20 @@ function CombineController:getDriveData()
end

function CombineController:getFillLevel()
return self.implement:getFillUnitFillLevel(self.combineSpec.fillUnitIndex)
local fillLevel = self.implement:getFillUnitFillLevel(self.combineSpec.fillUnitIndex)
if self.combineSpec.loadingDelay > 0 then
for i=1, #self.combineSpec.loadingDelaySlots do
local slot = self.combineSpec.loadingDelaySlots[i]
if slot.valid then
fillLevel = fillLevel + slot.fillLevelDelta
end
end
end
return fillLevel
end

function CombineController:getFillLevelPercentage()
return 100 * self.implement:getFillUnitFillLevel(self.combineSpec.fillUnitIndex) /
self.implement:getFillUnitCapacity(self.combineSpec.fillUnitIndex)
return 100 * self:getFillLevel() / self:getCapacity()
end

function CombineController:getCapacity()
Expand Down
4 changes: 2 additions & 2 deletions scripts/ai/strategies/AIDriveStrategyCombineCourse.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,8 +806,8 @@ function AIDriveStrategyCombineCourse:estimateDistanceUntilFull(ix)
self.litersPerMeter = 0
self.litersPerSecond = 0
end
self:debug('Fill rate is %.1f l/m, %.1f l/s (fill level %.1f, last %.1f, dToNext = %.1f)',
self.litersPerMeter, self.litersPerSecond, fillLevel, self.fillLevelAtLastWaypoint, dToNext)
self:debug('Fill rate is %.1f l/m, %.1f l/s (fill level %.1f of %.1f, last %.1f, dToNext = %.1f)',
self.litersPerMeter, self.litersPerSecond, fillLevel, capacity, self.fillLevelAtLastWaypoint, dToNext)
self.fillLevelLastCheckedTime = g_currentMission.time
self.fillLevelAtLastWaypoint = fillLevel
end
Expand Down
Loading