From af37ca1ff97fe05d4102a29d276033f36273158c Mon Sep 17 00:00:00 2001 From: Seth Posner Date: Sat, 24 Dec 2022 01:11:57 -0800 Subject: [PATCH] More day fixing and a bit of balancing --- src/components/Options.vue | 2 +- src/data/layers/packing.tsx | 3 ++- src/data/layers/paper.tsx | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/Options.vue b/src/components/Options.vue index 08245dc..cc9ba7e 100644 --- a/src/components/Options.vue +++ b/src/components/Options.vue @@ -98,7 +98,7 @@ const isPaused = computed({ }); const canAutoSave = computed( - () => (layers as any).main?.days[(layers as any).main?.day.value - 1].opened.value + () => (layers as any).main?.day.value >= 25 || (layers as any).main?.days[(layers as any).main?.day.value - 1].opened.value ); const autosaveTitle = jsx(() => ( diff --git a/src/data/layers/packing.tsx b/src/data/layers/packing.tsx index 40ba85f..124f77a 100644 --- a/src/data/layers/packing.tsx +++ b/src/data/layers/packing.tsx @@ -93,6 +93,7 @@ const layer = createLayer(id, function (this: BaseLayer) { }); const packedPresentsSize = computed(() => Decimal.times(packedPresents.value, 0.008).dividedBy(packingDensity.value)); + const currentMaxPresents = computed(() => Decimal.times(sledSpace, packingDensity.value).div(0.008)); const remainingSize = computed(() => Decimal.sub(sledSpace, packedPresentsSize.value)); const elfPackingSpeed = createSequentialModifier(() => [ @@ -462,7 +463,7 @@ const layer = createLayer(id, function (this: BaseLayer) { packedPresents.value = Decimal.add( Decimal.times(helpers.elf.amount.value, computedElfPackingSpeed.value), Decimal.times(helpers.loader.amount.value, computedLoaderPackingSpeed.value) - ).times(diff).plus(packedPresents.value).min(8e9); + ).times(diff).plus(packedPresents.value).min(currentMaxPresents.value); }); return { diff --git a/src/data/layers/paper.tsx b/src/data/layers/paper.tsx index 8af39af..a7b220f 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(1e120); + cost = cost.mul(1e126); } if (management.elfTraining.paperElfTraining.milestones[0].earned.value) { cost = Decimal.div(cost, sumBooks.value.max(1)); @@ -160,6 +160,9 @@ const layer = createLayer(id, function (this: BaseLayer) { if (["Peppermint", "Twinkle", "Cocoa", "Frosty"].includes(options.elfName)) { v = v.div(1e31); } + if (["Jingle"].includes(options.elfName)) { + v = v.div(1e126); + } v = v.log(scaling); v = v.div(Decimal.pow(0.95, paperBook.totalAmount.value));