Shovel Silo Loader Mode

Courseplay.lua

@@ -157,7 +157,7 @@ end
 function Courseplay.drawHudMap(map)
 	if g_Courseplay.globalSettings.drawOntoTheHudMap:getValue() then
 		local vehicle = g_currentMission.controlledVehicle
-		if vehicle and vehicle:getIsEntered() and not g_gui:getIsGuiVisible() and vehicle.spec_courseplaySpec and not vehicle.spec_locomotive then 
+		if vehicle and vehicle:getIsEntered() and not g_gui:getIsGuiVisible() and vehicle.spec_cpAIWorker and not vehicle.spec_locomotive then 
 			SpecializationUtil.raiseEvent(vehicle, "onCpDrawHudMap", map)
 		end
 	end
@@ -192,14 +192,28 @@ end
 FSCareerMissionInfo.saveToXMLFile = Utils.prependedFunction(FSCareerMissionInfo.saveToXMLFile, Courseplay.saveToXMLFile)
 
 function Courseplay:update(dt)
-	g_devHelper:update()
-	g_bunkerSiloManager:update(dt)
+    g_devHelper:update()
+    g_bunkerSiloManager:update(dt)
+    g_triggerManager:update(dt)
+    if not self.postInit then 
+        -- Doubles the map zoom for 4x Maps. Mainly to make it easier to set targets for unload triggers.
+        self.postInit = true
+        local function setIngameMapFix(mapElement)
+            local factor = 2*mapElement.terrainSize/2048
+            mapElement.zoomMax = mapElement.zoomMax * factor
+            mapElement.zoomDefault = mapElement.zoomDefault * factor
+            mapElement.mapZoom = mapElement.zoomDefault
+        end
+        setIngameMapFix(g_currentMission.inGameMenu.pageAI.ingameMap)
+        setIngameMapFix(g_currentMission.inGameMenu.pageMapOverview.ingameMap)
+    end
 end
 
 function Courseplay:draw()
 	if not g_gui:getIsGuiVisible() then
 		g_vineScanner:draw()
 		g_bunkerSiloManager:draw()
+		g_triggerManager:draw()
 	end
 	g_devHelper:draw()
 	CpDebug:draw()
@@ -323,27 +337,19 @@ end
 function Courseplay.register(typeManager)
 	--- TODO: make this function async. 
 	for typeName, typeEntry in pairs(typeManager.types) do	
-		if CourseplaySpec.prerequisitesPresent(typeEntry.specializations) then
-			typeManager:addSpecialization(typeName, Courseplay.MOD_NAME .. ".courseplaySpec")	
-		end
-		if CpVehicleSettings.prerequisitesPresent(typeEntry.specializations) then
-			typeManager:addSpecialization(typeName, Courseplay.MOD_NAME .. ".cpVehicleSettings")	
-		end
-		if CpCourseGeneratorSettings.prerequisitesPresent(typeEntry.specializations) then
-			typeManager:addSpecialization(typeName, Courseplay.MOD_NAME .. ".cpCourseGeneratorSettings")	
-		end
-		if CpCourseManager.prerequisitesPresent(typeEntry.specializations) then
-			typeManager:addSpecialization(typeName, Courseplay.MOD_NAME .. ".cpCourseManager")	
-		end
 		CpAIWorker.register(typeManager, typeName, typeEntry.specializations)
+		CpVehicleSettings.register(typeManager, typeName, typeEntry.specializations)
+		CpCourseGeneratorSettings.register(typeManager, typeName, typeEntry.specializations)
+		CpCourseManager.register(typeManager, typeName, typeEntry.specializations)
 		CpAIFieldWorker.register(typeManager, typeName, typeEntry.specializations)
 		CpAIBaleFinder.register(typeManager, typeName, typeEntry.specializations)
 		CpAICombineUnloader.register(typeManager, typeName, typeEntry.specializations)
-		CpAIBunkerSiloWorker.register(typeManager, typeName, typeEntry.specializations)
 		CpAISiloLoaderWorker.register(typeManager, typeName, typeEntry.specializations)
+		CpAIBunkerSiloWorker.register(typeManager, typeName, typeEntry.specializations)
 		CpGamePadHud.register(typeManager, typeName,typeEntry.specializations)
 		CpHud.register(typeManager, typeName, typeEntry.specializations)
 		CpInfoTexts.register(typeManager, typeName, typeEntry.specializations)
+		CpShovelPositions.register(typeManager, typeName, typeEntry.specializations)
 	end
 end
 TypeManager.finalizeTypes = Utils.prependedFunction(TypeManager.finalizeTypes, Courseplay.register)

