From aec06a6b26aae89b825a23f2c7bf717bbe80a24b Mon Sep 17 00:00:00 2001 From: circle-gon <97845741+circle-gon@users.noreply.github.com> Date: Tue, 13 Dec 2022 08:04:55 -0500 Subject: [PATCH] some minor fixes --- src/data/layers/management.tsx | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/data/layers/management.tsx b/src/data/layers/management.tsx index 2987ab2..b0a3206 100644 --- a/src/data/layers/management.tsx +++ b/src/data/layers/management.tsx @@ -146,19 +146,17 @@ const layer = createLayer(id, () => { if (elf.name == "Star" || elf.name == "Bell") { costMulti /= 3; } + const costBase = Decimal.mul(4000, costMulti) const expRequiredForNextLevel = computed(() => - Decimal.pow(5, level.value).mul(4000).mul(costMulti) + Decimal.pow(5, level.value).mul(costBase) ); const level = computed(() => - Decimal.min( - Decimal.affordGeometricSeries(exp.value, Decimal.mul(4000, costMulti), 5, 0), - schools.amount.value - ).toNumber() + Decimal.affordGeometricSeries(exp.value, costBase, 5, 0).min(schools.amount.value).toNumber() ); const expToNextLevel = computed(() => Decimal.sub( exp.value, - Decimal.sumGeometricSeries(level.value, Decimal.mul(4000, costMulti), 5, 0) + Decimal.sumGeometricSeries(level.value, costBase, 5, 0) ) ); const bar = createBar(() => ({ @@ -982,7 +980,7 @@ const layer = createLayer(id, () => { const focusMaxMulti = computed(() => focusMaxMultiModifiers.apply(10)); const maximumElves = computed(() => maximumElvesModifier.apply(3)); - const cooldown = computed(() => Number(cooldownModifiers.apply(15))); + const cooldown = computed(() => cooldownModifiers.apply(15)); const focusMeter = createBar(() => ({ direction: Direction.Right, @@ -1031,8 +1029,6 @@ const layer = createLayer(id, () => { onClick() { focusCooldown.value = cooldown.value; focusTime.value = 10; - - // better choice? this has to be a number rerollFocusTargets(12, maximumElves.value); } }));