Merge 3.8.4.0 to master

Author: TriggerAu

KerbalAlarmClock/KerbalAlarmClock.cs

@@ -180,8 +180,17 @@ internal override void Awake()
 			GameEvents.onGameSceneLoadRequested.Add(OnGameSceneLoadRequestedForAppLauncher);
 			GameEvents.Contract.onContractsLoaded.Add(ContractsReady);
 
-			// Need this one to handle the hideUI cancelling via pause menu
-			GameEvents.onGameUnpause.Add(OnUnpause);
+            GameEvents.onGUIAdministrationFacilitySpawn.Add(EnterKSCFacility);
+            GameEvents.onGUIAstronautComplexSpawn.Add(EnterKSCFacility);
+            GameEvents.onGUIMissionControlSpawn.Add(EnterKSCFacility);
+            GameEvents.onGUIRnDComplexSpawn.Add(EnterKSCFacility);
+            GameEvents.onGUIAdministrationFacilityDespawn.Add(LeaveKSCFacility);
+            GameEvents.onGUIAstronautComplexDespawn.Add(LeaveKSCFacility);
+            GameEvents.onGUIMissionControlDespawn.Add(LeaveKSCFacility);
+            GameEvents.onGUIRnDComplexDespawn.Add(LeaveKSCFacility);
+
+            // Need this one to handle the hideUI cancelling via pause menu
+            GameEvents.onGameUnpause.Add(OnUnpause);
 
 			blnFilterToVessel = false;
 			if (HighLogic.LoadedScene == GameScenes.TRACKSTATION ||
@@ -212,7 +221,7 @@ internal override void Awake()
 			APIAwake();
 		}
 
-		private void InitAudio()
+        private void InitAudio()
 		{
 			audioController = AddComponent<AudioController>();
 			audioController.mbKAC = this;
@@ -275,8 +284,17 @@ internal override void OnDestroy()
 			GameEvents.onGameSceneLoadRequested.Remove(OnGameSceneLoadRequestedForAppLauncher);
 			GameEvents.Contract.onContractsLoaded.Remove(ContractsReady);
 
-			// Need this one to handle the hideUI cancelling via pause menu
-			GameEvents.onGameUnpause.Remove(OnUnpause);
+            GameEvents.onGUIAdministrationFacilitySpawn.Remove(EnterKSCFacility);
+            GameEvents.onGUIAstronautComplexSpawn.Remove(EnterKSCFacility);
+            GameEvents.onGUIMissionControlSpawn.Remove(EnterKSCFacility);
+            GameEvents.onGUIRnDComplexSpawn.Remove(EnterKSCFacility);
+            GameEvents.onGUIAdministrationFacilityDespawn.Remove(LeaveKSCFacility);
+            GameEvents.onGUIAstronautComplexDespawn.Remove(LeaveKSCFacility);
+            GameEvents.onGUIMissionControlDespawn.Remove(LeaveKSCFacility);
+            GameEvents.onGUIRnDComplexDespawn.Remove(LeaveKSCFacility);
+
+            // Need this one to handle the hideUI cancelling via pause menu
+            GameEvents.onGameUnpause.Remove(OnUnpause);
 
 
 			Destroy(PhaseAngle);
@@ -302,9 +320,13 @@ void ContractsReady()
 			blnContractsSystemReady = true;
 		}
 
-		#region "Update Code"
-		//Update Function - Happens on every frame - this is where behavioural stuff is typically done
-		internal override void Update()
+        //Hide the KAC when in SC overlay scenes
+        private void EnterKSCFacility() { inAdminFacility = true; }
+        private void LeaveKSCFacility() { inAdminFacility = false; }
+
+        #region "Update Code"
+        //Update Function - Happens on every frame - this is where behavioural stuff is typically done
+        internal override void Update()
 		{
 			KACWorkerGameState.SetCurrentGUIStates();
 			//if scene has changed
@@ -429,7 +451,7 @@ private void OnUnpause()
 		}
 
 		private Boolean GUIVisible = true;
-
+        private Boolean inAdminFacility = false;
 
 		//public void OnGUI()
 		internal override void OnGUIEvery()
@@ -464,7 +486,7 @@ internal override void OnGUIEvery()
 				isPauseMenuOpen = PauseMenu.isOpen;
 			} catch{}
 
-			if (GUIVisible && blnFlightUIVisible && !(HighLogic.LoadedScene == GameScenes.FLIGHT && isPauseMenuOpen))
+			if (GUIVisible && blnFlightUIVisible && !inAdminFacility && !(HighLogic.LoadedScene == GameScenes.FLIGHT && isPauseMenuOpen && settings.HideOnPause))
 				{
 					DrawGUI();
 			}
@@ -539,40 +561,22 @@ public void DrawGUI()
 			//Draw the icon that should be there all the time
 			DrawIcons();
 
-			Boolean blnShowInterface = true;
-			Boolean isPauseMenuOpen = false;
-			try
-			{
-				isPauseMenuOpen = PauseMenu.isOpen;
-			}
-			catch { }
+			// look for passed alarms to display stuff
+			if (IconShowByActiveScene)
+				TriggeredAlarms();
 
-			if (KACWorkerGameState.CurrentGUIScene == GameScenes.FLIGHT)
+			//If the mainwindow is visible And no pause menu then draw it
+			if (WindowVisibleByActiveScene)
 			{
-				if (settings.HideOnPause && isPauseMenuOpen)
-					blnShowInterface = false;
+				DrawWindowsPre();
+				DrawWindows();
+				DrawWindowsPost();
+
 			}
 
