Merge pull request #168 from DMagic1/release

SCANsat v14.3

SCANassets/SCANsat.version

@@ -11,21 +11,21 @@
          "MAJOR":1,
          "MINOR":1,
          "PATCH":4,
-         "BUILD":2
+         "BUILD":3
      },
      "KSP_VERSION":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":4
+         "PATCH":5
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":2
+         "PATCH":5
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
          "MINOR":0,
-         "PATCH":4
+         "PATCH":5
      }
 }

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.4.0.2")]
-[assembly: AssemblyFileVersion("1.4.0.2")]
-[assembly: AssemblyInformationalVersion ("v14.2")]
+[assembly: AssemblyVersion("1.4.0.3")]
+[assembly: AssemblyFileVersion("1.4.0.3")]
+[assembly: AssemblyInformationalVersion ("v14.3")]
 
 [assembly: KSPAssembly ("SCANmechjeb", 0, 3)]
 [assembly: KSPAssemblyDependency ("SCANsat", 1, 4)]

SCANsat/CHANGELOG.txt

@@ -1,3 +1,25 @@
+Version 14.3 - 2015-11-10
+------------------------
+- Update for KSP 1.0.5
+
+- In-Game Help Function
+	- Help section for Settings window, Resource Settings window, and Color Selection window
+	- Activate help mode with the question mark button in the top right
+
+- Localization project
+	- All help function strings are included in a config file
+	- Local translations can be added to this file to replace the English text
+
+- Misc and Bug Fixes
+	- Fix bug while switching vessels from the small map vessel list
+	- Fix planetary overlay tooltips while in the tracking station
+	- Fix a potential loading error
+	- Fix bug generating terrain height maps on planets with PQS errors; prevents endless NRE spam
+	- Fix some problems with the background terrain height map generator
+	- Power usage works correctly up to 10000X time warp, instead of 1000X
+	- Remove debug log messages during planetary overlay map generation
+	- Change the default anomaly marker and close box icons to standard text
+
 Version 14.2 - 2015-8-29
 ------------------------
 

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.4.0.2")]
-[assembly: AssemblyFileVersion ("1.4.0.2")]
-[assembly: AssemblyInformationalVersion ("v14.2")]
+[assembly: AssemblyVersion ("1.4.0.3")]
+[assembly: AssemblyFileVersion ("1.4.0.3")]
+[assembly: AssemblyInformationalVersion ("v14.3")]
 
 [assembly: KSPAssembly ("SCANsat", 1, 4)]
 

SCANsat/SCAN_Data/SCANdata.cs

@@ -36,7 +36,7 @@ public class SCANdata
 		private Int32[,] coverage;
 		private CelestialBody body;
 		private SCANterrainConfig terrainConfig;
-		private bool building, externalBuilding, built;
+		private bool mapBuilding, overlayBuilding, controllerBuilding, built;
 
 		private float[,] tempHeightMap;
 
@@ -96,6 +96,9 @@ public float HeightMapValue(int i, int lon, int lat, bool useTemp = false)
 			if (body.pqsController == null)
 				return 0;
 
+			if (heightMaps[i].Length < 10)
+				return 0;
+
 			return heightMaps[i][lon, lat];
 		}
 
@@ -116,16 +119,22 @@ public bool Disabled
 			internal set { disabled = value; }
 		}
 
-		public bool Building
+		public bool MapBuilding
+		{
+			get { return mapBuilding; }
+			internal set { mapBuilding = value; }
+		}
+
+		public bool OverlayBuilding
 		{
-			get { return building; }
-			internal set { building = value; }
+			get { return overlayBuilding; }
+			internal set { overlayBuilding = value; }
 		}
 
-		public bool ExternalBuilding
+		public bool ControllerBuilding
 		{
-			get { return externalBuilding; }
-			internal set { externalBuilding = value; }
+			get { return controllerBuilding; }
+			internal set { controllerBuilding = value; }
 		}
 
 		public bool Built
@@ -247,7 +256,7 @@ public List<SCANwaypoint> Waypoints
 							if (orbit == null)
 								continue;
 
