fix autostage control and put it in the right place in the menus

Author: JonnyOThan

MechJebRPM/MechJebProxy.cs

@@ -42,7 +42,6 @@ public static class MechJebProxy
         internal static FieldInfo f_Ascent_LimitAoA;
         internal static FieldInfo f_Ascent_CorrectiveSteering;
         internal static FieldInfo f_Ascent_AutoPath;
-        internal static FieldInfo f_Ascent_Autostage;
         internal static FieldInfo f_Landing_DeployGears;
         internal static FieldInfo f_Landing_DeployChutes;
         internal static FieldInfo f_Landing_UseRCS;
@@ -58,7 +57,6 @@ public static class MechJebProxy
         internal static FieldInfo f_Thrust_DifferentialThrottle;
         internal static FieldInfo f_Thrust_TransKillH;
         internal static FieldInfo f_Node_Autowarp;
-        internal static FieldInfo f_Staging_Autostage;
         internal static FieldInfo f_Staging_DropSolids;
         internal static FieldInfo f_Docking_ForceRoll;
         internal static FieldInfo f_Docking_OverrideSafeDistance;
@@ -150,7 +148,6 @@ private static void InitializeFieldInfoCache()
             f_Ascent_LimitAoA = typeof(MechJebModuleAscentSettings).GetField(nameof(MechJebModuleAscentSettings.LimitAoA), BindingFlags.Public | BindingFlags.Instance);
             f_Ascent_CorrectiveSteering = typeof(MechJebModuleAscentSettings).GetField(nameof(MechJebModuleAscentSettings.CorrectiveSteering), BindingFlags.Public | BindingFlags.Instance);
             f_Ascent_AutoPath = typeof(MechJebModuleAscentSettings).GetField(nameof(MechJebModuleAscentSettings.AutoPath), BindingFlags.Public | BindingFlags.Instance);
-            f_Ascent_Autostage = typeof(MechJebModuleAscentSettings).GetField(nameof(MechJebModuleAscentSettings.Autostage), BindingFlags.Public | BindingFlags.Instance);
             f_Landing_DeployGears = typeof(MechJebModuleLandingAutopilot).GetField(nameof(MechJebModuleLandingAutopilot.DeployGears), BindingFlags.Public | BindingFlags.Instance);
             f_Landing_DeployChutes = typeof(MechJebModuleLandingAutopilot).GetField(nameof(MechJebModuleLandingAutopilot.DeployChutes), BindingFlags.Public | BindingFlags.Instance);
             f_Landing_UseRCS = typeof(MechJebModuleLandingAutopilot).GetField(nameof(MechJebModuleLandingAutopilot.RCSAdjustment), BindingFlags.Public | BindingFlags.Instance);
@@ -165,8 +162,7 @@ private static void InitializeFieldInfoCache()
             f_Thrust_ManageIntakes = typeof(MechJebModuleThrustController).GetField(nameof(MechJebModuleThrustController.ManageIntakes), BindingFlags.Public | BindingFlags.Instance);
             f_Thrust_DifferentialThrottle = typeof(MechJebModuleThrustController).GetField(nameof(MechJebModuleThrustController.DifferentialThrottle), BindingFlags.Public | BindingFlags.Instance);
             f_Thrust_TransKillH = typeof(MechJebModuleThrustController).GetField(nameof(MechJebModuleThrustController.TransKillH), BindingFlags.Public | BindingFlags.Instance);
-			f_Node_Autowarp = typeof(MechJebModuleNodeExecutor).GetField(nameof(MechJebModuleNodeExecutor.Autowarp), BindingFlags.Public | BindingFlags.Instance);
-			f_Staging_Autostage = typeof(MechJebModuleStagingController).GetField("autostage", BindingFlags.Public | BindingFlags.Instance);
+            f_Node_Autowarp = typeof(MechJebModuleNodeExecutor).GetField(nameof(MechJebModuleNodeExecutor.Autowarp), BindingFlags.Public | BindingFlags.Instance);
             f_Staging_DropSolids = typeof(MechJebModuleStagingController).GetField(nameof(MechJebModuleStagingController.DropSolids), BindingFlags.Public | BindingFlags.Instance);
             f_Docking_ForceRoll = typeof(MechJebModuleDockingAutopilot).GetField(nameof(MechJebModuleDockingAutopilot.forceRol), BindingFlags.Public | BindingFlags.Instance);
             f_Docking_OverrideSafeDistance = typeof(MechJebModuleDockingAutopilot).GetField(nameof(MechJebModuleDockingAutopilot.overrideSafeDistance), BindingFlags.Public | BindingFlags.Instance);

MechJebRPM/MechJebRPM.cs

@@ -618,7 +618,9 @@ private TextMenu BuildAscentStagingMenu()
             menu.selectedColor = JUtil.ColorToColorTag(Color.green);
             menu.disabledColor = JUtil.ColorToColorTag(Color.gray);
 
-            AddToggleItem(menu, "Autostage", mjCore.AscentSettings, MechJebProxy.f_Ascent_Autostage);
+            AddToggleItem(menu, "Autostage",
+                () => mjCore.AscentSettings.Autostage,
+                (val) => mjCore.AscentSettings.Autostage = val);
             AddNumericItem(menu, "Stop at Stage", mjCore.Staging.AutostageLimit,
                 1.0, v => v.ToString("F0"), null, true, 0, false, 0);
 
@@ -1671,10 +1673,6 @@ private TextMenu BuildUtilitiesMenu()
             menu.selectedColor = JUtil.ColorToColorTag(Color.green);
             menu.disabledColor = JUtil.ColorToColorTag(Color.gray);
 
-            AddToggleItem(menu, "Autostage",
-                mjCore.Staging, MechJebProxy.f_Staging_Autostage);
-            AddNumericItem(menu, "Stop at Stage", mjCore.Staging.AutostageLimit,
-                1.0, v => v.ToString("F0"), null, true, 0, false, 0);
             AddMenuItem(menu, "Stage Once", () => mjCore.Staging.AutostageOnce(null));
             AddMenuItem(menu, "Autostage Options", () => PushMenu(BuildAutostageOptionsMenu()));