* **NEW**: Parts no longer can gain data while in the **PRELAUNCH** s…

…ituation. This means no more static test firing. The new R&D system should be used instead if you don't want to risk parts on an actual flight. Misc code cleaup
KSP-RO · Mar 24, 2016 · c3940b8 · c3940b8
1 parent be96eb1
commit c3940b8
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 2 deletions.
diff --git a/FlightDataRecorder_Engine.cs b/FlightDataRecorder_Engine.cs
@@ -31,6 +31,9 @@ public override bool IsPartOperating()
             if (!isEnabled)
                 return false;
 
+            if (this.part.vessel.situation == Vessel.Situations.PRELAUNCH)
+                return false;
+
             return engine.IgnitionState == EngineModuleWrapper.EngineIgnitionState.IGNITED;
         }
 

diff --git a/FlightDataRecorder_Resources.cs b/FlightDataRecorder_Resources.cs
@@ -29,6 +29,9 @@ public override bool IsRecordingFlightData()
             if (!isEnabled)
                 return false;
 
+            if (this.part.vessel.situation == Vessel.Situations.PRELAUNCH)
+                return false;
+
             List<PartResource> partResources = this.part.Resources.list;
             foreach (PartResource resource in partResources)
             {

diff --git a/GameData/TestFlight/Plugins/TestFlight.dll b/GameData/TestFlight/Plugins/TestFlight.dll
diff --git a/GameData/TestFlight/Plugins/TestFlightAPI.dll b/GameData/TestFlight/Plugins/TestFlightAPI.dll
diff --git a/GameData/TestFlight/Plugins/TestFlightContracts.dll b/GameData/TestFlight/Plugins/TestFlightContracts.dll
diff --git a/GameData/TestFlight/Plugins/TestFlightCore.dll b/GameData/TestFlight/Plugins/TestFlightCore.dll
diff --git a/TestFlightAPI/TestFlightAPI/FlightDataRecorder.cs b/TestFlightAPI/TestFlightAPI/FlightDataRecorder.cs
@@ -119,6 +119,9 @@ public virtual bool IsRecordingFlightData()
             if (!IsPartOperating())
                 return false;
 
+            if (this.part.vessel.situation == Vessel.Situations.PRELAUNCH)
+                return false;
+
             if (!isEnabled)
                 return false;
 

diff --git a/TestFlightCore/TestFlightCore/TestFlightKSC.cs b/TestFlightCore/TestFlightCore/TestFlightKSC.cs
@@ -196,7 +196,6 @@ internal override void DrawWindow(int id)
                         GUILayout.Label("Here you can manage engineering teams working on your hardware.\nYou can start new research programs from the VAB.");
                     else
                     {
-//                        tfScenario.userSettings.currentResearchScrollPosition = GUILayout.BeginScrollView(tfScenario.userSettings.currentResearchScrollPosition);
                         GUILayout.BeginVertical();
                         foreach (string partInResearch in partsInResearch)
                         {
@@ -223,7 +222,6 @@ internal override void DrawWindow(int id)
                             GUILayout.EndHorizontal();
                         }
                         GUILayout.EndVertical();
-//                        GUILayout.EndScrollView();
                     }
                     break;
                 case 1: