Merge pull request #432 from Stephan-S/dev_axel32019

Release 2.0.0.5

gui/environmentSettingsPage.xml

@@ -27,7 +27,23 @@
 					<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
 					<GuiElement type="bitmap" profile="baseReference" position="730px 0px" size="50px 50px"/>
 				</GuiElement>
-			</GuiElement>
+				<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="useWorkLightsLoading" toolTipElementId="ingameMenuHelpBoxText">
+					<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
+					<GuiElement type="button" profile="multiTextOptionSettingsRight" />
+					<GuiElement type="text" profile="multiTextOptionSettingsText" />
+					<GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 0px" />
+					<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
+					<GuiElement type="bitmap" profile="baseReference" position="730px 0px" size="50px 50px"/>
+				</GuiElement>
+				<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="useWorkLightsSilo" toolTipElementId="ingameMenuHelpBoxText">
+					<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
+					<GuiElement type="button" profile="multiTextOptionSettingsRight" />
+					<GuiElement type="text" profile="multiTextOptionSettingsText" />
+					<GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 0px" />
+					<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
+					<GuiElement type="bitmap" profile="baseReference" position="730px 0px" size="50px 50px"/>
+				</GuiElement>
+            </GuiElement>
 		</GuiElement>
 
 		<GuiElement type="bitmap" profile="ingameMenuHelpRowBg" position="210px -64px" id="ingameMenuHelpBox" visible="false">

gui/vehicleSettingsPage.xml

@@ -147,7 +147,6 @@
 					<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
 					<GuiElement type="bitmap" profile="baseReference" position="730px 0px" size="50px 50px"/>
 				</GuiElement>
-<!--
  				<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="ALUnload" toolTipElementId="ingameMenuHelpBoxText"> 
 					<GuiElement type="button" profile="multiTextOptionSettingsLeft" /> 
 					<GuiElement type="button" profile="multiTextOptionSettingsRight" /> 
@@ -164,7 +163,6 @@
 					<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
 					<GuiElement type="bitmap" profile="baseReference" position="730px 0px" size="50px 50px"/>
 				</GuiElement> 
--->
 			</GuiElement>
 		</GuiElement>
 		<GuiElement type="bitmap" profile="ingameMenuHelpRowBg" position="210px -64px" id="ingameMenuHelpBox" visible="false">

modDesc.xml

@@ -32,7 +32,7 @@ Différents modes d'utilisation ont été ajoutés depuis les premières version
 			<![CDATA[Этот мод может быть использован для создания сети маршрутов для транспортных средств для автономного вождения. После настройки вы можете указать трактору, стоящему где-угодно рядом с сетью, проехать в любую точку, например, в магазин, поле №1 или в точку продажи.]]>
 		</ru>
 	</description>
-	<version>2.0.0.4</version>
+	<version>2.0.0.5</version>
 	<multiplayer supported="true" />
 	<iconFilename>icon.dds</iconFilename>
 	<extraSourceFiles>

scripts/AutoDrive.lua

@@ -1,5 +1,5 @@
 AutoDrive = {}
-AutoDrive.version = "2.0.0.4"
+AutoDrive.version = "2.0.0.5"
 
 AutoDrive.directory = g_currentModDirectory
 
@@ -14,7 +14,7 @@ AutoDrive.experimentalFeatures.enableRoutesManagerOnDediServer = false
 AutoDrive.experimentalFeatures.detectGrasField = true
 AutoDrive.experimentalFeatures.colorAssignmentMode = false
 AutoDrive.experimentalFeatures.UTurn = true
-AutoDrive.experimentalFeatures.FoldImplements = false
+AutoDrive.experimentalFeatures.FoldImplements = true
 
 AutoDrive.dynamicChaseDistance = true
 AutoDrive.smootherDriving = true
@@ -71,7 +71,7 @@ AutoDrive.SCAN_DIALOG_RESULT_NO = 3
 AutoDrive.SCAN_DIALOG_RESULT_DONE = 4
 AutoDrive.scanDialogState = AutoDrive.SCAN_DIALOG_NONE
 
-
+AutoDrive.foldTimeout = 30000 -- 30 s time to fold all implements
 AutoDrive.MAX_BUNKERSILO_LENGTH = 100 -- length of bunker silo where speed should be lowered
 
 -- number of frames for performance modulo operation
@@ -126,6 +126,15 @@ AutoDrive.seedFillTypes = {
     'LIQUIDFERTILIZER'
 }
 
+AutoDrive.modesToStartFromCP = {
+    -- AutoDrive.MODE_DRIVETO, not allowed
+    AutoDrive.MODE_PICKUPANDDELIVER,
+    -- AutoDrive.MODE_DELIVERTO, not allowed
+    AutoDrive.MODE_LOAD,
+    AutoDrive.MODE_UNLOAD
+    -- AutoDrive.MODE_BGA not allowed
+}
+
 function AutoDrive:onAllModsLoaded()
 	-- ADThirdPartyModsManager:load()
 end
@@ -231,7 +240,7 @@ function AutoDrive:loadMap(name)
 	ADInputManager:load()
 
 	ADMultipleTargetsManager:load()
-	AutoDrive.initTelemetry()
+	-- AutoDrive.initTelemetry()
 
 	InGameMenuAIFrame.onFrameOpen = Utils.appendedFunction(InGameMenuAIFrame.onFrameOpen, AutoDrive.onAIFrameOpen)
 	InGameMenuAIFrame.onFrameClose = Utils.appendedFunction(InGameMenuAIFrame.onFrameClose, AutoDrive.onAIFrameClose)

scripts/Events/HudInputEvent.lua

@@ -38,7 +38,10 @@ function AutoDriveHudInputEventEvent:run(connection)
         if self.eventType == self.TYPE_FIRST_MARKER then
 			local currentFirstMarker = self.vehicle.ad.stateModule:getFirstMarkerId()
 			if currentFirstMarker > 0 and currentFirstMarker ~= self.value then
-				AutoDrive:StopCP(self.vehicle)
+                if not (self.vehicle.spec_combine or AutoDrive.getIsBufferCombine(self.vehicle) or self.vehicle.ad.isCombine ~= nil) then
+                    -- not stop / change CP for harvesters
+                    AutoDrive:StopCP(self.vehicle)
+                end
 			end
             self.vehicle.ad.stateModule:setFirstMarker(self.value)
         end