Fix total ASL deltav values in OAB not being calculated

Author: Falki-git

MicroEngineerProject/MicroEngineer/UI/Controllers/StageInfoOABController.cs

@@ -24,6 +24,9 @@ public class StageInfoOABController : MonoBehaviour
         private static ManualLogSource _logger = BepInEx.Logging.Logger.CreateLogSource("MicroEngineer.StageInfoOABController");
         private bool _lockUiRefresh;
 
+        private double _totalDeltaVASL;
+        private double _totalDeltaVVac;
+
         public StageInfoOABController()
         { }
 
@@ -97,6 +100,9 @@ private void BuildStages(List<DeltaVStageInfo_OAB> stages)
                     stage.CelestialBody.Name
                     );
 
+                _totalDeltaVASL += stage.DeltaVASL;
+                _totalDeltaVVac += stage.DeltaVVac;
+
                 var celestialBodyDropdown = control.Q<DropdownField>("body-dropdown");
                 celestialBodyDropdown.RegisterCallback<MouseDownEvent>(evt =>
                 {
@@ -132,27 +138,44 @@ private void HandleStageInfoChanged(List<DeltaVStageInfo_OAB> stages)
             if (_lockUiRefresh) return;
 
             Body.Clear();
+            TotalAslDeltaVContainer.Clear();
+            _totalDeltaVASL = 0;
+            TotalVacDeltaVContainer.Clear();
+            _totalDeltaVVac = 0;
+            TotalBurnTimeContainer.Clear();
             BuildStages(stages);
+            SetTotalValues();
         }
 
         private void BuildFooter()
+        {
+            Footer = Root.Q<VisualElement>("footer");
+            TotalAslDeltaVContainer = Root.Q<VisualElement>("asl-dv-container");
+            TotalVacDeltaVContainer = Root.Q<VisualElement>("vac-dv-container");
+            TotalBurnTimeContainer = Root.Q<VisualElement>("burn-time-container");
+
+            SetTotalValues();
+        }
+
+        private void SetTotalValues()
         {
             BaseEntry entry;
             VisualElement control;
 
-            Footer = Root.Q<VisualElement>("footer");
-
-            TotalAslDeltaVContainer = Root.Q<VisualElement>("asl-dv-container");
             entry = StageInfoOABWindow.Entries.Find(e => e is TotalDeltaVASL_OAB);
-            control = new BaseEntryControl(entry);
+            // total deltav from stock stage info is wrong because it doesn't take into account different bodies.
+            // so here we'll sum up values for all calculated stages and won't subscribe to automatic value changes
+            entry.EntryValue = _totalDeltaVASL;
+            control = new BaseEntryControl(entry, false);
             TotalAslDeltaVContainer.Add(control);
-            
-            TotalVacDeltaVContainer = Root.Q<VisualElement>("vac-dv-container");
+
             entry = StageInfoOABWindow.Entries.Find(e => e is TotalDeltaVVac_OAB);
-            control = new BaseEntryControl(entry);
+            // total deltav from stock stage info is wrong because it doesn't take into account different bodies.
+            // so here we'll sum up values for all calculated stages and won't subscribe to automatic value changes
+            entry.EntryValue = _totalDeltaVVac;
+            control = new BaseEntryControl(entry, false);
             TotalVacDeltaVContainer.Add(control);
 
-            TotalBurnTimeContainer = Root.Q<VisualElement>("burn-time-container");
             entry = StageInfoOABWindow.Entries.Find(e => e is TotalBurnTime_OAB);
             control = new TimeEntryControl(entry);
             TotalBurnTimeContainer.Add(control);

MicroEngineerProject/MicroEngineer/UI/Controls/BaseEntryControl.cs

@@ -40,14 +40,15 @@ public string Unit
             set => UnitLabel.text = value;
         }
 
-        public BaseEntryControl(BaseEntry entry) : this()
+        public BaseEntryControl(BaseEntry entry, bool subscribeToValueChanges = true) : this()
         {
             EntryName = entry.Name;
             Value = entry.ValueDisplay;
             Unit = entry.UnitDisplay;
 
             // When entry's value changes, update value and unit labels
-            entry.OnEntryValueChanged += HandleEntryValueChanged;
+            if (subscribeToValueChanges)
+                entry.OnEntryValueChanged += HandleEntryValueChanged;
 
             // Handle alternate units
             if (entry.AltUnit != null)

Staging/BepInEx/plugins/micro_engineer/assets/bundles/microengineer_flightui.bundle

@@ -5,7 +5,7 @@
     "name": "Micro Engineer",
     "description": "Get in-flight and VAB information about your current vessel",
     "source": "https://github.com/Micrologist/MicroEngineer",
-    "version": "1.4.0",
+    "version": "1.5.0",
 	"version_check": "https://raw.githubusercontent.com/Micrologist/MicroEngineer/main/Staging/BepInEx/plugins/micro_engineer/swinfo.json",
     "dependencies": [
 		{
@@ -24,7 +24,7 @@
 		}
 	],
     "ksp2_version": {
-        "min": "0.1.4",
+        "min": "0.1.5",
         "max": "*"
     }
 }