thepaperpilot/Advent-Incremental
1
0
Fork 0
mirror of https://github.com/thepaperpilot/Advent-Incremental.git synced 2025-02-18 10:22:46 +00:00
Code Issues Releases Activity Actions

implement oil upgrades

Browse source
This commit is contained in:
unsoftcapped3 2022-12-14 05:18:20 +00:00
parent 1e2b3f1b12
commit 3646be388b
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/data/layers/dyes.tsx
View file

@ -518,7 +518,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
.pow(upgrades.coalUpg.bought.value ? 1.2 : 1) .pow(upgrades.coalUpg.bought.value ? 1.2 : 1)
.pow(management.elfTraining.clothElfTraining.milestones[3].earned.value ? 1.1 : 1) .pow(management.elfTraining.clothElfTraining.milestones[3].earned.value ? 1.1 : 1)
), ),
orange2: computed(() => Decimal.add(dyes.orange.amount.value, 1).log2().plus(1)), orange2: computed(() => Decimal.add(dyes.orange.amount.value, 1).log2().plus(1).pow(oil.row3Upgrades[1].bought.value ? 2.5 : 1)),
green1: computed(() => green1: computed(() =>
Decimal.pow(2, Decimal.add(dyes.green.amount.value, 1).log2().sqrt()) Decimal.pow(2, Decimal.add(dyes.green.amount.value, 1).log2().sqrt())
.pow(upgrades.coalUpg.bought.value ? 1.2 : 1) .pow(upgrades.coalUpg.bought.value ? 1.2 : 1)

9
src/data/layers/management.tsx
View file

@ -33,7 +33,7 @@ import metal from "./metal";
import paper from "./paper"; import paper from "./paper";
import plastic from "./plastic"; import plastic from "./plastic";
import trees from "./trees"; import trees from "./trees";
import oil from "./oil";
const id = "management"; const id = "management";
const day = 12; const day = 12;
const advancedDay = 13; const advancedDay = 13;
@ -1151,7 +1151,12 @@ const layer = createLayer(id, () => {
multiplier: 2, multiplier: 2,
description: "Focus Upgrade 1", description: "Focus Upgrade 1",
enabled: focusUpgrade1.bought enabled: focusUpgrade1.bought
})) })),
createAdditiveModifier(() => ({
addend(){return Decimal.add(dyes.dyes.orange.amount, dyes.dyes.purple.amount).add(dyes.dyes.green.amount).add(1).cbrt()},
description: "Colorful Focus",
enabled: oil.row3Upgrades[2].bought.value
})),
]); ]);
const maximumElvesModifier = createSequentialModifier(() => [ const maximumElvesModifier = createSequentialModifier(() => [
createAdditiveModifier(() => ({ createAdditiveModifier(() => ({

5
src/data/layers/metal.tsx
View file

@ -148,6 +148,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
multiplier: () => Decimal.div(management.totalElfExp.value, 1000).add(1).sqrt(), multiplier: () => Decimal.div(management.totalElfExp.value, 1000).add(1).sqrt(),
description: "Mary Level 5", description: "Mary Level 5",
enabled: management.elfTraining.heatedPlanterElfTraining.milestones[4].earned enabled: management.elfTraining.heatedPlanterElfTraining.milestones[4].earned
})),
createMultiplicativeModifier(() => ({
multiplier: () => Decimal.add(dyes.dyes.red.amount, dyes.dyes.blue.amount).add(dyes.dyes.yellow.amount).add(1).log10(),
description: "The Ultimate Metal Dye",
enabled: oil.row3Upgrades[4].bought.value
})) }))
]); ]);
const computedAutoSmeltSpeed = computed(() => autoSmeltSpeed.apply(0)); const computedAutoSmeltSpeed = computed(() => autoSmeltSpeed.apply(0));