diff --git a/src/cli/splatnet3/friends.ts b/src/cli/splatnet3/friends.ts index 0c340c6..107251e 100644 --- a/src/cli/splatnet3/friends.ts +++ b/src/cli/splatnet3/friends.ts @@ -106,6 +106,7 @@ function getVsModeDescription(vs_mode: {id: string; mode: string;} | null) { if (vs_mode.mode === 'BANKARA') return 'Anarchy Battle'; if (vs_mode.id === 'VnNNb2RlLTY=') return 'Splatfest Battle (Open)'; // VsMode-6 if (vs_mode.id === 'VnNNb2RlLTc=') return 'Splatfest Battle (Pro)'; // VsMode-7 + if (vs_mode.id === 'VnNNb2RlLTg=') return 'Tricolour Battle'; // VsMode-8 if (vs_mode.mode === 'FEST') return 'Splatfest Battle'; if (vs_mode.mode === 'LEAGUE') return 'League Battle'; if (vs_mode.mode === 'X_MATCH') return 'X Battle'; diff --git a/src/discord/titles/nintendo/splatoon3.ts b/src/discord/titles/nintendo/splatoon3.ts index 2bd9166..ed88e50 100644 --- a/src/discord/titles/nintendo/splatoon3.ts +++ b/src/discord/titles/nintendo/splatoon3.ts @@ -258,6 +258,7 @@ export function callback(activity: DiscordRPC.Presence, game: Game, context?: Di friend.vsMode.mode === 'BANKARA' ? 'Anarchy Battle' : friend.vsMode.id === 'VnNNb2RlLTY=' ? 'Splatfest Battle (Open)' : // VsMode-6 friend.vsMode.id === 'VnNNb2RlLTc=' ? 'Splatfest Battle (Pro)' : // VsMode-7 + friend.vsMode.id === 'VnNNb2RlLTg=' ? 'Tricolour Battle' : // VsMode-8 friend.vsMode.mode === 'FEST' ? 'Splatfest Battle' : friend.vsMode.mode === 'LEAGUE' ? 'League Battle' : friend.vsMode.mode === 'X_MATCH' ? 'X Battle' : @@ -290,10 +291,9 @@ export function callback(activity: DiscordRPC.Presence, game: Game, context?: Di // In the second half the player may be in a Tricolour battle if either: // the player is on the defending team and joins Splatfest Battle (Open) or // the player is on the attacking team and joins Tricolour Battle - const possibly_tricolour = fest && new Date(fest.midtermTime).getTime() <= Date.now() && ( - false - // (friend.vsMode?.id === 'VnNNb2RlLTY=' && fest_team?.role === FestTeamRole.DEFENSE) || - // (friend.vsMode?.id === '... tricolour mode ID ...') + const possibly_tricolour = fest?.state === FestState.SECOND_HALF && ( + (friend.vsMode?.id === 'VnNNb2RlLTY=' && fest_team?.role === FestTeamRole.DEFENSE) || + (friend.vsMode?.id === 'VnNNb2RlLTg=') ); activity.largeImageKey = 'https://fancy.org.uk/api/nxapi/s3/image?' + new URLSearchParams({