From 331d0e75529add9f03a89b363fd143116b9ffdcd Mon Sep 17 00:00:00 2001 From: unsoftcapped3 <75136164+unsoftcapped3@users.noreply.github.com> Date: Thu, 22 Dec 2022 18:19:04 +0000 Subject: [PATCH 1/5] add milestone --- src/data/layers/factory.tsx | 2 +- src/data/layers/toys.tsx | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/data/layers/factory.tsx b/src/data/layers/factory.tsx index eeb95c7..157d4e9 100644 --- a/src/data/layers/factory.tsx +++ b/src/data/layers/factory.tsx @@ -377,7 +377,7 @@ const factory = createLayer(id, () => { }, outputs: { wheel: { - amount: 1 + amount: toys.milestones.milestone5.earned ? 2 : 1 } } }, diff --git a/src/data/layers/toys.tsx b/src/data/layers/toys.tsx index 5884551..e4848d2 100644 --- a/src/data/layers/toys.tsx +++ b/src/data/layers/toys.tsx @@ -260,7 +260,15 @@ 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: "1000 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, 1000), + visibility: () => showIf(milestone4.earned.value) + })); + const milestones = { milestone1, milestone2, milestone3, milestone4, milestone5 }; const { collapseMilestones, display: milestonesDisplay } = createCollapsibleMilestones(milestones); From cac4e797eb7438336a0729a9022e7a4169384707 Mon Sep 17 00:00:00 2001 From: unsoftcapped3 <75136164+unsoftcapped3@users.noreply.github.com> Date: Thu, 22 Dec 2022 18:22:47 +0000 Subject: [PATCH 2/5] something --- src/data/layers/factory.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/layers/factory.tsx b/src/data/layers/factory.tsx index 157d4e9..1e0258d 100644 --- a/src/data/layers/factory.tsx +++ b/src/data/layers/factory.tsx @@ -377,7 +377,7 @@ const factory = createLayer(id, () => { }, outputs: { wheel: { - amount: toys.milestones.milestone5.earned ? 2 : 1 + amount: toys.milestones.milestone5.earned.value ? 2 : 1 } } }, From 3c6d86bd7888ca44d11e14c16ee8276bb9cc4cbc Mon Sep 17 00:00:00 2001 From: unsoftcapped3 <75136164+unsoftcapped3@users.noreply.github.com> Date: Thu, 22 Dec 2022 18:28:12 +0000 Subject: [PATCH 3/5] do something --- src/data/layers/factory.tsx | 5 +++++ src/data/layers/toys.tsx | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/data/layers/factory.tsx b/src/data/layers/factory.tsx index c1cbede..cf2260a 100644 --- a/src/data/layers/factory.tsx +++ b/src/data/layers/factory.tsx @@ -123,6 +123,11 @@ const factory = createLayer(id, () => { createAdditiveModifier(() => ({ addend: () => Decimal.add(1, coal.coal.value).log10(), description: "Coal Energy Production" + })), + createMultiplicativeModifier(()=>({ + multiplier: 1.2, + description: "2000 toys", + enabled: toys.milestones.milestone6.earned })) ]); const computedEnergy = computed(() => energy.apply(0)); diff --git a/src/data/layers/toys.tsx b/src/data/layers/toys.tsx index 2e1a1c3..05cde13 100644 --- a/src/data/layers/toys.tsx +++ b/src/data/layers/toys.tsx @@ -268,7 +268,16 @@ const layer = createLayer(id, function (this: BaseLayer) { shouldEarn: () => Decimal.gte(toySum.value, 1000), visibility: () => showIf(milestone4.earned.value) })); - const milestones = { milestone1, milestone2, milestone3, milestone4, milestone5 }; + + const milestone6 = createMilestone(() => ({ + display: { + requirement: "2000 toys", + effectDisplay: "Running out of energy? Let's increase the limit! Multiply energy capacity by 1.2" + }, + shouldEarn: () => Decimal.gte(toySum.value, 2000), + visibility: () => showIf(milestone5.earned.value) + })); + const milestones = { milestone1, milestone2, milestone3, milestone4, milestone5, milestone6 }; const { collapseMilestones, display: milestonesDisplay } = createCollapsibleMilestones(milestones); From c13c62045e162dc51be4e4508cc841af634f20eb Mon Sep 17 00:00:00 2001 From: unsoftcapped3 <75136164+unsoftcapped3@users.noreply.github.com> Date: Thu, 22 Dec 2022 18:30:33 +0000 Subject: [PATCH 4/5] reduce milestone reqs --- src/data/layers/toys.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/data/layers/toys.tsx b/src/data/layers/toys.tsx index 05cde13..64d523a 100644 --- a/src/data/layers/toys.tsx +++ b/src/data/layers/toys.tsx @@ -262,19 +262,19 @@ const layer = createLayer(id, function (this: BaseLayer) { })); const milestone5 = createMilestone(() => ({ display: { - requirement: "1000 toys", + 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, 1000), + shouldEarn: () => Decimal.gte(toySum.value, 750), visibility: () => showIf(milestone4.earned.value) })); const milestone6 = createMilestone(() => ({ display: { - requirement: "2000 toys", + requirement: "1500 toys", effectDisplay: "Running out of energy? Let's increase the limit! Multiply energy capacity by 1.2" }, - shouldEarn: () => Decimal.gte(toySum.value, 2000), + shouldEarn: () => Decimal.gte(toySum.value, 1500), visibility: () => showIf(milestone5.earned.value) })); const milestones = { milestone1, milestone2, milestone3, milestone4, milestone5, milestone6 }; From 57d7b7118837b21c8252312ef28ea2d774ef095e Mon Sep 17 00:00:00 2001 From: unsoftcapped3 <75136164+unsoftcapped3@users.noreply.github.com> Date: Thu, 22 Dec 2022 18:36:17 +0000 Subject: [PATCH 5/5] increase effect --- src/data/layers/factory.tsx | 2 +- src/data/layers/toys.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/layers/factory.tsx b/src/data/layers/factory.tsx index cf2260a..db6b641 100644 --- a/src/data/layers/factory.tsx +++ b/src/data/layers/factory.tsx @@ -125,7 +125,7 @@ const factory = createLayer(id, () => { description: "Coal Energy Production" })), createMultiplicativeModifier(()=>({ - multiplier: 1.2, + multiplier: 1.4, description: "2000 toys", enabled: toys.milestones.milestone6.earned })) diff --git a/src/data/layers/toys.tsx b/src/data/layers/toys.tsx index 64d523a..cf3d344 100644 --- a/src/data/layers/toys.tsx +++ b/src/data/layers/toys.tsx @@ -272,7 +272,7 @@ const layer = createLayer(id, function (this: BaseLayer) { const milestone6 = createMilestone(() => ({ display: { requirement: "1500 toys", - effectDisplay: "Running out of energy? Let's increase the limit! Multiply energy capacity by 1.2" + 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)