Changed recovery from panic a bit.

kog333 · Mar 6, 2011 · 95322c4 · 95322c4
1 parent 24bcb94
commit 95322c4
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Questor.Modules/Panic.cs b/Questor.Modules/Panic.cs
@@ -133,9 +133,13 @@ public void ProcessState()
                         Logging.Log("Panic: We're in a station, resume mission");
                         State = PanicState.Resume;
                     }
-                    else if (Cache.Instance.DirectEve.ActiveShip.CapacitorPercentage > Settings.Instance.SafeCapacitorPct)
+
+                    var isSafe = Cache.Instance.DirectEve.ActiveShip.CapacitorPercentage > Settings.Instance.SafeCapacitorPct;
+                    isSafe &= Cache.Instance.DirectEve.ActiveShip.ShieldPercentage > Settings.Instance.MinimumShieldPct;
+                    isSafe &= Cache.Instance.DirectEve.ActiveShip.ArmorPercentage > Settings.Instance.MinimumArmorPct;
+                    if (isSafe)
                     {
-                        Logging.Log("Panic: We've recovered our capacitor, resume mission");
+                        Logging.Log("Panic: We've recovered, resume mission");
                         State = PanicState.Resume;
                     }
                     break;