From 144e6012dc333153c7e41ad37df544a23ea4b827 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Apr 2019 17:24:42 +0900
Subject: [PATCH] Implement hp increase for osu!

---
 .../Judgements/OsuJudgement.cs                | 15 +++++++++++
 .../Scoring/OsuScoreProcessor.cs              | 25 ++++++++++---------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs
index 81fedf9f4a..7a98c5003d 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs
@@ -24,5 +24,20 @@ namespace osu.Game.Rulesets.Osu.Judgements
                     return 300;
             }
         }
+
+        protected override double HealthIncreaseFor(HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.Miss:
+                    return -0.02;
+                case HitResult.Meh:
+                case HitResult.Good:
+                case HitResult.Great:
+                    return 0.01;
+                default:
+                    return 0;
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index 2c8bf11016..a4975ef3b3 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -47,28 +47,29 @@ namespace osu.Game.Rulesets.Osu.Scoring
 
             if (result.Type != HitResult.None)
                 comboResultCounts[osuResult.ComboType] = comboResultCounts.GetOrDefault(osuResult.ComboType) + 1;
+        }
 
-            switch (result.Type)
+        protected override double HpFactorFor(Judgement judgement, HitResult result)
+        {
+            switch (result)
             {
                 case HitResult.Great:
-                    Health.Value += (10.2 - hpDrainRate) * harshness;
-                    break;
+                    return 10.2 - hpDrainRate;
 
                 case HitResult.Good:
-                    Health.Value += (8 - hpDrainRate) * harshness;
-                    break;
+                    return 8 - hpDrainRate;
 
                 case HitResult.Meh:
-                    Health.Value += (4 - hpDrainRate) * harshness;
-                    break;
+                    return 4 - hpDrainRate;
 
-                /*case HitResult.SliderTick:
-                    Health.Value += Math.Max(7 - hpDrainRate, 0) * 0.01;
-                    break;*/
+                // case HitResult.SliderTick:
+                //     return Math.Max(7 - hpDrainRate, 0) * 0.01;
 
                 case HitResult.Miss:
-                    Health.Value -= hpDrainRate * (harshness * 2);
-                    break;
+                    return hpDrainRate;
+
+                default:
+                    return 0;
             }
         }