Merge branch 'develop'

Dunbaratu · Dunbaratu · commit 2f807ca9926a · 2021-01-18T17:42:08.000-06:00
diff --git a/Resources/GameData/kOS/kOS.version b/Resources/GameData/kOS/kOS.version
@@ -11,7 +11,7 @@
   "VERSION": {
     "MAJOR": 1,
     "MINOR": 3,
-    "PATCH": 0,
+    "PATCH": 1,
     "BUILD": 0
   },
   "KSP_VERSION": {
diff --git a/doc/source/commands/prediction.rst b/doc/source/commands/prediction.rst
@@ -39,7 +39,7 @@ These return predicted information about the future position and velocity of an
     :param orbitable: A :struct:`Vessel`, :struct:`Body` or other :struct:`Orbitable` object
     :type orbitable:  :struct:`Orbitable`
     :param time:    Time of prediction
-    :type time:     :struct:`TimeSpan`
+    :type time:     :struct:`TimeStamp` or :struct:`Scalar` universal seconds
     :return:        A position :struct:`Vector` expressed as the coordinates in the :ref:`ship-center-raw-rotation <ship-raw>` frame
 
     Returns a prediction of where the :struct:`Orbitable` will be at some :ref:`universal Time <universal_time>`. If the :struct:`Orbitable` is a :struct:`Vessel`, and the :struct:`Vessel` has planned :ref:`maneuver nodes <maneuver node>`, the prediction assumes they will be executed exactly as planned.
@@ -59,7 +59,7 @@ These return predicted information about the future position and velocity of an
     :param orbitable: A :struct:`Vessel`, :struct:`Body` or other :struct:`Orbitable` object
     :type orbitable:  :struct:`Orbitable`
     :param time:    Time of prediction
-    :type time:     :struct:`TimeSpan`
+    :type time:     :struct:`TimeStamp` or :struct:`Scalar` universal seconds
     :return: An :ref:`ObitalVelocity <orbitablevelocity>` structure.
 
     Returns a prediction of what the :ref:`Orbitable's <orbitable>` velocity will be at some :ref:`universal Time <universal_time>`. If the :struct:`Orbitable` is a :struct:`Vessel`, and the :struct:`Vessel` has planned :struct:`maneuver nodes <Node>`, the prediction assumes they will be executed exactly as planned.
@@ -98,7 +98,7 @@ These return predicted information about the future position and velocity of an
     :param orbitable: A :Ref:`Vessel <vessel>`, :struct:`Body` or other :struct:`Orbitable` object
     :type orbitable:  :struct:`Orbitable`
     :param time:    Time of prediction
-    :type time:     :struct:`TimeSpan`
+    :type time:     :struct:`TimeStamp` or :struct:`Scalar` universal seconds
     :return: An :struct:`Orbit` structure.
 
     Returns the :ref:`Orbit patch <orbit>` where the :struct:`Orbitable` object is predicted to be at some :ref:`universal Time <universal_time>`. If the :struct:`Orbitable` is a :struct:`Vessel`, and the :struct:`Vessel` has planned :ref:`maneuver nodes <maneuver node>`, the prediction assumes they will be executed exactly as planned.
diff --git a/doc/source/structures/communication/message.rst b/doc/source/structures/communication/message.rst
@@ -35,10 +35,10 @@ Structure
           - Description
 
         * - :attr:`SENTAT`
-          - :struct:`TimeSpan`
+          - :struct:`TimeStamp`
           - date this message was sent at
         * - :attr:`RECEIVEDAT`
-          - :struct:`TimeSpan`
+          - :struct:`TimeStamp`
           - date this message was received at
         * - :attr:`SENDER`
           - :struct:`Vessel` or :struct:`Boolean`
@@ -56,13 +56,13 @@ Structure
 
 .. attribute:: Message:SENTAT
 
-    :type: :struct:`TimeSpan`
+    :type: :struct:`TimeStamp`
 
     Date this message was sent at.
 
 .. attribute:: Message:RECEIVEDAT
 
-    :type: :struct:`TimeSpan`
+    :type: :struct:`TimeStamp`
 
     Date this message was received at.
 
diff --git a/doc/source/structures/misc/kuniverse.rst b/doc/source/structures/misc/kuniverse.rst
@@ -323,8 +323,9 @@ KUniverse 4th wall methods
     have passed (25 x 60 x 60).  It doesn't care how that translates into
     minutes, hours, days, and years until showing it on screen to the player.)
 
