Merge 3.13.0.0 to master

Author: TriggerAu

KerbalAlarmClock/API/KACWrapper.cs

@@ -386,9 +386,11 @@ internal KACAlarm(Object a)
                     AlarmTypeField = KACAlarmType.GetField("TypeOfAlarm");
                     AlarmTimeProperty = KACAlarmType.GetProperty("AlarmTimeUT");
                     AlarmMarginField = KACAlarmType.GetField("AlarmMarginSecs");
-                    AlarmActionField = KACAlarmType.GetField("AlarmAction");
                     RemainingField = KACAlarmType.GetField("Remaining");
 
+                    AlarmActionField = KACAlarmType.GetField("AlarmAction");
+                    ActionActionProperty = KACAlarmType.GetProperty("AlarmActionConvert");
+
                     XferOriginBodyNameField = KACAlarmType.GetField("XferOriginBodyName");
                     //LogFormatted("XFEROrigin:{0}", XferOriginBodyNameField == null);
                     XferTargetBodyNameField = KACAlarmType.GetField("XferTargetBodyName");
@@ -498,11 +500,22 @@ public Double AlarmMargin
                 /// <summary>
                 /// What should the Alarm Clock do when the alarm fires
                 /// </summary>
+                //public AlarmActionEnum AlarmAction
+                //{
+                //    get { return (AlarmActionEnum)AlarmActionField.GetValue(actualAlarm); }
+                //    set { AlarmActionField.SetValue(actualAlarm, (Int32)value); }
+                //}
+                /// <summary>
+                /// What should the Alarm Clock do when the alarm fires
+                /// </summary>
                 public AlarmActionEnum AlarmAction
                 {
-                    get { return (AlarmActionEnum)AlarmActionField.GetValue(actualAlarm); }
-                    set { AlarmActionField.SetValue(actualAlarm, (Int32)value); }
+                    get { return (AlarmActionEnum)ActionActionProperty.GetValue(actualAlarm); }
+                    set { ActionActionProperty.SetValue(actualAlarm, (Int32)value); }
                 }
+                private PropertyInfo ActionActionProperty;
+
+
 
                 private FieldInfo RemainingField;
                 /// <summary>
@@ -573,7 +586,7 @@ public enum AlarmActionEnum
                 [Description("Message Only-No Affect on warp")]     MessageOnly,
                 [Description("Kill Warp Only-No Message")]          KillWarpOnly,
                 [Description("Kill Warp and Message")]              KillWarp,
-                [Description("Pause Game and Message")]             PauseGame,
+                [Description("Pause Game and Message")]             PauseGame
             }
 
             public enum TimeEntryPrecisionEnum

KerbalAlarmClock/KerbalAlarmClock.cs

@@ -1008,7 +1008,12 @@ internal void RemoveInputLock()
 
 		private Boolean MouseOverWindow(Rect WindowRect, Boolean WindowVisible)
 		{
-			return WindowVisible && WindowRect.Contains(Event.current.mousePosition);
+			// Use Input instead of Event.current because Event.current.mousePosition
+			// gets inverted for key presses, but Input is stable (though always
+			// inverted).
+			Vector2 mousePos = Input.mousePosition;
+			mousePos.y = Screen.height - mousePos.y;
+			return WindowVisible && WindowRect.Contains(mousePos);
 		}
 
 #if DEBUG

KerbalAlarmClock/KerbalAlarmClock.version

@@ -4,23 +4,23 @@
   "DOWNLOAD" : "https://github.com/TriggerAu/KerbalAlarmClock/releases",
   "VERSION": {
     "MAJOR": 3,
-    "MINOR": 12,
+    "MINOR": 13,
     "PATCH": 0,
     "BUILD": 0
   },
   "KSP_VERSION": {
     "MAJOR": 1,
-    "MINOR": 8,
+    "MINOR": 9,
     "PATCH": 1
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
-    "MINOR": 8,
+    "MINOR": 9,
     "PATCH": 0
   },
   "KSP_VERSION_MAX": {
     "MAJOR": 1,
-    "MINOR": 8,
+    "MINOR": 9,
     "PATCH": 99
   }
 }

KerbalAlarmClock/MuMech_OrbitExtensions.cs

@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Text;
 
+using UnityEngine;
 using KSP;
 
 namespace KerbalAlarmClock
