refactor diagonal twists to be part of the horizontal twist mod and t…

…o not be frequency-adjustable
hwabis · Oct 27, 2024 · 0674113 · 0674113
1 parent 403ccab
commit 0674113
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 51 deletions.
diff --git a/osu.Game.Rulesets.PumpTrainer/Beatmaps/PumpTrainerHitObjectGenerator.cs b/osu.Game.Rulesets.PumpTrainer/Beatmaps/PumpTrainerHitObjectGenerator.cs
@@ -495,7 +495,7 @@ private void banColumnsCausingBannedPatterns(List<Column> candidateColumns, Foot
             }
 
             // Ban diagonal twists (single pad)
-            if (random.NextDouble() > Settings.DiagonalTwistFrequency)
+            if (!Settings.AllowDiagonalTwists)
             {
                 if (previousColumn == Column.P1C)
                 {

diff --git a/osu.Game.Rulesets.PumpTrainer/Beatmaps/PumpTrainerHitObjectGeneratorSettings.cs b/osu.Game.Rulesets.PumpTrainer/Beatmaps/PumpTrainerHitObjectGeneratorSettings.cs
@@ -34,10 +34,11 @@ public class PumpTrainerHitObjectGeneratorSettings
         public double HorizontalTwistFrequency = 0;
 
         /// <summary>
-        /// 0 to 1 determining how frequently to generate a diagonal twist. Higher means more likely.
+        /// Determines whether to allow generating diagonal twists.
+        /// This requires horizontal twists to be on (greater than 0) to have any effect.
         /// Example starting left foot: DL --> C --> UR
         /// </summary>
-        public double DiagonalTwistFrequency = 0;
+        public bool AllowDiagonalTwists = false;
 
         /// <summary>
         /// 0 to 1 determining how frequently to generate a diagonal skip. Higher means more likely.

diff --git a/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModBanSinglesTwists.cs b/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModBanSinglesTwists.cs
@@ -30,7 +30,6 @@ public class PumpTrainerModBanSinglesTwists : Mod, IApplicableToBeatmapConverter
         {
             typeof(PumpTrainerModBanFarColumns),
             typeof(PumpTrainerModHorizontalTwists),
-            typeof(PumpTrainerModDiagonalTwists),
             typeof(PumpTrainerModCornersOnSixteenths),
             typeof(PumpTrainerModDiagonalSkips),
             typeof(PumpTrainerModHorizontalTriples),

diff --git a/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModDiagonalTwists.cs b/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModDiagonalTwists.cs
diff --git a/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModHorizontalTwists.cs b/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModHorizontalTwists.cs
@@ -24,6 +24,12 @@ public class PumpTrainerModHorizontalTwists : Mod, IApplicableToBeatmapConverter
             Default = false,
         };
 
+        [SettingSource("[P1Single+] Diagonal Twists")]
+        public Bindable<bool> AllowDiagonalTwists { get; } = new BindableBool(false)
+        {
+            Default = false,
+        };
+
         public override string Name => "Horizontal Twists";
         public override string Acronym => "H";
         public override LocalisableString Description =>
@@ -41,6 +47,11 @@ public void ApplyToBeatmapConverter(IBeatmapConverter beatmapConverter)
             {
                 pumpBeatmapConverter.Settings.LargeTwistFrequency = HorizontalTwistFrequency.Value;
             }
+
+            if (AllowDiagonalTwists.Value)
+            {
+                pumpBeatmapConverter.Settings.AllowDiagonalTwists = true;
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.PumpTrainer/PumpTrainerRuleset.cs b/osu.Game.Rulesets.PumpTrainer/PumpTrainerRuleset.cs
@@ -45,7 +45,6 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
                     return new Mod[]
                     {
                         new PumpTrainerModHorizontalTwists(),
-                        new PumpTrainerModDiagonalTwists(),
                         new PumpTrainerModCornersOnSixteenths(),
                         new PumpTrainerModDiagonalSkips(),
                         new PumpTrainerModHorizontalTriples(),