-    This setting also affects how values from :struct:Timespan calculate
-    the ``:hours``, ``:days``, and ``:years`` suffixes.
+    This setting also affects how values from :struct:`TimeSpan` and
+    :struct:`TimeStamp` calculate the ``:hours``, ``:days``, and ``:years``
+    suffixes.
 
     Note that this setting is not settable.  This decision was made because
     the main stock KSP game only ever changes the setting on the main
diff --git a/src/kOS.Safe.Test/Properties/AssemblyInfo.cs b/src/kOS.Safe.Test/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: AssemblyFileVersion("1.3.0.0")]
-[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyVersion("1.3.1.0")]
diff --git a/src/kOS.Safe/Properties/AssemblyInfo.cs b/src/kOS.Safe/Properties/AssemblyInfo.cs
@@ -31,5 +31,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: AssemblyFileVersion("1.3.0.0")]
-[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyVersion("1.3.1.0")]
diff --git a/src/kOS.Safe/kOS.Safe.csproj b/src/kOS.Safe/kOS.Safe.csproj
@@ -79,7 +79,6 @@
     <Compile Include="Exceptions\KOSNumberParseException.cs" />
     <Compile Include="Exceptions\KOSObsoletionException.cs" />
     <Compile Include="Exceptions\KOSPatchesObsoletionException.cs" />
-    <Compile Include="Exceptions\KOSTimeStampTimeSpanException.cs" />
     <Compile Include="Exceptions\KOSVolumeOutOfRangeException.cs" />
     <Compile Include="Exceptions\KOSYouShouldNeverSeeThisException.cs" />
     <Compile Include="Compilation\KS\BreakInfo.cs" />
