270 Commits

• Re-remove duplicate error functions
  Dean Herbert · 2025-10-07 16:30:40 +09:00
  743a94bd22
• Merge branch 'master' into pp-dev
  Dean Herbert · 2025-10-07 16:11:54 +09:00
  bda5737135
• Adjust matchmaking naming, namespaces, xmldoc (#35123)

  * Adjust matchmaking naming, namespaces, xmldoc
  
  * Change partial filenames to use `.` instead of `_` separator

  Dean Herbert · 2025-09-26 12:17:28 +09:00
  e1ba1b45b0
• 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
• Merge branch 'master' into pp-dev
  Dan Balasescu · 2025-09-07 19:22:08 +09:00
  ffab8342f2
• Show effect of beatmap attributes on gameplay metrics in osu!
  Bartłomiej Dach · 2025-08-01 11:07:48 +02:00
  655733c06d
• Allow showing additional metrics when hovering over beatmap attributes
  Bartłomiej Dach · 2025-08-01 11:06:40 +02:00
  c68cbc5360
• Fix code quality
  Bartłomiej Dach · 2025-07-30 15:00:55 +02:00
  640fe5752d
• Rename property to reduce confusion

  Caused an actual bug in one of the replaced usages.

  Bartłomiej Dach · 2025-07-30 14:06:38 +02:00
  cd2c5075df
• Add new ruleset method responsible for displaying beatmap attributes consistently everywhere

  The intention is to use this in every place that wishes to display
  beatmap attributes (and also remove a bunch of local hack-arounds for
  mania, etc.)

  Bartłomiej Dach · 2025-07-30 13:41:19 +02:00
  e2a454ae00
• osu!taiko consistency factor changes using object strains (#34327)

  * Calculate consistency factor from object strains
  
  * Use `totalDifficultHits` in performance calc
  
  ---------
  
  Co-authored-by: James Wilson <tsunyoku@gmail.com>

  Eloise · 2025-07-28 13:58:54 +00:00
  803e30f50f
• Replace error functions in DifficultyCalculationUtils with good-enough approximations (#33717)

  * Reimplement error functions
  
  * Fix bug with adjustment for negative values
  
  * Formatting
  
  ---------
  
  Co-authored-by: tsunyoku <tsunyoku@gmail.com>

  Natelytle · 2025-06-18 13:14:01 +00:00
  d5ef8c8524
• Optimize rhythm evaluation by replacing curve (#33423)

  * Update RhythmEvaluator.cs
  
  * add smoothstep bell curve
  
  * Update osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
  
  Co-authored-by: StanR <castl@inbox.ru>
  
  * Update osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
  
  Co-authored-by: StanR <castl@inbox.ru>
  
  * Rename variables
  
  ---------
  
  Co-authored-by: StanR <castl@inbox.ru>
  Co-authored-by: James Wilson <tsunyoku@gmail.com>

  Givikap120 · 2025-06-13 13:02:31 +05:00
  b783bb70e9
• Merge branch 'master' into pp-dev
  Bartłomiej Dach · 2025-05-31 19:55:56 +02:00
  737ec8b2a8
• 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
• Remove track usage in difficulty and performance calculations (#33132)
  James Wilson · 2025-05-14 12:37:08 +00:00
  d22b3fb200
• 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
• Disable incorrect cancellation token inspection
  Dean Herbert · 2025-04-07 20:12:49 +09:00
  2dc38b5f09
• Move BeatmapVersion from BeatmapInfo to IBeatmap

  Closes https://github.com/ppy/osu/issues/32420.
  
  The failure cause here is that in editor the beatmap version for the
  beatmap affected (or... any beatmap, really), is 0 (ZERO). That is
  probably a regression from https://github.com/ppy/osu/pull/32315, but
  like... can we universally agree that calling that change "a regression"
  in any capacity is dumb? Like what was that code *doing* playing dumb
  reference games and copying stuff into an arbitrary instance that could
  get or not get used later on? And now you have a 50/50 chance of
  accessing the *correct* model's field, depending on whether you go via
  `BeatmapInfo` or `Beatmap.BeatmapInfo`?
  
  Moving the field to `IBeatmap`, i.e. what is by now - by consensus,
  since https://github.com/ppy/osu/pull/28473 - supposed to be the "decoded
  and materialised" beatmap, fixes this issue.
  
  I probably should have done this as part of
  https://github.com/ppy/osu/pull/28473 but it slipped my mind. Probably
  for the better too because this change has rather large chances of
  breaking stuff so maybe better to examine it in isolation (via diffcalc
  runs or whatever).
  
  For added humour points, you'd say that the field on `BeatmapInfo` was
  not `[Ignore]`d, so this is a realm schema change, right? No. As far as
  I can tell, it's not. I opened realm studio and `BeatmapVersion` *is not
  a listed column` on `Beatmap` models.
  
  I'm also not gonna get into the fact that I think `EditorBeatmap` doing
  dumb games with juggling two `BeatmapInfo` references since
  https://github.com/ppy/osu/pull/15075 is bad, because I don't think I
  have the mental capacity to hotfix this by going down that train of
  thought.

  Bartłomiej Dach · 2025-03-17 15:04:48 +01:00
  91f3be5fea
• Cancel difficulty calculation after 10 seconds by default
  Dan Balasescu · 2025-03-04 11:22:47 +09:00
  550ff85550
• 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
• Move error function from osu.Game.Utils to osu.Game.Rulesets.Difficulty.Utils (#31520)

  * Move error function implementation to osu.Game.Rulesets.Difficulty.Utils
  
  * Rename ErrorFunction.cs to DifficultyCalculationUtils_ErrorFunction.cs

  Natelytle · 2025-01-17 19:37:34 +00:00
  5b4ba9225d
• Punish speed PP for scores with high deviation (#30907)
  Givikap120 · 2025-01-09 13:27:54 +00:00
  b21c6457b1
• Simplify angle bonus formula (#31449)

  * Simplify angle bonus formula
  
  * Simplify further
  
  * Simplify acute too
  
  * Tests

  StanR · 2025-01-08 10:03:22 +00:00
  392bb5718c
• Rewrite of the Rhythm Skill within osu!taiko (#31284)

  * implement bell curve into diffcalcutils
  
  * remove unneeded attributes
  
  * implement new rhythm skill
  
  * change dho variables
  
  * update dho rhythm
  
  * interval interface
  
  * implement rhythmevaluator
  
  * evenhitobjects
  
  * evenpatterns
  
  * evenrhythm
  
  * change attribute ordering
  
  * initial balancing
  
  * change naming to Same instead of Even
  
  * remove attribute bump for display
  
  * Fix diffcalc tests
  
  ---------
  
  Co-authored-by: StanR <hi@stanr.info>

  Jay Lawton · 2024-12-27 16:30:30 +03:00
  824497d82c
• 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
• Simplify osu! high-bpm acute angle jumps bonus (#30902)

  * Simplify osu! high-bpm acute angle jumps bonus
  
  * Add aim wiggle bonus
  
  * Add hitwindow-based aim velocity decrease
  
  * Revert "Add hitwindow-based aim velocity decrease"
  
  This reverts commit bcebe9662c.
  
  * Move wiggle multiplier to a const, slightly decrease acute bonus multiplier
  
  * Make sure the previous object in the wiggle bonus is also part of the wiggle
  
  * Scale the wiggle bonus multiplayer down
  
  * Increase the acute angle jump bonus multiplier
  
  * Make wiggle bonus only apply on >150 bpm streams, make repetitive angle penalty
  
  * Reduce wiggle bonus multiplier to not break velocity>difficulty relation
  
  * Adjust wiggle falloff function to fix stability issues
  
  * Adjust wiggle consts
  
  * Update tests

  StanR · 2024-12-20 23:32:51 +00:00
  f722f94f26
• Refactor TaikoDifficultyCalculator and add DifficultStrain attributes (#31191)

  * refactor + countdifficultstrain
  
  * norm in utils
  
  * adjust scaling shift
  
  * fix comment
  
  * revert all value changes
  
  * add the else back
  
  * remove cds comments

  Jay Lawton · 2024-12-19 11:32:59 +00:00
  4ca88ae2d6
• Move bookmarks out of BeatmapInfo

  Not sure why I didn't do that in https://github.com/ppy/osu/pull/28473...

  Bartłomiej Dach · 2024-12-03 14:17:14 +01:00
  808934581f
• Merge branch 'master' into beatmap-info-purge
  Dean Herbert · 2024-11-22 18:47:32 +09:00
  086a34f5c0
• More correct but not too important
  Nathen · 2024-11-14 01:50:05 -05:00
  d0e793a3b3
• Be doubly careful
  Nathen · 2024-11-14 01:47:24 -05:00
  2ea2e5f1db
• Fix NaN PP values when SR is 0
  Nathen · 2024-11-14 01:42:07 -05:00
  ce818f59e7
• Merge branch 'master' into bat-max-performance
  Dean Herbert · 2024-11-14 13:35:29 +09:00
  7670a81181
• Merge pull request #30536 from stanriders/add-diffcalc-helpers

  Add `DifficultyCalculationUtils`

  Dan Balasescu · 2024-11-13 17:49:40 +09:00
  60d45d44bb
• Fix code issues
  StanR · 2024-11-07 21:23:26 +05:00
  c9d3b6557d
• Add DifficultyCalculationUtils
  StanR · 2024-11-07 20:36:00 +05:00
  78c97d2cd7
• rename DifficultStrains for clarity
  Jay Lawton · 2024-11-07 21:56:42 +10:00
  7c3a3c4d10
• update methods
  Jay Lawton · 2024-11-07 21:12:04 +10:00
  2b6a473164
• introduce difficult strains globally
  Jay Lawton · 2024-11-07 19:53:53 +10:00
  a5e6da76cb
• Store attribute to the database
  Dan Balasescu · 2024-11-01 16:02:02 +09:00
  9766d51559
• Compute maximum performance along with difficulty
  Dan Balasescu · 2024-10-17 19:26:19 +09:00
  d195a69447
• Merge branch 'master' into taikostatacc
  Bartłomiej Dach · 2024-10-07 14:15:29 +02:00
  84d6467e48
• Merge branch 'master' into no-combo-scaling
  tsunyoku · 2024-10-03 16:37:20 +01:00
  f54a5a5b0e
• 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 'master' into beatmap-info-purge
  Dean Herbert · 2024-07-23 12:09:32 +09:00
  d707e29ff7
• Enforce IBeatmap.Breaks to be sorted chronologically
  Salman Ahmed · 2024-07-08 16:06:38 +03:00
  b33e54d064
• Revert "Change breaks list to IReadOnlyList"

  This reverts commit 2c3b411bb5.

  Dan Balasescu · 2024-07-02 12:16:11 +09:00
  04da1209f7