RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-13 10:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor gameplay-time drain limitation

Browse Source
This commit is contained in:
smoogipoo 2019-12-26 15:46:07 +09:00
parent 429272b864
commit 662ec2d812
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
View File

@ -16,6 +16,8 @@ namespace osu.Game.Rulesets.Scoring
{
private IBeatmap beatmap;
private double gameplayEndTime;
private List<(double time, double health)> healthIncreases;
private double targetMinimumHealth;
private double drainRate = 1;
@ -35,9 +37,11 @@ namespace osu.Game.Rulesets.Scoring
if (!IsBreakTime.Value)
{
// When jumping from before the gameplay start to after it or vice-versa, we only want to consider any drain since the gameplay start time
double lastTime = Math.Max(GameplayStartTime, Time.Current - Time.Elapsed);
Health.Value -= drainRate * (Time.Current - lastTime);
// When jumping in and out of gameplay time within a single frame, health should only be drained for the period within the gameplay time
double lastGameplayTime = Math.Clamp(Time.Current - Time.Elapsed, GameplayStartTime, gameplayEndTime);
double currentGameplayTime = Math.Clamp(Time.Current, GameplayStartTime, gameplayEndTime);
Health.Value -= drainRate * (currentGameplayTime - lastGameplayTime);
}
}
@ -45,6 +49,9 @@ namespace osu.Game.Rulesets.Scoring
{
this.beatmap = beatmap;
if (beatmap.HitObjects.Count > 0)
gameplayEndTime = beatmap.HitObjects[^1].GetEndTime();
healthIncreases = new List<(double time, double health)>();
targetMinimumHealth = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.DrainRate, 0.95, 0.70, 0.30);