RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-19 11:56:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use better break calculation

Browse Source
This commit is contained in:
Dan Balasescu 2023-11-24 13:32:14 +09:00
parent acf3de5e25
commit 4ba6450c77
No known key found for this signature in database
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs
View File

@ -5,7 +5,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Timing;
using osu.Game.Rulesets.Catch.Objects; using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
@ -65,22 +64,16 @@ namespace osu.Game.Rulesets.Catch.Scoring
{ {
HitObject h = allObjects[i]; HitObject h = allObjects[i];
double localLastTime = lastTime; while (currentBreak < Beatmap.Breaks.Count && Beatmap.Breaks[currentBreak].EndTime <= h.StartTime)
double breakTime = 0;
if (Beatmap.Breaks.Count > 0 && currentBreak < Beatmap.Breaks.Count)
{ {
BreakPeriod e = Beatmap.Breaks[currentBreak]; // If two hitobjects are separated by a break period, there is no drain for the full duration between the hitobjects.
// This differs from legacy (version < 8) beatmaps which continue draining until the break section is entered,
if (e.StartTime >= localLastTime && e.EndTime <= h.StartTime) // but this shouldn't have a noticeable impact in practice.
{ lastTime = h.StartTime;
// consider break start equal to object end time for version 8+ since drain stops during this time currentBreak++;
breakTime = (Beatmap.BeatmapInfo.BeatmapVersion < 8) ? (e.EndTime - e.StartTime) : e.EndTime - localLastTime;
currentBreak++;
}
} }
reduceHp(testDrop * (h.StartTime - lastTime - breakTime)); reduceHp(testDrop * (h.StartTime - lastTime));
lastTime = h.GetEndTime(); lastTime = h.GetEndTime();