2048 Commits

• Merge branch 'master' into pp-dev
  Dean Herbert · 2025-10-07 16:11:54 +09:00
  bda5737135
• Fix missing tiny droplets not changing catcher animation state to fail

  Addresses https://github.com/ppy/osu/discussions/35182.
  
  The source as it is would have you believe that this is correct and
  intentional but I'm not so sure about that. For one thing, I
  cross-checked stable, and sure, missing tiny droplets does change the
  state to fail over there. For another, the guard in master at
  
  	https://github.com/ppy/osu/blob/5e642cbce72862b29b117829e7ec90d6d6b0ce1e/osu.Game.Rulesets.Catch/UI/Catcher.cs#L250
  
  is very suspicious, given that it is dead in cause of tiny droplets
  because of a preceding guard:
  
  	https://github.com/ppy/osu/blob/5e642cbce72862b29b117829e7ec90d6d6b0ce1e/osu.Game.Rulesets.Catch/UI/Catcher.cs#L227-L228
  
  Looking into blame, the tiny droplet guard originates at
  e7f1f0f38b, wherein it looks to have been
  aimed at handling *hyperdash* state specifically. Later, the logic has
  been moved around and around like five times; at
  7069cef9ce, the catcher animation logic
  was added *below* the hyperdash-aimed guard without the comment being
  updated in any way; 5a5c956ced moved the
  logic from `CatcherArea` to `Catcher`, while simultaneously changing
  the inline comment to no longer mention hyperdashing; and finally,
  1d669cf65e added specific testing of tiny
  droplets not changing catcher animation state, which I wager to be
  back-engineered from the implementation as-it-was rather than
  supported by any actual ground truth.
  
  For additional reference:
  
  - catcher animation logic in stable is at https://github.com/peppy/osu-stable-reference/blob/67795dba3c308e7d0493b296149dcb073ca47ecb/osu!/GameModes/Play/Rulesets/Fruits/RulesetFruits.cs#L411-L463
  - hyperdash application logic in stable is at https://github.com/peppy/osu-stable-reference/blob/67795dba3c308e7d0493b296149dcb073ca47ecb/osu!/GameModes/Play/Rulesets/Fruits/RulesetFruits.cs#L165-L171

  Bartłomiej Dach · 2025-10-03 14:52:33 +02:00
  67041254db
• Merge branch 'master' into pp-dev
  Dan Balasescu · 2025-09-07 19:22:08 +09:00
  ffab8342f2
• Merge pull request #34761 from frenzibyte/fix-flashlight

  Fix flashlight not always matching gameplay scaling

  Bartłomiej Dach · 2025-08-25 12:03:58 +02:00
  6e8246b539
