Merge pull request #307 from DMagic1/release

Version 18.2

SCANassets/Resources/Contracts/ContractPackScanSatOfficial.cfg

@@ -6,14 +6,16 @@ CONTRACT_GROUP
 	agent = SCAN: Scientific Committee on Advanced Navigation
     minVersion = 1.15.0
 
-    maxSimultaneous = 3
+    //maxSimultaneous = 10
 
 	DATA
 	{
 		type = List<CelestialBody>
 		requiredValue = false
-		p1Bodies = AllBodies().Where(cb => ((cb.IsHomeWorld() || cb.Parent().IsHomeWorld()) && cb.HasSurface()))
-		p2Bodies = OrbitedBodies().Where(cb => cb.HasSurface())
+		homeBodies = AllBodies().Where(cb => ((cb.IsHomeWorld() || cb.Parent().IsHomeWorld()) && cb.HasSurface()))
+		nonHomeBodies = AllBodies().Where(cb => cb.HasSurface() && cb != HomeWorld() && cb.Parent() != HomeWorld())
+		p2Bodies = OrbitedBodies().Where(cb => cb.HasSurface() && cb != HomeWorld() && cb.Parent() != HomeWorld())
 		p3Bodies = ReachedBodies().Where(cb => cb.HasSurface() && cb != HomeWorld() && cb.Parent() != HomeWorld())
+		p4Bodies = NextUnreachedBodies(2).Where(cb => (cb.HasSurface() && cb != HomeWorld() && cb.Parent() != HomeWorld()))
 	}
 }

SCANassets/Resources/Contracts/Exceptional.cfg

@@ -0,0 +1,120 @@
+CONTRACT_TYPE
+{
+	name = SCAN_Exceptional
+	title = Do a group of high resolution SCANsat surveys of @/targetBodyValid3.
+	genericTitle = Do a group of high resolution SCANsat surveys of @/targetBodyValid3.
+	group = ScanSatOfficial
+	topic = Science
+	subject = Kerbal
+	agent = SCAN: Scientific Committee on Advanced Navigation
+	notes = Scanning can take place while the vessel is not loaded.
+	synopsis = Perform several high resolution scans of @/targetBodyValid3
+	completedMessage = We now have a detailed map and survey for the surface of @/targetBodyValid3
+	minExpiry = 1
+	maxExpiry = 7
+	deadline = Random(300, 500) * @/targetBodyValid3.Multiplier()
+	cancellable = true
+	declinable = true
+	autoAccept = false
+	targetBody = @/targetBodyValid3
+
+	// Contract rewards
+	rewardScience = 0
+	rewardReputation = 1
+	rewardFunds = Random(60000, 80000.0)
+	failureReputation = 1
+	failureFunds = Random(1000, 10000.0)
+	advanceFunds = Random(10000, 20000.0)
+	prestige = Exceptional
+
+    DATA_EXPAND
+	{
+		type = CelestialBody
+		targetBody3 = @ScanSatOfficial:nonHomeBodies
+	}
+
+	DATA
+	{
+		type = CelestialBody
+		requiredValue = true
+		uniquenessCheck = CONTRACT_ALL
+		targetBodyValid3 = @/targetBody3
+	}
+
+	DATA
+	{
+		type = List<CelestialBody>
+		requiredValue = false
+		targetBodyList3 = @ScanSatOfficial:p3Bodies
+		targetBodyList4 = @ScanSatOfficial:p4Bodies
+	}
+
+	PARAMETER
+	{
+		name = SCANsatCoverage_1
+		type = SCANsatCoverage
+		targetBody = @/targetBodyValid3
+		coverage = 95
+		scanType = AltimetryHiRes
+	}
+	PARAMETER
+	{
+		name = SCANsatCoverage_2
+		type = SCANsatCoverage
+		targetBody = @/targetBodyValid3
+		coverage = 95
+		scanType = Ore
+	}
+	REQUIREMENT
+	{
+		name = AnyCoverage
+		type = Any
+
+		REQUIREMENT
+		{
+			name = SCANsatCoverage_1
+			type = SCANsatCoverage
+			targetBody = @/targetBodyValid3
+			minCoverage = 0.0
+			maxCoverage = 90
+			scanType = AltimetryHiRes
+			title = Must have less than a 90% high resolution altimetry scan of the target body.
+		}
+		REQUIREMENT
+		{
+			name = SCANsatCoverage_2
+			type = SCANsatCoverage
+			targetBody = @/targetBodyValid3
+			minCoverage = 0.0
+			maxCoverage = 90
+			scanType = Ore
+			title = Must have less than a 90% ore scan of the target body.
+		}
+	}
+	REQUIREMENT
+	{
+		name = Expression_1
+		type = Expression
+		title = Must have orbited the target body, or the target body must be next on the list.
+		expression = (@/targetBodyList3.Contains(@/targetBodyValid3) || @/targetBodyList4.Contains(@/targetBodyValid3)) == true
+	}
+	REQUIREMENT
+	{
+		name = Orbit
+		type = Orbit
+
+		targetBody = HomeWorld()
+	}
+	REQUIREMENT
+	{
+		name = PartUnlocked_1
+		type = PartUnlocked
+		part = SCANsat_Scanner2
+	}
+	REQUIREMENT
+	{
+		name = PartUnlocked_2
+		type = PartUnlocked
+		part = OrbitalScanner
+	}
+}