Final bug fixes. Ready for release?

Pseudonian · Pseudonian · commit eed4b485ecc3 · 2025-12-12T17:30:52.000-05:00
diff --git a/Synergism.css b/Synergism.css
@@ -2613,7 +2613,8 @@ p#reincarnatehotkeys {
 #lotusCorner {
     border: 2px solid pink;
     width: 66%;
-    justify-self: center;
+    margin-left: auto;
+    margin-right: auto;
 }
 
 #lotusCorner p {
@@ -5940,6 +5941,14 @@ html[data-chal9x1="false"] .chal9x1 {
     display: none;
 }
 
+html[data-sacrifice-unlock="true"] .sacrificeUnlock {
+    display: inline-block;
+}
+
+html[data-sacrifice-unlock="false"] .sacrificeUnlock {
+    display: none;
+}
+
 html[data-chal10="true"] .chal10 {
     display: block;
 }
diff --git a/index.html b/index.html
@@ -1659,7 +1659,7 @@ <h3 class="reincarnationunlock" id="reincarnationtext" style="color: limegreen"
             <div id="antSubtabs">
                 <button id="toggleAntSubtab1" class="active-subtab" style="border: 2px solid burlywood" i18n="tabs.ants.anthill"></button>
                 <button id="toggleAntSubtab2" style="border: 2px solid purple" i18n="tabs.ants.altar"></button>
-                <button id="toggleAntSubtab3" style="border: 2px solid cyan" i18n="tabs.ants.quarkCorner"></button>
+                <button id="toggleAntSubtab3" class="sacrificeUnlock" style="border: 2px solid cyan" i18n="tabs.ants.quarkCorner"></button>
             </div>
 
             <div id="antSubtab1" style="display: flex;">
diff --git a/src/Config.ts b/src/Config.ts
@@ -1,7 +1,7 @@
 declare const PROD: boolean | undefined
 declare const DEV: boolean | undefined
 
