sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 09:57:21 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix legacy Taiko replays having reversed inputs

Browse Source
This commit is contained in:
tgi74000 2018-02-21 15:05:51 +01:00
parent 7e8b677e17
commit 426343f136
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
View File

@ -63,16 +63,16 @@ namespace osu.Game.Rulesets.Taiko.Replays
{ {
default: default:
case 0: case 0:
button = ReplayButtonState.Left1;
break;
case 1:
button = ReplayButtonState.Right1; button = ReplayButtonState.Right1;
break; break;
case 1:
button = ReplayButtonState.Left1;
break;
case 2: case 2:
button = ReplayButtonState.Left2; button = ReplayButtonState.Right2;
break; break;
case 3: case 3:
button = ReplayButtonState.Right2; button = ReplayButtonState.Left2;
break; break;
} }
@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
{ {
foreach (var tick in drumRoll.NestedHitObjects.OfType<DrumRollTick>()) 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; hitButton = !hitButton;
} }
} }
@ -95,16 +95,16 @@ namespace osu.Game.Rulesets.Taiko.Replays
if (hit is CentreHit) if (hit is CentreHit)
{ {
if (h.IsStrong) if (h.IsStrong)
button = ReplayButtonState.Right1 | ReplayButtonState.Right2; button = ReplayButtonState.Left1 | ReplayButtonState.Left2;
else else
button = hitButton ? ReplayButtonState.Right1 : ReplayButtonState.Right2; button = hitButton ? ReplayButtonState.Left1 : ReplayButtonState.Left2;
} }
else else
{ {
if (h.IsStrong) if (h.IsStrong)
button = ReplayButtonState.Left1 | ReplayButtonState.Left2; button = ReplayButtonState.Right1 | ReplayButtonState.Right2;
else else
button = hitButton ? ReplayButtonState.Left1 : ReplayButtonState.Left2; button = hitButton ? ReplayButtonState.Right1 : ReplayButtonState.Right2;
} }
Frames.Add(new TaikoReplayFrame(h.StartTime, button)); Frames.Add(new TaikoReplayFrame(h.StartTime, button));

10
osu.Game.Rulesets.Taiko/Replays/TaikoFramedReplayInputHandler.cs
View File

@ -19,13 +19,13 @@ namespace osu.Game.Rulesets.Taiko.Replays
var actions = new List<TaikoAction>(); var actions = new List<TaikoAction>();
if (CurrentFrame?.MouseRight1 == true) if (CurrentFrame?.MouseRight1 == true)
actions.Add(TaikoAction.LeftCentre);
if (CurrentFrame?.MouseRight2 == true)
actions.Add(TaikoAction.RightCentre);
if (CurrentFrame?.MouseLeft1 == true)
actions.Add(TaikoAction.LeftRim); actions.Add(TaikoAction.LeftRim);
if (CurrentFrame?.MouseLeft2 == true) if (CurrentFrame?.MouseRight2 == true)
actions.Add(TaikoAction.RightRim); 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 } }; return new List<InputState> { new ReplayState<TaikoAction> { PressedActions = actions } };
} }