Fix merge issue
Some checks failed
Build and Deploy / build-and-deploy (push) Successful in 1m2s
Run Tests / test (push) Failing after 2m15s

This commit is contained in:
thepaperpilot 2024-02-18 09:38:15 -06:00
parent 7df42f3185
commit 18de3d9f32

View file

@ -7,7 +7,7 @@ import Row from "components/layout/Row.vue";
import Spacer from "components/layout/Spacer.vue"; import Spacer from "components/layout/Spacer.vue";
import Sticky from "components/layout/Sticky.vue"; import Sticky from "components/layout/Sticky.vue";
import VerticalRule from "components/layout/VerticalRule.vue"; import VerticalRule from "components/layout/VerticalRule.vue";
import { createLayerTreeNode, createResetButton, modifierToFormula } from "data/common"; import { createLayerTreeNode, createResetButton } from "data/common";
import { main } from "data/projEntry"; import { main } from "data/projEntry";
import themes from "data/themes"; import themes from "data/themes";
import { createBar } from "features/bars/bar"; import { createBar } from "features/bars/bar";
@ -52,6 +52,7 @@ import { ComputedRef, Ref, computed, ref, unref } from "vue";
import f from "./f"; import f from "./f";
import { ProcessedComputable } from "util/computed"; import { ProcessedComputable } from "util/computed";
import { createAchievement } from "features/achievements/achievement"; import { createAchievement } from "features/achievements/achievement";
import { InvertibleFormula } from "game/formulas/types";
const id = "c"; const id = "c";
const layer = createLayer(id, () => { const layer = createLayer(id, () => {
@ -374,13 +375,13 @@ const layer = createLayer(id, () => {
]); ]);
const conversion = createCumulativeConversion(() => ({ const conversion = createCumulativeConversion(() => ({
formula: x => formula: x =>
modifierToFormula( // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
conversionModifier, conversionModifier.getFormula!(
x x
.div(10) .div(10)
.sqrt() .sqrt()
.step(1e100, f => f.sqrt()) .step(1e100, f => f.sqrt())
), ) as InvertibleFormula,
baseResource: main.points, baseResource: main.points,
gainResource: noPersist(points), gainResource: noPersist(points),
roundUpCost: true roundUpCost: true