h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 16:02:55 +08:00
Code Issues Releases Wiki Activity

Rewrite handling of legacy replay frame quirks to match stable closer

Browse Source
This commit is contained in:
Bartłomiej Dach 2024-03-21 21:01:51 +01:00
parent 5f7028b574
commit 990a07af0e
No known key found for this signature in database
1 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
View File

@ -21,6 +21,7 @@ using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Replays; using osu.Game.Rulesets.Replays;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
using osuTK;
using SharpCompress.Compressors.LZMA; using SharpCompress.Compressors.LZMA;
namespace osu.Game.Scoring.Legacy namespace osu.Game.Scoring.Legacy
@ -240,15 +241,7 @@ namespace osu.Game.Scoring.Legacy
private void readLegacyReplay(Replay replay, StreamReader reader) private void readLegacyReplay(Replay replay, StreamReader reader)
{ {
float lastTime = beatmapOffset; float lastTime = beatmapOffset;
bool negativeFrameEncounted = false; var legacyFrames = new List<LegacyReplayFrame>();
ReplayFrame currentFrame = null;
// the negative time amount that must be "paid back" by positive frames before we start including frames again.
// When a negative frame occurs in a replay, all future frames are skipped until the sum total of their times
// is equal to or greater than the time of that negative frame.
// This value will be negative if we are in a time deficit, ie we have a negative frame that must be paid back.
// Otherwise it will be 0.
float timeDeficit = 0;
string[] frames = reader.ReadToEnd().Split(','); string[] frames = reader.ReadToEnd().Split(',');
@ -271,40 +264,44 @@ namespace osu.Game.Scoring.Legacy
lastTime += diff; lastTime += diff;
if (i < 2 && mouseX == 256 && mouseY == -500) legacyFrames.Add(new LegacyReplayFrame(lastTime,
mouseX,
mouseY,
(ReplayButtonState)Parsing.ParseInt(split[3])));
}
// https://github.com/peppy/osu-stable-reference/blob/e53980dd76857ee899f66ce519ba1597e7874f28/osu!/GameModes/Play/ReplayWatcher.cs#L62-L67
if (legacyFrames.Count >= 2 && legacyFrames[1].Time < legacyFrames[0].Time)
{
legacyFrames[1].Time = legacyFrames[0].Time;
legacyFrames[0].Time = 0;
}
// https://github.com/peppy/osu-stable-reference/blob/e53980dd76857ee899f66ce519ba1597e7874f28/osu!/GameModes/Play/ReplayWatcher.cs#L69-L71
if (legacyFrames.Count >= 3 && legacyFrames[0].Time > legacyFrames[2].Time)
legacyFrames[0].Time = legacyFrames[1].Time = legacyFrames[2].Time;
// at the start of the replay, stable places two replay frames, at time 0 and SkipBoundary - 1, respectively. // at the start of the replay, stable places two replay frames, at time 0 and SkipBoundary - 1, respectively.
// both frames use a position of (256, -500). // both frames use a position of (256, -500).
// ignore these frames as they serve no real purpose (and can even mislead ruleset-specific handlers - see mania) // ignore these frames as they serve no real purpose (and can even mislead ruleset-specific handlers - see mania)
continue; if (legacyFrames.Count >= 2 && legacyFrames[1].Position == new Vector2(256, -500))
legacyFrames.RemoveAt(1);
// negative frames are only counted towards the deficit after the very beginning of the replay. if (legacyFrames.Count >= 1 && legacyFrames[0].Position == new Vector2(256, -500))
// When the two skip frames are present (see directly above), the third frame will have a large legacyFrames.RemoveAt(0);
// negative time roughly equal to SkipBoundary. This shouldn't be counted towards the deficit, otherwise
// any replay data before the skip would be, well, skipped. ReplayFrame currentFrame = null;
//
// On testing against stable, it appears that stable ignores the negative time of only the first foreach (var legacyFrame in legacyFrames)
// negative frame of the first three replay frames, regardless of if the skip frames are present.
// Hence the condition here.
// But there is a possibility this is incorrect and may need to be revisited later.
if (i > 2 || negativeFrameEncounted)
{ {
timeDeficit += diff; // never allow backwards time traversal in relation to the current frame.
timeDeficit = Math.Min(0, timeDeficit); // this handles frames with negative delta.
} // this doesn't match stable 100% as stable will do something similar to adding an interpolated "intermediate frame"
// at the point wherein time flow changes from backwards to forwards, but it'll do for now.
if (diff < 0) if (currentFrame != null && legacyFrame.Time < currentFrame.Time)
negativeFrameEncounted = true;
// still paying back the deficit from a negative frame. Skip this frame.
if (timeDeficit < 0)
continue; continue;
currentFrame = convertFrame(new LegacyReplayFrame(lastTime, replay.Frames.Add(currentFrame = convertFrame(legacyFrame, currentFrame));
mouseX,
mouseY,
(ReplayButtonState)Parsing.ParseInt(split[3])), currentFrame);
replay.Frames.Add(currentFrame);
} }
} }