Merge pull request #352 from Beamographic/dependabot/nuget/ppy.osu.Ga…

…me-2023.1223.0 Bump ppy.osu.Game from 2023.1026.0 to 2023.1223.0
Beamographic · Dec 23, 2023 · 35b0ff2 · 35b0ff2
2 parents 1d96bb5 + bb27eca
commit 35b0ff2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/osu.Game.Rulesets.Rush/Judgements/RushJudgementResult.cs b/osu.Game.Rulesets.Rush/Judgements/RushJudgementResult.cs
@@ -33,6 +33,6 @@ public RushJudgementResult(RushHitObject hitObject, RushJudgement judgement)
         {
         }
 
-        public override string ToString() => $"{Type} (Score:{Judgement.NumericResultFor(this)} HP:{Judgement.HealthPointIncreaseFor(this)} {Judgement})";
+        public override string ToString() => $"{Type} (HP:{Judgement.HealthPointIncreaseFor(this)} {Judgement})";
     }
 }
diff --git a/osu.Game.Rulesets.Rush/UI/Fever/FeverProcessor.cs b/osu.Game.Rulesets.Rush/UI/Fever/FeverProcessor.cs
@@ -156,7 +156,28 @@ private static float feverIncreaseFor(JudgementResult result)
             if (result.Judgement is RushIgnoreJudgement || result.Judgement is RushFeverJudgement)
                 return 0;
 
-            return (float)result.Judgement.NumericResultFor(result) / result.Judgement.MaxNumericResult / perfect_hits_to_fill;
+            return (float)NumericResultFor(result.Type) / NumericResultFor(HitResult.Great) / perfect_hits_to_fill;
+        }
+
+        public static int NumericResultFor(HitResult result)
+        {
+            switch (result)
+            {
+                default:
+                    return 0;
+
+                case HitResult.Good:
+                    return 200;
+
+                case HitResult.Great:
+                    return 300;
+
+                case HitResult.SmallBonus:
+                    return 10;
+
+                case HitResult.LargeBonus:
+                    return 50;
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
@@ -33,6 +33,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2023.1026.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2023.1223.0" />
   </ItemGroup>
 </Project>
-Original file line number
+Diff line change
@@ Expand Up @@
             {
             }
-            public override string ToString() => $"{Type} (Score:{Judgement.NumericResultFor(this)} HP:{Judgement.HealthPointIncreaseFor(this)} {Judgement})";
+            public override string ToString() => $"{Type} (HP:{Judgement.HealthPointIncreaseFor(this)} {Judgement})";
         }
     }