From 6a00574a78fcd2e8212212b13fe7036b8a003481 Mon Sep 17 00:00:00 2001 From: thepaperpilot Date: Mon, 12 Dec 2022 23:11:42 -0600 Subject: [PATCH] Fixed some management issues --- src/data/layers/elves.tsx | 2 +- src/data/layers/management.tsx | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/data/layers/elves.tsx b/src/data/layers/elves.tsx index e51e7aa..d165c4c 100644 --- a/src/data/layers/elves.tsx +++ b/src/data/layers/elves.tsx @@ -535,7 +535,7 @@ const layer = createLayer(id, function (this: BaseLayer) { const buyProgress = persistent(0); const amountOfTimesDone = persistent(0); const toggle = options.hasToggle ? persistent(false) : ref(true); - + const computedAutoBuyCooldown = computed(() => options.cooldownModifier.apply(10)); const isActive = convertComputable(options.canBuy ?? true); diff --git a/src/data/layers/management.tsx b/src/data/layers/management.tsx index a64bbcb..81a8600 100644 --- a/src/data/layers/management.tsx +++ b/src/data/layers/management.tsx @@ -196,12 +196,17 @@ const layer = createLayer(id, () => { const elfXPGainComputed = computed(() => elfXPGain.apply(0.1)); const click = createClickable(() => ({ display: { - title: elf.name, + title: jsx(() => ( + <> + {elf.name} - LV {formatWhole(level.value)} + + )), description: jsx(() => ( <> - {elf.name} is currently at level {formatWhole(level.value)}, and achieved a - total of {format(exp.value)} XP. They buy buyables{" "} - {formatWhole(elf.computedAutoBuyCooldown.value)} times per second, gaining{" "} + Current XP: {format(exp.value)} +
+ {elf.name} can buy buyables {formatWhole(elf.computedAutoBuyCooldown.value)}{" "} + times per second, gaining{" "} {Decimal.gte(level.value, schools.amount.value) ? 0 : format( @@ -487,7 +492,7 @@ const layer = createLayer(id, () => { )) }, - shouldEarn: () => heatedPlanterElfTraining.level.value >= 1 + shouldEarn: () => fertilizerElfTraining.level.value >= 1 })), createMilestone(() => ({ display: { @@ -495,7 +500,7 @@ const layer = createLayer(id, () => { effectDisplay: `"The Garden Tree's Handbook" affects "Fertilized Soil" twice` }, visibility: () => showIf(fertilizerElfMilestones[0].earned.value), - shouldEarn: () => heatedPlanterElfTraining.level.value >= 2 + shouldEarn: () => fertilizerElfTraining.level.value >= 2 })), createMilestone(() => ({ display: { @@ -503,7 +508,7 @@ const layer = createLayer(id, () => { effectDisplay: "Divide the mining drill cost by ln(Total logs + e)" }, visibility: () => showIf(fertilizerElfMilestones[1].earned.value), - shouldEarn: () => heatedPlanterElfTraining.level.value >= 3 + shouldEarn: () => fertilizerElfTraining.level.value >= 3 })), createMilestone(() => ({ display: { @@ -516,7 +521,7 @@ const layer = createLayer(id, () => { }, visibility: () => showIf(fertilizerElfMilestones[2].earned.value && main.day.value >= 13), - shouldEarn: () => heatedPlanterElfTraining.level.value >= 4 + shouldEarn: () => fertilizerElfTraining.level.value >= 4 })), createMilestone(() => ({ display: {