Remove setup screen controls that do nothing useful

osu.Game.Rulesets.Catch/CatchRuleset.cs

@@ -28,6 +28,7 @@
 using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
+using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
 
@@ -222,6 +223,12 @@ public override LocalisableString GetDisplayNameForHitResult(HitResult result)
 
  public override HitObjectComposer CreateHitObjectComposer() => new CatchHitObjectComposer(this);
 
+ public override IEnumerable<SetupSection> CreateEditorSetupSections() =>
+ [
+ new DifficultySection(),
+ new ColoursSection(),
+ ];
+
  public override IBeatmapVerifier CreateBeatmapVerifier() => new CatchBeatmapVerifier();
 
  public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)

osu.Game.Rulesets.Mania/Edit/Setup/ManiaDifficultySection.cs

@@ -20,6 +20,7 @@ public partial class ManiaDifficultySection : SetupSection
  public override LocalisableString Title => EditorSetupStrings.DifficultyHeader;
 
  private LabelledSliderBar<float> keyCountSlider { get; set; } = null!;
+ private LabelledSwitchButton specialStyle { get; set; } = null!;
  private LabelledSliderBar<float> healthDrainSlider { get; set; } = null!;
  private LabelledSliderBar<float> overallDifficultySlider { get; set; } = null!;
  private LabelledSliderBar<double> baseVelocitySlider { get; set; } = null!;
@@ -49,6 +50,13 @@ private void load()
  Precision = 1,
  }
  },
+ specialStyle = new LabelledSwitchButton
+ {
+ Label = "Use special (N+1) style",
+ FixedLabelWidth = LABEL_WIDTH,
+ Description = "Changes one column to act as a classic \"scratch\" or \"special\" column, which can be moved around by the user's skin (to the left/right/centre). Generally used in 6K (5+1) or 8K (7+1) configurations.",
+ Current = { Value = Beatmap.BeatmapInfo.SpecialStyle }
+ },
  healthDrainSlider = new LabelledSliderBar<float>
  {
  Label = BeatmapsetsStrings.ShowStatsDrain,
@@ -145,6 +153,7 @@ private void updateValues()
  // for now, update these on commit rather than making BeatmapMetadata bindables.
  // after switching database engines we can reconsider if switching to bindables is a good direction.
  Beatmap.Difficulty.CircleSize = keyCountSlider.Current.Value;
+ Beatmap.BeatmapInfo.SpecialStyle = specialStyle.Current.Value;
  Beatmap.Difficulty.DrainRate = healthDrainSlider.Current.Value;
  Beatmap.Difficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
  Beatmap.Difficulty.SliderMultiplier = baseVelocitySlider.Current.Value;

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -419,9 +419,10 @@ public override IRulesetFilterCriteria CreateRulesetFilterCriteria()
  return new ManiaFilterCriteria();
  }
 
- public override RulesetSetupSection CreateEditorSetupSection() => new ManiaSetupSection();
-
- public override SetupSection CreateEditorDifficultySection() => new ManiaDifficultySection();
+ public override IEnumerable<SetupSection> CreateEditorSetupSections() =>
+ [
+ new ManiaDifficultySection(),
+ ];
 
  public int GetKeyCount(IBeatmapInfo beatmapInfo, IReadOnlyList<Mod>? mods = null)
  => ManiaBeatmapConverter.GetColumnCount(LegacyBeatmapConversionDifficultyInfo.FromBeatmapInfo(beatmapInfo), mods);

osu.Game.Rulesets.Osu/Edit/Setup/OsuDifficultySection.cs

