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

Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental

Browse source
This commit is contained in:
ducdat0507 2022-12-07 13:55:01 +07:00
commit 99658fe3ab
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@
* @module * @module
* @hidden * @hidden
*/ */
import Row from "components/layout/Row.vue";
import Spacer from "components/layout/Spacer.vue"; import Spacer from "components/layout/Spacer.vue";
import Modal from "components/Modal.vue"; import Modal from "components/Modal.vue";
import { createCollapsibleModifierSections, setUpDailyProgressTracker } from "data/common"; import { createCollapsibleModifierSections, setUpDailyProgressTracker } from "data/common";
@ -20,7 +21,7 @@ import { noPersist, persistent } from "game/persistence";
import Decimal, { DecimalSource } from "util/bignum"; import Decimal, { DecimalSource } from "util/bignum";
import { formatWhole } from "util/break_eternity"; import { formatWhole } from "util/break_eternity";
import { Direction } from "util/common"; import { Direction } from "util/common";
import { render, renderRow } from "util/vue"; import { render, renderCol, renderRow } from "util/vue";
import { computed, ref } from "vue"; import { computed, ref } from "vue";
import metal from "./metal"; import metal from "./metal";
import paper from "./paper"; import paper from "./paper";
@ -207,7 +208,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
description: "Quadruple trees planted" description: "Quadruple trees planted"
} }
})); }));
const treesUpgrades = { treesUpgrade1, treesUpgrade2, treesUpgrade3 }; const treesUpgrades = { treesUpgrade3, treesUpgrade2, treesUpgrade1 };
const metalUpgrade1 = createUpgrade(() => ({ const metalUpgrade1 = createUpgrade(() => ({
resource: noPersist(cloth), resource: noPersist(cloth),
@ -235,7 +236,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
description: "Triple coal gain" description: "Triple coal gain"
} }
})); }));
const metalUpgrades = { metalUpgrade1, metalUpgrade2, metalUpgrade3 }; const metalUpgrades = { metalUpgrade3, metalUpgrade2, metalUpgrade1 };
const paperUpgrade1 = createUpgrade(() => ({ const paperUpgrade1 = createUpgrade(() => ({
resource: noPersist(cloth), resource: noPersist(cloth),
@ -263,7 +264,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
description: "Double paper gain" description: "Double paper gain"
} }
})); }));
const paperUpgrades = { paperUpgrade1, paperUpgrade2, paperUpgrade3 }; const paperUpgrades = { paperUpgrade3, paperUpgrade2, paperUpgrade1 };
const sheepGain = createSequentialModifier(() => [ const sheepGain = createSequentialModifier(() => [
createAdditiveModifier(() => ({ createAdditiveModifier(() => ({
@ -419,9 +420,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
{renderRow(breeding, shearing, spinning)} {renderRow(breeding, shearing, spinning)}
{renderRow(buildPens, betterShears, fasterSpinning)} {renderRow(buildPens, betterShears, fasterSpinning)}
<Spacer /> <Spacer />
{renderRow(...Object.values(treesUpgrades))} <Row>
{renderRow(...Object.values(metalUpgrades))} {renderCol(...Object.values(treesUpgrades))}
{renderRow(...Object.values(paperUpgrades))} {renderCol(...Object.values(metalUpgrades))}
{renderCol(...Object.values(paperUpgrades))}
</Row>
</> </>
)) ))
}; };