Refill on the field, for now only stationary waiting until refilled. #3505
Conversation
- Works for sowing machines, sprayers and tree planters. TODO: - Translation texts are not really understandable - All the test scenarios ...
schwiti6190
changed the title
config/MasterTranslations.xml
Outdated
| <Text language="en"><![CDATA[Refill tool]]></Text> | ||
| </Translation> | ||
| <Translation name="CP_vehicle_setting_refillOnTheField_tooltip"> | ||
| <Text language="de"><![CDATA[Gerät wartet auf dem Feld zum auffüllen.]]></Text> |
There was a problem hiding this comment.
zum Auffüllen.
Außerdem würde ich den Satz umstellen:
Gerät wartet zum Auffüllen auf dem Feld.
oder
Gerät wartet auf dem Feld, um aufgefüllt zu werden.
scripts/ai/AIDriveStrategyCourse.lua
Outdated
| return self.held:get() | ||
| local isHeld = self.held:get() | ||
| if not isHeld then | ||
| self.fuelSaveActiveWhileHeld = false |
There was a problem hiding this comment.
This isn't very clean, one would not expect a query function like this to have side effects.
| end | ||
|
|
||
| function AIDriveStrategyFieldWorkCourse:updateFilling() | ||
| --- Trys to load if possible |
| --- Waiting for refilling on the field | ||
| ----------------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| function AIDriveStrategyFieldWorkCourse:prepareFilling() |
There was a problem hiding this comment.
This is a lot of code in these *Filling() functions, not really related to the strategy, maybe move some to ImplementUtil or similar, or its own helper, keeping only the actions/state changes here?
| @@ -499,11 +490,12 @@ end | |||
| --- Hold the vehicle (set speed to 0) temporary. This is meant to be used for other vehicles to coordinate movements, | |||
| --- for instance tell a vehicle it should not move as the other vehicle is driving around it. | |||
| ---@param milliseconds number milliseconds to hold | |||
| function AIDriveStrategyCourse:hold(milliseconds) | |||
| function AIDriveStrategyCourse:hold(milliseconds, fuelSaveAllowed) | |||
There was a problem hiding this comment.
Probably missed them, but there aren't a lot of comments on how this refill should work, are we using hold()? If so, can we update the comments to make it clear?
scripts/ai/jobs/CpAIJobFieldWork.lua
Outdated
| @@ -25,13 +25,15 @@ function CpAIJobFieldWork:setupTasks(isServer) | |||
| self.attachHeaderTask = CpAITaskAttachHeader(isServer, self) | |||
| self.driveToFieldWorkStartTask = CpAITaskDriveTo(isServer, self) | |||
| self.fieldWorkTask = CpAITaskFieldWork(isServer, self) | |||
| -- self.refuelTask = CpAITaskRefuel(isServer, self) | |||
scripts/ai/jobs/CpAIJobFieldWork.lua
Outdated
| end | ||
|
|
||
| function CpAIJobFieldWork:onPreStart() | ||
| CpAIJob.onPreStart(self) | ||
| self:removeTask(self.attachHeaderTask) | ||
| self:removeTask(self.driveToFieldWorkStartTask) | ||
| self:removeTask(self.fieldWorkTask) | ||
| -- self:removeTask(self.refuelTask) |
scripts/ai/jobs/CpAIJobFieldWork.lua
Outdated
| @@ -40,15 +42,38 @@ function CpAIJobFieldWork:onPreStart() | |||
| end | |||
| self:addTask(self.driveToFieldWorkStartTask) | |||
| self:addTask(self.fieldWorkTask) | |||
| ---TODO: only if refuelling is possible .. | |||
| -- self:addTask(self.refuelTask) | |||
| end | ||
|
|
||
| function CpAIJobFieldWork:setupJobParameters() | ||
| CpAIJob.setupJobParameters(self) | ||
| self:setupCpJobParameters(CpFieldWorkJobParameters(self)) | ||
| end | ||
|
|
||
| function CpAIJobFieldWork:isFinishingAllowed(message) |
There was a problem hiding this comment.
just a little comment on what this means? Or is this a Giants function? Also some explanation on the concept here, especially since this is again a getter function with side effects.
| CpAITask.reset(self) | ||
| end | ||
|
|
||
| function CpAITaskFieldWork:setStartPosition(startPosition) | ||
| self.startPosition = startPosition | ||
| end | ||
|
|
||
| function CpAITaskFieldWork:setWaitingForRefuelActive() |
There was a problem hiding this comment.
Refuel can be confusing, it sounds more like filling the tractor with diesel. Can we use refill everywhere?
| @@ -341,7 +339,12 @@ function CpAIWorker:stopCurrentAIJob(superFunc, message, ...) | |||
| end | |||
| end | |||
| end | |||
| local job = self:getJob() | |||
| if not job:isFinishingAllowed(message) then | |||
There was a problem hiding this comment.
Oh, so the idea is intercept the stopCurrentAIJob() from the implements when empty? Can't we handle that within the strategy?
TODO: