diff --git a/Assets/Plugins/KerbalEngineer.Unity.dll b/Assets/Plugins/KerbalEngineer.Unity.dll index ef6be17d..ebfb5eaf 100644 Binary files a/Assets/Plugins/KerbalEngineer.Unity.dll and b/Assets/Plugins/KerbalEngineer.Unity.dll differ diff --git a/Documents/CHANGES.txt b/Documents/CHANGES.txt index 5cc42204..2567859e 100644 --- a/Documents/CHANGES.txt +++ b/Documents/CHANGES.txt @@ -1,3 +1,6 @@ +1.1.8.3, 2021-1-5, KSP 1.11.0 #3045 + - Restore time precision for vessel orbital period, target orbital period, and node post-burn period readouts. + 1.1.8.2, 2020-12-31, KSP 1.11.0 #3045 - Fix burn time calcs for engines using Intake Air - All 'time" readouts now show a maximum of 2 units. (i.e. years/days or minutes/seconds) diff --git a/KerbalEngineer/EngineerGlobals.cs b/KerbalEngineer/EngineerGlobals.cs index d4695892..adff1935 100644 --- a/KerbalEngineer/EngineerGlobals.cs +++ b/KerbalEngineer/EngineerGlobals.cs @@ -21,7 +21,7 @@ public static class EngineerGlobals /// /// Current version of the Kerbal Engineer assembly. /// - public const string ASSEMBLY_VERSION = "1.1.8.2"; + public const string ASSEMBLY_VERSION = "1.1.8.3"; private static string assemblyFile; private static string assemblyName; diff --git a/KerbalEngineer/Helpers/TimeFormatter.cs b/KerbalEngineer/Helpers/TimeFormatter.cs index 9b13787a..ec0f9144 100755 --- a/KerbalEngineer/Helpers/TimeFormatter.cs +++ b/KerbalEngineer/Helpers/TimeFormatter.cs @@ -46,24 +46,46 @@ public static string ConvertToString(double seconds, string format = "F1") minutes = (int)(seconds / 60.0); seconds -= minutes * 60.0; - - if (years > 0) - { - return string.Format("{0}y {1}d", years, days); - } - if (days > 0) - { - return string.Format("{0}d {1}h", days, hours); - } - if (hours > 0) - { - return string.Format("{0}h {1}m", hours, minutes); + if (format == "F3") + { //Full time + if (years > 0) + { + return string.Format("{0}y {1}d {2}h {3}m {4}s", years, days, hours, minutes, seconds.ToString(format)); + } + if (days > 0) + { + return string.Format("{1}d {2}h {3}m {4}s", years, days, hours, minutes, seconds.ToString(format)); + } + if (hours > 0) + { + return string.Format("{2}h {3}m {4}s", years, days, hours, minutes, seconds.ToString(format)); + } + if (minutes > 0) + { + return string.Format("{3}m {4}s", years, days, hours, minutes, seconds.ToString(format)); + } + return string.Format("{4}s", years, days, hours, minutes, seconds.ToString(format)); } - if (minutes > 0) - { - return string.Format("{0}m {1}s", minutes, seconds.ToString("F0")); + else + { //Short Time + if (years > 0) + { + return string.Format("{0}y {1}d", years, days); + } + if (days > 0) + { + return string.Format("{0}d {1}h", days, hours); + } + if (hours > 0) + { + return string.Format("{0}h {1}m", hours, minutes); + } + if (minutes > 0) + { + return string.Format("{0}m {1}s", minutes, seconds.ToString("F0")); + } + return string.Format("{0}s", seconds.ToString(format)); } - return string.Format("{0}s", seconds.ToString(format)); } else { diff --git a/Output/KerbalEngineer/KerbalEngineer.Unity.dll b/Output/KerbalEngineer/KerbalEngineer.Unity.dll index ef6be17d..ebfb5eaf 100644 Binary files a/Output/KerbalEngineer/KerbalEngineer.Unity.dll and b/Output/KerbalEngineer/KerbalEngineer.Unity.dll differ diff --git a/Output/KerbalEngineer/KerbalEngineer.dll b/Output/KerbalEngineer/KerbalEngineer.dll index 56d56041..a1e05051 100644 Binary files a/Output/KerbalEngineer/KerbalEngineer.dll and b/Output/KerbalEngineer/KerbalEngineer.dll differ diff --git a/Output/KerbalEngineer/KerbalEngineer.version b/Output/KerbalEngineer/KerbalEngineer.version index 986713b4..41283a43 100644 --- a/Output/KerbalEngineer/KerbalEngineer.version +++ b/Output/KerbalEngineer/KerbalEngineer.version @@ -7,7 +7,7 @@ "MAJOR":1, "MINOR":1, "PATCH":8, - "BUILD":2 + "BUILD":3 }, "KSP_VERSION": {