+
+
+
+));
+
+export { display as credits };
diff --git a/src/data/layers/boxes.tsx b/src/data/layers/boxes.tsx
index f7f8c30..23eff15 100644
--- a/src/data/layers/boxes.tsx
+++ b/src/data/layers/boxes.tsx
@@ -36,6 +36,7 @@ import reindeer from "./reindeer";
import trees from "./trees";
import workshop from "./workshop";
import wrappingPaper from "./wrapping-paper";
+import packing from "./packing";
export type BoxesBuyable = ElfBuyable & {
resource: Resource;
@@ -58,11 +59,17 @@ const layer = createLayer(id, function (this: BaseLayer) {
enabled: workshop.milestones.extraExpansionMilestone5.earned
})),
reindeer.reindeer.vixen.modifier,
+ createMultiplicativeModifier(() => ({
+ multiplier: 1.1,
+ description: "120 Presents Packed",
+ enabled: packing.packingMilestones.boxBoost.earned
+ })),
createExponentialModifier(() => ({
exponent: 1.1,
description: "Bell Level 2",
enabled: management.elfTraining.boxElfTraining.milestones[1].earned
- }))
+ })),
+
]) as WithRequiredAdvent Incremental
++
Created by thepaperpilot and friends
+
+
+
+
+ Created by {creator}
+ {help != null ? ( + <> + With help from {help} +
+ + ) : undefined} + {other + ? other?.map(other => ( + <> + {other} +
+ + )) + : undefined} +
+
+ +
+
+ ))
+ )
+ )}
+ + Day {day + 1} - {name} +
++
+ Created by {creator}
+ {help != null ? ( + <> + With help from {help} +
+ + ) : undefined} + {other + ? other?.map(other => ( + <> + {other} +
+ + )) + : undefined} +
+
+ +
Special Thanks
+Nekosity
+Yhvr
+Ducdat0507
+Haley
+emanresu
++
+ And last but not least, a massive thanks to everyone who played and provided feedback on + the game. +
+Thanks for playing!
+
+ TODO: layer
+
),
+ name,
+ day
+ }
+})
\ No newline at end of file
diff --git a/src/data/layers/dyes.tsx b/src/data/layers/dyes.tsx
index babf8ed..11a1d8f 100644
--- a/src/data/layers/dyes.tsx
+++ b/src/data/layers/dyes.tsx
@@ -39,6 +39,7 @@ import toys from "./toys";
import factory from "./factory";
import reindeer from "./reindeer";
import routing from "./routing";
+import packing from "./packing";
interface Dye {
name: string;
@@ -171,20 +172,21 @@ const layer = createLayer(id, function (this: BaseLayer) {
multiplier: 2,
description: "Wetter Dyes",
enabled: upgrades.yellowDyeUpg.bought
- }))
- );
- modifiers.push(
+ })),
createMultiplicativeModifier(() => ({
multiplier: () => Decimal.add(cloth.cloth.value, Math.E).ln(),
description: "Gingersnap Level 1",
enabled: management.elfTraining.clothElfTraining.milestones[0].earned
- }))
- );
- modifiers.push(
+ })),
createMultiplicativeModifier(() => ({
multiplier: 2,
description: "Carol Level 1",
enabled: management.elfTraining.dyeElfTraining.milestones[0].earned
+ })),
+ createMultiplicativeModifier(() => ({
+ multiplier: 5,
+ description: "977,000,000 Presents Packed",
+ enabled: packing.packingMilestones.primaryDyeBoost.earned
}))
);
}
@@ -728,6 +730,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
Decimal.add(dyes.orange.amount.value, 1)
.log2()
.plus(1)
+ .mul(packing.packingMilestones.secondaryDyeBoost.earned.value ? 2 : 1)
.pow(oil.row3Upgrades[1].bought.value ? 2.5 : 1)
),
green1: computed(() =>
@@ -739,6 +742,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
Decimal.add(dyes.green.amount.value, 1)
.log2()
.plus(1)
+ .mul(packing.packingMilestones.secondaryDyeBoost.earned.value ? 2 : 1)
.pow(upgrades.coalUpg.bought.value ? 2 : 1)
),
purple1: computed(() =>
@@ -746,7 +750,12 @@ const layer = createLayer(id, function (this: BaseLayer) {
.pow(upgrades.coalUpg.bought.value ? 1.2 : 1)
.pow(management.elfTraining.clothElfTraining.milestones[3].earned.value ? 1.1 : 1)
),
- purple2: computed(() => Decimal.add(dyes.purple.amount.value, 1).log2().plus(1)),
+ purple2: computed(() =>
+ Decimal.add(dyes.purple.amount.value, 1)
+ .log2()
+ .plus(1)
+ .mul(packing.packingMilestones.secondaryDyeBoost.earned.value ? 2 : 1)
+ ),
black1: computed(() =>
Decimal.pow(2, Decimal.add(dyes.black.amount.value, 1).log2().sqrt())
.pow(upgrades.coalUpg.bought.value ? 1.2 : 1)
diff --git a/src/data/layers/elves.tsx b/src/data/layers/elves.tsx
index 74b94fb..38ef179 100644
--- a/src/data/layers/elves.tsx
+++ b/src/data/layers/elves.tsx
@@ -39,6 +39,7 @@ import wrappingPaper from "./wrapping-paper";
import dyes, { enumColor } from "./dyes";
import ribbon from "./ribbon";
import letters from "./letters";
+import packing from "./packing";
export interface ElfBuyable extends GenericBuyable {
/** The inverse function of the cost formula, used to calculate the maximum amount that can be bought by elves. */
@@ -455,6 +456,23 @@ const layer = createLayer(id, function (this: BaseLayer) {
enabled: elvesMilestone2.earned
}))
]);
+ const packingCooldown = createSequentialModifier(() => [
+ createMultiplicativeModifier(() => ({
+ multiplier: 2,
+ description: "6 Elves Trained",
+ enabled: elvesMilestone.earned
+ })),
+ createMultiplicativeModifier(() => ({
+ multiplier: () => Decimal.times(paper.books.packingBook.totalAmount.value, 0.1).add(1),
+ description: "The Tetris Effect",
+ enabled: () => Decimal.gt(paper.books.packingBook.totalAmount.value, 0)
+ })),
+ createMultiplicativeModifier(() => ({
+ multiplier: 2,
+ description: "10 Elves Trained",
+ enabled: elvesMilestone2.earned
+ }))
+ ]);
const [generalTab, generalTabCollapsed] = createCollapsibleModifierSections(() => [
{
@@ -590,6 +608,13 @@ const layer = createLayer(id, function (this: BaseLayer) {
base: 10,
unit: "/s",
visible: plastic.masteryEffectActive
+ },
+ {
+ title: "Jingle Auto-Buy Frequency",
+ modifier: packingCooldown,
+ base: 10,
+ unit: "/s",
+ visible: packing.upgrades.packingElf.bought
}
]);
const showModifiersModal = ref(false);
@@ -732,7 +757,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
onPurchase() {
options.onPurchase?.();
if (
- !["Peppermint", "Twinkle", "Cocoa", "Frosty", "Carol"].includes(
+ !["Peppermint", "Twinkle", "Cocoa", "Frosty", "Carol", "Jingle"].includes(
options.name
)
) {
@@ -1013,6 +1038,20 @@ const layer = createLayer(id, function (this: BaseLayer) {
buyMax: () => management.elfTraining.plasticElfTraining.milestones[4].earned.value
});
const wrappingPaperElves = [dyeElf, plasticElf];
+
+ const packingElf = createElf({
+ name: "Jingle",
+ description: "Jingle will automatically hire more elves to help out with packing the sleigh.",
+ buyable: [packing.helpers.elf, packing.helpers.loader],
+ cooldownModifier: packingCooldown,
+ visibility: () => showIf(packing.upgrades.packingElf.bought.value),
+ buyMax: true,
+ onAutoPurchase(buyable, amount) {
+ if (buyable === packing.helpers.loader && !management.elfTraining.packingElfTraining.milestones[3].earned.value) {
+ buyable.amount.value = Decimal.sub(buyable.amount.value, amount);
+ }
+ }
+ });
const elves = {
cuttersElf,
plantersElf,
@@ -1031,7 +1070,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
oilElf,
metalElf,
dyeElf,
- plasticElf
+ plasticElf,
+ packingElf
};
const totalElves = computed(() => Object.values(elves).filter(elf => elf.bought.value).length);
@@ -1278,6 +1318,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
buyProgress: persistent