Merge remote-tracking branch 'origin/main' into day-20-factory

This commit is contained in:
thepaperpilot 2022-12-23 21:22:09 -06:00
commit 87fa404662
3 changed files with 5 additions and 1 deletions

View file

@ -98,7 +98,7 @@ const isPaused = computed({
}); });
const canAutoSave = computed( const canAutoSave = computed(
() => (layers as any).main.days[(layers as any).main.day.value - 1].opened.value () => (layers as any).main?.days[(layers as any).main?.day.value - 1].opened.value
); );
const autosaveTitle = jsx(() => ( const autosaveTitle = jsx(() => (

View file

@ -339,6 +339,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
) : null} ) : null}
<MainDisplay resource={letters} color={color} /> <MainDisplay resource={letters} color={color} />
{render(process)} {render(process)}
If your letters are stuck, try holding L
{Decimal.lt(totalLetters.value, 8e9) ? ( {Decimal.lt(totalLetters.value, 8e9) ? (
<div> <div>
The more letters you process, the more you'll improve at processing letters. The more letters you process, the more you'll improve at processing letters.

View file

@ -123,6 +123,9 @@ const layer = createLayer(id, function (this: BaseLayer) {
)), )),
visibility: () => showIf(Decimal.lt(foundationProgress.value, computedMaxFoundation.value)), visibility: () => showIf(Decimal.lt(foundationProgress.value, computedMaxFoundation.value)),
canClick: () => { canClick: () => {
if (Decimal.gt(computedMaxFoundation.value, foundationProgress.value)){
foundationProgress.value = Decimal.min(0, computedMaxFoundation.value)
}
if (Decimal.lt(trees.logs.value, foundationConversion.nextAt.value)) { if (Decimal.lt(trees.logs.value, foundationConversion.nextAt.value)) {
return false; return false;
} }