Skip to content

Commit 35b0ff2

Browse files
authored
Merge pull request #352 from Beamographic/dependabot/nuget/ppy.osu.Game-2023.1223.0
Bump ppy.osu.Game from 2023.1026.0 to 2023.1223.0
2 parents 1d96bb5 + bb27eca commit 35b0ff2

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

osu.Game.Rulesets.Rush/Judgements/RushJudgementResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ public RushJudgementResult(RushHitObject hitObject, RushJudgement judgement)
3333
{
3434
}
3535

36-
public override string ToString() => $"{Type} (Score:{Judgement.NumericResultFor(this)} HP:{Judgement.HealthPointIncreaseFor(this)} {Judgement})";
36+
public override string ToString() => $"{Type} (HP:{Judgement.HealthPointIncreaseFor(this)} {Judgement})";
3737
}
3838
}

osu.Game.Rulesets.Rush/UI/Fever/FeverProcessor.cs

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,28 @@ private static float feverIncreaseFor(JudgementResult result)
156156
if (result.Judgement is RushIgnoreJudgement || result.Judgement is RushFeverJudgement)
157157
return 0;
158158

159-
return (float)result.Judgement.NumericResultFor(result) / result.Judgement.MaxNumericResult / perfect_hits_to_fill;
159+
return (float)NumericResultFor(result.Type) / NumericResultFor(HitResult.Great) / perfect_hits_to_fill;
160+
}
161+
162+
public static int NumericResultFor(HitResult result)
163+
{
164+
switch (result)
165+
{
166+
default:
167+
return 0;
168+
169+
case HitResult.Good:
170+
return 200;
171+
172+
case HitResult.Great:
173+
return 300;
174+
175+
case HitResult.SmallBonus:
176+
return 10;
177+
178+
case HitResult.LargeBonus:
179+
return 50;
180+
}
160181
}
161182
}
162183
}

osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
</EmbeddedResource>
3434
</ItemGroup>
3535
<ItemGroup>
36-
<PackageReference Include="ppy.osu.Game" Version="2023.1026.0" />
36+
<PackageReference Include="ppy.osu.Game" Version="2023.1223.0" />
3737
</ItemGroup>
3838
</Project>

0 commit comments

Comments
 (0)