Merge pull request #68 from dkavolis/staging

Use stock staging in RealChutes
dkavolis · Jun 20, 2019 · 0363091 · 0363091
2 parents a8c09ae + 12e1534
commit 0363091
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/FerramAerospaceResearch/RealChuteLite/RealChuteFAR.cs b/FerramAerospaceResearch/RealChuteLite/RealChuteFAR.cs
@@ -1069,12 +1069,6 @@ private void FixedUpdate()
 
             CalculateSafeToDeployEstimate();
 
-            if (!staged &&
-                GameSettings.LAUNCH_STAGES.GetKeyDown() &&
-                vessel.isActiveVessel &&
-                (part.inverseStage == StageManager.CurrentStage - 1 || StageManager.CurrentStage == 0))
-                ActivateRC();
-
             if (!staged)
                 return;
             //Checks if the parachute must disarm
@@ -1162,6 +1156,13 @@ private void OnDestroy()
             //Hide/show UI event removal
             GameEvents.onHideUI.Remove(HideUI);
             GameEvents.onShowUI.Remove(ShowUI);
+            GameEvents.onStageActivate.Remove(OnStageActivate);
+        }
+
+        private void OnStageActivate(int stage)
+        {
+            if (!staged && stage == part.inverseStage)
+                ActivateRC();
         }
 
         public override void OnStart(StartState startState)
@@ -1210,6 +1211,7 @@ public override void OnStart(StartState startState)
                 //Hide/show UI event addition
                 GameEvents.onHideUI.Add(HideUI);
                 GameEvents.onShowUI.Add(ShowUI);
+                GameEvents.onStageActivate.Add(OnStageActivate);
 
                 if (CanRepack)
                     SetRepack();

diff --git a/GameData/FerramAerospaceResearch/Plugins/FerramAerospaceResearch.dll b/GameData/FerramAerospaceResearch/Plugins/FerramAerospaceResearch.dll
diff --git a/GameData/FerramAerospaceResearch/Plugins/ferramGraph.dll b/GameData/FerramAerospaceResearch/Plugins/ferramGraph.dll
diff --git a/bin/Debug/FerramAerospaceResearch.dll b/bin/Debug/FerramAerospaceResearch.dll
diff --git a/bin/Debug/ferramGraph.dll b/bin/Debug/ferramGraph.dll