@@ -0,0 +1,150 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Localisation;
+using osu.Game.Resources.Localisation.Web;
+using osu.Game.Screens.Edit.Setup;
+
+namespace osu.Game.Rulesets.Osu.Edit.Setup
+{
+ public partial class OsuDifficultySection : SetupSection
+ {
+ private LabelledSliderBar<float> circleSizeSlider { get; set; } = null!;
+ private LabelledSliderBar<float> healthDrainSlider { get; set; } = null!;
+ private LabelledSliderBar<float> approachRateSlider { get; set; } = null!;
+ private LabelledSliderBar<float> overallDifficultySlider { get; set; } = null!;
+ private LabelledSliderBar<double> baseVelocitySlider { get; set; } = null!;
+ private LabelledSliderBar<double> tickRateSlider { get; set; } = null!;
+ private LabelledSliderBar<float> stackLeniency { get; set; } = null!;
+
+ public override LocalisableString Title => EditorSetupStrings.DifficultyHeader;
+
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ Children = new Drawable[]
+ {
+ circleSizeSlider = new LabelledSliderBar<float>
+ {
+ Label = BeatmapsetsStrings.ShowStatsCs,
+ FixedLabelWidth = LABEL_WIDTH,
+ Description = EditorSetupStrings.CircleSizeDescription,
+ Current = new BindableFloat(Beatmap.Difficulty.CircleSize)
+ {
+ Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
+ MinValue = 0,
+ MaxValue = 10,
+ Precision = 0.1f,
+ }
+ },
+ healthDrainSlider = new LabelledSliderBar<float>
+ {
+ Label = BeatmapsetsStrings.ShowStatsDrain,
+ FixedLabelWidth = LABEL_WIDTH,
+ Description = EditorSetupStrings.DrainRateDescription,
+ Current = new BindableFloat(Beatmap.Difficulty.DrainRate)
+ {
+ Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
+ MinValue = 0,
+ MaxValue = 10,
+ Precision = 0.1f,
+ }
+ },
+ approachRateSlider = new LabelledSliderBar<float>
+ {
+ Label = BeatmapsetsStrings.ShowStatsAr,
+ FixedLabelWidth = LABEL_WIDTH,
+ Description = EditorSetupStrings.ApproachRateDescription,
+ Current = new BindableFloat(Beatmap.Difficulty.ApproachRate)
+ {
+ Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
+ MinValue = 0,
+ MaxValue = 10,
+ Precision = 0.1f,
+ }
+ },
+ overallDifficultySlider = new LabelledSliderBar<float>
+ {
+ Label = BeatmapsetsStrings.ShowStatsAccuracy,
+ FixedLabelWidth = LABEL_WIDTH,
+ Description = EditorSetupStrings.OverallDifficultyDescription,
+ Current = new BindableFloat(Beatmap.Difficulty.OverallDifficulty)
+ {
+ Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
+ MinValue = 0,
+ MaxValue = 10,
+ Precision = 0.1f,
+ }
+ },
+ baseVelocitySlider = new LabelledSliderBar<double>
+ {
+ Label = EditorSetupStrings.BaseVelocity,
+ FixedLabelWidth = LABEL_WIDTH,
+ Description = EditorSetupStrings.BaseVelocityDescription,
+ Current = new BindableDouble(Beatmap.Difficulty.SliderMultiplier)
+ {
+ Default = 1.4,
+ MinValue = 0.4,
+ MaxValue = 3.6,
+ Precision = 0.01f,
+ }
+ },
+ tickRateSlider = new LabelledSliderBar<double>
+ {
+ Label = EditorSetupStrings.TickRate,
+ FixedLabelWidth = LABEL_WIDTH,
+ Description = EditorSetupStrings.TickRateDescription,
+ Current = new BindableDouble(Beatmap.Difficulty.SliderTickRate)
+ {
+ Default = 1,
+ MinValue = 1,
+ MaxValue = 4,
+ Precision = 1,
+ }
+ },
+ stackLeniency = new LabelledSliderBar<float>
+ {
+ Label = "Stack Leniency",
+ FixedLabelWidth = LABEL_WIDTH,
+ Description = "In play mode, osu! automatically stacks notes which occur at the same location. Increasing this value means it is more likely to snap notes of further time-distance.",
+ Current = new BindableFloat(Beatmap.BeatmapInfo.StackLeniency)
+ {
+ Default = 0.7f,
+ MinValue = 0,
+ MaxValue = 1,
+ Precision = 0.1f
+ }
+ },
+ };
+
+ foreach (var item in Children.OfType<LabelledSliderBar<float>>())
+ item.Current.ValueChanged += _ => updateValues();
+
+ foreach (var item in Children.OfType<LabelledSliderBar<double>>())
+ item.Current.ValueChanged += _ => updateValues();
+ }
+
+ private void updateValues()
+ {
+ // for now, update these on commit rather than making BeatmapMetadata bindables.
+ // after switching database engines we can reconsider if switching to bindables is a good direction.
+ Beatmap.Difficulty.CircleSize = circleSizeSlider.Current.Value;
+ Beatmap.Difficulty.DrainRate = healthDrainSlider.Current.Value;
+ Beatmap.Difficulty.ApproachRate = approachRateSlider.Current.Value;
+ Beatmap.Difficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
+ Beatmap.Difficulty.SliderMultiplier = baseVelocitySlider.Current.Value;
+ Beatmap.Difficulty.SliderTickRate = tickRateSlider.Current.Value;
+ Beatmap.BeatmapInfo.StackLeniency = stackLeniency.Current.Value;
+
+ Beatmap.UpdateAllHitObjects();
+ Beatmap.SaveState();
+ }
+ }
+}

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -336,7 +336,11 @@ public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatm
  };
  }
 
- public override RulesetSetupSection CreateEditorSetupSection() => new OsuSetupSection();
+ public override IEnumerable<SetupSection> CreateEditorSetupSections() =>
+ [
+ new OsuDifficultySection(),
+ new ColoursSection(),
+ ];
 
  /// <seealso cref="OsuHitObject.ApplyDefaultsToSelf"/>
  /// <seealso cref="OsuHitWindows"/>