From e462a2ae61a34fdd68c047c394d5af46fd1b887d Mon Sep 17 00:00:00 2001
From: unsoftcapped3 <75136164+unsoftcapped3@users.noreply.github.com>
Date: Fri, 23 Dec 2022 03:19:44 +0000
Subject: [PATCH] first row upg effects

---
 src/data/layers/factory.tsx | 14 ++++++++++----
 src/data/layers/oil.tsx     |  7 +++++++
 src/data/layers/trees.tsx   |  6 ++++++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/data/layers/factory.tsx b/src/data/layers/factory.tsx
index 66aaa72..3a2d8e8 100644
--- a/src/data/layers/factory.tsx
+++ b/src/data/layers/factory.tsx
@@ -189,7 +189,13 @@ const factory = createLayer(id, () => {
             multiplier: energyEfficiency,
             description: "Energy Consumption",
             enabled: () => Decimal.gt(energyConsumption.value, computedEnergy.value)
+        })),
+        createMultiplicativeModifier(() => ({
+            multiplier: Decimal.add(paper.paper.value, 1).log10().div(100).add(1),
+            description: "News Ticker",
+            enabled: () => upgrades[0][1].bought.value 
         }))
+        
     ]);
     const computedTickRate = computed(() => tickRate.apply(1));
     const factorySize = createSequentialModifier(() => [
@@ -395,12 +401,12 @@ const factory = createLayer(id, () => {
             tick: 1,
             inputs: {
                 wood: {
-                    amount: 1
+                    amount: computed(() => (upgrades[0][0].bought.value ? 2 : 1))
                 }
             },
             outputs: {
                 plank: {
-                    amount: 1
+                    amount: computed(() => (upgrades[0][0].bought.value ? 2 : 1))
                 }
             }
         } as FactoryComponentDeclaration,
@@ -1038,7 +1044,7 @@ const factory = createLayer(id, () => {
             cost: () =>Decimal.pow(10, upgradeAmount.value).mul(1e80),
             display: {
                 title: "Sawmill Efficiency",
-                description: "Metal increases sawmill consumption and production by *log(metal)/10"
+                description: "Double sawmill consumption and production and metal supplier efficiency"
             },
             visible: () => showIf(main.days[advancedDay - 1].opened.value)
         })),
@@ -1047,7 +1053,7 @@ const factory = createLayer(id, () => {
             cost: () =>Decimal.pow(10, upgradeAmount.value).mul(1e94),
             display: {
                 title: "News Ticker",
-                description: "Paper boosts tick speed" // formula: *1+log(x)/100
+                description: "Paper boosts tick speed"
             },
             visible: () => showIf(main.days[advancedDay - 1].opened.value)
         })),
diff --git a/src/data/layers/oil.tsx b/src/data/layers/oil.tsx
index a047ba9..9b1d346 100644
--- a/src/data/layers/oil.tsx
+++ b/src/data/layers/oil.tsx
@@ -25,6 +25,7 @@ import {
     createSequentialModifier,
     createAdditiveModifier,
     createMultiplicativeModifier,
+    createExponentialModifier,
     Modifier
 } from "game/modifiers";
 import { main } from "data/projEntry";
@@ -41,6 +42,7 @@ import workshop from "./workshop";
 import { WithRequired } from "util/common";
 import { ElfBuyable } from "./elves";
 import toys from "./toys";
+import factory from "./factory";
 
 const id = "oil";
 const day = 9;
@@ -889,6 +891,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
             multiplier: dyes.boosts.red2,
             description: "Red Dye",
             enabled: dyes.masteryEffectActive
+        })),
+        createExponentialModifier(() => ({
+            exponent: 1.2,
+            description: "Diamond-tipped drills",
+            enabled: factory.upgrades[0][3].bought.value
         }))
     ]);
     const computedDrillPower = computed(() => drillPower.apply(0));
diff --git a/src/data/layers/trees.tsx b/src/data/layers/trees.tsx
index 51a799a..034fdf3 100644
--- a/src/data/layers/trees.tsx
+++ b/src/data/layers/trees.tsx
@@ -39,6 +39,7 @@ import paper from "./paper";
 import workshop from "./workshop";
 import wrappingPaper from "./wrapping-paper";
 import toys from "./toys";
+import factory from "./factory";
 const id = "trees";
 const day = 1;
 
@@ -551,6 +552,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
             description: "3000 Toys",
             enabled: toys.milestones.milestone7.earned
         })),
+        createMultiplicativeModifier(() => ({
+            multiplier: () => Decimal.add(toys.trucks.value, 1),
+            description: "Haul wood in trucks",
+            enabled: factory.upgrades[0][2].bought
+        })),
         createExponentialModifier(() => ({
             exponent: 1.2,
             description: "100% Foundation Completed",