From 9b4428d42fd4c24040d4a17be40fd5d3c695323a Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Tue, 13 Dec 2022 10:11:08 -0600
Subject: [PATCH] Fixed mangement progress bar after completing day 12

---
 src/components/Options.vue     | 22 +++++++++++++++-------
 src/data/layers/management.tsx |  8 +++++---
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/components/Options.vue b/src/components/Options.vue
index bc7ed8e..208caae 100644
--- a/src/components/Options.vue
+++ b/src/components/Options.vue
@@ -3,14 +3,20 @@
         <template v-slot:header>
             <h2>Settings</h2>
             <div class="option-tabs">
-                <button :class="{selected: isTab('behaviour')}" @click="setTab('behaviour')">Behaviour</button>
-                <button :class="{selected: isTab('appearance')}" @click="setTab('appearance')">Appearance</button>
+                <button :class="{ selected: isTab('behaviour') }" @click="setTab('behaviour')">
+                    Behaviour
+                </button>
+                <button :class="{ selected: isTab('appearance') }" @click="setTab('appearance')">
+                    Appearance
+                </button>
             </div>
         </template>
         <template v-slot:body>
             <div v-if="isTab('behaviour')">
                 <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
+                >
                 <Toggle v-if="projInfo.enablePausing" :title="isPausedTitle" v-model="isPaused" />
                 <Toggle :title="autoPauseTitle" v-model="autoPause" />
             </div>
@@ -56,11 +62,11 @@ defineExpose({
     }
 });
 
-function isTab (tab: string): boolean {
+function isTab(tab: string): boolean {
     return tab == currentTab.value;
 }
 
-function setTab (tab: string) {
+function setTab(tab: string) {
     currentTab.value = tab;
 }
 
@@ -86,7 +92,6 @@ const isPaused = computed({
     }
 });
 
-
 const autosaveTitle = jsx(() => (
     <span class="option-title">
         Autosave<Tooltip display="Save-specific">*</Tooltip>
@@ -102,7 +107,10 @@ const isPausedTitle = jsx(() => (
 const autoPauseTitle = jsx(() => (
     <span class="option-title">
         Auto-pause<Tooltip display="Save-specific">*</Tooltip>
-        <desc>Automatically pause the game when a day is completed. It is best to keep this on to avoid over-grinding.</desc>
+        <desc>
+            Automatically pause the game when a day is completed. It is best to keep this on to
+            avoid over-grinding.
+        </desc>
     </span>
 ));
 
diff --git a/src/data/layers/management.tsx b/src/data/layers/management.tsx
index 6b2dfed..ea93598 100644
--- a/src/data/layers/management.tsx
+++ b/src/data/layers/management.tsx
@@ -52,12 +52,13 @@ const layer = createLayer(id, () => {
             main.day.value === day
                 ? day12Elves.reduce((acc, curr) => acc + Math.min(1, curr.level.value / 3), 0) /
                   day12Elves.length
-                : main.day.value === advancedDay
+                : main.day.value === advancedDay && main.days[advancedDay - 1].opened.value
                 ? day13Elves.reduce((acc, curr) => acc + Math.min(1, curr.level.value / 5), 0) /
                   day13Elves.length
                 : 1,
         display: jsx(() =>
-            main.day.value === day || main.day.value === advancedDay ? (
+            main.day.value === day ||
+            (main.day.value === advancedDay && main.days[advancedDay - 1].opened.value) ? (
                 <>
                     {formatWhole(
                         Decimal.times(
@@ -273,7 +274,8 @@ const layer = createLayer(id, () => {
                 requirement: "Holly Level 3",
                 effectDisplay: jsx(() => (
                     <>
-                        Multiply all cloth actions' effectiveness by log<sub>10</sub>(Cutter amount).
+                        Multiply all cloth actions' effectiveness by log<sub>10</sub>(Cutter
+                        amount).
                     </>
                 ))
             },