From 3cde6f07ae12e1eceacd45190dce63671e5aa116 Mon Sep 17 00:00:00 2001
From: AlanMoonbase <alanmoonbase2004@gmail.com>
Date: Tue, 11 Mar 2025 22:24:45 -0700
Subject: [PATCH] revert rank up message due to buggy achievement store

---
 src/Controllers/Common/ProfileController.cs |  7 +------
 src/Services/AchievementService.cs          | 12 ------------
 src/Services/AchievementStoreSingleton.cs   |  3 +--
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/Controllers/Common/ProfileController.cs b/src/Controllers/Common/ProfileController.cs
index a6556e8..815d63a 100644
--- a/src/Controllers/Common/ProfileController.cs
+++ b/src/Controllers/Common/ProfileController.cs
@@ -121,11 +121,6 @@ public class ProfileController : Controller {
 
         if (achievementPoints != null) { playerxp = achievementPoints.Value; pointType = (AchievementPointTypes)achievementPoints.Type; }
 
-        int rank = 0;
-        rank = achievementStore.GetRankFromXP(playerxp, pointType);
-
-        if (viking.GameVersion >= ClientVersion.WoJS) rank += 1; // keep sod compatibility
-
         // Build the AvatarDisplayData
         AvatarDisplayData avatar = new AvatarDisplayData {
             AvatarData = avatarData,
@@ -154,7 +149,7 @@ public class ProfileController : Controller {
                 SubscriptionID = -3, // placeholder
                 IsActive = true, // placeholder
             },
-            RankID = rank,
+            RankID = 0,
             AchievementInfo = null, // placeholder
             Achievements = new UserAchievementInfo[] {
                 achievementService.CreateUserAchievementInfo(viking, AchievementPointTypes.PlayerXP),
diff --git a/src/Services/AchievementService.cs b/src/Services/AchievementService.cs
index 183cb1c..f5cd2c1 100644
--- a/src/Services/AchievementService.cs
+++ b/src/Services/AchievementService.cs
@@ -107,18 +107,6 @@ namespace sodoff.Services {
                     Amount = value
                 };
 
-                if(viking.GameVersion <= ClientVersion.WoJS && xpPoints.Type == (int)AchievementPointTypes.PlayerXP)
-                {
-                    int initialRank = achievementStore.GetRankFromXP(initialPoints, AchievementPointTypes.PlayerXP);
-                    int newRank = achievementStore.GetRankFromXP(xpPoints.Value, AchievementPointTypes.PlayerXP);
-                    // wojs shows level up screen when a message of type rank is posted to their message board
-                    if(newRank > initialRank)
-                    {
-                        // player leveled up, post message
-                        messagingService.AddMessageToViking(null, viking, MessageType.Data, MessageTypeID.Rank, MessageLevel.WhiteList, "[[Line3]]=[[Congratulations Jumpee, You Leveled Up!]][[Prefab]]=[[RS_DATA/PfLevelUpRoom.unity3d/PfLevelUpRoom]]", "[[Line3]]=[[Congratulations Jumpee, You Leveled Up!]][[Prefab]]=[[RS_DATA/PfLevelUpRoom.unity3d/PfLevelUpRoom]]", "[[Line3]]=[[Congratulations Jumpee, You Leveled Up!]][[Prefab]]=[[RS_DATA/PfLevelUpRoom.unity3d/PfLevelUpRoom]]", isPrivate: true);
-                    }
-                }
-
                 return achievementReward;
             }
             return null;
diff --git a/src/Services/AchievementStoreSingleton.cs b/src/Services/AchievementStoreSingleton.cs
index 4844b99..17a02f1 100644
--- a/src/Services/AchievementStoreSingleton.cs
+++ b/src/Services/AchievementStoreSingleton.cs
@@ -61,8 +61,7 @@ namespace sodoff.Services {
         }
         
         public int GetRankFromXP(int? xpPoints, AchievementPointTypes type) {
-            if (xpPoints <= 20) return ranks[type].Count(r => r.Value <= xpPoints);
-            else return ranks[type].Count(r => r.Value <= xpPoints) - 1; // i've given up
+            return ranks[type].Count(r => r.Value <= xpPoints);
         }
 
         public AchievementReward[]? GetAchievementRewardsById(int achievementID) {