Merge pull request #230 from DMagic1/release

Version 16.4
S-C-A-N · Aug 9, 2016 · e9edcf7 · e9edcf7
2 parents 8188a59 + 314c149
commit e9edcf7
Show file tree

Hide file tree

Showing 21 changed files with 195 additions and 52 deletions.
diff --git a/SCANassets/MM_Parts/SCANsat_Resource_Scanner.cfg b/SCANassets/MM_Parts/SCANsat_Resource_Scanner.cfg
@@ -40,7 +40,11 @@
 		max_alt = 500000
 		best_alt = 150000
 		scanName = Ore Scan
-		power = 0.4
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 0.4
+		}
 	}
 
 	MODULE
@@ -72,7 +76,11 @@
 		max_alt = 1000000
 		best_alt = 150000
 		scanName = Resource Scan
-		power = 0.5
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 0.5
+		}
 	}
 }
 
@@ -87,7 +95,11 @@
     	max_alt = 71000
     	best_alt = 65000
     	scanName = Metal Ore Scan
-    	power = 0.4
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 0.4
+		}
 	}
 
 	MODULE
@@ -109,7 +121,11 @@
     	max_alt = 500000
     	best_alt = 200000
     	scanName = Metal Ore Scan
-    	power = 0.8
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 0.8
+		}
 	}
 
 	MODULE
@@ -131,7 +147,11 @@
     	max_alt = 500000
     	best_alt = 150000
     	scanName = Resource Scan
-    	power = 0.4
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 0.4
+		}
 	}
 
 	MODULE
@@ -290,7 +310,11 @@
     	max_alt = 500000
     	best_alt = 150000
     	scanName = Karbonite Scan
-    	power = 0.4
+		RESOURCE
+		{
+			name = ElectricCharge
+			rate = 0.4
+		}
 	}
 
 	MODULE

diff --git a/SCANassets/Parts/BTDT/BTDT.cfg b/SCANassets/Parts/BTDT/BTDT.cfg
@@ -41,7 +41,11 @@ MODULE
 	min_alt = 0
 	max_alt = 2000
 	best_alt = 0
-	power = 0.1
 	scanName = BTDT Scan
+	RESOURCE
+		{
+			name = ElectricCharge
+			rate = 0.1
+		}
 }
 }
diff --git a/SCANassets/Parts/MULTI/MULTI.cfg b/SCANassets/Parts/MULTI/MULTI.cfg
@@ -40,8 +40,12 @@ MODULE
 	min_alt = 5000
 	max_alt = 500000
 	best_alt = 250000
-	power = 1
 	scanName = Multispectral Scan
 	animationName = Multi_Antenna
+	RESOURCE
+		{
+			name = ElectricCharge
+			rate = 1
+		}
 }
 }
diff --git a/SCANassets/Parts/MapTraq/MapTraq.cfg b/SCANassets/Parts/MapTraq/MapTraq.cfg
@@ -45,7 +45,11 @@ MODULE
 	min_alt = 0
 	max_alt = 0
 	best_alt = 0
-	power = 0.05
 	scanName = Eyeball Scan
+	RESOURCE
+		{
+			name = ElectricCharge
+			rate = 0.05
+		}
 }
 }
diff --git a/SCANassets/Parts/RADAR/RADAR.cfg b/SCANassets/Parts/RADAR/RADAR.cfg
@@ -43,7 +43,11 @@ MODULE
 	max_alt = 500000
 	best_alt = 5000
 	scanName = RADAR Scan
-	power = 0.1
 	animationName = Collapse_Antenna
+	RESOURCE
+		{
+			name = ElectricCharge
+			rate = 0.1
+		}
 }
 }
diff --git a/SCANassets/Parts/SAR/SAR.cfg b/SCANassets/Parts/SAR/SAR.cfg
@@ -40,8 +40,12 @@ MODULE
 	min_alt = 5000
 	max_alt = 800000
 	best_alt = 750000
-	power = 1.5
 	scanName = SAR Scan
 	animationName = Antenna
+	RESOURCE
+		{
+			name = ElectricCharge
+			rate = 1.5
+		}
 }
 }
diff --git a/SCANassets/Resources/Contracts/Biome.cfg b/SCANassets/Resources/Contracts/Biome.cfg
@@ -2,6 +2,7 @@ CONTRACT_TYPE
 {
     name = SCAN_Biome
     title = Do a Biome Scan of @/targetBody2
+	genericTitle = Do a Biome Scan of a body.
     group = ScanSatOfficial
 	agent = SCAN: Scientific Committee on Advanced Navigation
     topic = Science
@@ -32,7 +33,8 @@ CONTRACT_TYPE
 		type = CelestialBody
 		requiredValue = true
 		uniquenessCheck = CONTRACT_ALL
-		targetBody2 = Prestige() == Trivial ? @ScanSatOfficial:p1Bodies.Random() : @ScanSatOfficial:p2Bodies.Random()
+		targetBody2 = Prestige() == Trivial ? @ScanSatOfficial:p1Bodies.SelectUnique() : @ScanSatOfficial:p2Bodies.SelectUnique()
+		title = Must have orbited the target body.
 	}
 
 	DATA
@@ -60,6 +62,7 @@ CONTRACT_TYPE
 		minCoverage = 0.0
 		maxCoverage = @/minScan2
 		scanType = Biome
+		title = Must have scanned less than @/minScan2% of the target body.
 	}
 	REQUIREMENT
 	{

diff --git a/SCANassets/Resources/Contracts/ContractPackScanSatOfficial.cfg b/SCANassets/Resources/Contracts/ContractPackScanSatOfficial.cfg
@@ -2,8 +2,9 @@ CONTRACT_GROUP
 {
     // Name of the contract group
     name = ScanSatOfficial
-
-    minVersion = 1.9.1
+	displayName = ScanSat Official
+	agent = SCAN: Scientific Committee on Advanced Navigation
+    minVersion = 1.15.0
 
     maxSimultaneous = 3
 

diff --git a/SCANassets/Resources/Contracts/HiRes.cfg b/SCANassets/Resources/Contracts/HiRes.cfg
@@ -2,6 +2,7 @@ CONTRACT_TYPE
 {
     name = SCAN_HiRes
     title = Do a High Resolution Scan of @/targetBody3
+	genericTitle = Do a High Resolution Scan of a body.
     group = ScanSatOfficial
 	agent = SCAN: Scientific Committee on Advanced Navigation
     topic = Science
@@ -33,7 +34,8 @@ CONTRACT_TYPE
         type = CelestialBody
         requiredValue = true
 		uniquenessCheck = CONTRACT_ALL
-        targetBody3 = Prestige() == Significant ? @ScanSatOfficial:p2Bodies.Random() : @ScanSatOfficial:p3Bodies.Random()
+        targetBody3 = Prestige() == Significant ? @ScanSatOfficial:p2Bodies.SelectUnique() : @ScanSatOfficial:p3Bodies.SelectUnique()
+		title = Must have orbited the target body.
     }
 
 	DATA
@@ -61,6 +63,7 @@ CONTRACT_TYPE
 		minCoverage = 0.0
 		maxCoverage = @/minScan3
 		scanType = AltimetryHiRes
+		title = Must have scanned less than @/minScan3% of the target body.
 	}
 	REQUIREMENT
 	{

diff --git a/SCANassets/Resources/Contracts/LoRes.cfg b/SCANassets/Resources/Contracts/LoRes.cfg
@@ -2,6 +2,7 @@ CONTRACT_TYPE
 {
 	name = SCAN_LoRes
 	title = Do a Low Resolution Scan of @/targetBody1
+	genericTitle = Do a Low Resolution Scan of a body.
 	group = ScanSatOfficial
 	topic = Science
 	subject = Kerbal
@@ -33,7 +34,8 @@ CONTRACT_TYPE
 		type = CelestialBody
 		requiredValue = true
 		uniquenessCheck = CONTRACT_ALL
-		targetBody1 = Prestige() == Trivial ? @ScanSatOfficial:p1Bodies.Random() : @ScanSatOfficial:p2Bodies.Random()
+		targetBody1 = Prestige() == Trivial ? @ScanSatOfficial:p1Bodies.SelectUnique() : @ScanSatOfficial:p2Bodies.SelectUnique()
+		title = Must have orbited the target body.
 	}
 	
 	DATA
@@ -61,6 +63,7 @@ CONTRACT_TYPE
 		minCoverage = 0.0
 		maxCoverage = @/minScan1
 		scanType = AltimetryLoRes
+		title = Must have scanned less than @/minScan1% of the target body.
 	}
 	REQUIREMENT
 	{

diff --git a/SCANassets/Resources/Contracts/M700.cfg b/SCANassets/Resources/Contracts/M700.cfg
@@ -2,6 +2,7 @@ CONTRACT_TYPE
 {
     name = SCAN_M700
     title = Scan @/targetBody4 for resources
+	genericTitle = Scan a body for resouces.
     group = ScanSatOfficial
 	topic = Science
     subject = Kerbal
@@ -32,7 +33,8 @@ CONTRACT_TYPE
 		type = CelestialBody
 		requiredValue = true
 		uniquenessCheck = CONTRACT_ALL
-		targetBody4 = Prestige() == Trivial ? @ScanSatOfficial:p1Bodies.Random() : @ScanSatOfficial:p2Bodies.Random()
+		targetBody4 = Prestige() == Trivial ? @ScanSatOfficial:p1Bodies.SelectUnique() : @ScanSatOfficial:p2Bodies.SelectUnique()
+		title = Must have orbited the target body.
 	}
 	
 	DATA
@@ -60,6 +62,7 @@ CONTRACT_TYPE
 		minCoverage = 0.0
 		maxCoverage = @/minScan4
 		scanType = FuzzyResources
+		title = Must have scanned less than @/minScan4% of the target body.
 	}
 	REQUIREMENT
 	{

diff --git a/SCANassets/Resources/Contracts/NarrowBand.cfg b/SCANassets/Resources/Contracts/NarrowBand.cfg
@@ -2,6 +2,7 @@ CONTRACT_TYPE
 {
     name = SCAN_NarrowBand
     title = Scan @/targetBody5 for Ore
+	genericTitle = Scan a body for Ore.
     group = ScanSatOfficial
 	topic = Science
     subject = Kerbal
@@ -33,7 +34,8 @@ CONTRACT_TYPE
         type = CelestialBody
         requiredValue = true
 		uniquenessCheck = CONTRACT_ALL
-        targetBody5 = Prestige() == Significant ? @ScanSatOfficial:p2Bodies.Random() : @ScanSatOfficial:p3Bodies.Random()
+        targetBody5 = Prestige() == Significant ? @ScanSatOfficial:p2Bodies.SelectUnique() : @ScanSatOfficial:p3Bodies.SelectUnique()
+ 		title = Must have orbited the target body.
     }
 	
 	DATA
@@ -61,6 +63,7 @@ CONTRACT_TYPE
 		minCoverage = 0.0
 		maxCoverage = @/minScan5
 		scanType = Ore
+		title = Must have scanned less than @/minScan5% of the target body.
 	}
 	REQUIREMENT
 	{

diff --git a/SCANassets/SCANsat.version b/SCANassets/SCANsat.version
@@ -11,7 +11,7 @@
          "MAJOR":1,
          "MINOR":1,
          "PATCH":6,
-         "BUILD":3
+         "BUILD":4
      },
      "KSP_VERSION":{
          "MAJOR":1,

diff --git a/SCANmechjeb/Properties/AssemblyInfo.cs b/SCANmechjeb/Properties/AssemblyInfo.cs
@@ -32,9 +32,9 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.3")]
-[assembly: AssemblyFileVersion("1.6.0.3")]
-[assembly: AssemblyInformationalVersion ("v16.3")]
+[assembly: AssemblyVersion("1.6.0.4")]
+[assembly: AssemblyFileVersion("1.6.0.4")]
+[assembly: AssemblyInformationalVersion ("v16.4")]
 
 [assembly: KSPAssembly ("SCANmechjeb", 0, 4)]
 [assembly: KSPAssemblyDependency ("SCANsat", 1, 6)]

diff --git a/SCANsat/CHANGELOG.txt b/SCANsat/CHANGELOG.txt
@@ -1,3 +1,13 @@
+Version 16.4 - 2016-8-9
+------------------------
+
+- Update contracts for Contract Configurator 1.15+ (severedsolo)
+- Switch to using ModuleResource and RESOURCE nodes for all power consumption (NathanKell)
+- Calculate the local min and max terrain for RPM maps
+- Hidden map fill cheat option
+    - Add "cheatMapFill = True" to the SCANcolors.cfg file
+- Fix potential Toolbar related errors (bssthu)
+
 Version 16.3 - 2016-6-27
 ------------------------
 

diff --git a/SCANsat/Properties/AssemblyInfo.cs b/SCANsat/Properties/AssemblyInfo.cs
@@ -14,9 +14,9 @@
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion ("1.6.0.3")]
-[assembly: AssemblyFileVersion ("1.6.0.3")]
-[assembly: AssemblyInformationalVersion ("v16.3")]
+[assembly: AssemblyVersion ("1.6.0.4")]
+[assembly: AssemblyFileVersion ("1.6.0.4")]
+[assembly: AssemblyInformationalVersion ("v16.4")]
 
 [assembly: KSPAssembly ("SCANsat", 1, 6)]
 

diff --git a/SCANsat/SCAN_Color_Config.cs b/SCANsat/SCAN_Color_Config.cs
@@ -58,6 +58,8 @@ public class SCAN_Color_Config : SCAN_ConfigNodeStorage
 		[Persistent]
 		private float windowScale = 1f;
 		[Persistent]
+		private bool cheatMapFill = false;
+		[Persistent]
 		private List<SCANterrainConfig> SCANsat_Altimetry = new List<SCANterrainConfig>();
 		[Persistent]
 		private List<SCANresourceGlobal> SCANsat_Resources = new List<SCANresourceGlobal>();
@@ -150,6 +152,11 @@ public bool BiomeBorder
 			get { return biomeBorder; }
 		}
 
+		public bool CheatMapFill
+		{
+			get { return cheatMapFill; }
+		}
+
 		public float SlopeCutoff
 		{
 			get { return slopeCutoff; }