diff --git a/package.json b/package.json
index 6d2daf917..38dcc1d08 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,8 @@
"csslint": "npx stylelint Synergism.css",
"csslint:fix": "npx stylelint Synergism.css --fix",
"htmllint": "npx htmlhint index.html",
- "build:esbuild": "npx esbuild src/Synergism.ts --bundle --minify --target=\"chrome58,firefox57,safari11,edge29\" --outfile=\"./dist/out.js\"",
- "watch:esbuild": "npx esbuild src/Synergism.ts --bundle --minify --target=\"chrome58,firefox57,safari11,edge29\" --outfile=\"./dist/out.js\" --watch --sourcemap",
+ "build:esbuild": "npx esbuild src/Synergism.ts --bundle --minify --target=\"chrome58,firefox57,safari11,edge29\" --outfile=\"./dist/out.js\" --define:PROD=true",
+ "watch:esbuild": "npx esbuild src/Synergism.ts --bundle --minify --target=\"chrome58,firefox57,safari11,edge29\" --outfile=\"./dist/out.js\" --watch --sourcemap --define:PROD=false",
"check:tsc": "npx -p typescript tsc",
"watch:tsc": "npx -p typescript tsc --watch",
"prepare": "husky install",
diff --git a/scripts/update-last-updated.js b/scripts/update-last-updated.js
index 4da248eda..d7fd6fe8a 100644
--- a/scripts/update-last-updated.js
+++ b/scripts/update-last-updated.js
@@ -26,14 +26,3 @@ try {
console.error(e)
process.exit(1)
}
-
-try {
- console.log('Update like prod, maaaan')
- const config = readFileSync(`${__dirname}/../src/Config.ts`, 'utf-8')
- .replace('const prod: boolean = false', 'const prod: boolean = true')
-
- writeFileSync(`${__dirname}/../src/Config.ts`, config)
-} catch (e) {
- console.log('maaaaaan that sucks!', e)
- process.exit(1)
-}
diff --git a/src/Calculate.ts b/src/Calculate.ts
index 881b2de2b..0fed84a29 100644
--- a/src/Calculate.ts
+++ b/src/Calculate.ts
@@ -2780,7 +2780,7 @@ export const calculateAscensionScore = () => {
? 1
: 0
bonusLevel += +player.singularityChallenges.oneChallengeCap.rewards.freeCorruptionLevel
-
+
// Init Arrays with challenge values :)
const challengeScoreArrays1 = [0, 8, 10, 12, 15, 20, 60, 80, 120, 180, 300]
const challengeScoreArrays2 = [0, 10, 12, 15, 20, 30, 80, 120, 180, 300, 450]
diff --git a/src/Config.ts b/src/Config.ts
index a372d0be7..b10999af2 100644
--- a/src/Config.ts
+++ b/src/Config.ts
@@ -1,3 +1,5 @@
+declare const PROD: boolean | undefined
+
export const version = '3.1.1 January 15, 2025 pt 1.4: The Bakery Update'
/**
@@ -13,4 +15,4 @@ export const lastUpdated = new Date('##LAST_UPDATED##')
/**
* CHANGE THIS ONE INSTEAD
*/
-export const prod: boolean = false
+export const prod = typeof PROD === 'undefined' ? false : PROD
diff --git a/src/PseudoCoinUpgrades.ts b/src/PseudoCoinUpgrades.ts
index adbb77ff4..30301ad27 100644
--- a/src/PseudoCoinUpgrades.ts
+++ b/src/PseudoCoinUpgrades.ts
@@ -1,6 +1,7 @@
import i18next from 'i18next'
import { displayProperLoadoutCount } from './BlueberryUpgrades'
import { corruptionLoadoutTableCreate, updateCorruptionLoadoutNames } from './Corruptions'
+import { CartTab } from './purchases/CartTab'
import { format } from './Synergism'
export type PseudoCoinUpgradeNames =
@@ -20,28 +21,6 @@ export type PseudoCoinUpgradeNames =
export type PseudoCoinUpgrades = Record
@@ -52,14 +53,18 @@ export const initializeCheckoutTab = memoize((products: Product[]) => {
const fd = new FormData()
for (const product of getProductsInCart()) {
- fd.set(`product-${product.id}`, `${product.quantity}`)
+ fd.set(product.id, `${product.quantity}`)
}
fd.set('tosAgree', tosAgreed ? 'on' : 'off')
checkout.setAttribute('disabled', '')
- fetch('https://synergism.cc/stripe/create-checkout-session', {
+ const url = !prod
+ ? 'https://synergism.cc/stripe/test/create-checkout-session'
+ : 'https://synergism.cc/stripe/create-checkout-session'
+
+ fetch(url, {
method: 'POST',
body: fd
}).then((response) => response.json())
@@ -79,11 +84,14 @@ export const initializeCheckoutTab = memoize((products: Product[]) => {
function addItem (e: MouseEvent) {
e.preventDefault()
- const key = Number((e.target as HTMLButtonElement).closest('div[key]')?.getAttribute('key'))
+ const key = (e.target as HTMLButtonElement).closest('div[key]')?.getAttribute('key')
- if (Number.isNaN(key) || !Number.isSafeInteger(key)) {
+ if (key == null || !products.some((product) => product.id === key)) {
Alert('Stop fucking touching the html! We do server-side validation!')
return
+ } else if (subscriptionProducts.some((product) => getQuantity(product.id) !== 0)) {
+ Alert('You can only subscribe to 1 subscription tier!')
+ return
}
addToCart(key)
@@ -94,9 +102,9 @@ function addItem (e: MouseEvent) {
function removeItem (e: MouseEvent) {
e.preventDefault()
- const key = Number((e.target as HTMLButtonElement).closest('div[key]')?.getAttribute('key'))
+ const key = (e.target as HTMLButtonElement).closest('div[key]')?.getAttribute('key')
- if (Number.isNaN(key) || !Number.isSafeInteger(key)) {
+ if (key == null || !products.some((product) => product.id === key)) {
Alert('Stop fucking touching the html! We do server-side validation!')
return
}
@@ -118,7 +126,7 @@ function updateItemList () {
${product.quantity > 0 ? `x${product.quantity}` : ''}
-
+
`)).join('')
@@ -128,8 +136,8 @@ function updateItemList () {
})
}
-export const toggleCheckoutTab = (products: Product[]) => {
- initializeCheckoutTab(products)
+export const toggleCheckoutTab = () => {
+ initializeCheckoutTab()
updateTotalPriceInCart()
updateItemList()
diff --git a/src/purchases/ProductSubtab.ts b/src/purchases/ProductSubtab.ts
index 5d4738c89..f4d455b35 100644
--- a/src/purchases/ProductSubtab.ts
+++ b/src/purchases/ProductSubtab.ts
@@ -1,7 +1,7 @@
import { format } from '../Synergism'
import { Alert, Notification } from '../UpdateHTML'
import { memoize } from '../Utility'
-import type { Product } from './CartTab'
+import { coinProducts } from './CartTab'
import { addToCart } from './CartUtil'
const productContainer = document.querySelector
- 
+ 
('#pseudoCoins > #subscriptionsContainer')!
+const subscriptionSectionHolder = subscriptionsContainer.querySelector('#sub-section-holder')!
+
+const formatter = Intl.NumberFormat('en-US', {
+ style: 'currency',
+ currency: 'USD'
+})
+
+const tierCosts = [0, 300, 600, 1000, 2000]
+
+async function changeSubscription (productId: string, type: 'upgrade' | 'downgrade') {
+ const tier = upgradeResponse.tier
+ const existingCosts = tierCosts[tier] ?? 0
+ const newSub = subscriptionProducts.find((v) => v.id === productId)
+ const newSubPrice = newSub!.price
+ const newSubName = newSub!.name
+ const confirm = (type === 'downgrade')
+ ? await Confirm(
+ `You are downgrading to ${newSubName}, which costs ${
+ formatter.format((existingCosts - newSubPrice) / 100)
+ } less per month. New cost: ${
+ formatter.format(newSubPrice / 100)
+ } per month. Downgrading takes effect immediately!`
+ )
+ : await Confirm(
+ `You are upgrading to ${newSubName}, which costs ${
+ formatter.format((newSubPrice - existingCosts) / 100)
+ } more per month. New cost: ${formatter.format(newSubPrice / 100)} per month`
+ )
+
+ if (!confirm) {
+ return
+ }
+
+ const link = !prod
+ ? `https://synergism.cc/stripe/test/subscription/${type}`
+ : `https://synergism.cc/stripe/subscription/${type}`
+ const url = new URL(link)
+ url.searchParams.set('key', productId)
+
+ const response = await fetch(url, {
+ method: 'POST'
+ })
+ console.log(response, response.text())
+ return Alert(`You are now subscribed to ${newSubName}!`)
+}
+
+function clickHandler (this: HTMLButtonElement, e: HTMLElementEventMap['click']) {
+ const productId = (e.target as HTMLButtonElement).getAttribute('data-id')
+ const productName = (e.target as HTMLButtonElement).getAttribute('data-name')
+
+ if (productId === null || !subscriptionProducts.some((product) => product.id === productId)) {
+ Alert('Stop fucking touching the html! We do server-side validation!')
+ return
+ } else if (subscriptionProducts.some((product) => getQuantity(product.id) !== 0)) {
+ Alert('You can only subscribe to 1 subscription tier!')
+ return
+ }
+
+ if (upgradeResponse.tier !== 0) {
+ if (this.hasAttribute('data-downgrade')) {
+ changeSubscription(productId, 'downgrade')
+ return
+ } else if (this.hasAttribute('data-upgrade')) {
+ changeSubscription(productId, 'upgrade')
+ return
+ }
+ }
+
+ addToCart(productId)
+ Notification(`Added ${productName} to the cart!`)
+}
+
+const constructDescriptions = (description: string) => {
+ const [firstLine, secondLine] = description.split(' and ')
+ // capitalize the first letter of the second line
+ const secondLineCap = secondLine.charAt(0).toUpperCase() + secondLine.slice(1)
+
+ return `${firstLine}
+
+ ${secondLineCap}` +} + +export const createIndividualSubscriptionHTML = (product: Product, existingCosts: number) => { + if (product.price < existingCosts) { + return ` +
+
+ `
+ } else if (product.price === existingCosts) {
+ return `
+
+
+ `
+ } else {
+ return `
+
+
+ `
+ }
+}
+
+export const initializeSubscriptionPage = memoize(() => {
+ // Manage subscription button
+ {
+ const form = document.createElement('form')
+ form.action = !prod
+ ? 'https://synergism.cc/stripe/test/manage-subscription'
+ : 'https://synergism.cc/stripe/manage-subscription'
+
+ const submit = document.createElement('input')
+ submit.type = 'submit'
+ submit.value = 'Manage Subscription'
+ form.appendChild(submit)
+
+ subscriptionsContainer.prepend(form)
+ }
+
+ const tier = upgradeResponse.tier
+ const existingCosts = tierCosts[tier] ?? 0
+
+ subscriptionSectionHolder.innerHTML = subscriptionProducts.map((product) =>
+ createIndividualSubscriptionHTML(product, existingCosts)
+ ).join('')
+
+ subscriptionSectionHolder!.style.display = 'grid'
+
+ document.querySelectorAll('.subscriptionContainer > div > button[data-id]').forEach(
+ (element) => {
+ element.addEventListener('click', clickHandler)
+ }
+ )
+})
+
+export const clearSubscriptionPage = () => {
+ subscriptionsContainer.style.display = 'none'
+}
+
+export const toggleSubscriptionPage = () => {
+ initializeSubscriptionPage()
+ subscriptionsContainer.style.display = 'flex'
+}
diff --git a/src/purchases/UpgradesSubtab.ts b/src/purchases/UpgradesSubtab.ts
index f9bec6860..be1e63ab6 100644
--- a/src/purchases/UpgradesSubtab.ts
+++ b/src/purchases/UpgradesSubtab.ts
@@ -9,6 +9,7 @@ import {
} from '../PseudoCoinUpgrades'
import { Alert } from '../UpdateHTML'
import { memoize } from '../Utility'
+import { upgradeResponse } from './CartTab'
interface Upgrades {
upgradeId: number
@@ -32,10 +33,11 @@ type UpgradesList = Omit & {
playerLevel: number
}
-interface UpgradesResponse {
+export interface UpgradesResponse {
coins: number
upgrades: Upgrades[]
playerUpgrades: PlayerUpgrades[]
+ tier: number
}
interface CoinsResponse {
@@ -137,67 +139,62 @@ async function purchaseUpgrade (upgrades: Map) {
}
const initializeUpgradeSubtab = memoize(() => {
- ;(async () => {
- const response = await fetch('https://synergism.cc/stripe/upgrades')
- const upgradesList = await response.json() as UpgradesResponse
-
- DOMCacheGetOrSet('currentCoinBalance').innerHTML = `${
- i18next.t('pseudoCoins.coinCount', { amount: Intl.NumberFormat().format(upgradesList.coins) })
- }`
- const grouped = upgradesList.upgrades.reduce((map, upgrade) => {
- const current = map.get(upgrade.upgradeId)
- const playerUpgrade = upgradesList.playerUpgrades.find((v) => v.upgradeId === upgrade.upgradeId)
-
- if (!current) {
- map.set(upgrade.upgradeId, {
- ...upgrade,
- cost: [upgrade.cost],
- level: [upgrade.level],
- playerLevel: playerUpgrade?.level ?? 0
- })
- } else {
- current.maxLevel = Math.max(current.maxLevel, upgrade.maxLevel)
- current.cost.push(upgrade.cost)
- current.level.push(upgrade.level)
+ DOMCacheGetOrSet('currentCoinBalance').innerHTML = `${
+ i18next.t('pseudoCoins.coinCount', { amount: Intl.NumberFormat().format(upgradeResponse.coins) })
+ }`
+ const grouped = upgradeResponse.upgrades.reduce((map, upgrade) => {
+ const current = map.get(upgrade.upgradeId)
+ const playerUpgrade = upgradeResponse.playerUpgrades.find((v) => v.upgradeId === upgrade.upgradeId)
+
+ if (!current) {
+ map.set(upgrade.upgradeId, {
+ ...upgrade,
+ cost: [upgrade.cost],
+ level: [upgrade.level],
+ playerLevel: playerUpgrade?.level ?? 0
+ })
+ } else {
+ current.maxLevel = Math.max(current.maxLevel, upgrade.maxLevel)
+ current.cost.push(upgrade.cost)
+ current.level.push(upgrade.level)
+ }
+
+ return map
+ }, new Map())
+
+ tab.querySelector('#upgradeGrid')!.innerHTML = [...grouped.values()].map((u) => `
+ ('#upgradeGrid > div[data-id]')
+ upgradesInGrid.forEach((element) => {
+ element.addEventListener('click', (e) => {
+ const upgradeId = Number((e.target as HTMLElement).closest('div')?.getAttribute('data-id'))
+
+ if (Number.isNaN(upgradeId) || !Number.isSafeInteger(upgradeId)) {
+ Alert('Stop touching the fucking html! We do server-side validations!')
+ return
}
- return map
- }, new Map())
-
- tab.querySelector('#upgradeGrid')!.innerHTML = [...grouped.values()].map((u) => `
- ('#upgradeGrid > div[data-id]')
- upgradesInGrid.forEach((element) => {
- element.addEventListener('click', (e) => {
- const upgradeId = Number((e.target as HTMLElement).closest('div')?.getAttribute('data-id'))
-
- if (Number.isNaN(upgradeId) || !Number.isSafeInteger(upgradeId)) {
- Alert('Stop touching the fucking html! We do server-side validations!')
- return
- }
-
- setActiveUpgrade([...grouped.values()].find((u) => u.upgradeId === upgradeId))
-
- // Setting an active class here turns the border white due to a CSS rule
- upgradesInGrid.forEach((u) => u.classList.remove('active'))
- element.classList.add('active')
- })
- })
+ setActiveUpgrade([...grouped.values()].find((u) => u.upgradeId === upgradeId))
- DOMCacheGetOrSet('buy').addEventListener('click', () => {
- purchaseUpgrade(grouped)
+ // Setting an active class here turns the border white due to a CSS rule
+ upgradesInGrid.forEach((u) => u.classList.remove('active'))
+ element.classList.add('active')
})
- })()
+ })
+
+ DOMCacheGetOrSet('buy').addEventListener('click', () => {
+ purchaseUpgrade(grouped)
+ })
})
export const toggleUpgradeSubtab = () => {
diff --git a/src/singularity.ts b/src/singularity.ts
index d0875f848..349a4868c 100644
--- a/src/singularity.ts
+++ b/src/singularity.ts
@@ -1945,7 +1945,7 @@ export const singularityPerks: SingularityPerk[] = [
218,
228,
238,
- 248,
+ 248
],
description: (n: number, levels: number[]) => {
for (let i = levels.length - 1; i >= 0; i--) {
diff --git a/translations/en.json b/translations/en.json
index 8aa2c5176..f42405c7f 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -2537,6 +2537,7 @@
},
"pseudocoins": {
"buy": "Purchase Coins",
+ "subscriptions": "Subscriptions",
"upgrades": "Buy Upgrades",
"merch": "Purchase Merch"
}
+
${product.name} [${format(product.coins)} PseudoCoins]
@@ -50,7 +50,7 @@ export const clearProductPage = () => { productContainer!.style.display = 'none' } -export const toggleProductPage = (products: Product[]) => { - initializeProductPage(products) +export const toggleProductPage = () => { + initializeProductPage() productContainer!.style.display = 'grid' } diff --git a/src/purchases/SubscriptionsSubtab.ts b/src/purchases/SubscriptionsSubtab.ts new file mode 100644 index 000000000..2f9febfd2 --- /dev/null +++ b/src/purchases/SubscriptionsSubtab.ts @@ -0,0 +1,184 @@ +import { prod } from '../Config' +import { Alert, Confirm, Notification } from '../UpdateHTML' +import { memoize } from '../Utility' +import { type Product, subscriptionProducts, upgradeResponse } from './CartTab' +import { addToCart, getQuantity } from './CartUtil' + +const subscriptionsContainer = document.querySelector+ ${secondLineCap}` +} + +export const createIndividualSubscriptionHTML = (product: Product, existingCosts: number) => { + if (product.price < existingCosts) { + return ` +
+
+
+
+
+ ${product.name.split(' - ').join('
')}
+
+ ${constructDescriptions(product.description)} +
+ +
+
+
+
+
+ ${product.name.split(' - ').join('
')}
+
+ ${constructDescriptions(product.description)} +
+ +
+
+
+
+
+ ${product.name.split(' - ').join('
')}
+
+ ${constructDescriptions(product.description)} +
+ +
+ 
+
+ `).join('')
+
+ const upgradesInGrid = tab.querySelectorAll
+ ${u.playerLevel}/${u.maxLevel}
+ ${u.playerLevel === u.maxLevel ? '✔️
' : ''} +
-
-
- `).join('')
-
- const upgradesInGrid = tab.querySelectorAll
- ${u.playerLevel}/${u.maxLevel}
- ${u.playerLevel === u.maxLevel ? '✔️
' : ''} -