OAB stage info upgrades

- Sea Level TWR and DeltaV now more accurately calculated
- VesselDeltaVCalculationMessage update skipper if it originated from vessel in flight
- CelestionBodies selection formatted in a tree-like structure
- Log info for SW version detection

Author: Falki-git

MicroEngineerProject/MicroEngineer/MicroCelestialBodies.cs

@@ -1,5 +1,5 @@
 using KSP.Game;
-using KSP.Sim.Definitions;
+using KSP.Sim.impl;
 
 namespace MicroMod
 {
@@ -16,7 +16,7 @@ internal bool GetBodies()
             if (this.Bodies.Count > 0)
                 return true;
 
-            Dictionary<string, CelestialBodyCore> bodies = GameManager.Instance?.Game?.CelestialBodies?.GetAllBodiesData();
+            List<CelestialBodyComponent> bodies = GameManager.Instance?.Game?.UniverseModel?.GetAllCelestialBodies();
 
             if (bodies == null || bodies.Count == 0)
                 return false;
@@ -25,37 +25,118 @@ internal bool GetBodies()
             {
                 this.Bodies.Add(new CelestialBody
                 {
-                    Name = body.Value.data.bodyName,
-                    GravityASL = body.Value.data.gravityASL,
-                    HasAtmosphere = body.Value.data.hasAtmosphere,
-                    IsHomeWorld = body.Value.data.isHomeWorld
+                    Name = body.Name,
+                    DisplayName = body.Name,
+                    GravityASL = body.gravityASL,
+                    HasAtmosphere = body.hasAtmosphere,
+                    IsHomeWorld = body.isHomeWorld,
+                    CelestialBodyComponent = body,
                 });
             }
 
+            // Reorder and format all celestial bodies so they form a tree-like structure
+            TryReorderBodies();
+
             return true;
         }
 
+        private void TryReorderBodies()
+        {
+            // Grab all stars in CelestialBodies
+            List<CelestialBodyComponent> stars = Bodies
+                .Select(b => b.CelestialBodyComponent)
+                .Where(c => c.IsStar)
+                .ToList();
+
+            if (stars == null || stars.Count == 0)
+                return;
+
+            List<CelestialBody> reorderedBodies = new();
+
+            // Iterate through all stars and grab all planets and moons that are orbiting them
+            foreach (var star in stars)
+            {
+                reorderedBodies.AddRange(InstantiateCelestialBodies(star, 0));
+            }
+
+            this.Bodies = reorderedBodies;
+        }
+
+        /// <summary>
+        /// Instantiates a list of planets and moons in the CelestialBodyComponent + bodies that are orbiting it
+        /// </summary>
+        /// <param name="cel"></param>
+        /// <param name="level">Indicates how much indentation format needs to have</param>
+        /// <returns></returns>
+        private List<CelestialBody> InstantiateCelestialBodies (CelestialBodyComponent cel, int level)
+        {
+            List<CelestialBody> instantiatedBodies = new();            
+            instantiatedBodies.Add(InstantiateCelestialBody(cel, level));
+
+            foreach (CelestialBodyComponent body in cel.orbitingBodies)
+            {
+                instantiatedBodies.AddRange(InstantiateCelestialBodies(body, level + 1));
+            }
+
+            return instantiatedBodies;
+        }
+
+
+        /// <summary>
+        /// Instantiates a single CelestialBody and formats it according to level of indentation
+        /// </summary>
+        /// <param name="cel"></param>
+        /// <param name="level">Indicates how much indentation format needs to have</param>
+        /// <returns></returns>
+        private CelestialBody InstantiateCelestialBody(CelestialBodyComponent cel, int level)
+        {
+            CelestialBody body = new ()
+            {
+                Name = cel.Name,
+                DisplayName = cel.Name,
+                GravityASL = cel.gravityASL,
+                HasAtmosphere = cel.hasAtmosphere,
+                IsHomeWorld = cel.isHomeWorld,
+                CelestialBodyComponent = cel,
+            };
+
+            if (cel.isHomeWorld)
+                body.DisplayName = $"{body.DisplayName} *";
+
+            if (level > 0)
+            {
+                body.DisplayName = $"└ {body.DisplayName}";
+
+                for (int i = 0; i < level; i++)
+                    body.DisplayName = $"  {body.DisplayName}";
+            }
+
+            return body;
+        }
+
         /// <summary>
         /// Calculates what factor needs to be used for HomeWorld's TWR in order to compensate for gravity of the selected body
         /// </summary>
         /// <param name="bodyName">Name of the CelestialBody for which the TWR factor is calculated</param>
