Merge pull request #211 from DMagic1/dev

Version 15.3

Author: DMagic1

SCANassets/Resources/KSPedia/Advanced image.png

@@ -11,6 +11,7 @@ SCAN_Color_Config
 	stockBiomeMap = False
 	biomeBorder = True
 	slopeCutoff = 1
+	windowScale = 1
 	bottomLowSlopeColor = 0.004705883,0.6,0.3788235,1
 	bottemHighSlopeColor = 0.9764706,1,0.4627451,1
 	topLowSlopeColor = 0.9764706,1,0.4627451,1

SCANassets/Resources/KSPedia/Basic image_2.png

@@ -15,13 +15,14 @@ SCAN_Localization
 			settingsHelpWindowTooltips = Display tooltips on some map window buttons. These are primarily used to identify icon buttons.
 			settingsHelpStockToolbar = Use the stock toolbar.\nOnly one stock button is available. Can be used concurrently with the Blizzy78 Toolbar.
 			settingsHelpMechJeb = The SCANsat zoom map target selection mode can be used to select a MechJeb landing site.
-			settingsHelpResetWindows = Reset all window positions. Use this in case a window has been dragged completely off screen or if any windows are not visible.
+			settingsHelpResetWindows = Reset all window positions and scale. Use this in case a window has been dragged completely off screen or if any windows are not visible.
 			settingsHelpResetPlanetData = Resets all SCANsat data for the current celestial body.\nA confirmation window will open before activating.\nCannot be reversed.
 			settingsHelpResetAllData = Resets all SCANsat data for all celestial bodies.       \nA confirmation window will open before activating.\nCannot be reversed.
 			settingsHelpVesselsSensorsPasses = Information about the currently active SCANsat sensors. Vessels indicates the number of vessels with active sensors. Sensors indicates the total number of sensors; instruments with multiple sensor types count each individual sensor. Passes indicates the number of sensor updates performed per second.\nThis value is affected by the\nTimeWarp Resolution setting.
 			settingsHelpGreyScale = Use a true grey-scale color spectrum for black-and-white SCANsat maps. Pixels on the altitude map will interpolate between black and white; the min and max terrain heights for each celestial body\ndefine the limits.
 			settingsHelpExportCSV = Export a .csv file along with map texture when using the Export button on the big map. The file contains coordinates and the terrain height for each pixel. Pixels are labeled from left to right\nand from top to bottom.
 			settingsHelpSetMapWidth = Enter an exact value for the SCANsat big map texture width. Values are limited to 550 - 8192 pixels wide. Press the Set button to apply the value.
+			settingsHelpWindowScale = Adjust all SCANsat window scales; buttons adjust scale in increments of 5%.
 			resourceSettingsHelpOverlayWindow = Open the planetary overlay map control window.
 			resourceSettingsHelpBiomeLock = Circumvents the requirement for stock surface biome scans. SCANsat displays will show the full accuracy for resource abundance with or without any surface biome scans.
 			resourceSettingsHelpInstant = By default, the stock M700 resource scanner's orbital survey will fill in all SCANsat resource maps. This can be disabled, requiring standard SCANsat methods for all resource scanning. Disabled automatically when stock resource scanning is disabled.

SCANassets/Resources/KSPedia/Biome Color Image.png

@@ -11,7 +11,7 @@
          "MAJOR":1,
          "MINOR":1,
          "PATCH":5,
-         "BUILD":2
+         "BUILD":3
      },
      "KSP_VERSION":{
          "MAJOR":1,

SCANassets/Resources/KSPedia/Colors Image.png

@@ -1,3 +1,14 @@
+Version 15.3 - 2016-4-15
+------------------------
+
+- Additional KSPedia pages
+- Add window scaling function
+    - Adjust scale in the Settings window
+- Window reset button will now reset all window positions and scale
+- Fix bug in instruments window resource readout
+- Make sure new save files apply all SCANsat default values and options
+
+
 Version 15.2 - 2016-4-5
 ------------------------
 

SCANassets/Resources/KSPedia/Features Image_2.png

@@ -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.5.0.2")]
-[assembly: AssemblyFileVersion ("1.5.0.2")]
-[assembly: AssemblyInformationalVersion ("v15.2")]
+[assembly: AssemblyVersion ("1.5.0.3")]
+[assembly: AssemblyFileVersion ("1.5.0.3")]
+[assembly: AssemblyInformationalVersion ("v15.3")]
 
 [assembly: KSPAssembly ("SCANsat", 1, 5)]
 

SCANassets/Resources/KSPedia/Parts Image_4.png

@@ -56,6 +56,8 @@ public class SCAN_Color_Config : SCAN_ConfigNodeStorage
 		[Persistent]
 		private Color topHighSlopeColor = palette.xkcd_OrangeRed;
 		[Persistent]
+		private float windowScale = 1f;
+		[Persistent]
 		private List<SCANterrainConfig> SCANsat_Altimetry = new List<SCANterrainConfig>();
 		[Persistent]
 		private List<SCANresourceGlobal> SCANsat_Resources = new List<SCANresourceGlobal>();
@@ -94,6 +96,7 @@ public override void OnEncodeToConfigNode()
 				bottemHighSlopeColor = SCANcontroller.controller.highSlopeColorOne;
 				topLowSlopeColor = SCANcontroller.controller.lowSlopeColorTwo;
 				topHighSlopeColor = SCANcontroller.controller.highSlopeColorTwo;
+				windowScale = SCANcontroller.controller.windowScale;
 			}
 		}
 
