Dummy pull request to see what has changed in the pathfinding

.github/workflows/unit-test.yml

@@ -35,7 +35,7 @@ jobs:
           lua LoggerTest.lua
       - name: Run course generator unit tests
         run: |
-          cd scripts/courseGenerator/test
+          pushd scripts/courseGenerator/test
           lua BlockSequencerTest.lua
           lua CacheMapTest.lua
           lua CenterTest.lua
@@ -53,3 +53,6 @@ jobs:
           lua TransformTest.lua
           lua VertexTest.lua
           lua WrapAroundIndexTest.lua
+          popd
+          pushd scripts/pathfinder/test
+          lua GraphPathfinderTest.lua

Courseplay.lua

@@ -32,6 +32,7 @@ function Courseplay:registerXmlSchema()
 	CpBaseHud.registerXmlSchema(self.xmlSchema, self.xmlKey)
 	CpHudInfoTexts.registerXmlSchema(self.xmlSchema, self.xmlKey)
 	CpInGameMenu.registerXmlSchema(self.xmlSchema, self.xmlKey)
+	Graph.registerXmlSchema(self.xmlSchema, self.xmlKey)
 end
 
 --- Loads data not tied to a savegame.
@@ -115,6 +116,7 @@ function Courseplay:loadMap(filename)
 		self.xmlFile = XMLFile.load("cpXml", filePath , self.xmlSchema)
 		if self.xmlFile == nil then return end
 		self.globalSettings:loadFromXMLFile(self.xmlFile, g_Courseplay.xmlKey)
+		g_graph:loadFromXMLFile(self.xmlFile, g_Courseplay.xmlKey)
 		self.xmlFile:delete()
 	end
 
@@ -128,22 +130,30 @@ function Courseplay:deleteMap()
 		self:saveUserSettings()
 	end
 	g_courseEditor:delete()
+	g_graphEditor:delete()
 	BufferedCourseDisplay.deleteBuffer()
 	g_signPrototypes:delete()
 	g_consoleCommands:delete()
+	g_graph:delete()
 end
 
 function Courseplay:setupGui()
 	CpInGameMenu.setupGui(self.courseStorage)
 	self.infoTextsHud = CpHudInfoTexts()
-
+	TargetPointSelectionDialog.register()
+	FilltypeSelectionDialog.register()
 	--- Adding Player input bindings 
 	local function addPlayerActionEvents(self, superFunc, ...)
 		superFunc(self, ...)
 		local _, id = g_inputBinding:registerActionEvent(InputAction.CP_OPEN_INGAME_MENU, self, function ()
 			g_messageCenter:publishDelayed(MessageType.GUI_CP_INGAME_OPEN)
 		end, false, true, false, true)
 		g_inputBinding:setActionEventTextVisibility(id, false)
