Merge branch 'day-17-toys' of https://github.com/thepaperpilot/Advent-Incremental into day-17-toys

src/data/layers/dyes.tsx

@@ -40,7 +40,10 @@ import trees from "./trees";
 import boxes from "./boxes";
 import { ElfBuyable } from "./elves";
 import toys from "./toys"
+<<<<<<< HEAD
 >>>>>>> finish balancing toys layer
+=======
+>>>>>>> 19d58d575e4f3e5ecb3adad514f7089e50360057
 
 interface Dye {
     name: string;
@@ -61,11 +64,15 @@ type DyeUpg =
     | "blueDyeUpg2"
     | "coalUpg";
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 export type enumColor = "blue" | "red" | "green" | "yellow" | "purple" | "orange";
 =======
 export type enumColor = "red" | "green" | "blue" | "yellow" | "purple" | "orange" | "black";
 >>>>>>> finish balancing toys layer
+=======
+export type enumColor = "red" | "green" | "blue" | "yellow" | "purple" | "orange" | "black";
+>>>>>>> 19d58d575e4f3e5ecb3adad514f7089e50360057
 
 const id = "dyes";
 const day = 11;
@@ -525,6 +532,34 @@ const layer = createLayer(id, function (this: BaseLayer) {
             ],
             dyesToReset: []
         }),
+        black: createDye({
+            name: "Black Dye",
+            color: "black",
+            costs: () => [
+                {
+                    base: "1e42",
+                    root: 5,
+                    res: trees.logs
+                },
+                {
+                    base: computed(() => (upgrades.yellowDyeUpg2.bought.value ? "1e15" : "2e15")),
+                    root: 2,
+                    res: oil.oil
+                }
+            ],
+            listedBoosts: [
+                {
+                    visible: true,
+                    desc: computed(
+                        () =>
+                            `*${format(
+                                boosts.black1.value
+                            )} letters processed.`
+                    )
+                }
+            ],
+            dyesToReset: []
+        }),
         orange: createDye({
             name: "Orange Dye",
             color: "orange",

src/data/layers/metal.tsx

@@ -36,10 +36,14 @@ import paper from "./paper";
 import plastic from "./plastic";
 import workshop from "./workshop";
 <<<<<<< HEAD
+<<<<<<< HEAD
 import wrappingPaper from "./wrapping-paper";
 =======
 import toys from "./toys";
 >>>>>>> finish balancing toys layer
+=======
+import toys from "./toys";
+>>>>>>> 19d58d575e4f3e5ecb3adad514f7089e50360057
 
 const id = "metal";
 const day = 7;

src/data/layers/trees.tsx

@@ -537,6 +537,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
             enabled: computed(() => Decimal.gt(wrappingPaper.boosts.christmas1.value, 1))
         })),
         createMultiplicativeModifier(() => ({
+<<<<<<< HEAD
 <<<<<<< HEAD
             multiplier: () => Decimal.add(computedTotalTrees.value, 1).log10(),
             description: "Trees Decoration",
@@ -546,6 +547,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
             description: "Load logs onto trucks",
             enabled: toys.row1Upgrades[0].bought
 >>>>>>> finish balancing toys layer
+=======
+            multiplier: 2,
+            description: "Load logs onto trucks",
+            enabled: toys.row1Upgrades[0].bought
+>>>>>>> 19d58d575e4f3e5ecb3adad514f7089e50360057
         })),
         createExponentialModifier(() => ({
             exponent: 1.2,

src/data/projEntry.tsx

@@ -34,10 +34,14 @@ import trees from "./layers/trees";
 import workshop from "./layers/workshop";
 import wrappingPaper from "./layers/wrapping-paper";
 <<<<<<< HEAD
+<<<<<<< HEAD
 import ribbon from "./layers/ribbon";
 =======
 import toys from "./layers/toys";
 >>>>>>> fix toy sum
+=======
+import toys from "./layers/toys";
+>>>>>>> 19d58d575e4f3e5ecb3adad514f7089e50360057
 import boxesSymbol from "./symbols/cardboardBox.png";
 import clothSymbol from "./symbols/cloth.png";
 import coalSymbol from "./symbols/coal.png";
@@ -579,12 +583,16 @@ export const getInitialLayers = (
     dyes,
     management,
     letters,
+<<<<<<< HEAD
 <<<<<<< HEAD
     wrappingPaper,
     ribbon
 =======
     toys,
 >>>>>>> fix toy sum
+=======
+    toys,
+>>>>>>> 19d58d575e4f3e5ecb3adad514f7089e50360057
 ];
 
 /**