diff --git a/src/core/achievements.cpp b/src/core/achievements.cpp index 70b081517..6f3e2c37e 100644 --- a/src/core/achievements.cpp +++ b/src/core/achievements.cpp @@ -2122,7 +2122,7 @@ void Achievements::FinishLogin() if (g_settings.achievements_notifications) { //: Summary for login notification. - std::string summary = fmt::format(TRANSLATE_FS("Achievements", "Score: {} ({} softcore)\nUnread messages: {}"), + std::string summary = fmt::format(TRANSLATE_FS("Achievements", "Score: {} ({} casual)\nUnread messages: {}"), user->score, user->score_softcore, user->num_unread_messages); FullscreenUI::AddAchievementNotification("achievements_login", LOGIN_NOTIFICATION_TIME, @@ -2150,7 +2150,7 @@ SmallString Achievements::GetLoggedInUserPointsSummary() return ret; //: Score summary, shown in Big Picture mode. - ret.format(TRANSLATE_FS("Achievements", "Score: {} ({} softcore)"), user->score, user->score_softcore); + ret.format(TRANSLATE_FS("Achievements", "Score: {} ({} casual)"), user->score, user->score_softcore); return ret; } diff --git a/src/core/achievements.h b/src/core/achievements.h index fdb8c60a7..b11568cb1 100644 --- a/src/core/achievements.h +++ b/src/core/achievements.h @@ -204,7 +204,7 @@ namespace Host { void OnAchievementsLoginRequested(Achievements::LoginRequestReason reason); /// Called when achievements login completes. -void OnAchievementsLoginSuccess(const char* display_name, u32 points, u32 sc_points, u32 unread_messages); +void OnAchievementsLoginSuccess(const char* display_name, u32 points, u32 casual_points, u32 unread_messages); /// Called when achievements login completes or they are disabled. void OnAchievementsActiveChanged(bool active); diff --git a/src/core/fullscreenui_achievements.cpp b/src/core/fullscreenui_achievements.cpp index 9926077ad..f5bdf1c2b 100644 --- a/src/core/fullscreenui_achievements.cpp +++ b/src/core/fullscreenui_achievements.cpp @@ -2078,7 +2078,7 @@ void FullscreenUI::DrawAchievementsWindow() {ICON_FA_HAND_FIST, TRANSLATE_NOOP("Achievements", "Active Challenges")}, {ICON_FA_FLAG_CHECKERED, TRANSLATE_NOOP("Achievements", "Almost There")}, {ICON_EMOJI_WARNING, TRANSLATE_NOOP("Achievements", "Not Confirmed")}, - {ICON_FA_UNLOCK, TRANSLATE_NOOP("Achievements", "Unlocked in Softcore")}, + {ICON_FA_UNLOCK, TRANSLATE_NOOP("Achievements", "Unlocked in Casual")}, }; static_assert(std::size(bucket_names) == NUM_RC_CLIENT_ACHIEVEMENT_BUCKETS); diff --git a/src/duckstation-qt/mainwindow.cpp b/src/duckstation-qt/mainwindow.cpp index 0ba7228d7..41b196df8 100644 --- a/src/duckstation-qt/mainwindow.cpp +++ b/src/duckstation-qt/mainwindow.cpp @@ -3320,13 +3320,13 @@ void MainWindow::onAchievementsLoginRequested(Achievements::LoginRequestReason r dlg->open(); } -void MainWindow::onAchievementsLoginSuccess(const QString& username, quint32 points, quint32 sc_points, +void MainWindow::onAchievementsLoginSuccess(const QString& username, quint32 points, quint32 casual_points, quint32 unread_messages) { - m_ui.statusBar->showMessage(tr("RA: Logged in as %1 (%2, %3 softcore). %4 unread messages.") + m_ui.statusBar->showMessage(tr("RA: Logged in as %1 (%2, %3 casual). %4 unread messages.") .arg(username) .arg(points) - .arg(sc_points) + .arg(casual_points) .arg(unread_messages)); // Automatically show the achievements column after first login. If the user has manually hidden it, diff --git a/src/duckstation-qt/mainwindow.h b/src/duckstation-qt/mainwindow.h index 5c6e56070..4b40228e5 100644 --- a/src/duckstation-qt/mainwindow.h +++ b/src/duckstation-qt/mainwindow.h @@ -249,7 +249,7 @@ private: void onMediaCaptureStarted(MediaCaptureMode mode); void onMediaCaptureStopped(); void onAchievementsLoginRequested(Achievements::LoginRequestReason reason); - void onAchievementsLoginSuccess(const QString& username, quint32 points, quint32 sc_points, quint32 unread_messages); + void onAchievementsLoginSuccess(const QString& username, quint32 points, quint32 casual_points, quint32 unread_messages); void onAchievementsActiveChanged(bool active); void onAchievementsHardcoreModeChanged(bool enabled); bool onCreateAuxiliaryRenderWindow(RenderAPI render_api, qint32 x, qint32 y, quint32 width, quint32 height, diff --git a/src/duckstation-qt/qthost.cpp b/src/duckstation-qt/qthost.cpp index 5762a2704..c897222db 100644 --- a/src/duckstation-qt/qthost.cpp +++ b/src/duckstation-qt/qthost.cpp @@ -1978,9 +1978,9 @@ void Host::OnAchievementsLoginRequested(Achievements::LoginRequestReason reason) emit g_core_thread->achievementsLoginRequested(reason); } -void Host::OnAchievementsLoginSuccess(const char* username, u32 points, u32 sc_points, u32 unread_messages) +void Host::OnAchievementsLoginSuccess(const char* username, u32 points, u32 casual_points, u32 unread_messages) { - emit g_core_thread->achievementsLoginSuccess(QString::fromUtf8(username), points, sc_points, unread_messages); + emit g_core_thread->achievementsLoginSuccess(QString::fromUtf8(username), points, casual_points, unread_messages); } void Host::OnAchievementsActiveChanged(bool active) diff --git a/src/duckstation-qt/qthost.h b/src/duckstation-qt/qthost.h index 666b9d67b..0556d73bb 100644 --- a/src/duckstation-qt/qthost.h +++ b/src/duckstation-qt/qthost.h @@ -123,7 +123,7 @@ Q_SIGNALS: void mouseModeRequested(bool relative, bool hide_cursor, bool ignore_double_click); void fullscreenUIStartedOrStopped(bool running); void achievementsLoginRequested(Achievements::LoginRequestReason reason); - void achievementsLoginSuccess(const QString& username, quint32 points, quint32 sc_points, quint32 unread_messages); + void achievementsLoginSuccess(const QString& username, quint32 points, quint32 casual_points, quint32 unread_messages); void achievementsActiveChanged(bool active); void achievementsHardcoreModeChanged(bool enabled); void mediaCaptureStarted(MediaCaptureMode mode); diff --git a/src/duckstation-regtest/regtest_host.cpp b/src/duckstation-regtest/regtest_host.cpp index f0d6ad5cf..1568f7435 100644 --- a/src/duckstation-regtest/regtest_host.cpp +++ b/src/duckstation-regtest/regtest_host.cpp @@ -600,7 +600,7 @@ std::string Host::FormatNumber(NumberFormatType type, double value) void Host::SetMouseMode(bool relative, bool hide_cursor) { - // + // noop } void Host::OnAchievementsLoginRequested(Achievements::LoginRequestReason reason) @@ -608,7 +608,7 @@ void Host::OnAchievementsLoginRequested(Achievements::LoginRequestReason reason) // noop } -void Host::OnAchievementsLoginSuccess(const char* username, u32 points, u32 sc_points, u32 unread_messages) +void Host::OnAchievementsLoginSuccess(const char* username, u32 points, u32 casual_points, u32 unread_messages) { // noop }