Merge pull request #251 from DMagic1/release

Version 16.11
S-C-A-N · Nov 4, 2016 · 30c4064 · 30c4064
2 parents b147380 + 8a996dc
commit 30c4064
Show file tree

Hide file tree

Showing 11 changed files with 176 additions and 93 deletions.
diff --git a/SCANassets/MM_Parts/SCANsat_Resource_Scanner.cfg b/SCANassets/MM_Parts/SCANsat_Resource_Scanner.cfg
@@ -125,22 +125,12 @@
 	}
 }
 
-@PART[MKS_Antenna]:FOR[SCANsat]:NEEDS[KolonyTools]
+@PART[OrbitalScanner]:FOR[SCANsat]:NEEDS[KolonyTools]
 {
-	MODULE
+	@MODULE[ModuleSCANresourceScanner]
 	{
-    	name = ModuleSCANresourceScanner
-    	sensorType = 32613504
-    	fov = 3
-    	min_alt = 10000
-    	max_alt = 500000
-    	best_alt = 150000
-    	scanName = Resource Scan
-		RESOURCE
-		{
-			name = ElectricCharge
-			rate = 0.4
-		}
+    	@sensorType += 32613504
+    	@scanName = Resource Scan
 	}
 
 	MODULE
@@ -214,7 +204,7 @@
 	}
 }
 
-@PART[MKS_ScanOMatic]:FOR[SCANsat]:NEEDS[KolonyTools]
+@PART[SurfaceScanner]:FOR[SCANsat]:NEEDS[KolonyTools]
 {
 
 	MODULE
@@ -314,11 +304,11 @@
 	}	
 }
 
-@PART[OrbitalScanner]:FOR[SCANsat]:NEEDS[WarpPlugin]
+@PART[OrbitalScanner]:FOR[SCANsat]:NEEDS[WarpPlugin,!KolonyTools]
 {
 	@MODULE[ModuleSCANresourceScanner]
 	{
-		@sensorType = 437272320
+		@sensorType += 437272064
 		@scanName = Resource Scan
 	}
 
@@ -376,7 +366,7 @@
 		name = SCANresourceDisplay
 		sensorType = 1024
 		ResourceName = Uraninite
-	}	
+	}
 
 	MODULE
 	{
@@ -385,3 +375,53 @@
 		ResourceName = Water
 	}
 }
+
+@PART[OrbitalScanner]:FOR[SCANsat]:NEEDS[WarpPlugin,KolonyTools]
+{
+	@MODULE[ModuleSCANresourceScanner]
+	{
+		@sensorType += 436214272
+	}
+
+	MODULE
+	{
+		name = SCANresourceDisplay
+		sensorType = 4096
+		ResourceName = Alumina
+	}
+
+	MODULE
+	{
+		name = SCANresourceDisplay
+		sensorType = 33554432
+		ResourceName = Borate
+	}
+
+	MODULE
+	{
+		name = SCANresourceDisplay
+		sensorType = 2048
+		ResourceName = Monazite
+	}
+
+	MODULE
+	{
+		name = SCANresourceDisplay
+		sensorType = 134217728
+		ResourceName = SaltWater
+	}
+
+	MODULE
+	{
+		name = SCANresourceDisplay
+		sensorType = 268435456
+		ResourceName = Silicates
+	}	
+
+	MODULE
+	{
+		name = SCANresourceDisplay
+		sensorType = 512
+		ResourceName = SolarWind
+	}
+}
diff --git a/SCANassets/SCANsat.version b/SCANassets/SCANsat.version
@@ -11,21 +11,21 @@
          "MAJOR":1,
          "MINOR":1,
          "PATCH":6,
-         "BUILD":10
+         "BUILD":11
      },
      "KSP_VERSION":{
          "MAJOR":1,
          "MINOR":2,
-         "PATCH":0
+         "PATCH":1
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
          "MINOR":2,
-         "PATCH":0
+         "PATCH":1
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
          "MINOR":2,
-         "PATCH":0
+         "PATCH":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.10")]
-[assembly: AssemblyFileVersion("1.6.0.10")]
-[assembly: AssemblyInformationalVersion ("v16.10")]
+[assembly: AssemblyVersion("1.6.0.11")]
+[assembly: AssemblyFileVersion("1.6.0.11")]
+[assembly: AssemblyInformationalVersion ("v16.11")]
 
 [assembly: KSPAssembly ("SCANmechjeb", 0, 4)]
 [assembly: KSPAssemblyDependency ("SCANsat", 1, 6)]

diff --git a/SCANmechjeb/SCANmechjeb.csproj b/SCANmechjeb/SCANmechjeb.csproj
@@ -37,20 +37,11 @@
       <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="KSPUtil">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\KSPUtil.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="MechJeb2, Version=2.5.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\GameData\SCANsat\MechJeb2.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="SCANsat, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameData\SCANsat\SCANsat.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="UnityEngine">
       <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.dll</HintPath>
@@ -67,6 +58,13 @@
     <Compile Include="SCANmechjebMainMenu.cs" />
     <Compile Include="SCANmechStarter.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SCANsat\SCANsat.csproj">
+      <Project>{3ae13948-477d-4375-8ab4-b45664966d9e}</Project>
+      <Name>SCANsat</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/SCANsat/CHANGELOG.txt b/SCANsat/CHANGELOG.txt
@@ -1,3 +1,13 @@
+Version 16.11 - 2016-11-4
+-----------------------
+
+- Update for KSP 1.2.1
+
+- Disable window dragging for big map and zoom map when in IVA
+- Most resource scanners now use the stock Narrow-Band for high resolution scanning
+     - The "Require Narrow-Band" option in the resource settings is slightly broken by this
+	 - Disable that option if using lots of CRP resources
+
 Version 16.10 - 2016-10-24
 -----------------------
 

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.10")]
-[assembly: AssemblyFileVersion ("1.6.0.10")]
-[assembly: AssemblyInformationalVersion ("v16.10")]
+[assembly: AssemblyVersion ("1.6.0.11")]
+[assembly: AssemblyFileVersion ("1.6.0.11")]
+[assembly: AssemblyInformationalVersion ("v16.11")]
 
 [assembly: KSPAssembly ("SCANsat", 1, 6)]
 

diff --git a/SCANsat/SCAN_UI/SCANbigMap.cs b/SCANsat/SCAN_UI/SCANbigMap.cs
@@ -91,6 +91,8 @@ protected override void Start()
 			TooltipsEnabled = SCANcontroller.controller.toolTips;
 
 			initializeMap();
+
+			GameEvents.OnCameraChange.Add(onCameraChange);
 		}
 
 		private void initializeMap()
