Allow * menu on vessels being rolled out/back

KSP-RO · Sep 11, 2023 · cba9da9 · cba9da9
1 parent ef3e727
commit cba9da9
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/Source/KerbalConstructionTime/GUI/GUI_BuildList.cs b/Source/KerbalConstructionTime/GUI/GUI_BuildList.cs
@@ -1084,7 +1084,7 @@ private static void RenderWarehouseRow(BuildListVessel b, int listIdx, bool isCo
                 textColor = _redText;
 
             GUILayout.BeginHorizontal();
-            if (b.LC.IsOperational && !HighLogic.LoadedSceneIsEditor && (padStatus == VesselPadStatus.InStorage || padStatus == VesselPadStatus.RolledOut))
+            if (b.LC.IsOperational && !HighLogic.LoadedSceneIsEditor && (padStatus != VesselPadStatus.Recovering))
             {
                 if (GUILayout.Button("*", GUILayout.Width(_butW)))
                 {
@@ -1618,8 +1618,9 @@ private static void DrawBLPlusWindow(int windowID)
             }
             string blvID = b.shipID.ToString();
             ReconRollout rollout = b.LC.GetReconRollout(ReconRollout.RolloutReconType.Rollout, launchSite);
+            ReconRollout rollback = rollout == null ? b.LC.GetReconRollout(ReconRollout.RolloutReconType.Rollback, launchSite) : null;
             bool isRollingOut = rollout != null && rollout.associatedID == blvID;
-            bool onPad = isRollingOut && rollout.IsComplete();
+            bool isRollingBack = rollback != null && rollback.associatedID == blvID;
 
             // Only allow selecting launch site for planes.
             // Rockets use whatever location is set for their pad.
@@ -1638,7 +1639,7 @@ private static void DrawBLPlusWindow(int windowID)
                 }
             }
 
-            if (!onPad && GUILayout.Button("Scrap"))
+            if (!isRollingOut && !isRollingBack && GUILayout.Button("Scrap"))
             {
                 InputLockManager.SetControlLock(ControlTypes.KSC_ALL, "KCTPopupLock");
                 DialogGUIBase[] options = new DialogGUIBase[2];
@@ -1652,7 +1653,7 @@ private static void DrawBLPlusWindow(int windowID)
                 ResetBLWindow(false);
             }
 
-            if (!onPad && GUILayout.Button("Edit"))
+            if (!isRollingOut && !isRollingBack && GUILayout.Button("Edit"))
             {
                 GUIStates.ShowBLPlus = false;
                 EditorWindowPosition.height = 1;
@@ -1708,7 +1709,7 @@ private static void DrawBLPlusWindow(int windowID)
                 GUIStates.ShowBLPlus = false;
             }
 
-            if (!b.IsFinished && GUILayout.Button("Move to Top"))
+            if (!isRollingOut && !isRollingBack && !b.IsFinished && GUILayout.Button("Move to Top"))
             {
                 if (_isIntegrationSelected)
                 {