6.01.00169: bugfix HUD

#3552 #3555
Courseplay · Apr 9, 2019 · b40b117 · b40b117
1 parent 3433bad
commit b40b117
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/hud.lua b/hud.lua
@@ -732,13 +732,9 @@ function courseplay.hud:updatePageContent(vehicle, page)
 					vehicle.cp.hud.content.pages[page][line][2].text = vehicle.cp.automaticCoverHandling and courseplay:loc('COURSEPLAY_AUTOMATIC') or courseplay:loc('COURSEPLAY_DEACTIVATED');
 
 				elseif entry.functionToCall == 'changeSiloFillType' then
-					if vehicle.cp.canDrive then
-						self:enableButtonWithFunction(vehicle,page, 'changeSiloFillType')
-						vehicle.cp.hud.content.pages[page][line][1].text = courseplay:loc('COURSEPLAY_FARM_SILO_FILL_TYPE');
-						vehicle.cp.hud.content.pages[page][line][2].text = g_fillTypeManager:getFillTypeByIndex(vehicle.cp.siloSelectedFillType).title
-					else
-						self:disableButtonWithFunction(vehicle,page, 'changeSiloFillType')
-					end
+					vehicle.cp.hud.content.pages[page][line][1].text = courseplay:loc('COURSEPLAY_FARM_SILO_FILL_TYPE');
+					vehicle.cp.hud.content.pages[page][line][2].text = g_fillTypeManager:getFillTypeByIndex(vehicle.cp.siloSelectedFillType).title
+
 				elseif entry.functionToCall == 'changeRunNumber' then
 					if vehicle.cp.canDrive then
 						self:enableButtonWithFunction(vehicle,page, 'changeRunNumber')
@@ -934,13 +930,15 @@ function courseplay.hud:updatePageContent(vehicle, page)
 
 
 				elseif entry.functionToCall == 'addCustomSingleFieldEdgeToList' then
-
 					if vehicle.cp.fieldEdge.customField.isCreated and vehicle.cp.fieldEdge.customField.fieldNum > 0 then
+						self:enableButtonWithFunction(vehicle,page, 'addCustomSingleFieldEdgeToList')
 						if vehicle.cp.fieldEdge.customField.selectedFieldNumExists then
 							vehicle.cp.hud.content.pages[page][line][1].text = string.format(courseplay:loc('COURSEPLAY_OVERWRITE_CUSTOM_FIELD_EDGE_PATH_IN_LIST'), vehicle.cp.fieldEdge.customField.fieldNum);
 						else
 							vehicle.cp.hud.content.pages[page][line][1].text = string.format(courseplay:loc('COURSEPLAY_ADD_CUSTOM_FIELD_EDGE_PATH_TO_LIST'), vehicle.cp.fieldEdge.customField.fieldNum);
 						end;
+					else
+						self:disableButtonWithFunction(vehicle,page, 'addCustomSingleFieldEdgeToList')
 					end
 				elseif entry.functionToCall == 'toggleSymmetricLaneChange' then
 					--Symmetrical lane change
@@ -1005,7 +1003,7 @@ function courseplay.hud:updatePageContent(vehicle, page)
 					vehicle.cp.hud.content.pages[page][line][2].text = vehicle.cp.driveOnAtFillLevel ~= nil and ('%d%%'):format(vehicle.cp.driveOnAtFillLevel) or '---';
 
 				elseif entry.functionToCall == 'setDriveNow' then
-					if not vehicle.cp.isLoaded then
+					if not vehicle.cp.isLoaded and not vehicle.cp.isRecording and not vehicle.cp.recordingIsPaused then
 						vehicle.cp.hud.content.pages[page][line][1].text = courseplay:loc('COURSEPLAY_DRIVE_NOW')
 					end
 
@@ -1122,14 +1120,14 @@ function courseplay.hud:updatePageContent(vehicle, page)
 					vehicle.cp.hud.content.pages[page][line][2].text = vehicle.cp.driveOnAtFillLevel ~= nil and ('%d%%'):format(vehicle.cp.driveOnAtFillLevel) or '---';
 
 
-				elseif entry.functionToCall == 'toggleSearchCombineMode' then
+				elseif entry.functionToCall == 'toggleSearchCombineMode' then    --automatic or manual
 					vehicle.cp.hud.content.pages[page][line][1].text = courseplay:loc('COURSEPLAY_COMBINE_SEARCH_MODE'); --always
 					vehicle.cp.hud.content.pages[page][line][2].text = vehicle.cp.searchCombineAutomatically and courseplay:loc('COURSEPLAY_AUTOMATIC_SEARCH') or courseplay:loc('COURSEPLAY_MANUAL_SEARCH');
 