config/HelpMenu.xml

@@ -222,5 +222,21 @@
 				<text text="$l10n_CP_help_page_siloLoaderBasic_text"/>
 			</paragraph>
 		</page>
+		<!--Courseplay Shovel Loader Driver-->
+		<page title="$l10n_CP_help_page_shovelLoader_title">
+			<paragraph>
+				<text text="$l10n_CP_help_page_shovelLoaderGeneral_text"/>
+			</paragraph>
+			<paragraph>
+				<text text="$l10n_CP_help_page_shovelLoaderBasic_text"/>
+			</paragraph>
+			<paragraph>
+				<text text="$l10n_CP_help_page_shovelLoaderTrigger_text"/>
+				<image filename="img/helpmenu/shovelloadertrigger.dds" size="1024 1024" uvs="0px 0px 830px 610px"/>
+			</paragraph>
+			<!--<paragraph>
+				<text text="$l10n_CP_help_page_shovelLoaderTpsExtension_text"/>
+			</paragraph>-->
+			</page>
 	</category>
 </helpLines>

config/MasterTranslations.xml

@@ -79,6 +79,10 @@
 			<Text language="de"><![CDATA[Keinen Haufen gefunden.]]></Text>
 			<Text language="en"><![CDATA[No heap found.]]></Text>
 		</Translation>
+		<Translation name="CP_error_no_unload_trigger_found">
+			<Text language="de"><![CDATA[Keinen Abladepunkt gefunden.]]></Text>
+			<Text language="en"><![CDATA[No unloading point found.]]></Text>
+		</Translation>
 	</Category>
 	<Category name="AI job parameters">	
 		<Translation name="CP_jobParameters_fieldPosition_title">
@@ -298,9 +302,21 @@
 			<Text language="en"><![CDATA[Loading position]]></Text>
 		</Translation>
 		<Translation name="CP_siloLoader_fillLevelProgress">
-			<Text language="de"><![CDATA[Fortschritt: ]]></Text>
-			<Text language="en"><![CDATA[Progress: ]]></Text>
-		</Translation>		
+			<Text language="de"><![CDATA[Liter übrig: ]]></Text>
+			<Text language="en"><![CDATA[Liters left: ]]></Text>
+		</Translation>
+		<Translation name="CP_siloLoaderJobParameters_subTitle_unloading">
+			<Text language="de"><![CDATA[Abladen in:]]></Text>
+			<Text language="en"><![CDATA[Unloading at:]]></Text>
+		</Translation>
+		<Translation name="CP_siloLoaderJobParameters_unloadAt_trailer">
+			<Text language="de"><![CDATA[Anhänger]]></Text>
+			<Text language="en"><![CDATA[Trailer]]></Text>
+		</Translation>
+		<Translation name="CP_siloLoaderJobParameters_unloadAt_unloadTrigger">
+			<Text language="de"><![CDATA[Abladestation]]></Text>
+			<Text language="en"><![CDATA[Unload station]]></Text>
+		</Translation>
 	</Category>
 	<Category name="AI jobs">
 		<Translation name="CP_job_fieldWork">
@@ -597,6 +613,14 @@
 			<Text language="de"><![CDATA[Arbeitsbreite. Wert: 0 - 50]]></Text>
 			<Text language="en"><![CDATA[Work width. Value: 0 - 50]]></Text>
 		</Translation>
+		<Translation name="CP_vehicle_setting_loadingShovelHeightOffset_title">
+			<Text language="de"><![CDATA[Versatz Schaufelhöhe.]]></Text>
+			<Text language="en"><![CDATA[Shovel hight offset.]]></Text>
+		</Translation>
+		<Translation name="CP_vehicle_setting_loadingShovelHeightOffset_tooltip">
+			<Text language="de"><![CDATA[Höhenversatz der Schaufel für die Ladeposition. Wert: -1 - 1]]></Text>
+			<Text language="en"><![CDATA[Offset for the shovel loading position. Value: -1 - 1]]></Text>
+		</Translation>
 	</Category> 
 	<Category name="Vehicle settings speed">
 		<Translation name="CP_vehicle_setting_fieldWorkSpeed_title">
@@ -2474,6 +2498,96 @@ The marker detects heaps or silos and highlights them on the map.
 Now it's possible to start the helper.
 ]]></Text>
 		</Translation>
