Skip to content

Commit 435feea

Browse files
TensukoTensuko
authored
Merge pull request #1124 from Courseplay/Fieldwork-course-loop
Fieldwork course loop
2 parents 557c1e0 + abd5a1a commit 435feea

30 files changed

+75
-6
lines changed

‎config/MasterTranslations.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,14 @@
643643
<Text language="de"><![CDATA[Versucht beim Wendemanöver auf dem Feld zu bleiben. Nicht mit allen Geräten möglich. Wenn ausgeschaltet, wird das Gerät nicht rückwärts fahren.]]></Text>
644644
<Text language="en"><![CDATA[Only turning on the field. Not possible with all tools. If turned off, the tool won't drive in reverse.]]></Text>
645645
</Translation>
646+
<Translation name="CP_vehicle_setting_restartCourseAtEnd_title">
647+
<Text language="de"><![CDATA[Kurs am Ende neu starten]]></Text>
648+
<Text language="en"><![CDATA[Restart course at the end]]></Text>
649+
</Translation>
650+
<Translation name="CP_vehicle_setting_restartCourseAtEnd_tooltip">
651+
<Text language="de"><![CDATA[Startet den Feldkurs am ersten Wegpunkt erneut.]]></Text>
652+
<Text language="en"><![CDATA[Restart the fieldwork course at the 1st waypoint.]]></Text>
653+
</Translation>
646654
<Translation name="CP_vehicle_setting_avoidFruit_title">
647655
<Text language="de"><![CDATA[Fruchtumfahrung]]></Text>
648656
<Text language="en"><![CDATA[Avoid driving in fruit]]></Text>

‎config/VehicleSettingsSetup.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
<!--Open hud with mouse-->
2929
<Setting classType="AIParameterBooleanSetting" name="fuelSave" defaultBool="true" isExpertModeOnly="true"/>
30-
<!--Stop At End-->
31-
<!--<Setting classType="AIParameterBooleanSetting" name="stopAtEnd" defaultBool="true" isExpertModeOnly="true"/> turn this setting off for now, as it is not active right now.-->
30+
<!--Restart course at end-->
31+
<Setting classType="AIParameterBooleanSetting" name="restartCourseAtEnd" defaultBool="false" isExpertModeOnly="true"/>
3232
<!--Turn on Field-->
3333
<Setting classType="AIParameterBooleanSetting" name="turnOnField" defaultBool="true" isVisible="areCourseSettingsVisible"/>
3434
<!--Avoid Fruit-->

‎scripts/ai/strategies/AIDriveStrategyFieldWorkCourse.lua‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,8 @@ end
445445
--- State changes
446446
-----------------------------------------------------------------------------------------------------------------------
447447
function AIDriveStrategyFieldWorkCourse:finishFieldWork()
448-
if self.settings.returnToStart:getValue() and self.fieldWorkCourse:startsWithHeadland() then
448+
if (self.settings.returnToStart:getValue() and self.fieldWorkCourse:startsWithHeadland()) or
449+
self.settings.restartCourseAtEnd:getValue() then
449450
self:debug('Fieldwork ended, returning to first waypoint.')
450451
self.vehicle:prepareForAIDriving()
451452
self:returnToStartAfterDone()
@@ -530,9 +531,15 @@ function AIDriveStrategyFieldWorkCourse:onPathfindingDoneToReturnToStart(path)
530531
self:debug('Pathfinding to return to start finished with %d waypoints (%d ms)',
531532
#path, g_currentMission.time - (self.pathfindingStartedAt or 0))
532533
local returnCourse = Course(self.vehicle, CpMathUtil.pointsToGameInPlace(path), true)
533-
self.state = self.states.RETURNING_TO_START
534-
self.waitingForPrepare:set(true, 10000)
535-
self:startCourse(returnCourse, 1)
534+
if self.settings.restartCourseAtEnd:getValue() then
535+
self:debug('Returning to the first waypoint and then restarting the fieldwork course')
536+
self:startAlignmentTurn(self.fieldWorkCourse, 1, returnCourse)
537+
else
538+
self:debug('Returning to the first waypoint and stopping there')
539+
self.state = self.states.RETURNING_TO_START
540+
self.waitingForPrepare:set(true, 10000)
541+
self:startCourse(returnCourse, 1)
542+
end
536543
else
537544
self:debug('No path found to return to fieldwork start after work is done (%d ms), stopping job',
538545
g_currentMission.time - (self.pathfindingStartedAt or 0))

‎translations/translation_br.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@
201201
<text name="CP_vehicle_setting_lowerImplementEarly_late" text="final"/>
202202
<text name="CP_vehicle_setting_turnOnField_title" text="Virar no campo"/>
203203
<text name="CP_vehicle_setting_turnOnField_tooltip" text="Virar no campo. Não é possível com todos os implementos."/>
204+
<text name="CP_vehicle_setting_restartCourseAtEnd_title" text="Restart course at the end"/>
205+
<text name="CP_vehicle_setting_restartCourseAtEnd_tooltip" text="Restart the fieldwork course at the 1st waypoint."/>
204206
<text name="CP_vehicle_setting_avoidFruit_title" text="Evite dirigir na plantação"/>
205207
<text name="CP_vehicle_setting_avoidFruit_tooltip" text="AI evitará dirigir na plantação"/>
206208
<text name="CP_vehicle_setting_toolOffsetX_title" text="Distancia horizontal do implemento"/>

‎translations/translation_cs.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@
201201
<text name="CP_vehicle_setting_lowerImplementEarly_late" text="晚些"/>
202202
<text name="CP_vehicle_setting_turnOnField_title" text="仅在田地范围内作业"/>
203203
<text name="CP_vehicle_setting_turnOnField_tooltip" text="不超出田地范围，对某些工具无效。"/>
204+
<text name="CP_vehicle_setting_restartCourseAtEnd_title" text="Restart course at the end"/>
205+
<text name="CP_vehicle_setting_restartCourseAtEnd_tooltip" text="Restart the fieldwork course at the 1st waypoint."/>
204206
<text name="CP_vehicle_setting_avoidFruit_title" text="避开作物"/>
205207
<text name="CP_vehicle_setting_avoidFruit_tooltip" text="工人将尽量避免开车碾压种植作物。"/>
206208
<text name="CP_vehicle_setting_toolOffsetX_title" text="工具横向调整"/>

‎translations/translation_ct.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@
201201
<text name="CP_vehicle_setting_lowerImplementEarly_late" text="晚些"/>
202202
<text name="CP_vehicle_setting_turnOnField_title" text="僅在田地範圍內作業"/>
203203
<text name="CP_vehicle_setting_turnOnField_tooltip" text="不超出田地範圍，對某些工具無效。"/>
204+
<text name="CP_vehicle_setting_restartCourseAtEnd_title" text="Restart course at the end"/>
205+
<text name="CP_vehicle_setting_restartCourseAtEnd_tooltip" text="Restart the fieldwork course at the 1st waypoint."/>
204206
<text name="CP_vehicle_setting_avoidFruit_title" text="避開作物"/>
205207
<text name="CP_vehicle_setting_avoidFruit_tooltip" text="工人將盡量避免開車碾壓種植作物。"/>
206208
<text name="CP_vehicle_setting_toolOffsetX_title" text="工具橫向調整"/>

‎translations/translation_cz.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@
201201
<text name="CP_vehicle_setting_lowerImplementEarly_late" text="Pozdě"/>
202202
<text name="CP_vehicle_setting_turnOnField_title" text="Otáčení pouze na poli"/>
203203
<text name="CP_vehicle_setting_turnOnField_tooltip" text="Nastaví otáčení pouze na poli. Není možné pro všechny nástroje."/>
204+
<text name="CP_vehicle_setting_restartCourseAtEnd_title" text="Restart course at the end"/>
205+
<text name="CP_vehicle_setting_restartCourseAtEnd_tooltip" text="Restart the fieldwork course at the 1st waypoint."/>
204206
<text name="CP_vehicle_setting_avoidFruit_title" text="Vyhnout se vjíždění do plodin"/>
205207
<text name="CP_vehicle_setting_avoidFruit_tooltip" text="Umělá inteligence se pokusí vyhnout vjíždění do plodin."/>
206208
<text name="CP_vehicle_setting_toolOffsetX_title" text="Horizontální odsazení nástroje"/>

‎translations/translation_da.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@
201201
<text name="CP_vehicle_setting_lowerImplementEarly_late" text="Sent"/>
202202
<text name="CP_vehicle_setting_turnOnField_title" text="Vende i mark"/>
203203
<text name="CP_vehicle_setting_turnOnField_tooltip" text="Forsøger at lave vendemanøvre i marken. Ikke muligt med alle redskaber."/>
204+
<text name="CP_vehicle_setting_restartCourseAtEnd_title" text="Restart course at the end"/>
205+
<text name="CP_vehicle_setting_restartCourseAtEnd_tooltip" text="Restart the fieldwork course at the 1st waypoint."/>
204206
<text name="CP_vehicle_setting_avoidFruit_title" text="Udenomskørsel af afgrøde"/>
205207
<text name="CP_vehicle_setting_avoidFruit_tooltip" text="Forsøger så vidt muligt at køre udenom afgrøder."/>
206208
<text name="CP_vehicle_setting_toolOffsetX_title" text="Redskab forskudt vandret"/>

‎translations/translation_de.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@
201201
<text name="CP_vehicle_setting_lowerImplementEarly_late" text="spät"/>
202202
<text name="CP_vehicle_setting_turnOnField_title" text="Wenden auf dem Feld"/>
203203
<text name="CP_vehicle_setting_turnOnField_tooltip" text="Versucht beim Wendemanöver auf dem Feld zu bleiben. Nicht mit allen Geräten möglich. Wenn ausgeschaltet, wird das Gerät nicht rückwärts fahren."/>
204+
<text name="CP_vehicle_setting_restartCourseAtEnd_title" text="Kurs am Ende neu starten"/>
205+
<text name="CP_vehicle_setting_restartCourseAtEnd_tooltip" text="Startet den Feldkurs am ersten Wegpunkt erneut."/>
204206
<text name="CP_vehicle_setting_avoidFruit_title" text="Fruchtumfahrung"/>
205207
<text name="CP_vehicle_setting_avoidFruit_tooltip" text="Versucht nach Möglichkeit, nicht in der Frucht zu fahren."/>
206208
<text name="CP_vehicle_setting_toolOffsetX_title" text="Geräteversatz horizontal"/>

‎translations/translation_ea.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@
201201
<text name="CP_vehicle_setting_lowerImplementEarly_late" text="Después"/>
202202
<text name="CP_vehicle_setting_turnOnField_title" text="Solo giros dentro del campo"/>
203203
<text name="CP_vehicle_setting_turnOnField_tooltip" text="Puede no ser posible con todos las herramientas."/>
204+
<text name="CP_vehicle_setting_restartCourseAtEnd_title" text="Restart course at the end"/>
205+
<text name="CP_vehicle_setting_restartCourseAtEnd_tooltip" text="Restart the fieldwork course at the 1st waypoint."/>
204206
<text name="CP_vehicle_setting_avoidFruit_title" text="Evitar conducir sobre los cultivos"/>
205207
<text name="CP_vehicle_setting_avoidFruit_tooltip" text="El conductor intentará evitar conducir sobre los cultivos"/>
206208
<text name="CP_vehicle_setting_toolOffsetX_title" text="Desplazamiento de Herramientas"/>

0 commit comments

Comments
 (0)