rest of day 17 stuff

This commit is contained in:
unsoftcapped3 2022-12-21 00:23:02 +00:00
parent 6a625f2fb8
commit 2cf4e58e5e
4 changed files with 31 additions and 3 deletions

View file

@ -40,6 +40,7 @@ import management from "./management";
import workshop from "./workshop";
import { WithRequired } from "util/common";
import { ElfBuyable } from "./elves";
import toys from "./toys";
const id = "oil";
const day = 9;
@ -951,6 +952,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
createMultiplicativeModifier(() => ({
multiplier: () => dyes.boosts.black1.value,
description: "Black Dye Boost"
})),
createMultiplicativeModifier(() => ({
multiplier: 50,
description: "350 toys",
enabled: toys.milestones.milestone4.earned.value
}))
]) as WithRequired<Modifier, "description" | "revert">;
const computedOilSpeed = computed(() => oilSpeed.apply(0));

View file

@ -36,6 +36,7 @@ import metal from "./metal";
import oil from "./oil";
import paper from "./paper";
import workshop from "./workshop";
import toys from "./toys";
const id = "plastic";
const day = 10;
@ -373,6 +374,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
multiplier: () => Decimal.div(buildRefinery.amount.value, 100).add(1),
description: "Tinsel Level 4",
enabled: management.elfTraining.plasticElfTraining.milestones[3].earned
})),
createMultiplicativeModifier(() => ({
multiplier: 50,
description: "400 toys",
enabled: toys.milestones.milestone4.earned.value
}))
]);
const computedPlasticGain = computed(() => plasticGain.apply(0));

View file

@ -215,7 +215,22 @@ const layer = createLayer(id, function (this: BaseLayer) {
},
shouldEarn: () => Decimal.gte(toySum.value, 100)
}));
const milestones = { milestone1, milestone2 };
const milestone3 = createMilestone(() => ({
display: {
requirement: "200 toys",
effectDisplay: "Beach wrapping paper is much more powerful."
},
shouldEarn: () => Decimal.gte(toySum.value, 200)
}));
const milestone4 = createMilestone(() => ({
display: {
requirement: "350 toys",
effectDisplay: "Gain 50x oil and plastic."
},
shouldEarn: () => Decimal.gte(toySum.value, 350)
}));
const milestones = { milestone1, milestone2, milestone3, milestone4 };
const { collapseMilestones, display: milestonesDisplay } =
createCollapsibleMilestones(milestones);
@ -256,7 +271,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
const { total: totalToys, trackerDisplay } = setUpDailyProgressTracker({
resource: toySum,
goal: 2000,
goal: 500,
name,
day,
background: {

View file

@ -16,6 +16,7 @@ import { computed, Ref, unref, watchEffect } from "vue";
import { main } from "../projEntry";
import { default as dyes, type enumColor } from "./dyes";
import elves from "./elves";
import toys from "./toys";
const id = "wrappingPaper";
const day = 15;
@ -277,7 +278,7 @@ const layer = createLayer(id, () => {
beach1: computed(() =>
main.isMastery.value
? 1
: Decimal.add(wrappingPaper.beach.buyable.amount.value, 1).log10().add(1)
: Decimal.add(wrappingPaper.beach.buyable.amount.value, 1).log10().add(1).pow(toys.milestones.milestone3.earned.value ? 1.6 : 1)
)
};
const wrappingPaperSum = createResource(