From 2cf4e58e5e8cccf55a19ac4b27bcfaeccb5a0204 Mon Sep 17 00:00:00 2001
From: unsoftcapped3 <75136164+unsoftcapped3@users.noreply.github.com>
Date: Wed, 21 Dec 2022 00:23:02 +0000
Subject: [PATCH] rest of day 17 stuff

---
 src/data/layers/oil.tsx            |  6 ++++++
 src/data/layers/plastic.tsx        |  6 ++++++
 src/data/layers/toys.tsx           | 19 +++++++++++++++++--
 src/data/layers/wrapping-paper.tsx |  3 ++-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/data/layers/oil.tsx b/src/data/layers/oil.tsx
index 46e367a..4b5f00c 100644
--- a/src/data/layers/oil.tsx
+++ b/src/data/layers/oil.tsx
@@ -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));
diff --git a/src/data/layers/plastic.tsx b/src/data/layers/plastic.tsx
index 170f25c..27499b2 100644
--- a/src/data/layers/plastic.tsx
+++ b/src/data/layers/plastic.tsx
@@ -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));
diff --git a/src/data/layers/toys.tsx b/src/data/layers/toys.tsx
index 79ee3c5..f5d9612 100644
--- a/src/data/layers/toys.tsx
+++ b/src/data/layers/toys.tsx
@@ -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: {
diff --git a/src/data/layers/wrapping-paper.tsx b/src/data/layers/wrapping-paper.tsx
index 0622348..9c30853 100644
--- a/src/data/layers/wrapping-paper.tsx
+++ b/src/data/layers/wrapping-paper.tsx
@@ -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(