Merge pull request #6 from DBT85/dev-for-0.5.0

Dev for 0.5.0
DBT85 · Jan 21, 2015 · 6ca26ec · 6ca26ec
2 parents 74da15c + cd5685e
commit 6ca26ec
Show file tree

Hide file tree

Showing 15 changed files with 1,427 additions and 1,384 deletions.
diff --git a/...ntractPacks/CC-CP-SCANSat/KerbinLoRes.cfg → ...actPacks/CC-CP-SCANSat/01-KerbinLoRes.cfg b/...ntractPacks/CC-CP-SCANSat/KerbinLoRes.cfg → ...actPacks/CC-CP-SCANSat/01-KerbinLoRes.cfg
@@ -7,9 +7,10 @@ CONTRACT_TYPE:NEEDS[SCANsat]
 
     // Contract text
     title = Altimetry Scan of Kerbin
-    description = Our scientists have suggested that knowing what the rock we're flying around looks like might ge a good idea. Perform an altimetry scan of Kerbin's surface and report back with the answer to the ultimate question, "Where did I put my keys?".
-    synopsis = Send an unkerbaled vessel into orbit, reach a 496km orbit with an 79.8 decgree inclination and scan Kerbin's surface with the SCAN Radar Altimetry Sensor. You'll see a suggested orbit in the Tracking Station, but feel free to just hit the targets below.
-    completedMessage = Excellent work, despite the grainy monochrome image we've recovered our experts are very excited to see what they can find.
+    description = Our scientists have suggested that knowing what the rock we're flying around looks like might be a good idea. Perform an altimetry scan of Kerbin's surface and report back with the answer to the ultimate question, "Where did I put my keys?".
+    synopsis = Send an unkerbaled vessel into orbit, reach a 496km orbit with an 79.8 degree inclination and scan Kerbin's surface with the SCAN Radar Altimetry Sensor. \n\nYou'll see a suggested orbit in the Tracking Station, but feel free to just hit the targets below.
+	notes = Tip: There's probably some other science equipment you can take along for some extra science!
+	completedMessage = Excellent work, despite the grainy monochrome image we've recovered our experts are very excited to see what they can find.
 
     // Target Celestial body - controls where the contract must be completed, has some automated
     // effects on numeric parameters (increasing science, etc.)
@@ -19,10 +20,10 @@ CONTRACT_TYPE:NEEDS[SCANsat]
 	agent = Research & Development Department
 
     // Contract rewards, Kerbin multiplies by 1.25 on Normal mode.
-    advanceFunds = 10000.0
-	rewardScience = 10.0
-	rewardReputation = 10.0
-    rewardFunds = 10000.0
+    advanceFunds = 16000
+	rewardScience = 20
+	rewardReputation = 28
+    rewardFunds = 36000
 
 	// Can only be done once
 	maxCompletions = 1
@@ -54,11 +55,12 @@ CONTRACT_TYPE:NEEDS[SCANsat]
 
 		PARAMETER
 		{
-			name = HasPart1
-			type = HasPart
-			
+			name = PartValidation
+			type = PartValidation
+			//title = Dont forget this!
 			part = SCANsat_Scanner
-			minCount = 1
+			//minCount = 1
+			//maxCount = 1
 		}
 
 		PARAMETER
@@ -71,8 +73,7 @@ CONTRACT_TYPE:NEEDS[SCANsat]
 			maxApA = 499314
 			minPeA = 493101
 			maxPeA = 499106
-			minEccentricity = 0.0
-			maxEccentricity = 0.00244
+			maxEccentricity = 0.0021
 			minInclination = 79.3
 			maxInclination = 80.3
 			disableOnStateChange = false
@@ -84,7 +85,7 @@ CONTRACT_TYPE:NEEDS[SCANsat]
 			name = Duration
 			type = Duration
 
-			duration = 6h
+			duration = 1d 30m
 
 			preWaitText = We need a stable orbit for at least 
 			waitingText = Orbit acquired, monitoring.
@@ -101,17 +102,18 @@ CONTRACT_TYPE:NEEDS[SCANsat]
 	// Get 50% coverage to complete
 	coverage = 50.0
 	scanType = AltimetryLoRes
+	disableOnStateChange = false
 	}
 
 
-	//REQUIREMENT
-	//{
-	//	name = PartUnlocked1
-	//	type = PartUnlocked
-	//
+	REQUIREMENT
+	{
+		name = PartUnlocked1
+		type = PartUnlocked
+
 		// Part name that needs to be unlocked.
-	//	part = SCANsat_Scanner
-	//}
+		part = SCANsat_Scanner
+	}
 
 
 	REQUIREMENT
@@ -151,8 +153,6 @@ CONTRACT_TYPE:NEEDS[SCANsat]
 				INC = 79.8
 				LPE = 70
 				LAN = 27
-				MNA = 1.55872660382504
-				EPH = 31.3999999999994
 				REF = 1
 			}
 		}

diff --git a/.../ContractPacks/CC-CP-SCANSat/MunLoRes.cfg → ...ntractPacks/CC-CP-SCANSat/02-MunLoRes.cfg b/.../ContractPacks/CC-CP-SCANSat/MunLoRes.cfg → ...ntractPacks/CC-CP-SCANSat/02-MunLoRes.cfg
@@ -8,7 +8,7 @@ CONTRACT_TYPE:NEEDS[SCANsat]
     // Contract text
     title = Altimetry Scan of Mun
     description = With your recent success in getting us some preliminary altimetry data of Kerbin, our researchers have begged to see similar information for Mun. Get this right and we'll have some useful data for a Mun landing, not because it's easy, but because it is hard.
