1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-18 00:49:53 +08:00

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

This reverts commit a97915180f.
This commit is contained in:
Zyf
2023-11-19 21:02:56 +01:00
Unverified
parent 5ddb10281b
commit 2cf16e29ac
3 changed files with 6 additions and 17 deletions
@@ -20,12 +20,9 @@ namespace osu.Game.Rulesets.Catch.Difficulty
public int ComboScore { get; private set; }
public int LegacyBonusScore { get; private set; }
public int MaxCombo { get; private set; }
public double BonusScoreRatio => LegacyBonusScore == 0 ? 0 : (double)modernBonusScore / LegacyBonusScore;
public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
private int legacyBonusScore;
private int modernBonusScore;
private int combo;
@@ -77,7 +74,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty
foreach (var obj in playableBeatmap.HitObjects)
simulateHit(obj);
MaxCombo = combo;
}
private void simulateHit(HitObject hitObject)
@@ -133,7 +129,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
if (isBonus)
{
LegacyBonusScore += scoreIncrease;
legacyBonusScore += scoreIncrease;
modernBonusScore += Judgement.ToNumericResult(bonusResult);
}
else
@@ -14,8 +14,6 @@ namespace osu.Game.Rulesets.Mania.Difficulty
{
public int AccuracyScore => 0;
public int ComboScore { get; private set; }
public int LegacyBonusScore => 0;
public int MaxCombo { get; private set; }
public double BonusScoreRatio => 0;
public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
@@ -25,7 +23,6 @@ namespace osu.Game.Rulesets.Mania.Difficulty
.Aggregate(1.0, (c, n) => c * n);
ComboScore = (int)(1000000 * multiplier);
MaxCombo = playableBeatmap.GetMaxCombo();
}
}
}
@@ -20,12 +20,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
public int ComboScore { get; private set; }
public int LegacyBonusScore { get; private set; }
public int MaxCombo { get; private set; }
public double BonusScoreRatio => LegacyBonusScore == 0 ? 0 : (double)modernBonusScore / LegacyBonusScore;
public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
private int legacyBonusScore;
private int modernBonusScore;
private int combo;
@@ -83,7 +80,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
foreach (var obj in playableBeatmap.HitObjects)
simulateHit(obj);
MaxCombo = combo;
}
private void simulateHit(HitObject hitObject)
@@ -193,7 +189,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
if (isBonus)
{
LegacyBonusScore += scoreIncrease;
legacyBonusScore += scoreIncrease;
modernBonusScore += Judgement.ToNumericResult(bonusResult);
}
else