thepaperpilot/Advent-Incremental
1
0
Fork 0
mirror of https://github.com/thepaperpilot/Advent-Incremental.git synced 2025-01-19 03:51:37 +00:00
Code Issues Releases Activity Actions

Fix build issues

Browse source
This commit is contained in:
thepaperpilot 2022-12-13 22:33:25 -06:00
parent 4331f8f423
commit d77c3ecb88
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ import {
} from "game/modifiers";
import { persistent } from "game/persistence";
import Decimal, { DecimalSource, format, formatTime, formatWhole } from "util/bignum";
import { Direction } from "util/common";
import { Direction, WithRequired } from "util/common";
import { ProcessedComputable } from "util/computed";
import { render, renderCol, renderGrid } from "util/vue";
import { computed, ComputedRef, ref, Ref, unref, watchEffect } from "vue";
@ -123,7 +123,7 @@ const layer = createLayer(id, () => {
description: "Carry experience in boxes???",
enabled: boxes.row3Upgrades.xpUpgrade.bought
}))
]);
]) as WithRequired<Modifier, "description" | "revert">;
const globalXPModifierComputed = computed(() => globalXPModifier.apply(1));
// ------------------------------------------------------------------------------- Training core function
@ -1131,7 +1131,10 @@ const layer = createLayer(id, () => {
focusTargets.value = {};
focusMulti.value = Decimal.pow(
focusMaxMulti.value,
Decimal.pow(1 - Math.abs(Math.sin((Date.now() / 1000) * 2)), focusUpgrade4.bought ? 0.5 : 1)
Decimal.pow(
1 - Math.abs(Math.sin((Date.now() / 1000) * 2)),
focusUpgrade4.bought ? 0.5 : 1
)
);
}
});
@ -1383,7 +1386,9 @@ const layer = createLayer(id, () => {
});
const classroomEffect = computed(() => {
return Decimal.add(classrooms.amount.value, 1).pow(0.9).pow(paper.classroomUpgrade.bought.value ? 1.1 : 1);
return Decimal.add(classrooms.amount.value, 1)
.pow(0.9)
.pow(paper.upgrades2.classroomUpgrade.bought.value ? 1.1 : 1);
});
const classrooms = createBuyable(() => ({

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

@ -12,7 +12,7 @@ import { createCumulativeConversion, createPolynomialScaling } from "features/co
import { jsx, showIf } from "features/feature";
import MainDisplay from "features/resources/MainDisplay.vue";
import { createResource, displayResource, Resource } from "features/resources/resource";
import { createUpgrade } from "features/upgrades/upgrade";
import { createUpgrade, GenericUpgrade } from "features/upgrades/upgrade";
import { globalBus } from "game/events";
import { BaseLayer, createLayer } from "game/layers";
import { createMultiplicativeModifier, createSequentialModifier, Modifier } from "game/modifiers";
@ -300,16 +300,18 @@ const layer = createLayer(id, function (this: BaseLayer) {
const ashUpgrade = createUpgrade(() => ({
resource: noPersist(paper),
cost: 1e36,
visibility: () => showIf(management.elfTraining.heavyDrillElfTraining.milestones[4].earned.value),
visibility: () =>
showIf(management.elfTraining.heavyDrillElfTraining.milestones[4].earned.value),
display: {
title: "Paper Burning",
description: "Paper adds to ash gain after all other modifiers"
}
}));
})) as GenericUpgrade;
const bookUpgrade = createUpgrade(() => ({
resource: noPersist(paper),
cost: 1e40,
visibility: () => showIf(management.elfTraining.heavyDrillElfTraining.milestones[4].earned.value),
visibility: () =>
showIf(management.elfTraining.heavyDrillElfTraining.milestones[4].earned.value),
display: {
title: "Book Cheapener",
description: "Books are less expensive"
@ -318,7 +320,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
const classroomUpgrade = createUpgrade(() => ({
resource: noPersist(paper),
cost: 1e44,
visibility: () => showIf(management.elfTraining.heavyDrillElfTraining.milestones[4].earned.value),
visibility: () =>
showIf(management.elfTraining.heavyDrillElfTraining.milestones[4].earned.value),
display: {
title: "Classroom Supplies",
description: "Classrooms' effect is raised to the 1.1"
@ -368,7 +371,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
description: "Star Level 2",
enabled: management.elfTraining.paperElfTraining.milestones[1].earned
}))
]);
]) as WithRequired<Modifier, "description" | "revert">;
const computedAshCost = computed(() => ashCost.apply(1e6));
const [generalTab, generalTabCollapsed] = createCollapsibleModifierSections(() => [