-							if (orbit.targetBody == body)
+							if (orbit.TargetBody == body)
 							{
 								for (int j = 0; j < stationary[i].AllParameters.Count(); j++)
 								{
@@ -377,13 +386,33 @@ internal void generateHeightMap(ref int step, ref int xStart, int width)
 			if (body.pqsController == null)
 			{
 				built = true;
-				building = false;
-				externalBuilding = false;
+				mapBuilding = false;
+				overlayBuilding = false;
+				controllerBuilding = false;
 				if (!heightMaps.ContainsKey(body.flightGlobalsIndex))
 					heightMaps.Add(body.flightGlobalsIndex, new float[1, 1]);
 				return;
 			}
 
+			if (step <= 0)
+			{
+				try
+				{
+					double d = SCANUtil.getElevation(body, 0, 0);
+				}
+				catch (Exception e)
+				{
+					Debug.LogError("[SCANsat] Error In Detecting Terrain Height Map; Stopping Height Map Generator\n" + e);
+					built = true;
+					mapBuilding = false;
+					overlayBuilding = false;
+					controllerBuilding = false;
+					if (!heightMaps.ContainsKey(body.flightGlobalsIndex))
+						heightMaps.Add(body.flightGlobalsIndex, new float[1, 1]);
+					return;
+				}
+			}
+
 			if (tempHeightMap == null)
 			{
 				tempHeightMap = new float[360, 180];
@@ -394,8 +423,9 @@ internal void generateHeightMap(ref int step, ref int xStart, int width)
 				step = 0;
 				xStart = 0;
 				built = true;
-				building = false;
-				externalBuilding = false;
+				mapBuilding = false;
+				overlayBuilding = false;
+				controllerBuilding = false;
 				if (!heightMaps.ContainsKey(body.flightGlobalsIndex))
 					heightMaps.Add(body.flightGlobalsIndex, tempHeightMap);
 				tempHeightMap = null;

SCANsat/SCAN_Data/SCANwaypoint.cs

@@ -23,7 +23,7 @@ public class SCANwaypoint
 	{
 		internal SCANwaypoint(SurveyWaypointParameter p)
 		{
-			way = reflectWaypoint(p);
+			way = p.wp;
 			if (way != null)
 			{
 				band = reflectFlightBand(p);
@@ -127,14 +127,6 @@ public bool LandingTarget
 			get { return landingTarget; }
 		}
 
-		private Waypoint reflectWaypoint(SurveyWaypointParameter p)
-		{
-			if (SCANmainMenuLoader.FinePrintWaypoint)
-				return SCANreflection.FinePrintWaypointObject(p);
-
-			return null;
-		}
-
 		private Waypoint reflectWaypoint(StationaryPointParameter p)
 		{
 			if (SCANmainMenuLoader.FinePrintStationaryWaypoint)

SCANsat/SCAN_PartModules/SCANsat.cs

@@ -112,7 +112,10 @@ public override void OnUpdate()
 			Events["stopScan"].active = scanning;
 			if (sensorType != 32)
 				Fields["alt_indicator"].guiActive = scanning;
+		}
 
+		public override void OnFixedUpdate()
+		{
 			if (powerIsProblem)
 			{
 				addStatic();
@@ -130,9 +133,9 @@ public override void OnUpdate()
 				{
 					if (sensorType != 0 || SCANcontroller.controller.isVesselKnown(vessel.id, (SCANtype)sensorType))
 					{
-						if (TimeWarp.CurrentRate < 1500)
+						if (TimeWarp.CurrentRate < 15000)
 						{
-							float p = power * TimeWarp.deltaTime;
+							float p = power * TimeWarp.fixedDeltaTime;
 							float e = part.RequestResource("ElectricCharge", p);
 							if (e < p)
 							{
@@ -141,7 +144,6 @@ public override void OnUpdate()
 							}
 							else
 							{
-								registerScanner();
 								powerIsProblem = false;
 							}
 						}
@@ -153,6 +155,7 @@ public override void OnUpdate()
 					}
 					else
 						unregisterScanner();
+
 					alt_indicator = scanAlt();
 				}
 			}
@@ -522,6 +525,16 @@ public ScienceData[] GetData()
 			return storedData.ToArray();
 		}
 
+		public void ReturnData(ScienceData data)
+		{
+			if (data == null)
+				return;
+
+			storedData.Clear();
+
+			storedData.Add(data);
+		}
+
 		private void KeepData(ScienceData data)
 		{
 			expDialog = null;

SCANsat/SCAN_Platform/SCAN_ConfigNodeStorage.cs

@@ -62,6 +62,31 @@ public bool Load(string fileFullName)
 			}
 		}
 
+		public bool LoadSavedCopy()
+		{
+			try
+			{
+				Log.Debug("Loading ConfigNode");
+				if (FileExists)
+				{
+					ConfigNode cnToLoad = ConfigNode.Load(FilePath);
+					ConfigNode cnUnwrapped = cnToLoad.GetNode(this.GetType().Name);
+					ConfigNode.LoadObjectFromConfig(this, cnUnwrapped);
+					return true;
+				}
+				else
+				{
+					Log.Now("File could not be found to load after saving new copy ({0})", FilePath);
+					return false;
+				}
+			}
+			catch (Exception ex)
+			{
+				Log.Now("Failed to Load ConfigNode from file after saving ({0}) - Error:{1}", FilePath, ex.Message);
+				return false;
+			}
+		}
+
 		public bool Save()
 		{
 			Log.Debug("Saving ConfigNode");

SCANsat/SCAN_Platform/SCAN_MBW.cs

@@ -151,7 +151,7 @@ public Rect GetWindowRect
 		private Rect _TooltipPosition = new Rect();
 
 		public bool TooltipsEnabled = false;
-		internal Int32 TooltipDisplayForSecs = 15;
+		protected Int32 TooltipDisplayForSecs = 15;
 		protected Int32 TooltipMaxWidth = 250;
 		private string strToolTipText = "";
 		private string strLastTooltipText = "";