diff --git a/config/MasterTranslations.xml b/config/MasterTranslations.xml index f6a98271..279fa7cb 100644 --- a/config/MasterTranslations.xml +++ b/config/MasterTranslations.xml @@ -3115,6 +3115,19 @@ TPS extension + + + + + + + + + + + + + diff --git a/modDesc.xml b/modDesc.xml index 174444c6..8d8472a5 100644 --- a/modDesc.xml +++ b/modDesc.xml @@ -353,7 +353,15 @@ Changelog 8.0.0.0: - + + + + + + + + + @@ -400,6 +408,9 @@ Changelog 8.0.0.0: + + + diff --git a/scripts/specializations/CpAIWorker.lua b/scripts/specializations/CpAIWorker.lua index 7bd5807e..8697fd42 100644 --- a/scripts/specializations/CpAIWorker.lua +++ b/scripts/specializations/CpAIWorker.lua @@ -127,22 +127,54 @@ function CpAIWorker:onRegisterActionEvents(isActiveForInput, isActiveForInputIgn end end - addActionEvent(self, InputAction.CP_START_STOP, CpAIWorker.startStopCpActionEvent) - addActionEvent(self, InputAction.CP_GENERATE_COURSE, CpAIWorker.generateCourse) - addActionEvent(self, InputAction.CP_CHANGE_SELECTED_JOB, CpAIWorker.changeCurrentSelectedJob) - addActionEvent(self, InputAction.CP_CHANGE_STARTING_POINT, CpAIWorker.changeStartingPoint) - addActionEvent(self, InputAction.CP_CLEAR_COURSE, CpAIWorker.clearCourse, - g_i18n:getText("input_CP_CLEAR_COURSE")) - addActionEvent(self, InputAction.CP_CHANGE_COURSE_VISIBILITY, CpAIWorker.changeCourseVisibility) - - addActionEvent(self, InputAction.CP_OPEN_VEHICLE_SETTINGS, CpGuiUtil.openVehicleSettingsGui, - g_i18n:getText("input_CP_OPEN_VEHICLE_SETTINGS")) - addActionEvent(self, InputAction.CP_OPEN_GLOBAL_SETTINGS, CpGuiUtil.openGlobalSettingsGui, - g_i18n:getText("input_CP_OPEN_GLOBAL_SETTINGS")) - addActionEvent(self, InputAction.CP_OPEN_COURSEGENERATOR_SETTINGS, CpGuiUtil.openCourseGeneratorGui, - g_i18n:getText("input_CP_OPEN_COURSEGENERATOR_SETTINGS")) - addActionEvent(self, InputAction.CP_OPEN_COURSEMANAGER, CpGuiUtil.openCourseManagerGui, - g_i18n:getText("input_CP_OPEN_COURSEMANAGER")) + addActionEvent(self, InputAction.CP_START_STOP, function () + self:cpStartStopDriver(true) + end) + addActionEvent(self, InputAction.CP_START_STOP_AT_FIRST_WAYPOINT, function (self) + local startingPointSetting = self:getCpStartingPointSetting() + startingPointSetting:setValue(CpFieldWorkJobParameters.START_AT_FIRST_POINT) + self:cpStartStopDriver(true) + end) + addActionEvent(self, InputAction.CP_START_STOP_AT_NEAREST_WAYPOINT, function (self) + local startingPointSetting = self:getCpStartingPointSetting() + startingPointSetting:setValue(CpFieldWorkJobParameters.START_AT_NEAREST_POINT) + self:cpStartStopDriver(true) + end) + addActionEvent(self, InputAction.CP_START_STOP_AT_LAST_WAYPOINT, function (self) + local startingPointSetting = self:getCpStartingPointSetting() + startingPointSetting:setValue(CpFieldWorkJobParameters.START_AT_LAST_POINT) + self:cpStartStopDriver(true) + end) + + addActionEvent(self, InputAction.CP_GENERATE_COURSE, function (self) + CourseGeneratorInterface.generateDefaultCourse() + end) + addActionEvent(self, InputAction.CP_CHANGE_SELECTED_JOB, function (self) + local currentJobSetting = self:cpGetHudSelectedJobSetting() + currentJobSetting:setNextItem() + end) + addActionEvent(self, InputAction.CP_CHANGE_STARTING_POINT, function (self) + local startingPointSetting = self:getCpStartingPointSetting() + startingPointSetting:setNextItem() + end) + addActionEvent(self, InputAction.CP_CLEAR_COURSE, function (self) + self:resetCpCoursesFromGui() + end, g_i18n:getText("input_CP_CLEAR_COURSE")) + addActionEvent(self, InputAction.CP_CHANGE_COURSE_VISIBILITY, function () + self:getCpSettings().showCourse:setNextItem() + end) + addActionEvent(self, InputAction.CP_OPEN_VEHICLE_SETTINGS, function () + CpGuiUtil.openVehicleSettingsGui(self) + end, g_i18n:getText("input_CP_OPEN_VEHICLE_SETTINGS")) + addActionEvent(self, InputAction.CP_OPEN_GLOBAL_SETTINGS, function () + CpGuiUtil.openGlobalSettingsGui(self) + end, g_i18n:getText("input_CP_OPEN_GLOBAL_SETTINGS")) + addActionEvent(self, InputAction.CP_OPEN_COURSEGENERATOR_SETTINGS, function () + CpGuiUtil.openCourseGeneratorGui(self) + end, g_i18n:getText("input_CP_OPEN_COURSEGENERATOR_SETTINGS")) + addActionEvent(self, InputAction.CP_OPEN_COURSEMANAGER, function () + CpGuiUtil.openCourseManagerGui(self) + end, g_i18n:getText("input_CP_OPEN_COURSEMANAGER")) CpAIWorker.updateActionEvents(self) end @@ -209,28 +241,6 @@ function CpAIWorker:updateActionEvents() end end -function CpAIWorker:changeStartingPoint() - local startingPointSetting = self:getCpStartingPointSetting() - startingPointSetting:setNextItem() -end - -function CpAIWorker:changeCurrentSelectedJob() - local currentJobSetting = self:cpGetHudSelectedJobSetting() - currentJobSetting:setNextItem() -end - -function CpAIWorker:clearCourse() - self:resetCpCoursesFromGui() -end - -function CpAIWorker:changeCourseVisibility() - self:getCpSettings().showCourse:setNextItem() -end - -function CpAIWorker:startStopCpActionEvent() - self:cpStartStopDriver(true) -end - --- Directly starts a cp job or stops a currently active job. function CpAIWorker:cpStartStopDriver(isStartedByHud) CpUtil.debugVehicle(CpDebug.DBG_FIELDWORK, self, "Start/stop cp helper") @@ -545,13 +555,6 @@ function CpAIWorker:onStartAutoDrive() end end ------------------------------------------------ ---- Generate course ---------------------------------------------- -function CpAIWorker:generateCourse() - CourseGeneratorInterface.generateDefaultCourse() -end - --------------------------------------------- --- Console commands --------------------------------------------- diff --git a/translations/translation_br.xml b/translations/translation_br.xml index 10f636c0..3eea0c8f 100644 --- a/translations/translation_br.xml +++ b/translations/translation_br.xml @@ -1045,6 +1045,9 @@ Agora sua seleção deve ser semelhante à imagem. + + + diff --git a/translations/translation_cs.xml b/translations/translation_cs.xml index 27e0fa56..0dfd24d3 100644 --- a/translations/translation_cs.xml +++ b/translations/translation_cs.xml @@ -1014,6 +1014,9 @@ hud还显示助手工作时堆或思洛存储器的剩余填充水平。 + + + diff --git a/translations/translation_ct.xml b/translations/translation_ct.xml index f2cb56f8..97817db7 100644 --- a/translations/translation_ct.xml +++ b/translations/translation_ct.xml @@ -1014,6 +1014,9 @@ Now your selection should look similar to the image. + + + diff --git a/translations/translation_cz.xml b/translations/translation_cz.xml index 2b891f47..f829d410 100644 --- a/translations/translation_cz.xml +++ b/translations/translation_cz.xml @@ -1012,6 +1012,9 @@ Nyní by váš výběr měl vypadat podobně jako na obrázku. + + + diff --git a/translations/translation_da.xml b/translations/translation_da.xml index a6d6e0d2..7e1e5a60 100644 --- a/translations/translation_da.xml +++ b/translations/translation_da.xml @@ -1025,6 +1025,9 @@ Now your selection should look similar to the image. + + + diff --git a/translations/translation_de.xml b/translations/translation_de.xml index 7565fa59..b8c5e0cb 100644 --- a/translations/translation_de.xml +++ b/translations/translation_de.xml @@ -1046,6 +1046,9 @@ Das Kreuz sollte jetzt, wie im Bild dargestellt, gelb sein. + + + diff --git a/translations/translation_ea.xml b/translations/translation_ea.xml index 709ebd4d..3694f0fd 100644 --- a/translations/translation_ea.xml +++ b/translations/translation_ea.xml @@ -1056,6 +1056,9 @@ Ahora su selección debería verse similar a la imagen. + + + diff --git a/translations/translation_en.xml b/translations/translation_en.xml index cdd6358c..3a43a545 100644 --- a/translations/translation_en.xml +++ b/translations/translation_en.xml @@ -1063,6 +1063,9 @@ Now your selection should look similar to the image. + + + diff --git a/translations/translation_es.xml b/translations/translation_es.xml index 4e5474cb..e5255e3f 100644 --- a/translations/translation_es.xml +++ b/translations/translation_es.xml @@ -1056,6 +1056,9 @@ Ahora su selección debería verse similar a la imagen. + + + diff --git a/translations/translation_fc.xml b/translations/translation_fc.xml index 8dd33e94..a60d250d 100644 --- a/translations/translation_fc.xml +++ b/translations/translation_fc.xml @@ -1022,6 +1022,9 @@ Now your selection should look similar to the image. + + + diff --git a/translations/translation_fi.xml b/translations/translation_fi.xml index 416260fe..5bc10d9a 100644 --- a/translations/translation_fi.xml +++ b/translations/translation_fi.xml @@ -1022,6 +1022,9 @@ Now your selection should look similar to the image. + + + diff --git a/translations/translation_fr.xml b/translations/translation_fr.xml index 24f86813..c735046a 100644 --- a/translations/translation_fr.xml +++ b/translations/translation_fr.xml @@ -1007,6 +1007,9 @@ Votre sélection devrait ressembler à l'illustration ci-contre. + + + diff --git a/translations/translation_hu.xml b/translations/translation_hu.xml index 21d2aac5..3740262d 100644 --- a/translations/translation_hu.xml +++ b/translations/translation_hu.xml @@ -1031,6 +1031,9 @@ A kijelölésnek hasonlónak kell lennie, mint a képen. + + + diff --git a/translations/translation_it.xml b/translations/translation_it.xml index 4d708e5f..240187ee 100644 --- a/translations/translation_it.xml +++ b/translations/translation_it.xml @@ -1047,6 +1047,9 @@ Ora la tua selezione dovrebbe essere simile all'immagine. + + + diff --git a/translations/translation_jp.xml b/translations/translation_jp.xml index 6b6b1f31..a9704f0e 100644 --- a/translations/translation_jp.xml +++ b/translations/translation_jp.xml @@ -1021,6 +1021,9 @@ Now your selection should look similar to the image. + + + diff --git a/translations/translation_kr.xml b/translations/translation_kr.xml index 63f3d4ca..d5ac8a3b 100644 --- a/translations/translation_kr.xml +++ b/translations/translation_kr.xml @@ -1022,6 +1022,9 @@ Now your selection should look similar to the image. + + + diff --git a/translations/translation_nl.xml b/translations/translation_nl.xml index 7bc6cef3..7a5e7ba3 100644 --- a/translations/translation_nl.xml +++ b/translations/translation_nl.xml @@ -1021,6 +1021,9 @@ Now your selection should look similar to the image. + + + diff --git a/translations/translation_no.xml b/translations/translation_no.xml index 53a15372..0f2f00cc 100644 --- a/translations/translation_no.xml +++ b/translations/translation_no.xml @@ -1022,6 +1022,9 @@ Now your selection should look similar to the image. + + + diff --git a/translations/translation_pl.xml b/translations/translation_pl.xml index a92f2567..69462b19 100644 --- a/translations/translation_pl.xml +++ b/translations/translation_pl.xml @@ -991,6 +991,9 @@ Twój wybór powinien wyglądać podobnie do tego zdjęcia. + + + diff --git a/translations/translation_pt.xml b/translations/translation_pt.xml index 2ca53c54..a2da932d 100644 --- a/translations/translation_pt.xml +++ b/translations/translation_pt.xml @@ -1016,6 +1016,9 @@ Now your selection should look similar to the image. + + + diff --git a/translations/translation_ro.xml b/translations/translation_ro.xml index f7b3342b..4cf04583 100644 --- a/translations/translation_ro.xml +++ b/translations/translation_ro.xml @@ -1022,6 +1022,9 @@ Now your selection should look similar to the image. + + + diff --git a/translations/translation_ru.xml b/translations/translation_ru.xml index 459fb1cd..5ffb4afd 100644 --- a/translations/translation_ru.xml +++ b/translations/translation_ru.xml @@ -1031,6 +1031,9 @@ HUD также показывает оставшийся уровень запо + + + diff --git a/translations/translation_sv.xml b/translations/translation_sv.xml index 59e831ff..28d8a15f 100644 --- a/translations/translation_sv.xml +++ b/translations/translation_sv.xml @@ -1019,6 +1019,9 @@ Now your selection should look similar to the image. + + + diff --git a/translations/translation_tr.xml b/translations/translation_tr.xml index f68d4a85..37bdf4cc 100644 --- a/translations/translation_tr.xml +++ b/translations/translation_tr.xml @@ -1063,6 +1063,9 @@ Seçimler tamamlandığında örnek görsele benzer bir görüntü olması gerek + + +