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

Fix catch pp calculator not matching live with respect to miss handling #27489

Merged
merged 3 commits into from Mar 6, 2024

Conversation

bdach
Copy link
Collaborator

@bdach bdach commented Mar 4, 2024

Field renames in CatchPerformanceCalculator are purposefully obfuscatory to match the actual live implementation closer.

For reference:

stable IncreaseScoreType stable replay field lazer HitResult
fruit hit Hit300 1 Count300 2 Great
fruit missed Miss 1 CountMiss 3 Miss
droplet hit FruitTick 4 Count100 5 LargeTickHit
droplet missed Miss 4 CountMiss 3 LargeTickMiss
tiny droplet hit FruitTickTiny 6 Count50 7 SmallTickHit
tiny droplet missed FruitTickTinyMiss 6 CountKatu 8 SmallTickMiss
banana hit SpinnerBonus 9 - 10 LargeBonus
banana missed Ignore 9 - 11 IgnoreMiss

Footnotes

  1. https://github.com/peppy/osu-stable-reference/blob/46cd3a10af7cc6cc96f4eba92ef1812dc8c3a27e/osu!/GameplayElements/HitObjects/Fruits/HitCircleFruits.cs#L123-L131 2

  2. https://github.com/peppy/osu-stable-reference/blob/46cd3a10af7cc6cc96f4eba92ef1812dc8c3a27e/osu!/GameModes/Play/Rulesets/Ruleset.cs#L858-L869

  3. https://github.com/peppy/osu-stable-reference/blob/46cd3a10af7cc6cc96f4eba92ef1812dc8c3a27e/osu!/GameModes/Play/Rulesets/Ruleset.cs#L770-L776 2

  4. https://github.com/peppy/osu-stable-reference/blob/46cd3a10af7cc6cc96f4eba92ef1812dc8c3a27e/osu!/GameplayElements/HitObjects/Fruits/HitCircleFruitsTick.cs#L41-L49 2

  5. https://github.com/peppy/osu-stable-reference/blob/46cd3a10af7cc6cc96f4eba92ef1812dc8c3a27e/osu!/GameModes/Play/Rulesets/Ruleset.cs#L951-L956

  6. https://github.com/peppy/osu-stable-reference/blob/46cd3a10af7cc6cc96f4eba92ef1812dc8c3a27e/osu!/GameplayElements/HitObjects/Fruits/HitCircleFruitsTickTiny.cs#L34-L43 2

  7. https://github.com/peppy/osu-stable-reference/blob/46cd3a10af7cc6cc96f4eba92ef1812dc8c3a27e/osu!/GameModes/Play/Rulesets/Ruleset.cs#L957-L963

  8. https://github.com/peppy/osu-stable-reference/blob/46cd3a10af7cc6cc96f4eba92ef1812dc8c3a27e/osu!/GameModes/Play/Rulesets/Ruleset.cs#L964-L967

  9. https://github.com/peppy/osu-stable-reference/blob/46cd3a10af7cc6cc96f4eba92ef1812dc8c3a27e/osu!/GameplayElements/HitObjects/Fruits/HitCircleFruitsSpin.cs#L66-L83 2

  10. https://github.com/peppy/osu-stable-reference/blob/46cd3a10af7cc6cc96f4eba92ef1812dc8c3a27e/osu!/GameModes/Play/Rulesets/Ruleset.cs#L946-L950

  11. https://github.com/peppy/osu-stable-reference/blob/46cd3a10af7cc6cc96f4eba92ef1812dc8c3a27e/osu!/GameModes/Play/Rulesets/Ruleset.cs#L740

@bdach
Copy link
Collaborator Author

bdach commented Mar 4, 2024

Spreadsheet: https://docs.google.com/spreadsheets/d/1UYz9XkhA8siliwzhdp1Capg8pHRqgZcZXvon88meBJ8/edit#gid=1075393136

I guess it being empty makes sense because the spreadsheet generator will have imported legacy scores which are supposed to be unaffected by any of these changes. So take that as a regression test I suppose...

@bdach bdach marked this pull request as ready for review March 4, 2024 22:04
@smoogipoo smoogipoo merged commit d8003ab into ppy:master Mar 6, 2024
15 of 17 checks passed
@bdach bdach deleted the fix-catch-pp-mismatch branch March 6, 2024 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

Inconsistency in pp calculation due to treatment of large droplet misses (osu!catch)
2 participants