Use ultimacy calculation

codergautam · Dec 26, 2024 · 155d8f0 · 155d8f0
1 parent e2d0635
commit 155d8f0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/client/src/helpers.ts b/client/src/helpers.ts
@@ -122,10 +122,18 @@ export function addCommas(num: number) {
 
 export function calculateGemsXP(coins: number, kills: number) {
   const xp = Math.floor(coins / 20) + kills
-  return {
-    xp,
-    gems: Math.floor(xp / 5),
-    ultimacy: 1000
+  if (coins >= 1250000) {
+    return {
+      xp,
+      gems: Math.floor(xp / 5),
+      ultimacy: Math.floor((coins ** 1.3 / 3200) * 2), 
+    };
+  } else {
+    return {
+      xp,
+      gems: Math.floor(xp / 5),
+      ultimacy: Math.floor((coins ** 2.5 / 10 ** 11) * 3),
+    };
   }
 }
 

diff --git a/client/src/ui/GlobalLeaderboard.tsx b/client/src/ui/GlobalLeaderboard.tsx
@@ -186,7 +186,7 @@ function LeaderboardCard({ type, row, index }: { type: string, row: any, index:
             </>) : (
               <h5 className="mb-0">
                 {type === 'xp' && numberWithCommas(row.xp) + ' XP'}
-                {type === 'ultimacy' && numberWithCommas(row.ultimacy) + '  Ultimacy'}
+                {type === 'ultimacy' && numberWithCommas(row.ultimacy) + '  ultimacy'}
                 {type === 'total-coins' && numberWithCommas(row.coins) + ' coins'}
                 {type === 'total-kills' && numberWithCommas(row.kills) + ' stabs'}
                 {type === 'total-playtime' && secondsToTime(row.playtime) + ' played'}

diff --git a/server/src/helpers.js b/server/src/helpers.js
@@ -46,10 +46,18 @@ module.exports = {
 
  calculateGemsXP(coins, kills) {
     const xp = Math.floor(coins / 20) + kills
-    return {
-      xp,
-      gems: Math.floor(xp / 5),
-      ultimacy: 1000
+    if (coins >= 1250000) {
+      return {
+        xp,
+        gems: Math.floor(xp / 5),
+        ultimacy: Math.floor((coins ** 1.3 / 3200) * 2), 
+      };
+    } else {
+      return {
+        xp,
+        gems: Math.floor(xp / 5),
+        ultimacy: Math.floor((coins ** 2.5 / 10 ** 11) * 3),
+      };
     }
   },