@@ -121,7 +122,7 @@ internal static double UTAtMeanAnomaly(this Orbit o, double meanAnomaly, double
         //The returned value is always between 0 and 360.
         internal static double AscendingNodeTrueAnomaly(this Orbit a, Orbit b)
         {
-            Vector3d vectorToAN = Vector3d.Cross(a.SwappedOrbitNormal(), b.SwappedOrbitNormal());
+            Vector3d vectorToAN = Vector3d.Cross(b.GetOrbitNormal(), a.GetOrbitNormal());
             return a.TrueAnomalyFromVector(vectorToAN);
         }
 
@@ -130,7 +131,8 @@ internal static double AscendingNodeTrueAnomaly(this Orbit a, Orbit b)
         //The returned value is always between 0 and 360.
         internal static double DescendingNodeTrueAnomaly(this Orbit a, Orbit b)
         {
-            return MuUtils.ClampDegrees360(a.AscendingNodeTrueAnomaly(b) + 180);
+            Vector3d vectorToDN = Vector3d.Cross(a.GetOrbitNormal(), b.GetOrbitNormal());
+            return a.TrueAnomalyFromVector(vectorToDN);
         }
 
         //Gives the true anomaly at which o crosses the equator going northwards, if o is east-moving,
@@ -196,23 +198,7 @@ internal static bool DescendingNodeEquatorialExists(this Orbit o)
         //The returned value is always between 0 and 360.
         internal static double TrueAnomalyFromVector(this Orbit o, Vector3d vec)
         {
-            Vector3d projected = Vector3d.Exclude(o.SwappedOrbitNormal(), vec);
-            Vector3d vectorToPe = SwapYZ(o.eccVec);
-            double angleFromPe = Math.Abs(Vector3d.Angle(vectorToPe, projected));
-
-            //If the vector points to the infalling part of the orbit then we need to do 360 minus the
-            //angle from Pe to get the true anomaly. Test this by taking the the cross product of the
-            //orbit normal and vector to the periapsis. This gives a vector that points to center of the 
-            //outgoing side of the orbit. If vectorToAN is more than 90 degrees from this vector, it occurs
-            //during the infalling part of the orbit.
-            if (Math.Abs(Vector3d.Angle(projected, Vector3d.Cross(o.SwappedOrbitNormal(), vectorToPe))) < 90)
-            {
-                return angleFromPe;
-            }
-            else
-            {
-                return 360 - angleFromPe;
-            }
+            return o.GetTrueAnomalyOfZupVector(vec) * Mathf.Rad2Deg;
         }
 
         //Originally by Zool, revised by The_Duck

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.12.0.0")]
-[assembly: AssemblyFileVersion("3.12.0.0")]
+[assembly: AssemblyVersion("3.13.0.0")]
+[assembly: AssemblyFileVersion("3.13.0.0")]

KerbalAlarmClock_APITester/KACAPITester.cs

@@ -83,11 +83,20 @@ internal override void DrawWindow(int id)
 
                 GUILayout.BeginHorizontal();
                 UT = GUILayout.TextField(UT);
-                if (GUILayout.Button("Create One"))
+                if (GUILayout.Button("ChangeTime"))
                 {
                     KACWrapper.KAC.Alarms.First().AlarmTime = Convert.ToDouble(UT);
                 }
                 GUILayout.EndHorizontal();
+
+                if (GUILayout.Button("Create DoNothing"))
+                {
+                    String aID = KACWrapper.KAC.CreateAlarm(KACWrapper.KACAPI.AlarmTypeEnum.TransferModelled, "Test", Planetarium.GetUniversalTime() + 900);
+
+                    KACWrapper.KAC.Alarms.First(z => z.ID == aID).Notes = "FRED FLINTSTONE";
+                    KACWrapper.KAC.Alarms.First(z => z.ID == aID).AlarmMargin = 600;
+                    KACWrapper.KAC.Alarms.First(z => z.ID == aID).AlarmAction = KACWrapper.KACAPI.AlarmActionEnum.DoNothing;
+                }
             }
         }
         String UT="";

KerbalAlarmClock_APITester/KerbalAlarmClock_APITester.csproj

@@ -59,8 +59,8 @@
   <PropertyGroup>
     <PostBuildEvent>rem Set the Variables we need
 echo Finding KSP
-if exist "D:\~Games\KSP_Win_PlugInTest_Minimal\KSP.exe" (
-	set GAMEPATH="D:\~Games\KSP_Win_PlugInTest_Minimal"
+if exist "C:\Data\Programming\KSP\_Versions\KSP_win_PluginTest\KSP_x64.exe" (
+	set GAMEPATH="C:\Data\Programming\KSP\_Versions\KSP_win_PluginTest"
 ) else if exist "C:\~Games\KSP_Win_PlugInTest_Minimal\KSP.exe" (
 	set GAMEPATH="C:\~Games\KSP_Win_PlugInTest_Minimal
 ) else if exist "D:\~Games\KSP_Win_PlugInTest\KSP.exe" (
@@ -75,7 +75,7 @@ if exist "D:\~Games\KSP_Win_PlugInTest_Minimal\KSP.exe" (
 echo Gamepath: %25GAMEPATH%25
 echo ConfigName: $(ConfigurationName)
 set DestPath="%25GAMEPATH%25\GameData\TriggerTech"
-set Binary="%25GAMEPATH%25\KSP.exe"
+set Binary="%25GAMEPATH%25\KSP_x64.exe"
 
 if not $(ConfigurationName)==Debug goto DEBUGREBUILDCONFIG
 :DEBUGCONFIG

PlugInFiles/ReadMe-KerbalAlarmClock.txt

@@ -32,6 +32,12 @@ ATTRIBUTION-SOUNDS
 Included Sounds are from freesfx.co.uk (https://www.freesfx.co.uk). EULA can be found here: https://www.freesfx.co.uk/info/eula/
 
 VERSION HISTORY
+Version 3.13.0.0	-	KSP Version: 1.9.1
+- Recompiled for 1.9.1
+- Fix for input locking chekcing issue on Linux - thanks Taniwha
+- Fix for AN/DN timing (Issue #239) - Thanks Doxen
+- Update API Wrapper for actions (Issue #233)
+
 Version 3.12.0.0	-	KSP Version: 1.8.1
 - Recompiled for 1.8.1 (Issue #234)