Merge branch 'master' into taiko_conversion

osu.Game.Modes.Taiko/Judgements/TaikoHitResult.cs

@@ -0,0 +1,11 @@
+// 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.Judgements
+{
+    public enum TaikoHitResult
+    {
+        Good,
+        Great
+    }
+}

osu.Game.Modes.Taiko/Judgements/TaikoJudgementInfo.cs

@@ -7,5 +7,77 @@ namespace osu.Game.Modes.Taiko.Judgements
 {
     public class TaikoJudgementInfo : JudgementInfo
     {
+        /// <summary>
+        /// The maximum score value.
+        /// </summary>
+        public const TaikoHitResult MAX_HIT_RESULT = TaikoHitResult.Great;
+
+        /// <summary>
+        /// The score value.
+        /// </summary>
+        public TaikoHitResult TaikoResult;
+
+        /// <summary>
+        /// The score value for the combo portion of the score.
+        /// </summary>
+        public int ScoreValue => NumericResultForScore(TaikoResult);
+        
+        /// <summary>
+        /// The score value for the accuracy portion of the score.
+        /// </summary>
+        public int AccuracyScoreValue => NumericResultForAccuracy(TaikoResult);
+
+        /// <summary>
+        /// The maximum score value for the combo portion of the score.
+        /// </summary>
+        public int MaxScoreValue => NumericResultForScore(MAX_HIT_RESULT);
+        
+        /// <summary>
+        /// The maximum score value for the accuracy portion of the score.
+        /// </summary>
+        public int MaxAccuracyScoreValue => NumericResultForAccuracy(MAX_HIT_RESULT);
+
+        /// <summary>
+        /// Whether this Judgement has a secondary hit in the case of finishers.
+        /// </summary>
+        public bool SecondHit;
+
+        /// <summary>
+        /// Computes the numeric score value for the combo portion of the score.
+        /// For the accuracy portion of the score (including accuracy percentage), see <see cref="NumericResultForAccuracy(TaikoHitResult)"/>.
+        /// </summary>
+        /// <param name="result">The result to compute the score value for.</param>
+        /// <returns>The numeric score value.</returns>
+        protected virtual int NumericResultForScore(TaikoHitResult result)
+        {
+            switch (result)
+            {
+                default:
+                    return 0;
+                case TaikoHitResult.Good:
+                    return 100;
+                case TaikoHitResult.Great:
+                    return 300;
+            }
+        }
+
+        /// <summary>
+        /// Computes the numeric score value for the accuracy portion of the score.
+        /// For the combo portion of the score, see <see cref="NumericResultForScore(TaikoHitResult)"/>.
+        /// </summary>
+        /// <param name="result">The result to compute the score value for.</param>
+        /// <returns>The numeric score value.</returns>
+        protected virtual int NumericResultForAccuracy(TaikoHitResult result)
+        {
+            switch (result)
+            {
+                default:
+                    return 0;
+                case TaikoHitResult.Good:
+                    return 150;
+                case TaikoHitResult.Great:
+                    return 300;
+            }
+        }
     }
 }

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

@@ -17,7 +17,7 @@ namespace osu.Game.Modes.Taiko.Objects
         /// <summary>
         /// The number of hits required to complete the bash successfully.
         /// </summary>
-        public int RequiredHits;
+        public int RequiredHits { get; protected set; }
 
         public override void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty)
         {

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

@@ -25,41 +25,33 @@ namespace osu.Game.Modes.Taiko.Objects
         /// <summary>
         /// Velocity of the drum roll in positional length units per millisecond.
         /// </summary>
-        public double Velocity;
+        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;
+        public double TickTimeDistance { get; protected set; }
 
         /// <summary>
         /// Number of drum roll ticks required for a "Good" hit.
         /// </summary>
-        public double RequiredGoodHits;
+        public double RequiredGoodHits { get; protected set; }
 
         /// <summary>
         /// Number of drum roll ticks required for a "Great" hit.
         /// </summary>
-        public double RequiredGreatHits;
+        public double RequiredGreatHits { get; protected set; }
 
         /// <summary>
         /// Total number of drum roll ticks.
         /// </summary>
-        public int TotalTicks;
+        public int TotalTicks => Ticks.Count();
 
         /// <summary>
         /// Initializes the drum roll ticks if not initialized and returns them.
         /// </summary>
-        public IEnumerable<DrumRollTick> Ticks
-        {
-            get
-            {
-                if (ticks == null)
-                    createTicks();
-                return ticks;
-            }
-        }
+        public IEnumerable<DrumRollTick> Ticks => ticks ?? (ticks = createTicks());
 
         private List<DrumRollTick> ticks;
 
@@ -70,27 +62,27 @@ namespace osu.Game.Modes.Taiko.Objects
             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;
 
-            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()
+        private List<DrumRollTick> createTicks()
         {
-            ticks = new List<DrumRollTick>();
+            var ret = new List<DrumRollTick>();
 
             if (TickTimeDistance == 0)
-                return;
+                return ret;
 
             bool first = true;
             for (double t = StartTime; t < EndTime + (int)TickTimeDistance; t += TickTimeDistance)
             {
-                ticks.Add(new DrumRollTick
+                ret.Add(new DrumRollTick
                 {
                     FirstTick = first,
                     PreEmpt = PreEmpt,
@@ -105,6 +97,8 @@ namespace osu.Game.Modes.Taiko.Objects
 
                 first = false;
             }
+
+            return ret;
         }
     }
-}
+}

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

@@ -1,21 +0,0 @@
-// 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;
-
-namespace osu.Game.Modes.Taiko.Objects
-{
-    [Flags]
-    public enum TaikoHitType
-    {
-        None = 0,
-        CentreHit = 1 << 0,
-        RimHit = 1 << 1,
-        DrumRoll = 1 << 2,
-        DrumRollTick = 1 << 3,
-        Bash = 1 << 4,
-        Finisher = 1 << 5,
-
-        Hit = CentreHit | RimHit
-    }
-}

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

@@ -50,10 +50,10 @@
     <Compile Include="Beatmaps\TaikoBeatmapConverter.cs" />
     <Compile Include="Beatmaps\TaikoBeatmapProcessor.cs" />
     <Compile Include="Judgements\TaikoJudgementInfo.cs" />
+    <Compile Include="Judgements\TaikoHitResult.cs" />
     <Compile Include="Objects\Bash.cs" />
     <Compile Include="Objects\DrumRoll.cs" />
     <Compile Include="Objects\DrumRollTick.cs" />
-    <Compile Include="Objects\TaikoHitType.cs" />
     <Compile Include="TaikoDifficultyCalculator.cs" />
     <Compile Include="Objects\Drawable\DrawableTaikoHit.cs" />
     <Compile Include="Objects\TaikoHitObject.cs" />