From 1d999bb634de168c5acb1f3abbc5fd12d5596e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 10 May 2020 18:32:38 +0200
Subject: [PATCH] Integrate PeriodTracker changes

---
 .../Scoring/DrainingHealthProcessor.cs        | 56 +++++--------------
 1 file changed, 15 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index b36e42326c..1958efdd6f 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -5,9 +5,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Utils;
 
 namespace osu.Game.Rulesets.Scoring
 {
@@ -49,33 +49,7 @@ public class DrainingHealthProcessor : HealthProcessor
         private double targetMinimumHealth;
         private double drainRate = 1;
 
-        private readonly List<(double startTime, double endTime)> nonDrainSections = new List<(double, double)>();
-        private int currentNonDrainSection;
-
-        private bool isInNonDrainSection
-        {
-            get
-            {
-                if (nonDrainSections.Count == 0)
-                    return false;
-
-                var time = Time.Current;
-
-                if (time > nonDrainSections[currentNonDrainSection].endTime)
-                {
-                    while (time > nonDrainSections[currentNonDrainSection].endTime && currentNonDrainSection < nonDrainSections.Count - 1)
-                        currentNonDrainSection++;
-                }
-                else
-                {
-                    while (time < nonDrainSections[currentNonDrainSection].startTime && currentNonDrainSection > 0)
-                        currentNonDrainSection--;
-                }
-
-                var closestSection = nonDrainSections[currentNonDrainSection];
-                return time >= closestSection.startTime && time <= closestSection.endTime;
-            }
-        }
+        private PeriodTracker noDrainPeriodTracker;
 
         /// <summary>
         /// Creates a new <see cref="DrainingHealthProcessor"/>.
@@ -90,7 +64,7 @@ protected override void Update()
         {
             base.Update();
 
-            if (isInNonDrainSection)
+            if (noDrainPeriodTracker?.IsInAny(Time.Current) == true)
                 return;
 
             // When jumping in and out of gameplay time within a single frame, health should only be drained for the period within the gameplay time
@@ -102,23 +76,23 @@ protected override void Update()
 
         public override void ApplyBeatmap(IBeatmap beatmap)
         {
-            nonDrainSections.Clear();
-
             this.beatmap = beatmap;
 
             if (beatmap.HitObjects.Count > 0)
                 gameplayEndTime = beatmap.HitObjects[^1].GetEndTime();
 
-            // Ranges between the end of last hit object before a break
-            // and the start of first hit object after a break should
-            // not allow HP draining. (with break periods in)
-            foreach (BreakPeriod b in beatmap.Breaks)
-            {
-                var startTime = beatmap.HitObjects.LastOrDefault(h => h.GetEndTime() < b.StartTime)?.GetEndTime() ?? double.MinValue;
-                var endTime = beatmap.HitObjects.FirstOrDefault(h => h.StartTime > b.EndTime)?.StartTime ?? double.MaxValue;
-
-                nonDrainSections.Add((startTime, endTime));
-            }
+            noDrainPeriodTracker = new PeriodTracker(beatmap.Breaks.Select(breakPeriod => new Period(
+                beatmap.HitObjects
+                       .Select(hitObject => hitObject.GetEndTime())
+                       .Where(endTime => endTime < breakPeriod.StartTime)
+                       .DefaultIfEmpty(double.MinValue)
+                       .Last(),
+                beatmap.HitObjects
+                       .Select(hitObject => hitObject.StartTime)
+                       .Where(startTime => startTime > breakPeriod.EndTime)
+                       .DefaultIfEmpty(double.MaxValue)
+                       .First()
+            )));
 
             targetMinimumHealth = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.DrainRate, min_health_target, mid_health_target, max_health_target);