From fd74052eac030a575c1f01ec5be5e441e5271eaf Mon Sep 17 00:00:00 2001 From: Miodec Date: Thu, 4 Aug 2022 23:50:55 +0200 Subject: [PATCH] updated xp scaling once more --- frontend/src/ts/elements/account-button.ts | 2 +- frontend/src/ts/utils/misc.ts | 20 ++------------------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/frontend/src/ts/elements/account-button.ts b/frontend/src/ts/elements/account-button.ts index 758361343..f64c7ce87 100644 --- a/frontend/src/ts/elements/account-button.ts +++ b/frontend/src/ts/elements/account-button.ts @@ -31,7 +31,7 @@ export async function update( discordAvatar?: string ): Promise { if (Auth.currentUser != null) { - if (xp) { + if (xp !== undefined) { $("#top #menu .level").text(Math.floor(Misc.getLevel(xp))); $("#top #menu .bar").css({ width: (Misc.getLevel(xp) % 1) * 100 + "%", diff --git a/frontend/src/ts/utils/misc.ts b/frontend/src/ts/utils/misc.ts index c95657763..23ef8f548 100644 --- a/frontend/src/ts/utils/misc.ts +++ b/frontend/src/ts/utils/misc.ts @@ -1181,27 +1181,11 @@ export async function getDiscordAvatarUrl( } export function getLevel(xp: number): number { - return ( - Math.cbrt( - 2.7891272155157822 * xp + - 1.7320508075688772 * - Math.sqrt(2.5930768747769397 * xp ** 2 + 678618.09453225) - ) / - 1.458938803353093 - - 86.87173353918234 / - Math.cbrt( - 2.7891272155157822 * xp + - 1.7320508075688772 * - Math.sqrt(2.5930768747769397 * xp ** 2 + 678618.09453225) - ) + - 0.0001 - ); + return (1 / 98) * (-151 + Math.sqrt(392 * xp + 22801)) + 1; } export function getXpForLevel(level: number): number { - return Math.ceil( - 0.556689342404 * level ** 3 + 99.4433106576 * level - 0.0001 - ); + return 49 * (level - 1) + 100; } export async function promiseAnimation(