Merge branch 'master' into subscriptions

src/Config.ts

@@ -1,6 +1,6 @@
 declare const PROD: boolean | undefined
 
-export const version = '3.1.1 January 13, 2025 pt 1.3: The Bakery Update'
+export const version = '3.1.1 January 15, 2025 pt 1.4: The Bakery Update'
 
 /**
  * PSEUDO DO NOT CHANGE THIS LINE

src/Reset.ts

@@ -1058,6 +1058,11 @@ export const updateSingularityMilestoneAwards = (singularityReset = true): void
     awardAutosCookieUpgrade()
   }
 
+  if (player.highestSingularityCount >= 244) {
+    player.cubeUpgrades[71] = 1
+    player.cubeUpgrades[72] = 1
+  }
+
   if (player.singularityUpgrades.platonicAlpha.getEffect().bonus && player.platonicUpgrades[5] === 0) {
     player.platonicUpgrades[5] = 1
     updatePlatonicUpgradeBG(5)
@@ -1319,6 +1324,7 @@ export const singularity = async (setSingNumber = -1): Promise<void> => {
   hold.insideSingularityChallenge = player.insideSingularityChallenge
   hold.ultimatePixels = player.ultimatePixels
   hold.ultimateProgress = player.ultimateProgress
+  hold.cubeUpgradeRedBarFilled = player.cubeUpgradeRedBarFilled
   hold.singularityChallenges = Object.fromEntries(
     Object.entries(player.singularityChallenges).map(([key, value]) => {
       return [key, {

src/SingularityChallenges.ts

@@ -345,7 +345,12 @@ export const singularityChallengeData: Record<
     unlockSingularity: 100,
     HTMLTag: 'noOcteracts',
     singularityRequirement: (baseReq: number, completions: number) => {
-      return baseReq + 13 * completions
+      if (completions < 10) {
+        return baseReq + 13 * completions
+      }
+      else {
+        return baseReq + 13 * 9 + 10 * (completions - 9)
+      }
     },
     scalingrewardcount: 1,
     uniquerewardcount: 3,

src/Statistics.ts

@@ -45,6 +45,7 @@ import { format, formatTimeShort, player } from './Synergism'
 import type { GlobalVariables } from './types/Synergism'
 import { sumContents } from './Utility'
 import { Globals as G } from './Variables'
+import i18next from 'i18next'
 
 const associated = new Map<string, string>([
   ['kMisc', 'miscStats'],
@@ -2043,7 +2044,7 @@ const updateDisplayC15Rewards = () => {
     if (player.challenge15Exponent >= exponentRequirements[i]) {
       DOMCacheGetOrSet(`c15Reward${i + 1}Num`).textContent = isNum[i]
         ? format(100 * values[i - skip] - 100, 2, true)
-        : 'Unlocked!'
+        : i18next.t('wowCubes.unlocked')
 
       if (!isNum[i] && i !== 24) {
         // TODO: This sucks -Platonic

src/Synergism.ts

@@ -2820,6 +2820,12 @@ const loadSynergy = () => {
     resetHistoryRenderAllTables()
     updateSingularityAchievements()
     updateSingularityGlobalPerks()
+
+    // Update the Sing requirements on reload for a challenge if applicable
+    if (G.currentSingChallenge !== undefined) {
+      const sing = player.singularityChallenges[G.currentSingChallenge].computeSingularityRquirement()
+      player.singularityCount = sing
+    }
   }
 
   updateAchievementBG()

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--) {
@@ -2235,6 +2235,16 @@ export const singularityPerks: SingularityPerk[] = [
       return i18next.t('singularity.perks.skrauQ.default', { amt })
     },
     ID: 'skrauQ'
+  },
+  {
+    name: () => {
+      return i18next.t('singularity.perks.permanentBenefaction.name')
+    },
+    levels: [244],
+    description: () => {
+      return i18next.t('singularity.perks.permanentBenefaction.default')
+    },
+    ID: 'permanentBenefaction'
   }
 ]
 

translations/en.json

@@ -24,7 +24,7 @@
     "availableBlueberries": "You have <<lightblue|{{availableBlueberries}}>> unspent Blueberries. Unlock higher tier modules below using them!",
     "cubeUpgradeThresholds": "Your Blueberry Time requirements have been doubled <<cyan | {{threshold}}>> times due to lifetime Ambrosia. <<cyan | Blueberry Generation Speed +{{percent}}%>>!",
     "cubeUpgradeRedBarFills": "Your Red Bar has filled <<maroon | {{amount}}>> times while Cookie Upgrade 29 is purchased, giving <<green | +{{luck}} &#9752 Ambrosia Luck>>!",
-	  "ambrosiaBuyPrompt": "How many Ambrosia would you like to spend? You have {{amount}} Ambrosia. Type -1 to use max!",
+    "ambrosiaBuyPrompt": "How many Ambrosia would you like to spend? You have {{amount}} Ambrosia. Type -1 to use max!",
     "refund": "You have refunded all spent Blueberries and Ambrosia.",
     "refundWord": "Refund",
     "data": {
@@ -1666,7 +1666,7 @@
       },
       "itAllAddsUp": {
         "name": "It all adds up",
-        "default": "The 'Add' Special Action reward & cooldown are divided by {{div}} while its maximum capacity is multiplied the same amount! (Rounded Up)."
+        "default": "The 'Add' Special Action reward & cooldown is divided by {{div}} while its maximum capacity is multiplied the same amount! (Rounded Up)."
       },
       "automagicalRunes": {
         "name": "Automagical Runes",
@@ -1744,7 +1744,7 @@
       },
       "octeractMetagenesis": {
         "name": "Octeract Metagenesis",
-        "hasLevel1": "Gives free levels of Octeract Cogenesis AND Trigenesis based on your current free levels and purchased levels: (level * free / 640)^0.5, (level^2 * free/125000)^0.333 respectively.",
+        "hasLevel1": "Gives free levels of Octeract Cogenesis AND Trigenesis based on your current free levels and purchased levels: (level * free / 640)^0.5, (level^2 * free/125000)^0.333 respectively ",
         "default": "Gives free levels of Octeract Cogenesis based on your current free levels and purchased levels: (level * free / 1000)^0.5"
       },
       "immaculateAlchemy": {
@@ -1761,6 +1761,10 @@
         "name": "Primal Power!",
         "hasLevel1": "Gain awesome power by reaching Prime Numbered Singularities! Currently gaining: + <<limegreen|☘ 131>> & <<limegreen|☘ 269>> Ambrosia Luck!",
         "default": "Gain awesome power by reaching Prime Numbered Singularities! Currently gaining: <<limegreen|☘ +131>> Ambrosia Luck!"
+      },
+      "permanentBenefaction": {
+        "name": "Permanent Benefaction",
+        "default": "<<lightblue | Pandora>> and <<orange | Vyshareth>> will always grant you their benefaction, so their cookies are correspondingly always eaten!"
       }
     },
     "toString": {
@@ -3166,7 +3170,7 @@
       "noOcteracts": {
         "name": "No Octeract Effects",
         "description": "Beat the target Singularity, but octeracts and their upgrades do nothing!<br/>Effective Singularity is also much higher based on tier.",
-        "ScalingReward1": "+0.02 increase to <<var(--lightseagreen-text-color)|OCTERACT to CUBE>> bonus power (Base: 2.00)",
+        "ScalingReward1": "+0.02 increase to <<var(--lightseagreen-text-color)|OCTERACT to CUBE>> bonus power (Base: 2.00) [effect halved after 10 completions]",
         "UniqueReward1": "1st - A bonus to <<Gold|Offerings>> based on <<var(--lightseagreen-text-color)|Octeracts>>!",
         "UniqueReward2": "10th - A bonus to <<steelblue|Obtainium>> based on <<var(--lightseagreen-text-color)|Octeracts>>!",
         "UniqueReward3": "10th - A new <<orchid|Quark Shop>> upgrade!"
@@ -3276,6 +3280,7 @@
     "openAll": "Open All",
     "autoOff": "Auto Open [OFF]",
     "autoOn": "Auto Open {{percent}}%",
+    "unlocked": "Unlocked!",
     "quarks": {
       "quarkTitle": "-=- Cube to Quark Corner -=-",
       "resetInfo": "Quark Rewards reset midnight!",