h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-19 11:42:54 +08:00
Code Issues Releases Wiki Activity

Scoring : Adds fields to Catch/Mania/Taiko Simulators too

Browse Source
This commit is contained in:
Zyf 2023-07-15 23:30:59 +02:00
parent b672b49e02
commit a97915180f
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
View File

@ -20,9 +20,12 @@ namespace osu.Game.Rulesets.Catch.Difficulty
public int ComboScore { get; private set; } public int ComboScore { get; private set; }
public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore; public int LegacyBonusScore { get; private set; }
public int MaxCombo { get; private set; }
public double BonusScoreRatio => LegacyBonusScore == 0 ? 0 : (double)modernBonusScore / LegacyBonusScore;
private int legacyBonusScore;
private int modernBonusScore; private int modernBonusScore;
private int combo; private int combo;
@ -74,6 +77,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
foreach (var obj in playableBeatmap.HitObjects) foreach (var obj in playableBeatmap.HitObjects)
simulateHit(obj); simulateHit(obj);
MaxCombo = combo;
} }
private void simulateHit(HitObject hitObject) private void simulateHit(HitObject hitObject)
@ -129,7 +133,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
if (isBonus) if (isBonus)
{ {
legacyBonusScore += scoreIncrease; LegacyBonusScore += scoreIncrease;
modernBonusScore += Judgement.ToNumericResult(bonusResult); modernBonusScore += Judgement.ToNumericResult(bonusResult);
} }
else else

3
osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
View File

@ -14,6 +14,8 @@ namespace osu.Game.Rulesets.Mania.Difficulty
{ {
public int AccuracyScore => 0; public int AccuracyScore => 0;
public int ComboScore { get; private set; } public int ComboScore { get; private set; }
public int LegacyBonusScore => 0;
public int MaxCombo { get; private set; }
public double BonusScoreRatio => 0; public double BonusScoreRatio => 0;
public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods) public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
@ -23,6 +25,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
.Aggregate(1.0, (c, n) => c * n); .Aggregate(1.0, (c, n) => c * n);
ComboScore = (int)(1000000 * multiplier); ComboScore = (int)(1000000 * multiplier);
MaxCombo = playableBeatmap.GetMaxCombo();
} }
} }
} }

10
osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
View File

@ -20,9 +20,12 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
public int ComboScore { get; private set; } public int ComboScore { get; private set; }
public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore; public int LegacyBonusScore { get; private set; }
public int MaxCombo { get; private set; }
public double BonusScoreRatio => LegacyBonusScore == 0 ? 0 : (double)modernBonusScore / LegacyBonusScore;
private int legacyBonusScore;
private int modernBonusScore; private int modernBonusScore;
private int combo; private int combo;
@ -80,6 +83,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
foreach (var obj in playableBeatmap.HitObjects) foreach (var obj in playableBeatmap.HitObjects)
simulateHit(obj); simulateHit(obj);
MaxCombo = combo;
} }
private void simulateHit(HitObject hitObject) private void simulateHit(HitObject hitObject)
@ -189,7 +193,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
if (isBonus) if (isBonus)
{ {
legacyBonusScore += scoreIncrease; LegacyBonusScore += scoreIncrease;
modernBonusScore += Judgement.ToNumericResult(bonusResult); modernBonusScore += Judgement.ToNumericResult(bonusResult);
} }
else else