diff --git a/GameData/TestFlight/Plugins/TestFlight.dll b/GameData/TestFlight/Plugins/TestFlight.dll index fc3fd3f7..7a9739b8 100755 Binary files a/GameData/TestFlight/Plugins/TestFlight.dll and b/GameData/TestFlight/Plugins/TestFlight.dll differ diff --git a/GameData/TestFlight/Plugins/TestFlightAPI.dll b/GameData/TestFlight/Plugins/TestFlightAPI.dll index e7d0126b..032c0e25 100755 Binary files a/GameData/TestFlight/Plugins/TestFlightAPI.dll and b/GameData/TestFlight/Plugins/TestFlightAPI.dll differ diff --git a/GameData/TestFlight/Plugins/TestFlightContracts.dll b/GameData/TestFlight/Plugins/TestFlightContracts.dll index de16aa2a..0993bb7d 100755 Binary files a/GameData/TestFlight/Plugins/TestFlightContracts.dll and b/GameData/TestFlight/Plugins/TestFlightContracts.dll differ diff --git a/GameData/TestFlight/Plugins/TestFlightCore.dll b/GameData/TestFlight/Plugins/TestFlightCore.dll index 9346dbf2..30bf44fb 100755 Binary files a/GameData/TestFlight/Plugins/TestFlightCore.dll and b/GameData/TestFlight/Plugins/TestFlightCore.dll differ diff --git a/TestFlightFailure_IgnitionFail.cs b/TestFlightFailure_IgnitionFail.cs index b3281d8f..5da85485 100644 --- a/TestFlightFailure_IgnitionFail.cs +++ b/TestFlightFailure_IgnitionFail.cs @@ -23,37 +23,6 @@ public class TestFlightFailure_IgnitionFail : TestFlightFailure_Engine private ITestFlightCore core = null; - private bool _FARLoaded = false, check = true; - /// - /// Returns if FAR is currently loaded in the game - /// - public bool FARLoaded - { - get - { - if (check) { _FARLoaded = AssemblyLoader.loadedAssemblies.Any(a => a.dllName == "FerramAerospaceResearch"); check = false; } - return _FARLoaded; - } - } - private MethodInfo _densityMethod = null; - /// - /// A delegate to the FAR GetCurrentDensity method - /// - public MethodInfo densityMethod - { - get - { - if (_densityMethod == null) - { - _densityMethod = AssemblyLoader.loadedAssemblies.FirstOrDefault(a => a.dllName == "FerramAerospaceResearch").assembly - .GetTypes().Single(t => t.Name == "FARAeroUtil").GetMethods().Where(m => m.IsPublic && m.IsStatic) - .Where(m => m.ReturnType == typeof(double) && m.Name == "GetCurrentDensity").ToDictionary(m => m, m => m.GetParameters()) - .Single(p => p.Value[0].ParameterType == typeof(CelestialBody) && p.Value[1].ParameterType == typeof(double)).Key; - } - - return _densityMethod; - } - } public double DynamicPressure { get @@ -61,21 +30,7 @@ public double DynamicPressure double density; Vector3 velocity = this.part.Rigidbody.velocity + Krakensbane.GetFrameVelocityV3f(); float sqrSpeed = velocity.sqrMagnitude; - if (FARLoaded) - { - try - { - density = (double)densityMethod.Invoke(null, new object[] { this.vessel.mainBody, this.vessel.altitude, true }); - } - catch - { - density = this.vessel.atmDensity; - } - } - else - { - density = this.vessel.atmDensity; - } + density = this.vessel.atmDensity; double dynamicPressure = 0.5 * density * sqrSpeed; return dynamicPressure; } @@ -86,21 +41,12 @@ public double DynamicPressure { // verify we have a valid core attached if (core == null) - { - Log("IgnitionFail: No valid core attached"); return false; - } if (baseIgnitionChance == null) - { - Log("IgnitionFail: No valid baseIgnitionChance FloatCurve"); return false; - } // and a valid engine if (engines == null) - { - Log("IgnitionFail: No valid engines found"); return false; - } return TestFlightUtil.EvaluateQuery(Configuration, this.part); } }