Skip to content

Commit

Permalink
fix dumbass caches
Browse files Browse the repository at this point in the history
  • Loading branch information
KhafraDev committed Jun 12, 2024
1 parent 6ada011 commit 8ba1280
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 7 deletions.
3 changes: 2 additions & 1 deletion src/StatCache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,8 @@ export class BlueberryInventoryCache extends AdditionCache<BlueberryInventory> {
}

export const cacheReinitialize = () => {
// TODO: Create a hierarchy of cache dependencies (ambrosia generation depends on blueberry inventory)
// TODO: REMOVE THIS FUCKING SHIT ASS CODE
// WHY THE FUCK ARE WE CACHING MATH OPERATIONS???
player.caches.ambrosiaLuckAdditiveMult.initialize()
player.caches.blueberryInventory.initialize()
player.caches.ambrosiaGeneration.initialize()
Expand Down
1 change: 1 addition & 0 deletions src/Synergism.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2051,6 +2051,7 @@ const loadSynergy = async () => {

// checkVariablesOnLoad(data)
const validatedPlayer = playerSchema.safeParse(data)

if (validatedPlayer.success) {
Object.assign(player, validatedPlayer.data)
} else {
Expand Down
23 changes: 17 additions & 6 deletions src/saves/PlayerSchema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,9 @@ export const playerSchema = z.object({
antPoints: decimalSchema,
antUpgrades: z.union([z.number().array(), arrayStartingWithNull(z.number()).transform((array) => array.slice(1))])
.default(() => [...blankSave.antUpgrades]),
antSacrificePoints: z.number().default(() => blankSave.antSacrificePoints),
antSacrificePoints: z.union([z.number(), z.null().transform(() => Number.MAX_VALUE)]).default(() =>
blankSave.antSacrificePoints
),
antSacrificeTimer: z.number().default(() => blankSave.antSacrificeTimer),
antSacrificeTimerReal: z.number().default(() => blankSave.antSacrificeTimerReal),

Expand Down Expand Up @@ -571,7 +573,11 @@ export const playerSchema = z.object({
.transform(() =>
Object.fromEntries(Object.keys(singularityData).map((k) => [k, new SingularityUpgrade(singularityData[k], k)]))
)
.default(() => JSON.parse(JSON.stringify(blankSave.singularityUpgrades))),
.default(() => {
const v = JSON.parse(JSON.stringify(blankSave.singularityUpgrades))
console.log('DEFAULT SING UPGRADES', v)
return v
}),
octeractUpgrades: z.record(z.string(), singularityUpgradeSchema('octeractsInvested'))
.transform(() =>
Object.fromEntries(Object.keys(octeractData).map((k) => [k, new OcteractUpgrade(octeractData[k], k)]))
Expand Down Expand Up @@ -621,10 +627,15 @@ export const playerSchema = z.object({
ultimatePixels: z.number().default(() => blankSave.ultimatePixels),

// TODO: what type?
caches: z.record(z.string(), z.any()).default(() => {
Object.values(blankSave.caches).map((cache) => cache.reset())
return blankSave.caches
}),
caches: z.record(z.string(), z.any())
.transform(() => {
Object.values(blankSave.caches).map((cache) => cache.reset())
return blankSave.caches
})
.default(() => {
Object.values(blankSave.caches).map((cache) => cache.reset())
return blankSave.caches
}),

lastExportedSave: z.number().default(() => blankSave.lastExportedSave)
})

0 comments on commit 8ba1280

Please sign in to comment.