Skip to content

fix(recap): if player plays both hardcore and softcore, check both for rarest achievement #4369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jamiras merged 2 commits into from
Jan 9, 2026
Merged

fix(recap): if player plays both hardcore and softcore, check both for rarest achievement #4369

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b682c8
if player plays both hardcore and softcore, check both for rarest ach…
Jamiras Jan 5, 2026
6cf01d5
Merge branch 'master' into bugfix/recap_mixedcore_rarity
Jamiras Jan 9, 2026
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
73 changes: 38 additions & 35 deletions app/Community/Actions/GenerateAnnualRecapAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,46 +441,49 @@ private function determineRarestAchievement(array &$recapData, User $user, array

private function getRarestAchievement(array $gameIds, User $user, Carbon $startDate, Carbon $endDate): array
{
$result = [
'rarestHardcoreAchievement' => null,
'rarestHardcoreAchievementEarnRate' => 0.0,
'rarestSoftcoreAchievement' => null,
'rarestSoftcoreAchievementEarnRate' => 0.0,
];

$rarestHardcoreAchievement = PlayerAchievement::where(DB::raw('player_achievements.user_id'), $user->id)
->where('unlocked_hardcore_at', '>=', $startDate)
->where('unlocked_hardcore_at', '<', $endDate)
->join('achievements', 'achievements.id', '=', 'player_achievements.achievement_id')
->join('games', 'games.id', '=', 'achievements.game_id')
->whereIn('achievements.game_id', $gameIds)
->where(DB::raw('achievements.is_promoted'), true)
->select('achievements.id', DB::raw('achievements.unlocks_hardcore/games.players_total as EarnRate'))
->orderBy('EarnRate')
->first();
if ($rarestHardcoreAchievement) {
$result['rarestHardcoreAchievement'] = Achievement::find($rarestHardcoreAchievement->id);
$result['rarestHardcoreAchievementEarnRate'] = sprintf("%01.2f", $rarestHardcoreAchievement->EarnRate * 100);
$rarestHardcoreAchievement = null;
if ($user->points_hardcore > 0) {
$rarestHardcoreAchievement = PlayerAchievement::where(DB::raw('player_achievements.user_id'), $user->id)
->where('unlocked_hardcore_at', '>=', $startDate)
->where('unlocked_hardcore_at', '<', $endDate)
->join('achievements', 'achievements.id', '=', 'player_achievements.achievement_id')
->join('games', 'games.id', '=', 'achievements.game_id')
->whereIn('achievements.game_id', $gameIds)
->where(DB::raw('achievements.is_promoted'), true)
->select('achievements.id', DB::raw('achievements.unlocks_hardcore/games.players_total as EarnRate'))
->orderBy('EarnRate')
->first();
}

return $result; // only report rarest hardcore achievement if one was found
$rarestSoftcoreAchievement = null;
if ($user->points > 0) {
$rarestSoftcoreAchievement = PlayerAchievement::where(DB::raw('player_achievements.user_id'), $user->id)
->where('unlocked_at', '>=', $startDate)
->where('unlocked_at', '<', $endDate)
->join('achievements', 'achievements.id', '=', 'player_achievements.achievement_id')
->join('games', 'games.id', '=', 'achievements.game_id')
->whereIn('achievements.game_id', $gameIds)
->where(DB::raw('achievements.is_promoted'), true)
->select('achievements.id', DB::raw('achievements.unlocks_total/games.players_total as EarnRate'))
->orderBy('EarnRate')
->first();
}

$rarestSoftcoreAchievement = PlayerAchievement::where(DB::raw('player_achievements.user_id'), $user->id)
->where('unlocked_at', '>=', $startDate)
->where('unlocked_at', '<', $endDate)
->join('achievements', 'achievements.id', '=', 'player_achievements.achievement_id')
->join('games', 'games.id', '=', 'achievements.game_id')
->whereIn('achievements.game_id', $gameIds)
->where(DB::raw('achievements.is_promoted'), true)
->select('achievements.id', DB::raw('achievements.unlocks_total/games.players_total as EarnRate'))
->orderBy('EarnRate')
->first();
if ($rarestSoftcoreAchievement) {
$result['rarestSoftcoreAchievement'] = Achievement::find($rarestSoftcoreAchievement->id);
$result['rarestSoftcoreAchievementEarnRate'] = sprintf("%01.2f", $rarestSoftcoreAchievement->EarnRate * 100);
// only keep the most rare achievement (regardless of softcore vs hardcore)
if ($rarestHardcoreAchievement && $rarestSoftcoreAchievement) {
if ($rarestHardcoreAchievement->EarnRate < $rarestSoftcoreAchievement->EarnRate) {
$rarestSoftcoreAchievement = null;
} else {
$rarestHardcoreAchievement = null;
}
}

return $result;
return [
'rarestHardcoreAchievement' => $rarestHardcoreAchievement ? Achievement::find($rarestHardcoreAchievement->id) : null,
'rarestHardcoreAchievementEarnRate' => $rarestHardcoreAchievement ? sprintf("%01.2f", $rarestHardcoreAchievement->EarnRate * 100) : 0.0,
'rarestSoftcoreAchievement' => $rarestSoftcoreAchievement ? Achievement::find($rarestSoftcoreAchievement->id) : null,
'rarestSoftcoreAchievementEarnRate' => $rarestSoftcoreAchievement ? sprintf("%01.2f", $rarestSoftcoreAchievement->EarnRate * 100) : 0.0,
];
}

private function determineRarestSubsetAchievement(array &$recapData, User $user, array $subsetGameIds, Carbon $startDate, Carbon $endDate): void
Expand Down