+		<Translation name="CP_help_page_shovelLoader_title">
+			<Text language="de"><![CDATA[Radlader/Frontlader]]></Text>
+			<Text language="en"><![CDATA[Wheel loader/Front loader]]></Text>
+		</Translation>
+		<Translation name="CP_help_page_shovelLoaderGeneral_text">
+			<Text language="de"><![CDATA[
+Mit einem Radlader oder Traktor mit Frontlader und Schaufel lassen sich Haufen vom Boden oder aus einem Bunker Silo automatisch aufnehmen und in einen Anhänger oder Lager abladen.
+Die Schaufel wird dabei automatisch an die richtigen Positionen gefahren.
+Ist der Modus im HUD nicht direkt zu sehen, schalte die "Startposition" durch bis der Modus erscheint.
+
+Im HUD erscheint dann das gewohnte Ziel Icon um direkt mit dem richtigen Modus auf der Helfer Karte zu landen.
+Es gibt eine Anzeige, die die verbleibenden Füllmenge des Haufens anzeigt.
+Die Arbeitsbreite muss im HUD eventuell angepasst werden, wenn ihr ein Bunker Silo leeren möchtet, um nicht seitlich in die Wand zu fahren.
+
+Der Versatz der Schaufelhöhe dient dazu, die Höhe über dem Boden anzupassen. Diese Höhe sollte relativ genau sein, damit auch alles eingesammelt wird
+oder damit der Radlader nicht an Kanten fest hängt. Wird der Wert verändert, fährt die Schaufel automatisch auf die Position und die eingestellte Höhe.
+Ein Klick auf den Text, setzt den Wert auf 0 zurück. Der Wert lässt sich zwischen +1 bis -1 anpassen.
+
+Schaufeln mit Gebiss öffnen dieses automatisch beim laden und abladen und schließen dieses zum Transport.
+Die Schaufel zum Zerkleinern von Zuckerrüben wird mit allen Funktionen unterstützt.
+]]></Text>
+			<Text language="en"><![CDATA[
+This mode enables wheel loader and tractors with a front loader. 
+With a shovel attached a heap can be picked up from the ground or loading from a bunker silo can be accomplished.
+The picked up fill level can be unloaded automatically into a nearby trailer or a selected unloading station like a BGA.
+The shovel will automatically be moved to the correct positions for loading, unloading and so on.
+In case the mode is not directly visable on the hud, you can toggle the "start position" until the shovel mode appears.
+
+The target icon on the hud can be used to open the AI map to select the loading and the unloading targets.
+The hud also shows the leftover fill level of the heap or silo, while the helper is working.
+If the loading target is a bunker silo, then the work width might need to be adjusted to avoid hitting the side walls of the silo.
+
+The hight offset setting is used to adjust the hight above the ground, as not all shovel can calculated correctly. 
+This should be checked, if the shovel is to low for loading and the driver can't turn anymore or the shovel is to high and fill level is missed to the ground.
+If the value gets changed, the shovel will automatically move to the loading position to show the impact of the offset.
+To reset the offset you need to click on the settings text in the hud. The value can be adjusted from +1 to -1 in 0.1 setps.
+
+Shovels with a silage grab will open and close automatically for loading and unloading.
+The shovel to shred sugar beets is completly functional as well.
+]]></Text>
+		</Translation>
+		<Translation name="CP_help_page_shovelLoaderBasic_text">
+			<Text language="de"><![CDATA[
+Um einen Radlader Fahrer zu starten, müssen zunächst über das Ziel Icon im HUD die Lade- und Entladepositionen gewählt werden.
+Die Ladeposition wird wie auch bereits beim Lader gewählt. Ein blauer Ramen entsteht um den gefunden Haufen.
+
+Die Abladeposition hängt davon ab, ob du in einen Anhänger oder in eine Abladestation entladen möchtest.
+Abladen in einen Anhänger funktioniert automatisch und braucht keine zusätzliche Position. 
+Es wird der naheste, stehende Anhänger gewählt und seitlich angefahren.
+
+Möchtest du in eine Abladestation entladen, muss zunächst das Ziel umgestellt werden und anschließend der Marker auf den Trigger gesetzt werden.
+]]></Text>
+			<Text language="en"><![CDATA[
+To start a wheel loader helper, you need to set the load and unload positions by clicking the target icon on the hud.
+The loading position works the same like the one from the loader mode. A blue square will be created arround the heap.
+
+The unloading position depends if you want to unload into a trailer or into an unloading station.
+Unloading into a trailer works automatically and doesn't need a dedicated unload position. The driver will check for the nearest standing trailer and unloads to it from the side.
+
+If you want to unload into an unloading station, you need to switch the target and then mark the trigger with the unloading position.
+]]></Text>
+		</Translation>
+		<Translation name="CP_help_page_shovelLoaderTrigger_text">
+			<Text language="de"><![CDATA[
+Die Auswahl eines Triggers wirkt zunächst kompliziert, ist aber im Prinzip recht einfach.
+Da Gebäude mehrere Trigger haben können, muss dieser selber gewählt werden.
+Die verfügbaren Trigger werden als orangene Kreuze da gestellt.
+Um einen Trigger zu wählen, setzt du den Punkt in der Mitte des runden Icons einfach mittig auf das Kreuz.
+Die Richtung des Pfeils entspricht hierbei die Anfahrtsrichtung vom Helfer.
+Das Kreuz sollte jetzt, wie im Bild da gestellt, gelb sein.
+]]></Text>
+			<Text language="en"><![CDATA[
+Selecting a trigger does look a bit complicated at first, but in reality it is really easy.
+Every building can have more then one trigger so you have to choose the one you want to unload to.
+All available triggers will be shown with an orange cross on the AI Map.
+To select one place the middle of the round marker on the middle of the cross.
+The driection of the arrow tells the helper from which direction he will approach the trigger for unloading.
+Now your selection should look similar to the image.
+]]></Text>
+		</Translation>
+	<!--
+	<Translation name="CP_help_page_shovelLoaderTpsExtension_text">
+		<Text language="de"><![CDATA[
+TPS extension
+]]></Text>
+		<Text language="en"><![CDATA[
+TPS extension
+]]></Text>
+	</Translation>
+	-->
 
 	</Category>
 	<Category name="Input bindings">	

