sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-11 16:47:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove healthIncreases nullability

Browse Source
This commit is contained in:
smoogipoo 2019-12-27 12:39:25 +09:00
parent cac011edc1
commit fbbd16b4f0
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Scoring
private IBeatmap beatmap; private IBeatmap beatmap;
private double gameplayEndTime; private double gameplayEndTime;
private List<(double time, double health)> healthIncreases; private readonly List<(double time, double health)> healthIncreases = new List<(double, double)>();
private double targetMinimumHealth; private double targetMinimumHealth;
private double drainRate = 1; private double drainRate = 1;
@ -56,19 +56,15 @@ namespace osu.Game.Rulesets.Scoring
if (beatmap.HitObjects.Count > 0) if (beatmap.HitObjects.Count > 0)
gameplayEndTime = beatmap.HitObjects[^1].GetEndTime(); 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); targetMinimumHealth = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.DrainRate, 0.95, 0.70, 0.30);
base.ApplyBeatmap(beatmap); base.ApplyBeatmap(beatmap);
// Only required during the simulation stage
healthIncreases = null;
} }
protected override void ApplyResultInternal(JudgementResult result) protected override void ApplyResultInternal(JudgementResult result)
{ {
base.ApplyResultInternal(result); base.ApplyResultInternal(result);
healthIncreases?.Add((result.HitObject.GetEndTime() + result.TimeOffset, GetHealthIncreaseFor(result))); healthIncreases.Add((result.HitObject.GetEndTime() + result.TimeOffset, GetHealthIncreaseFor(result)));
} }
protected override void Reset(bool storeResults) protected override void Reset(bool storeResults)
@ -79,11 +75,13 @@ namespace osu.Game.Rulesets.Scoring
if (storeResults) if (storeResults)
drainRate = computeDrainRate(); drainRate = computeDrainRate();
healthIncreases.Clear();
} }
private double computeDrainRate() private double computeDrainRate()
{ {
if (healthIncreases == null || healthIncreases.Count == 0) if (healthIncreases.Count == 0)
return 0; return 0;
int adjustment = 1; int adjustment = 1;