From ad0064d65d85a848372bf4c275aa8ee03b501544 Mon Sep 17 00:00:00 2001
From: ducdat0507 <62660527+ducdat0507@users.noreply.github.com>
Date: Thu, 15 Dec 2022 16:43:08 +0700
Subject: [PATCH] Minor polishing

---
 src/components/Layer.vue     | 30 +++++++++++++++++++++---------
 src/components/Options.vue   | 10 ++++++----
 src/data/layers/coal.tsx     |  2 +-
 src/data/layers/workshop.tsx |  2 +-
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/components/Layer.vue b/src/components/Layer.vue
index 62cca55..20cdf27 100644
--- a/src/components/Layer.vue
+++ b/src/components/Layer.vue
@@ -1,7 +1,8 @@
 <template>
     <div class="layer-container" :style="{ '--layer-color': unref(color) }">
         <button v-if="showGoBack" class="goBack" @click="goBack">❌</button>
-        <button class="layer-tab minimized" v-if="minimized.value" @click="minimized.value = false">
+
+        <button class="layer-tab minimized" v-if="minimized" @click="setMinimized(false)">
             <component v-if="minimizedComponent" :is="minimizedComponent" />
             <div v-else>{{ unref(name) }}</div>
         </button>
@@ -10,7 +11,8 @@
                 <component :is="component" />
             </Context>
         </div>
-        <button v-if="unref(minimizable)" class="minimize" @click="minimized.value = true">
+
+        <button v-if="unref(minimizable)" class="minimize" @click="setMinimized(true)">
             ▼
         </button>
     </div>
@@ -63,7 +65,7 @@ export default defineComponent({
         }
     },
     setup(props) {
-        const { display, index, minimized, minWidth, tab, minimizedDisplay } = toRefs(props);
+        const { display, index, minimized, minWidth, tab, minimizedDisplay, name } = toRefs(props);
 
         const component = computeComponent(display);
         const minimizedComponent = computeOptionalComponent(minimizedDisplay);
@@ -75,23 +77,28 @@ export default defineComponent({
             player.tabs.splice(unref(props.index), 1);
         }
 
+        function setMinimized(min: boolean) {
+            minimized.value = min;
+        }
+
         nextTick(() => updateTab(minimized.value, unref(minWidth.value)));
-        watch([minimized, wrapRef(minWidth)], ([minimized, minWidth]) =>
-            updateTab(minimized, minWidth)
-        );
+        watch([name, minimized, wrapRef(minWidth)], ([name, minimized, minWidth]) => {
+            updateTab(minimized, minWidth);
+        });
 
         function updateNodes(nodes: Record<string, FeatureNode | undefined>) {
             props.nodes.value = nodes;
         }
 
-        function updateTab(minimized: boolean, minWidth: number | string) {
+        function updateTab(min: boolean, minWidth: number | string) {
+            minimized.value = min;
             const width =
                 typeof minWidth === "number" || Number.isNaN(parseInt(minWidth))
                     ? minWidth + "px"
                     : minWidth;
             const tabValue = tab.value();
             if (tabValue != undefined) {
-                if (minimized) {
+                if (min) {
                     tabValue.style.flexGrow = "0";
                     tabValue.style.flexShrink = "0";
                     tabValue.style.width = "60px";
@@ -107,13 +114,17 @@ export default defineComponent({
             }
         }
 
+
         return {
             component,
             minimizedComponent,
             showGoBack,
             updateNodes,
             unref,
-            goBack
+            goBack,
+            setMinimized,
+            minimized,
+            minWidth,
         };
     }
 });
@@ -162,6 +173,7 @@ export default defineComponent({
 .layer-tab.minimized > * {
     margin: 0;
     writing-mode: vertical-rl;
+    text-align: left;
     padding-left: 10px;
     width: 50px;
 }
diff --git a/src/components/Options.vue b/src/components/Options.vue
index 0be178a..98fa0fb 100644
--- a/src/components/Options.vue
+++ b/src/components/Options.vue
@@ -15,11 +15,13 @@
             <div v-if="isTab('behaviour')">
                 <div v-if="canAutoSave">
                     <Toggle :title="autosaveTitle" v-model="autosave" />
-                    <FeedbackButton v-if="!autosave" class="button save-button" @click="save()"
-                        >Manually save</FeedbackButton
-                    >
+                    <FeedbackButton v-if="!autosave" class="button save-button" @click="save()">
+                        Manually save
+                    </FeedbackButton>
+                </div>
+                <div style="text-align: center" v-else>
+                    Auto-saving is disabled while between days
                 </div>
-                <div style="text-align: center" v-else>Auto-saving disabled while between days</div>
                 <Toggle v-if="projInfo.enablePausing" :title="isPausedTitle" v-model="isPaused" />
             </div>
             <div v-if="isTab('appearance')">
diff --git a/src/data/layers/coal.tsx b/src/data/layers/coal.tsx
index b09edb4..dfaa390 100644
--- a/src/data/layers/coal.tsx
+++ b/src/data/layers/coal.tsx
@@ -579,7 +579,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         inverseCost(x: DecimalSource) {
             let v = Decimal.div(x, 50000).root(1.5).sub(1);
             v = v.mul(wrappingPaper.boosts.rainbow1.value);
-            if (management.elfTraining.fertilizerElfTraining.milestones[0].earned.value) {
+            if (management.elfTraining.fertilizerElfTraining.milestones[1].earned.value) {
                 v = v.div(Decimal.pow(0.95, paper.books.fertilizerBook.totalAmount.value));
             }
             v = v.div(Decimal.pow(0.95, paper.books.fertilizerBook.totalAmount.value));
diff --git a/src/data/layers/workshop.tsx b/src/data/layers/workshop.tsx
index 70bfeaa..055abdb 100644
--- a/src/data/layers/workshop.tsx
+++ b/src/data/layers/workshop.tsx
@@ -326,7 +326,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         )),
         minimizedDisplay: jsx(() => (
             <div>
-                {name} - {format(foundationProgress.value)} {foundationProgress.displayName}
+                {name} - {format(foundationProgress.value)}% {foundationProgress.displayName}
             </div>
         ))
     };