Divide by zero fix and vine generator settings added

Courseplay · Dec 6, 2024 · 68164ea · 68164ea
1 parent 5381107
commit 68164ea
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/config/MasterTranslations.xml b/config/MasterTranslations.xml
@@ -877,6 +877,10 @@
 			<Text language="de"><![CDATA[Grundeinstellungen]]></Text>
 			<Text language="en"><![CDATA[Basic settings]]></Text>
 		</Translation>
+		<Translation name="CP_vehicle_courseGeneratorSetting_subTitle_vineField">
+			<Text language="de"><![CDATA[Weinfeld Einstellungen]]></Text>
+			<Text language="en"><![CDATA[Vine field settings]]></Text>
+		</Translation>
 		<Translation name="CP_vehicle_courseGeneratorSetting_subTitle_headland">
 			<Text language="de"><![CDATA[Einstellungen Vorgewende]]></Text>
 			<Text language="en"><![CDATA[Settings headland]]></Text>

diff --git a/config/VehicleSettingsSetup.xml b/config/VehicleSettingsSetup.xml
@@ -123,9 +123,9 @@
 			</Texts>
 		</Setting>
 		<Setting classType="AIParameterSettingList" name="pipeOffsetX" min="-100" max="100" incremental="0.1" default="0" unit="2" precision="3"
-				 isVisible="isPipeOffsetSettingsVisible"/>
+				 isVisible="isPipeOffsetSettingsVisible" title="CP_deactivated"/>
 		<Setting classType="AIParameterSettingList" name="pipeOffsetZ" min="-100" max="100" incremental="0.1" default="0" unit="2" precision="3"
-				 isVisible="isPipeOffsetSettingsVisible"/>
+				 isVisible="isPipeOffsetSettingsVisible" title="CP_deactivated"/>
 	</SettingSubTitle>
 
 	<SettingSubTitle title="seeder" isVisible="areSowingMachineSettingsVisible">

diff --git a/scripts/gui/CoursePlot.lua b/scripts/gui/CoursePlot.lua
@@ -113,8 +113,8 @@ function CoursePlot:drawLineBetween(map, x, z, nx, nz, isHudMap, lineThickness,
 	local startX, startY, _, sv = CpGuiUtil.worldToScreen(map, x, z, isHudMap)
 	local endX, endY, _, ev = CpGuiUtil.worldToScreen(map, nx, nz, isHudMap)
 	local dx, dz = nx - x, nz - z
-	local dirX, dirZ = MathUtil.vector2Normalize(dx, dz)
 	local length = MathUtil.vector2Length(dx, dz)
+	local dirX, dirZ = length > 0 and MathUtil.vector2Normalize(dx, dz) or 0, 1
 	if startX and startY and endX and endY then
 		local dx2D = endX - startX
 		local dy2D = ( endY - startY ) / g_screenAspectRatio

diff --git a/scripts/gui/pages/CpCourseGeneratorFrame.lua b/scripts/gui/pages/CpCourseGeneratorFrame.lua
@@ -5,13 +5,15 @@
 
 CpCourseGeneratorFrame = {
 	CATEGRORIES = {
-		BASIC_SETTINGS = 1,
-		IN_GAME_MAP = 2,
+		IN_GAME_MAP = 1,
+		BASIC_SETTINGS = 2,
+		Vine_SETTINGS = 3
 	},
 	INPUT_CONTEXT_NAME = "CP_COURSE_GENERATOR_MENU",
 	CATEGRORY_TEXTS = {
-		"CP_vehicle_courseGeneratorSetting_subTitle_basic",
 		"CP_ingameMenu_map_title",
+		"CP_vehicle_courseGeneratorSetting_subTitle_basic",
+		"CP_vehicle_courseGeneratorSetting_subTitle_vineField",
 	},
 	CLEAR_INPUT_ACTIONS = {
 		InputAction.MENU_ACTIVATE,
@@ -155,7 +157,7 @@ function CpCourseGeneratorFrame:initialize(menu)
 		self.subCategoryTabs[key].onClickCallback = function ()
 			self:updateSubCategoryPages(key)
 		end
-		if key == 2 then
+		if key == self.CATEGRORIES.IN_GAME_MAP then
 			self.subCategoryPages[key] = self.containerMap
 		else
 			self.subCategoryPages[key] = self.containerPrefab:clone(self)
@@ -219,7 +221,7 @@ function CpCourseGeneratorFrame:onFrameOpen()
 	local title = string.format(g_i18n:getText(pageTitle), vehicle:getName())
 	self.categoryHeaderText:setText(title)
 
-	local layout = self.subCategoryPages[1]:getDescendantByName("layout")
+	local layout = self.subCategoryPages[self.CATEGRORIES.BASIC_SETTINGS]:getDescendantByName("layout")
 	for i = #layout.elements, 1, -1 do
 		layout.elements[i]:delete()
 	end
@@ -228,6 +230,17 @@ function CpCourseGeneratorFrame:onFrameOpen()
 		self.sectionHeaderPrefab, settings)
 	CpSettingsUtil.updateGuiElementsBoundToSettings(layout, vehicle)
 
+	settings = vehicle:getCpVineSettings()
+	settingsBySubTitle = CpCourseGeneratorSettings.getVineSettingSetup()
+	layout = self.subCategoryPages[self.CATEGRORIES.Vine_SETTINGS]:getDescendantByName("layout")
+	for i = #layout.elements, 1, -1 do
+		layout.elements[i]:delete()
+	end
+	CpSettingsUtil.generateAndBindGuiElementsToSettings(settingsBySubTitle,
+		layout, self.multiTextPrefab, self.booleanPrefab, 
+		self.sectionHeaderPrefab, settings)
+	CpSettingsUtil.updateGuiElementsBoundToSettings(layout, vehicle)
+
 	-- g_messageCenter:subscribe(MessageType.AI_VEHICLE_STATE_CHANGE, self.onAIVehicleStateChanged, self)
 	self.activeWorkerList:reloadData()
 	g_messageCenter:subscribe(MessageType.AI_JOB_STARTED, function(self)
@@ -283,8 +296,7 @@ function CpCourseGeneratorFrame:onFrameOpen()
 	self.startJobPending = false
 	self.ingameMap:onOpen()
 
-	self:updateSubCategoryPages(self.CATEGRORIES.BASIC_SETTINGS)
-	FocusManager:setFocus(self.subCategoryPages[self.CATEGRORIES.BASIC_SETTINGS]:getDescendantByName("layout"))
+	self:updateSubCategoryPages(self.CATEGRORIES.IN_GAME_MAP)
 
 	CpCourseGeneratorFrame:superClass().onFrameOpen(self)
 end

diff --git a/scripts/specializations/CpCourseGeneratorSettings.lua b/scripts/specializations/CpCourseGeneratorSettings.lua
@@ -199,10 +199,8 @@ function CpCourseGeneratorSettings.getSettingSetup()
 end
 
 function CpCourseGeneratorSettings.getVineSettingSetup(vehicle)
-    local title = g_i18n:getText(CpCourseGeneratorSettings.vineSettings.pageTitle)
-    return CpCourseGeneratorSettings.vineSettings.settingsBySubTitle, 
-            vehicle and string.format(title, vehicle:getName()) 
-            or title
+    return CpCourseGeneratorSettings.vineSettings.settingsBySubTitle,
+        CpCourseGeneratorSettings.vineSettings.pageTitle
 end
 
 function CpCourseGeneratorSettings:loadSettings(savegame)