From 90a0569660a593e53e27cc1853155a73df09bbf6 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Wed, 25 Dec 2019 19:19:57 +0900 Subject: [PATCH] Tweak drain values --- osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs | 13 +++++++++++-- osu.Game/Rulesets/Scoring/HealthProcessor.cs | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs index 7a5b98864c..845ff76ce6 100644 --- a/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs +++ b/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs @@ -8,6 +8,11 @@ namespace osu.Game.Rulesets.Osu.Judgements { public class OsuJudgement : Judgement { + /// + /// The health increase for a maximum judgement result. + /// + protected const double MAX_HEALTH_INCREASE = 0.05; + public override HitResult MaxResult => HitResult.Great; protected override int NumericResultFor(HitResult result) @@ -33,12 +38,16 @@ protected override double HealthIncreaseFor(HitResult result) switch (result) { case HitResult.Miss: - return -0.02; + return -MAX_HEALTH_INCREASE; case HitResult.Meh: + return -MAX_HEALTH_INCREASE * 0.05; + case HitResult.Good: + return MAX_HEALTH_INCREASE * 0.3; + case HitResult.Great: - return 0.01; + return MAX_HEALTH_INCREASE; default: return 0; diff --git a/osu.Game/Rulesets/Scoring/HealthProcessor.cs b/osu.Game/Rulesets/Scoring/HealthProcessor.cs index 772e317955..a1389d7ee9 100644 --- a/osu.Game/Rulesets/Scoring/HealthProcessor.cs +++ b/osu.Game/Rulesets/Scoring/HealthProcessor.cs @@ -57,7 +57,7 @@ public override void ApplyBeatmap(IBeatmap beatmap) this.beatmap = beatmap; healthIncreases = new List<(double time, double health)>(); - targetMinimumHealth = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.DrainRate, 0.95, 0.6, 0.2); + targetMinimumHealth = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.DrainRate, 0.95, 0.70, 0.30); base.ApplyBeatmap(beatmap);