Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Pictures/Legacy/CubeUpgrade16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Legacy/CubeUpgrade2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Legacy/CubeUpgrade37.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Legacy/CubeUpgrade47.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Legacy/CubeUpgrade49.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Legacy/Research110.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Legacy/Research148.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Legacy/Research169.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Monotonous/CubeUpgrade16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Monotonous/CubeUpgrade2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Monotonous/CubeUpgrade37.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Monotonous/CubeUpgrade47.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Monotonous/CubeUpgrade49.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Monotonous/Research110.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Monotonous/Research148.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Monotonous/Research169.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/PseudoShop/REBORN_ELO_BUFF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Simplified/CubeUpgrade16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Simplified/CubeUpgrade2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Simplified/CubeUpgrade37.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Simplified/CubeUpgrade47.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Simplified/CubeUpgrade49.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Simplified/Research110.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Simplified/Research148.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Simplified/Research169.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 66 additions & 3 deletions Synergism.css
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,15 @@ body button:active:not(:disabled):not(.disable-hover-color) {
animation-fill-mode: forwards;
}

.iconAndNameContainer {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
gap: 10px;
padding: 10px;
}

#notification > p {
position: fixed;
top: 50%;
Expand Down Expand Up @@ -2601,6 +2610,32 @@ p#reincarnatehotkeys {
margin: 0;
}

#lotusCorner {
border: 2px solid pink;
width: 66%;
justify-self: center;
}

#lotusCorner p {
margin: 0;
}

#lotusButtons {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
width: 100%;
}

#use-lotus {
border: 2px solid pink;
width: 50%;
height: 30px;
}



#antSacrificeObtainiumOfferings,
#antSacrificeShardsRow1,
#antSacrificeShardsRow2 {
Expand Down Expand Up @@ -4488,6 +4523,16 @@ header #obtainiumDisplay { color: pink; }
--gradient-end: lightgoldenrodyellow;
}

.bellGradient {
--gradient-start: gold;
--gradient-end: darkgoldenrod;
}

.lotusGradient {
--gradient-start: purple;
--gradient-end: pink;
}

