Skip to content

Commit 998b933

Browse files
committed
Undo Decimal fromString change, player default
1 parent 1d5ea69 commit 998b933

4 files changed

Lines changed: 13 additions & 27 deletions

File tree

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
export const defaultCrumbs = '1'
2-
export const defaultHighestCrumbsThisSacrifice = '1'
3-
export const defaultHighestCrumbsEver = '1'
1+
import Decimal from "break_infinity.js"
2+
3+
export const defaultCrumbs = Decimal.fromString('1')
4+
export const defaultHighestCrumbsThisSacrifice = Decimal.fromString('1')
5+
export const defaultHighestCrumbsEver = Decimal.fromString('1')

src/Features/Ants/Crumbs/player/reset.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import { defaultCrumbs, defaultHighestCrumbsEver, defaultHighestCrumbsThisSacrif
55

66
export const resetPlayerAntCrumbs = (resetTier: AntSacrificeTiers): void => {
77
if (resetTier >= AntSacrificeTiers.sacrifice) {
8-
player.ants.crumbs = Decimal.fromString(defaultCrumbs)
9-
player.ants.highestCrumbsThisSacrifice = Decimal.fromString(defaultHighestCrumbsThisSacrifice)
8+
player.ants.crumbs = Decimal.fromDecimal(defaultCrumbs)
9+
player.ants.highestCrumbsThisSacrifice = Decimal.fromDecimal(defaultHighestCrumbsThisSacrifice)
1010
}
1111
// Sing Perk
1212
if (player.highestSingularityCount >= 20) {
1313
player.ants.crumbs = Decimal.fromString('1e100')
1414
}
1515
// If player resets the game
1616
if (resetTier >= AntSacrificeTiers.never) {
17-
player.ants.highestCrumbsEver = Decimal.fromString(defaultHighestCrumbsEver)
17+
player.ants.highestCrumbsEver = Decimal.fromDecimal(defaultHighestCrumbsEver)
1818
}
1919
}

src/Features/Ants/player/default.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ export const defaultPlayerAnts: PlayerAnts = {
1717
producers: { ...defaultAntProducers },
1818
masteries: { ...defaultAntMasteries },
1919
upgrades: { ...defaultAntUpgrades },
20-
crumbs: Decimal.fromString(defaultCrumbs),
21-
highestCrumbsThisSacrifice: Decimal.fromString(defaultHighestCrumbsThisSacrifice),
22-
highestCrumbsEver: Decimal.fromString(defaultHighestCrumbsEver),
20+
crumbs: Decimal.fromDecimal(defaultCrumbs),
21+
highestCrumbsThisSacrifice: Decimal.fromDecimal(defaultHighestCrumbsThisSacrifice),
22+
highestCrumbsEver: Decimal.fromDecimal(defaultHighestCrumbsEver),
2323
immortalELO: defaultAntImmortalELO,
2424
rebornELO: defaultAntRebornELO,
2525
highestRebornELODaily: [...defaultHighestRebornELODaily],

src/Synergism.ts

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,8 @@ import { dev, lastUpdated, prod, testing, version } from './Config'
180180
import { WowCubes, WowHypercubes, WowPlatonicCubes, WowTesseracts } from './CubeExperimental'
181181
import { eventCheck } from './Event'
182182
import { autobuyAnts } from './Features/Ants'
183-
import { defaultAntMasteries } from './Features/Ants/AntMasteries/player/default'
184183
import { generateAntsAndCrumbs } from './Features/Ants/AntProducers/lib/generate-ant-producers'
185-
import { defaultAntProducers } from './Features/Ants/AntProducers/player/default'
186184
import { getAntUpgradeEffect } from './Features/Ants/AntUpgrades/lib/upgrade-effects'
187-
import { defaultAntUpgrades } from './Features/Ants/AntUpgrades/player/default'
188185
import { AntUpgrades } from './Features/Ants/AntUpgrades/structs/structs'
189186
import {
190187
defaultHepteractValues,
@@ -244,6 +241,7 @@ import {
244241
import { changeSubTab, changeTab, getActiveSubTab, Tabs } from './Tabs'
245242
import { settingAnnotation, settingSymbols, toggleIconSet, toggleTheme } from './Themes'
246243
import { clearTimeout, clearTimers, setInterval, setTimeout } from './Timers'
244+
import { defaultPlayerAnts } from './Features/Ants/player/default'
247245

248246
export const player: Player = {
249247
firstPlayed: new Date().toISOString(),
@@ -354,21 +352,7 @@ export const player: Player = {
354352
fifthCostParticles: new Decimal('1e16'),
355353
fifthProduceParticles: 0.5,
356354

357-
ants: {
358-
producers: { ...defaultAntProducers },
359-
masteries: { ...defaultAntMasteries },
360-
upgrades: { ...defaultAntUpgrades },
361-
crumbs: new Decimal('1'),
362-
highestCrumbsThisSacrifice: new Decimal('1'),
363-
highestCrumbsEver: new Decimal('1'),
364-
immortalELO: 0,
365-
rebornELO: 0,
366-
highestRebornELODaily: [],
367-
highestRebornELOEver: [],
368-
quarksGainedFromAnts: 0,
369-
antSacrificeCount: 0,
370-
currentSacrificeId: 0
371-
},
355+
ants: defaultPlayerAnts,
372356

373357
ascendBuilding1: {
374358
cost: 1,

0 commit comments

Comments
 (0)