Nuke more of the old gravity turner code

somehow this never got cleaned up Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
MuMech · Nov 21, 2023 · 05475d6 · 05475d6
1 parent 96a998d
commit 05475d6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 278 deletions.
diff --git a/MechJeb2/MechJeb2.csproj b/MechJeb2/MechJeb2.csproj
@@ -100,7 +100,6 @@
         <Compile Include="MechJebModuleAscentBaseAutopilot.cs"/>
         <Compile Include="MechJebModuleAscentClassicAutopilot.cs"/>
         <Compile Include="MechJebModuleAscentClassicPathMenu.cs"/>
-        <Compile Include="MechJebModuleAscentGTAutopilot.cs"/>
         <Compile Include="MechJebModuleAscentMenu.cs"/>
         <Compile Include="MechJebModuleAscentPVGAutopilot.cs"/>
         <Compile Include="MechJebModuleAscentPVGSettingsMenu.cs"/>

diff --git a/MechJeb2/MechJebModuleAscentGTAutopilot.cs b/MechJeb2/MechJebModuleAscentGTAutopilot.cs
diff --git a/MechJeb2/MechJebModuleAscentMenu.cs b/MechJeb2/MechJebModuleAscentMenu.cs
@@ -175,31 +175,6 @@ private void ShowTargetingGUIElements()
             Profiler.EndSample();
         }
 
-        private void ShowGuidanceSettingsGUIElements()
-        {
-            Profiler.BeginSample("MJ.GUIWindow.ShowGuidanceSettings");
-
-
-            if (_ascentSettings.AscentType == AscentType.GRAVITYTURN)
-            {
-                GUILayout.BeginVertical(GUI.skin.box);
-
-                GuiUtils.SimpleTextBox(CachedLocalizer.Instance.MechJebAscentLabel8, _ascentSettings.TurnStartAltitude,
-                    "km"); //Turn start altitude:
-                GuiUtils.SimpleTextBox(CachedLocalizer.Instance.MechJebAscentLabel9, _ascentSettings.TurnStartVelocity,
-                    "m/s");                                                                                                   //Turn start velocity:
-                GuiUtils.SimpleTextBox(CachedLocalizer.Instance.MechJebAscentLabel10, _ascentSettings.TurnStartPitch, "deg"); //Turn start pitch:
-                GuiUtils.SimpleTextBox(CachedLocalizer.Instance.MechJebAscentLabel11, _ascentSettings.IntermediateAltitude,
-                    "km");                                                                                              //Intermediate altitude:
-                GuiUtils.SimpleTextBox(CachedLocalizer.Instance.MechJebAscentLabel12, _ascentSettings.HoldAPTime, "s"); //Hold AP Time:
-                GUILayout.EndVertical();
-            }
-
-            _ascentSettings.LimitQaEnabled = _ascentSettings.AscentType == AscentType.PVG; // this is mandatory for PVG
-
-            Profiler.EndSample();
-        }
-
         private void ShowStatusGUIElements()
         {
             Profiler.BeginSample("MJ.GUIWindow.ShowStatus");
@@ -413,8 +388,8 @@ protected override void WindowGUI(int windowID)
             //PerformanceTestGUIElements();
             VisibleSectionsGUIElements();
             ShowTargetingGUIElements();
-            ShowGuidanceSettingsGUIElements();
 
+            _ascentSettings.LimitQaEnabled = _ascentSettings.AscentType == AscentType.PVG; // this is mandatory for PVG
 
             GUILayout.BeginVertical(GUI.skin.box);
             GUILayout.BeginHorizontal();

diff --git a/MechJeb2/MechJebModuleAscentSettings.cs b/MechJeb2/MechJebModuleAscentSettings.cs
@@ -6,7 +6,7 @@
 
 namespace MuMech
 {
-    public enum AscentType { CLASSIC, GRAVITYTURN, PVG }
+    public enum AscentType { CLASSIC, PVG }
 
     public class MechJebModuleAscentSettings : ComputerModule
     {
@@ -287,17 +287,12 @@ public bool Autostage
 
         private MechJebModuleAscentBaseAutopilot GetAscentModule(AscentType type)
         {
-            switch (type)
+            return type switch
             {
-                case AscentType.CLASSIC:
-                    return Core.GetComputerModule<MechJebModuleAscentClassicAutopilot>();
-                case AscentType.GRAVITYTURN:
-                    return Core.GetComputerModule<MechJebModuleAscentGTAutopilot>();
-                case AscentType.PVG:
-                    return Core.GetComputerModule<MechJebModuleAscentPVGAutopilot>();
-                default:
-                    return Core.GetComputerModule<MechJebModuleAscentClassicAutopilot>();
-            }
+                AscentType.CLASSIC => Core.GetComputerModule<MechJebModuleAscentClassicAutopilot>(),
+                AscentType.PVG     => Core.GetComputerModule<MechJebModuleAscentPVGAutopilot>(),
+                _                  => Core.GetComputerModule<MechJebModuleAscentClassicAutopilot>()
+            };
         }
 
         private void DisableAscentModules()