From 850ccdbd5f13d130d85cfb9694fce0af5516e406 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Tue, 20 Dec 2022 21:27:22 -0600
Subject: [PATCH] Cleaned up

---
 src/data/Day.vue                   | 15 +++++++--------
 src/data/layers/trees.tsx          |  2 +-
 src/data/layers/workshop.tsx       |  2 +-
 src/data/layers/wrapping-paper.tsx |  5 ++++-
 src/data/projEntry.tsx             |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/data/Day.vue b/src/data/Day.vue
index 21389ce..a63ccc3 100644
--- a/src/data/Day.vue
+++ b/src/data/Day.vue
@@ -48,16 +48,15 @@
 <script setup lang="ts">
 import Notif from "components/Notif.vue";
 import Tooltip from "features/tooltips/Tooltip.vue";
-import Decimal from "util/bignum";
 import { layers } from "game/layers";
-import { Direction } from "util/common";
+import Decimal from "util/bignum";
 import { formatTime } from "util/break_eternity";
+import { Direction } from "util/common";
 import { ProcessedComputable } from "util/computed";
-import { Ref, Transition } from "vue";
-import { computed, unref } from "vue";
-import { main } from "./projEntry";
+import { computed, Ref, Transition, unref } from "vue";
 import coal from "./layers/coal";
 import dyes from "./layers/dyes";
+import { main } from "./projEntry";
 
 const props = defineProps<{
     day: number;
@@ -77,7 +76,7 @@ const emit = defineEmits<{
 
 const canOpen = computed(
     () =>
-        props.layer &&
+        props.layer != null &&
         Decimal.gte(main.day.value, props.day) &&
         new Date().getMonth() === 11 &&
         new Date().getDate() >= props.day
@@ -88,14 +87,14 @@ const includeMastery = computed(
     () =>
         props.mastered.value ||
         main.currentlyMastering.value == layers[props.layer ?? ""] ||
-        ["wrappingPaper", "ribbon"].includes(props.layer || "") ||
+        ["wrappingPaper", "ribbon"].includes(props.layer ?? "") ||
         (coal.mastered.value && props.layer == "elves") ||
         (dyes.mastered.value && props.layer == "elves")
 );
 const masteryLock = computed(() => isMastering.value && !includeMastery.value);
 
 function tryUnlock() {
-    if (canOpen.value) {
+    if (canOpen.value === true) {
         emit("unlockLayer");
     }
 }
diff --git a/src/data/layers/trees.tsx b/src/data/layers/trees.tsx
index 8bc2497..8bc93e2 100644
--- a/src/data/layers/trees.tsx
+++ b/src/data/layers/trees.tsx
@@ -404,7 +404,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         createAdditiveModifier(() => ({
             addend: 1,
             description: "Automated Spade",
-            enabled: autoPlantUpgrade1.bought.value
+            enabled: autoPlantUpgrade1.bought
         })),
         createAdditiveModifier(() => ({
             addend: () => Decimal.div(autoPlantingBuyable1.amount.value, 2),
diff --git a/src/data/layers/workshop.tsx b/src/data/layers/workshop.tsx
index 1b6ea38..6bc112e 100644
--- a/src/data/layers/workshop.tsx
+++ b/src/data/layers/workshop.tsx
@@ -49,7 +49,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         scaling: addHardcap(
             addSoftcap(addSoftcap(createPolynomialScaling(250, 1.5), 5423, 1 / 1e10), 1e20, 3e8),
             computed(() =>
-                toys.row1Upgrades[2].bought
+                toys.row1Upgrades[2].bought.value
                     ? 1200
                     : management.elfTraining.expandersElfTraining.milestones[2].earned.value
                     ? 1000
diff --git a/src/data/layers/wrapping-paper.tsx b/src/data/layers/wrapping-paper.tsx
index 9c30853..5aa998c 100644
--- a/src/data/layers/wrapping-paper.tsx
+++ b/src/data/layers/wrapping-paper.tsx
@@ -278,7 +278,10 @@ const layer = createLayer(id, () => {
         beach1: computed(() =>
             main.isMastery.value
                 ? 1
-                : Decimal.add(wrappingPaper.beach.buyable.amount.value, 1).log10().add(1).pow(toys.milestones.milestone3.earned.value ? 1.6 : 1)
+                : Decimal.add(wrappingPaper.beach.buyable.amount.value, 1)
+                      .log10()
+                      .add(1)
+                      .pow(toys.milestones.milestone3.earned.value ? 1.6 : 1)
         )
     };
     const wrappingPaperSum = createResource(
diff --git a/src/data/projEntry.tsx b/src/data/projEntry.tsx
index efe1bb0..4ba7193 100644
--- a/src/data/projEntry.tsx
+++ b/src/data/projEntry.tsx
@@ -224,7 +224,7 @@ export const main = createLayer("main", function (this: BaseLayer) {
                             openDay(layer ?? "trees");
                         },
                         onUnlockLayer() {
-                            if (layer) {
+                            if (layer != null) {
                                 opened.value = true;
                                 setTimeout(() => {
                                     loreScene.value = -1;