-        /// <returns>TWR factor that needs to be multiplied with HomeWorld's TWR to get TWR at the selected body and information if target body has an atmosphere</returns>
-        internal (double twrFactor, bool hasAtmosphere) GetTwrFactor(string bodyName)
+        /// <returns>TWR factor that needs to be multiplied with HomeWorld's TWR to get TWR at the selected body</returns>
+        internal double GetTwrFactor(string bodyName)
         {
-            if (Bodies.Count == 0) return (0, false);
+            if (Bodies.Count == 0) return 0;
             CelestialBody homeWorld = Bodies.Find(b => b.IsHomeWorld);
             CelestialBody targetBody = Bodies.Find(t => t.Name.ToLowerInvariant() == bodyName.ToLowerInvariant()) ?? null;
-            if (targetBody == null) return (0, false);
+            if (targetBody == null) return 0;
 
-            return (homeWorld.GravityASL / targetBody.GravityASL, targetBody.HasAtmosphere);
+            return homeWorld.GravityASL / targetBody.GravityASL;
         }
     }
 
     internal class CelestialBody
     {
-        public string Name;
-        public double GravityASL;
-        public bool HasAtmosphere;
-        public bool IsHomeWorld;
+        internal string Name;
+        internal string DisplayName;
+        internal double GravityASL;
+        internal bool HasAtmosphere;
+        internal bool IsHomeWorld;
+        internal CelestialBodyComponent CelestialBodyComponent;
     }
 }

MicroEngineerProject/MicroEngineer/MicroEngineerMod.cs

@@ -8,6 +8,7 @@
 using KSP.UI.Binding;
 using KSP.Sim.DeltaV;
 using KSP.Messages;
