diff --git a/osu.Game.Rulesets.PumpTrainer/Beatmaps/PumpTrainerBeatmapConverter.cs b/osu.Game.Rulesets.PumpTrainer/Beatmaps/PumpTrainerBeatmapConverter.cs index dc79095..4287661 100644 --- a/osu.Game.Rulesets.PumpTrainer/Beatmaps/PumpTrainerBeatmapConverter.cs +++ b/osu.Game.Rulesets.PumpTrainer/Beatmaps/PumpTrainerBeatmapConverter.cs @@ -16,6 +16,12 @@ public class PumpTrainerBeatmapConverter : BeatmapConverter generator.Settings; private NextHitObjectGenerator generator = new(); + /// + /// For osu! sliders with no repeats, this represents whether to convert the end of the slider to a hitobject. + /// (For repeating sliders, each slider end is always converted to hitobjects whether this is true or false.) + /// + public bool IgnoreNormalSliderEnds = false; + public PumpTrainerBeatmapConverter(IBeatmap beatmap, Ruleset ruleset) : base(beatmap, ruleset) { @@ -63,7 +69,7 @@ protected override IEnumerable ConvertHitObject(HitObject yield return generator.GetNextHitObject(newHitObjectTime, beatmap); } } - else if (!Settings.IgnoreNormalSliderEnds) + else if (!IgnoreNormalSliderEnds) { // This is a slider with no repeats, and the mod for ignoring is slider ends is off diff --git a/osu.Game.Rulesets.PumpTrainer/Beatmaps/PumpTrainerBeatmapConverterSettings.cs b/osu.Game.Rulesets.PumpTrainer/Beatmaps/PumpTrainerBeatmapConverterSettings.cs index 931377c..7aa1042 100644 --- a/osu.Game.Rulesets.PumpTrainer/Beatmaps/PumpTrainerBeatmapConverterSettings.cs +++ b/osu.Game.Rulesets.PumpTrainer/Beatmaps/PumpTrainerBeatmapConverterSettings.cs @@ -5,12 +5,6 @@ namespace osu.Game.Rulesets.PumpTrainer.Beatmaps { public class PumpTrainerBeatmapConverterSettings { - /// - /// For osu! sliders with no repeats, this represents whether to convert the end of the slider to a hitobject. - /// (For repeating sliders, each slider end is always converted to hitobjects whether this is true or false.) - /// - public bool IgnoreNormalSliderEnds = false; - public List AllowedColumns = [Column.P1DL, Column.P1UL, Column.P1C, Column.P1UR, Column.P1DR, Column.P2DL, Column.P2UL, Column.P2C, Column.P2UR, Column.P2DR]; diff --git a/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModIgnoreOsuSliderEnds.cs b/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModIgnoreOsuSliderEnds.cs index 2a8da00..790d629 100644 --- a/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModIgnoreOsuSliderEnds.cs +++ b/osu.Game.Rulesets.PumpTrainer/Mods/PumpTrainerModIgnoreOsuSliderEnds.cs @@ -18,7 +18,7 @@ public void ApplyToBeatmapConverter(IBeatmapConverter beatmapConverter) { var pumpBeatmapConverter = (PumpTrainerBeatmapConverter)beatmapConverter; - pumpBeatmapConverter.Settings.IgnoreNormalSliderEnds = true; + pumpBeatmapConverter.IgnoreNormalSliderEnds = true; } } }