.singularityUpgrade > img,
.octeractUpgrade > img,
.singularityChallenge img {
Expand Down Expand Up @@ -5446,6 +5491,7 @@ form input:hover {
border: 2px solid var(--amber-text-color);
padding: 5px;
box-sizing: border-box;
width: 50%;
}

.consumablePurchaseBtn {
Expand All @@ -5463,16 +5509,15 @@ form input:hover {
flex-direction: row;
justify-content: center;
align-items: center;
margin: 0 auto;
width: 100%;
}

.timeSkipContainer {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
margin: 0;
width: 33%;
width: 33.333%;
height: 30%;
}

Expand All @@ -5485,6 +5530,24 @@ form input:hover {
padding: 0;
}

#topRowConsumables {
display: flex;
flex-direction: row;
width: 100%;
}

.lotusHeaderText {
text-align: center;
}

.lotusHeaderText p {
margin: 0;
}

.lotusContainer {
border: 2px solid pink !important;
}

/* Cost text */
#consumablesGrid > div > button > :nth-child(2) {
color: var(--amber-text-color);
Expand Down
20 changes: 20 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1813,6 +1813,26 @@ <h3 class="reincarnationunlock" id="reincarnationtext" style="color: limegreen"
<p id="eloStageTranche4" i18n="ants.stageTranche4"></p>
<p id="eloStageTranche5" i18n="ants.stageTranche5"></p>
</div>
<br>
<div id="lotusCorner">
<div id="lotusNameIcon">
<div class="iconAndNameContainer">
<img src="Pictures/PseudoShop/LOTUS.png">
<p class="gradientText lotusGradient" i18n="pseudoCoins.lotus.nameSingular"></p>
</div>
<p i18n="pseudoCoins.lotus.boxText1"></p>
<p i18n="pseudoCoins.lotus.boxText2"></p>
<p i18n="pseudoCoins.lotus.boxText3"></p>
<br>
<p id="lotusOwnedAnt"></p>
<p id="lotusStatus"></p>
<div id="lotusButtons">
<button id="use-lotus" i18n="pseudoCoins.lotus.useLotus"></button>
<button class="consumableButton" i18n="pseudoCoins.consumables.consumableButton"></button>
</div>
</div>
<p id="lotusInformation"></p>
</div>
</div>
<div id="altar" class="sacrificeAntsContainer">
<p style="font-size: 1.3em" i18n="ants.altar.titles.altar"></p>
Expand Down
13 changes: 1 addition & 12 deletions src/Calculate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { calculateAscensionScorePlatonicBlessing } from './PlatonicCubes'
import { PCoinUpgradeEffects } from './PseudoCoinUpgrades'
import { quarkHandler } from './Quark'
import { getRedAmbrosiaUpgradeEffects } from './RedAmbrosiaUpgrades'
import { reset, updatePrestigeCount, updateReincarnationCount, updateTranscensionCount } from './Reset'
import { updatePrestigeCount, updateReincarnationCount, updateTranscensionCount } from './Reset'
import { getRuneEffects, sumOfRuneLevels } from './Runes'
import { getGQUpgradeEffect } from './singularity'
import {
Expand Down Expand Up @@ -802,17 +802,6 @@ export const calculateOffline = (forceTime = 0, fromTips = false) => {
)

player.offlinetick = updatedTime
if (!player.loadedNov13Vers) {
if (
player.challengecompletions[14] > 0
|| player.highestchallengecompletions[14] > 0
) {
const ascCount = player.ascensionCount
reset('ascensionChallenge')
player.ascensionCount = ascCount + 1
}
player.loadedNov13Vers = true
}

saveSynergy()

Expand Down
4 changes: 2 additions & 2 deletions src/Event.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { allDurableConsumables, type PseudoCoinConsumableNames } from './Login'
import { getGQUpgradeEffect } from './singularity'
import { getTimePinnedToLoadDate, player } from './Synergism'
import { revealStuff } from './UpdateHTML'
import { timeReminingHours } from './Utility'
import { timeRemainingHours } from './Utility'
import { Globals as G } from './Variables'

export enum BuffType {
Expand Down Expand Up @@ -69,7 +69,7 @@ export const eventCheck = async () => {
}

const eventNowEndDate = new Date(nowEvent?.end ?? 0)
DOMCacheGetOrSet('globalEventTimer').textContent = timeReminingHours(eventNowEndDate)
DOMCacheGetOrSet('globalEventTimer').textContent = timeRemainingHours(eventNowEndDate)

const updateIsEventCheck = G.isEvent

Expand Down
29 changes: 28 additions & 1 deletion src/EventListeners.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ import {
resetGame,
updateSaveString
} from './ImportExport'
import { exitFastForward, getTips, sendToWebsocket, setTips } from './Login'
import { exitFastForward, getLotusTimeExpiresAt, getOwnedLotus, getTips, sendToWebsocket, setTips } from './Login'
import {
buyOcteractUpgradeLevel,
type OcteractDataKeys,
Expand Down Expand Up @@ -184,6 +184,7 @@ import {
} from './Toggles'
import type { FirstToEighth, FirstToFifth, OneToFive, Player } from './types/Synergism'
import {
Alert,
closeChangelog,
CloseModal,
Confirm,
Expand Down Expand Up @@ -895,6 +896,32 @@ export const generateEventHandlers = () => {
updateOnlySacrificeMaxRebornELOToggle(player.ants.toggles.onlySacrificeMaxRebornELO)
})

document.getElementById('use-lotus')?.addEventListener('click', () => {
const timeNow = Date.now()
const lotusTime = getLotusTimeExpiresAt()
let extraHTML = ''
if (lotusTime !== undefined && timeNow < lotusTime) {
extraHTML = `${i18next.t('pseudoCoins.lotus.useConfirmMulti')}`
}
Confirm(`${i18next.t('pseudoCoins.lotus.useConfirm')} ${extraHTML}`)
.then((bool) => {
if (!bool) {
return
}

if (getOwnedLotus() < 1) {
return Alert(i18next.t('pseudoCoins.lotus.noLotus'))
}

sendToWebsocket(
JSON.stringify({
type: 'applied-lotus',
amount: 1
})
)
})
})

// Part 3.5: Leaderboard
DOMCacheGetOrSet('antLeaderboardToggle').addEventListener('click', () => toggleLeaderboardMode())
DOMCacheGetOrSet('antLeaderboardValueAmount').addEventListener('mousemove', (e: MouseEvent) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { getLotusTimeExpiresAt } from '../../../../../../../Login'
import { player } from '../../../../../../../Synergism'
import { availableQuarksFromELO } from '../QuarkCorner/lib/calculate-quarks'
import { updateAntLeaderboards } from '../QuarkCorner/lib/leaderboard-update'
Expand All @@ -7,22 +8,29 @@ import { calculateAvailableRebornELO, rebornELOCreationSpeedMult } from './calcu
export const activateELO = (dt: number) => {
const toActivate = calculateAvailableRebornELO()
if (toActivate > 0) {
const limit = player.ants.immortalELO - player.ants.rebornELO
const gain = Math.min(limit, dt * rebornELOCreationSpeedMult())
let stages = calculateRebornELOThresholds(player.ants.rebornELO)
let ELOToNextThreshold = calculateToNextELOThreshold(player.ants.rebornELO, stages)
let budget = gain
const time = Date.now()
// Lotus is active.
const lotusTimeExpiresAt = getLotusTimeExpiresAt()
if (lotusTimeExpiresAt !== undefined && time < lotusTimeExpiresAt) {
player.ants.rebornELO = player.ants.immortalELO
} else {
const limit = player.ants.immortalELO - player.ants.rebornELO
const gain = Math.min(limit, dt * rebornELOCreationSpeedMult())
let stages = calculateRebornELOThresholds(player.ants.rebornELO)
let ELOToNextThreshold = calculateToNextELOThreshold(player.ants.rebornELO, stages)
let budget = gain

while (budget >= ELOToNextThreshold) {
player.ants.rebornELO += ELOToNextThreshold
budget -= ELOToNextThreshold
budget /= 1.02 // Each threshold makes further ELO harder to gain
stages++
ELOToNextThreshold = calculateToNextELOThreshold(player.ants.rebornELO, stages)
}
while (budget >= ELOToNextThreshold) {
player.ants.rebornELO += ELOToNextThreshold
budget -= ELOToNextThreshold
budget /= 1.02 // Each threshold makes further ELO harder to gain
stages++
ELOToNextThreshold = calculateToNextELOThreshold(player.ants.rebornELO, stages)
}

player.ants.rebornELO += budget
player.ants.rebornELO = Math.min(player.ants.rebornELO, player.ants.immortalELO)
player.ants.rebornELO += budget
player.ants.rebornELO = Math.min(player.ants.rebornELO, player.ants.immortalELO)
}
}
updateAntLeaderboards()
const quarksToBeGained = availableQuarksFromELO()
Expand Down
10 changes: 9 additions & 1 deletion src/Features/Ants/HTML/updates/sacrifice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import type Decimal from 'break_infinity.js'
import i18next from 'i18next'
import { getAchievementReward } from '../../../../Achievements'
import { DOMCacheGetOrSet } from '../../../../Cache/DOM'
import { getLotusTimeExpiresAt, getOwnedLotus } from '../../../../Login'
import { format, player } from '../../../../Synergism'
import { toOrdinal } from '../../../../Utility'
import { timeRemainingMinutes, toOrdinal } from '../../../../Utility'
import { antSacrificeRewards } from '../../AntSacrifice/Rewards/calculate-rewards'
import { calculateEffectiveAntELO } from '../../AntSacrifice/Rewards/ELO/AntELO/lib/calculate'
import { calculateAntSpeedMultFromELO } from '../../AntSacrifice/Rewards/ELO/RebornELO/lib/ant-speed'
Expand Down Expand Up @@ -86,6 +87,13 @@ export const showSacrifice = () => {
DOMCacheGetOrSet('antSacrificeOffering').textContent = `+${format(sacRewards.offerings)}`
DOMCacheGetOrSet('antSacrificeObtainium').textContent = `+${format(sacRewards.obtainium)}`

DOMCacheGetOrSet('lotusStatus').innerHTML = i18next.t('pseudoCoins.lotus.status', {
time: timeRemainingMinutes(getLotusTimeExpiresAt())
})
DOMCacheGetOrSet('lotusOwnedAnt').innerHTML = i18next.t('pseudoCoins.lotus.owned', {
x: format(getOwnedLotus(), 0, true)
})

if (player.challengecompletions[9] > 0) {
// Helper function to update reward display and styling
const updateRewardDisplay = (
Expand Down
Loading
Loading