Merge pull request #548 from Stephan-S/dev_axel32019

Release 2.0.0.6
Stephan-S · May 28, 2022 · 0b52cb5 · 0b52cb5
2 parents dcc0264 + 41d97ae
commit 0b52cb5
Show file tree

Hide file tree

Showing 49 changed files with 1,342 additions and 555 deletions.
diff --git a/gui/debugSettingsPage.xml b/gui/debugSettingsPage.xml
@@ -9,95 +9,95 @@
 
 		<GuiElement type="bitmap" profile="ingameMenuSettingsBox" id="settingsContainer">
             <GuiElement type="scrollingLayout" profile="ingameMenuSettingsLayout" id="boxLayout" >
-				<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="1">
+				<GuiElement type="listItem" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="1">
 					<GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle">
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" />
 						<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckboxToggleIcon" imageUVs="0px 0px 128px 128px" />
 						<GuiElement type="text" profile="autoDriveDebugSettingsCheckboxToggleText" text="gui_ad_debugChannelVehicle" onCreate="onCreateAutoDriveText1" />
 					</GuiElement>
 				</GuiElement>
-				<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="2">
+				<GuiElement type="listItem" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="2">
 					<GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle">
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" />
 						<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckboxToggleIcon" imageUVs="128px 0px 128px 128px" />
 						<GuiElement type="text" profile="autoDriveDebugSettingsCheckboxToggleText" text="gui_ad_debugChannelCombine" onCreate="onCreateAutoDriveText2" />
 					</GuiElement>
 				</GuiElement>
-				<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="4">
+				<GuiElement type="listItem" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="4">
 					<GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle">
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" />
 						<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckboxToggleIcon" imageUVs="256px 0px 128px 128px" />
 						<GuiElement type="text" profile="autoDriveDebugSettingsCheckboxToggleText" text="gui_ad_debugChannelTrailer" onCreate="onCreateAutoDriveText3" />
 					</GuiElement>
 				</GuiElement>
-				<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="8">
+				<GuiElement type="listItem" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="8">
 					<GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle">
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" />
 						<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckboxToggleIcon" imageUVs="384px 0px 128px 128px" />
 						<GuiElement type="text" profile="autoDriveDebugSettingsCheckboxToggleText" text="gui_ad_debugChannelDev" onCreate="onCreateAutoDriveText4" />
 					</GuiElement>
 				</GuiElement>
-				<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="16">
+				<GuiElement type="listItem" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="16">
 					<GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle">
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" />
 						<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckboxToggleIcon" imageUVs="512px 0px 128px 128px" />
 						<GuiElement type="text" profile="autoDriveDebugSettingsCheckboxToggleText" text="gui_ad_debugChannelPath" onCreate="onCreateAutoDriveText5" />
 					</GuiElement>
 				</GuiElement>
-				<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="32">
+				<GuiElement type="listItem" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="32">
 					<GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle">
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" />
 						<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckboxToggleIcon" imageUVs="640px 0px 128px 128px" />
 						<GuiElement type="text" profile="autoDriveDebugSettingsCheckboxToggleText" text="gui_ad_debugChannelSensor" onCreate="onCreateAutoDriveText6" />
 					</GuiElement>
 				</GuiElement>
-				<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="64">
+				<GuiElement type="listItem" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="64">
 					<GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle">
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" />
 						<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckboxToggleIcon" imageUVs="768px 0px 128px 128px" />
 						<GuiElement type="text" profile="autoDriveDebugSettingsCheckboxToggleText" text="gui_ad_debugChannelNetwork" onCreate="onCreateAutoDriveText7" />
 					</GuiElement>
 				</GuiElement>
-				<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="128">
+				<GuiElement type="listItem" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="128">
 					<GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle">
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" />
 						<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckboxToggleIcon" imageUVs="896px 0px 128px 128px" />
 						<GuiElement type="text" profile="autoDriveDebugSettingsCheckboxToggleText" text="gui_ad_debugChannelExternalInterface" onCreate="onCreateAutoDriveText8" />
 					</GuiElement>
 				</GuiElement>
-				<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="256">
+				<GuiElement type="listItem" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="256">
 					<GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle">
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" />
 						<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckboxToggleIcon" imageUVs="128px 128px 128px 128px" />
 						<GuiElement type="text" profile="autoDriveDebugSettingsCheckboxToggleText" text="gui_ad_debugChannelRender" onCreate="onCreateAutoDriveText9" />
 					</GuiElement>
 				</GuiElement>
-				<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="512">
+				<GuiElement type="listItem" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="512">
 					<GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle">
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" />
 						<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckboxToggleIcon2" imageUVs="780px 780px 234px 234px" />
 						<GuiElement type="text" profile="autoDriveDebugSettingsCheckboxToggleText" text="gui_ad_debugChannelRoadNetwork" onCreate="onCreateAutoDriveText10" />
 					</GuiElement>
 				</GuiElement>
