5568 Commits

• 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
• Merge pull request #33259 from LumpBloom7/ruleset-agnostic-concurrent-check

  Make concurrent object check ruleset specific

  Bartłomiej Dach · 2025-05-26 14:33:41 +02:00
  f043a95dbd
• Make CheckConcurrentObjects.Run virtual

  And let implementers copy-paste common code.

  Derrick Timmermans · 2025-05-26 10:59:57 +02:00
  0495a03607
• Rename ConcurrentCondition to ConcurrencyPrecondition

  Better describes the intent of the method.

  Derrick Timmermans · 2025-05-26 10:59:17 +02:00
  257767b311
• Use null coalesce wherever possible

  Rider EAP being noisy about this one now.

  Dean Herbert · 2025-05-26 17:15:35 +09:00
  5450298468
• Remove redundant public specfications in interfaces

  Rider EAP being noisy about this now (smoogi will be happy :D).

  Dean Herbert · 2025-05-26 17:14:41 +09:00
  cb0592d711
• Make CheckConcurrentObject ruleset specific
  Derrick Timmermans · 2025-05-25 14:19:23 +02:00
  0065696248
• 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
• Merge pull request #33209 from bdach/mania-combo-accounting-rewind

  Fix combo accounting when rewinding mania replays

  Dean Herbert · 2025-05-23 16:47:36 +09:00
  fa92fbb9d1
• 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
• Fix editor player sometimes crashing because of instantiating wrong judgement result type for object

  Closes https://github.com/ppy/osu/issues/33231.
  
  I'm not sure how to reproduce the instances of this reported to sentry
  with `Drawable{Slider,Spinner}`, but this bug is about to be made worse
  by `DrawableHoldNote` in mania getting its own `JudgementResult` subtype
  in https://github.com/ppy/osu/pull/33194 - for that one to reproduce
  just start gameplay test while editor is seeked to a time instant where
  a hold note is mid-hold.
  
  There's possibly an argument here that `CreateResult()` should live on
  `HitObject` and not `DrawableHitObject`, and I'd even be partial to such
  an argument, but doing that would be a rather hard ruleset API break
  (albeit trivial one to resolve), and also may dredge up past
  conversations about `Judgement` and `JudgementResult` (cf.
  https://github.com/ppy/osu/pull/26563) that I would rather not get into
  again.
  
  Notably this is not source-breaking for rulesets. It may be
  binary-breaking, I haven't tested.

  Bartłomiej Dach · 2025-05-22 10:20:39 +02:00
  70c6ddbe30
• Adjust combo accounting in score processor to be order-agnostic

  Closes https://github.com/ppy/osu/issues/21732.
  
  While the problem of multiple judgements in one frame and ordering of
  `RevertResult()` calls as described in the issue is a real one, this
  commit is a bit of a sidestep of the entire issue.
  
  The idea here that while *snapshots* of instantaneous combo values are
  susceptible to such ordering foibles on revert, *deltas* are not - and
  such, when deltas are using to update the combo counts on revert,
  ordering stops mattering so much.

  Bartłomiej Dach · 2025-05-20 12:28:28 +02:00
  237de1ef72
• 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
• Also perform time-based frame de-duplication at frame bundle level

  See https://github.com/ppy/osu/pull/33148#discussion_r2092467082

  Bartłomiej Dach · 2025-05-16 09:39:29 +02:00
  baf069ccf7
• Do not emit multiple consequent replay frames with the exact same data

  With judgements occurring forcing emission of important frames, there's
  the question of emitting redundant frames. In a majority of cases
  still, a judgement *will* be tied to a specific user input, which means
  that there's a high likelihood of duplicate frames, as one will be
  emitted by the input change, and another by the judgement.
  
  To a degree this is a pre-existing issue. The replay recording code
  responds to both mouse movement and key presses by recording frames, so
  depending on the intrinsic (basically undefined) ordering between
  handling mouse move and key presses, it was possible for multiple frames
  to be emitted with the same timestamp to the replay, each containing
  partial input state changes (e.g. first frame with mouse position
  changed, and the second with a key pressed).
  
  The extent to which this increases the frame count will obviously depend
  on the beatmap, but in my ballpark testing across all rulesets on a
  single "relatively standard" beatmap (think no aspire chicanery), around
  4-10% of frames can end up being duplicates / not meaningful. This has
  implications both on replay size and on playback performance.
  
  This commit therefore performs de-duplication of the frames based on
  timestamp - only the last frame with a given timestamp ends up in the
  final replay.
  
  The CPU cost of this is negligible to the point of not being useful to
  profile - it's a single condition gated behind a single float comparison

  Bartłomiej Dach · 2025-05-16 08:40:07 +02:00
  cd4ab9307c
• Emit important replay frames on every judgement

  - Closes https://github.com/ppy/osu/issues/4287
  - Probably closes https://github.com/ppy/osu/issues/25405 (but not
    retroactively)
  
  Up until now, whether or not a replay frame is emitted depended solely
  on the user's input, i.e. mouse movement or key presses/releases. This,
  intersected with the replay playback system which is given allowance to
  perform interpolation between replay frames, leads to potential
  situations wherein a replay can play inaccurately when a judgement takes
  place without user input meaningfully changing. One such case is slider
  ends with their 36ms of judgement leniency; see
  https://github.com/ppy/osu/issues/25405#issuecomment-2879031106 for
  details on that.
  
  To that end, this commit aims to counteract that issue by *forcing* an
  important replay frame to be emitted on every new judgement recorded
  during gameplay. This will only benefit rulesets wherein judgements can
  occur that are not inherently tied to user input changing, which are
  going to be osu! as mentioned above, and maybe possibly catch. I don't
  foresee this doing anything relevant for taiko or mania.

  Bartłomiej Dach · 2025-05-15 11:43:09 +02:00
  9f91c2e25c