+using KSP.Sim.impl;
 
 namespace MicroMod
 {
@@ -63,8 +64,14 @@ public override void OnInitialized()
 
             // Preserve backward compatibility with SpaceWarp 1.0.1
             if (MicroUtility.IsModOlderThan("SpaceWarp", 1, 1, 0))
+            {
+                Logger.LogInfo("Space Warp older version detected. Loading old MicroStyles.");
                 MicroStyles.SetStylesForOldSpaceWarpSkin();
+            }
+            else
+                Logger.LogInfo("Space Warp new version detected. Loading new MicroStyles.");
 
+            // Register Flight and OAB buttons
             Appbar.RegisterAppButton(
                 "Micro Engineer",
                 "BTN-MicroEngineerBtn",
@@ -149,8 +156,12 @@ private void GameStateLeft(MessageCenterMessage obj)
         /// </summary>
         private void RefreshStagingDataOAB(MessageCenterMessage obj)
         {
+            // Check if message originated from ships in flight. If yes, return.
+            VesselDeltaVCalculationMessage msg = (VesselDeltaVCalculationMessage)obj;
+            if (msg.DeltaVComponent.Ship == null || !msg.DeltaVComponent.Ship.IsLaunchAssembly()) return;
+
             MicroUtility.RefreshGameManager();
-            if (MicroUtility.GameState.GameState != GameState.VehicleAssemblyBuilder) return;
+            if (MicroUtility.GameState.GameState != GameState.VehicleAssemblyBuilder) return;            
 
             MicroUtility.RefreshStagesOAB();
 
@@ -833,24 +844,23 @@ private void DrawStageInfoOAB(int windowID)
                 GUILayout.Label(String.Format("{0:00}", ((List<DeltaVStageInfo_OAB>)stageInfoOab.EntryValue).Count - stages[stageIndex].Stage), MicroStyles.NameLabelStyle, GUILayout.Width(40));
                 GUILayout.FlexibleSpace();
 
-                // We calculate what factor needs to be applied to TWR in order to compensate for different gravity of the selected celestial body
-                // For selected bodies with atmosphere, for ASL TWR we just apply the factor to HomeWorld's (i.e. Kerbin) ASL TWR as it's a good enough approximation for now.
-                // -> This is just an approximation because ASL TWR depends on Thrust as well which changes depending on atmospheric pressure
-                (double factor, bool hasAtmosphere) twrFactor = _celestialBodies.GetTwrFactor(stageInfoOab.CelestialBodyForStage[celestialIndex]);
-
-                GUILayout.Label(String.Format("{0:N2}", stages[stageIndex].TWRVac * twrFactor.factor), MicroStyles.ValueLabelStyle, GUILayout.Width(65));
+                // We calculate what factor needs to be applied to TWR in order to compensate for different gravity of the selected celestial body                
+                double twrFactor = _celestialBodies.GetTwrFactor(stageInfoOab.CelestialBodyForStage[celestialIndex]);
+                GUILayout.Label(String.Format("{0:N2}", stages[stageIndex].TWRVac * twrFactor), MicroStyles.ValueLabelStyle, GUILayout.Width(65));
 
-                // If target body doesn't have an atmosphere, its ASL TWR is the same as Vacuum TWR
-                GUILayout.Label(String.Format("{0:N2}", twrFactor.hasAtmosphere ? stages[stageIndex].TWRASL * twrFactor.factor : stages[stageIndex].TWRVac * twrFactor.factor), MicroStyles.ValueLabelStyle, GUILayout.Width(75));
-                GUILayout.Label(String.Format("{0:N0}", stages[stageIndex].DeltaVASL), MicroStyles.ValueLabelStyle, GUILayout.Width(75));
+                // Calculate Sea Level TWR and DeltaV
+                CelestialBodyComponent cel = _celestialBodies.Bodies.Find(b => b.Name == stageInfoOab.CelestialBodyForStage[celestialIndex]).CelestialBodyComponent;                
+                GUILayout.Label(String.Format("{0:N2}", stages[stageIndex].GetTWRAtSeaLevel(cel) * twrFactor), MicroStyles.ValueLabelStyle, GUILayout.Width(75));
+                GUILayout.Label(String.Format("{0:N0}", stages[stageIndex].GetDeltaVelAtSeaLevel(cel)), MicroStyles.ValueLabelStyle, GUILayout.Width(75));
                 GUILayout.Label("m/s", MicroStyles.UnitLabelStyleStageOAB, GUILayout.Width(30));
+
                 GUILayout.Label(String.Format("{0:N0}", stages[stageIndex].DeltaVVac), MicroStyles.ValueLabelStyle, GUILayout.Width(75));
                 GUILayout.Label("m/s", MicroStyles.UnitLabelStyleStageOAB, GUILayout.Width(30));
                 GUILayout.Label(MicroUtility.SecondsToTimeString(stages[stageIndex].StageBurnTime, true, true), MicroStyles.ValueLabelStyle, GUILayout.Width(110));
                 GUILayout.Space(20);
                 GUILayout.BeginVertical();
                 GUILayout.FlexibleSpace();
-                if (GUILayout.Button(stageInfoOab.CelestialBodyForStage[celestialIndex], MicroStyles.CelestialSelectionBtnStyle))
+                if (GUILayout.Button(stageInfoOab.CelestialBodyForStage[celestialIndex], MicroStyles.CelestialBodyBtnStyle))
                 {
                     _celestialBodySelectionStageIndex = celestialIndex;
                 }
@@ -873,7 +883,7 @@ private void DrawCelestialBodySelection(int id)
 
             foreach (var body in _celestialBodies.Bodies)
             {
-                if (GUILayout.Button(body.Name))
+                if (GUILayout.Button(body.DisplayName, MicroStyles.CelestialSelectionBtnStyle))
                 {
                     StageInfo_OAB stageInfoOab = (StageInfo_OAB)MicroWindows.Find(w => w.MainWindow == MainWindow.StageInfoOAB).Entries.Find(e => e.Name == "Stage Info (OAB)");
                     stageInfoOab.CelestialBodyForStage[_celestialBodySelectionStageIndex] = body.Name;

MicroEngineerProject/MicroEngineer/MicroEntries.cs

@@ -1,4 +1,5 @@
 using KSP.Game;
+using KSP.Sim.DeltaV;
 using KSP.Sim.impl;
 using Newtonsoft.Json;
 using static KSP.Rendering.Planets.PQSData;
@@ -1403,7 +1404,8 @@ public override void RefreshData()
                     ThrustVac = stage.ThrustVac,
                     TotalExhaustVelocityASL = stage.TotalExhaustVelocityASL,
                     TotalExhaustVelocityActual = stage.TotalExhaustVelocityActual,
-                    TotalExhaustVelocityVAC = stage.TotalExhaustVelocityVAC
+                    TotalExhaustVelocityVAC = stage.TotalExhaustVelocityVAC,
+                    DeltaVStageInfo = stage
                 });
             }
         }
@@ -1429,32 +1431,46 @@ internal void AddNewCelestialBody(MicroCelestialBodies celestialBodies)
     /// <summary>
     /// Parameters for one stage
     /// </summary>
-    public class DeltaVStageInfo_OAB
+    internal class DeltaVStageInfo_OAB
     {
-        public double DeltaVActual;
-        public double DeltaVASL;
-        public double DeltaVVac;
-        public double DryMass;
-        public double EndMass;
-        public double FuelMass;
-        public double IspASL;
-        public double IspActual;
-        public double IspVac;
-        public int SeparationIndex;
-        public int Stage;
-        public double StageBurnTime;
-        public double StageMass;
-        public double StartMass;
-        public float TWRASL;
-        public float TWRActual;
-        public float TWRVac;
-        public float ThrustASL;
-        public float ThrustActual;
-        public float ThrustVac;
-        public float TotalExhaustVelocityASL;
-        public float TotalExhaustVelocityActual;
-        public float TotalExhaustVelocityVAC;
-        public string CelestialBody;
+        internal double DeltaVActual;
+        internal double DeltaVASL;
+        internal double DeltaVVac;
+        internal double DryMass;
+        internal double EndMass;
+        internal double FuelMass;
+        internal double IspASL;
+        internal double IspActual;
+        internal double IspVac;
+        internal int SeparationIndex;
+        internal int Stage;
+        internal double StageBurnTime;
+        internal double StageMass;
+        internal double StartMass;
+        internal float TWRASL;
+        internal float TWRActual;
+        internal float TWRVac;
+        internal float ThrustASL;
+        internal float ThrustActual;
+        internal float ThrustVac;
+        internal float TotalExhaustVelocityASL;
+        internal float TotalExhaustVelocityActual;
+        internal float TotalExhaustVelocityVAC;
+        internal DeltaVStageInfo DeltaVStageInfo;
+
+        private float GetThrustAtAltitude(double altitude, CelestialBodyComponent cel) => this.DeltaVStageInfo.EnginesActiveInStage?.Select(e => e.Engine.MaxThrustOutputAtm(atmPressure: cel.GetPressure(altitude) / 101.325))?.Sum() ?? 0;
+        private double GetISPAtAltitude(double altitude, CelestialBodyComponent cel)
+        {
+            float sum = 0;
+            foreach (DeltaVEngineInfo engInfo in this.DeltaVStageInfo.EnginesActiveInStage)
+                sum += engInfo.Engine.MaxThrustOutputAtm(atmPressure: cel.GetPressure(altitude) / 101.325) /
+                 engInfo.Engine.currentEngineModeData.atmosphereCurve.Evaluate((float)cel.GetPressure(altitude) / 101.325f);
+            return GetThrustAtAltitude(altitude, cel) / sum;
+        }
+        private double GetDeltaVelAlt(double altitude, CelestialBodyComponent cel) => GetISPAtAltitude(altitude, cel) * 9.80665 * Math.Log(this.DeltaVStageInfo.StartMass / this.DeltaVStageInfo.EndMass);
+        private double GetTWRAtAltitude(double altitude, CelestialBodyComponent cel) => this.DeltaVStageInfo.TWRVac * (GetThrustAtAltitude(altitude, cel) / this.DeltaVStageInfo.ThrustVac);
+        internal double GetTWRAtSeaLevel(CelestialBodyComponent cel) => this.GetTWRAtAltitude(0, cel);
+        internal double GetDeltaVelAtSeaLevel(CelestialBodyComponent cel) => GetDeltaVelAlt(0, cel);
     }
     #endregion
 }

