Merge remote-tracking branch 'origin/master' into taiko_bash_base

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

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/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,8 +50,8 @@
     <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\TaikoHitType.cs" />
     <Compile Include="TaikoDifficultyCalculator.cs" />
     <Compile Include="Objects\Drawable\DrawableTaikoHit.cs" />
     <Compile Include="Objects\TaikoHitObject.cs" />