From 17aa5b1c592b09d2a75ff48cb9599fe993149f0e Mon Sep 17 00:00:00 2001 From: unsoftcapped3 <75136164+unsoftcapped3@users.noreply.github.com> Date: Fri, 23 Dec 2022 04:32:32 +0000 Subject: [PATCH] fix bucket --- src/data/layers/factory.tsx | 15 ++++++++++----- src/data/layers/toys.tsx | 12 +++++++++++- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/data/layers/factory.tsx b/src/data/layers/factory.tsx index e127681..0cdb359 100644 --- a/src/data/layers/factory.tsx +++ b/src/data/layers/factory.tsx @@ -162,7 +162,12 @@ const factory = createLayer(id, () => { })), createMultiplicativeModifier(() => ({ multiplier: 1.4, - description: "2000 toys", + description: "1500 toys", + enabled: toys.milestones.milestone6.earned + })), + createMultiplicativeModifier(() => ({ + multiplier: 1.4, + description: "6000 toys", enabled: toys.milestones.milestone6.earned })) ]); @@ -537,7 +542,7 @@ const factory = createLayer(id, () => { } }, outputs: { - shovel: { + bucket: { amount: 1 } }, @@ -1059,7 +1064,7 @@ const factory = createLayer(id, () => { })), createUpgrade(() => ({ resource: paper.paper, - cost: () =>Decimal.pow(10, upgradeAmount.value).mul(1e90), + cost: () =>Decimal.pow(5, upgradeAmount.value).mul(1e90), display: { title: "News Ticker", description: "Paper boosts tick speed" @@ -1068,7 +1073,7 @@ const factory = createLayer(id, () => { })), createUpgrade(() => ({ resource: toys.trucks, - cost: () =>Decimal.pow(1.25, upgradeAmount.value).mul(1000), + cost: () =>Decimal.pow(1.2, upgradeAmount.value).mul(1000), display: { title: "Haul wood in trucks", description: "Trucks multiply wood gain" @@ -1086,7 +1091,7 @@ const factory = createLayer(id, () => { }))], [createUpgrade(() => ({ resource: toys.woodenBlocks, - cost: () =>Decimal.pow(1.25, upgradeAmount.value).mul(1000), + cost: () =>Decimal.pow(1.2, upgradeAmount.value).mul(2000), display: { title: "Larger wood pieces", description: "Wooden block producers produce 3x as much" diff --git a/src/data/layers/toys.tsx b/src/data/layers/toys.tsx index 83c6417..370f43f 100644 --- a/src/data/layers/toys.tsx +++ b/src/data/layers/toys.tsx @@ -288,6 +288,15 @@ const layer = createLayer(id, function (this: BaseLayer) { visibility: () => showIf(milestone6.earned.value && main.days[factory.advancedDay - 1].opened.value) })) as GenericMilestone; + const milestone8 = createMilestone(() => ({ + display: { + requirement: "6000 toys", + effectDisplay: "Running out of energy? Let's increase the limit! Multiply energy capacity by 1.4" + }, + shouldEarn: () => Decimal.gte(toySum.value, 6000), + visibility: () => + showIf(milestone6.earned.value && main.days[factory.advancedDay - 1].opened.value) + })) as GenericMilestone; const milestones = { milestone1, milestone2, @@ -295,7 +304,8 @@ const layer = createLayer(id, function (this: BaseLayer) { milestone4, milestone5, milestone6, - milestone7 + milestone7, + milestone8 }; const { collapseMilestones, display: milestonesDisplay } = createCollapsibleMilestones(milestones);