thepaperpilot/Advent-Incremental
1
0
Fork 0
mirror of https://github.com/thepaperpilot/Advent-Incremental.git synced 2025-03-20 13:20:29 +00:00
Code Issues Releases Activity Actions

Fixed some layers activating during mastery before they should

Browse source
This commit is contained in:
thepaperpilot 2022-12-18 16:41:00 -06:00
parent bef5ce94ec
commit 294cd5c989
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/data/layers/coal.tsx
View file

@ -134,7 +134,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
color: colorText, color: colorText,
width: "160px", width: "160px",
flexGrow: 1 flexGrow: 1
} },
visibility: () => showIf(!main.isMastery.value || masteryEffectActive.value)
})) as ElfBuyable & { resource: Resource }; })) as ElfBuyable & { resource: Resource };
const { const {

17
src/data/layers/paper.tsx
View file

@ -91,7 +91,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
} }
paperConversion.convert(); paperConversion.convert();
}, },
style: "width: 600px; min-height: unset" style: "width: 600px; min-height: unset",
visibility: () => showIf(!main.isMastery.value || masteryEffectActive.value)
})); }));
function createBook( function createBook(
@ -534,11 +535,15 @@ const layer = createLayer(id, function (this: BaseLayer) {
) : null} ) : null}
<MainDisplay resource={paper} color={color} style="margin-bottom: 0" /> <MainDisplay resource={paper} color={color} style="margin-bottom: 0" />
<Spacer /> <Spacer />
{render(makePaper)} {!main.isMastery.value || masteryEffectActive.value ? (
<Spacer /> <>
{renderGrid(Object.values(upgrades), Object.values(upgrades2))} {render(makePaper)}
<Spacer /> <Spacer />
{renderCol(...Object.values(books))} {renderGrid(Object.values(upgrades), Object.values(upgrades2))}
<Spacer />
{renderCol(...Object.values(books))}
</>
) : null}
</> </>
)), )),
minimizedDisplay: jsx(() => ( minimizedDisplay: jsx(() => (