Merge branch 'master' into taiko_note_circle

osu.Game.Modes.Taiko/Objects/Bash.cs

@@ -0,0 +1,30 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Database;
+using osu.Game.Modes.Objects.Types;
+
+namespace osu.Game.Modes.Taiko.Objects
+{
+    public class Bash : TaikoHitObject, IHasEndTime
+    {
+        public double EndTime { get; set; }
+
+        public double Duration => EndTime - StartTime;
+
+        /// <summary>
+        /// The number of hits required to complete the bash successfully.
+        /// </summary>
+        public int RequiredHits { get; protected set; }
+
+        public override void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty)
+        {
+            base.ApplyDefaults(timing, difficulty);
+
+            double spinnerRotationRatio = BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 3, 5, 7.5);
+            RequiredHits = (int)Math.Max(1, Duration / 1000f * spinnerRotationRatio);
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
 {
     internal class DrawableTaikoHit : Sprite
     {
-        private TaikoHitObject h;
+        private readonly TaikoHitObject h;
 
         public DrawableTaikoHit(TaikoHitObject h)
         {
@@ -29,7 +29,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
         {
             Texture = textures.Get(@"Menu/logo");
 
-            double duration = 0;
+            const double duration = 0;
 
             Transforms.Add(new TransformPositionX { StartTime = h.StartTime - 200, EndTime = h.StartTime, StartValue = 1.1f, EndValue = 0.1f });
             Transforms.Add(new TransformAlpha { StartTime = h.StartTime + duration + 200, EndTime = h.StartTime + duration + 400, StartValue = 1, EndValue = 0 });

osu.Game.Modes.Taiko/Objects/DrumRoll.cs

@@ -0,0 +1,104 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Beatmaps.Samples;
+using osu.Game.Modes.Objects.Types;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Database;
+
+namespace osu.Game.Modes.Taiko.Objects
+{
+    public class DrumRoll : TaikoHitObject, IHasDistance
+    {
+        public double EndTime => StartTime + Distance / Velocity;
+
+        public double Duration => EndTime - StartTime;
+
+        /// <summary>
+        /// Raw length of the drum roll in positional length units.
+        /// </summary>
+        public double Distance { get; set; }
+
+        /// <summary>
+        /// Velocity of the drum roll in positional length units per millisecond.
+        /// </summary>
+        public double Velocity { get; protected set; }
+
+        /// <summary>
+        /// The distance between ticks of this drumroll.
+        /// <para>Half of this value is the hit window of the ticks.</para>
+        /// </summary>
+        public double TickTimeDistance { get; protected set; }
+
+        /// <summary>
+        /// Number of drum roll ticks required for a "Good" hit.
+        /// </summary>
+        public double RequiredGoodHits { get; protected set; }
+
+        /// <summary>
+        /// Number of drum roll ticks required for a "Great" hit.
+        /// </summary>
+        public double RequiredGreatHits { get; protected set; }
+
+        /// <summary>
+        /// Total number of drum roll ticks.
+        /// </summary>
+        public int TotalTicks => Ticks.Count();
+
+        /// <summary>
+        /// Initializes the drum roll ticks if not initialized and returns them.
+        /// </summary>
+        public IEnumerable<DrumRollTick> Ticks => ticks ?? (ticks = createTicks());
+
+        private List<DrumRollTick> ticks;
+
+        public override void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty)
+        {
+            base.ApplyDefaults(timing, difficulty);
+
+            Velocity = timing.SliderVelocityAt(StartTime) * difficulty.SliderMultiplier / 1000;
+            TickTimeDistance = timing.BeatLengthAt(StartTime);
+
+            //TODO: move this to legacy conversion code to allow for direct division without special case.
+            if (difficulty.SliderTickRate == 3)
+                TickTimeDistance /= 3;
+            else
+                TickTimeDistance /= 4;
+
+            RequiredGoodHits = TotalTicks * Math.Min(0.15, 0.05 + 0.10 / 6 * difficulty.OverallDifficulty);
+            RequiredGreatHits = TotalTicks * Math.Min(0.30, 0.10 + 0.20 / 6 * difficulty.OverallDifficulty);
+        }
+
+        private List<DrumRollTick> createTicks()
+        {
+            var ret = new List<DrumRollTick>();
+
+            if (TickTimeDistance == 0)
+                return ret;
+
+            bool first = true;
+            for (double t = StartTime; t < EndTime + (int)TickTimeDistance; t += TickTimeDistance)
+            {
+                ret.Add(new DrumRollTick
+                {
+                    FirstTick = first,
+                    PreEmpt = PreEmpt,
+                    TickTimeDistance = TickTimeDistance,
+                    StartTime = t,
+                    Sample = new HitSampleInfo
+                    {
+                        Type = SampleType.None,
+                        Set = SampleSet.Soft
+                    }
+                });
+
+                first = false;
+            }
+
+            return ret;
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/DrumRollTick.cs

@@ -0,0 +1,19 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Modes.Taiko.Objects
+{
+    public class DrumRollTick : TaikoHitObject
+    {
+        /// <summary>
+        /// Whether this is the first (initial) tick of the slider.
+        /// </summary>
+        public bool FirstTick;
+
+        /// <summary>
+        /// The distance between this tick and the next in milliseconds.
+        /// <para>Half of this value is the hit window of the tick.</para>
+        /// </summary>
+        public double TickTimeDistance;
+    }
+}