diff --git a/osu.Game.Rulesets.Diva/Beatmaps/DivaBeatmapConverter.cs b/osu.Game.Rulesets.Diva/Beatmaps/DivaBeatmapConverter.cs index c678aba..5b7a9bb 100644 --- a/osu.Game.Rulesets.Diva/Beatmaps/DivaBeatmapConverter.cs +++ b/osu.Game.Rulesets.Diva/Beatmaps/DivaBeatmapConverter.cs @@ -21,6 +21,7 @@ public class DivaBeatmapConverter : BeatmapConverter //create patterns of same button public int TargetButtons; + public bool AllowDoubles = true; private DivaAction prevAction = DivaAction.Triangle; private Vector2 prevObjectPos = Vector2.Zero; @@ -61,7 +62,7 @@ protected override IEnumerable ConvertHitObject(HitObject origina //currently press presses are placed in place of sliders as placeholder, but arcade slider are better suited for these //another option would be long sliders: arcade sliders, short sliders: doubles - if(original is IHasPathWithRepeats) + if(AllowDoubles && original is IHasPathWithRepeats) { yield return new DoublePressButton { diff --git a/osu.Game.Rulesets.Diva/DivaRuleset.cs b/osu.Game.Rulesets.Diva/DivaRuleset.cs index 7086535..507a8fc 100644 --- a/osu.Game.Rulesets.Diva/DivaRuleset.cs +++ b/osu.Game.Rulesets.Diva/DivaRuleset.cs @@ -123,6 +123,7 @@ public override IEnumerable GetModsFor(ModType type) new DivaModKey3(), new DivaModKey4() ), + new DivaModNoDoubles(), }; default: diff --git a/osu.Game.Rulesets.Diva/Mods/DivaKeyMod.cs b/osu.Game.Rulesets.Diva/Mods/DivaKeyMod.cs index b78834e..58bce9a 100644 --- a/osu.Game.Rulesets.Diva/Mods/DivaKeyMod.cs +++ b/osu.Game.Rulesets.Diva/Mods/DivaKeyMod.cs @@ -14,7 +14,7 @@ public abstract class DivaKeyMod : Mod, IApplicableToBeatmapConverter public override string Acronym => Name; public abstract int KeyCount { get; } public override ModType Type => ModType.Conversion; - public override double ScoreMultiplier => 1; // TODO: Implement the Diva key mod score multiplier + public override double ScoreMultiplier => 1; public override bool Ranked => true; public void ApplyToBeatmapConverter(IBeatmapConverter beatmapConverter) diff --git a/osu.Game.Rulesets.Diva/Mods/DivaModNoDoubles.cs b/osu.Game.Rulesets.Diva/Mods/DivaModNoDoubles.cs new file mode 100644 index 0000000..7d91193 --- /dev/null +++ b/osu.Game.Rulesets.Diva/Mods/DivaModNoDoubles.cs @@ -0,0 +1,24 @@ +using System; +using System.Linq; +using osu.Game.Beatmaps; +using osu.Game.Rulesets.Diva.Beatmaps; +using osu.Game.Rulesets.Mods; + +namespace osu.Game.Rulesets.Diva.Mods +{ + public class DivaModNoDoubles : Mod, IApplicableToBeatmapConverter + { + public override string Name => "No Doubles"; + public override string Acronym => "ND"; + public override ModType Type => ModType.Conversion; + public override double ScoreMultiplier => 0.667; + public override bool Ranked => true; + + public void ApplyToBeatmapConverter(IBeatmapConverter beatmapConverter) + { + var bc = (DivaBeatmapConverter)beatmapConverter; + + bc.AllowDoubles = false; + } + } +} \ No newline at end of file