@@ -171,5 +174,10 @@ public Color TopHighSlopeColor
 		{
 			get { return topHighSlopeColor; }
 		}
+
+		public float WindowScale
+		{
+			get { return windowScale; }
+		}
 	}
 }

SCANassets/Resources/KSPedia/RPM Image_2.png

@@ -122,51 +122,7 @@ protected SCAN_MBW()
 			}
 		}
 		#endregion
-
-		protected override void Start()
-		{
-			base.Start();
-
-			GameEvents.onShowUI.Add(UIOn);
-			GameEvents.onHideUI.Add(UIOff);
-			GameEvents.onGUIMissionControlSpawn.Add(UIOff);
-			GameEvents.onGUIMissionControlDespawn.Add(UIOff);
-			GameEvents.onGUIRnDComplexSpawn.Add(UIOff);
-			GameEvents.onGUIRnDComplexDespawn.Add(UIOn);
-			GameEvents.onGUIAdministrationFacilitySpawn.Add(UIOff);
-			GameEvents.onGUIAdministrationFacilityDespawn.Add(UIOn);
-			GameEvents.onGUIAstronautComplexSpawn.Add(UIOff);
-			GameEvents.onGUIAstronautComplexDespawn.Add(UIOn);
-		}
-
-		protected override void OnDestroy()
-		{
-			base.OnDestroy();
-
-			GameEvents.onShowUI.Remove(UIOn);
-			GameEvents.onHideUI.Remove(UIOff);
-			GameEvents.onGUIMissionControlSpawn.Remove(UIOff);
-			GameEvents.onGUIMissionControlDespawn.Remove(UIOff);
-			GameEvents.onGUIRnDComplexSpawn.Remove(UIOff);
-			GameEvents.onGUIRnDComplexDespawn.Remove(UIOn);
-			GameEvents.onGUIAdministrationFacilitySpawn.Remove(UIOff);
-			GameEvents.onGUIAdministrationFacilityDespawn.Remove(UIOn);
-			GameEvents.onGUIAstronautComplexSpawn.Remove(UIOff);
-			GameEvents.onGUIAstronautComplexDespawn.Remove(UIOn);
-		}
-
-		private void UIOn()
-		{
-			showUI = true;
-		}
-
-		private void UIOff()
-		{
-			showUI = false;
-		}
-
-		private bool showUI = true;
-
+		
 		internal Int32 WindowID { get; private set; }
 		internal TimeSpan DrawWindowInternalDuration { get; private set; }
 		private bool _Visible;
@@ -271,32 +227,23 @@ public bool Visible
 			get { return _Visible; }
 			set
 			{
-				//if (_Visible != value)
-				//{
-				//	if (value)
-				//	{
-				//		Log.Debug("Adding Window to PostDrawQueue-{0}", WindowID); RenderingManager.AddToPostDrawQueue(5, this.DrawGUI);
-				//	}
-				//	else
-				//	{
-				//		Log.Debug("Removing Window from PostDrawQueue", WindowID); RenderingManager.RemoveFromPostDrawQueue(5, this.DrawGUI);
-				//	}
-				//}
+				if (_Visible != value)
+				{
+					if (value)
+					{
+						Log.Debug("Adding Window to PostDrawQueue-{0}", WindowID);
+						SCANcontroller.controller.addToDrawQueue(WindowID, this.DrawGUI);
+					}
+					else
+					{
+						Log.Debug("Removing Window from PostDrawQueue", WindowID);
+						SCANcontroller.controller.removeFromDrawQueue(WindowID);
+					}
+				}
 				_Visible = value;
 			}
 		}
