diff --git a/src/ImportExport.ts b/src/ImportExport.ts index 195ccbc53..1ad8093eb 100644 --- a/src/ImportExport.ts +++ b/src/ImportExport.ts @@ -620,13 +620,31 @@ export const promocodes = async (input: string | null, amount?: number) => { } if (player.highestSingularityCount >= 200 && player.highestSingularityCount < 205) { - const freeLevelOct1 = Math.max(player.octeractUpgrades.octeractGain.level / 100, Math.pow(player.octeractUpgrades.octeractGain.level * player.octeractUpgrades.octeractGain.freeLevels / 100, 0.5)) + const freeLevelOct1 = Math.max( + player.octeractUpgrades.octeractGain.level / 100, + Math.pow( + player.octeractUpgrades.octeractGain.level * player.octeractUpgrades.octeractGain.freeLevels / 100, + 0.5 + ) + ) player.octeractUpgrades.octeractGain.freeLevels += freeLevelOct1 freeLevels.octeractGain = freeLevelOct1 - } - else if (player.highestSingularityCount >= 205) { - const freeLevelOct1 = Math.max(player.octeractUpgrades.octeractGain.level / 100, Math.pow(player.octeractUpgrades.octeractGain.level * player.octeractUpgrades.octeractGain.freeLevels / 50, 0.5)) - const freeLevelOct2 = Math.max(player.octeractUpgrades.octeractGain2.level / 100, Math.pow(Math.pow(player.octeractUpgrades.octeractGain2.level, 2) * player.octeractUpgrades.octeractGain2.freeLevels / 125, 0.333)) + } else if (player.highestSingularityCount >= 205) { + const freeLevelOct1 = Math.max( + player.octeractUpgrades.octeractGain.level / 100, + Math.pow( + player.octeractUpgrades.octeractGain.level * player.octeractUpgrades.octeractGain.freeLevels / 50, + 0.5 + ) + ) + const freeLevelOct2 = Math.max( + player.octeractUpgrades.octeractGain2.level / 100, + Math.pow( + Math.pow(player.octeractUpgrades.octeractGain2.level, 2) * player.octeractUpgrades.octeractGain2.freeLevels + / 125, + 0.333 + ) + ) player.octeractUpgrades.octeractGain.freeLevels += freeLevelOct1 player.octeractUpgrades.octeractGain2.freeLevels += freeLevelOct2 diff --git a/src/Login.ts b/src/Login.ts index 655ebd856..57e505e8c 100644 --- a/src/Login.ts +++ b/src/Login.ts @@ -79,7 +79,7 @@ export async function handleLogin () { if (location.hostname !== 'synergism.cc') { // TODO: better error, make link clickable, etc. subtabElement.textContent = 'Login is not available here, go to https://synergism.cc instead!' - } else if (document.cookie.length) { + } else if (Object.keys(parseDocumentCookie()).length === 0) { if (!member) { console.log(response, globalBonus, member, personalBonus, document.cookie) } @@ -200,3 +200,13 @@ async function saveToCloud () { return } } + +function parseDocumentCookie () { + return document.cookie.split(';').reduce((obj, item) => { + if (!item.includes('=')) return obj + + const split = item.split('=') + obj[split[0]] = split[1] + return obj + }, {} as Record) +}