• Remove track usage in difficulty and performance calculations (#33132)
  James Wilson · 2025-05-14 12:37:08 +00:00
  d22b3fb200
• Remove unnecessary replay recorder depth hack

  Addresses https://github.com/ppy/osu/pull/33102#discussion_r2087963889.

  Bartłomiej Dach · 2025-05-14 11:25:31 +02:00
  acebf3e95e
• Merge pull request #33104 from frenzibyte/adjust-pitch-tooltip

  Fix rate adjust / time ramp mods not showing "Adjust pitch" in tooltip

  Dean Herbert · 2025-05-13 15:11:26 +09:00
  cb59e5acbf
• Change implementation to match other implementations

  The previous version was confusing to read.

  Dean Herbert · 2025-05-13 15:10:59 +09:00
  7918685c4e
• 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
• Fix rate adjust / time ramp mods not showing "Adjust pitch" in tooltip
  Salman Alshamrani · 2025-05-12 15:14:26 +03:00
  9c77a3e74f
• Fix mod tooltip not handling settings changes to same mod instance
  Salman Alshamrani · 2025-05-12 15:04:51 +03:00
  d5be4bf8d4
• Allow any hit result for empty hit windows

  It's really going to return zero anyway even if given a "supported"
  one, so probably fine?

  Bartłomiej Dach · 2025-05-09 10:31:00 +02:00
  bf86878597
• Fix HitWindows.WindowFor() returning values for invalid results

  This fell out of my work on hit window-related replay issues. In my WIP
  branch (that is probably going to get PR'd as draft soon) I refactored
  `HitWindows` and found a few straggling test failures due to some places
  reading hit windows for results that were not actually supported by the
  underlying `HitWindows` implementations, leading to returning garbage
  (mostly zeroes).
  
  Importantly, there is one actual usage in game code with impact here -
  `TaikoModSingleTap` was attempting to read the hit window for MEH, when
  MEH was never actually a valid hit result in taiko (OK is). This was a
  result of a copy-paste oversight from osu!, specifically from
  
  	https://github.com/ppy/osu/blob/51cf835fb6300aca53b5b98143d606f64d7a4d49/osu.Game.Rulesets.Osu/Mods/InputBlockingMod.cs#L58

  Bartłomiej Dach · 2025-05-09 09:40:20 +02:00
  ceb58a1141
• Merge pull request #32970 from peppy/mod-icon-improvements

  Improve visibility of setting adjustments on mod icons

  Dean Herbert · 2025-04-30 17:21:12 +09:00
  373a74da4b
• Move UserAdjustedSettingsCount local to ModDifficultyAdjust in absence of other usages
  Dean Herbert · 2025-04-30 16:04:26 +09:00
  a397737476
• Fix adjustment marker not updating when settings' states change
  Dean Herbert · 2025-04-30 13:04:50 +09:00
  0c5193ba59
• Don't bother with localised implementation of AdjustedSettingsCount

  I was avoiding using reflection to save on overheads, but it's probably
  not worth it.

  Dean Herbert · 2025-04-30 12:58:40 +09:00
  babccca2bb
• Add xmldoc note explaining new flag is instantaneous state
  Dean Herbert · 2025-04-30 12:49:39 +09:00
  14d0565194
• Adjust colours to match icon better
  Dean Herbert · 2025-04-30 12:48:07 +09:00
  713fbfb2c8
• Show marker when settings are adjusted
  Dean Herbert · 2025-04-28 18:14:14 +09:00
  1e8d9b3482
• Show singular difficulty adjust modifications inline in mod icons
  Dean Herbert · 2025-04-28 16:58:16 +09:00
  c16514274d
• Simplify taglib interactions further
  Dean Herbert · 2025-04-28 15:52:31 +09:00
  40faa3fc99
• Add manual MIME type resolution for TagLib file creation
  Stedoss · 2025-04-28 13:38:38 +09:00
  c2efda20d7
• Merge branch 'master' into freestyle-mods
  Bartłomiej Dach · 2025-04-23 13:49:32 +02:00
  6da4e09717
• Fix rate adjust no longer showing the rate if custom

  "Accidentally" removed in 6e635f124a
  apparently.

  Bartłomiej Dach · 2025-04-18 14:03:32 +02:00
  5791375b38
• Improve IMod documentation
  Dan Balasescu · 2025-04-17 18:32:35 +09:00
  92267c8bb3
• Use IMod documentation where present
  Dan Balasescu · 2025-04-17 18:32:26 +09:00
  95cf4887e1
• Apply changes from reviews
  Dan Balasescu · 2025-04-17 02:19:31 +09:00
  64aafa4e4c
• Adjust property name
  Dan Balasescu · 2025-04-14 19:34:33 +09:00
  35ee4b6f24
• Only apply freestyle validation to required mods
  Dan Balasescu · 2025-04-14 19:34:21 +09:00
  b4c7d7f498
• Revert "Use median for statistic display"

  This reverts commit fa06643bb6.
  
  Revert "Remove mean hit error calculation"
  
  This reverts commit b3c578e545.

  Dean Herbert · 2025-04-11 02:12:40 +09:00
  ba5932c1dd
• Allow classic mod in freestyle
  Dan Balasescu · 2025-04-10 13:05:17 +09:00
  c6e368d3ea
• Merge pull request #32723 from sineplusx/fix-multi-chat-hint

  Use actual keybind in multiplayer chat hint

  Bartłomiej Dach · 2025-04-09 09:29:12 +02:00
  c5eda87ac3
• Move key binding string retrieval to RealmKeyBindingStore
  Dean Herbert · 2025-04-09 15:23:55 +09:00
  9e90f80ab5
• Merge branch 'master' into freestyle-mods
  Dan Balasescu · 2025-04-08 19:57:28 +09:00
  1c060f986c
• Remove obsoleted overload of ApplyResult
  Dean Herbert · 2025-04-08 15:47:30 +09:00
  5d572e1ab2