stop tracking sub cost client-side

Author: KhafraDev

src/Calculate.ts

@@ -1652,7 +1652,6 @@ export const calculateBaseGoldenQuarks = (singularity: number) => {
   return Math.floor(minimumValue + contributionFromQuarks + firstTenBonus)
 }
 
-
 export const calculateSingularityAmbrosiaLuckMilestoneBonus = () => {
   let bonus = 0
   const singThresholds1 = [35, 42, 49, 56, 63, 70, 77]

src/Runes.ts

@@ -1016,7 +1016,7 @@ export const sacrificeOfferings = (rune: RuneKeys, budget: Decimal, auto = false
     levelsToAdd = 20 * player.shopUpgrades.offeringAuto
     levelsToAdd *= getLevelMilestone('runeAutobuyImprover')
     if (player.cubeUpgrades[20] > 0) {
-    levelsToAdd *= 20
+      levelsToAdd *= 20
     }
   }
 

src/Shop.ts

@@ -808,7 +808,7 @@ export const shopData: Record<keyof Player['shopUpgrades'], IShopData> = {
 }
 
 export const updateShopLevels = () => {
-  for (const upgrade in player.shopUpgrades){
+  for (const upgrade in player.shopUpgrades) {
     const k = upgrade as keyof Player['shopUpgrades']
     player.shopUpgrades[k] = Math.min(player.shopUpgrades[k], shopData[k].maxLevel)
   }

src/Statistics.ts

@@ -2269,8 +2269,7 @@ export const allPowderMultiplierStats: NumberStatLine[] = [
 export const allGoldenQuarkMultiplierStats: NumberStatLine[] = [
   {
     i18n: 'Base',
-    stat: () =>
-      calculateBaseGoldenQuarks(player.singularityCount) // Base Golden Quarks based on Quarks and Sing Count
+    stat: () => calculateBaseGoldenQuarks(player.singularityCount) // Base Golden Quarks based on Quarks and Sing Count
   },
   {
     i18n: 'PseudoCoins',

src/Synergism.ts

@@ -230,6 +230,7 @@ import {
 } from './RuneSpirits'
 import { playerJsonSchema } from './saves/PlayerJsonSchema'
 import { playerUpdateVarSchema } from './saves/PlayerUpdateVarSchema'
+import { updateShopLevels } from './Shop'
 import {
   blankGQLevelObject,
   calculateMaxSingularityLookahead,
@@ -244,7 +245,6 @@ import {
 import { changeSubTab, changeTab, getActiveSubTab, Tabs } from './Tabs'
 import { settingAnnotation, settingSymbols, toggleIconSet, toggleTheme } from './Themes'
 import { clearTimeout, clearTimers, setInterval, setTimeout } from './Timers'
-import { updateShopLevels } from './Shop'
 
 export const player: Player = {
   firstPlayed: new Date().toISOString(),

src/purchases/CartTab.ts

@@ -22,6 +22,7 @@ interface BaseProduct {
 export interface SubscriptionProduct extends BaseProduct {
   subscription: true
   quarkBonus: number
+  tier: number
 }
 
 export interface RegularProduct extends BaseProduct {

src/purchases/SubscriptionsSubtab.ts

@@ -14,26 +14,18 @@ const formatter = Intl.NumberFormat('en-US', {
   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`
+      `You are upgrading to ${newSubName}, which costs ${formatter.format(newSubPrice / 100)} per month`
     )
 
   if (!confirm) {
@@ -93,11 +85,11 @@ const constructDescriptions = ({ description, quarkBonus }: SubscriptionProduct)
   `
 }
 
-export const createIndividualSubscriptionHTML = (product: SubscriptionProduct, existingCosts: number) => {
-  if (product.price < existingCosts) {
+export const createIndividualSubscriptionHTML = (product: SubscriptionProduct, currentSubTier: number) => {
+  if (product.tier < currentSubTier) {
     return `
       <section class="subscriptionContainer" key="${product.id}">
-      <div>
+        <div>
           <img class="pseudoCoinSubImage" alt="${product.name}" src="./Pictures/${product.id}.png" />
           <p class="pseudoCoinText">
           ${product.name.split(' - ').join('<br>')}
@@ -109,13 +101,13 @@ export const createIndividualSubscriptionHTML = (product: SubscriptionProduct, e
             Downgrade!
           </button>
           <div class="checkout-paypal" data-id="${product.id}"></div>
-      </div>
+        </div>
       </section>
     `
-  } else if (product.price === existingCosts) {
+  } else if (product.tier === currentSubTier) {
     return `
       <section class="subscriptionContainer" key="${product.id}">
-      <div>
+        <div>
           <img class="pseudoCoinSubImage" alt="${product.name}" src="./Pictures/${product.id}.png" />
           <p class="pseudoCoinText">
           ${product.name.split(' - ').join('<br>')}
@@ -127,13 +119,13 @@ export const createIndividualSubscriptionHTML = (product: SubscriptionProduct, e
             You are here!
           </button>
           <div class="checkout-paypal" data-id="${product.id}"></div>
-      </div>
+        </div>
       </section>
     `
   } else {
     return `
       <section class="subscriptionContainer" key="${product.id}">
-      <div>
+        <div>
           <img class="pseudoCoinSubImage" alt="${product.name}" src="./Pictures/${product.id}.png" />
           <p class="pseudoCoinText">
           ${product.name.split(' - ').join('<br>')}
@@ -142,10 +134,10 @@ export const createIndividualSubscriptionHTML = (product: SubscriptionProduct, e
           ${constructDescriptions(product)}
           </p>
           <button data-id="${product.id}" data-name="${product.name}" data-upgrade class="pseudoCoinButton">
-            Upgrade for ${formatter.format((product.price - existingCosts) / 100)} USD / mo
+            Upgrade for ${formatter.format(product.price / 100)} USD / mo
           </button>
           <!--<div class="checkout-paypal" data-id="${product.id}"></div>-->
-      </div>
+        </div>
       </section>
     `
   }
@@ -168,10 +160,9 @@ export const initializeSubscriptionPage = memoize(() => {
   }
 
   const tier = upgradeResponse.tier
-  const existingCosts = tierCosts[tier] ?? 0
 
   subscriptionSectionHolder.innerHTML = subscriptionProducts.map((product) =>
-    createIndividualSubscriptionHTML(product, existingCosts)
+    createIndividualSubscriptionHTML(product, tier)
   ).join('')
 
   subscriptionSectionHolder!.style.display = 'grid'