diff --git a/project/Aki.SinglePlayer/Utils/InRaid/RaidTimeUtil.cs b/project/Aki.SinglePlayer/Utils/InRaid/RaidTimeUtil.cs index 2fc54e4..b0f3598 100644 --- a/project/Aki.SinglePlayer/Utils/InRaid/RaidTimeUtil.cs +++ b/project/Aki.SinglePlayer/Utils/InRaid/RaidTimeUtil.cs @@ -10,13 +10,22 @@ namespace Aki.SinglePlayer.Utils.InRaid public static class RaidTimeUtil { /// - /// Calculates the seconds remaining in the current raid + /// Determines if a raid is in-progress by checking if the GameTimer has started + /// + public static bool HasRaidStarted() + { + return Singleton.Instance.GameTimer.Started(); + } + + /// + /// Calculates the seconds remaining in the current raid. + /// Please ensure is true, or this will throw an exception. /// /// Seconds remaining in the raid /// Thrown if there is no raid in progress public static float GetRemainingRaidSeconds() { - if (!Singleton.Instance.GameTimer.Started()) + if (!HasRaidStarted()) { throw new InvalidOperationException("The raid-time remaining can only be calculated when a raid is in-progress"); } @@ -28,10 +37,12 @@ namespace Aki.SinglePlayer.Utils.InRaid } /// - /// Calculates the fraction of raid-time remaining relative to the original escape time for the map. - /// 1.0 = the raid just started, and 0.0 = the raid is over (and you're MIA). + /// Calculates the fraction of raid-time remaining relative to the original escape time for the map. + /// 1.0 = the raid just started, and 0.0 = the raid is over (and you're MIA). + /// Please ensure is true, or this will throw an exception. /// /// The fraction of raid-time remaining (0.0 - 1.0) relative to the original escape time for the map + /// Thrown if there is no raid in progress public static float GetRaidTimeRemainingFraction() { return GetRemainingRaidSeconds() / RaidChangesUtil.OriginalEscapeTimeSeconds;