-			//If game has pause menu up see whether to display the interface
-			if (blnShowInterface)
+			if (settings.WarpToEnabled)
 			{
-				// look for passed alarms to display stuff
-				if (IconShowByActiveScene)
-					TriggeredAlarms();
-
-				//If the mainwindow is visible And no pause menu then draw it
-				if (WindowVisibleByActiveScene)
-				{
-					DrawWindowsPre();
-					DrawWindows();
-					DrawWindowsPost();
-
-				}
-
-				if (settings.WarpToEnabled)
-				{
-					DrawNodeButtons();
-				}
+				DrawNodeButtons();
 			}
 
 			//Do the stuff to lock inputs of people have that turned on

KerbalAlarmClock/KerbalAlarmClock.version

@@ -5,7 +5,7 @@
   "VERSION": {
     "MAJOR": 3,
     "MINOR": 8,
-    "PATCH": 3,
+    "PATCH": 4,
     "BUILD": 0
   },
   "KSP_VERSION": {

KerbalAlarmClock/KerbalAlarmClock_WindowAlarm.cs

@@ -500,6 +500,8 @@ private int DrawAlarmActionButtons(KACAlarm tmpAlarm, out int NoOfDoubleLineButt
 				if ((tmpAlarm.ManNodes != null) && tmpAlarm.ManNodes.Count > 0)
 				//if ((tmpAlarm.ManNodes != null) && ((tmpAlarm.Remaining.UT + tmpAlarm.AlarmMarginSecs) > 0))
 				{
+                    bool blnDontShowManNode = false;
+
 					//Check if theres a Maneuver node and if so put a label saying that it already exists
 					//only display this node button if its the active ship
 					//Add this sae functionality to the alarm triggered window
@@ -509,25 +511,28 @@ private int DrawAlarmActionButtons(KACAlarm tmpAlarm, out int NoOfDoubleLineButt
 					if (KACWorkerGameState.CurrentVessel.patchedConicSolver.maneuverNodes.Count > 0)
 					{
 						strRestoretext = "Replace Maneuver Node(s)";
-						//if the count and UT's are the same then go from there
-						if (!KACAlarm.CompareManNodeListSimple(KACWorkerGameState.CurrentVessel.patchedConicSolver.maneuverNodes, tmpAlarm.ManNodes))
-							strRestoretext += "\r\nNOTE: There is already a Node on the flight path";
-						else
-							strRestoretext += "\r\nNOTE: These nodes appear to be already set on the flight path";
-						NoOfDoubleLineButtons++;
-					}
-					if ((tmpAlarm.Remaining.UT + tmpAlarm.AlarmMarginSecs) < 0)
-					{
-						strRestoretext += "\r\nWARNING: The stored Nodes are in the past";
-						NoOfDoubleLineButtons++;
-					}
-					intReturnNoOfButtons++;
-					if (GUILayout.Button(strRestoretext, KACResources.styleButton))
-					{
-						LogFormatted("Attempting to add Node");
-						KACWorkerGameState.CurrentVessel.patchedConicSolver.maneuverNodes.Clear();
-						RestoreManeuverNodeList(tmpAlarm.ManNodes);
+                        //if the count and UT's are the same then go from there
+                        if(!KACAlarm.CompareManNodeListSimple(KACWorkerGameState.CurrentVessel.patchedConicSolver.maneuverNodes, tmpAlarm.ManNodes)) {
+                            strRestoretext += "\r\nNOTE: There is already a Node on the flight path";
+                            NoOfDoubleLineButtons++;
+                        } else {
+                            //Dont show the button
+                            blnDontShowManNode = true;
+                        }
 					}
+
+                    if(!blnDontShowManNode) {
+                        if((tmpAlarm.Remaining.UT + tmpAlarm.AlarmMarginSecs) < 0) {
+                            strRestoretext += "\r\nWARNING: The stored Nodes are in the past";
+                            NoOfDoubleLineButtons++;
+                        }
+                        intReturnNoOfButtons++;
+                        if(GUILayout.Button(strRestoretext, KACResources.styleButton)) {
+                            LogFormatted("Attempting to add Node");
+                            KACWorkerGameState.CurrentVessel.patchedConicSolver.maneuverNodes.Clear();
+                            RestoreManeuverNodeList(tmpAlarm.ManNodes);
+                        }
+                    }
 				}
 				//There is a stored Target, that hasnt passed
 				//if ((tmpAlarm.TargetObject != null) && ((tmpAlarm.Remaining.UT + tmpAlarm.AlarmMarginSecs) > 0))

KerbalAlarmClock/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // 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("3.8.3.0")]
-[assembly: AssemblyFileVersion("3.8.3.0")]
+[assembly: AssemblyVersion("3.8.4.0")]
+[assembly: AssemblyFileVersion("3.8.4.0")]

PlugInFiles/ReadMe-KerbalAlarmClock.txt

@@ -32,6 +32,12 @@ ATTRIBUTION-SOUNDS
 Included Sounds are from freesfx.co.uk (http://www.freesfx.co.uk). EULA can be found here: http://www.freesfx.co.uk/info/eula/
 
 VERSION HISTORY
+Version 3.8.4.0		-	KSP Version: 1.2.2
+- Fixed bug in HideWhenPaused logic - (Issue #184)
+- Hide the KAC when in the SpaceCenter overlay scenes Issue #186)
+
+- No longer create duplicate mannodes from alarm windows
+
 Version 3.8.3.0		-	KSP Version: 1.2.2
 - Fixed stupd typo with scrollview and add transfer (Issue #183)