diff --git a/src/data/layers/management.tsx b/src/data/layers/management.tsx index 0ba59e2..b6deac2 100644 --- a/src/data/layers/management.tsx +++ b/src/data/layers/management.tsx @@ -1153,8 +1153,8 @@ const layer = createLayer(id, () => { })), createAdditiveModifier(() => ({ addend() { - return Decimal.add(dyes.dyes.orange.amount, dyes.dyes.purple.amount) - .add(dyes.dyes.green.amount) + return Decimal.add(dyes.dyes.orange.amount.value, dyes.dyes.purple.amount.value) + .add(dyes.dyes.green.amount.value) .add(1) .cbrt(); }, diff --git a/src/data/layers/metal.tsx b/src/data/layers/metal.tsx index 7ac0eb7..e82f2f2 100644 --- a/src/data/layers/metal.tsx +++ b/src/data/layers/metal.tsx @@ -162,8 +162,8 @@ const layer = createLayer(id, function (this: BaseLayer) { })), createMultiplicativeModifier(() => ({ multiplier: () => - Decimal.add(dyes.dyes.red.amount, dyes.dyes.blue.amount) - .add(dyes.dyes.yellow.amount) + Decimal.add(dyes.dyes.red.amount.value, dyes.dyes.blue.amount.value) + .add(dyes.dyes.yellow.amount.value) .add(1) .log10(), description: "The Ultimate Metal Dye", diff --git a/src/data/layers/oil.tsx b/src/data/layers/oil.tsx index 04b2867..2fbbb29 100644 --- a/src/data/layers/oil.tsx +++ b/src/data/layers/oil.tsx @@ -24,7 +24,8 @@ import metal from "./metal"; import { createSequentialModifier, createAdditiveModifier, - createMultiplicativeModifier + createMultiplicativeModifier, + Modifier } from "game/modifiers"; import { main } from "data/projEntry"; import { globalBus } from "game/events"; @@ -37,6 +38,7 @@ import paper from "./paper"; import dyes from "./dyes"; import management from "./management"; import workshop from "./workshop"; +import { WithRequired } from "util/common"; const id = "oil"; const day = 9; @@ -809,7 +811,7 @@ const layer = createLayer(id, function (this: BaseLayer) { description: "Faith Level 4", enabled: management.elfTraining.bonfireElfTraining.milestones[3].earned })) - ]); + ]) as WithRequired; const computedOilSpeed = computed(() => oilSpeed.apply(0)); const oilConsumption = createSequentialModifier(() => [