Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace lazer scoring with "ScoreV2" #23638

Merged
merged 44 commits into from
May 30, 2023
Merged
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
5afe570
Add parent hitobject to strong hits
May 9, 2023
3c3c812
Initial implementation of ScoreV2
May 9, 2023
a7b623f
Reimplement classic scoring mode
May 9, 2023
f2483a1
Add some helper methods, fix precision differences
smoogipoo May 18, 2023
829e47d
Add MaxTotalScore for performance breakdown calculator
smoogipoo May 18, 2023
510b8e4
Remove ScoreManager.Mode, handle per-use
smoogipoo May 18, 2023
f3591f8
Remove ScoreManager.GetTotalScore()
smoogipoo May 18, 2023
8088187
Add TotalScore to replay frame headers
smoogipoo May 18, 2023
c33e4fe
Remove unnecessary override
smoogipoo May 18, 2023
ef86be6
Fix base score added for non-accuracy-affecting objects
smoogipoo May 18, 2023
00e0411
Fix/rework ModAccuracyChallenge calculation
smoogipoo May 18, 2023
8b56a3f
Remove ClassicScoreMultiplier and DefaultScoreProcessor
smoogipoo May 18, 2023
035d0d5
Fix multiplayer leaderboard not working
smoogipoo May 19, 2023
4d14467
Invert order of operations
smoogipoo May 19, 2023
7354423
Fix TestSceneTopLocalRank
smoogipoo May 19, 2023
9a1d749
Fix TestSceneDrawableTaikoMascot
smoogipoo May 19, 2023
7cbf48f
Fix TestSceneScoring and incorrect combo calculations
smoogipoo May 19, 2023
2ae3453
Avoid NaN values during ApplyBeatmap processing()
smoogipoo May 19, 2023
d74bf2a
Refactor for safety
smoogipoo May 19, 2023
6c6f862
Add score processor statistics to replay header
smoogipoo May 19, 2023
30a296b
Rename parameters
smoogipoo May 19, 2023
25d72d3
Always add non-bonus change to combo portion
smoogipoo May 19, 2023
c291d6f
Remove catch tiny droplet portion
smoogipoo May 22, 2023
e1feede
Change statistics type, remove overridability
smoogipoo May 22, 2023
62d504a
Fix base implementation of ComputeTotalScore
smoogipoo May 23, 2023
f8101fb
Rename variables
smoogipoo May 23, 2023
8570f82
Consider all accuracy judgements in accuracy progress
smoogipoo May 23, 2023
3598ca9
Adjust xmldoc
smoogipoo May 23, 2023
d45b543
Add back minimum/maximum accuracy
smoogipoo May 23, 2023
844c023
Fix tests
smoogipoo May 23, 2023
fee3d43
Merge branch 'master' into scorev2
smoogipoo May 23, 2023
7658536
Fix CI issues
smoogipoo May 23, 2023
6d9ba92
Massage tests a bit more
smoogipoo May 25, 2023
57c63db
Add xmldoc for `GetDisplayScore`
peppy May 25, 2023
a789d1e
Add xmldoc and change naming around `ScoreProcessorStatistics` a bit
peppy May 29, 2023
22be045
Apply NRT to `GameplayScoreCounter`
peppy May 29, 2023
9a88612
Ensure `GameplayScoreCounter`'s display score is updated on `ScoringM…
peppy May 29, 2023
fcd7a1d
Move `GetDisplayScore` xmldoc to interface and remove getter
peppy May 29, 2023
1a6d9e9
Apply NRT to `GameplayLeaderboardScore` and change `GetDisplayedScore…
peppy May 29, 2023
df662af
Pass `ScoreProcessorStatistics` to `FrameHeader`, rather than the ful…
peppy May 29, 2023
1558723
Merge branch 'master' into scorev2
peppy May 29, 2023
b3ca409
Rename a few remaining `CountAccuracyJudgement` variable
peppy May 29, 2023
4e0f40b
Split out multiplier retrieval into a function and use a default mult…
peppy May 30, 2023
14a376c
Merge branch 'master' into scorev2
peppy May 30, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Invert order of operations
  • Loading branch information
smoogipoo committed May 19, 2023
commit 4d14467d95cf3b0a1cab08b70a5408d587f056f7
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ protected override double ComputeTotalScore()
protected override void AddScoreChange(JudgementResult result)
{
var change = computeScoreChange(result);
BonusPortion += change.bonus;
ComboPortion += change.combo;
BonusPortion += change.bonus;
}

protected override void RemoveScoreChange(JudgementResult result)
{
var change = computeScoreChange(result);
BonusPortion -= change.bonus;
ComboPortion -= change.combo;
BonusPortion -= change.bonus;
}

private (double combo, double bonus) computeScoreChange(JudgementResult result)
Expand Down