From 1e2b3f1b12802de34e81c12d96d5af31df4cb994 Mon Sep 17 00:00:00 2001 From: unsoftcapped3 <75136164+unsoftcapped3@users.noreply.github.com> Date: Wed, 14 Dec 2022 05:11:07 +0000 Subject: [PATCH] oil upgrades 1 and 4 effects --- src/data/layers/dyes.tsx | 16 ++++++++++++++++ src/data/layers/oil.tsx | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/data/layers/dyes.tsx b/src/data/layers/dyes.tsx index fa56269..5daf320 100644 --- a/src/data/layers/dyes.tsx +++ b/src/data/layers/dyes.tsx @@ -90,6 +90,22 @@ const layer = createLayer(id, function (this: BaseLayer) { description: `${options.name} Chambers` })) ]; + if (options.color === "yellow" && oil.row3Upgrades[0].bought.value){ + modifiers.push( + createMultiplicativeModifier(() => ({ + multiplier(){return Decimal.add(dyes.red.amount.value,1).log10().pow(0.75)}, + description: "Dye Synergy I" + })) + ) + } + if (options.color === "red" && oil.row3Upgrades[3].bought.value){ + modifiers.push( + createMultiplicativeModifier(() => ({ + multiplier(){return Decimal.add(dyes.blue.amount.value,1).log10()}, + description: "Dye Synergy II" + })) + ) + } if (options.color === "red" || options.color === "yellow") { modifiers.push( createMultiplicativeModifier(() => ({ diff --git a/src/data/layers/oil.tsx b/src/data/layers/oil.tsx index 4172cac..4d507bf 100644 --- a/src/data/layers/oil.tsx +++ b/src/data/layers/oil.tsx @@ -686,7 +686,7 @@ const layer = createLayer(id, function (this: BaseLayer) { cost: 1e15, display: { title: "The Ultimate Metal Dye", - description: "Product of primary dyes makes everything that costs metal cost less metal" + description: "Sum of primary dyes boosts auto smelt speed" }, visibility: () => showIf(management.elfTraining.oilElfTraining.milestones[4].earned.value), style: { color: colorText }