From 91764fd28ff15bde93fb9cff73d72f6e5d5072b9 Mon Sep 17 00:00:00 2001
From: LillyJadeKatrin <lilly.kitty.1988@gmail.com>
Date: Sat, 4 May 2024 11:06:25 -0400
Subject: [PATCH] Retooled Achievements Welcome Message

The "welcome message" that shows up to players when a game starts up and Achievements are active will now either tell the player upon load that there's no support for achievements, or will wait until the first attempt to load the game's badge either succeeds or fails and then display a full message with title and progress and status. This is in part facilitated by a boolean field for when to display a welcome message, set to true upon loading and to false upon a message being displayed.
---
 Source/Core/Core/AchievementManager.cpp | 23 ++++++++++++++---------
 Source/Core/Core/AchievementManager.h   |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Source/Core/Core/AchievementManager.cpp b/Source/Core/Core/AchievementManager.cpp
index 2c4241498d..c1b7e92c58 100644
--- a/Source/Core/Core/AchievementManager.cpp
+++ b/Source/Core/Core/AchievementManager.cpp
@@ -215,14 +215,6 @@ void AchievementManager::DoFrame()
 {
   if (!IsGameLoaded() || !Core::IsCPUThread())
     return;
-  if (m_framecount == 0x200)
-  {
-    DisplayWelcomeMessage();
-  }
-  if (m_framecount <= 0x200)
-  {
-    m_framecount++;
-  }
   {
     std::lock_guard lg{m_lock};
     rc_client_do_frame(m_client);
@@ -593,6 +585,8 @@ void AchievementManager::LoadGameCallback(int result, const char* error_message,
   if (result != RC_OK)
   {
     WARN_LOG_FMT(ACHIEVEMENTS, "Failed to load data for current game.");
+    OSD::AddMessage("Achievements are not supported for this title.", OSD::Duration::VERY_LONG,
+                    OSD::Color::RED);
     return;
   }
 
@@ -600,10 +594,13 @@ void AchievementManager::LoadGameCallback(int result, const char* error_message,
   if (!game)
   {
     ERROR_LOG_FMT(ACHIEVEMENTS, "Failed to retrieve game information from client.");
+    OSD::AddMessage("Failed to load achievements for this title.", OSD::Duration::VERY_LONG,
+                    OSD::Color::RED);
     return;
   }
   INFO_LOG_FMT(ACHIEVEMENTS, "Loaded data for game ID {}.", game->id);
 
+  AchievementManager::GetInstance().m_display_welcome_message = true;
   AchievementManager::GetInstance().FetchGameBadges();
   AchievementManager::GetInstance().m_system = &Core::System::GetInstance();
   AchievementManager::GetInstance().m_update_callback({.all = true});
@@ -634,9 +631,10 @@ void AchievementManager::ChangeMediaCallback(int result, const char* error_messa
 void AchievementManager::DisplayWelcomeMessage()
 {
   std::lock_guard lg{m_lock};
+  m_display_welcome_message = false;
   const u32 color =
       rc_client_get_hardcore_enabled(m_client) ? OSD::Color::YELLOW : OSD::Color::CYAN;
-  if (Config::Get(Config::RA_BADGES_ENABLED))
+  if (Config::Get(Config::RA_BADGES_ENABLED) && !m_game_badge.name.empty())
   {
     OSD::AddMessage("", OSD::Duration::VERY_LONG, OSD::Color::GREEN,
                     DecodeBadgeToOSDIcon(m_game_badge.badge));
@@ -882,11 +880,18 @@ void AchievementManager::FetchBadge(AchievementManager::BadgeStatus* badge, u32
   if (!m_client || !HasAPIToken() || !Config::Get(Config::RA_BADGES_ENABLED))
   {
     m_update_callback(callback_data);
+    if (m_display_welcome_message && badge_type == RC_IMAGE_TYPE_GAME)
+      DisplayWelcomeMessage();
     return;
   }
 
   m_image_queue.EmplaceItem([this, badge, badge_type, function = std::move(function),
                              callback_data = std::move(callback_data)] {
+    Common::ScopeGuard on_end_scope([&]() {
+      if (m_display_welcome_message && badge_type == RC_IMAGE_TYPE_GAME)
+        DisplayWelcomeMessage();
+    });
+
     std::string name_to_fetch;
     {
       std::lock_guard lg{m_lock};
diff --git a/Source/Core/Core/AchievementManager.h b/Source/Core/Core/AchievementManager.h
index 757daeb86d..5d133e023f 100644
--- a/Source/Core/Core/AchievementManager.h
+++ b/Source/Core/Core/AchievementManager.h
@@ -192,8 +192,8 @@ private:
   u32 m_game_id = 0;
   rc_api_fetch_game_data_response_t m_game_data{};
   bool m_is_game_loaded = false;
-  u32 m_framecount = 0;
   BadgeStatus m_game_badge;
+  bool m_display_welcome_message = false;
   std::unordered_map<AchievementId, BadgeStatus> m_unlocked_badges;
   std::unordered_map<AchievementId, BadgeStatus> m_locked_badges;
   RichPresence m_rich_presence;