+
+		local _, id = g_inputBinding:registerActionEvent(InputAction.CP_OPEN_GRAPH_EDITOR, self, function ()
+			g_graphEditor:open()
+		end, false, true, false, true)
+		g_inputBinding:setActionEventTextVisibility(id, false)
 		-- CpDebug.registerEvents()
 	end
 	PlayerInputComponent.registerGlobalPlayerActionEvents = Utils.overwrittenFunction(
@@ -166,16 +176,19 @@ end
 --- Saves all global data, for example global settings.
 function Courseplay.saveToXMLFile(missionInfo)
 	if missionInfo.isValid then 
-		local saveGamePath = missionInfo.savegameDirectory .."/"
-		local xmlFile = XMLFile.create("cpXml", saveGamePath.. "Courseplay.xml", 
-				"Courseplay", g_Courseplay.xmlSchema)
-		if xmlFile then	
-			g_Courseplay.globalSettings:saveToXMLFile(xmlFile, g_Courseplay.xmlKey)
-			xmlFile:save()
-			xmlFile:delete()
-		end
-		g_Courseplay:saveUserSettings()
-		g_assignedCoursesManager:saveAssignedCourses(saveGamePath)
+		CpUtil.try(function ()
+			local saveGamePath = missionInfo.savegameDirectory .."/"
+			local xmlFile = XMLFile.create("cpXml", saveGamePath.. "Courseplay.xml", 
+					"Courseplay", g_Courseplay.xmlSchema)
+			if xmlFile then	
+				g_Courseplay.globalSettings:saveToXMLFile(xmlFile, g_Courseplay.xmlKey)
+				g_graph:saveToXMLFile(xmlFile, g_Courseplay.xmlKey)
+				xmlFile:save()
+				xmlFile:delete()
+			end
+			g_Courseplay:saveUserSettings()
+			g_assignedCoursesManager:saveAssignedCourses(saveGamePath)
+		end)
 	end
 end
 FSCareerMissionInfo.saveToXMLFile = Utils.prependedFunction(FSCareerMissionInfo.saveToXMLFile, Courseplay.saveToXMLFile)
@@ -186,6 +199,8 @@ function Courseplay:update(dt)
     g_triggerManager:update(dt)
 	g_baleToCollectManager:update(dt)
 	g_courseEditor:update(dt)
+	g_graphEditor:update(dt)
+	g_graph: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
@@ -206,6 +221,7 @@ function Courseplay:draw()
 		g_triggerManager:draw()
 		g_baleToCollectManager:draw()
 	end
+	g_graph:draw()
 	g_devHelper:draw()
 	CpDebug:draw()
 	if not g_gui:getIsGuiVisible() and not g_noHudModeEnabled then
@@ -261,6 +277,7 @@ function Courseplay:load()
 	--- Register additional AI messages.
 	CpAIMessages.register()	
 	g_vineScanner:setup()
+	g_graph:setup()
 end
 
 --- Registers all cp specializations.
@@ -280,6 +297,7 @@ function Courseplay.register(typeManager)
 			CpAICombineUnloader.register(typeManager, typeName, typeEntry.specializations)
 			CpAISiloLoaderWorker.register(typeManager, typeName, typeEntry.specializations)
 			CpAIBunkerSiloWorker.register(typeManager, typeName, typeEntry.specializations)
+			CpAIStreetWorker.register(typeManager, typeName, typeEntry.specializations)
 			-- TODO 25 CpGamePadHud.register(typeManager, typeName,typeEntry.specializations)
 			CpHud.register(typeManager, typeName, typeEntry.specializations)
 			CpInfoTexts.register(typeManager, typeName, typeEntry.specializations)

config/GraphEditorCategories.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Category>
+	<Tab name="points" iconSliceId="cpIconSprite.circle">
+		<Brush name="insertPoint" class="InsertPointBrush" iconSliceId="cpUi.editorInsert"/>
+		<Brush name="deletePoint" class="DeletePointBrush" iconSliceId="cpUi.trashcan"/>
+		<Brush name="movePoint" class="MovePointBrush" iconSliceId="cpUi.editorMove"/>
+		<Brush name="linePoint" class="LinePointBrush" iconSliceId="cpUi.editorMove"/>
+	</Tab>
+	<Tab name="segments" iconSliceId="cpIconSprite.circle">
+		<!-- <Brush name="createSegment" class="CreateSegmentBrush" iconSliceId="cpUi.editorInsert"/> -->
+		<Brush name="mergeSplitSegment" class="MergeSplitSegmentBrush" iconSliceId="cpUi.trashcan"/>
+		<Brush name="deleteSegment" class="DeleteSegmentBrush" iconSliceId="cpUi.trashcan"/>
+		<Brush name="changeSegmentType" class="ChangeSegmentTypBrush" iconSliceId="cpUi.trashcan"/>
+	</Tab>
+	<Tab name="targets" iconSliceId="cpIconSprite.circle">
+		<Brush name="createTarget" class="CreateTargetBrush" iconSliceId="cpUi.editorInsert"/>
+		<Brush name="deleteTarget" class="DeleteTargetBrush" iconSliceId="cpUi.trashcan"/>
+		<Brush name="renameTarget" class="RenameTargetBrush" iconSliceId="cpUi.editorMove"/>
+	</Tab>
+</Category>

config/HudSettingsSetup.xml

@@ -20,17 +20,15 @@
 				<!-- Combine Unloader -->
 				<Value name="COMBINE_UNLOADER_SELECTED" isDisabled="isUnloaderModeDisabled">5</Value> 
 				<!-- Street Driver -->
-				<!--
 				<Value name="STREET_DRIVER_SELECTED" isDisabled="isStreetModeDisabled">6</Value> 
-				-->
 			</Values>
 			<Texts>
 				<Text prefix="false">CP_job_fieldWork</Text>
 				<Text prefix="false">CP_job_baleCollect</Text>
 				<Text prefix="false">CP_job_bunkerSilo</Text>
 				<Text prefix="false">CP_job_siloLoader</Text>
 				<Text prefix="false">CP_job_combineUnload</Text>
-				<!-- <Text prefix="false">CP_job_street</Text> -->
+				<Text prefix="false">CP_job_street</Text>
 			</Texts>
 		</Setting>
 	</SettingSubTitle>