diff --git a/GameData/TestFlight/Plugins/TestFlight.dll b/GameData/TestFlight/Plugins/TestFlight.dll index 562b2dff..70259fb6 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 957f6385..8e023505 100755 Binary files a/GameData/TestFlight/Plugins/TestFlightAPI.dll and b/GameData/TestFlight/Plugins/TestFlightAPI.dll differ diff --git a/GameData/TestFlight/Plugins/TestFlightCore.dll b/GameData/TestFlight/Plugins/TestFlightCore.dll index 5257bc23..e5c77af1 100755 Binary files a/GameData/TestFlight/Plugins/TestFlightCore.dll and b/GameData/TestFlight/Plugins/TestFlightCore.dll differ diff --git a/TestFlight.userprefs b/TestFlight.userprefs index 1c95235a..ec27a0a6 100644 --- a/TestFlight.userprefs +++ b/TestFlight.userprefs @@ -23,22 +23,9 @@ - + - - - - - - - - - - - - - diff --git a/TestFlightAPI/TestFlightAPI/EngineModuleWrapper.cs b/TestFlightAPI/TestFlightAPI/EngineModuleWrapper.cs index e92d4c99..a671ad8e 100644 --- a/TestFlightAPI/TestFlightAPI/EngineModuleWrapper.cs +++ b/TestFlightAPI/TestFlightAPI/EngineModuleWrapper.cs @@ -238,11 +238,8 @@ public float requestedThrust { if (engineType == EngineModuleType.UNKNOWN) return 0f; - - if (engineType == EngineModuleType.ENGINE) - return engine.requestedThrust; - else - return engineFX.requestedThrust; + + return 0f; } } @@ -260,6 +257,19 @@ public float finalThrust } } + public bool EngineIgnited + { + get + { + if (engineType == EngineModuleType.ENGINE) + return engine.EngineIgnited; + else if (engineType == EngineModuleType.ENGINEFX) + return engineFX.EngineIgnited; + + return false; + } + } + public BaseEventList Events { get @@ -282,22 +292,8 @@ public EngineIgnitionState IgnitionState if (engineType == EngineModuleType.UNKNOWN) return EngineIgnitionState.UNKNOWN; - if (flameout) - { - return EngineIgnitionState.NOT_IGNITED; - } - if (requestedThrust <= 0f) - { - return EngineIgnitionState.NOT_IGNITED; - } - if (!throttleLocked && Events.Contains("Shutdown Engine")) - { - return EngineIgnitionState.NOT_IGNITED; - } - if (finalThrust <= 0f) - { - return EngineIgnitionState.NOT_IGNITED; - } + if (EngineIgnited) + return EngineIgnitionState.IGNITED; return EngineIgnitionState.IGNITED; } diff --git a/TestFlightCore/TestFlightCore/TestFlightCore.csproj b/TestFlightCore/TestFlightCore/TestFlightCore.csproj index a76f61cf..ef11c785 100644 --- a/TestFlightCore/TestFlightCore/TestFlightCore.csproj +++ b/TestFlightCore/TestFlightCore/TestFlightCore.csproj @@ -20,7 +20,7 @@ - + true