From 28e495c885b8c452e3d54d79cc7ad9dfc28e14f3 Mon Sep 17 00:00:00 2001
From: DMagic <david.grandy@gmail.com>
Date: Fri, 4 Nov 2016 09:42:40 -0400
Subject: [PATCH 1/7] version

---
 SCANassets/SCANsat.version             | 8 ++++----
 SCANmechjeb/Properties/AssemblyInfo.cs | 6 +++---
 SCANsat/Properties/AssemblyInfo.cs     | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/SCANassets/SCANsat.version b/SCANassets/SCANsat.version
index 2e0e3a08d..ced1ed4a3 100644
--- 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
index e53b1757e..b47d7c372 100644
--- 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/SCANsat/Properties/AssemblyInfo.cs b/SCANsat/Properties/AssemblyInfo.cs
index 44552bb01..3b36744f4 100644
--- 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)]
 

From 403a1cfb87c0a473a02a1e3f9e1a45112406b443 Mon Sep 17 00:00:00 2001
From: DMagic <david.grandy@gmail.com>
Date: Fri, 4 Nov 2016 09:42:52 -0400
Subject: [PATCH 2/7] project references

---
 SCANmechjeb/SCANmechjeb.csproj | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/SCANmechjeb/SCANmechjeb.csproj b/SCANmechjeb/SCANmechjeb.csproj
index b82eaab04..1132eb863 100644
--- 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.

From 56f16b4174ef210b7e2cade39a6e83f89b501c9c Mon Sep 17 00:00:00 2001
From: DMagic <david.grandy@gmail.com>
Date: Fri, 4 Nov 2016 09:43:14 -0400
Subject: [PATCH 3/7] Disable drag in IVA

---
 SCANsat/SCAN_UI/SCANbigMap.cs     | 11 +++++++++++
 SCANsat/SCAN_UI/SCANzoomWindow.cs | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/SCANsat/SCAN_UI/SCANbigMap.cs b/SCANsat/SCAN_UI/SCANbigMap.cs
index ef21576b8..136307d0c 100644
--- 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/SCANzoomWindow.cs b/SCANsat/SCAN_UI/SCANzoomWindow.cs
index de6b592b2..2438c18b6 100644
--- 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);

From ab564f28c6c4a54dd00abc97e7559b2dec57c5b3 Mon Sep 17 00:00:00 2001
From: DMagic <david.grandy@gmail.com>
Date: Fri, 4 Nov 2016 09:43:35 -0400
Subject: [PATCH 4/7] Fully remove object

---
 SCANsat/SCAN_UI/SCANsettingsUI.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SCANsat/SCAN_UI/SCANsettingsUI.cs b/SCANsat/SCAN_UI/SCANsettingsUI.cs
index b8a8d261e..4b97c5113 100644
--- 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;
+				}
 			}
 		}
 

From 2b93490b56ab866942103fd707c0a57fca3cbc2a Mon Sep 17 00:00:00 2001
From: DMagic <david.grandy@gmail.com>
Date: Fri, 4 Nov 2016 09:54:56 -0400
Subject: [PATCH 5/7] Use events for stock resource scan; fix hiding UI

---
 SCANsat/SCAN_UI/SCANresourceSettings.cs |  18 +++-
 SCANsat/SCANcontroller.cs               | 104 +++++++++++-------------
 2 files changed, 66 insertions(+), 56 deletions(-)

diff --git a/SCANsat/SCAN_UI/SCANresourceSettings.cs b/SCANsat/SCAN_UI/SCANresourceSettings.cs
index a8148ac95..d1e6b8f02 100644
--- 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/SCANcontroller.cs b/SCANsat/SCANcontroller.cs
index 4e0c5723b..4bcd40ca0 100644
--- a/SCANsat/SCANcontroller.cs
+++ b/SCANsat/SCANcontroller.cs
@@ -211,9 +211,6 @@ public static SCANcontroller controller
 		/* Used as holder for vessel id's while loading */
 		private List<Guid> tempIDs = new List<Guid>();
 
-		private CelestialBody body = null;
-		private bool bodyScanned = false;
-		private bool bodyCoverage = false;
 		private bool heightMapsBuilt = false;
 
 		private static SCANcontroller instance;
@@ -923,6 +920,7 @@ private void Start()
 			GameEvents.onGUIAstronautComplexSpawn.Add(UIOff);
 			GameEvents.onGUIAstronautComplexDespawn.Add(UIOn);
 
+			GameEvents.OnOrbitalSurveyCompleted.Add(onSurvey);
 			GameEvents.onVesselSOIChanged.Add(SOIChange);
 			GameEvents.onVesselCreate.Add(newVesselCheck);
 			GameEvents.onPartCouple.Add(dockingEventCheck);
@@ -973,13 +971,22 @@ private void Start()
 
 			if (disableStockResource && useScanThreshold)
 			{
-				for (int i = 0; i < FlightGlobals.Bodies.Count; i++)
-				{
+				for (int i = FlightGlobals.Bodies.Count - 1; i >= 0; i--)
+				{					
 					CelestialBody b = FlightGlobals.Bodies[i];
 
 					checkResourceScanStatus(b);
 				}
 			}
+			else if (!disableStockResource && easyModeScanning)
+			{
+				for (int i = FlightGlobals.Bodies.Count - 1; i >= 0; i--)
+				{
+					CelestialBody b = FlightGlobals.Bodies[i];
+
+					checkStockResourceScanStatus(b);
+				}
+			}
 		}
 
 		private void Update()
@@ -989,61 +996,28 @@ private void Update()
 
 			if (!heightMapsBuilt)
 				checkHeightMapStatus();
+		}
 
