mirror of
https://github.com/ppy/osu.git
synced 2026-05-16 22:24:11 +08:00
Bartłomiej Dach
12cc8e38da
Closes https://github.com/ppy/osu/issues/33465 probably. This reverts the replay frame de-duplication logic to what it was before https://github.com/ppy/osu/pull/33148#discussion_r2091549388. I don't have good reproduction steps. I tried to write a test case for this that isn't just "press and release a key in the same frame", thinking that maybe there was some loophole in the osu! touch input mapper that may produce this situation artificially, but I could not in many configurations. So I have to assume that this just *can happen* organically.
77 lines
2.6 KiB
C#
77 lines
2.6 KiB
C#
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
// See the LICENCE file in the repository root for full licence text.
|
|
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using osu.Game.Beatmaps;
|
|
using osu.Game.Replays.Legacy;
|
|
using osu.Game.Rulesets.Replays;
|
|
using osu.Game.Rulesets.Replays.Types;
|
|
|
|
namespace osu.Game.Rulesets.Catch.Replays
|
|
{
|
|
public class CatchReplayFrame : ReplayFrame, IConvertibleReplayFrame
|
|
{
|
|
public List<CatchAction> Actions = new List<CatchAction>();
|
|
|
|
public float Position;
|
|
public bool Dashing;
|
|
|
|
public CatchReplayFrame()
|
|
{
|
|
}
|
|
|
|
public CatchReplayFrame(double time, float? position = null, bool dashing = false, CatchReplayFrame? lastFrame = null)
|
|
: base(time)
|
|
{
|
|
Position = position ?? -1;
|
|
Dashing = dashing;
|
|
|
|
if (Dashing)
|
|
Actions.Add(CatchAction.Dash);
|
|
|
|
if (lastFrame != null)
|
|
{
|
|
if (Position > lastFrame.Position)
|
|
lastFrame.Actions.Add(CatchAction.MoveRight);
|
|
else if (Position < lastFrame.Position)
|
|
lastFrame.Actions.Add(CatchAction.MoveLeft);
|
|
}
|
|
}
|
|
|
|
public void FromLegacy(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame? lastFrame = null)
|
|
{
|
|
Position = currentFrame.Position.X;
|
|
Dashing = currentFrame.ButtonState == ReplayButtonState.Left1;
|
|
|
|
if (Dashing)
|
|
Actions.Add(CatchAction.Dash);
|
|
|
|
// this probably needs some cross-checking with osu-stable to ensure it is actually correct.
|
|
if (lastFrame is CatchReplayFrame lastCatchFrame)
|
|
{
|
|
if (Position > lastCatchFrame.Position)
|
|
lastCatchFrame.Actions.Add(CatchAction.MoveRight);
|
|
else if (Position < lastCatchFrame.Position)
|
|
lastCatchFrame.Actions.Add(CatchAction.MoveLeft);
|
|
}
|
|
}
|
|
|
|
public LegacyReplayFrame ToLegacy(IBeatmap beatmap)
|
|
{
|
|
ReplayButtonState state = ReplayButtonState.None;
|
|
|
|
if (Actions.Contains(CatchAction.Dash)) state |= ReplayButtonState.Left1;
|
|
|
|
return new LegacyReplayFrame(Time, Position, null, state);
|
|
}
|
|
|
|
public override bool IsEquivalentTo(ReplayFrame other)
|
|
=> other is CatchReplayFrame catchFrame
|
|
&& Time == catchFrame.Time
|
|
&& Position == catchFrame.Position
|
|
&& Dashing == catchFrame.Dashing
|
|
&& Actions.SequenceEqual(catchFrame.Actions);
|
|
}
|
|
}
|