thepaperpilot/Advent-Incremental
1
0
Fork 0
mirror of https://github.com/thepaperpilot/Advent-Incremental.git synced 2024-11-28 02:51:46 +00:00
Code Issues Releases Activity Actions

Merge remote-tracking branch 'origin/day-18-toy-factory' into day-18-toy-factory

Browse source
This commit is contained in:
thepaperpilot 2022-12-22 12:40:59 -06:00
commit 2feeeca614
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/data/layers/factory.tsx
View file

@ -123,6 +123,11 @@ const factory = createLayer(id, () => {
createAdditiveModifier(() => ({
addend: () => Decimal.add(1, coal.coal.value).log10(),
description: "Coal Energy Production"
})),
createMultiplicativeModifier(()=>({
multiplier: 1.4,
description: "2000 toys",
enabled: toys.milestones.milestone6.earned
}))
]);
const computedEnergy = computed(() => energy.apply(0));
@ -379,7 +384,7 @@ const factory = createLayer(id, () => {
},
outputs: {
wheel: {
amount: 1
amount: toys.milestones.milestone5.earned.value ? 2 : 1
}
}
} as FactoryComponentDeclaration,

19
src/data/layers/toys.tsx
View file

@ -260,7 +260,24 @@ const layer = createLayer(id, function (this: BaseLayer) {
shouldEarn: () => Decimal.gte(toySum.value, 350),
visibility: () => showIf(milestone3.earned.value)
}));
const milestones = { milestone1, milestone2, milestone3, milestone4 };
const milestone5 = createMilestone(() => ({
display: {
requirement: "750 toys",
effectDisplay: "The wheel crafter now makes 2 wheels instead of 1! Now you should be able to fit everything in the factory."
},
shouldEarn: () => Decimal.gte(toySum.value, 750),
visibility: () => showIf(milestone4.earned.value)
}));
const milestone6 = createMilestone(() => ({
display: {
requirement: "1500 toys",
effectDisplay: "Running out of energy? Let's increase the limit! Multiply energy capacity by 1.4"
},
shouldEarn: () => Decimal.gte(toySum.value, 1500),
visibility: () => showIf(milestone5.earned.value)
}));
const milestones = { milestone1, milestone2, milestone3, milestone4, milestone5, milestone6 };
const { collapseMilestones, display: milestonesDisplay } =
createCollapsibleMilestones(milestones);