diff --git a/src/data/layers/dyes.tsx b/src/data/layers/dyes.tsx index ce6677c..0f132af 100644 --- a/src/data/layers/dyes.tsx +++ b/src/data/layers/dyes.tsx @@ -494,12 +494,12 @@ const layer = createLayer(id, function (this: BaseLayer) { key: "a", costs: () => [ { - base: "1e42", + base: "1e60", root: 5, res: trees.logs }, { - base: computed(() => (upgrades.yellowDyeUpg2.bought.value ? "1e15" : "2e15")), + base: computed(() => (upgrades.yellowDyeUpg2.bought.value ? "1e17" : "2e17")), root: 2, res: oil.oil } @@ -507,10 +507,10 @@ const layer = createLayer(id, function (this: BaseLayer) { listedBoosts: [ { visible: true, - desc: computed(() => `*${format(boosts.black1.value)} letters processed.`) + desc: computed(() => `*${format(boosts.black1.value)} oil gain.`) } ], - dyesToReset: [] + dyesToReset: [], }), orange: createDye({ name: "Orange Dye", diff --git a/src/data/layers/letters.tsx b/src/data/layers/letters.tsx index 22c2272..d7bb010 100644 --- a/src/data/layers/letters.tsx +++ b/src/data/layers/letters.tsx @@ -215,10 +215,6 @@ const layer = createLayer(id, function (this: BaseLayer) { createMultiplicativeModifier(() => ({ multiplier: () => Decimal.div(paperBuyable.amount.value, 2).add(1), description: "Printed Labels" - })), - createMultiplicativeModifier(() => ({ - multiplier: () => dyes.boosts.black1.value, - description: "Black Dye Boost" })) ]); diff --git a/src/data/layers/oil.tsx b/src/data/layers/oil.tsx index 40d2000..46e367a 100644 --- a/src/data/layers/oil.tsx +++ b/src/data/layers/oil.tsx @@ -947,6 +947,10 @@ const layer = createLayer(id, function (this: BaseLayer) { multiplier: 2, description: "Cocoa Level 3", enabled: management.elfTraining.oilElfTraining.milestones[2].earned + })), + createMultiplicativeModifier(() => ({ + multiplier: () => dyes.boosts.black1.value, + description: "Black Dye Boost" })) ]) as WithRequired; const computedOilSpeed = computed(() => oilSpeed.apply(0)); diff --git a/src/data/layers/toys.tsx b/src/data/layers/toys.tsx index 97c197d..a211714 100644 --- a/src/data/layers/toys.tsx +++ b/src/data/layers/toys.tsx @@ -59,14 +59,14 @@ const layer = createLayer(id, function (this: BaseLayer) { const clothesCost = computed(() => { let clothFactor = Decimal.add(1, clothesBuyable.amount.value); - if (milestones.milestone1.earned) { + if (milestones.milestone1.earned.value) { clothFactor = clothFactor.div( Decimal.div(workshop.foundationProgress.value, 100).floor() ); } return { - cloth: clothFactor.mul(1e8), - dye: clothFactor.mul(1e6) + cloth: clothFactor.mul(1e12), + dye: clothFactor.mul(1e14) }; }); const clothesBuyable = createBuyable(() => ({ @@ -100,13 +100,13 @@ const layer = createLayer(id, function (this: BaseLayer) { })) as GenericBuyable; const woodenBlocksCost = computed(() => { let woodFactor = Decimal.add(1, woodenBlocksBuyable.amount.value).pow(5); - if (milestones.milestone1.earned) { + if (milestones.milestone1.earned.value) { woodFactor = woodFactor.div( Decimal.div(workshop.foundationProgress.value, 100).floor() ); } return { - wood: woodFactor.mul(1e40) + wood: woodFactor.mul(1e63) }; }); const woodenBlocksBuyable = createBuyable(() => ({ @@ -133,15 +133,15 @@ const layer = createLayer(id, function (this: BaseLayer) { const trucksCost = computed(() => { let factor = Decimal.add(1, trucksBuyable.amount.value).pow(3); let plasticFactor = Decimal.add(1, trucksBuyable.amount.value); - if (milestones.milestone1.earned) { + if (milestones.milestone1.earned.value) { factor = factor.div(Decimal.div(workshop.foundationProgress.value, 100).floor()); plasticFactor = plasticFactor.div( Decimal.div(workshop.foundationProgress.value, 100).floor() ); } return { - metal: factor.mul(1e25), - plastic: plasticFactor.mul(1e10) + metal: factor.mul(1e43), + plastic: plasticFactor.mul(1e15) }; }); const trucksBuyable = createBuyable(() => ({