fix torpedo phase

ElectronicObserverEN · Mar 1, 2024 · 783c6ae · 783c6ae
1 parent d8d6b70
commit 783c6ae
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/ElectronicObserver/Data/Battle/Phase/PhaseTorpedo.cs b/ElectronicObserver/Data/Battle/Phase/PhaseTorpedo.cs
@@ -43,23 +43,10 @@ public PhaseTorpedo(BattleData data, string title, int phaseID)
 	}
 
 
-	public override bool IsAvailable
-	{
-		get
-		{
-			if (phaseID == 0)
-			{
-				return IsOpeningTorpedoPhase;
-			}
-			else
-			{
-				return IsClosingTorpedoPhase;
-			}
-		}
-	}
+	public override bool IsAvailable => IsOpeningTorpedoPhase || IsClosingTorpedoPhase;
 
-	private bool IsOpeningTorpedoPhase => RawData.api_opening_flag() ? (int)RawData.api_opening_flag != 0 : false;
-	private bool IsClosingTorpedoPhase => (int)RawData.api_hourai_flag[phaseID - 1] != 0;
+	private bool IsOpeningTorpedoPhase => phaseID == 0 && (RawData.api_opening_flag() ? (int)RawData.api_opening_flag != 0 : false);
+	private bool IsClosingTorpedoPhase => phaseID != 0 && ((int)RawData.api_hourai_flag[phaseID - 1] != 0);
 
 
 	public override void EmulateBattle(int[] hps, int[] damages)