101 Commits

• Merge branch 'master' into pp-dev
  Bartłomiej Dach · 2025-05-31 19:55:56 +02:00
  737ec8b2a8
• 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
• 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
• 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-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
• Change breaks list to IReadOnlyList
  Dean Herbert · 2024-07-02 11:59:24 +09:00
  2c3b411bb5
• Isolate bindable breaks list to EditorBeatmap
  Dean Herbert · 2024-07-02 11:31:55 +09:00
  005af280f2
• Fix ManiaModInvert permanently messing up the beatmap
  Dan Balasescu · 2024-07-01 15:02:00 +09:00
  f942595829
• Merge branch 'master' into pp_counter_fix
  Dan Balasescu · 2024-06-28 12:40:56 +09:00
  3b3f914cd2
• Make list of breaks bindable
  Bartłomiej Dach · 2024-06-19 07:44:03 +02:00
  6a6ccbc09f
• Updated the tests according to new logic

  and fixed one minor CI code quality thing

  Givikap120 · 2024-06-18 15:48:21 +03:00
  1ddfc8f011
• Changed timed difficulty attributes to be "per-HitObject" instead of "per-DifficultyHitObject"
  Givikap120 · 2024-06-18 15:41:41 +03:00
  ec2b8f3bc3
• Move CountdownOffset out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 14:15:00 +02:00
  dd50d6fa6e
• Move Countdown out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 14:15:00 +02:00
  d373f752d6
• Move TimelineZoom out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 14:15:00 +02:00
  7f2a6f6f5a
• Move GridSize out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 14:15:00 +02:00
  6685c5ab74
• Move DistanceSpacing out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 14:14:58 +02:00
  3634307d7c
• Move SamplesMatchPlaybackRate out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 13:32:23 +02:00
  c216283bf4
• Move EpilepsyWarning out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 13:28:41 +02:00
  f64a0624a5
• Move WidescreenStoryboard out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 13:23:53 +02:00
  1ab86ebd24
• Move LetterboxInBreaks out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 13:18:44 +02:00
  a6b7600bf2
• Move SpecialStyle out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 13:12:30 +02:00
  011c2e3651
• Move StackLeniency out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 13:04:33 +02:00
  0a4560a03e
• Move AudioLeadIn out of BeatmapInfo
  Bartłomiej Dach · 2024-06-12 13:04:28 +02:00
  4339e2dc4a
• Preserve storyboard events when saving a beatmap in the editor

  Until we have full encoding support for storyboards, this stop-gap
  measure ensures that storyboards don't just disappear from existence.

  Dean Herbert · 2024-04-30 00:01:56 +08:00
  fd3f4a9e7b
• Ensure all remaining objects are added in the last iteration
  Dan Balasescu · 2024-04-12 00:11:54 +09:00
  e9b319f4c6
• Implement a less failure-prone method
  Dan Balasescu · 2024-04-11 23:40:40 +09:00
  19cc847be6
• Also add potentially missed intermediate parents
  Dan Balasescu · 2024-04-11 16:53:08 +09:00
  f5555b9fa4
• Fix gameplay PP counter not matching results screen
  Dan Balasescu · 2024-04-08 22:34:11 +09:00
  fefcd17db9
• Split legacy scoring attributes into a separate object
  Dan Balasescu · 2023-09-07 21:10:38 +09:00
  2334be1987
• Add flag to disable computing legacy scoring values
  Dan Balasescu · 2023-06-24 01:03:18 +09:00
  06565871d6
• Fix legacy diffcalc creating all mods unnecessarily
  Dan Balasescu · 2023-06-02 17:37:43 +09:00
  bfe80fe143
• Add versioning to difficulty calculators
  Dean Herbert · 2022-07-21 18:15:25 +09:00
  aca19a005e
• Automated #nullable processing
  Dan Balasescu · 2022-06-17 16:37:17 +09:00
  f8830c6850
• Remove internal process method
  apollo-dw · 2022-05-22 21:45:27 +01:00
  40f560d7d0
• Rename method to CalculateAllLegacyCombinations()
  Dan Balasescu · 2022-03-31 15:09:06 +09:00
  40b6f3ff0a
• Add remark about usage of CalculateAll()
  Dan Balasescu · 2022-02-22 18:12:55 +09:00
  bedd07d2e4
• wip
  Dan Balasescu · 2022-02-17 21:14:49 +09:00
  3945cd24eb
• Use default timeout in GetPlayableBeatmap when provided CancellationToken is default
  Dean Herbert · 2021-12-07 13:33:41 +09:00
  cfa712473d
• Add the ability to pass a CancellationToken through DifficultyCalculator.CalculateAll

  Was weirdly missing from this one method.

  Dean Herbert · 2021-12-07 13:32:47 +09:00
  f3e9fb76fc
• Merge branch 'master' into beatmap-cancellation-token
  Dean Herbert · 2021-11-17 11:16:10 +09:00
  0715d40ea0
• Standardise naming of CancellationToken parameters
  Dean Herbert · 2021-11-16 14:45:51 +09:00
  6cca657a2d
• Update DifficultyCalculator to take an IRulesetInfo
  Dean Herbert · 2021-11-15 19:16:48 +09:00
  369b4ba789
• Update DifficultyCalculator to take an IWorkingBeatmap
  Dean Herbert · 2021-11-15 19:16:48 +09:00
  62d670a3ca
• Handle mods with overloaded method signature instead
  Dean Herbert · 2021-11-08 14:43:46 +09:00
  c58f21a115