Fix Space Engines Safety ratings being 0 and simultaneously unable to…

… fail. Fix Divide by 0 in VAB
severedsolo · Feb 1, 2019 · 6f23a66 · 6f23a66
1 parent 6929a43
commit 6f23a66
Show file tree

Hide file tree

Showing 5 changed files with 5,658 additions and 4,113 deletions.
diff --git a/OhScrap/BaseFailureModule.cs b/OhScrap/BaseFailureModule.cs
@@ -75,7 +75,7 @@ private void Start()
 
         private void OnLaunch(EventReport data)
         {
-            if (FlightGlobals.ActiveVessel.speed > 8 || isSRB) return;
+            if (FlightGlobals.ActiveVessel.speed > 8) return;
             ActivateFailures();
         }
 
@@ -122,7 +122,7 @@ private void ActivateFailures()
             launched = true;
             Initialise();
             UPFMUtils.instance.testedParts.Add(SYP.ID);
-            if (HighLogic.LoadedScene == GameScenes.FLIGHT && FailureAllowed() && isSRB && UPFMUtils.instance._randomiser.NextDouble() < chanceOfFailure) InvokeRepeating("FailPart", 0.01f, 0.01f);
+            if (HighLogic.LoadedScene == GameScenes.FLIGHT && isSRB && FailureAllowed() && UPFMUtils.instance._randomiser.NextDouble() < chanceOfFailure) InvokeRepeating("FailPart", 0.01f, 0.01f);
         }
 
             // This is where we "initialise" the failure module and get everything ready

diff --git a/OhScrap/EngineFailureModule.cs b/OhScrap/EngineFailureModule.cs
@@ -17,9 +17,9 @@ class EngineFailureModule : BaseFailureModule
         [KSPField(isPersistant = true, guiActive = false)]
         float originalThrust;
         [KSPField(isPersistant = true, guiActive = false)]
-        int spaceEngineExpectedLifetime;
+        int spaceEngineExpectedLifetime = 3;
         [KSPField(isPersistant = true, guiActive = false)]
-        float spaceEngineBaseChanceOfFailure;
+        float spaceEngineBaseChanceOfFailure = 0.1f;
 
 
         protected override void Overrides()

diff --git a/OhScrap/UPFMUtils.cs b/OhScrap/UPFMUtils.cs
@@ -279,8 +279,8 @@ private void onEditorShipModified(ShipConstruct shipConstruct)
                     vesselSafetyRating += bfm.safetyRating;
                     bfmCount++;
                 }
-                vesselSafetyRating = vesselSafetyRating / bfmCount;
             }
+            vesselSafetyRating = vesselSafetyRating / bfmCount;
         }
         //This is mostly for use in the flight scene, will only run once assuming everything goes ok.
         void Update()