Merge remote-tracking branch 'origin/main' into days-15-16

src/components/Layer.vue

@@ -237,3 +237,9 @@ export default defineComponent({
     text-shadow: 0 0 7px var(--foreground);
 }
 </style>
+<style> 
+.layer-tab.minimized > * > .desc {
+    color: var(--accent1);
+    font-size: 30px;
+}
+</style>

src/data/layers/boxes.tsx

@@ -653,7 +653,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
         )),
         minimizedDisplay: jsx(() => (
             <div>
-                {name} - {format(boxes.value)} {boxes.displayName}
+                {name}{" "}
+                <span class="desc">{format(boxes.value)} {boxes.displayName}</span>
             </div>   
         )),
         mastery,

src/data/layers/cloth.tsx

@@ -658,7 +658,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
         )),
         minimizedDisplay: jsx(() => (
             <div>
-                {name} - {format(cloth.value)} {cloth.displayName}
+                {name}{" "}
+                <span class="desc">{format(cloth.value)} {cloth.displayName}</span>
             </div>   
         )),
         mastery,

src/data/layers/coal.tsx

@@ -132,7 +132,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
         },
         style: {
             color: colorText,
-            width: "160px"
+            width: "160px",
+            flexGrow: 1
         }
     })) as ElfBuyable & { resource: Resource };
 
@@ -196,7 +197,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
         },
         style: {
             color: colorText,
-            width: "160px"
+            width: "160px",
+            flexGrow: 1
         },
         visibility: () => showIf(unlockBonfire.bought.value)
     })) as ElfBuyable & { resource: Resource };
@@ -262,7 +264,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
         },
         style: {
             color: colorText,
-            width: "160px"
+            width: "160px",
+            flexGrow: 1
         },
         visibility: () => showIf(unlockKiln.bought.value)
     })) as ElfBuyable & { resource: Resource };
@@ -334,7 +337,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
         },
         style: {
             color: colorText,
-            width: "160px"
+            width: "160px",
+            flexGrow: 1
         },
         visibility: () => showIf(metal.coalDrill.bought.value)
     })) as ElfBuyable & { resource: Resource };
@@ -1174,7 +1178,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
         )),
         minimizedDisplay: jsx(() => (
             <div>
-                {name} - {format(coal.value)} {coal.displayName}
+                {name}{" "}
+                <span class="desc">{format(coal.value)} {coal.displayName}</span>
             </div>   
         )),
         mastery,

src/data/layers/dyes.tsx

@@ -96,7 +96,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
                 modifiers.push(
                     createMultiplicativeModifier(() => ({
                         multiplier() {
-                            return Decimal.add(dyes.red.amount.value, 1).log10().pow(0.75);
+                            return Decimal.add(dyes.red.amount.value, 1).log10().add(1).pow(0.75);
                         },
                         description: "Dye Synergy I"
                     }))

src/data/layers/letters.tsx

@@ -303,7 +303,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
         )),
         minimizedDisplay: jsx(() => (
             <div>
-                {name} - {format(letters.value)} {letters.displayName}
+                {name}{" "}
+                <span class="desc">{format(letters.value)} {letters.displayName}</span>
             </div>   
         )),
         mastery,

src/data/layers/management.tsx

@@ -1228,16 +1228,6 @@ const layer = createLayer(id, () => {
             multiplier: 2,
             description: "Focus Upgrade 1",
             enabled: focusUpgrade1.bought
-        })),
-        createAdditiveModifier(() => ({
-            addend() {
-                return Decimal.add(dyes.dyes.orange.amount.value, dyes.dyes.purple.amount.value)
-                    .add(dyes.dyes.green.amount.value)
-                    .add(1)
-                    .cbrt();
-            },
-            description: "Colorful Focus",
-            enabled: oil.row3Upgrades[2].bought
         }))
     ]) as WithRequired<Modifier, "revert" | "description">;
     const maximumElvesModifier = createSequentialModifier(() => [

src/data/layers/metal.tsx

@@ -203,9 +203,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         createMultiplicativeModifier(() => ({
             multiplier: 3,
             description: "Twinkle Level 3",
-            enabled: () =>
+            enabled: management.elfTraining.metalElfTraining.milestones[2].earned
-                management.elfTraining.metalElfTraining.milestones[2].earned.value &&
-                !main.isMastery.value
         })),
         createMultiplicativeModifier(() => ({
             multiplier: () => Decimal.add(industrialCrucible.amount.value, 1).sqrt(),
@@ -770,7 +768,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
         )),
         minimizedDisplay: jsx(() => (
             <div>
-                {name} - {format(metal.value)} {metal.displayName}
+                {name}{" "}
+                <span class="desc">{format(metal.value)} {metal.displayName}</span>
             </div>   
         )),
         mastery,

src/data/layers/oil.tsx

@@ -1352,10 +1352,10 @@ const layer = createLayer(id, function (this: BaseLayer) {
         }),
         minimizedDisplay: jsx(() => (
             <div>
-                {name} - {format(oil.value)} {oil.displayName}
+                {name}{" "}
+                <span class="desc">{format(oil.value)} {oil.displayName}</span>
             </div>   
         )),
-
         mastery,
         mastered
     };

src/data/layers/paper.tsx

@@ -533,7 +533,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
         )),
         minimizedDisplay: jsx(() => (
             <div>
-                {name} - {format(paper.value)} {paper.displayName}
+                {name}{" "}
+                <span class="desc">{format(paper.value)} {paper.displayName}</span>
             </div>   
         )),
         mastery,

src/data/layers/plastic.tsx

@@ -280,9 +280,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         createMultiplicativeModifier(() => ({
             multiplier: () => Decimal.add(oil.buildExtractor.amount.value, 1).pow(1.25),
             description: "Snowball Level 4",
-            enabled: () =>
+            enabled: management.elfTraining.kilnElfTraining.milestones[3].earned
-                management.elfTraining.kilnElfTraining.milestones[3].earned.value &&
-                !main.isMastery.value
         })),
         createMultiplicativeModifier(() => ({
             multiplier: () => Decimal.add(dyes.secondaryDyeSum.value, 1).cbrt(),
@@ -385,7 +383,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
         )),
         minimizedDisplay: jsx(() => (
             <div>
-                {name} - {format(plastic.value)} {plastic.displayName}
+                {name}{" "}
+                <span class="desc">{format(plastic.value)} {plastic.displayName}</span>
             </div>   
         )),
         mastery,

src/data/layers/trees.tsx

@@ -778,6 +778,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
             Decimal.times(computedAutoPlantingAmount.value, diff)
         );
         saplings.value = Decimal.sub(saplings.value, amountPlanted);
+        if(Decimal.gte(saplings.value, computedTotalTrees.value)) saplings.value = computedTotalTrees.value;
     });
 
     const netSaplingGain = computed(() =>
@@ -917,7 +918,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
         )),
         minimizedDisplay: jsx(() => (
             <div>
-                {name} - {format(logs.value)} {logs.displayName}
+                {name}{" "}
+                <span class="desc">{format(logs.value)} {logs.displayName}</span>
             </div>   
         )),
         mastery,

src/data/layers/workshop.tsx

@@ -393,7 +393,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
         )),
         minimizedDisplay: jsx(() => (
             <div>
-                {name} - {format(foundationProgress.value)}% {foundationProgress.displayName}
+                {name}{" "}
+                <span class="desc">{formatWhole(foundationProgress.value)}% {foundationProgress.displayName}</span>
             </div>
         )),
         mastery,