-    synopsis = Send an unkerbaled vessel into Munar orbit, reach a 405km orbit with an 85.2 degree inclination and scan Mun's surface with the SCAN Radar Altimetry Sensor. You'll see a suggested orbit in the Tracking Station, but feel free to just hit the targets below.
+    synopsis = Send an unkerbaled vessel into Munar orbit, reach a 405km orbit with an 85.2 degree inclination and scan Mun's surface with the SCAN Radar Altimetry Sensor. \n\nYou'll see a suggested orbit in the Tracking Station, but feel free to just hit the targets below.
     completedMessage = Incredible, we have already analysed the early data and have found 73 different rock formations that resemble rocks! We'll be in touch.
 
     // Target Celestial body - controls where the contract must be completed, has some automated
@@ -19,10 +19,10 @@ CONTRACT_TYPE:NEEDS[SCANsat]
 	agent = Research & Development Department
 
     // Contract rewards Mun multiplies by 2.5 on Normal mode.
-    advanceFunds = 10000.0
-	rewardScience = 10.0
-	rewardReputation = 10.0
-    rewardFunds = 10000.0
+    advanceFunds = 11200
+	rewardScience = 14
+	rewardReputation = 20
+    rewardFunds = 25200
 	
 	// Can only be done once
 	maxCompletions = 1
@@ -52,13 +52,13 @@ CONTRACT_TYPE:NEEDS[SCANsat]
 		
 		PARAMETER
 		{
-			name = HasPart1
-			type = HasPart
-			
+			name = PartValidation
+			type = PartValidation
+			//title = Dont forget this!
 			part = SCANsat_Scanner
-			minCount = 1
+			//minCount = 1
+			//maxCount = 1
 		}
-	
 		
 		PARAMETER
 		{
@@ -70,8 +70,7 @@ CONTRACT_TYPE:NEEDS[SCANsat]
 			maxApA = 408256
 			minPeA = 402102
 			maxPeA = 408114
-			minEccentricity = 0.0
-			maxEccentricity = 0.00234
+			maxEccentricity = 0.0021
 			minInclination = 84.7
 			maxInclination = 85.7
 			disableOnStateChange = false
@@ -83,7 +82,7 @@ CONTRACT_TYPE:NEEDS[SCANsat]
 			name = Duration
 			type = Duration
 
-			duration = 5h 30m
+			duration = 1d 3h
 
 			preWaitText = We need a stable orbit for at least 
 			waitingText = Orbit acquired, monitoring.
@@ -101,41 +100,41 @@ CONTRACT_TYPE:NEEDS[SCANsat]
 		scanType = AltimetryLoRes
 	}
 
-//	REQUIREMENT
-//	{
-//		name = All1
-//		type = All
-//	
-//		REQUIREMENT
-//		{
-//			name = SCANsatCoverage2
-//			type = SCANsatCoverage
-//
-//			targetBody = Mun
-//
-//			// Contract will not be activated if 50% of Mun has LoRes data
-//			maxCoverage = 49.9
-//			minCoverage = 0.0		
-//
-//			// The type of scan to perform. Valid values are from SCANdata.SCANtype.
-//			scanType = AltimetryLoRes
-//		}
-//		
-//		REQUIREMENT
-//		{
-//			name = SCANsatCoverage3
-//			type = SCANsatCoverage
-//
-//			targetBody = Kerbin
-//
-//			// Contract will not be activated unless Kerbin has 60% LoRes data
-//			maxCoverage = 100.0
-//			minCoverage = 60.0		
-//
-//			// The type of scan to perform. Valid values are from SCANdata.SCANtype.
-//			scanType = AltimetryLoRes
-//		}	
-//	}
+	REQUIREMENT
+	{
+		name = All1
+		type = All
+	
+		REQUIREMENT
+		{
+			name = SCANsatCoverage2
+			type = SCANsatCoverage
+
+			targetBody = Mun
+
+			// Contract will not be activated if 50% of Mun has LoRes data
+			maxCoverage = 49.9
+			minCoverage = 0.0		
+
+			// The type of scan to perform. Valid values are from SCANdata.SCANtype.
+			scanType = AltimetryLoRes
+		}
+		
+		REQUIREMENT
+		{
+			name = SCANsatCoverage3
+			type = SCANsatCoverage
+
+			targetBody = Kerbin
+
+			// Contract will not be activated unless Kerbin has 60% LoRes data
+			maxCoverage = 100.0
+			minCoverage = 60.0		
+
+			// The type of scan to perform. Valid values are from SCANdata.SCANtype.
+			scanType = AltimetryLoRes
+		}	
+	}
 	
 	BEHAVIOUR
 	{
@@ -159,8 +158,6 @@ CONTRACT_TYPE:NEEDS[SCANsat]
 				INC = 85.2
 				LPE = 302
 				LAN = 112
-				MNA = 1.55872660382504
-				EPH = 31.3999999999994
 				REF = 1
 			}
 		}