-			if (!HighLogic.LoadedSceneIsFlight && HighLogic.LoadedScene != GameScenes.TRACKSTATION)
+		public void checkStockResourceScanStatus(CelestialBody body)
+		{
+			if (disableStockResource || !easyModeScanning)
 				return;
 
-			if (!easyModeScanning || disableStockResource)
+			if (body == null)
 				return;
 
-			if (body == null)
-			{
-				if (HighLogic.LoadedSceneIsFlight)
-				{
-					body = FlightGlobals.ActiveVessel.mainBody;
-					bodyScanned = false;
-					bodyCoverage = false;
-				}
-				else if (HighLogic.LoadedScene == GameScenes.TRACKSTATION)
-				{
-					MapObject target = PlanetariumCamera.fetch.target;
+			if (!ResourceMap.Instance.IsPlanetScanned(body.flightGlobalsIndex))
+				return;
 
-					if (target.type != MapObject.ObjectType.CelestialBody)
-					{
-						body = null;
-						return;
-					}
+			if (SCANUtil.GetCoverage((int)SCANtype.AllResources, body) >= 100)
+				return;
 
-					body = target.celestialBody;
-					bodyScanned = false;
-					bodyCoverage = false;
-				}
-			}
+			SCANdata data = getData(body.name);
 
-			if (bodyScanned)
+			if (data == null)
 				return;
 
-			if (!bodyCoverage)
-			{
-				if (SCANUtil.GetCoverage((int)SCANtype.AllResources, body) >= 100)
-				{
-					bodyScanned = true;
-					return;
-				}
-				bodyCoverage = true;
-			}
-
-			if (ResourceMap.Instance.IsPlanetScanned(body.flightGlobalsIndex))
-			{
-				SCANdata data = SCANUtil.getData(body);
-				if (data == null)
-				{
-					data = new SCANdata(body);
-					addToBodyData(body, data);
-				}
-				data.fillResourceMap();
-				bodyScanned = true;
-			}
+			data.fillResourceMap();
 		}
 
 		public void checkResourceScanStatus(CelestialBody body)
@@ -1126,8 +1100,8 @@ private void checkHeightMapStatus()
 
 		private void OnDestroy()
 		{
-			GameEvents.onShowUI.Remove(UIOn);
-			GameEvents.onHideUI.Remove(UIOff);
+			GameEvents.onShowUI.Remove(UIShow);
+			GameEvents.onHideUI.Remove(UIHide);
 			GameEvents.onGUIMissionControlSpawn.Remove(UIOff);
 			GameEvents.onGUIMissionControlDespawn.Remove(UIOn);
 			GameEvents.onGUIRnDComplexSpawn.Remove(UIOff);
@@ -1137,6 +1111,7 @@ private void OnDestroy()
 			GameEvents.onGUIAstronautComplexSpawn.Remove(UIOff);
 			GameEvents.onGUIAstronautComplexDespawn.Remove(UIOn);
 
+			GameEvents.OnOrbitalSurveyCompleted.Remove(onSurvey);
 			GameEvents.onVesselSOIChanged.Remove(SOIChange);
 			GameEvents.onVesselCreate.Remove(newVesselCheck);
 			GameEvents.onPartCouple.Remove(dockingEventCheck);
@@ -1194,6 +1169,28 @@ private void UIHide()
 				showUI = false;
 		}
 
+		private void onSurvey(Vessel v, CelestialBody b)
+		{
+			if (!easyModeScanning || disableStockResource)
+				return;
+
+			if (b == null)
+				return;
+
+			if (SCANUtil.GetCoverage((int)SCANtype.AllResources, b) >= 100)
+				return;
+
+			SCANdata data = SCANUtil.getData(b);
+
+			if (data == null)
+			{
+				data = new SCANdata(b);
+				addToBodyData(b, data);
+			}
+
+			data.fillResourceMap();
+		}
+
 		internal void loadPQS(CelestialBody b, mapSource s = mapSource.Data)
 		{
 			if (!SCANmainMenuLoader.KopernicusLoaded)
@@ -1595,9 +1592,6 @@ private void SOIChange(GameEvents.HostedFromToAction<Vessel, CelestialBody> VC)
 		{
 			if (!body_data.Contains(VC.to.name))
 				body_data.Add(VC.to.name, new SCANdata(VC.to));
-			body = VC.to;
-			bodyScanned = false;
-			bodyCoverage = false;
 		}
 
 		private void setNewTerrainConfigValues(SCANterrainConfig terrain, float min, float max, float? clamp, Palette c, int size, bool reverse, bool discrete)

From 67b9ba09483ed96b9304a0c0b2adc29d8ab5cc79 Mon Sep 17 00:00:00 2001
From: DMagic <david.grandy@gmail.com>
Date: Fri, 4 Nov 2016 10:16:31 -0400
Subject: [PATCH 6/7] Resource scanner patches use stock Narrow-Band now

---
 .../MM_Parts/SCANsat_Resource_Scanner.cfg     | 76 ++++++++++++++-----
 1 file changed, 58 insertions(+), 18 deletions(-)

diff --git a/SCANassets/MM_Parts/SCANsat_Resource_Scanner.cfg b/SCANassets/MM_Parts/SCANsat_Resource_Scanner.cfg
index 63211525d..215f58f51 100644
--- 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
+	}
+}

From 8a996dc6dad35e7be63a5423b95d82a362c7a147 Mon Sep 17 00:00:00 2001
From: DMagic <david.grandy@gmail.com>
Date: Fri, 4 Nov 2016 10:20:07 -0400
Subject: [PATCH 7/7] Changes

---
 SCANsat/CHANGELOG.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/SCANsat/CHANGELOG.txt b/SCANsat/CHANGELOG.txt
index 778505d92..e349834f8 100644
--- 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
 -----------------------