-				<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="1024">
-					<GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle">
-						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />
-						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" />
-						<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckboxToggleIcon" imageUVs="256px 128px 128px 128px" />
-						<GuiElement type="text" profile="autoDriveDebugSettingsCheckboxToggleText" text="gui_ad_debugChannelBGA" onCreate="onCreateAutoDriveText11" />
-					</GuiElement>
-				</GuiElement>
-				<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="65535">
+				<!-- <GuiElement type="listItem" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="1024"> -->
+					<!-- <GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle"> -->
+						<!-- <GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" /> -->
+						<!-- <GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" /> -->
+						<!-- <GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckboxToggleIcon" imageUVs="256px 128px 128px 128px" /> -->
+						<!-- <GuiElement type="text" profile="autoDriveDebugSettingsCheckboxToggleText" text="gui_ad_debugChannelBGA" onCreate="onCreateAutoDriveText11" /> -->
+					<!-- </GuiElement> -->
+				<!-- </GuiElement> -->
+				<GuiElement type="listItem" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="65535">
 					<GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle">
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" />

diff --git a/gui/environmentSettingsPage.xml b/gui/environmentSettingsPage.xml
@@ -9,7 +9,7 @@
 		</GuiElement>
 
 		<GuiElement type="bitmap" profile="ingameMenuSettingsBox" id="settingsContainer">
-			<GuiElement type="scrollingLayout" profile="ingameMenuSettingsLayout" >
+			<GuiElement type="scrollingLayout" profile="ingameMenuSettingsLayout" id="boxLayout" >
 
 				<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="blinkValue" toolTipElementId="ingameMenuHelpBoxText">
 					<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
@@ -43,6 +43,14 @@
 					<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="useHazardLightReverse" 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>
 

diff --git a/gui/experimentalFeaturesSettingsPage.xml b/gui/experimentalFeaturesSettingsPage.xml
@@ -8,7 +8,7 @@
 		</GuiElement>
 
 		<GuiElement type="bitmap" profile="ingameMenuSettingsBox" id="settingsContainer">
-			<GuiElement type="scrollingLayout" profile="ingameMenuSettingsLayout" >
+            <GuiElement type="scrollingLayout" profile="ingameMenuSettingsLayout" id="boxLayout" >
 				<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onClick="onOptionChange" onCreate="onCreateElement" id="cloneElement">
 					<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
 					<GuiElement type="button" profile="multiTextOptionSettingsRight" />

diff --git a/gui/guiProfiles.xml b/gui/guiProfiles.xml
@@ -14,7 +14,8 @@
         <Preset name="colorGlassLight_50" value="0.718 0.716 0.715 0.0625" />
         <Preset name="colorGlassLight_75" value="0.718 0.716 0.715 0.09375" />
 
-        <Preset name="colorMainUI" value="0.9910 0.3865 0.0100 1" />
+<!-- FS 22 blue -->
+        <Preset name="colorMainUI" value="0.023 0.533 0.847 1" />
         <Preset name="colorMainUIAlt" value="0.9900 0.4640 0.0010 1" />
         <Preset name="colorDisabled" value="0.4 0.4 0.4 1" />
 

diff --git a/modDesc.xml b/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.5</version>
+	<version>2.0.0.6</version>
 	<multiplayer supported="true" />
 	<iconFilename>icon.dds</iconFilename>
 	<extraSourceFiles>

diff --git a/scripts/AutoDrive.lua b/scripts/AutoDrive.lua
@@ -1,5 +1,5 @@
 AutoDrive = {}
-AutoDrive.version = "2.0.0.5"
+AutoDrive.version = "2.0.0.6"
 
 AutoDrive.directory = g_currentModDirectory
 
@@ -15,6 +15,7 @@ AutoDrive.experimentalFeatures.detectGrasField = true
 AutoDrive.experimentalFeatures.colorAssignmentMode = false
 AutoDrive.experimentalFeatures.UTurn = true
 AutoDrive.experimentalFeatures.FoldImplements = true
+AutoDrive.experimentalFeatures.RefuelOnlyAtValidStations = true
 
 AutoDrive.dynamicChaseDistance = true
 AutoDrive.smootherDriving = true
@@ -86,6 +87,10 @@ AutoDrive.FLAG_SUBPRIO = 1
 AutoDrive.FLAG_TRAFFIC_SYSTEM = 2
 AutoDrive.FLAG_TRAFFIC_SYSTEM_CONNECTION = 4
 
+-- add this to measured size of vehicles
+AutoDrive.DIMENSION_ADDITION = 0.2
+
+
 AutoDrive.colors = {
 	ad_color_singleConnection = {0, 1, 0, 1},
 	ad_color_dualConnection = {0, 0, 1, 1},
@@ -116,8 +121,7 @@ AutoDrive.fuelFillTypes = {
 }
 
 AutoDrive.nonFillableFillTypes = { -- these fillTypes should not be transported
-    "AIR",
-	"SILAGE_ADDITIVE"
+    "AIR"
 }
 
 AutoDrive.seedFillTypes = {
@@ -194,12 +198,13 @@ function AutoDrive:loadMap(name)
     AutoDrive.readLocalSettingsFromXML()
 
 	ADUserDataManager:load()
+
+	AutoDrive.Hud = AutoDriveHud:new()
+
 	if g_server ~= nil then
 		ADUserDataManager:loadFromXml()
 	end
 
-	AutoDrive.Hud = AutoDriveHud:new()
-
 	AutoDrive.Hud:loadHud()
 
 	-- Save Configuration when saving savegame
@@ -454,7 +459,6 @@ function AutoDrive:init()
 	else
 		ADGraphManager:checkYPositionIntegrity()
 	end
-
 	AutoDrive.updateDestinationsMapHotspots()
 	AutoDrive:registerDestinationListener(AutoDrive, AutoDrive.updateDestinationsMapHotspots)