Merge pull request #30 from Artemis-chan/doubles-toggle

Implemented mod to disable double hit

osu.Game.Rulesets.Diva/Beatmaps/DivaBeatmapConverter.cs

@@ -21,6 +21,7 @@ public class DivaBeatmapConverter : BeatmapConverter<DivaHitObject>
         //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<DivaHitObject> 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
 				{

osu.Game.Rulesets.Diva/DivaRuleset.cs

@@ -123,6 +123,7 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
                             new DivaModKey3(),
                             new DivaModKey4()
                         ),
+                        new DivaModNoDoubles(),
                     };
 
                 default:

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)

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;
+		}
+	}
+}