-		protected override void OnGUIEvery()
-		{
-			base.OnGUIEvery();
-
-			if (!showUI)
-				return;
 
-			if (!_Visible)
-				return;
-
-			this.DrawGUI();
-		}
 		protected void DrawGUI()
 		{
 			string cc = "";

SCANassets/Resources/KSPedia/Resource Color Image.png

@@ -70,8 +70,6 @@ protected override void Awake()
 
 		protected override void Start()
 		{
-			base.Start();
-
 			//Initialize the map object
 			Visible = SCANcontroller.controller.bigMapVisible;
 			WindowRect.x = SCANcontroller.controller.map_x;
@@ -118,8 +116,6 @@ private void initializeMap()
 
 		protected override void OnDestroy()
 		{
-			base.OnDestroy();
-
 			SCANcontroller.controller.unloadPQS(bigmap.Body, mapSource.BigMap);
 		}
 

SCANassets/Resources/KSPedia/Resource Header Image.png

@@ -112,8 +112,6 @@ protected override void Awake()
 
 		protected override void Start()
 		{
-			base.Start();
-
 			TooltipsEnabled = false;
 
 			if (SCANconfigLoader.languagePack != null)
@@ -221,8 +219,6 @@ private void loadStrings()
 
 		protected override void OnDestroy()
 		{
-			base.OnDestroy();
-
 			removeControlLocks();
 			TooltipsEnabled = false;
 		}

SCANassets/Resources/KSPedia/Resource Overlay Image.png

@@ -66,8 +66,6 @@ protected override void Awake()
 
 		protected override void Start()
 		{
-			base.Start();
-
 			GameEvents.onVesselSOIChanged.Add(soiChange);
 			GameEvents.onVesselChange.Add(vesselChange);
 			GameEvents.onVesselWasModified.Add(vesselChange);
@@ -86,8 +84,6 @@ protected override void Start()
 
 		protected override void OnDestroy()
 		{
-			base.OnDestroy();
-
 			GameEvents.onVesselSOIChanged.Remove(soiChange);
 			GameEvents.onVesselChange.Remove(vesselChange);
 			GameEvents.onVesselWasModified.Remove(vesselChange);
@@ -331,7 +327,7 @@ private void resourceInfo(int id)
 			}
 			else
 			{
-				resourceLabel(resources[currentResource], false, false);
+				resourceLabel(resources[currentResource], false, true);
 			}
 		}
 

SCANassets/Resources/KSPedia/Resource Parts Image_2.png

@@ -66,8 +66,6 @@ protected override void Awake()
 
 		protected override void Start()
 		{
-			base.Start();
-
 			Visible = SCANcontroller.controller.kscMapVisible;
 			if (b == null)
 				b = Planetarium.fetch.Home;
@@ -97,8 +95,6 @@ protected override void Start()
 
 		protected override void OnDestroy()
 		{
-			base.OnDestroy();
-
 			removeControlLocks();
 			if (spotMap != null)
 				Destroy(spotMap);

SCANassets/Resources/KSPedia/Resource Settings Image.png

@@ -26,7 +26,7 @@ namespace SCANsat.SCAN_UI
 {
 	class SCANoverlayController : SCAN_MBW
 	{
-		internal readonly static Rect defaultRect = new Rect(Screen.width - 280, 200, 175, 100);
+		internal static Rect defaultRect = new Rect(Screen.width - 320, 200, 175, 100);
 		private static Rect sessionRect = defaultRect;
 		private CelestialBody body;
 		private SCANdata data;
@@ -61,6 +61,8 @@ protected override void Awake()
 		{
 			WindowCaption = "  S.C.A.N. Overlay";
 			WindowRect = sessionRect;
+			if ((WindowRect.x * SCANcontroller.controller.windowScale) > (Screen.width - 100))
+				WindowRect.x /= SCANcontroller.controller.windowScale;
 			WindowStyle = SCANskins.SCAN_window;
 			WindowOptions = new GUILayoutOption[2] { GUILayout.Width(175), GUILayout.Height(100) };
 			Visible = false;
@@ -72,8 +74,6 @@ protected override void Awake()
 
 		protected override void Start()
 		{
-			base.Start();
-
 			GameEvents.onShowUI.Add(showUI);
 			GameEvents.onHideUI.Add(hideUI);
 			GameEvents.onGameSceneSwitchRequested.Add(switchScene);
@@ -109,8 +109,6 @@ private void switchScene(GameEvents.FromToAction<GameScenes, GameScenes> FT)
 
 		protected override void OnDestroy()
 		{
-			base.OnDestroy();
-
 			GameEvents.onShowUI.Remove(showUI);
 			GameEvents.onHideUI.Remove(hideUI);
 			GameEvents.onGameSceneSwitchRequested.Remove(switchScene);
@@ -154,8 +152,6 @@ protected override void DrawWindowPost(int id)
 
 		protected override void OnGUIEvery()
 		{
-			base.OnGUIEvery();
-
 			if (enableUI)
 				mouseOverToolTip();
 		}

SCANassets/Resources/KSPedia/Resource Tools image_2.png

@@ -65,8 +65,6 @@ protected override void Awake()
 
 		protected override void Start()
 		{
-			base.Start();
-
 			oldNarrowBand = SCANcontroller.controller.needsNarrowBand;
 			oldStockScanThreshold = SCANcontroller.controller.useScanThreshold;
 			oldInstantScan = SCANcontroller.controller.easyModeScanning;