@@ -126,6 +128,7 @@ private void initializeMap()
 
 		protected override void OnDestroy()
 		{
+			GameEvents.OnCameraChange.Remove(onCameraChange);
 			SCANcontroller.controller.unloadPQS(bigmap.Body, mapSource.BigMap);
 		}
 
@@ -135,6 +138,14 @@ protected override void Update()
 				v = FlightGlobals.ActiveVessel;
 		}
 
+		private void onCameraChange(CameraManager.CameraMode cam)
+		{
+			if (cam == CameraManager.CameraMode.IVA)
+				DragEnabled = false;
+			else
+				DragEnabled = true;
+		}
+
 		//Properties used to sync with color selection window
 		public static SCANmap BigMap
 		{

diff --git a/SCANsat/SCAN_UI/SCANresourceSettings.cs b/SCANsat/SCAN_UI/SCANresourceSettings.cs
@@ -187,6 +187,22 @@ protected override void DrawWindowPost(int id)
 					warningMMLoaded = !warningMMLoaded;
 				}
 			}
+			else
+			{
+				if (oldInstantScan != SCANcontroller.controller.easyModeScanning)
+				{
+					oldInstantScan = SCANcontroller.controller.easyModeScanning;
+					if (oldInstantScan)
+					{
+						for (int i = FlightGlobals.Bodies.Count - 1; i >= 0; i--)
+						{
+							CelestialBody b = FlightGlobals.Bodies[i];
+
+							SCANcontroller.controller.checkStockResourceScanStatus(b);
+						}
+					}
+				}
+			}
 
 			if (oldNarrowBand != SCANcontroller.controller.needsNarrowBand)
 			{
@@ -200,7 +216,7 @@ protected override void DrawWindowPost(int id)
 				oldStockScanThreshold = SCANcontroller.controller.useScanThreshold;
 				if (oldStockScanThreshold)
 				{
-					for (int i = 0; i < FlightGlobals.Bodies.Count; i++)
+					for (int i = FlightGlobals.Bodies.Count - 1; i >= 0; i--)
 					{
 						CelestialBody b = FlightGlobals.Bodies[i];
 

diff --git a/SCANsat/SCAN_UI/SCANsettingsUI.cs b/SCANsat/SCAN_UI/SCANsettingsUI.cs
@@ -217,7 +217,10 @@ protected override void DrawWindowPost(int id)
 				if (stockToolbar)
 					SCANcontroller.controller.appLauncher = gameObject.AddComponent<SCANappLauncher>();
 				else
+				{
 					Destroy(SCANcontroller.controller.appLauncher);
+					SCANcontroller.controller.appLauncher = null;
+				}
 			}
 		}
 

diff --git a/SCANsat/SCAN_UI/SCANzoomWindow.cs b/SCANsat/SCAN_UI/SCANzoomWindow.cs
@@ -87,6 +87,8 @@ protected override void Awake()
 			infoString2 = new StringBuilder();
 
 			Startup();
+
+			GameEvents.OnCameraChange.Add(onCameraChange);
 		}
 
 		protected virtual void Startup()
@@ -140,9 +142,18 @@ protected override void OnDestroy()
 		{
 			removeControlLocks();
 
+			GameEvents.OnCameraChange.Remove(onCameraChange);
 			SCANcontroller.controller.unloadPQS(spotmap.Body, mapSource.ZoomMap);
 		}
 
+		private void onCameraChange(CameraManager.CameraMode cam)
+		{
+			if (cam == CameraManager.CameraMode.IVA)
+				DragEnabled = false;
+			else
+				DragEnabled = true;
+		}
+
 		internal void removeControlLocks()
 		{
 			InputLockManager.RemoveControlLock(lockID);