MicroEngineerProject/MicroEngineer/MicroStyles.cs

@@ -8,7 +8,7 @@ public static class MicroStyles
         public static int WindowWidth = 290;
         public static int WindowHeight = 1440;
         public static int WindowWidthStageOAB = 645;
-        public static int WindowWidthCelestialSelection = 100;
+        //public static int WindowWidthCelestialSelection = 200;
 
         public static GUISkin SpaceWarpUISkin;
         public static GUIStyle MainWindowStyle;
@@ -31,6 +31,7 @@ public static class MicroStyles
         public static GUIStyle CloseBtnStyle;
         public static GUIStyle CloseBtnStageOABStyle;
         public static GUIStyle NormalBtnStyle;
+        public static GUIStyle CelestialBodyBtnStyle;
         public static GUIStyle CelestialSelectionBtnStyle;
         public static GUIStyle OneCharacterBtnStyle;
         public static GUIStyle TableHeaderLabelStyle;
@@ -84,8 +85,7 @@ public static void InitializeStyles()
             CelestialSelectionStyle = new GUIStyle(SpaceWarpUISkin.window)
             {
                 padding = new RectOffset(8, 8, 0, 8),
-                contentOffset = new Vector2(0, -22),
-                fixedWidth = WindowWidthCelestialSelection
+                contentOffset = new Vector2(0, -22)
             };
 
             PopoutBtnStyle = new GUIStyle(SpaceWarpUISkin.button)
