Merge pull request #3149 from Courseplay/Code-Improvements

WIP diff code improvements

config/MasterTranslations.xml

@@ -89,91 +89,91 @@
 		</Translation>
 	</Category>
 	<Category name="AI job parameters">	
-		<Translation name="CP_jobParameters_fieldPosition_title">
+		<Translation name="CP_fieldWorkJobParameters_fieldPosition_title">
 			<Text language="de"><![CDATA[Feldposition:]]></Text>
 			<Text language="en"><![CDATA[Field position:]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_bunkerSiloPosition_title">
+		<Translation name="CP_fieldWorkJobParameters_bunkerSiloPosition_title">
 			<Text language="de"><![CDATA[Siloposition:]]></Text>
 			<Text language="en"><![CDATA[Silo position:]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_parkPosition_title">
+		<Translation name="CP_fieldWorkJobParameters_parkPosition_title">
 			<Text language="de"><![CDATA[Parkposition:]]></Text>
 			<Text language="en"><![CDATA[Park position:]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_subTitle_startAt">
+		<Translation name="CP_fieldWorkJobParameters_subTitle_startAt">
 			<Text language="de"><![CDATA[Start am:]]></Text>
 			<Text language="en"><![CDATA[Start at:]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_startAt_title">
+		<Translation name="CP_fieldWorkJobParameters_startAt_title">
 			<Text language="de"><![CDATA[Start am:]]></Text>
 			<Text language="en"><![CDATA[Start at:]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_startAt_tooltip">
+		<Translation name="CP_fieldWorkJobParameters_startAt_tooltip">
 			<Text language="de"><![CDATA[Wo die Arbeit gestartet wird.]]></Text>
 			<Text language="en"><![CDATA[Where to start field work.]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_startAt_nearest">
+		<Translation name="CP_fieldWorkJobParameters_startAt_nearest">
 			<Text language="de"><![CDATA[Nahester Wegpunkt]]></Text>
 			<Text language="en"><![CDATA[nearest waypoint]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_startAt_first">
+		<Translation name="CP_fieldWorkJobParameters_startAt_first">
 			<Text language="de"><![CDATA[Erster Wegpunkt]]></Text>
 			<Text language="en"><![CDATA[first waypoint]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_startAt_last">
+		<Translation name="CP_fieldWorkJobParameters_startAt_last">
 			<Text language="de"><![CDATA[Letzter Wegpunkt]]></Text>
 			<Text language="en"><![CDATA[last waypoint]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_startAt_bunkerSilo">
+		<Translation name="CP_fieldWorkJobParameters_startAt_bunkerSilo">
 			<Text language="de"><![CDATA[Bunkersilo-Modus]]></Text>
 			<Text language="en"><![CDATA[Bunker silo mode]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_startAt_siloLoader">
+		<Translation name="CP_fieldWorkJobParameters_startAt_siloLoader">
 			<Text language="de"><![CDATA[Silo laden]]></Text>
 			<Text language="en"><![CDATA[Silo load mode]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_startAt_unload">
+		<Translation name="CP_fieldWorkJobParameters_startAt_unload">
 			<Text language="de"><![CDATA[Drescher entladen]]></Text>
 			<Text language="en"><![CDATA[unload combine]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_startAt_unload_siloLoader">
+		<Translation name="CP_fieldWorkJobParameters_startAt_unload_siloLoader">
 			<Text language="de"><![CDATA[Silolader entladen]]></Text>
 			<Text language="en"><![CDATA[Unload Silo loader]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_startAt_bales">
+		<Translation name="CP_fieldWorkJobParameters_startAt_bales">
 			<Text language="de"><![CDATA[Ballen sammeln/wickeln]]></Text>
 			<Text language="en"><![CDATA[collecting/wrapping bales]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_subTitle_laneOffset">
+		<Translation name="CP_fieldWorkJobParameters_subTitle_laneOffset">
 			<Text language="de"><![CDATA[Bahn:]]></Text>
 			<Text language="en"><![CDATA[Lane offset:]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_laneOffset_title">
+		<Translation name="CP_fieldWorkJobParameters_laneOffset_title">
 			<Text language="de"><![CDATA[Bahn:]]></Text>
 			<Text language="en"><![CDATA[Lane offset:]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_laneOffset_tooltip">
+		<Translation name="CP_fieldWorkJobParameters_laneOffset_tooltip">
 			<Text language="de"><![CDATA[Bahnauswahl, wenn ein Multitoolkurs erstellt wurde.]]></Text>
 			<Text language="en"><![CDATA[Lane offset]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_laneOffset_center">
+		<Translation name="CP_fieldWorkJobParameters_laneOffset_center">
 			<Text language="de"><![CDATA[Mitte]]></Text>
 			<Text language="en"><![CDATA[center]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_laneOffset_left">
+		<Translation name="CP_fieldWorkJobParameters_laneOffset_left">
 			<Text language="de"><![CDATA[Links(1)]]></Text>
 			<Text language="en"><![CDATA[left(1)]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_laneOffset_right">
+		<Translation name="CP_fieldWorkJobParameters_laneOffset_right">
 			<Text language="de"><![CDATA[Rechts(1)]]></Text>
 			<Text language="en"><![CDATA[right(1)]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_laneOffset_left_2">
+		<Translation name="CP_fieldWorkJobParameters_laneOffset_left_2">
 			<Text language="de"><![CDATA[Links(2)]]></Text>
 			<Text language="en"><![CDATA[left(2)]]></Text>
 		</Translation>
-		<Translation name="CP_jobParameters_laneOffset_right_2">
+		<Translation name="CP_fieldWorkJobParameters_laneOffset_right_2">
 			<Text language="de"><![CDATA[Rechts(2)]]></Text>
 			<Text language="en"><![CDATA[right(2)]]></Text>
 		</Translation>

config/gamePadHud/BaleLoaderGamePadHudPage.xml

@@ -6,7 +6,7 @@
 
 <Settings title="CP_vehicle_setting_display">
 	<Setting type="vehicleSettings" name = "showCourse" />
-	<Setting type="jobParameters" name = "startAt" />
+	<Setting type="fieldWorkJobParameters" name = "startAt" />
 	<Setting type="baleFinderJobParameters" name = "baleWrapType" />
 	<Setting type="vehicleSettings" name = "baleCollectorOffset" />
 </Settings>

config/gamePadHud/BunkerSiloGamePadHudPage.xml

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

config/gamePadHud/FieldworkGamePadHudPage.xml

@@ -5,9 +5,9 @@
 -->
 
 <Settings title="CP_vehicle_setting_display">
-	<Setting type="jobParameters" name = "startAt" />
+	<Setting type="fieldWorkJobParameters" name = "startAt" />
 	<Setting type="vehicleSettings" name = "showCourse" />
-	<Setting type="jobParameters" name = "laneOffset" />
+	<Setting type="fieldWorkJobParameters" name = "laneOffset" />
 	<Setting type="courseGeneratorSettings" name = "workWidth" />
 	<Setting type="vehicleSettings" name = "toolOffsetX" />
 </Settings>

config/gamePadHud/SiloLoaderGamePadHudPage.xml

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

config/jobParameters/BaleFinderJobParameterSetup.xml

@@ -9,11 +9,11 @@
 	<SettingSubTitle title="ai_parameterGroupTitlePosition" prefix="false">
 		<Setting classType="CpAIParameterPositionAngle" name="startPosition" positionParameterType="DRIVE_TO"/>
 	</SettingSubTitle>
-	<SettingSubTitle title="CP_jobParameters_fieldPosition_title" prefix="false">
+	<SettingSubTitle title="CP_fieldWorkJobParameters_fieldPosition_title" prefix="false">
 		<Setting classType="CpAIParameterPosition" name="fieldPosition" positionParameterType="FIELD_OR_SILO"/>
 	</SettingSubTitle>
 	<SettingSubTitle title="baleWrapType">
-		<Setting classType="AIParameterSettingList" name="baleWrapType" isVisible="isBaleWrapSettingVisible" onChangeCallback="onCpWrapTypeSettingChanged">
+		<Setting classType="AIParameterSettingList" name="baleWrapType" isVisible="hasBaleLoader" onChangeCallback="onCpWrapTypeSettingChanged">
 			<Values>
 				<Value name="ALL_BALES">1</Value>
 				<Value name="ONLY_WRAPPED_BALES">2</Value>

config/jobParameters/BunkerSiloJobParameterSetup.xml

@@ -9,7 +9,7 @@
 	<SettingSubTitle title="ai_parameterGroupTitlePosition" prefix="false">
 		<Setting classType="CpAIParameterPositionAngle" name="startPosition" positionParameterType="DRIVE_TO"/>
 	</SettingSubTitle>
-	<SettingSubTitle title="CP_jobParameters_bunkerSiloPosition_title" prefix="false">
+	<SettingSubTitle title="CP_fieldWorkJobParameters_fieldPosition_title" prefix="false">
 		<Setting classType="CpAIParameterPosition" name="siloPosition" positionParameterType="FIELD_OR_SILO"/>
 	</SettingSubTitle>
 	<SettingSubTitle title="drivingForwardsIntoSilo">

config/jobParameters/CombineUnloaderJobParameterSetup.xml

@@ -9,7 +9,7 @@
 	<SettingSubTitle title="ai_parameterGroupTitlePosition" prefix="false">
 		<Setting classType="CpAIParameterPositionAngle" name="startPosition" positionParameterType="DRIVE_TO"/>
 	</SettingSubTitle>
-	<SettingSubTitle title="CP_jobParameters_fieldPosition_title" prefix="false">
+	<SettingSubTitle title="CP_fieldWorkJobParameters_fieldPosition_title" prefix="false">
 		<Setting classType="CpAIParameterPosition" name="fieldPosition" positionParameterType="FIELD_OR_SILO"/>
 	</SettingSubTitle>
 	<SettingSubTitle title="unloadTarget">

config/jobParameters/JobParameterSetup.xml → config/jobParameters/FieldWorkJobParameterSetup.xml

@@ -5,11 +5,11 @@
 	For documentation look up the CpSettingUtil.lua.
 -->
 
-<Settings prefixText="CP_jobParameters_">
+<Settings prefixText="CP_fieldWorkJobParameters_">
 	<SettingSubTitle title="ai_parameterGroupTitlePosition" prefix="false">
 		<Setting classType="CpAIParameterPositionAngle" name="startPosition" positionParameterType="DRIVE_TO"/>
 	</SettingSubTitle>
-	<SettingSubTitle title="CP_jobParameters_fieldPosition_title" prefix="false">
+	<SettingSubTitle title="CP_fieldWorkJobParameters_fieldPosition_title" prefix="false">
 		<Setting classType="CpAIParameterPosition" name="fieldPosition" positionParameterType="FIELD_OR_SILO"/>
 	</SettingSubTitle>
 	<SettingSubTitle title="startAt">

scripts/ai/AIDriveStrategyCourse.lua

@@ -187,11 +187,11 @@ function AIDriveStrategyCourse:getGeneratedCourse(jobParameters)
 end
 
 function AIDriveStrategyCourse:getStartingPointWaypointIx(course, startAt)
-    if startAt == CpJobParameters.START_AT_NEAREST_POINT then
+    if startAt == CpFieldWorkJobParameters.START_AT_NEAREST_POINT then
         local _, _, ixClosestRightDirection, _ = course:getNearestWaypoints(self.vehicle:getAIDirectionNode())
         self:debug('Starting course at the closest waypoint in the right direction %d', ixClosestRightDirection)
         return ixClosestRightDirection
-    elseif startAt == CpJobParameters.START_AT_LAST_POINT then
+    elseif startAt == CpFieldWorkJobParameters.START_AT_LAST_POINT then
         local lastWpIx = self.vehicle:getCpLastRememberedWaypointIx()
         if lastWpIx then
             self:debug('Starting course at the last waypoint %d', lastWpIx)

scripts/ai/jobs/CpAIJob.lua

@@ -23,12 +23,7 @@ CpAIJob = {
 local AIJobCp_mt = Class(CpAIJob, AIJob)
 
 function CpAIJob.new(isServer, customMt)
-	local mt = customMt or AIJobCp_mt
-	mt.__tostring = function(_self)
-		CpUtil.info("Job: %s", g_currentMission.aiJobTypeManager:getJobTypeByIndex(_self.jobTypeIndex).name)
-		return string.format("%d Job parameters", tostring(_self.cpJobParameters))
-	end
-	local self = AIJob.new(isServer, mt)
+	local self = AIJob.new(isServer, customMt or AIJobCp_mt)
 	self.isDirectStart = false
 	self.debugChannel = CpDebug.DBG_FIELDWORK
 
@@ -274,6 +269,10 @@ function CpAIJob.getIsStartErrorText(state)
 	return g_i18n:getText("ai_startStateSuccess")
 end
 
+function CpAIJob:draw(map, isOverviewMap)
+
+end
+
 
 function CpAIJob:writeStream(streamId, connection)
 	streamWriteBool(streamId, self.isDirectStart)
@@ -469,41 +468,14 @@ AIJobTypeManager.getJobTypeIndex = Utils.overwrittenFunction(AIJobTypeManager.ge
 
 --- Registers additional jobs.
 function CpAIJob.registerJob(AIJobTypeManager)
-	AIJobTypeManager:registerJobType(CpAIJobBaleFinder.name, CpAIJobBaleFinder.jobName, CpAIJobBaleFinder)
-	AIJobTypeManager:registerJobType(CpAIJobFieldWork.name, CpAIJobFieldWork.jobName, CpAIJobFieldWork)
-	AIJobTypeManager:registerJobType(CpAIJobCombineUnloader.name, CpAIJobCombineUnloader.jobName, CpAIJobCombineUnloader)
-	AIJobTypeManager:registerJobType(CpAIJobSiloLoader.name, CpAIJobSiloLoader.jobName, CpAIJobSiloLoader)
-	AIJobTypeManager:registerJobType(CpAIJobBunkerSilo.name, CpAIJobBunkerSilo.jobName, CpAIJobBunkerSilo)
-end
-
-
---- for reload, messing with the internals of the job type manager so it uses the reloaded job
-if g_currentMission then
-	local myJobTypeIndex = g_currentMission.aiJobTypeManager:getJobTypeIndexByName(AIJob.name)
-	if myJobTypeIndex then
-		local myJobType = g_currentMission.aiJobTypeManager:getJobTypeByIndex(myJobTypeIndex)
-		myJobType.classObject = AIJob
-	end
-	local myJobTypeIndex = g_currentMission.aiJobTypeManager:getJobTypeIndexByName(CpAIJobFieldWork.name)
-	if myJobTypeIndex then
-		local myJobType = g_currentMission.aiJobTypeManager:getJobTypeByIndex(myJobTypeIndex)
-		myJobType.classObject = CpAIJobFieldWork
-	end
-	local myJobTypeIndex = g_currentMission.aiJobTypeManager:getJobTypeIndexByName(CpAIJobBaleFinder.name)
-	if myJobTypeIndex then
-		local myJobType = g_currentMission.aiJobTypeManager:getJobTypeByIndex(myJobTypeIndex)
-		myJobType.classObject = CpAIJobBaleFinder
-	end
-	local myJobTypeIndex = g_currentMission.aiJobTypeManager:getJobTypeIndexByName(CpAIJobBunkerSilo.name)
-	if myJobTypeIndex then
-		local myJobType = g_currentMission.aiJobTypeManager:getJobTypeByIndex(myJobTypeIndex)
-		myJobType.classObject = CpAIJobBunkerSilo
-	end
-	local myJobTypeIndex = g_currentMission.aiJobTypeManager:getJobTypeIndexByName(CpAIJobSiloLoader.name)
-	if myJobTypeIndex then
-		local myJobType = g_currentMission.aiJobTypeManager:getJobTypeByIndex(myJobTypeIndex)
-		myJobType.classObject = CpAIJobSiloLoader
-	end
+	local function register(class)
+		AIJobTypeManager:registerJobType(class.name, class.jobName, class)
+	end
+	register(CpAIJobBaleFinder)
+	register(CpAIJobFieldWork)
+	register(CpAIJobCombineUnloader)
+	register(CpAIJobSiloLoader)
+	register(CpAIJobBunkerSilo)
 end
 
 AIJobTypeManager.loadMapData = Utils.appendedFunction(AIJobTypeManager.loadMapData,CpAIJob.registerJob)

scripts/ai/jobs/CpAIJobBaleFinder.lua

@@ -107,8 +107,11 @@ function CpAIJobBaleFinder:validateFieldPosition(isValid, errorMessage)
 	return isValid, errorMessage
 end
 
-function CpAIJobBaleFinder:drawSelectedField(map)
-	self.selectedFieldPlot:draw(map)
+function CpAIJobBaleFinder:draw(map, isOverviewMap)
+	CpAIJob.draw(self, map, isOverviewMap)
+	if not isOverviewMap then
+		self.selectedFieldPlot:draw(map)
+	end
 end
 
 --- Gets the additional task description shown.

scripts/ai/jobs/CpAIJobBunkerSilo.lua

@@ -3,8 +3,8 @@
 CpAIJobBunkerSilo = {
 	name = "BUNKER_SILO_CP",
 	jobName = "CP_job_bunkerSilo",
-	fieldPositionParameterText = "CP_jobParameters_bunkerSiloPosition_title",
-	targetPositionParameterText = "CP_jobParameters_parkPosition_title",
+	fieldPositionParameterText = "CP_fieldWorkJobParameters_bunkerSiloPosition_title",
+	targetPositionParameterText = "CP_fieldWorkJobParameters_parkPosition_title",
 }
 local CpAIJobBunkerSilo_mt = Class(CpAIJobBunkerSilo, CpAIJob)
 
@@ -109,8 +109,11 @@ function CpAIJobBunkerSilo:validate(farmId)
 	return true, ''
 end
 
-function CpAIJobBunkerSilo:drawSilos(map)
-	g_bunkerSiloManager:drawSilos(map, self.bunkerSilo)
+function CpAIJobBunkerSilo:draw(map, isOverviewMap)
+	CpAIJob.draw(self, map, isOverviewMap)
+	if not isOverviewMap then
+		g_bunkerSiloManager:drawSilos(map, self.bunkerSilo)
+	end
 end
 
 function CpAIJobBunkerSilo:readStream(streamId, connection)

scripts/ai/jobs/CpAIJobCombineUnloader.lua

@@ -228,9 +228,12 @@ function CpAIJobCombineUnloader:validate(farmId)
 	return isValid, errorMessage
 end
 
-function CpAIJobCombineUnloader:drawSelectedField(map)
-	self.selectedFieldPlot:draw(map)
-    self.heapPlot:draw(map)
+function CpAIJobCombineUnloader:draw(map, isOverviewMap)
+	CpAIJob.draw(self, map, isOverviewMap)
+	if not isOverviewMap then
+		self.selectedFieldPlot:draw(map)
+		self.heapPlot:draw(map)
+	end
 end
 
 ------------------------------------

scripts/ai/jobs/CpAIJobFieldWork.lua

@@ -4,7 +4,7 @@ CpAIJobFieldWork = {
     name = "FIELDWORK_CP",
     jobName = "CP_job_fieldWork",
     GenerateButton = "FIELDWORK_BUTTON",
-    fieldPositionParameterText = "CP_jobParameters_fieldPosition_title"
+    fieldPositionParameterText = "CP_fieldWorkJobParameters_fieldPosition_title"
 }
 local AIJobFieldWorkCp_mt = Class(CpAIJobFieldWork, CpAIJob)
 
@@ -45,7 +45,7 @@ end
 
 function CpAIJobFieldWork:setupJobParameters()
     CpAIJob.setupJobParameters(self)
-    self:setupCpJobParameters(CpJobParameters(self))
+    self:setupCpJobParameters(CpFieldWorkJobParameters(self))
 end
 
 ---@param vehicle table
@@ -149,9 +149,12 @@ function CpAIJobFieldWork:validate(farmId)
     return true, ''
 end
 
-function CpAIJobFieldWork:drawSelectedField(map)
-    if self.selectedFieldPlot then
-        self.selectedFieldPlot:draw(map)
+function CpAIJobFieldWork:draw(map, isOverviewMap)
+	CpAIJob.draw(self, map, isOverviewMap)
+    if not isOverviewMap then
+        if self.selectedFieldPlot then
+            self.selectedFieldPlot:draw(map)
+        end
     end
 end