Merge pull request #545 from smoogipooo/taiko_scoreprocessing

Taiko scoreprocessing

osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs

@@ -4,9 +4,9 @@
 using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Screens.Testing;
-using osu.Game.Modes;
 using osu.Game.Modes.Mods;
 using osu.Game.Modes.Osu.Mods;
+using osu.Game.Modes.Scoring;
 using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Users;
 

osu.Game.Modes.Catch/CatchRuleset.cs

@@ -10,6 +10,8 @@
 using osu.Game.Modes.UI;
 using osu.Game.Screens.Play;
 using System.Collections.Generic;
+using osu.Game.Modes.Catch.Scoring;
+using osu.Game.Modes.Scoring;
 
 namespace osu.Game.Modes.Catch
 {

osu.Game.Modes.Catch/Judgements/CatchJudgement.cs

@@ -7,8 +7,8 @@ namespace osu.Game.Modes.Catch.Judgements
 {
     public class CatchJudgement : Judgement
     {
-        public override string ScoreString => string.Empty;
+        public override string ResultString => string.Empty;
 
-        public override string MaxScoreString => string.Empty;
+        public override string MaxResultString => string.Empty;
     }
 }

osu.Game.Modes.Catch/CatchScoreProcessor.cs → osu.Game.Modes.Catch/Scoring/CatchScoreProcessor.cs

@@ -3,9 +3,10 @@
 
 using osu.Game.Modes.Catch.Judgements;
 using osu.Game.Modes.Catch.Objects;
+using osu.Game.Modes.Scoring;
 using osu.Game.Modes.UI;
 
-namespace osu.Game.Modes.Catch
+namespace osu.Game.Modes.Catch.Scoring
 {
     internal class CatchScoreProcessor : ScoreProcessor<CatchBaseHit, CatchJudgement>
     {
@@ -18,7 +19,7 @@ public CatchScoreProcessor(HitRenderer<CatchBaseHit, CatchJudgement> hitRenderer
         {
         }
 
-        protected override void UpdateCalculations(CatchJudgement newJudgement)
+        protected override void OnNewJugement(CatchJudgement judgement)
         {
         }
     }

osu.Game.Modes.Catch/UI/CatchHitRenderer.cs

@@ -5,7 +5,9 @@
 using osu.Game.Modes.Catch.Beatmaps;
 using osu.Game.Modes.Catch.Judgements;
 using osu.Game.Modes.Catch.Objects;
+using osu.Game.Modes.Catch.Scoring;
 using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Scoring;
 using osu.Game.Modes.UI;
 
 namespace osu.Game.Modes.Catch.UI

osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj

@@ -50,7 +50,7 @@
     <Compile Include="Beatmaps\CatchBeatmapConverter.cs" />
     <Compile Include="Beatmaps\CatchBeatmapProcessor.cs" />
     <Compile Include="CatchDifficultyCalculator.cs" />
-    <Compile Include="CatchScoreProcessor.cs" />
+    <Compile Include="Scoring\CatchScoreProcessor.cs" />
     <Compile Include="Judgements\CatchJudgement.cs" />
     <Compile Include="Objects\CatchBaseHit.cs" />
     <Compile Include="Objects\Drawable\DrawableFruit.cs" />

osu.Game.Modes.Mania/Judgements/ManiaJudgement.cs

@@ -7,8 +7,8 @@ namespace osu.Game.Modes.Mania.Judgements
 {
     public class ManiaJudgement : Judgement
     {
-        public override string ScoreString => string.Empty;
+        public override string ResultString => string.Empty;
 
-        public override string MaxScoreString => string.Empty;
+        public override string MaxResultString => string.Empty;
     }
 }

osu.Game.Modes.Mania/ManiaRuleset.cs

@@ -9,6 +9,8 @@
 using osu.Game.Modes.UI;
 using osu.Game.Screens.Play;
 using System.Collections.Generic;
+using osu.Game.Modes.Mania.Scoring;
+using osu.Game.Modes.Scoring;
 
 namespace osu.Game.Modes.Mania
 {

osu.Game.Modes.Mania/ManiaScoreProcessor.cs → osu.Game.Modes.Mania/Scoring/ManiaScoreProcessor.cs

@@ -3,9 +3,10 @@
 
 using osu.Game.Modes.Mania.Judgements;
 using osu.Game.Modes.Mania.Objects;
+using osu.Game.Modes.Scoring;
 using osu.Game.Modes.UI;
 
-namespace osu.Game.Modes.Mania
+namespace osu.Game.Modes.Mania.Scoring
 {
     internal class ManiaScoreProcessor : ScoreProcessor<ManiaBaseHit, ManiaJudgement>
     {
@@ -18,7 +19,7 @@ public ManiaScoreProcessor(HitRenderer<ManiaBaseHit, ManiaJudgement> hitRenderer
         {
         }
 
-        protected override void UpdateCalculations(ManiaJudgement newJudgement)
+        protected override void OnNewJugement(ManiaJudgement judgement)
         {
         }
     }

osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs

@@ -5,7 +5,9 @@
 using osu.Game.Modes.Mania.Beatmaps;
 using osu.Game.Modes.Mania.Judgements;
 using osu.Game.Modes.Mania.Objects;
+using osu.Game.Modes.Mania.Scoring;
 using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Scoring;
 using osu.Game.Modes.UI;
 
 namespace osu.Game.Modes.Mania.UI

osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj

@@ -51,7 +51,7 @@
     <Compile Include="Beatmaps\ManiaBeatmapProcessor.cs" />
     <Compile Include="Judgements\ManiaJudgement.cs" />
     <Compile Include="ManiaDifficultyCalculator.cs" />
-    <Compile Include="ManiaScoreProcessor.cs" />
+    <Compile Include="Scoring\ManiaScoreProcessor.cs" />
     <Compile Include="Objects\Drawable\DrawableNote.cs" />
     <Compile Include="Objects\HoldNote.cs" />
     <Compile Include="Objects\ManiaBaseHit.cs" />

osu.Game.Modes.Osu/Judgements/OsuJudgement.cs

@@ -25,9 +25,9 @@ public class OsuJudgement : Judgement
         /// </summary>
         public OsuScoreResult MaxScore = OsuScoreResult.Hit300;
 
-        public override string ScoreString => Score.GetDescription();
+        public override string ResultString => Score.GetDescription();
 
-        public override string MaxScoreString => MaxScore.GetDescription();
+        public override string MaxResultString => MaxScore.GetDescription();
 
         public int ScoreValue => scoreToInt(Score);
 

osu.Game.Modes.Osu/Mods/OsuMod.cs

@@ -7,6 +7,7 @@
 using osu.Game.Modes.Osu.Objects;
 using System;
 using System.Linq;
+using osu.Game.Modes.Scoring;
 
 namespace osu.Game.Modes.Osu.Mods
 {

osu.Game.Modes.Osu/OsuRuleset.cs

@@ -12,6 +12,8 @@
 using osu.Game.Screens.Play;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Game.Modes.Osu.Scoring;
+using osu.Game.Modes.Scoring;
 
 namespace osu.Game.Modes.Osu
 {

osu.Game.Modes.Osu/OsuScore.cs → osu.Game.Modes.Osu/Scoring/OsuScore.cs

@@ -1,7 +1,9 @@
 // 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.Osu
+using osu.Game.Modes.Scoring;
+
+namespace osu.Game.Modes.Osu.Scoring
 {
     internal class OsuScore : Score
     {

osu.Game.Modes.Osu/OsuScoreProcessor.cs → osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs

@@ -4,9 +4,10 @@
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Judgements;
 using osu.Game.Modes.Osu.Objects;
+using osu.Game.Modes.Scoring;
 using osu.Game.Modes.UI;
 
-namespace osu.Game.Modes.Osu
+namespace osu.Game.Modes.Osu.Scoring
 {
     internal class OsuScoreProcessor : ScoreProcessor<OsuHitObject, OsuJudgement>
     {
@@ -27,7 +28,7 @@ protected override void Reset()
             Accuracy.Value = 1;
         }
 
-        protected override void UpdateCalculations(OsuJudgement judgement)
+        protected override void OnNewJugement(OsuJudgement judgement)
         {
             if (judgement != null)
             {

osu.Game.Modes.Osu/UI/OsuHitRenderer.cs

@@ -7,6 +7,8 @@
 using osu.Game.Modes.Osu.Judgements;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.Objects.Drawables;
+using osu.Game.Modes.Osu.Scoring;
+using osu.Game.Modes.Scoring;
 using osu.Game.Modes.UI;
 using osu.Game.Screens.Play;
 

osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj

@@ -72,8 +72,8 @@
     <Compile Include="OsuAutoReplay.cs" />
     <Compile Include="OsuDifficultyCalculator.cs" />
     <Compile Include="OsuKeyConversionInputManager.cs" />
-    <Compile Include="OsuScore.cs" />
-    <Compile Include="OsuScoreProcessor.cs" />
+    <Compile Include="Scoring\OsuScore.cs" />
+    <Compile Include="Scoring\OsuScoreProcessor.cs" />
     <Compile Include="UI\OsuHitRenderer.cs" />
     <Compile Include="UI\OsuPlayfield.cs" />
     <Compile Include="OsuRuleset.cs" />

osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs

@@ -3,6 +3,7 @@
 
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Legacy;
+using osu.Game.Beatmaps.Samples;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Types;
 using osu.Game.Modes.Taiko.Objects;
@@ -43,12 +44,15 @@ private TaikoHitObject convertHitObject(HitObject original)
             IHasRepeats repeatsData = original as IHasRepeats;
             IHasEndTime endTimeData = original as IHasEndTime;
 
+            bool accented = ((original.Sample?.Type ?? SampleType.None) & SampleType.Finish) > 0;
+
             if (distanceData != null)
             {
                 return new DrumRoll
                 {
                     StartTime = original.StartTime,
                     Sample = original.Sample,
+                    Accented = accented,
 
                     Distance = distanceData.Distance * (repeatsData?.RepeatCount ?? 1)
                 };
@@ -61,6 +65,7 @@ private TaikoHitObject convertHitObject(HitObject original)
                 {
                     StartTime = original.StartTime,
                     Sample = original.Sample,
+                    Accented = accented,
 
                     EndTime = original.StartTime + endTimeData.Duration * bash_convert_factor 
                 };
@@ -70,6 +75,7 @@ private TaikoHitObject convertHitObject(HitObject original)
             {
                 StartTime = original.StartTime,
                 Sample = original.Sample,
+                Accented = accented
             };
         }
     }

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

@@ -8,12 +8,12 @@ public class TaikoDrumRollTickJudgement : TaikoJudgement
         /// <summary>
         /// Drum roll ticks don't display judgement text.
         /// </summary>
-        public override string ScoreString => string.Empty;
+        public override string ResultString => string.Empty;
 
         /// <summary>
         /// Drum roll ticks don't display judgement text.
         /// </summary>
-        public override string MaxScoreString => string.Empty;
+        public override string MaxResultString => string.Empty;
 
         protected override int NumericResultForScore(TaikoHitResult result)
         {

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

@@ -9,50 +9,50 @@ namespace osu.Game.Modes.Taiko.Judgements
     public class TaikoJudgement : Judgement
     {
         /// <summary>
-        /// The maximum score value.
+        /// The maximum result.
         /// </summary>
         public const TaikoHitResult MAX_HIT_RESULT = TaikoHitResult.Great;
 
         /// <summary>
-        /// The score value.
+        /// The result.
         /// </summary>
         public TaikoHitResult TaikoResult;
 
         /// <summary>
-        /// The score value for the combo portion of the score.
+        /// The result value for the combo portion of the score.
         /// </summary>
-        public int ScoreValue => NumericResultForScore(TaikoResult);
+        public int ResultValueForScore => NumericResultForScore(TaikoResult);
 
         /// <summary>
-        /// The score value for the accuracy portion of the score.
+        /// The result value for the accuracy portion of the score.
         /// </summary>
-        public int AccuracyScoreValue => NumericResultForAccuracy(TaikoResult);
+        public int ResultValueForAccuracy => NumericResultForAccuracy(TaikoResult);
 
         /// <summary>
-        /// The maximum score value for the combo portion of the score.
+        /// The maximum result value for the combo portion of the score.
         /// </summary>
-        public int MaxScoreValue => NumericResultForScore(MAX_HIT_RESULT);
+        public int MaxResultValueForScore => NumericResultForScore(MAX_HIT_RESULT);
 
         /// <summary>
-        /// The maximum score value for the accuracy portion of the score.
+        /// The maximum result value for the accuracy portion of the score.
         /// </summary>
-        public int MaxAccuracyScoreValue => NumericResultForAccuracy(MAX_HIT_RESULT);
+        public int MaxResultValueForAccuracy => NumericResultForAccuracy(MAX_HIT_RESULT);
 
-        public override string ScoreString => TaikoResult.GetDescription();
+        public override string ResultString => TaikoResult.GetDescription();
 
-        public override string MaxScoreString => MAX_HIT_RESULT.GetDescription();
+        public override string MaxResultString => MAX_HIT_RESULT.GetDescription();
 
         /// <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.
+        /// Computes the numeric result 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>
+        /// <param name="result">The result to compute the value for.</param>
+        /// <returns>The numeric result value.</returns>
         protected virtual int NumericResultForScore(TaikoHitResult result)
         {
             switch (result)
@@ -67,11 +67,11 @@ protected virtual int NumericResultForScore(TaikoHitResult result)
         }
 
         /// <summary>
-        /// Computes the numeric score value for the accuracy portion of the score.
+        /// Computes the numeric result 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>
+        /// <param name="result">The result to compute the value for.</param>
+        /// <returns>The numeric result value.</returns>
         protected virtual int NumericResultForAccuracy(TaikoHitResult result)
         {
             switch (result)

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

@@ -19,6 +19,12 @@ public abstract class TaikoHitObject : HitObject
         /// </summary>
         public double PreEmpt;
 
+        /// <summary>
+        /// Whether this HitObject is accented.
+        /// Accented hit objects give more points for hitting the hit object with both keys.
+        /// </summary>
+        public bool Accented;
+
         /// <summary>
         /// Whether this HitObject is in Kiai time.
         /// </summary>