Fixed logic error with ShouldPanic()

RealityMachina · May 21, 2018 · ea37851 · ea37851
1 parent c6e0fd2
commit ea37851
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/PunchinOut/BasicPanic.cs b/PunchinOut/BasicPanic.cs
@@ -357,7 +357,7 @@ public static bool ShouldPanic(Mech mech, AttackDirector.AttackSequence attackSe
             if(rngRoll <= PanicRoll)
             {
 
-                if (Holder.TrackedPilots[index].trackedPilot == pilot.GUID && Holder.TrackedPilots[index].pilotStatus == PanicStatus.Fatigued)
+                if (Holder.TrackedPilots[index].trackedPilot == pilot.GUID && Holder.TrackedPilots[index].pilotStatus == PanicStatus.Normal)
                 {
                     mech.Combat.MessageCenter.PublishMessage(new AddSequenceToStackMessage(new ShowActorInfoSequence(mech, $"Fatigued!", FloatieMessage.MessageNature.Debuff, true)));
                     Holder.TrackedPilots[index].pilotStatus = PanicStatus.Fatigued;
@@ -368,7 +368,7 @@ public static bool ShouldPanic(Mech mech, AttackDirector.AttackSequence attackSe
                     mech.StatCollection.ModifyStat<float>("Panic Attack: Fatigued Aim", -1, "AccuracyModifier", StatCollection.StatOperation.Float_Add, BasicPanic.Settings.FatiguedAimModifier, -1, true);
 
                 }
-                else if (Holder.TrackedPilots[index].trackedPilot == pilot.GUID && Holder.TrackedPilots[index].pilotStatus == PanicStatus.Stressed)
+                else if (Holder.TrackedPilots[index].trackedPilot == pilot.GUID && Holder.TrackedPilots[index].pilotStatus == PanicStatus.Fatigued)
                 {
                     mech.Combat.MessageCenter.PublishMessage(new AddSequenceToStackMessage(new ShowActorInfoSequence(mech, $"Stressed!", FloatieMessage.MessageNature.Debuff, true)));
                     Holder.TrackedPilots[index].pilotStatus = PanicStatus.Stressed;
@@ -377,7 +377,7 @@ public static bool ShouldPanic(Mech mech, AttackDirector.AttackSequence attackSe
                     mech.StatCollection.ModifyStat<float>("Panic Attack: Stressed Aim", -1, "AccuracyModifier", StatCollection.StatOperation.Float_Add, BasicPanic.Settings.StressedAimModifier, -1, true);
                     mech.StatCollection.ModifyStat<float>("Panic Attack: Stressed Defence", -1, "ToHitThisActor", StatCollection.StatOperation.Float_Add, BasicPanic.Settings.StressedToHitModifier, -1, true);
                 }
-                else if (Holder.TrackedPilots[index].trackedPilot == pilot.GUID && Holder.TrackedPilots[index].pilotStatus == PanicStatus.Panicked)
+                else if (Holder.TrackedPilots[index].trackedPilot == pilot.GUID && Holder.TrackedPilots[index].pilotStatus == PanicStatus.Stressed)
                 {
                     mech.Combat.MessageCenter.PublishMessage(new AddSequenceToStackMessage(new ShowActorInfoSequence(mech, $"Panicked!", FloatieMessage.MessageNature.Debuff, true)));
                     Holder.TrackedPilots[index].pilotStatus = PanicStatus.Panicked;
@@ -387,6 +387,10 @@ public static bool ShouldPanic(Mech mech, AttackDirector.AttackSequence attackSe
                     mech.StatCollection.ModifyStat<float>("Panic Attack: Panicking Aim!", -1, "AccuracyModifier", StatCollection.StatOperation.Float_Add, BasicPanic.Settings.PanickedAimModifier, -1, true);
                     mech.StatCollection.ModifyStat<float>("Panic Attack: Panicking Defence!", -1, "ToHitThisActor", StatCollection.StatOperation.Float_Add, BasicPanic.Settings.PanickedToHitModifier, -1, true);
                 }
+                else
+                {
+                    mech.Combat.MessageCenter.PublishMessage(new AddSequenceToStackMessage(new ShowActorInfoSequence(mech, $"Still Panicking!", FloatieMessage.MessageNature.Debuff, true)));
+                }
                 Holder.TrackedPilots[index].ChangedRecently = true;
                 return true;
             }

diff --git a/PunchinOut/panicTracker.cs b/PunchinOut/panicTracker.cs
@@ -22,7 +22,7 @@ public class PanicTracker
         public PanicTracker(Pilot pilot)
         {
 
-             trackedPilot = pilot.GUID;
+            trackedPilot = pilot.GUID;
             pilotStatus = PanicStatus.Normal;
             ChangedRecently = false;
         }