Skip to content
Open
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/Default/ShopVIPPassUpgradeLost.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/Default/ShopVIPPassUpgradeZ.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2516,6 +2516,7 @@ <h3 class="reincarnationunlock" id="reincarnationtext" style="color: limegreen"
<span id="hepteractQuantity" class="wowhepteractText"></span>
<img class="heptNotification" id="heptnotificationpic" alt="Notification" src="Pictures/Default/Notifications.png" title="Notifications" loading="lazy">
<button class="auto nonSquare" id="toggle35" toggleid="35" format="[$]" style="border: 2px solid green">[ON]</button>
<span id="maxCraftWarning" class="wowhepteractText" i18n="general.maxCraftWarning"></span>
</div>
</div>

Expand Down Expand Up @@ -3819,6 +3820,9 @@ <h3 id="nextSingularityInfo" class="elevatorLockStatus singularityGradient gradi
</div>
<div id="goldenQuarksMultiBuyInfo">
<p id="goldenQuarkMultiBuyText" i18n="general.multiBuyInstructions"></p>
</div>
<div id="freeLevelDescriptionInfo">
<p id="freeLevelDescriptionText" i18n="general.freeLevelDescription"></p>
</div>
<div class="boxColor" id="actualSingularityUpgradeContainer">
<button class="singularityUpgrade" id="goldenQuarks1" i18n-aria-label="singularity.data.goldenQuarks1.description">
Expand Down
23 changes: 17 additions & 6 deletions src/Octeracts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1099,23 +1099,32 @@ export const updateMobileOcteractHTML = (upgradeKey: OcteractDataKeys): void =>
const buttonDiv = document.createElement('div')

const buyOne = document.createElement('button')
const buyX = document.createElement('button')
const buyMax = document.createElement('button')

buyOne.classList.add('modalBtnBuy')
buyOne.textContent = i18next.t('general.buyOne')
buyOne.addEventListener('click', (event: MouseEvent) => {
buyOcteractUpgradeLevel(upgradeKey, event, false)
buyOcteractUpgradeLevel(upgradeKey, event, false, false)
updateMobileOcteractHTML(upgradeKey)
})

buyX.classList.add('modalBtnBuy')
buyX.textContent = i18next.t('general.buyX')
buyX.addEventListener('click', (event: MouseEvent) => {
buyOcteractUpgradeLevel(upgradeKey, event, true, true)
updateMobileOcteractHTML(upgradeKey)
})

buyMax.classList.add('modalBtnBuy')
buyMax.textContent = i18next.t('general.buyMax')
buyMax.addEventListener('click', (event: MouseEvent) => {
buyOcteractUpgradeLevel(upgradeKey, event, true)
buyOcteractUpgradeLevel(upgradeKey, event, true, false)
updateMobileOcteractHTML(upgradeKey)
})