diff --git a/src/kOS.sln b/src/kOS.sln
@@ -15,16 +15,16 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{465EC87D-723D-4A6C-B116-9777AC641DE3}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{465EC87D-723D-4A6C-B116-9777AC641DE3}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{465EC87D-723D-4A6C-B116-9777AC641DE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{465EC87D-723D-4A6C-B116-9777AC641DE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{465EC87D-723D-4A6C-B116-9777AC641DE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{465EC87D-723D-4A6C-B116-9777AC641DE3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{590FFDA8-7B44-4BC3-A12A-5FFE2BB7D8FD}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{590FFDA8-7B44-4BC3-A12A-5FFE2BB7D8FD}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{590FFDA8-7B44-4BC3-A12A-5FFE2BB7D8FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{590FFDA8-7B44-4BC3-A12A-5FFE2BB7D8FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{590FFDA8-7B44-4BC3-A12A-5FFE2BB7D8FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{590FFDA8-7B44-4BC3-A12A-5FFE2BB7D8FD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C9A42A44-DDC8-4D6C-8A16-D7F30F494B46}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{C9A42A44-DDC8-4D6C-8A16-D7F30F494B46}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{C9A42A44-DDC8-4D6C-8A16-D7F30F494B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9A42A44-DDC8-4D6C-8A16-D7F30F494B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C9A42A44-DDC8-4D6C-8A16-D7F30F494B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C9A42A44-DDC8-4D6C-8A16-D7F30F494B46}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
diff --git a/src/kOS/Binding/FlightStats.cs b/src/kOS/Binding/FlightStats.cs
@@ -28,7 +28,7 @@ public override void AddTo(SharedObjects shared)
             // While it would be cleaner to make it JUST a built -in function,
             // the bound variable had to be retained for backward compatibility with scripts
             // that call TIME without parentheses:
-            shared.BindingMgr.AddGetter("TIME", () => new TimeSpan(Planetarium.GetUniversalTime()));
+            shared.BindingMgr.AddGetter("TIME", () => new TimeStamp(Planetarium.GetUniversalTime()));
             shared.BindingMgr.AddGetter("ACTIVESHIP", () => VesselTarget.CreateOrGetExisting(FlightGlobals.ActiveVessel, shared));
             shared.BindingMgr.AddGetter("STATUS", () => shared.Vessel.situation.ToString());
             shared.BindingMgr.AddGetter("STAGE", () => shared.VesselTarget.StageValues);
diff --git a/src/kOS/Communication/MessageStructure.cs b/src/kOS/Communication/MessageStructure.cs
@@ -51,8 +51,8 @@ public static MessageStructure CreateFromDump(SafeSharedObjects shared, Dump d)
 
         private void InitializeSuffixes()
         {
-            AddSuffix("SENTAT", new Suffix<kOS.Suffixed.TimeSpan>(() => new kOS.Suffixed.TimeSpan(Message.SentAt)));
-            AddSuffix("RECEIVEDAT", new Suffix<kOS.Suffixed.TimeSpan>(() => new kOS.Suffixed.TimeSpan(Message.ReceivedAt)));
+            AddSuffix("SENTAT", new Suffix<kOS.Suffixed.TimeStamp>(() => new kOS.Suffixed.TimeStamp(Message.SentAt)));
+            AddSuffix("RECEIVEDAT", new Suffix<kOS.Suffixed.TimeStamp>(() => new kOS.Suffixed.TimeStamp(Message.ReceivedAt)));
             AddSuffix("SENDER", new Suffix<Structure>(GetVesselTarget));
             AddSuffix("HASSENDER", new Suffix<BooleanValue>(GetVesselExists));
             AddSuffix("CONTENT", new Suffix<Structure>(DeserializeContent));
diff --git a/src/kOS/Communication/VesselConnection.cs b/src/kOS/Communication/VesselConnection.cs
@@ -1,12 +1,11 @@
-﻿using System;
+using System;
 using kOS.Safe.Encapsulation;
 using kOS.Safe.Encapsulation.Suffixes;
 using kOS.Communication;
 using UnityEngine;
 using kOS.Safe.Exceptions;
 using kOS.Safe.Serialization;
 using kOS.Suffixed;
-using TimeSpan = kOS.Suffixed.TimeSpan;
 using kOS.Safe.Communication;
 
 namespace kOS.Communication
diff --git a/src/kOS/Function/FunctionBase.cs b/src/kOS/Function/FunctionBase.cs
@@ -2,7 +2,6 @@
 using kOS.Safe.Function;
 using kOS.Suffixed;
 using System;
-using TimeSpan = kOS.Suffixed.TimeSpan;
 
 namespace kOS.Function
 {
@@ -45,9 +44,9 @@ protected RgbaColor GetRgba(object argument)
             throw new KOSCastException(argument.GetType(), typeof(RgbaColor));
         }
 
-        protected TimeSpan GetTimeSpan(object argument)
+        protected TimeStamp GetTimeStamp(object argument)
         {
-            var span = argument as TimeSpan;
+            var span = argument as TimeStamp;
             if (span != null)
             {
                 return span;
@@ -56,11 +55,11 @@ protected TimeSpan GetTimeSpan(object argument)
             {
                 // Convert to double instead of cast in case the identifier is stored
                 // as an encapsulated ScalarValue, preventing an unboxing collision.
-                return new TimeSpan(Convert.ToDouble(argument));
+                return new TimeStamp(Convert.ToDouble(argument));
             }
             catch
             {
-                throw new KOSCastException(argument.GetType(), typeof(TimeSpan));
+                throw new KOSCastException(argument.GetType(), typeof(TimeStamp));
             }
         }
 
diff --git a/src/kOS/Function/Suffixed.cs b/src/kOS/Function/Suffixed.cs
@@ -379,7 +379,7 @@ public override void Execute(SharedObjects shared)
             int argCount = CountRemainingArgs(shared);
 
             // If zero args, then the default is to assume you want to
-            // make a Timespan of "now":
+            // make a TimeStamp of "now":
             if (argCount == 0)
             {
                 ReturnValue = new kOS.Suffixed.TimeStamp(Planetarium.GetUniversalTime());
@@ -667,7 +667,7 @@ public class FunctionPositionAt : FunctionBase
     {
         public override void Execute(SharedObjects shared)
         {
-            var when = GetTimeSpan(PopValueAssert(shared));
+            var when = GetTimeStamp(PopValueAssert(shared));
             var what = GetOrbitable(PopValueAssert(shared));
             AssertArgBottomAndConsume(shared);
 
@@ -680,7 +680,7 @@ public class FunctionVelocityAt : FunctionBase
     {
         public override void Execute(SharedObjects shared)
         {
-            var when = GetTimeSpan(PopValueAssert(shared));
+            var when = GetTimeStamp(PopValueAssert(shared));
             var what = GetOrbitable(PopValueAssert(shared));
             AssertArgBottomAndConsume(shared);
 
@@ -706,7 +706,7 @@ public class FunctionOrbitAt : FunctionBase
     {
         public override void Execute(SharedObjects shared)
         {
-            var when = GetTimeSpan(PopValueAssert(shared));
+            var when = GetTimeStamp(PopValueAssert(shared));
             var what = GetOrbitable(PopValueAssert(shared));
             AssertArgBottomAndConsume(shared);
 
diff --git a/src/kOS/Properties/AssemblyInfo.cs b/src/kOS/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 // 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: AssemblyFileVersion("1.3.0.0")]
-[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyVersion("1.3.1.0")]
 [assembly: KSPAssembly("kOS", 1, 3)]
diff --git a/src/kOS/Screen/ConnectivityInterpreter.cs b/src/kOS/Screen/ConnectivityInterpreter.cs
@@ -1,4 +1,4 @@
-﻿using kOS.Communication;
+using kOS.Communication;
 using kOS.Safe;
 using kOS.Safe.Screen;
 using kOS.Safe.UserIO;
@@ -189,7 +189,7 @@ private void DrawProgressBar(double elapsed, double total)
             if (progressBarSubBuffer.Enabled)
             {
                 var bars = Math.Max((int)((ColumnCount) * elapsed / total), 0);
-                var time = new DateTime(TimeSpan.FromSeconds(total - elapsed + 0.5).Ticks).ToString("H:mm:ss");
+                var time = new DateTime(System.TimeSpan.FromSeconds(total - elapsed + 0.5).Ticks).ToString("H:mm:ss");
                 string statusText = deploymentMessage + new string(' ', ColumnCount - time.Length - deploymentMessage.Length) + time;
                 var barsText = new string('|', bars);
                 DrawStatus(statusText);
diff --git a/src/kOS/Screen/TermWindow.cs b/src/kOS/Screen/TermWindow.cs
@@ -80,9 +80,9 @@ public class TermWindow : KOSManagedWindow , ITermWindow
             
         private bool isLocked;
         /// <summary>How long blinks should last for, for various blinking needs</summary>
-        private readonly TimeSpan blinkDuration = TimeSpan.FromMilliseconds(150);
+        private readonly TimeSpan blinkDuration = System.TimeSpan.FromMilliseconds(150);
         /// <summary>How long to pad between consecutive blinks to ensure they are visibly detectable as distinct blinks.</summary>
-        private readonly TimeSpan blinkCoolDownDuration = TimeSpan.FromMilliseconds(50);
+        private readonly TimeSpan blinkCoolDownDuration = System.TimeSpan.FromMilliseconds(50);
         /// <summary>At what milliseconds-from-epoch timestamp will the current blink be over.</summary>
         private DateTime blinkEndTime;
         /// <summary>text color that changes depending on if the computer is on</summary>
@@ -438,7 +438,7 @@ void TelnetOutputUpdate()
             
             // Throttle it back so the faster Update() rates don't cause pointlessly repeated work:
             // Needs to be no faster than the fastest theoretical typist or script might change the view.
-            if (newTime > lastTelnetIncrementalRepaint + TimeSpan.FromMilliseconds(50)) // = 1/20th second.
+            if (newTime > lastTelnetIncrementalRepaint + System.TimeSpan.FromMilliseconds(50)) // = 1/20th second.
             {
                 lastTelnetIncrementalRepaint = newTime;
                 foreach (TelnetSingletonServer telnet in telnets)
@@ -844,7 +844,7 @@ void GetNewestBuffer()
             
             // Throttle it back so the faster Update() rates don't cause pointlessly repeated work:
             // Needs to be no faster than the fastest theoretical typist or script might change the view.
-            if (newTime > lastBufferGet + TimeSpan.FromMilliseconds(50)) // = 1/20th second.
+            if (newTime > lastBufferGet + System.TimeSpan.FromMilliseconds(50)) // = 1/20th second.
             {
                 mostRecentScreen = new ScreenSnapShot(shared.Screen);
                 lastBufferGet = newTime;
diff --git a/src/kOS/Suffixed/BodyTarget.cs b/src/kOS/Suffixed/BodyTarget.cs
@@ -149,12 +149,12 @@ public override OrbitableVelocity GetVelocities()
             return new OrbitableVelocity(Body, Shared);
         }
 
-        public override Vector GetPositionAtUT(TimeSpan timeStamp)
+        public override Vector GetPositionAtUT(TimeStamp timeStamp)
         {
             return new Vector(Body.getPositionAtUT(timeStamp.ToUnixStyleTime()) - Shared.Vessel.CoMD);
         }
 
-        public override OrbitableVelocity GetVelocitiesAtUT(TimeSpan timeStamp)
+        public override OrbitableVelocity GetVelocitiesAtUT(TimeStamp timeStamp)
         {
             CelestialBody parent = Body.KOSExtensionGetParentBody();
             if (parent == null) // only if Body is Sun and therefore has no parent, then do more complex work instead because KSP didn't provide a way itself
diff --git a/src/kOS/Suffixed/Node.cs b/src/kOS/Suffixed/Node.cs
@@ -38,7 +38,7 @@ public Node(TimeStamp stamp, double radialOut, double normal, double prograde, S
         {
         }
 
-            public Node(kOS.Suffixed.TimeSpan span, double radialOut, double normal, double prograde, SharedObjects sharedObj)
+        public Node(kOS.Suffixed.TimeSpan span, double radialOut, double normal, double prograde, SharedObjects sharedObj)
             : this(sharedObj)
         {
             this.time = Planetarium.GetUniversalTime() + span.ToUnixStyleTime();
diff --git a/src/kOS/Suffixed/OrbitInfo.cs b/src/kOS/Suffixed/OrbitInfo.cs
@@ -59,8 +59,8 @@ private void InitializeSuffixes()
                                                                    ));
             AddSuffix("EPOCH", new Suffix<ScalarValue>(() => orbit.epoch));
             AddSuffix("TRANSITION", new Suffix<StringValue>(() => orbit.patchEndTransition.ToString()));
-            AddSuffix("POSITION", new Suffix<Vector>(() => GetPositionAtUT( new TimeSpan(Planetarium.GetUniversalTime() ) )));
-            AddSuffix("VELOCITY", new Suffix<OrbitableVelocity>(() => GetVelocityAtUT( new TimeSpan(Planetarium.GetUniversalTime() ) )));
+            AddSuffix("POSITION", new Suffix<Vector>(() => GetPositionAtUT( new TimeStamp(Planetarium.GetUniversalTime() ) )));
+            AddSuffix("VELOCITY", new Suffix<OrbitableVelocity>(() => GetVelocityAtUT( new TimeStamp(Planetarium.GetUniversalTime() ) )));
             AddSuffix("NEXTPATCH", new Suffix<OrbitInfo>(GetNextPatch));
             AddSuffix("HASNEXTPATCH", new Suffix<BooleanValue>(GetHasNextPatch));
             AddSuffix("NEXTPATCHETA", new Suffix<ScalarValue>(() => GetETA().GetEndTransition()));  // deprecated alias for :ETA:TRANSITION
@@ -94,7 +94,7 @@ private OrbitEta GetETA()
         /// </summary>
         /// <param name="timeStamp">The universal time to query for</param>
         /// <returns></returns>
-        public Vector GetPositionAtUT( TimeSpan timeStamp )
+        public Vector GetPositionAtUT( TimeStamp timeStamp )
         {
             return new Vector( orbit.getPositionAtUT( timeStamp.ToUnixStyleTime() ) - Shared.Vessel.CoMD );
         }
@@ -107,7 +107,7 @@ public Vector GetPositionAtUT( TimeSpan timeStamp )
         /// </summary>
         /// <param name="timeStamp">The universal time to query for</param>
         /// <returns></returns>
-        public OrbitableVelocity GetVelocityAtUT( TimeSpan timeStamp )
+        public OrbitableVelocity GetVelocityAtUT( TimeStamp timeStamp )
         {
             var orbVel = new Vector( orbit.getOrbitalVelocityAtUT( timeStamp.ToUnixStyleTime() ) );
             // For some weird reason orbit returns velocities with Y and Z swapped, so flip them back:
diff --git a/src/kOS/Suffixed/Orbitable.cs b/src/kOS/Suffixed/Orbitable.cs
@@ -74,7 +74,7 @@ protected Orbitable()
         ///   </a>
         ///   coordinate reference frame.
         /// </returns>
-        public abstract Vector GetPositionAtUT( TimeSpan timeStamp );
+        public abstract Vector GetPositionAtUT( TimeStamp timeStamp );
 
         /// <summary>
         ///   Subclasses must override this method to return the OrbitableVelocity of this object at some
@@ -91,7 +91,7 @@ protected Orbitable()
         ///   </a>
         ///   coordinate reference frame.
         /// </returns>
-        public abstract OrbitableVelocity GetVelocitiesAtUT( TimeSpan timeStamp );
+        public abstract OrbitableVelocity GetVelocitiesAtUT( TimeStamp timeStamp );
 
         /// <summary>
         ///   Return the Orbit that the object will be in at some point in the future.
diff --git a/src/kOS/Suffixed/VesselTarget.cs b/src/kOS/Suffixed/VesselTarget.cs
diff --git a/src/kOS/UserIO/TelnetSingletonServer.cs b/src/kOS/UserIO/TelnetSingletonServer.cs
diff --git a/src/kOS/UserIO/TelnetWelcomeMenu.cs b/src/kOS/UserIO/TelnetWelcomeMenu.cs
