From 76b95f6834631a5fa558359dbe1fd048ec517858 Mon Sep 17 00:00:00 2001
From: siimav <siim.aaver@gmail.com>
Date: Fri, 9 Aug 2024 01:40:20 +0300
Subject: [PATCH] Generate waypoints around landing spot for Mars Rover

---
 GameData/RP-1/Contracts/Mars/Mars Probe.cfg |  1 -
 GameData/RP-1/Contracts/Mars/Mars Rover.cfg | 30 +++++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/GameData/RP-1/Contracts/Mars/Mars Probe.cfg b/GameData/RP-1/Contracts/Mars/Mars Probe.cfg
index ade5d7079d0..e1766e37e39 100644
--- a/GameData/RP-1/Contracts/Mars/Mars Probe.cfg	
+++ b/GameData/RP-1/Contracts/Mars/Mars Probe.cfg	
@@ -49,7 +49,6 @@ CONTRACT_TYPE
 		name = VesselGroup
 		type = VesselParameterGroup
 		title = Atmospheric probe Mars
-		define = ProbeMars
 		
 		PARAMETER
 		{
diff --git a/GameData/RP-1/Contracts/Mars/Mars Rover.cfg b/GameData/RP-1/Contracts/Mars/Mars Rover.cfg
index 25a482ed833..957599f9ed1 100644
--- a/GameData/RP-1/Contracts/Mars/Mars Rover.cfg	
+++ b/GameData/RP-1/Contracts/Mars/Mars Rover.cfg	
@@ -65,8 +65,10 @@ CONTRACT_TYPE
 	{
 		name = VesselGroup
 		type = VesselParameterGroup
-		title = Uncrewed rover on Mars
-		define = ProbeMars
+		title = Land near waypoint
+		define = MarsRover
+		dissassociateVesselsOnContractCompletion = true
+		resetChildrenWhenVesselDestroyed = true
 
 		PARAMETER
 		{
@@ -82,12 +84,30 @@ CONTRACT_TYPE
 			name = WaypointAlpha
 			type = VisitWaypoint
 			index = 0
-			distance = 100.0
+			distance = 50000.0
 			disableOnStateChange = true
-			title = Safely land near rover site Alpha on Mars
+			title = Safely land within 50km of site Alpha
 			hideChildren = true
 			showMessages = true
 		}
+	}
+
+	PARAMETER
+	{
+		name = VesselGroup2
+		type = VesselParameterGroup
+		title = Visit the other 2 waypoints
+		vessel = MarsRover
+
+		PARAMETER
+		{
+			name = Crewmembers
+			type = HasCrew
+			minCrew = 0
+			maxCrew = 0
+			title = Uncrewed
+			hideChildren = true
+		}
 		PARAMETER
 		{
 			name = WaypointBravo
@@ -145,7 +165,7 @@ CONTRACT_TYPE
 			icon = marker
 			altitude = 0.0
 			waterAllowed = false
-			nearIndex = 0
+			vessel = MarsRover
 			minDistance = 500.0
 			maxDistance = 1000.0
 		}