Fix horizontal twists being banned when horizontal triples is off

hwabis · Oct 1, 2024 · 28d3d78 · 28d3d78
1 parent 45fe9d9
commit 28d3d78
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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
@@ -10,19 +10,18 @@ namespace osu.Game.Rulesets.PumpTrainer.Mods
     public class PumpTrainerModHorizontalTriples : Mod, IApplicableToBeatmapConverter
     {
         [SettingSource("Frequency")]
-        public Bindable<double> HorizontalTripleFrequency { get; } = new BindableDouble(0.5)
+        public Bindable<double> 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
@@ -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
@@ -43,9 +43,9 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
                 case ModType.DifficultyIncrease:
                     return new Mod[]
                     {
+                        new PumpTrainerModHorizontalTriples(),
                         new PumpTrainerModHorizontalTwists(),
                         new PumpTrainerModDiagonalTwists(),
-                        new PumpTrainerModHorizontalTriples(),
                     };
 
                 case ModType.Conversion: