Merge pull request #2404 from Courseplay/BalerSilageAdditive

Added silage additives for balers
Courseplay · Mar 23, 2023 · c045d5e · c045d5e
2 parents 0a5792f + 7533d1a
commit c045d5e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/config/VehicleSettingsSetup.xml b/config/VehicleSettingsSetup.xml
@@ -63,9 +63,9 @@
 				 isDisabled = "isToolOffsetDisabled" vehicleConfiguration="toolOffsetX"/>
 		<!--Tool Offset Z-->
 		<Setting classType="AIParameterSettingList" name="toolOffsetZ" min="-10" max="10" incremental="0.1" default="0" unit="2"
-				 onChangeCallback="cpShowWorkWidth" isDisabled = "isToolOffsetDisabled" />
+				 onChangeCallback="cpShowWorkWidth" isDisabled = "isToolOffsetDisabled" isVisible="areCombineUnloaderSettingsVisible" />
 		<!-- Full threshold -->
-		<Setting classType="AIParameterSettingList" name="fullThreshold" min="40" max="100" incremental="5" default="85" unit="4"/>
+		<Setting classType="AIParameterSettingList" name="fullThreshold" min="40" max="100" incremental="5" default="85" unit="4" isVisible="areCombineUnloaderSettingsVisible"/>
 		<!--Silage additives needed?-->
 		<Setting classType="AIParameterBooleanSetting" name="useAdditiveFillUnit" defaultBool="false" isVisible="isAdditiveFillUnitSettingVisible" isExpertModeOnly="true"/>
 	</SettingSubTitle>

diff --git a/scripts/ai/controllers/BalerController.lua b/scripts/ai/controllers/BalerController.lua
@@ -35,6 +35,18 @@ function BalerController:getDriveData()
     return nil, nil, nil, maxSpeed
 end
 
+function BalerController:update()
+	if self.settings.useAdditiveFillUnit:getValue() then 
+		--- If the silage additive is empty, then stop the driver.
+        if self.balerSpec.additives.available then 
+            if self.implement:getFillUnitFillLevelPercentage(self.balerSpec.additives.fillUnitIndex) <= 0 then 
+                self:debug("Stopped Cp, as the additive fill unit is empty.")
+                self.vehicle:stopCurrentAIJob(AIMessageErrorOutOfFill.new())
+            end
+        end
+    end
+end
+
 function BalerController:handleBaler()
     if self.driveStrategy:isTurning() then
         --- Waits for the bale wrapping and unload at the start of a turn.

diff --git a/scripts/specializations/CpVehicleSettings.lua b/scripts/specializations/CpVehicleSettings.lua
@@ -341,13 +341,17 @@ end
 function CpVehicleSettings:isAdditiveFillUnitSettingVisible()
     local combines, _ = AIUtil.getAllChildVehiclesWithSpecialization(self, Combine)
     local forageWagons, _ = AIUtil.getAllChildVehiclesWithSpecialization(self, ForageWagon)
+    local balers, _ = AIUtil.getAllChildVehiclesWithSpecialization(self, Baler)
     local hasAdditiveTank
     if #combines > 0 then 
         hasAdditiveTank = combines[1].spec_combine.additives.available
     end
     if #forageWagons > 0 then 
         hasAdditiveTank = hasAdditiveTank or forageWagons[1].spec_forageWagon.additives.available
     end
+    if #balers > 0 then 
+        hasAdditiveTank = hasAdditiveTank or balers[1].spec_baler.additives.available
+    end
     return hasAdditiveTank
 end
 
@@ -359,6 +363,10 @@ function CpVehicleSettings:areBunkerSiloSettingsVisible()
     return self:getCanStartCpBunkerSiloWorker()
 end
 
+function CpVehicleSettings:areCombineUnloaderSettingsVisible()
+    return self:getCanStartCpCombineUnloader()
+end
+
 function CpVehicleSettings:setAutomaticBunkerSiloWorkWidth(ignoreObject)
     local spec = self.spec_cpVehicleSettings
     local width = WorkWidthUtil.getAutomaticWorkWidthAndOffset(self, nil, ignoreObject)