-export const version = '4.1.0 December 8, 2025: The Ants Update'
+export const version = '4.1.0 December 12, 2025: The Ants Update'
 
 /**
  * If true, the version is marked as a testing version.
diff --git a/src/Features/Ants/AntProducers/player/default.ts b/src/Features/Ants/AntProducers/player/default.ts
@@ -2,19 +2,19 @@ import Decimal from 'break_infinity.js'
 import { AntProducers } from '../../structs/structs'
 import type { PlayerAntProducers } from '../structs/structs'
 
-const emptyAntProducer: PlayerAntProducers = {
+export const emptyAntProducer = (): PlayerAntProducers => ({
   purchased: 0,
   generated: Decimal.fromString('0')
-}
+})
 
-export const defaultAntProducers: Record<AntProducers, PlayerAntProducers> = {
-  [AntProducers.Workers]: { ...emptyAntProducer },
-  [AntProducers.Breeders]: { ...emptyAntProducer },
-  [AntProducers.MetaBreeders]: { ...emptyAntProducer },
-  [AntProducers.MegaBreeders]: { ...emptyAntProducer },
-  [AntProducers.Queens]: { ...emptyAntProducer },
-  [AntProducers.LordRoyals]: { ...emptyAntProducer },
-  [AntProducers.Almighties]: { ...emptyAntProducer },
-  [AntProducers.Disciples]: { ...emptyAntProducer },
-  [AntProducers.HolySpirit]: { ...emptyAntProducer }
-}
+export const createDefaultAntProducers = (): Record<AntProducers, PlayerAntProducers> => ({
+  [AntProducers.Workers]: emptyAntProducer(),
+  [AntProducers.Breeders]: emptyAntProducer(),
+  [AntProducers.MetaBreeders]: emptyAntProducer(),
+  [AntProducers.MegaBreeders]: emptyAntProducer(),
+  [AntProducers.Queens]: emptyAntProducer(),
+  [AntProducers.LordRoyals]: emptyAntProducer(),
+  [AntProducers.Almighties]: emptyAntProducer(),
+  [AntProducers.Disciples]: emptyAntProducer(),
+  [AntProducers.HolySpirit]: emptyAntProducer()
+})
diff --git a/src/Features/Ants/AntProducers/player/reset.ts b/src/Features/Ants/AntProducers/player/reset.ts
@@ -1,14 +1,12 @@
-import Decimal from 'break_infinity.js'
 import { AntSacrificeTiers } from '../../../../Reset'
 import { player } from '../../../../Synergism'
 import { AntProducers, LAST_ANT_PRODUCER } from '../../structs/structs'
-import { defaultAntProducers } from './default'
+import { emptyAntProducer } from './default'
 
 export const resetPlayerAntProducers = (resetTier: AntSacrificeTiers) => {
   if (resetTier >= AntSacrificeTiers.sacrifice) {
     for (let ant = AntProducers.Workers; ant <= LAST_ANT_PRODUCER; ant++) {
-      player.ants.producers[ant].generated = Decimal.fromDecimal(defaultAntProducers[ant].generated)
-      player.ants.producers[ant].purchased = defaultAntProducers[ant].purchased
+      player.ants.producers[ant] = emptyAntProducer()
     }
   }
   if (player.highestSingularityCount >= 10) {
diff --git a/src/Features/Ants/AntSacrifice/Rewards/TalismanCraftItems/constants.ts b/src/Features/Ants/AntSacrifice/Rewards/TalismanCraftItems/constants.ts
@@ -6,8 +6,8 @@ export const talismanItemRequiredELO: Record<TalismanCraftItems, number> = {
   uncommonFragment: 600,
   rareFragment: 1200,
   epicFragment: 2000,
-  legendaryFragment: 4000,
-  mythicalFragment: 10000
+  legendaryFragment: 7500,
+  mythicalFragment: 7500
 }
 
 export const talismanRewardMultipliers: Record<TalismanCraftItems, number> = {
@@ -16,6 +16,6 @@ export const talismanRewardMultipliers: Record<TalismanCraftItems, number> = {
   uncommonFragment: 0.1,
   rareFragment: 0.06,
   epicFragment: 0.02,
-  legendaryFragment: 0.008,
-  mythicalFragment: 0.003
+  legendaryFragment: 0.0008,
+  mythicalFragment: 0.0001
 }
diff --git a/src/Features/Ants/AntUpgrades/data/data.ts b/src/Features/Ants/AntUpgrades/data/data.ts
@@ -112,7 +112,7 @@ export const antUpgradeData: { [K in AntUpgrades]: AntUpgradeData<K> } = {
     description: () => i18next.t('ants.upgrades.acceleratorBoosts.description'),
     effect: (n: number) => {
       return {
-        acceleratorBoostMult: calculateSigmoidExponential(40, n / 1000 * 40 / 39)
+        acceleratorBoostMult: calculateSigmoidExponential(20, n / 1000)
       }
     },
     effectDescription: () => {
@@ -137,7 +137,7 @@ export const antUpgradeData: { [K in AntUpgrades]: AntUpgradeData<K> } = {
     description: () => i18next.t('ants.upgrades.multipliers.description'),
     effect: (n: number) => {
       return {
-        multiplierMult: calculateSigmoidExponential(40, n / 1000 * 80 / 79)
+        multiplierMult: calculateSigmoidExponential(40, n / 1000)
       }
     },
     effectDescription: () => {
diff --git a/src/Features/Ants/HTML/modals/upgrade-modal.ts b/src/Features/Ants/HTML/modals/upgrade-modal.ts
@@ -18,7 +18,7 @@ export const antUpgradeHTML = (antUpgrade: AntUpgrades) => {
 
   const freeLevels = computeFreeAntUpgradeLevels()
   const levelHTML = `<span class="crimsonText">${
-    i18next.t('ants.level', { x: format(player.ants.upgrades[antUpgrade], 0, true), y: format(freeLevels, 0, true) })
+    i18next.t('ants.level', { x: format(player.ants.upgrades[antUpgrade], 0, true), y: format(freeLevels, 2, true) })
   }</span>`
 
   let challengeHTML = ''
diff --git a/src/Features/Ants/HTML/updates/sacrifice.ts b/src/Features/Ants/HTML/updates/sacrifice.ts
@@ -107,7 +107,7 @@ export const showSacrifice = () => {
 
       if (effectiveELO >= requirement) {
         // Unlocked: show reward amount, remove locked styling
-        element.textContent = i18next.t('ants.elo', { x: format(reward) })
+        element.textContent = i18next.t('ants.itemReward', { x: format(reward) })
         parentElement?.classList.remove('antSacrificeRewardLocked')
         const img = parentElement?.querySelector('img')
         img?.classList.remove('antSacrificeRewardImageLocked')
diff --git a/src/Features/Ants/player/default.ts b/src/Features/Ants/player/default.ts
@@ -1,6 +1,6 @@
 import Decimal from 'break_infinity.js'
 import { defaultAntMasteries } from '../AntMasteries/player/default'
-import { defaultAntProducers } from '../AntProducers/player/default'
+import { createDefaultAntProducers } from '../AntProducers/player/default'
 import { defaultAntSacrificeCount, defaultCurrentSacrificeId } from '../AntSacrifice/player/default'
 import { defaultAntImmortalELO } from '../AntSacrifice/Rewards/ELO/ImmortalELO/player/default'
 import {
@@ -26,7 +26,7 @@ import {
 } from '../toggles/player/default'
 
 export const defaultPlayerAnts: PlayerAnts = {
-  producers: { ...defaultAntProducers },
+  producers: createDefaultAntProducers(),
   masteries: { ...defaultAntMasteries },
   upgrades: { ...defaultAntUpgrades },
   crumbs: Decimal.fromDecimal(defaultCrumbs),
diff --git a/src/RedAmbrosiaUpgrades.ts b/src/RedAmbrosiaUpgrades.ts
@@ -523,8 +523,9 @@ export const redAmbrosiaUpgrades: { [K in RedAmbrosiaNames]: RedAmbrosiaUpgrade<
   blueberries: {
     level: 0,
     redAmbrosiaInvested: 0,
-    costFormula: (level: number, baseCost: number) => {
-      return baseCost * Math.pow(30, level)
+    costFormula: (level: number, _baseCost: number) => {
+      const costValue = [100_000, 1_400_000, 3_000_000]
+      return costValue[level] ?? 0
     },
     effects: (n: number) => {
       return {
@@ -534,7 +535,7 @@ export const redAmbrosiaUpgrades: { [K in RedAmbrosiaNames]: RedAmbrosiaUpgrade<
     effectsDescription: (n: number) => {
       return i18next.t('redAmbrosia.data.blueberries.effect', { amount: n })
     },
-    maxLevel: 2,
+    maxLevel: 3,
     costPerLevel: 1e5,
     name: () => i18next.t('redAmbrosia.data.blueberries.name'),
     description: () => i18next.t('redAmbrosia.data.blueberries.description')
diff --git a/src/Reset.ts b/src/Reset.ts
@@ -950,9 +950,6 @@ export const updateSingularityMilestoneAwards = (singularityReset = true): void
   }
   if (player.highestSingularityCount >= 3) { // Singularity 3
     if (player.currentChallenge.ascension !== 12) {
-      if (singularityReset) {
-        player.reincarnationCount = 1
-      }
       player.reincarnationPoints = new Decimal('10')
     }
     player.unlocks.reincarnate = true
diff --git a/src/Synergism.ts b/src/Synergism.ts
@@ -352,7 +352,7 @@ export const player: Player = {
   fifthCostParticles: new Decimal('1e16'),
   fifthProduceParticles: 0.5,
 
-  ants: defaultPlayerAnts,
+  ants: { ...defaultPlayerAnts },
 
   ascendBuilding1: {
     cost: 1,
@@ -1262,18 +1262,8 @@ export const saveSynergy = (button?: boolean) => {
 const loadSynergy = () => {
   const saveString = localStorage.getItem('Synergysave2')
   const data = saveString ? JSON.parse(atob(saveString)) : null
-
-  if (testing || !prod) {
-    Object.defineProperties(window, {
-      player: { value: player },
-      G: { value: G },
-      Decimal: { value: Decimal },
-      i18n: { value: i18next }
-    })
-
-    if (data && testing) {
-      data.exporttest = false
-    }
+  if (data && testing) {
+    data.exporttest = false
   }
 
   Object.assign(G, { ...blankGlobals })
@@ -3368,8 +3358,9 @@ export const resourceGain = (dt: number): void => {
       `ascendBuilding${(6 - i) as OneToFive}` as const
     ].generated
       .add(player[`ascendBuilding${(6 - i) as OneToFive}` as const].owned)
-      // 4.1.0: Removing this from player, also because I want to make the multiplier 1.00 instead of 0.01 anyway
+      // 4.1.0: Removing this from player, also because I want to make the multiplier 0.05 instead of 0.01 anyway
       // .times(player[`ascendBuilding${i as OneToFive}` as const].multiplier)
+      .times(0.05)
       .times(G.globalConstantMult)
 
     if (i !== 5) {
@@ -5290,6 +5281,15 @@ window.addEventListener('load', async () => {
   fetchUnreadMessages().catch(console.error)
 
   reloadShit()
+
+  if (testing || !prod) {
+    Object.defineProperties(window, {
+      player: { value: player },
+      G: { value: G },
+      Decimal: { value: Decimal },
+      i18n: { value: i18next }
+    })
+  }
 }, { once: true })
 
 window.addEventListener('unload', () => {
diff --git a/src/Tax.ts b/src/Tax.ts
@@ -141,7 +141,7 @@ export const calculatetax = () => {
   )
   const exponentForWarning = Math.max(0, G.maxexponent - flatMaxExponentIncrease)
 
-  if (player.currentChallenge.ascension === 13 && G.maxexponent <= 99999) {
+  if (player.currentChallenge.ascension === 13 && (G.maxexponent - flatMaxExponentIncrease) <= 99999) {
     // i don't think it makes sense to give the achievement as soon as the challenge is opened
     // as soon as the challenge is opened you don't have enough tax reducers to have max exponent above 100000
     // so for the achievement description to make sense i think it should require at least 1 challenge completion || Dorijanko
diff --git a/src/UpdateHTML.ts b/src/UpdateHTML.ts
@@ -25,6 +25,7 @@ import {
 import { getMaxChallenges } from './Challenges'
 import { revealCorruptions } from './Corruptions'
 import { canBuyAntMastery } from './Features/Ants/AntMasteries/lib/get-buyable'
+import { canGenerateAntCrumbs } from './Features/Ants/AntProducers/lib/generate-ant-producers'
 import { getCostNextAnt } from './Features/Ants/AntProducers/lib/get-cost'
 import { getCostNextAntUpgrade } from './Features/Ants/AntUpgrades/lib/get-cost'
 import { AntUpgrades, LAST_ANT_UPGRADE } from './Features/Ants/AntUpgrades/structs/structs'
@@ -134,12 +135,14 @@ export const revealStuff = () => {
     }
   }
 
-  DOMCacheGetOrSet('challenge8AntLocked').style.display = (player.challengecompletions[8] > 0) ? 'none' : 'block'
+  DOMCacheGetOrSet('challenge8AntLocked').style.display = canGenerateAntCrumbs() ? 'none' : 'block'
 
   document.documentElement.dataset.chal9 = player.unlocks.talismans ? 'true' : 'false'
   document.documentElement.dataset.chal9x1 = player.highestchallengecompletions[9] > 0 ? 'true' : 'false'
   document.documentElement.dataset.chal10 = player.unlocks.ascensions ? 'true' : 'false'
 
+  document.documentElement.dataset.sacrificeUnlock = player.ants.antSacrificeCount > 0 ? 'true' : 'false'
+
   const example21 = document.getElementsByClassName('ascendunlock') as HTMLCollectionOf<HTMLElement>
   for (let i = 0; i < example21.length; i++) {
     const parent = example21[i].parentElement!
diff --git a/src/saves/PlayerSchema.ts b/src/saves/PlayerSchema.ts
@@ -5,7 +5,7 @@ import { CorruptionLoadout, CorruptionSaves } from '../Corruptions'
 import { WowCubes, WowHypercubes, WowPlatonicCubes, WowTesseracts } from '../CubeExperimental'
 import { defaultAntMasteries } from '../Features/Ants/AntMasteries/player/default'
 import type { PlayerAntMasteries } from '../Features/Ants/AntMasteries/structs/structs'
-import { defaultAntProducers } from '../Features/Ants/AntProducers/player/default'
+import { emptyAntProducer } from '../Features/Ants/AntProducers/player/default'
 import type { PlayerAntProducers } from '../Features/Ants/AntProducers/structs/structs'
 import { defaultAntUpgrades } from '../Features/Ants/AntUpgrades/player/default'
 import { AntUpgrades, LAST_ANT_UPGRADE } from '../Features/Ants/AntUpgrades/structs/structs'
@@ -85,7 +85,7 @@ const antsSchema = z.object({
 
       for (let ant = AntProducers.Workers; ant <= LAST_ANT_PRODUCER; ant++) {
         if (!(ant in result)) {
-          result[ant] = { ...defaultAntProducers[ant] }
+          result[ant] = emptyAntProducer()
         }
       }
 
diff --git a/translations/en.json b/translations/en.json