buttonDiv.appendChild(buyOne)
buttonDiv.appendChild(buyX)
buttonDiv.appendChild(buyMax)
elm.appendChild(buttonDiv)
}
Expand All @@ -1124,7 +1133,8 @@ export const updateMobileOcteractHTML = (upgradeKey: OcteractDataKeys): void =>
export const buyOcteractUpgradeLevel = async (
upgradeKey: OcteractDataKeys,
event: MouseEvent,
buyMax = false
buyMax = false,
alert = true
): Promise<void> => {
const upgrade = octeractUpgrades[upgradeKey]
let purchased = 0
Expand All @@ -1133,9 +1143,10 @@ export const buyOcteractUpgradeLevel = async (

if (event.shiftKey || buyMax) {
maxPurchasable = 100000000
const buy = Number(
await Prompt(`${i18next.t('octeract.buyLevel.buyPrompt', { n: format(player.wowOcteracts, 0, true) })}`)
)
let buy = Number(-1)
if(alert) {
buy = Number(await Prompt(`${i18next.t('octeract.buyLevel.buyPrompt', { n: format(player.wowOcteracts, 0, true) })}`))
}

if (isNaN(buy) || !isFinite(buy) || !Number.isInteger(buy)) {
return Alert(i18next.t('general.validation.finite'))
Expand Down
1 change: 1 addition & 0 deletions src/UpdateVisuals.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1611,6 +1611,7 @@ export const visualUpdateSingularity = () => {
goldenQuarks: format(player.goldenQuarks, 0, true)
}
)
DOMCacheGetOrSet('freeLevelDescription').innerHTML = i18next.t('singularity.freeLevelDescription')

const keys = Object.keys(goldenQuarkUpgrades) as SingularityDataKeys[]
const val = G.shopEnhanceVision
Expand Down
26 changes: 19 additions & 7 deletions src/singularity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2094,23 +2094,32 @@ export function updateMobileGQHTML (k: SingularityDataKeys) {
const buttonDiv = document.createElement('div')

const buyOne = document.createElement('button')
const buyX = document.createElement('button')
const buyMax = document.createElement('button')

buyOne.classList.add('modalBtnBuy')
buyOne.textContent = i18next.t('general.buyOne')
buyOne.addEventListener('click', (event: MouseEvent) => {
buyGQUpgradeLevel(k, event, false)
buyGQUpgradeLevel(k, event, false, false)
updateMobileGQHTML(k)
})

buyX.classList.add('modalBtnBuy')
buyX.textContent = i18next.t('general.buyX')
buyX.addEventListener('click', (event: MouseEvent) => {
buyGQUpgradeLevel(k, event, true, true)
updateMobileGQHTML(k)
})

buyMax.classList.add('modalBtnBuy')
buyMax.textContent = i18next.t('general.buyMax')
buyMax.addEventListener('click', (event: MouseEvent) => {
buyGQUpgradeLevel(k, event, true)
buyGQUpgradeLevel(k, event, true, false)
updateMobileGQHTML(k)
})

buttonDiv.appendChild(buyOne)
buttonDiv.appendChild(buyX)
buttonDiv.appendChild(buyMax)
elm.appendChild(buttonDiv)
}
Expand Down Expand Up @@ -2168,7 +2177,8 @@ export function getGQUpgradeCostTNL (upgradeKey: SingularityDataKeys): number {
export async function buyGQUpgradeLevel (
upgradeKey: SingularityDataKeys,
event: MouseEvent,
buyMax = false
buyMax = false,
alert = true
): Promise<void> {
const upgrade = goldenQuarkUpgrades[upgradeKey]
let purchased = 0
Expand All @@ -2177,13 +2187,15 @@ export async function buyGQUpgradeLevel (

if (event.shiftKey || buyMax) {
maxPurchasable = 100000000
const buy = Number(
await Prompt(

let buy = Number(-1)
if (alert) {
buy = Number(await Prompt(
i18next.t('singularity.goldenQuarks.spendPrompt', {
gq: format(player.goldenQuarks, 0, true)
})
)
)
))
}

if (isNaN(buy) || !isFinite(buy) || !Number.isInteger(buy)) {
return Alert(i18next.t('general.validation.finite'))
Expand Down
9 changes: 6 additions & 3 deletions translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2800,7 +2800,7 @@
"15": {
"name": "SADISTIC CHALLENGE II || {{- value}} Completions",
"flavor": "The worst atrocity a man can commit is witnessing, without anguish, the suffering of others.",
"restrictions": "Ascend and reach the goal but you're stuck in all Corruptions at level 11. <br> ☆ Ant Speed <<gold|^0.5>> <br> ☆ Fortunae Formicidae effect is multiplied by <<gold|0.0001>> <br> ☆ Your Tax burden is reduced by <<pink|99.9995%>>",
"restrictions": "Ascend and reach the goal but you're stuck in all Corruptions at level 11. <br> ☆ Ant Speed <<gold|^0.5>> <br> ☆ Fortunae Formicidae effect is multiplied by <<gold|0.0001>> <br> ☆ Your Tax burden is reduced by <<pink|99.9995%>> <br> ☆ You cannot enter challenges before 2 seconds Ascension time",
"goal": "Goal: {{value}} Coins, but get bonuses based on your best attempt.",
"per": {
"1": "Folly of mankind: ",
Expand Down Expand Up @@ -3580,7 +3580,7 @@
},
"respecBeGone": {
"name": "Respec, be gone!",
"default": "Talismans now buff all runes at all times!"
"default": "Wow that was effective! Respecs were already gone! This perk does nothing!"
},
"forTheLoveOfTheAntGod": {
"name": "For the love of (the Ant) God!",
Expand Down Expand Up @@ -3947,7 +3947,7 @@
"singQuarkImprover1": {
"name": "Marginal Quark Gain Improver Thingy",
"description": "A doohickey that I forgot what it looked like. +0.5% Quarks per level, multiplicative with all other bonuses! Seems like it grows in cost a lot faster than anything else though. Also, did you know these descriptions can be arbitrarily long?",
"effect": "You gain {{n}}% more Quarks!"
"effect": "You gain {{n}} more Quarks!"
},
"singQuarkHepteract": {
"name": "I wish my Quark Hepteract was marginally better.",
Expand Down Expand Up @@ -4239,13 +4239,16 @@
"blessCapital": "BLESS",
"spiritCapital": "REJUVENATE",
"multiBuyInstructions": "Buy multiple levels at once by holding <<var(--orchid-text-color)|'SHIFT'>> while clicking!",
"freeLevelDescription": "Perks with a negative coloring have more free levels than normal levels",
"maxCraftWarning": "Warn when crafting max",
"autoOnColon": "Auto: ON",
"autoOffColon": "Auto: OFF",
"buyMaxOn": "Buy Max: ON",
"buyMaxOff": "Buy Max: OFF",
"on": "ON",
"off": "OFF",
"buyOne": "Buy x1",
"buyX": "Buy X",
"buyMax": "Buy MAX",
"languageChange": "Changing the language requires a reload! Would you like to reload now?",
"resources": {
Expand Down