• Adjust default flashlight size on osu! & osu!catch

  Because the flashlight is made to be scaled by playfield, there are
  constant scale factors applied somewhere in the
  `PlayfieldAdjustmentContainer` which needs to be reflected in the
  flashlight size to keep the size the same.
  
  The factor is specifically 1.6x, computed in {Osu,Catch}PlayfieldAdjustmentContainer.ScalingContainer`.
  
  More generally, I've deduced these factors by logging the difference
  between the `flashlightSize` before and after b78abe2f.

  Salman Alshamrani · 2025-08-21 19:03:43 +03:00
  7530ad1a7b
• Add and use new mod icon assets
  Bartłomiej Dach · 2025-08-21 09:00:44 +02:00
  92016a7d9b
• initial pass on updated verifier context usage across most checks
  Hivie · 2025-08-11 14:57:14 +01:00
  fd6cf680b9
• Adjust some formatting to read better
  Dean Herbert · 2025-08-04 18:20:56 +09:00
  af290ddc0c
• Adjust displayed precision to match stable
  Bartłomiej Dach · 2025-08-01 12:00:25 +02:00
  21ef184ae3
• Show effect of beatmap attributes on gameplay metrics in catch
  Bartłomiej Dach · 2025-08-01 11:07:58 +02:00
  c1ea472dcf
• Fix code quality
  Bartłomiej Dach · 2025-07-30 15:00:55 +02:00
  640fe5752d
• Refactor beatmap attribute methods

  This change refactors `GetAdjustedDisplayDifficulty()` and
  `GetBeatmapAttributesToDisplay()` in two ways:
  
  - Both methods now accept `IBeatmapInfo` instead of
    `IBeatmapDifficultyInfo`. This is done in order to make mania key
    count display to work, wherein `IBeatmapDifficultyInfo` is not enough
    to calculate the final key count.
  
  - `GetAdjustedDisplayDifficulty()` now applies all
    `IApplicableToDifficulty` mods itself. I did this after noticing that
    every real consumer of this method had to do that themselves for very
    little reason.

  Bartłomiej Dach · 2025-07-30 14:06:34 +02:00
  7c4dd812b6
• 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
• Change new mod name to title case
  Dean Herbert · 2025-07-30 15:54:13 +09:00
  31b5c9c2b8
• Rename mod and move back to fun
  Dean Herbert · 2025-07-29 17:11:41 +09:00
  92a5399b4a
• Merge branch 'master' into feature/catch-mod-h2w
  Dean Herbert · 2025-07-29 17:00:26 +09:00
  40f06af357
• Merge pull request #34181 from Hiviexd/verify/check-lowest-diff-drain

  Add verify check for lowest diff drain/play time requirements

  Bartłomiej Dach · 2025-07-22 08:38:59 +02:00
  c408d60fbe
• use TimeSpan for defining thresholds
  Hivie · 2025-07-21 12:32:45 +01:00
  86369ab403
• Attempt to properly quantify the impact of mania Hard Rock / Easy mod application on overall difficulty

  In stable mania, Hard Rock and Easy mods do not work the same way as
  they do on all of the rulesets. The difference is that mania HR and EZ,
  rather than apply a multiplier to the map's original Overall Difficulty,
  apply multipliers to *the durations of hit windows themselves*.
  
  Prior to the last release, lazer was oblivious to this reality and just
  treated mania HR / EZ as it did every other ruleset. Last release, for
  the sake for gameplay parity across rulesets, the mods in question were
  adjusted to match stable, but in the process, it started looking like HR
  / EZ did not change OD anymore.
  
  The problem is that they do, but applying a multiplier to the map's OD
  and applying a multiplier to the hit window duration is not the same
  thing. The second thing is actually *much harsher* in magnitude, to the
  point where applying HR to any map is almost guaranteed to exceed "the
  effective OD" of 10, and applying EZ to any map is almost guaranteed to
  result in "negative effective OD".
  
  This change attempts to convey that reality by displaying "effective
  OD", similar to what's already done in other rulesets when rate-changing
  mods are active. Note that the values this will display *do not match*
  stable *and that is correct*, because stable song select *lies* about
  the actual impact on OD by just assuming it can treat all rulesets in
  the same way.
  
  ---
  
  Would close https://github.com/ppy/osu/issues/34150 I guess.
  
  And yes I would like *all of the above* to land on the changelog if
  possible if this is merged.
  
  For further convincing that this makes any semblance of sense please see
  the following: https://www.desmos.com/calculator/yigt7jycdv

  Bartłomiej Dach · 2025-07-15 09:40:55 +02:00
  131f828e6a
• Add verify check for lowest diff drain time requirement
  Hivie · 2025-07-13 02:00:50 +01:00
  ccf6d9c173
• Merge branch 'master' into pp-dev
  Dan Balasescu · 2025-07-08 20:58:22 +09:00
  f2dcf2024a
• Merge branch 'master' into pp-dev
  Dean Herbert · 2025-07-07 17:56:44 +09:00
  7ec6c8bf57
• Fix mania Hard Rock & Easy mods not matching stable

  The implementation in `master` was presuming that Hard Rock and Easy
  worked the same way across all rulesets, but actually, in stable mania,
  the two mods have special treatment as per
  
  	https://github.com/peppy/osu-stable-reference/blob/996648fba06baf4e7d2e0b248959399444017895/osu!/GameplayElements/HitObjectManagerMania.cs#L147-L150
  
  The open question here would be what this means for existing scores set
  on lazer using this mod.

  Bartłomiej Dach · 2025-07-02 12:26:50 +02:00
  8e53f47e78
• Merge pull request #33960 from bdach/catch-timestamp-support

  Read & output combo indices in timestamps in catch editor

  Dean Herbert · 2025-07-01 17:28:29 +09:00
  b3ba51d730
• Fix Difficulty Adjust extended mod icon information not showing with extended limits active

  - Closes https://github.com/ppy/osu/issues/33522.
  - Alternative to / closes https://github.com/ppy/osu/pull/33561.

  Bartłomiej Dach · 2025-06-30 12:20:05 +02:00
  28caa03d21
• Read & output combo indices in timestamps in catch editor

  Addresses https://github.com/ppy/osu/discussions/33912 for catch
  specifically. Code copy-pasted from osu! ruleset.
  
  I'm leaving taiko be because new combo still doesn't make any sense in
  taiko. It'd probably either have to be object index in beatmap period
  instead of index in combo, or the `kdkdkdkdkkkdkdkkkdkkdkd` notation
  people use.

  Bartłomiej Dach · 2025-06-30 11:50:31 +02:00
  535d9f5b58
• Add localisation usage to BeatmapStatistic and revert ShowDetailsMappedBy
  diquoks · 2025-06-21 21:01:48 +03:00
  cad4382350
• Change mod category to Conversion
  CloneWith · 2025-06-16 19:28:57 +08:00
  5a315a7f52
• Concat incompatible mods list for Autoplay and Relax
  CloneWith · 2025-06-14 00:30:09 +08:00
  c0993f812e
• Reduce combo scaling for osu!catch (#33417)

  * Reduce combo scaling for osu!catch
  
  This is a conservative reduction, a middle point between the current
  scaling and the CSR proposals.
  
  * Reduce osu!catch combo scaling further
  
  0.45 makes little difference so let's reduce it a bit more.
  
  ---------
  
  Co-authored-by: James Wilson <tsunyoku@gmail.com>

  Wulpey · 2025-06-07 14:17:46 +00:00
  642b938358
• Fix replays being misrecorded if an action is pressed and released in one update frame

  Closes https://github.com/ppy/osu/issues/33465 probably.
  
  This reverts the replay frame de-duplication logic to what it was before
  https://github.com/ppy/osu/pull/33148#discussion_r2091549388.
  
  I don't have good reproduction steps. I tried to write a test case for
  this that isn't just "press and release a key in the same frame",
  thinking that maybe there was some loophole in the osu! touch input
  mapper that may produce this situation artificially, but I could not in
  many configurations. So I have to assume that this just *can happen*
  organically.

  Bartłomiej Dach · 2025-06-06 09:10:51 +02:00
  12cc8e38da
• Add Hold to Walk mod for osu!catch
  CloneWith · 2025-06-06 12:57:45 +08:00
  0e4de9d615
• Merge branch 'master' into pp-dev
  Bartłomiej Dach · 2025-05-31 19:55:56 +02:00
  737ec8b2a8
• Make CheckConcurrentObject ruleset specific
  Derrick Timmermans · 2025-05-25 14:19:23 +02:00
  0065696248
• Remove track usage in difficulty and performance calculations (#33132)
  James Wilson · 2025-05-14 12:37:08 +00:00
  d22b3fb200
• Merge branch 'master' into gameplay-leaderboard-skinnable
  Bartłomiej Dach · 2025-05-07 10:45:51 +02:00
  5b61761bbd
• 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
• 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
• Fix osu!catch getting upscaled on portrait orientation
  Salman Alshamrani · 2025-04-30 05:03:51 +03:00
  a8ca60497c
• Show singular difficulty adjust modifications inline in mod icons
  Dean Herbert · 2025-04-28 16:58:16 +09:00
  c16514274d
• Convert gameplay leaderboard to skinnable component

  This PR converts the leaderboard into a full-fledged skinnable component
  that can be manipulated by users at will.
  
  Notably, this finally allows https://github.com/ppy/osu/issues/20422 to
  be fixed - although it's a very mixed bag, for several reasons:
  
  - Because of taiko players' refusal to see reason^W^W^W^Winsistence on
    keeping stable behaviours related to aspect ratio treatment, I have to
    assume the worst case scenario, which means than on typical
    resolutions like 16:9 (or even worse, 4:3), the leaderboard will
    likely not occupy as much vertical space as it probably could.
  
  - Additionally, there's the problem of where to put the spectator list.
    I settled on putting it to the right of the leaderboard, but that's
    kind of janky, because the leaderboard sometimes collapses and
    sometimes fully hides, leading to a very awkward space left behind. If
    we had the capability to anchor elements to other elements, maybe this
    could be resolved, but for now, I'm not sure what to do. I think if
    some users are bothered by it they can move it where they want it. Or
    delete it.

  Bartłomiej Dach · 2025-04-24 13:10:30 +02:00
  59b826c321
• Minor fix to the description text
  Shavixinio · 2025-04-22 19:49:34 +02:00
  3b2382ceb0
• Don't include spinner types in note sums
  Dean Herbert · 2025-04-14 19:21:36 +09:00
  3d47a2b5b2
• Rename new property to better explain visual-only usage
  Dean Herbert · 2025-04-14 18:38:04 +09:00
  f05a50f4e1
• Introduce numeric value in beatmap hit count statistics
  Salman Alshamrani · 2025-04-12 00:14:53 +09:00
  85556e0c3e
• Shorten beatmap hit statistics names
  Salman Alshamrani · 2025-04-11 02:33:57 +09:00
  1dbcbbde15
• 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>

  wulpine · 2025-04-10 15:47:11 +00:00
  7a9d31adb6
• Fix editor setup screen sliders not having correct keyboard steps

  Closes https://github.com/ppy/osu/issues/32691.
  
  Fixes some extra cases of failure that aren't pointed out in the issue.

  Dean Herbert · 2025-04-08 14:45:43 +09:00
  f2088496c5
• 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>

  wulpine · 2025-03-24 20:04:40 +03:00
  0c3ee1938e
• Change SettingDescription to differentiate between settings and values
  Salman Alshamrani · 2025-03-23 13:43:26 -04:00
  6e635f124a