54 Commits

• Fix non-default mod settings allowing for duplicate freestyle mod selection in multiplayer (#37646)

  Fixes a bug that allowed for selecting the same mod twice in multiplayer
  if the playlist entry has non-default settings for a required mod.
  This happens due to a strict equality mod check in the mod set
  compatibility check function, which only considers mods duplicates if
  their settings are exactly the same. Replacing with a more lenient
  `Type` check fixes this.
  
  Adds a regression test for this behavior
  
  Fixes https://github.com/ppy/osu/issues/37625.
  
  ---------
  
  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  triacontakai · 2026-05-07 08:59:54 +02:00
  3f5c113394
• Reorder function parameters, hopefully improve documentation
  Dan Balasescu · 2025-04-17 19:12:13 +09:00
  f0a8ddd513
• Adjust method name
  Dan Balasescu · 2025-04-17 02:36:55 +09:00
  2a09572d09
• Apply changes from reviews
  Dan Balasescu · 2025-04-17 02:19:31 +09:00
  64aafa4e4c
• Adjust logic to properly list selectable mods
  Dan Balasescu · 2025-04-14 20:23:00 +09:00
  3dcd1a9e74
• 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
• Merge mod validity checks to closer match osu!web
  Dan Balasescu · 2025-04-10 13:02:25 +09:00
  05e70cd938
• Allow specifying mod compatibility with freestyle
  Dan Balasescu · 2025-04-04 16:49:23 +09:00
  ef0cf5143d
• Add helper for testing mod/freemod validity
  Dan Balasescu · 2025-02-05 16:44:52 +09:00
  7f8f528ae2
• Move rate-changing TODO to a common place in CalculateRateWithMods
  Tim Schumacher · 2024-12-02 23:49:51 +01:00
  e920cfa187
• Fix code quality and null handling
  Dean Herbert · 2024-06-07 00:01:50 +08:00
  dd3f4bcdab
• Creating method in ModUtils to calculate the rate for the song
  Xesquim · 2024-06-06 10:06:07 -03:00
  860afb8123
• Fix helper method returning incorrect result
  Salman Ahmed · 2024-01-16 14:27:30 +03:00
  90da39c65d
• Fix TestModReinstantiation failing due to custom mod being used
  Salman Ahmed · 2024-01-15 15:01:13 +03:00
  d346dd0650
• Move checking logic inside ModUtils and somewhat optimise
  Salman Ahmed · 2024-01-15 14:58:59 +03:00
  1d7b63e204
• Fix: floating point errors

  Signed-off-by: CaffeeLake <PascalCoffeeLake@gmail.com>

  CaffeeLake · 2024-01-01 08:32:21 +09:00
  ad4b5f6ded
• Add helper method for properly formatting score multiplier in ModUtils
  Salman Ahmed · 2023-12-31 05:17:34 +03:00
  7cfb786b1a
• Automatically activate and deactivate touch device mod in song select
  Bartłomiej Dach · 2023-11-02 19:45:48 +01:00
  2f6ff893b5
• Automated #nullable processing
  Dan Balasescu · 2022-06-17 16:37:17 +09:00
  f8830c6850
• Add note about not checking compatibility in free mods validity method
  Salman Ahmed · 2022-05-05 16:16:55 +03:00
  74c0cb2f6e
• Bring back separate bool properties as non-cascading
  Salman Ahmed · 2022-05-05 14:37:38 +03:00
  8501a41619
• Improve validity methods to include system, non-implemented, and multi mods
  Salman Ahmed · 2022-05-05 08:13:06 +03:00
  e3c7c5d0b9
• Inline CheckCompatibleSet method to avoid ugly boolean flag
  Salman Ahmed · 2022-05-04 18:56:30 +03:00
  d0df9e8051
• Bring back behaviour of checking incompatibility on gameplay validity
  Salman Ahmed · 2022-05-04 17:21:19 +03:00
  8f04db5df5
• Apply proposed naming changes
  Salman Ahmed · 2022-05-04 17:12:17 +03:00
  20e277d2e5
• Merge branch 'master' into multiplayer-disable-adaptive-speed
  Salman Ahmed · 2022-05-04 17:12:03 +03:00
  e9ecf26b6a
• Fix test failure due to checking incompaatibility of flattened multi mods
  Bartłomiej Dach · 2022-04-08 00:16:50 +02:00
  282b220d94
• Fix failing test scenes
  Salman Ahmed · 2022-03-20 16:17:19 +03:00
  145fca2704
• Rename multiplayer mod usages to make more sense
  Salman Ahmed · 2022-03-20 13:12:24 +03:00
  add9f3ec91
• Update usages to use IsPlayable instead
  Salman Ahmed · 2022-03-18 02:11:18 +03:00
  f2248ecc08
• Reword mod utility documentation regarding nullability
  Salman Ahmed · 2022-03-18 00:21:16 +03:00
  b0d04a78f7
• Update mod instantiation utility method inline with APIMod.ToMod changes
  Salman Ahmed · 2022-03-17 06:28:10 +03:00
  e0a06bf5d9
• Revert "Update mod instantiaton utility method to no longer check for validity"

  This reverts commit 1a04260807.

  Salman Ahmed · 2022-03-17 06:24:55 +03:00
  83189d1f07
• Update mod instantiaton utility method to no longer check for validity
  Salman Ahmed · 2022-03-17 05:51:12 +03:00
  1a04260807
• Add multiplayer mod validity check methods for server consumption
  Salman Ahmed · 2022-03-17 05:15:09 +03:00
  59741ccee6
• Move GetSettingUnderlyingValue to a SettingSource extension method
  Dean Herbert · 2022-03-15 14:54:00 +09:00
  1814a325d8
• Fix xmldoc reference
  Dan Balasescu · 2021-11-17 11:46:06 +09:00
  97bc67245d
• Add ModUtils helper to instantiate mods from ruleset
  Dan Balasescu · 2021-11-17 11:30:47 +09:00
  f5b95c9e6d
• Ensure duplicate mods cannot be defined
  Dean Herbert · 2021-06-22 17:41:20 +09:00
  c4fde635c6
• Change CheckCompatibleSet to never deselect the current candidat when checking incompatibility
  Dean Herbert · 2021-06-18 13:17:32 +09:00
  5933e0d2d9
• Use conditional nullability attribute

  As it turns out, C# 8 provides an attribute that allows annotating that
  an `out` parameter's nullability depends on the method's return value,
  which is exactly what is desired here.

  Bartłomiej Dach · 2021-05-15 00:09:34 +02:00
  c9facf70f9
• Extract mod setting value handling to utils class
  Salman Ahmed · 2021-04-12 03:37:03 +03:00
  fbd5195738
• Merge branch 'master' into mod-consistency-function
  Dean Herbert · 2021-02-02 20:01:42 +09:00
  ac5662b1aa
• Add codeanalysis attribute
  smoogipoo · 2021-02-02 19:02:09 +09:00
  180af3c7f8
• Reuse existing method
  smoogipoo · 2021-02-02 18:42:02 +09:00
  052cf1abae
• Merge branch 'add-mod-utils' into mod-consistency-function
  smoogipoo · 2021-02-02 18:41:35 +09:00
  5881b8be96
• Prevent multiple enumeration
  smoogipoo · 2021-02-02 18:37:11 +09:00
  12f52316cd
• Fix incorrect handling of multi-mod incompatibilities
  smoogipoo · 2021-02-02 18:31:08 +09:00
  1df412a03c
• Simplify implementation of CheckCompatibleSet
  smoogipoo · 2021-02-02 18:18:57 +09:00
  d0655c21c6