Merge branch 'dev'

Author: jwvanderbeck

GameData/TestFlight/Plugins/TestFlight.dll

@@ -76,8 +76,8 @@ public override void OnUpdate()
                 double flightData = (currentMet - lastRecordedMet) * flightDataMultiplier;
                 double engineerBonus = core.GetEngineerDataBonus(flightDataEngineerModifier);
                 flightData *= engineerBonus;
-
-                core.ModifyFlightDataForScope(flightData, scope, true);
+                if (flightData >= 0)
+                    core.ModifyFlightDataForScope(flightData, scope, true);
             }
 
             core.ModifyFlightTimeForScope(currentMet - lastRecordedMet, scope, true);

GameData/TestFlight/Plugins/TestFlightAPI.dll

@@ -237,6 +237,10 @@ string Configuration
             get;
             set;
         }
+        bool OneShot
+        {
+            get;
+        }
         /// <summary>
         /// Gets the details of the failure encapsulated by this module.  In most cases you can let the base class take care of this unless oyu need to do somethign special
         /// </summary>

GameData/TestFlight/Plugins/TestFlightCore.dll

@@ -134,6 +134,15 @@ public class TestFlightFailureBase : PartModule, ITestFlightFailure
         public string failureTitle = "Failure";
         [KSPField(isPersistant=true)]
         public string configuration = "";
+        [KSPField(isPersistant = true)]
+        public double duFail = 0;
+        [KSPField(isPersistant = true)]
+        public double duRepair = 0;
+        [KSPField(isPersistant = true)]
+        public bool oneShot = false;
+
+        public RepairConfig repairConfig;
+
 
         public bool Failed
         {
@@ -164,8 +173,10 @@ public string Configuration
             set { configuration = value; }
         }
 
-
-        public RepairConfig repairConfig;
+        public bool OneShot
+        {
+            get { return oneShot; }
+        }
 
         /// <summary>
         /// Gets the details of the failure encapsulated by this module.  In most cases you can let the base class take care of this unless oyu need to do somethign special
@@ -314,6 +325,9 @@ internal float GetOptionalRepairBonus()
         public virtual void DoFailure()
         {
             Failed = true;
+            ITestFlightCore core = TestFlightUtil.GetCore(this.part);
+            if (core != null)
+                core.ModifyFlightData(duFail, true);
         }
 
         /// <summary>
@@ -365,6 +379,9 @@ public virtual double ForceRepair()
         public virtual double DoRepair()
         {
             Failed = false;
+            ITestFlightCore core = TestFlightUtil.GetCore(this.part);
+            if (core != null)
+                core.ModifyFlightData(duRepair, true);
             return 0;
         }
 

TestFlightAPI/TestFlightAPI/FlightDataRecorder.cs

@@ -78,7 +78,7 @@ public string Configuration
         // If this Reliability module's purpose is to supply Momentary Fialure Rates, then it MUST return 0 when asked for the Base Failure Rate
         // If it dosn't, then the Base Failure Rate of the part will not be correct.
         //
-        public double GetBaseFailureRateForScope(double flightData, String scope)
+        public virtual double GetBaseFailureRateForScope(double flightData, String scope)
         {
             if (!TestFlightEnabled)
                 return 0;
@@ -116,7 +116,10 @@ private ReliabilityBodyConfig GetConfigForScope(String scope)
             if (reliabilityBodies == null)
                 return null;
 
-            return reliabilityBodies.Find(s => s.scope == scope);
+            ReliabilityBodyConfig returnBody = reliabilityBodies.Find(s => s.scope == scope);
+            if (returnBody == null)
+                returnBody = reliabilityBodies.Find(s => s.scope == "default");
+            return returnBody;
         }
 
         IEnumerator Attach()

TestFlightAPI/TestFlightAPI/TestFlightAPI.cs

@@ -375,7 +375,6 @@ internal override void Update()
                 VerifyMasterStatus();
             }
             // process vessels
-            string configuration = "";
             foreach (var entry in knownVessels)
             {
                 Vessel vessel = FlightGlobals.Vessels.Find(v => v.id == entry.Key);

TestFlightAPI/TestFlightAPI/TestFlightFailure.cs

@@ -679,9 +679,21 @@ public ITestFlightFailure TriggerFailure()
             int totalWeight = 0;
             int currentWeight = 0;
             int chosenWeight = 0;
-            List<ITestFlightFailure> failureModules;
+            List<ITestFlightFailure> failureModules = null;
 
-            failureModules = TestFlightUtil.GetFailureModules(this.part);
+            // Get all failure modules on the part
+            // Then filter only the ones that are not disabled
+            List<ITestFlightFailure> allFailureModules = TestFlightUtil.GetFailureModules(this.part);
+            foreach (ITestFlightFailure fm in allFailureModules)
+            {
+                PartModule pm = fm as PartModule;
+                if (!disabledFailures.Contains(pm.moduleName))
+                {
+                    if (failureModules == null)
+                        failureModules = new List<ITestFlightFailure>();
+                    failureModules.Add(fm);
+                }
+            }
 
             foreach(ITestFlightFailure fm in failureModules)
             {
@@ -730,11 +742,14 @@ public ITestFlightFailure TriggerNamedFailure(String failureModuleName, bool fal
                     else
                     {
                         LogFormatted_DebugOnly("TestFlightCore: Triggering Failure: " + pm.moduleName);
-                        activeFailure = fm;
-                        failureAcknowledged = false;
-                        fm.DoFailure();
-                        operatingTime = -1;
-                        return fm;
+                        if (!fm.OneShot)
+                        {
+                            activeFailure = fm;
+                            failureAcknowledged = false;
+                            fm.DoFailure();
+                            operatingTime = -1;
+                            return fm;
+                        }
                     }
                 }
             }

TestFlightAPI/TestFlightAPI/TestFlightReliability.cs

@@ -11,6 +11,9 @@ namespace TestFlight
 {
     public class TestFlightFailure_IgnitionFail : TestFlightFailureBase
     {
+        [KSPField(isPersistant=true)]
+        public bool restoreIgnitionCharge = false;
+
         public FloatCurve ignitionFailureRate;
         public int engineIndex = 0;
 
@@ -125,6 +128,25 @@ public override void DoFailure()
                 return;
 
             engine.Shutdown();
+
+            if (OneShot && restoreIgnitionCharge)
+                RestoreIgnitor();
+        }
+        public override double DoRepair()
+        {
+            base.DoRepair();
+            if (restoreIgnitionCharge)
+                RestoreIgnitor();
+            return 0;
+        }
+        public void RestoreIgnitor()
+        {
+            // part.Modules["ModuleEngineIgnitor"].GetType().GetField("ignitionsRemained").GetValue(part.Modules["ModuleEngineIgnitor"]));
+            if (this.part.Modules.Contains("ModuleEngineIgnitor"))
+            {
+                int currentIgnitions = (int)part.Modules["ModuleEngineIgnitor"].GetType().GetField("ignitionsRemained").GetValue(part.Modules["ModuleEngineIgnitor"]);
+                part.Modules["ModuleEngineIgnitor"].GetType().GetField("ignitionsRemained").SetValue(part.Modules["ModuleEngineIgnitor"], currentIgnitions + 1);
+            }
         }
 
         public override void OnLoad(ConfigNode node)