From 426343f1364efd05152dd81c89a8d1b0990e4793 Mon Sep 17 00:00:00 2001
From: tgi74000 <tgi74@hotmail.fr>
Date: Wed, 21 Feb 2018 15:05:51 +0100
Subject: [PATCH] Fix legacy Taiko replays having reversed inputs

---
 .../Replays/TaikoAutoGenerator.cs             | 20 +++++++++----------
 .../Replays/TaikoFramedReplayInputHandler.cs  | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index 002159439d..4c0eafe25c 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -63,16 +63,16 @@ namespace osu.Game.Rulesets.Taiko.Replays
                         {
                             default:
                             case 0:
-                                button = ReplayButtonState.Left1;
-                                break;
-                            case 1:
                                 button = ReplayButtonState.Right1;
                                 break;
+                            case 1:
+                                button = ReplayButtonState.Left1;
+                                break;
                             case 2:
-                                button = ReplayButtonState.Left2;
+                                button = ReplayButtonState.Right2;
                                 break;
                             case 3:
-                                button = ReplayButtonState.Right2;
+                                button = ReplayButtonState.Left2;
                                 break;
                         }
 
@@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
                 {
                     foreach (var tick in drumRoll.NestedHitObjects.OfType<DrumRollTick>())
                     {
-                        Frames.Add(new TaikoReplayFrame(tick.StartTime, hitButton ? ReplayButtonState.Right1 : ReplayButtonState.Right2));
+                        Frames.Add(new TaikoReplayFrame(tick.StartTime, hitButton ? ReplayButtonState.Left1 : ReplayButtonState.Left2));
                         hitButton = !hitButton;
                     }
                 }
@@ -95,16 +95,16 @@ namespace osu.Game.Rulesets.Taiko.Replays
                     if (hit is CentreHit)
                     {
                         if (h.IsStrong)
-                            button = ReplayButtonState.Right1 | ReplayButtonState.Right2;
+                            button = ReplayButtonState.Left1 | ReplayButtonState.Left2;
                         else
-                            button = hitButton ? ReplayButtonState.Right1 : ReplayButtonState.Right2;
+                            button = hitButton ? ReplayButtonState.Left1 : ReplayButtonState.Left2;
                     }
                     else
                     {
                         if (h.IsStrong)
-                            button = ReplayButtonState.Left1 | ReplayButtonState.Left2;
+                            button = ReplayButtonState.Right1 | ReplayButtonState.Right2;
                         else
-                            button = hitButton ? ReplayButtonState.Left1 : ReplayButtonState.Left2;
+                            button = hitButton ? ReplayButtonState.Right1 : ReplayButtonState.Right2;
                     }
 
                     Frames.Add(new TaikoReplayFrame(h.StartTime, button));
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoFramedReplayInputHandler.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoFramedReplayInputHandler.cs
index 05e10b6fce..1a96b26d34 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoFramedReplayInputHandler.cs
@@ -19,13 +19,13 @@ namespace osu.Game.Rulesets.Taiko.Replays
             var actions = new List<TaikoAction>();
 
             if (CurrentFrame?.MouseRight1 == true)
-                actions.Add(TaikoAction.LeftCentre);
-            if (CurrentFrame?.MouseRight2 == true)
-                actions.Add(TaikoAction.RightCentre);
-            if (CurrentFrame?.MouseLeft1 == true)
                 actions.Add(TaikoAction.LeftRim);
-            if (CurrentFrame?.MouseLeft2 == true)
+            if (CurrentFrame?.MouseRight2 == true)
                 actions.Add(TaikoAction.RightRim);
+            if (CurrentFrame?.MouseLeft1 == true)
+                actions.Add(TaikoAction.LeftCentre);
+            if (CurrentFrame?.MouseLeft2 == true)
+                actions.Add(TaikoAction.RightCentre);
 
             return new List<InputState> { new ReplayState<TaikoAction> { PressedActions = actions } };
         }