config/VehicleConfigurations.xml

@@ -97,6 +97,13 @@ You can define the following custom settings:
 	Overrides the automatic selection of a moving tool for example for the shield controller of a snowcat.
 	Used to control the target tilt.
 
+- loadingShovelOffset: number -1 : 1
+	Offset to the loading and transport shovel position in meter for the height of the shovel.
+
+- shovelMovingToolIx: number
+	If the shovel is a high dump shovel then the moving tool index of the correct one is needed.
+	Usually this index is 1 for the first moving tool.
+
 - modName: Name of the .zip file (without '.zip')
     In case a Mod has the same .xml filename for the vehicle/implement, as a default giants vehicle/implement,
     add the name of the .zip file to prevent conflicts. For example: "FS22_exampleMod".
@@ -106,8 +113,46 @@ You can define the following custom settings:
     Ignore bales detected by the forward-looking proximity controller if any implement has this set to true.
     This can be set for bale pushers to prevent the Courseplay driver stopping when a bale is blocking the way.
 
+- fixWheelLoaderDirectionNodeByMovingToolIx
+	Fixes the ai direction node for the platinum wheel loaders, as their direction is not changed based on the rotation.
+	As a fix the parent node of the arm moving tool ix is used.
+
+- articulatedAxisReverseNodeInverted: boolean
+	Is the reverse node for articulated axis vehicles rotated by 180 degree?
+
+- unloadXOffset: number
+	Offset of the discharge node or a given pipe for unloading into a trailer.
+	For pipes this overwrites the measured pipe offset.
+
+- disablePipeMovingToolCorrection: boolean
+	Disables the pipe height adjustment for trailers of a few pipe implements/vehicles.
+
 -->
 <VehicleConfigurations>
+	<Configurations>
+		<Configuration type="FLOAT">toolOffsetX</Configuration>
+		<Configuration type="BOOL">noReverse</Configuration>
+		<Configuration type="FLOAT">turnRadius</Configuration>
+		<Configuration type="FLOAT">workingWidth</Configuration>
+		<Configuration type="FLOAT">balerUnloadDistance</Configuration>
+		<Configuration type="FLOAT">directionNodeOffsetZ</Configuration>
+		<Configuration type="BOOL">implementWheelAlwaysOnGround</Configuration>
+		<Configuration type="BOOL">ignoreCollisionBoxesWhenFolded</Configuration>
+		<Configuration type="FLOAT">baleCollectorOffset</Configuration>
+		<Configuration type="BOOL">disableUnfolding</Configuration>
+		<Configuration type="BOOL">raiseLate</Configuration>
+		<Configuration type="BOOL">lowerEarly</Configuration>
+		<Configuration type="BOOL">useVehicleSizeForMarkers</Configuration>
+		<Configuration type="INT">armMovingToolIx</Configuration>
+		<Configuration type="INT">movingToolIx</Configuration>
+		<Configuration type="INT">shovelMovingToolIx</Configuration>
+		<Configuration type="FLOAT">loadingShovelOffset</Configuration>
+		<Configuration type="BOOL">ignoreBaleCollisionForward</Configuration>
+		<Configuration type="INT">fixWheelLoaderDirectionNodeByMovingToolIx</Configuration>
+		<Configuration type="BOOL">articulatedAxisReverseNodeInverted</Configuration>
+		<Configuration type="BOOL">disablePipeMovingToolCorrection</Configuration>
+		<Configuration type="FLOAT">unloadOffsetX</Configuration>
+	</Configurations>
     <!--[GIANTS]-->
 
     <!-- Harvesters -->
