From 28d3d78428fa88c658841d3e828099cc47b8770b Mon Sep 17 00:00:00 2001 From: hwabis Date: Mon, 30 Sep 2024 21:04:02 -0400 Subject: [PATCH] Fix horizontal twists being banned when horizontal triples is off --- .../Beatmaps/NextHitObjectGenerator.cs | 1 + .../Mods/PumpTrainerModDiagonalTwists.cs | 2 +- .../Mods/PumpTrainerModHorizontalTriples.cs | 9 ++++----- .../Mods/PumpTrainerModHorizontalTwists.cs | 4 +++- osu.Game.Rulesets.PumpTrainer/PumpTrainerRuleset.cs | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/osu.Game.Rulesets.PumpTrainer/Beatmaps/NextHitObjectGenerator.cs b/osu.Game.Rulesets.PumpTrainer/Beatmaps/NextHitObjectGenerator.cs index 9c73896..cdc219d 100644 --- a/osu.Game.Rulesets.PumpTrainer/Beatmaps/NextHitObjectGenerator.cs +++ b/osu.Game.Rulesets.PumpTrainer/Beatmaps/NextHitObjectGenerator.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; +using NUnit.Framework; using osu.Game.Beatmaps; using osu.Game.Rulesets.PumpTrainer.Objects; diff --git a/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModDiagonalTwists.cs b/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModDiagonalTwists.cs index 0d1f497..9b7733e 100644 --- a/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModDiagonalTwists.cs +++ b/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModDiagonalTwists.cs @@ -22,7 +22,7 @@ public class PumpTrainerModDiagonalTwists : Mod, IApplicableToBeatmapConverter public override string Acronym => "D"; public override LocalisableString Description => "Diagonal crossovers across a center panel.\n" + - "Only has an effect when the panel set spans at least a single, and the \"horizontal twists\" mod is on."; + "Requires the \"horizontal twists\" mod to be enabled."; public override double ScoreMultiplier => 1; public override ModType Type => ModType.DifficultyIncrease; diff --git a/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModHorizontalTriples.cs b/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModHorizontalTriples.cs index 66d3ea3..98a4787 100644 --- a/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModHorizontalTriples.cs +++ b/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModHorizontalTriples.cs @@ -10,19 +10,18 @@ namespace osu.Game.Rulesets.PumpTrainer.Mods public class PumpTrainerModHorizontalTriples : Mod, IApplicableToBeatmapConverter { [SettingSource("Frequency")] - public Bindable HorizontalTripleFrequency { get; } = new BindableDouble(0.5) + public Bindable HorizontalTripleFrequency { get; } = new BindableDouble(1.0) { MinValue = 0.1, MaxValue = 1.0, - Default = 0.5, + Default = 1.0, Precision = 0.1, }; - public override string Name => "[AT LEAST HALF-D] Horizontal triples"; + public override string Name => "Horizontal triples"; public override string Acronym => "HHH"; public override LocalisableString Description => - "Runs spanning three or more physical dance pad columns (not note columns).\n" + - "Only has an effect when the panel set spans at least a half-double."; + "Three consecutive notes spanning three physical dance pad columns (not note columns) in one direction."; public override double ScoreMultiplier => 1; public override ModType Type => ModType.DifficultyIncrease; diff --git a/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModHorizontalTwists.cs b/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModHorizontalTwists.cs index d05864e..885e8cc 100644 --- a/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModHorizontalTwists.cs +++ b/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModHorizontalTwists.cs @@ -20,7 +20,9 @@ public class PumpTrainerModHorizontalTwists : Mod, IApplicableToBeatmapConverter public override string Name => "Horizontal twists"; public override string Acronym => "H"; - public override LocalisableString Description => "Horizontal crossovers across a center panel."; + public override LocalisableString Description => + "Horizontal crossovers across a center panel.\n" + + "Requires the \"horizontal triples\" mod to be enabled."; public override double ScoreMultiplier => 1; public override ModType Type => ModType.DifficultyIncrease; diff --git a/osu.Game.Rulesets.PumpTrainer/PumpTrainerRuleset.cs b/osu.Game.Rulesets.PumpTrainer/PumpTrainerRuleset.cs index d269367..9f48ee1 100644 --- a/osu.Game.Rulesets.PumpTrainer/PumpTrainerRuleset.cs +++ b/osu.Game.Rulesets.PumpTrainer/PumpTrainerRuleset.cs @@ -43,9 +43,9 @@ public override IEnumerable GetModsFor(ModType type) case ModType.DifficultyIncrease: return new Mod[] { + new PumpTrainerModHorizontalTriples(), new PumpTrainerModHorizontalTwists(), new PumpTrainerModDiagonalTwists(), - new PumpTrainerModHorizontalTriples(), }; case ModType.Conversion: