thepaperpilot/Advent-Incremental
1
0
Fork 0
mirror of https://github.com/thepaperpilot/Advent-Incremental.git synced 2024-11-22 08:31:35 +00:00
Code Issues Releases Activity Actions

Fixed mangement progress bar after completing day 12

Browse source
This commit is contained in:
thepaperpilot 2022-12-13 10:11:08 -06:00
parent 8b0194ae02
commit 9b4428d42f
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/components/Options.vue
View file

@ -3,14 +3,20 @@
<template v-slot:header> <template v-slot:header>
<h2>Settings</h2> <h2>Settings</h2>
<div class="option-tabs"> <div class="option-tabs">
<button :class="{selected: isTab('behaviour')}" @click="setTab('behaviour')">Behaviour</button> <button :class="{ selected: isTab('behaviour') }" @click="setTab('behaviour')">
<button :class="{selected: isTab('appearance')}" @click="setTab('appearance')">Appearance</button> Behaviour
</button>
<button :class="{ selected: isTab('appearance') }" @click="setTab('appearance')">
Appearance
</button>
</div> </div>
</template> </template>
<template v-slot:body> <template v-slot:body>
<div v-if="isTab('behaviour')"> <div v-if="isTab('behaviour')">
<Toggle :title="autosaveTitle" v-model="autosave" /> <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 v-if="projInfo.enablePausing" :title="isPausedTitle" v-model="isPaused" />
<Toggle :title="autoPauseTitle" v-model="autoPause" /> <Toggle :title="autoPauseTitle" v-model="autoPause" />
</div> </div>
@ -56,11 +62,11 @@ defineExpose({
} }
}); });
function isTab (tab: string): boolean { function isTab(tab: string): boolean {
return tab == currentTab.value; return tab == currentTab.value;
} }
function setTab (tab: string) { function setTab(tab: string) {
currentTab.value = tab; currentTab.value = tab;
} }
@ -86,7 +92,6 @@ const isPaused = computed({
} }
}); });
const autosaveTitle = jsx(() => ( const autosaveTitle = jsx(() => (
<span class="option-title"> <span class="option-title">
Autosave<Tooltip display="Save-specific">*</Tooltip> Autosave<Tooltip display="Save-specific">*</Tooltip>
@ -102,7 +107,10 @@ const isPausedTitle = jsx(() => (
const autoPauseTitle = jsx(() => ( const autoPauseTitle = jsx(() => (
<span class="option-title"> <span class="option-title">
Auto-pause<Tooltip display="Save-specific">*</Tooltip> 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> </span>
)); ));

8
src/data/layers/management.tsx
View file

@ -52,12 +52,13 @@ const layer = createLayer(id, () => {
main.day.value === day main.day.value === day
? day12Elves.reduce((acc, curr) => acc + Math.min(1, curr.level.value / 3), 0) / ? day12Elves.reduce((acc, curr) => acc + Math.min(1, curr.level.value / 3), 0) /
day12Elves.length 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.reduce((acc, curr) => acc + Math.min(1, curr.level.value / 5), 0) /
day13Elves.length day13Elves.length
: 1, : 1,
display: jsx(() => 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( {formatWhole(
Decimal.times( Decimal.times(
@ -273,7 +274,8 @@ const layer = createLayer(id, () => {
requirement: "Holly Level 3", requirement: "Holly Level 3",
effectDisplay: jsx(() => ( 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).
</> </>
)) ))
}, },