diff --git a/src/data/layers/packing.tsx b/src/data/layers/packing.tsx index 124f77a..ea8f0ab 100644 --- a/src/data/layers/packing.tsx +++ b/src/data/layers/packing.tsx @@ -1,6 +1,6 @@ import { isArray } from "@vue/shared"; import SpacerVue from "components/layout/Spacer.vue"; -import { setUpDailyProgressTracker } from "data/common"; +import { createCollapsibleModifierSections, setUpDailyProgressTracker } from "data/common"; import { main } from "data/projEntry"; import { createBar } from "features/bars/bar"; import { createBuyable, GenericBuyable } from "features/buyable"; @@ -15,7 +15,7 @@ import { persistent } from "game/persistence"; import Decimal, { DecimalSource, format, formatWhole } from "util/bignum"; import { Direction } from "util/common"; import { render, renderRow } from "util/vue"; -import { computed, ComputedRef, unref } from "vue"; +import { computed, ComputedRef, ref, unref } from "vue"; import metal from "./metal"; import oil from "./oil"; import { createCollapsibleMilestones } from "data/common" @@ -24,6 +24,7 @@ import { createUpgrade } from "features/upgrades/upgrade"; import { ElfBuyable } from "./elves"; import management from "./management"; import paper from "./paper"; +import ModalVue from "components/Modal.vue"; const id = "packing" const day = 24; @@ -429,6 +430,30 @@ const layer = createLayer(id, function (this: BaseLayer) { const { collapseMilestones, display: milestonesDisplay } = createCollapsibleMilestones(packingMilestones); + const [generalTab, generalTabCollapsed] = createCollapsibleModifierSections(() => [ + { + title: "Elf Packing Speed", + modifier: elfPackingSpeed, + base: 1 + }, + { + title: "Loader Packing Speed", + modifier: loaderPackingSpeed, + base: 1000 + } + ]); + const showModifiersModal = ref(false); + const modifiersModal = jsx(() => ( + (showModifiersModal.value = value)} + v-slots={{ + header: () =>

{name} Modifiers

, + body: generalTab + }} + /> + )); + const { trackerDisplay } = setUpDailyProgressTracker({ resource: packedPresents, ignoreTotal: true, @@ -440,6 +465,10 @@ const layer = createLayer(id, function (this: BaseLayer) { duration: "15s" }, textColor: "var(--bought)", + modal: { + show: showModifiersModal, + display: modifiersModal + } }); globalBus.on("update", diff => { @@ -479,6 +508,7 @@ const layer = createLayer(id, function (this: BaseLayer) { upgrades, packingMilestones, collapseMilestones, + generalTabCollapsed, display: jsx(() => ( <> {render(trackerDisplay)} diff --git a/src/data/layers/paper.tsx b/src/data/layers/paper.tsx index a7b220f..39f80ec 100644 --- a/src/data/layers/paper.tsx +++ b/src/data/layers/paper.tsx @@ -133,7 +133,7 @@ const layer = createLayer(id, function (this: BaseLayer) { cost = cost.mul(1e31); } if (["Jingle"].includes(options.elfName)) { - cost = cost.mul(1e126); + cost = cost.mul(1e123); } if (management.elfTraining.paperElfTraining.milestones[0].earned.value) { cost = Decimal.div(cost, sumBooks.value.max(1)); @@ -161,7 +161,7 @@ const layer = createLayer(id, function (this: BaseLayer) { v = v.div(1e31); } if (["Jingle"].includes(options.elfName)) { - v = v.div(1e126); + v = v.div(1e123); } v = v.log(scaling);