@@ -314,6 +359,13 @@ You can define the following custom settings:
 			 ignoreCollisionBoxesWhenFolded = "true"
 	/>
 
+	<Vehicle name="torion1914.xml"
+             turnRadius = "12"
+    />
+	<Vehicle name="wheelLoaderShovel.xml"
+             shovelMovingToolIx = "1"
+    />
+
     <!--[DLC]-->
 
     <!--Harvester-->
@@ -327,6 +379,22 @@ You can define the following custom settings:
     <Vehicle name="lowloader4A.xml"
              disableUnfolding = "true"
     />
+	<Vehicle name="l180HHighTipShovel.xml"
+             shovelMovingToolIx = "1"
+    />
+	<Vehicle name="l180H.xml"
+		fixWheelLoaderDirectionNodeByMovingToolIx = "1"
+		articulatedAxisReverseNodeInverted = "true"
+        turnRadius = "12"
+	/>
+    <Vehicle name="l120HHighTipShovel.xml"
+             shovelMovingToolIx = "1"
+    />
+	<Vehicle name="l120H.xml"
+		fixWheelLoaderDirectionNodeByMovingToolIx = "1"
+		articulatedAxisReverseNodeInverted = "true"
+        turnRadius = "10"
+	/>
 
     <!--Vermeer-->
     <Vehicle name="tm1410.xml"
@@ -471,4 +539,14 @@ You can define the following custom settings:
              workingWidth = "9.7m"
     />
 
+    <!--Mod: FS22_newHollandW190D-->
+    <Vehicle name="w190D.xml"
+             turnRadius = "10"
+    />
+
+	<!--Mod: FS22_strawHarvest-->
+    <Vehicle name="premos5000.xml"
+			 disablePipeMovingToolCorrection = "true"
+			 unloadOffsetX = "-3.56"
+    />
 </VehicleConfigurations>

config/VehicleSettingsSetup.xml

@@ -76,6 +76,9 @@
 
 	<SettingSubTitle title="bunkerSilo" isVisible="areBunkerSiloSettingsVisible">
 		<Setting classType="AIParameterSettingList" name="bunkerSiloWorkWidth" min="3" max="50" incremental="0.1" unit="2" setDefault="setAutomaticBunkerSiloWorkWidth" onChangeCallback="cpShowWorkWidth"/>
+		<Setting classType="AIParameterSettingList" name="loadingShovelHeightOffset" min="-1" max="1" incremental="0.1" default="0" unit="2" 
+				isVisible="isLoadingShovelOffsetSettingVisible" isDisabled="isLoadingShovelOffsetSettingDisabled" 
+				onChangeCallback="onCpLoadingShovelOffsetSettingChanged" vehicleConfiguration="loadingShovelOffset"/>
 	</SettingSubTitle>
 
 	<SettingSubTitle title="combine" isVisible="areCombineSettingsVisible">

config/gamePadHud/SiloLoaderGamePadHudPage.xml

@@ -5,5 +5,7 @@
 -->
 
 <Settings title="CP_vehicle_setting_display">
+	<Setting type="jobParameters" name = "startAt" />
 	<Setting type="vehicleSettings" name="bunkerSiloWorkWidth"/>
+	<Setting type="vehicleSettings" name="loadingShovelHeightOffset"/>
 </Settings>

config/jobParameters/CombineUnloaderJobParameterSetup.xml

@@ -27,7 +27,7 @@
 	<SettingSubTitle title="giantsUnloader">
 		<!-- Is the giants ai unloader wanted for unloading? -->
 		<Setting classType="AIParameterBooleanSetting" name="useGiantsUnload" defaultBool="false" isDisabled ="isGiantsUnloadDisabled"/>
-		<Setting classType="CpAIParameterUnloadingStation" name="unloadingStation" isDisabled ="isUnloadStationSelectorDisabled" generateValuesFunction="generateUnloadingStations"/>
+		<Setting classType="CpAIParameterUnloadingStation" name="unloadingStation" isVisible ="isUnloadStationSelectorVisible" generateValuesFunction="generateUnloadingStations"/>
 	</SettingSubTitle>
 	<SettingSubTitle title="fieldUnload">
 		<!-- Is unloading onto the field allowed? -->