Skip to content

Staging: Fix stock fairings ignoring autostage conditions #2084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krupenik wants to merge 1 commit into
base: dev
Choose a base branch
from
+5 −2
Open

Staging: Fix stock fairings ignoring autostage conditions #2084

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions MechJeb2/MechJebModuleStagingController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public override void OnUpdate()
}

// always stage if we have no active engines
if (!InverseStageHasActiveEngines(Vessel.currentStage))
if (!InverseStageHasActiveEngines(Vessel.currentStage) && !WaitingForFairing())
{
Stage();
}
Expand All @@ -321,7 +321,7 @@ public override void OnUpdate()
return;

// Always drop deactivated engines or tanks
if (InverseStageDecouplesDeactivatedEngineOrTank(Vessel.currentStage - 1))
if (InverseStageDecouplesDeactivatedEngineOrTank(Vessel.currentStage - 1) && !WaitingForFairing())
{
Stage();
}
Expand Down Expand Up @@ -671,6 +671,9 @@ private bool HasFairingUncached(int inverseStage)
// decoupler check below
return _partsInStage.Slinq().All(p => p.IsProceduralFairingPayloadFairing());

if (_partsInStage.Slinq().Any(p => p.Modules.Contains("ModuleProceduralFairing")))
return true;

// this is simple, but subtle:
// 1. we do not identify fairings as separate from decouplers here because of part mods like RSB
// which only put a stock decoupler in the staging.
Expand Down