Merge pull request #38 from zeroquinc:fix-total-points

feature: support for softcore

Author: zeroquinc

services/game.py

@@ -37,7 +37,8 @@ def __init__(self, data: dict):
         self.richpresence = data.get('RichPresencePatch', "N/A")
         self.title = data.get('Title', "N/A")
         self.total_achievements = data.get('NumAchievements', "N/A")
-        self.total_achievements_earned = data.get('NumAwardedToUserHardcore', "N/A")
+        self.total_achievements_earned_hardcore = data.get('NumAwardedToUserHardcore', "N/A")
+        self.total_achievements_earned_softcore = data.get('NumAwardedToUser', "N/A")
         self.total_players_hardcore = data.get('NumDistinctPlayersHardcore', "N/A")
         self.total_players_softcore = data.get('NumDistinctPlayersCasual', "N/A")
         self.total_points = data.get('points_total', "N/A")

src/achievements.py

@@ -112,7 +112,11 @@ def create_achievement_embed(game, user, achievement, profile, current, total):
 
 # First style of achievement embed
 def create_achievement_embed_v1(game, user, achievement, profile, current, total):
-    completion = game.total_achievements_earned - total + current
+    if achievement.mode == "Hardcore":
+        completion = game.total_achievements_earned_hardcore - total + current
+    else:  # Assuming 'softcore' as the default else case
+        completion = game.total_achievements_earned_softcore - total + current
+
     percentage = (completion / game.total_achievements) * 100
     unlock_percentage = (game.achievements[achievement.title]['NumAwardedHardcore'] / game.total_players_hardcore) * 100 if game.total_players_hardcore else 0
     most_common_color = get_discord_color(achievement.game_icon)