@@ -175,13 +175,19 @@ public static void InitializeStyles()
                 alignment = TextAnchor.MiddleCenter
             };
 
-            CelestialSelectionBtnStyle = new GUIStyle(SpaceWarpUISkin.button)
+            CelestialBodyBtnStyle = new GUIStyle(SpaceWarpUISkin.button)
             {
                 alignment = TextAnchor.MiddleCenter,
                 fixedWidth = 80,
                 fixedHeight = 20
             };
 
+            CelestialSelectionBtnStyle = new GUIStyle(SpaceWarpUISkin.button)
+            {
+                alignment = TextAnchor.MiddleLeft,
+                fixedWidth = 120
+            };
+
             OneCharacterBtnStyle = new GUIStyle(SpaceWarpUISkin.button)
             {
                 fixedWidth = 20,

MicroEngineerProject/MicroEngineer/MicroUtility.cs

@@ -280,6 +280,8 @@ internal static (int major, int minor, int patch)? GetModVersion(string modId)
                 if (versionNumbers.Length == 3)
                     int.TryParse(versionNumbers[2], out patchVersion);
 
+                Logger.LogInfo($"Space Warp version {majorVersion}.{minorVersion}.{patchVersion} detected.");
+
                 return (majorVersion, minorVersion, patchVersion);
             }
             else return null;