-				elseif entry.functionToCall == 'showSavedCombine' then
+				elseif entry.functionToCall == 'selectAssignedCombine' then -- if manual toggle through combines to select one
 					--Line 2: select combine manually
-					self:disableButtonWithFunction(vehicle,page, 'showSavedCombine')
 					if not vehicle.cp.searchCombineAutomatically then
+						self:enableButtonWithFunction(vehicle,page, 'selectAssignedCombine')
 						vehicle.cp.hud.content.pages[page][line][1].text = courseplay:loc('COURSEPLAY_CHOOSE_COMBINE'); --only if manual
 						if vehicle.cp.savedCombine ~= nil then
 							local name = vehicle.cp.savedCombine:getName()
@@ -1142,12 +1140,17 @@ function courseplay.hud:updatePageContent(vehicle, page)
 						else
 							vehicle.cp.hud.content.pages[page][line][2].text = courseplay:loc('COURSEPLAY_NONE');
 						end;
+					else
+						self:disableButtonWithFunction(vehicle,page, 'selectAssignedCombine')					
 					end;
 
-				elseif entry.functionToCall == 'setSearchCombineOnField' then
+				elseif entry.functionToCall == 'setSearchCombineOnField' then 
 					--Line 3: choose field for automatic search --only if automatic
 					if vehicle.cp.searchCombineAutomatically and courseplay.fields.numAvailableFields > 0 then
+						self:enableButtonWithFunction(vehicle,page, 'setSearchCombineOnField')
 						vehicle.cp.hud.content.pages[page][line][1].text = courseplay:loc('COURSEPLAY_SEARCH_COMBINE_ON_FIELD'):format(vehicle.cp.searchCombineOnField > 0 and tostring(vehicle.cp.searchCombineOnField) or '---');
+					else
+						self:disableButtonWithFunction(vehicle,page, 'setSearchCombineOnField')
 					end;
 
 				elseif entry.functionToCall == 'showCombineName' then
@@ -2276,9 +2279,12 @@ end
 function courseplay.hud:setGrainTransportAIDriverContent(vehicle)
 	self:debug(vehicle,"setGrainTransportAIDriverContent")
 	--page 1 driving
-	self:addSettingsRow(vehicle,'changeSiloFillType', 1, 5, 1 )
 	self:addSettingsRow(vehicle,'changeRunNumber', 1, 6, 1 )
 
+	--page 1 driving
+	self:enablePageButton(vehicle, 3)
+	self:addSettingsRow(vehicle,'changeSiloFillType', 3, 1, 1 )
+
 	--page 7 
 	self:addSettingsRow(vehicle,'changeLoadUnloadOffsetX', 7, 5, 1 )
 	self:addSettingsRow(vehicle,'changeLoadUnloadOffsetZ', 7, 6, 1 )
@@ -2367,7 +2373,7 @@ function courseplay.hud:setCombineUnloadAIDriverContent(vehicle)
 	self:enablePageButton(vehicle, 4)
 
 	self:addRowButton(vehicle,'toggleSearchCombineMode', 4, 1, 1 )
-	self:addRowButton(vehicle,'showSavedCombine', 4, 2, 1 )
+	self:addSettingsRowWithArrows(vehicle,'selectAssignedCombine', 4, 2, 1 )
 	self:addSettingsRowWithArrows(vehicle,'setSearchCombineOnField', 4, 3, 1 )
 	self:addRowButton(vehicle,'showCombineName', 4, 4, 1 )
 	self:addRowButton(vehicle,'removeActiveCombineFromTractor', 4, 5, 1 )
@@ -2397,8 +2403,10 @@ end
 
 function courseplay.hud:setFillableFieldworkAIDriverContent(vehicle)
 	self:debug(vehicle,"setFillableFieldworkAIDriverContent")
+
+
 	self:addSettingsRow(vehicle,'changeRefillUntilPct', 3, 5, 1 )
-
+	self:addSettingsRow(vehicle,'changeSiloFillType', 3, 6, 1 )
 
 	self:setReloadPageOrder(vehicle, -1, true)
 end

diff --git a/modDesc.xml b/modDesc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <modDesc descVersion="40">
-	<version>6.01.00168</version>
+	<version>6.01.00169</version>
 	<author><![CDATA[Courseplay.devTeam]]></author>
 	<title>
 		<br>CoursePlay SIX</br>