MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Initial Implementation of SSBU PlayReport usage! #638

Merged
FluffyOMC merged 6 commits from ssbu-report into master 2025-02-08 22:23:25 +00:00
Conversation 1 Commits 6 Files Changed 2 +204 -180
1 changed files with 204 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4190b69923 - Show all commits

86
src/Ryujinx/Utilities/PlayReport/PlayReports.cs
View File

@ -46,14 +46,17 @@ namespace Ryujinx.Ava.Utilities.PlayReport
"01006a800016e000", "01006a800016e000",
spec => spec spec => spec
.AddSparseMultiValueFormatter( .AddSparseMultiValueFormatter(
new []{ [
// Metadata to figure out what PlayReport we have. // Metadata to figure out what PlayReport we have.
"match_mode", "match_submode", "anniversary", "fighter", "reason", "challenge_count", "adv_slot", "match_mode", "match_submode", "anniversary", "fighter", "reason", "challenge_count",
"adv_slot",
// List of Fighters // List of Fighters
"player_1_fighter", "player_2_fighter", "player_3_fighter", "player_4_fighter", "player_5_fighter", "player_6_fighter", "player_7_fighter", "player_8_fighter", "player_1_fighter", "player_2_fighter", "player_3_fighter", "player_4_fighter",
"player_5_fighter", "player_6_fighter", "player_7_fighter", "player_8_fighter",
// List of rankings/placements // List of rankings/placements
"player_1_rank", "player_2_rank", "player_3_rank", "player_4_rank", "player_5_rank", "player_6_rank", "player_7_rank", "player_8_rank" "player_1_rank", "player_2_rank", "player_3_rank", "player_4_rank", "player_5_rank",
}, "player_6_rank", "player_7_rank", "player_8_rank"
],
SuperSmashBrosUltimate_Mode SuperSmashBrosUltimate_Mode
) )
); );
@ -142,65 +145,80 @@ namespace Ryujinx.Ava.Utilities.PlayReport
//TODO DLC Locations //TODO DLC Locations
_ => FormattedValue.ForceReset _ => FormattedValue.ForceReset
}; };
private static FormattedValue SuperSmashBrosUltimate_Mode(SparseMultiValue valuesWrapper)
private static FormattedValue SuperSmashBrosUltimate_Mode(SparseMultiValue values)
{ {
var values = valuesWrapper.Matched;
// Check if the PlayReport is for a challenger approach or an achievement. // Check if the PlayReport is for a challenger approach or an achievement.
if (values.TryGetValue("fighter", out var fighter) && values.ContainsKey("reason")) if (values.Matched.TryGetValue("fighter", out var fighter) && values.Matched.ContainsKey("reason"))
{ {
return $"Challenger Approaches - {SuperSmashBrosUltimate_Character(fighter)}"; return $"Challenger Approaches - {SuperSmashBrosUltimate_Character(fighter)}";
} }
if (values.TryGetValue("fighter", out fighter) && values.ContainsKey("challenge_count"))
if (values.Matched.TryGetValue("fighter", out fighter) && values.Matched.ContainsKey("challenge_count"))
{ {
return $"Fighter Unlocked - {SuperSmashBrosUltimate_Character(fighter)}"; return $"Fighter Unlocked - {SuperSmashBrosUltimate_Character(fighter)}";
} }
if (values.TryGetValue("anniversary", out var anniversary)) {
if (values.Matched.TryGetValue("anniversary", out var anniversary))
{
return $"Achievement Unlocked - ID: {anniversary}"; return $"Achievement Unlocked - ID: {anniversary}";
} }
if (values.ContainsKey("adv_slot")) {
return $"Playing Adventure Mode"; // Doing this as it can be a placeholder until we can grab the character. if (values.Matched.ContainsKey("adv_slot"))
{
return
$"Playing Adventure Mode"; // Doing this as it can be a placeholder until we can grab the character.
} }
// Check if we have a match_mode at this point, if not, go to default. // Check if we have a match_mode at this point, if not, go to default.
if (!values.TryGetValue("match_mode", out var matchMode)) if (!values.Matched.TryGetValue("match_mode", out var matchMode))
{ {
return "Smashing"; return "Smashing";
} }
return matchMode.BoxedValue switch return matchMode.BoxedValue switch
{ {
0 when values.TryGetValue("player_1_fighter", out var player) && values.TryGetValue("player_2_fighter", out var challenger) 0 when values.Matched.TryGetValue("player_1_fighter", out var player) &&
values.Matched.TryGetValue("player_2_fighter", out var challenger)
=> $"Last Smashed: {SuperSmashBrosUltimate_Character(challenger)}'s Fighter Challenge - {SuperSmashBrosUltimate_Character(player)}", => $"Last Smashed: {SuperSmashBrosUltimate_Character(challenger)}'s Fighter Challenge - {SuperSmashBrosUltimate_Character(player)}",
1 => $"Last Smashed: Normal Battle - {SuperSmashBrosUltimate_PlayerListing(values)}", 1 => $"Last Smashed: Normal Battle - {SuperSmashBrosUltimate_PlayerListing(values)}",
2 when values.TryGetValue("player_1_rank", out var team) 2 when values.Matched.TryGetValue("player_1_rank", out var team)
=> team.BoxedValue is 0 ? "Last Smashed: Squad Strike - Red Team Wins" => team.BoxedValue is 0
? "Last Smashed: Squad Strike - Red Team Wins"
: "Last Smashed: Squad Strike - Blue Team Wins", : "Last Smashed: Squad Strike - Blue Team Wins",
3 => $"Last Smashed: Custom Smash - {SuperSmashBrosUltimate_PlayerListing(values)}", 3 => $"Last Smashed: Custom Smash - {SuperSmashBrosUltimate_PlayerListing(values)}",
4 => $"Last Smashed: Super Sudden Death - {SuperSmashBrosUltimate_PlayerListing(values)}", 4 => $"Last Smashed: Super Sudden Death - {SuperSmashBrosUltimate_PlayerListing(values)}",
5 => $"Last Smashed: Smashdown - {SuperSmashBrosUltimate_PlayerListing(values)}", 5 => $"Last Smashed: Smashdown - {SuperSmashBrosUltimate_PlayerListing(values)}",
6 => $"Last Smashed: Tourney Battle - {SuperSmashBrosUltimate_PlayerListing(values)}", 6 => $"Last Smashed: Tourney Battle - {SuperSmashBrosUltimate_PlayerListing(values)}",
7 when values.TryGetValue("player_1_fighter", out var player) 7 when values.Matched.TryGetValue("player_1_fighter", out var player)
=> $"Last Smashed: Spirit Board Battle as {SuperSmashBrosUltimate_Character(player)}", => $"Last Smashed: Spirit Board Battle as {SuperSmashBrosUltimate_Character(player)}",
8 when values.TryGetValue("player_1_fighter", out var player) 8 when values.Matched.TryGetValue("player_1_fighter", out var player)
=> $"Playing Adventure Mode as {SuperSmashBrosUltimate_Character(player)}", => $"Playing Adventure Mode as {SuperSmashBrosUltimate_Character(player)}",
10 when values.TryGetValue("match_submode", out var battle) && values.TryGetValue("player_1_fighter", out var player) 10 when values.Matched.TryGetValue("match_submode", out var battle) &&
values.Matched.TryGetValue("player_1_fighter", out var player)
=> $"Last Smashed: Classic Mode, Battle {(int)battle.BoxedValue + 1}/8 as {SuperSmashBrosUltimate_Character(player)}", => $"Last Smashed: Classic Mode, Battle {(int)battle.BoxedValue + 1}/8 as {SuperSmashBrosUltimate_Character(player)}",
12 => $"Last Smashed: Century Smash - {SuperSmashBrosUltimate_PlayerListing(values)}", 12 => $"Last Smashed: Century Smash - {SuperSmashBrosUltimate_PlayerListing(values)}",
13 => $"Last Smashed: All-Star Smash - {SuperSmashBrosUltimate_PlayerListing(values)}", 13 => $"Last Smashed: All-Star Smash - {SuperSmashBrosUltimate_PlayerListing(values)}",
14 => $"Last Smashed: Cruel Smash - {SuperSmashBrosUltimate_PlayerListing(values)}", 14 => $"Last Smashed: Cruel Smash - {SuperSmashBrosUltimate_PlayerListing(values)}",
15 when values.TryGetValue("player_1_fighter", out var player) 15 when values.Matched.TryGetValue("player_1_fighter", out var player)
=> $"Last Smashed: Home-Run Contest - {SuperSmashBrosUltimate_Character(player)}", => $"Last Smashed: Home-Run Contest - {SuperSmashBrosUltimate_Character(player)}",
16 when values.TryGetValue("player_1_fighter", out var player1) && values.TryGetValue("player_2_fighter", out var player2) 16 when values.Matched.TryGetValue("player_1_fighter", out var player1) &&
values.Matched.TryGetValue("player_2_fighter", out var player2)
=> $"Last Smashed: Home-Run Content (Co-op) - {SuperSmashBrosUltimate_Character(player1)} and {SuperSmashBrosUltimate_Character(player2)}", => $"Last Smashed: Home-Run Content (Co-op) - {SuperSmashBrosUltimate_Character(player1)} and {SuperSmashBrosUltimate_Character(player2)}",
17 => $"Last Smashed: Home-Run Contest (Versus) - {SuperSmashBrosUltimate_PlayerListing(values)}", 17 => $"Last Smashed: Home-Run Contest (Versus) - {SuperSmashBrosUltimate_PlayerListing(values)}",
18 when values.TryGetValue("player_1_fighter", out var player1) && values.TryGetValue("player_2_fighter", out var player2) 18 when values.Matched.TryGetValue("player_1_fighter", out var player1) &&
values.Matched.TryGetValue("player_2_fighter", out var player2)
=> $"Fresh out of Training mode - {SuperSmashBrosUltimate_Character(player1)} with {SuperSmashBrosUltimate_Character(player2)}", => $"Fresh out of Training mode - {SuperSmashBrosUltimate_Character(player1)} with {SuperSmashBrosUltimate_Character(player2)}",
58 => $"Last Smashed: LDN Battle - {SuperSmashBrosUltimate_PlayerListing(values)}", 58 => $"Last Smashed: LDN Battle - {SuperSmashBrosUltimate_PlayerListing(values)}",
63 when values.TryGetValue("player_1_fighter", out var player) 63 when values.Matched.TryGetValue("player_1_fighter", out var player)
=> $"Last Smashed: DLC Spirit Board Battle as {SuperSmashBrosUltimate_Character(player)}", => $"Last Smashed: DLC Spirit Board Battle as {SuperSmashBrosUltimate_Character(player)}",
_ => "Smashing" _ => "Smashing"
}; };
} }
private static string SuperSmashBrosUltimate_Character(Value value) => private static string SuperSmashBrosUltimate_Character(Value value) =>
BinaryPrimitives.ReverseEndianness(BitConverter.ToInt64(((MsgPack.MessagePackExtendedTypeObject)value.BoxedValue).GetBody(), 0)) switch BinaryPrimitives.ReverseEndianness(
BitConverter.ToInt64(((MsgPack.MessagePackExtendedTypeObject)value.BoxedValue).GetBody(), 0)) switch
{ {
0x0 => "Mario", 0x0 => "Mario",
0x1 => "Donkey Kong", 0x1 => "Donkey Kong",
@ -292,23 +310,28 @@ namespace Ryujinx.Ava.Utilities.PlayReport
0xFF => "Scripted Entity", 0xFF => "Scripted Entity",
_ => "Unknown" _ => "Unknown"
}; };
private static string SuperSmashBrosUltimate_PlayerListing(Dictionary<string, Value> values)
{
var players = new List<(string Character, int PlayerNumber, int? Rank)>();
foreach (var player in values) private static string SuperSmashBrosUltimate_PlayerListing(SparseMultiValue values)
{ {
if (player.Key.StartsWith("player_") && player.Key.EndsWith("_fighter") && player.Value.BoxedValue is not null) List<(string Character, int PlayerNumber, int? Rank)> players = [];
foreach (var player in values.Matched)
{
if (player.Key.StartsWith("player_") && player.Key.EndsWith("_fighter") &&
player.Value.BoxedValue is not null)
{ {
int playerNumber = int.Parse(player.Key.Split('_')[1]); int playerNumber = int.Parse(player.Key.Split('_')[1]);
string character = SuperSmashBrosUltimate_Character(player.Value); string character = SuperSmashBrosUltimate_Character(player.Value);
int? rank = values.TryGetValue($"player_{playerNumber}_rank", out var rankValue) ? (int)rankValue.BoxedValue : null; int? rank = values.Matched.TryGetValue($"player_{playerNumber}_rank", out var rankValue)
? (int)rankValue.BoxedValue
: null;
players.Add((character, playerNumber, rank)); players.Add((character, playerNumber, rank));
} }
} }
players = players.OrderBy(p => p.Rank ?? int.MaxValue).ToList(); players = players.OrderBy(p => p.Rank ?? int.MaxValue).ToList();
string RankMedal(int? rank) => rank switch string RankMedal(int? rank) => rank switch
{ {
0 => "🥇", 0 => "🥇",
@ -318,7 +341,8 @@ namespace Ryujinx.Ava.Utilities.PlayReport
}; };
return players.Count > 4 return players.Count > 4
? $"{players.Count} Players - " + string.Join(", ", players.Take(3).Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}")) ? $"{players.Count} Players - " + string.Join(", ",
players.Take(3).Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}"))
: string.Join(", ", players.Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}")); : string.Join(", ", players.Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}"));
} }
} }