50 Commits

• Remove databasing of MechanicalDifficulty and ReadingDifficulty attributes (#35028)

  * Remove databasing of `MechanicalDifficulty` and `ReadingDifficulty` attributes
  
  * Update attribute IDs

  James Wilson · 2025-09-15 13:46:00 +03:00
  2749184c38
• Add a consistency factor to osu!taiko diffcalc (#33233)

  * add consistency attribute
  
  * write attributes to json for serialisation
  
  * comment change
  
  * fix json, add mechanical difficulty
  
  * write new attributes to database
  
  ---------
  
  Co-authored-by: James Wilson <tsunyoku@gmail.com>

  Jay Lawton · 2025-05-23 11:57:37 +00:00
  ace74824b8
• Add spinners support to combo based estimated misscount (#33170)

  * add spinner support
  
  * Make `CalculateSpinnerScore` private & clarify comments
  
  ---------
  
  Co-authored-by: James Wilson <tsunyoku@gmail.com>

  Givikap120 · 2025-05-22 22:27:16 +00:00
  ee055ba8f5
• Change effective misscount to be based on legacy score and combo at the same time (#33066)

  * implement stuff
  
  * fix basic issues
  
  * rework calculations
  
  * sanity check
  
  * don't use score based misscount if no scorev1 present
  
  * Update OsuPerformanceCalculator.cs
  
  * update misscount diff attribute names
  
  * add raw score misscount attribute
  
  * introduce more reasonable high bound for misscount
  
  * code quality changes
  
  * Fix osu!catch SR buzz slider detection (#32412)
  
  * Use `normalized_hitobject_radius` during osu!catch buzz slider detection
  
  Currently the algorithm considers some buzz sliders as standstills when
  in reality they require movement. This happens because `HalfCatcherWidth`
  isn't normalized while `exactDistanceMoved` is, leading to an inaccurate
  comparison.
  
  `normalized_hitobject_radius` is the normalized value of `HalfCatcherWidth`
  and replacing one with the other fixes the problem.
  
  * Rename `normalized_hitobject_radius` to `normalized_half_catcher_width`
  
  The current name is confusing because hit objects have no radius in the
  context of osu!catch difficulty calculation. The new name conveys the
  actual purpose of the value.
  
  * Only set `normalized_half_catcher_width` in `CatchDifficultyHitObject`
  
  Prevents potential bugs if the value were to be changed in one of the
  classes but not in both.
  
  * Use `CatchDifficultyHitObject.NORMALIZED_HALF_CATCHER_WIDTH` directly
  
  Requested during code review.
  
  ---------
  
  Co-authored-by: James Wilson <tsunyoku@gmail.com>
  
  * Move osu!catch movement diffcalc to an evaluator (#32655)
  
  * Move osu!catch movement state into `CatchDifficultyHitObject`
  
  In order to port `Movement` to an evaluator, the state has to be either
  moved elsewhere or calculated inside the evaluator. The latter requires
  backtracking for every hit object, which in the worst case is continued
  until the beginning of the map is reached. Limiting backtracking can
  lead to difficulty value changes.
  
  Thus, the first option was chosen for its simplicity.
  
  * Move osu!catch movement difficulty calculation to an evaluator
  
  Makes the code more in line with the other game modes.
  
  * Add documentation for `CatchDifficultyHitObject` fields
  
  ---------
  
  Co-authored-by: James Wilson <tsunyoku@gmail.com>
  
  * Move all score-independent bonuses into star rating (#31351)
  
  * basis refactor to allow for more complex SR calculations
  
  * move all possible bonuses into star rating
  
  * decrease star rating scaling to account for overall gains
  
  * add extra FL guard for safety
  
  * move star rating multiplier into a constant
  
  * Reorganise some things
  
  * Add HD and SO to difficulty adjustment mods
  
  * Move non-legacy mod multipliers back to PP
  
  * Some merge fixes
  
  * Fix application of flashlight rating multiplier
  
  * Fix Hidden bonuses being applied when Blinds mod is in use
  
  * Move part of speed OD scaling into difficulty
  
  * Move length bonus back to PP
  
  * Remove blinds special case
  
  * Revert star rating multiplier decrease
  
  * More balancing
  
  ---------
  
  Co-authored-by: StanR <hi@stanr.info>
  
  * Add diffcalc considerations for Magnetised mod (#33004)
  
  * Add diffcalc considerations for Magnetised mod
  
  * Make speed reduction scale with power too
  
  * cleaning up
  
  * Update OsuPerformanceCalculator.cs
  
  * Update OsuPerformanceCalculator.cs
  
  * add new check to avoid overestimation
  
  * fix code style
  
  * fix nvicka
  
  * add database attributes
  
  * Refactor
  
  * Rename `Working` to `WorkingBeatmap`
  
  * Remove redundant condition
  
  * Remove useless variable
  
  * Remove `get` wording
  
  * Rename `calculateScoreAtCombo`
  
  * Remove redundant operator
  
  * Add comments to explain how score-based miss count derivations work
  
  * Remove redundant `decimal` calculations
  
  * use static method to improve performance
  
  * move stuff around for readability
  
  * move logic into helper class
  
  * fix the bug
  
  * Delete OsuLegacyScoreProcessor.cs
  
  * Delete ILegacyScoreProcessor.cs
  
  * revert static method for multiplier
  
  * use only basic combo score attribute
  
  * Clean-up
  
  * Remove unused param
  
  * Update osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
  
  Co-authored-by: StanR <castl@inbox.ru>
  
  * rename variables
  
  * Add `LegacyScoreUtils`
  
  * Add fail safe
  
  * Move `countMiss`
  
  * Better explain `CalculateRelevantScoreComboPerObject`
  
  * Add `OsuLegacyScoreMissCalculator`
  
  * Move `CalculateScoreAtCombo` and `CalculateRelevantScoreComboPerObject`
  
  * Remove unused variables
  
  * Move `GetLegacyScoreMultiplier`
  
  * Add `estimated` wording
  
  ---------
  
  Co-authored-by: wulpine <wulpine@proton.me>
  Co-authored-by: James Wilson <tsunyoku@gmail.com>
  Co-authored-by: StanR <hi@stanr.info>
  Co-authored-by: StanR <castl@inbox.ru>

  Givikap120 · 2025-05-16 23:38:12 +00:00
  9314ea94b5
• Use proportion of difficult sliders to better estimate sliderbreaks on classic accuracy scores (#31234)

  * scale misscount by proportion of difficult sliders
  
  * cap sliderbreak count at count100 + count50
  
  * use countMiss instead of effectiveMissCount as the base for sliderbreaks
  
  * make code inspector happy + cleanup
  
  * refactor to remove unnecesary calculation and need for new tuple
  
  * scale sliderbreaks with combo
  
  * use aimNoSliders for sliderbreak factor
  
  * code cleanup
  
  * make inspect code happy
  
  * use diffcalcutils
  
  * fix errors (oops)
  
  * scaling changes
  
  * fix div by zeros
  
  * Fix compilation error
  
  * Add online attributes for new difficulty attributes
  
  * Formatting
  
  * Rebase fixes
  
  * Make `CountTopWeightedSliders` to remove weird protected `SliderStrains` list
  
  * Prevent top weighted slider factor from being Infinity
  
  ---------
  
  Co-authored-by: tsunyoku <tsunyoku@gmail.com>

  KermitNuggies · 2025-05-12 14:05:07 +01:00
  3165b147ee
• Calculate hit windows in performance calculator instead of databased difficulty attributes (#31735)

  * Calculate hit windows in performance calculator instead of databased difficulty attributes
  
  * Apply mods to beatmap difficulty in osu! performance calculator
  
  * Remove `GreatHitWindow` difficulty attribute for osu!mania
  
  * Remove use of approach rate and overall difficulty attributes for osu!
  
  * Remove use of hit window difficulty attributes in osu!taiko
  
  * Remove use of approach rate attribute in osu!catch
  
  * Remove unused attribute IDs
  
  * Code quality
  
  * Fix `computeDeviationUpperBound` being called before `greatHitWindow` is set

  James Wilson · 2025-02-07 19:21:12 +09:00
  9f90ebb2f7
• Punish speed PP for scores with high deviation (#30907)
  Givikap120 · 2025-01-09 13:27:54 +00:00
  b21c6457b1
• Change slider drop penalty to use actual number of difficult sliders, fix slider drop penalty being too lenient (#31055)

  * Change slider drop penalty to use actual number of difficult sliders, fix slider nerf being too lenient
  
  * Move cubing to performance calculation
  
  * Add separate list for slider strains
  
  * Rename difficulty atttribute
  
  * Rename attribute in perfcalc
  
  * Check if AimDifficultSliderCount is more than 0, code quality fixes
  
  * Add `AimDifficultSliderCount` to the list of databased attributes
  
  * Code quality
  
  ---------
  
  Co-authored-by: James Wilson <tsunyoku@gmail.com>

  StanR · 2024-12-21 23:45:29 +00:00
  6808a5a77c
• Store attribute to the database
  Dan Balasescu · 2024-11-01 16:02:02 +09:00
  9766d51559
• Merge branch 'master' into taikostatacc
  Bartłomiej Dach · 2024-10-07 14:15:29 +02:00
  84d6467e48
• Update osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs

  Co-authored-by: James Wilson <tsunyoku@gmail.com>

  apollo-dw · 2024-09-11 12:29:17 +01:00
  a7e1d35f64
• Merge branch 'ppy:master' into no-combo-scaling
  apollo-dw · 2024-05-11 13:24:16 +01:00
  9b60abe486
• Merge master
  nathen · 2024-03-09 22:33:13 -05:00
  8a26cdaaab
• Remove no longer used scoring difficulty attributes
  Bartłomiej Dach · 2023-10-16 12:36:58 +02:00
  f2436a5ecb
• Split legacy scoring attributes into a separate object
  Dan Balasescu · 2023-09-07 21:10:38 +09:00
  2334be1987
• Fix incorrect truncation to int
  Dan Balasescu · 2023-08-15 00:58:13 +09:00
  90d7e46e20
• Temporarily allow new difficulty attributes to not exist
  Dan Balasescu · 2023-08-14 16:59:01 +09:00
  d1a4a46fd3
• Serialize ok hit window attribute to db
  Natelytle · 2023-07-28 11:38:30 -04:00
  e56942012c
• Remove JSON output
  Dan Balasescu · 2023-06-28 16:15:44 +09:00
  af25ffbe81
• Adjust attribute data
  Dan Balasescu · 2023-06-19 21:38:13 +09:00
  bfa449e47a
• Add combo score / bonus score attributes
  Dan Balasescu · 2023-06-12 23:00:29 +09:00
  446807e7f6
• "TotalScoreV1" -> "LegacyTotalScore"
  Dan Balasescu · 2023-06-06 17:25:28 +09:00
  77c745cc94
• Write max combo attribute from base class
  Dan Balasescu · 2023-06-02 21:53:25 +09:00
  e402c6d2b4
• Implement ScoreV1 calculation for OsuRuleset
  Dan Balasescu · 2023-06-02 17:36:45 +09:00
  02111e3854
• Merge branch 'master' into no-combo-scaling
  apollo-dw · 2022-10-24 02:17:39 +01:00
  23d0c03fc8
• Merge branch 'master' into speed-acc-scaling
  Dan Balasescu · 2022-06-29 16:15:20 +09:00
  2989803b71
• Remove NRT disables from attributes classes
  Dan Balasescu · 2022-06-27 16:07:15 +09:00
  0fd2c010e5
• Add IBeatmapOnlineInfo parameter and use to extract more data
  Dan Balasescu · 2022-06-27 16:07:15 +09:00
  0579780bb8
• Add attribute ID
  Dan Balasescu · 2022-06-21 19:31:45 +09:00
  a7de43ade6
• Automated #nullable processing
  Dan Balasescu · 2022-06-17 16:37:17 +09:00
  f8830c6850
• Merge branch 'master' into no-combo-scaling
  apollo · 2022-03-03 14:55:41 +00:00
  580e43b5ea
• Add XMLDocs to difficulty attribute properties
  Dan Balasescu · 2022-02-16 14:09:19 +09:00
  84e82ef5e4
• Add attribute ids to mapping functions
  Dan Balasescu · 2022-01-06 16:28:04 +09:00
  400abc147b
• Slightly refactor difficulty and pp calculators
  StanR · 2021-12-17 23:40:23 +03:00
  2f2006715e
• Stop persisting Skills in DifficultyAttributes
  Dean Herbert · 2021-11-21 12:15:32 +09:00
  9f688f6291
• Move consts to top of file
  Dean Herbert · 2021-11-17 20:47:52 +09:00
  0a7498014f
• Use consts for attribute IDs
  Dan Balasescu · 2021-11-17 20:31:18 +09:00
  815179f713
• Document base class
  Dan Balasescu · 2021-11-17 20:20:54 +09:00
  abb333299b
• Remove JsonIgnores, require opt-in properties
  Dan Balasescu · 2021-11-15 19:54:35 +09:00
  2c45a327bb
• Remove extra members from FromDatabaseAttributes
  Dan Balasescu · 2021-11-15 18:11:07 +09:00
  c8a01c35f7
• Ignore some properties
  Dan Balasescu · 2021-11-15 16:32:25 +09:00
  45382a8127
• Add to/from database mapping functions to difficulty attributes
  Dan Balasescu · 2021-11-15 16:06:50 +09:00
  0cfd6fdf04
• Add json properties to difficulty attributes
  Dan Balasescu · 2021-11-15 16:06:29 +09:00
  907499f73a
• Refactor DifficultyAttributes to use auto properties over public fields
  Samuel Cattini-Schultz · 2021-06-08 19:43:59 +10:00
  f1bef989b7
• Move MaxCombo to base DifficultyAttributes
  smoogipoo · 2020-08-28 19:16:20 +09:00
  1c1afa1c96
• Add Skills to DifficultyAttributes
  HoLLy · 2019-05-29 11:22:51 +02:00
  7e9f5a0939
• Remove mods from constructor
  smoogipoo · 2019-02-19 13:40:39 +09:00
  af0bb4d5e8
• Implement new difficulty calculator structure
  smoogipoo · 2019-02-18 14:49:43 +09:00
  a8faa942a6
• Update licence header (and remove year)
  Dean Herbert · 2019-01-24 17:43:03 +09:00
  8617aaa2a7
• Restructure of DifficultyCalculator to cleanup mod + attribute handling
  smoogipoo · 2018-06-14 15:32:07 +09:00
  b7a06b9594