@@ -154,7 +158,11 @@ def create_achievement_embed_v1(game, user, achievement, profile, current, total
 
 # Second style of achievement embed
 def create_achievement_embed_v2(game, user, achievement, profile, current, total):
-    completion = game.total_achievements_earned - total + current
+    if achievement.mode == "Hardcore":
+        completion = game.total_achievements_earned_hardcore - total + current
+    else:  # Assuming 'softcore' as the default else case
+        completion = game.total_achievements_earned_softcore - total + current
+
     percentage = (completion / game.total_achievements) * 100
     unlock_percentage = (game.achievements[achievement.title]['NumAwardedHardcore'] / game.total_players_hardcore) * 100 if game.total_players_hardcore else 0
     most_common_color = get_discord_color(achievement.game_icon)

src/daily_overview.py

@@ -18,11 +18,11 @@ async def process_daily_overview(users, api_username, api_key, channel):
             profile = UserProfile(user, api_username, api_key)
             achievements = user_completion.get_achievements()
             if achievements:  # Only process if there are achievements
-                achievement_count, daily_points, daily_retropoints = count_daily_points(achievements)
+                achievement_count, daily_hardcore_points, daily_softcore_points, daily_retropoints = count_daily_points(achievements)
                 max_achievement = find_max_achievement(achievements)
                 fav_game_details = favorite_game(achievements)
-                logger.info(f"{user} has earned {achievement_count} achievements today, totaling {daily_points} points and {daily_retropoints} RetroPoints. Their favorite game is {fav_game_details[0]} with {fav_game_details[1]} achievements.")
-                embed = create_embed(profile, achievement_count, daily_points, daily_retropoints, max_achievement, *fav_game_details)
+                logger.info(f"{user} has earned {achievement_count} achievements today, totaling {daily_hardcore_points} Hardcore points, {daily_softcore_points} Softcore points and {daily_retropoints} RetroPoints. Their favorite game is {fav_game_details[0]} with {fav_game_details[1]} achievements.")
+                embed = create_embed(profile, daily_hardcore_points, daily_softcore_points, daily_retropoints, max_achievement, *fav_game_details, achievements)
                 all_embeds.append(embed)
         except Exception as e:
             logger.error(f'Error processing user {user}: {e}')
@@ -34,9 +34,17 @@ async def process_daily_overview(users, api_username, api_key, channel):
 
 def count_daily_points(achievements):
     achievement_count = len(achievements) if achievements else 0
-    daily_points = sum(achievement.points for achievement in achievements) if achievements else 0
-    daily_retropoints = sum(achievement.retropoints for achievement in achievements) if achievements else 0
-    return achievement_count, format_points(daily_points), format_points(daily_retropoints)
+
+    daily_hardcore_points = sum(a.points for a in achievements if a.mode == "Hardcore") if achievements else 0
+    daily_softcore_points = sum(a.points for a in achievements if a.mode == "Softcore") if achievements else 0
+    daily_retropoints = sum(a.retropoints for a in achievements if a.mode == "Hardcore") if achievements else 0  # No RetroPoints for Softcore
+
+    return (
+        achievement_count,
+        format_points(daily_hardcore_points),
+        format_points(daily_softcore_points),
+        format_points(daily_retropoints)
+    )
 
 def find_max_achievement(achievements):
     return max(achievements, key=lambda achievement: (achievement.points, achievement.retropoints), default=None)
@@ -57,10 +65,10 @@ def extract_favorite_game(game_counts):
     fav_details = game_counts[favorite_game]
     return favorite_game, fav_details[0], fav_details[1], fav_details[2], format_points(fav_details[3]), format_points(fav_details[4])
 
-def create_embed(profile, achievement_count, daily_points, daily_retropoints, max_achievement, fav_game, fav_game_achievements, fav_url, fav_console_name, fav_game_points, fav_game_retropoints):
+def create_embed(profile, daily_hardcore_points, daily_softcore_points, daily_retropoints, max_achievement, fav_game, fav_game_achievements, fav_url, fav_console_name, fav_game_points, fav_game_retropoints, achievements):
     embed_color = get_discord_color(max_achievement.badge_url if max_achievement else profile.profile.user_pic_unique)
     embed = discord.Embed(title='', description='', color=embed_color).set_footer(
-        text=f"Total Points: {profile.profile.total_points_format} • Total RetroPoints: {profile.profile.total_true_points_format}",
+        text=f"Hardcore Points: {profile.profile.total_points_format} • Softcore Points: {profile.profile.total_softcore_points} • Retro Points: {profile.profile.total_true_points_format}",
         icon_url=profile.profile.user_pic_unique
     ).set_author(
         name=f"Daily Overview for {profile.profile.user}",
@@ -69,15 +77,42 @@ def create_embed(profile, achievement_count, daily_points, daily_retropoints, ma
         url=DISCORD_IMAGE
     )
     if max_achievement:
+        hardcore_count = sum(1 for a in achievements if a.mode == "Hardcore")
+        softcore_count = sum(1 for a in achievements if a.mode == "Softcore")
+
+        achievement_mode_text = f"[{profile.profile.user}]({profile.profile.user_url}) has earned "
+        if hardcore_count > 0 and softcore_count > 0:
+            achievement_mode_text += f"{softcore_count} softcore achievement{'s' if softcore_count != 1 else ''} and {hardcore_count} hardcore achievement{'s' if hardcore_count != 1 else ''} today.\n\n"
+        elif hardcore_count > 0:
+            achievement_mode_text += f"{hardcore_count} hardcore achievement{'s' if hardcore_count != 1 else ''} today.\n\n"
+        elif softcore_count > 0:
+            achievement_mode_text += f"{softcore_count} softcore achievement{'s' if softcore_count != 1 else ''} today.\n\n"
+
         embed.set_thumbnail(url=max_achievement.badge_url)
         embed.description = (
-            f"[{profile.profile.user}]({profile.profile.user_url}) has earned **{achievement_count}** achievements today.\n\n"
+            f"{achievement_mode_text}"
             f"[{fav_game}]({fav_url}) ({fav_console_name}) is the game with the most earned **({fav_game_achievements})** achievements today.\n"
-            f"**{fav_game_points}** Points and **{fav_game_retropoints}** RetroPoints.\n\n"
+        )
+        if daily_hardcore_points != "0":
+            embed.description += f"**{fav_game_points}** Hardcore Points and **{fav_game_retropoints}** Retro Points.\n\n"
+        else:
+            embed.description += f"**{fav_game_points}** Softcore Points.\n\n"
+
+        embed.description += (
             f"[{max_achievement.title}]({max_achievement.url}) from [{max_achievement.game_title}]({max_achievement.game_url}) ({max_achievement.remap_console_name()}) is the top achievement of the day.\n"
-            f"**{max_achievement.points}** Points and **{max_achievement.retropoints_format}** RetroPoints.\n\n"
-            f"***{daily_points}** Points and **{daily_retropoints}** RetroPoints have been earned in total today.*"
         )
+        if max_achievement.mode == "Hardcore":
+            embed.description += f"**{max_achievement.points}** Hardcore Points and **{max_achievement.retropoints_format}** Retro Points.\n\n"
+        else:
+            embed.description += f"**{max_achievement.points}** Hardcore Points.\n\n"
+
+        if daily_hardcore_points != "0":
+            embed.description += f"***{daily_hardcore_points}** Hardcore Points and **{daily_retropoints}** Retro Points have been earned in total today.*"
+        elif daily_softcore_points != "0":
+            embed.description += f"***{daily_softcore_points}** Softcore Points have been earned in total today.*"
+        else:
+            embed.description += "***0** Points have been earned in total today.*"
+
     else:
         embed.description = 'Nothing has been earned today.'
     return embed