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

Fixed workshop mastery issues

Browse source
This commit is contained in:
thepaperpilot 2022-12-18 15:47:46 -06:00
parent c47e6cf2f5
commit 0bbe295d70
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/data/layers/workshop.tsx
View file

@ -24,7 +24,7 @@ import {
createSequentialModifier createSequentialModifier
} from "game/modifiers"; } from "game/modifiers";
import { noPersist, persistent } from "game/persistence"; import { noPersist, persistent } from "game/persistence";
import Decimal, { DecimalSource, format, formatWhole } from "util/bignum"; import Decimal, { DecimalSource, formatWhole } from "util/bignum";
import { Direction } from "util/common"; import { Direction } from "util/common";
import { render } from "util/vue"; import { render } from "util/vue";
import { computed, unref, watchEffect } from "vue"; import { computed, unref, watchEffect } from "vue";
@ -371,10 +371,18 @@ const layer = createLayer(id, function (this: BaseLayer) {
<div> <div>
{main.day.value === day {main.day.value === day
? `Complete the foundation to complete the day` ? `Complete the foundation to complete the day`
: main.currentlyMastering.value?.name === name
? `Complete the foundation to decorate the day`
: `${name} Complete!`} : `${name} Complete!`}
</div> </div>
{render(dayProgress)} {render(dayProgress)}
<Spacer /> <Spacer />
{masteryEffectActive.value ? (
<>
Decoration effect: Logs are just a requirement instead of a cost
<Spacer />
</>
) : null}
<div> <div>
<span>The foundation is </span> <span>The foundation is </span>
<h2 style={`color: ${color}; text-shadow: 0 0 10px ${color}`}> <h2 style={`color: ${color}; text-shadow: 0 0 10px ${color}`}>
@ -394,7 +402,9 @@ const layer = createLayer(id, function (this: BaseLayer) {
minimizedDisplay: jsx(() => ( minimizedDisplay: jsx(() => (
<div> <div>
{name}{" "} {name}{" "}
<span class="desc">{formatWhole(foundationProgress.value)}% {foundationProgress.displayName}</span> <span class="desc">
{formatWhole(foundationProgress.value)}% {foundationProgress.displayName}
</span>
</div> </div>
)), )),
mastery, mastery,