Merge branch 'taiko_drumroll_base' into taiko_drumroll_drawable

Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

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

@@ -0,0 +1,120 @@
+// 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;
+
+        /// <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;
+
+        /// <summary>
+        /// Number of drum roll ticks required for a "Good" hit.
+        /// </summary>
+        public double RequiredGoodHits;
+
+        /// <summary>
+        /// Number of drum roll ticks required for a "Great" hit.
+        /// </summary>
+        public double RequiredGreatHits;
+
+        /// <summary>
+        /// Total number of drum roll ticks.
+        /// </summary>
+        public int TotalTicks;
+
+        /// <summary>
+        /// Initializes the drum roll ticks if not initialized and returns them.
+        /// </summary>
+        public IEnumerable<DrumRollTick> Ticks
+        {
+            get
+            {
+                if (ticks == null)
+                    createTicks();
+                return ticks;
+            }
+        }
+
+        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);
+
+            if (difficulty.SliderTickRate == 3)
+                TickTimeDistance /= 3;
+            else
+                TickTimeDistance /= 4;
+
+            TotalTicks = Ticks.Count();
+            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 void createTicks()
+        {
+            ticks = new List<DrumRollTick>();
+
+            if (TickTimeDistance == 0)
+                return;
+
+            bool first = true;
+            for (double t = StartTime; t < EndTime + (int)TickTimeDistance; t += TickTimeDistance)
+            {
+                ticks.Add(new DrumRollTick
+                {
+                    FirstTick = first,
+                    PreEmpt = PreEmpt,
+                    TickTimeDistance = TickTimeDistance,
+                    StartTime = t,
+                    Sample = new HitSampleInfo
+                    {
+                        Type = SampleType.None,
+                        Set = SampleSet.Soft
+                    }
+                });
+
+                first = false;
+            }
+        }
+
+        public override TaikoHitType Type
+        {
+            get
+            {
+                SampleType st = Sample?.Type ?? SampleType.None;
+
+                return TaikoHitType.DrumRoll | ((st & SampleType.Finish) > 0 ? TaikoHitType.Finisher : TaikoHitType.None);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,21 @@
+// 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;
+
+        public override TaikoHitType Type => TaikoHitType.DrumRollTick;
+    }
+}

osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

@@ -51,6 +51,8 @@
     <Compile Include="Beatmaps\TaikoBeatmapProcessor.cs" />
     <Compile Include="Judgements\TaikoJudgementInfo.cs" />
     <Compile Include="Objects\Drawable\DrawableTaikoHitObject.cs" />
+    <Compile Include="Objects\DrumRoll.cs" />
+    <Compile Include="Objects\DrumRollTick.cs" />
     <Compile Include="Objects\TaikoHitType.cs" />
     <Compile Include="TaikoDifficultyCalculator.cs" />
     <Compile Include="Objects\TaikoHitObject.cs" />