Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions Quaver.API/Replays/Replay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -299,12 +299,7 @@ public void Write(string path)
bw.Write(DateTime.Now.ToString(CultureInfo.InvariantCulture));
bw.Write(TimePlayed);
bw.Write((int)Mode);
// This check is to keep compatibility with older clients.
// We only want to write a 64-bit integer for replays with newer mods activated
if (ReplayVersion == "0.0.1" || Mods < ModIdentifier.Speed105X)
bw.Write((int)Mods);
else
bw.Write((long)Mods);
bw.Write((long)Mods);
bw.Write(Score);
bw.Write(Accuracy);
bw.Write(MaxCombo);
Expand Down Expand Up @@ -511,7 +506,7 @@ public List<ReplayKeyPressInfo> GetKeyPresses()
/// <returns></returns>
public string GetMd5(string frames)
{
if (Version.TryParse(CurrentVersionString, out var ver) && ver >= VersionMineHit)
if (Version.TryParse(ReplayVersion, out var ver) && ver >= VersionMineHit)
{
return CryptoHelper.StringToMd5($"{ReplayVersion}-{TimePlayed}-{MapMd5}-{PlayerName}-{(int)Mode}-" +
$"{(int)Mods}-{Score}-{Accuracy}-{MaxCombo}-{CountMarv}-{CountPerf}-" +
Expand Down
5 changes: 3 additions & 2 deletions Quaver.Tools/Commands/ReplayBuildCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class ReplayBuildCommand : Command

/// <summary>
/// <replay_path> <output_path> <quaver_version> <map_md5> <timestamp> <mode> <mods> <score>
/// <accuracy> <max_combo> <count_marv> <count_perf> <count_great> <count_good> <count_okay> <count_miss> <pause_count> <username>
/// <accuracy> <max_combo> <count_marv> <count_perf> <count_great> <count_good> <count_okay> <count_miss> <count_mine_hit> <pause_count> <username>
/// </summary>
/// <param name="args"></param>
public ReplayBuildCommand(string[] args) : base(args)
Expand All @@ -52,7 +52,8 @@ public ReplayBuildCommand(string[] args) : base(args)
CountGood = int.Parse(args[14]),
CountOkay = int.Parse(args[15]),
CountMiss = int.Parse(args[16]),
PauseCount = int.Parse(args[17])
CountMineHit = int.Parse(args[17]),
PauseCount = int.Parse(args[18])
};

OutputPath = args[2];
Expand Down
1 change: 1 addition & 0 deletions Quaver.Tools/Commands/ReplayCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public override void Execute() => Console.WriteLine(JObject.FromObject(new
Replay.CountGood,
Replay.CountOkay,
Replay.CountMiss,
Replay.CountMineHit,
Replay.PauseCount,
Replay.HasData,
Replay.Frames.Count
Expand Down
4 changes: 3 additions & 1 deletion Quaver.Tools/Commands/VirtualReplayPlayerCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ public override void Execute()
Replay.CountGreat,
Replay.CountGood,
Replay.CountOkay,
Replay.CountMiss
Replay.CountMiss,
Replay.CountMineHit
},
VirtualReplayPlayer = new
{
Expand All @@ -134,6 +135,7 @@ public override void Execute()
CountGood = virtualPlayer.ScoreProcessor.CurrentJudgements[Judgement.Good],
CountOkay = virtualPlayer.ScoreProcessor.CurrentJudgements[Judgement.Okay],
CountMiss = virtualPlayer.ScoreProcessor.CurrentJudgements[Judgement.Miss],
virtualPlayer.ScoreProcessor.CountMineHit,
Hits = hits
},
}));
Expand Down
2 changes: 1 addition & 1 deletion Quaver.Tools/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ internal static void Main(string[] args)
$"-calcfolder <folder_path> <mods> `Calculate the difficulty of an entire folder`\n" +
$"-replay <file_path.qr> (-headerless) `Read a replay file and retrieve information about it.`\n" +
$"-virtualreplay <a.qr> <b.qua> <mods (int)> <-hl (optional to read headerless)> `Simulate a replay and retrieve its score outcome.`\n" +
$"-buildreplay <replay_path> <output_path> <quaver_version> <map_md5> <timestamp> <mode> <mods> <score> <accuracy> <max_combo> <count_marv> <count_perf> <count_great> <count_good> <count_okay> <count_miss> <pause_count> <username>\n" +
$"-buildreplay <replay_path> <output_path> <quaver_version> <map_md5> <timestamp> <mode> <mods> <score> <accuracy> <max_combo> <count_marv> <count_perf> <count_great> <count_good> <count_okay> <count_miss> <count_minehit> <pause_count> <username>\n" +
$"-calcrating <difficulty_rating> <accuracy>\n" +
$"-convertosu <file_path.osu> <output.qua>\n" +
$"-convertsm <file_path.sm> <output directory>\n" +
Expand Down
Loading