Implemented holly lv1-3

This commit is contained in:
Anthony Lawn 2022-12-12 14:40:49 -06:00
parent 640a74e55c
commit 1632e16e5d
4 changed files with 6 additions and 5 deletions

View file

@ -331,7 +331,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
})); }));
const paperUpgrades = { paperUpgrade4, paperUpgrade3, paperUpgrade2, paperUpgrade1 }; const paperUpgrades = { paperUpgrade4, paperUpgrade3, paperUpgrade2, paperUpgrade1 };
const hollyEffect = computed(() => Decimal.add(trees.computedAutoCuttingAmount.value, 1).log10().add(1)); const hollyEffect = computed(() => Decimal.add(trees.computedAutoCuttingAmount.value, 1).root(3));
const gingersnapEffect = computed(() => Decimal.add(dyes.dyeSum.value, 10).log10()); const gingersnapEffect = computed(() => Decimal.add(dyes.dyeSum.value, 10).log10());
const sheepGain = createSequentialModifier(() => [ const sheepGain = createSequentialModifier(() => [

View file

@ -532,7 +532,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
description: description:
"Holly will automatically purchase cutters you can afford, without actually spending any logs.", "Holly will automatically purchase cutters you can afford, without actually spending any logs.",
buyable: trees.row1Buyables[0], buyable: trees.row1Buyables[0],
cooldownModifier: cutterCooldown cooldownModifier: cutterCooldown,
buyMax: () => management.elfTraining.cutterElfTraining.milestones[1].earned.value
}); });
const plantersElf = createElf({ const plantersElf = createElf({
name: "Ivy", name: "Ivy",

View file

@ -219,7 +219,7 @@ const layer = createLayer(id, () => {
createMilestone(() => ({ createMilestone(() => ({
display: { display: {
requirement: "Holly Level 1", requirement: "Holly Level 1",
effectDisplay: jsx(() => <>Multiply log gain by (<Sqrt>Cutter amount</Sqrt>)<sup>3</sup>.</>) effectDisplay: jsx(() => <>Multiply log gain by <sup>3</sup><Sqrt>Cutter amount</Sqrt>.</>)
}, },
shouldEarn: () => cutterElfTraining.level.value >= 1 shouldEarn: () => cutterElfTraining.level.value >= 1
})), })),
@ -234,7 +234,7 @@ const layer = createLayer(id, () => {
createMilestone(() => ({ createMilestone(() => ({
display: { display: {
requirement: "Holly Level 3", requirement: "Holly Level 3",
effectDisplay: jsx(() => <>Multiply all cloth actions' effectiveness by (<Sqrt>Cutter amount</Sqrt>)<sup>3</sup>.</>) effectDisplay: jsx(() => <>Multiply all cloth actions' effectiveness by <sup>3</sup><Sqrt>Cutter amount</Sqrt>.</>)
}, },
visibility: () => showIf(cutterElfMilestones[1].earned.value), visibility: () => showIf(cutterElfMilestones[1].earned.value),
shouldEarn: () => cutterElfTraining.level.value >= 3 shouldEarn: () => cutterElfTraining.level.value >= 3

View file

@ -455,7 +455,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
})), })),
createMultiplicativeModifier(() => ({ createMultiplicativeModifier(() => ({
multiplier: computed(() => multiplier: computed(() =>
Decimal.add(computedAutoCuttingAmount.value, 1).log10().plus(1) Decimal.add(computedAutoCuttingAmount.value, 1).root(3)
), ),
description: "Holly Level 1", description: "Holly Level 1",
enabled: management.elfTraining.cutterElfTraining.milestones[0].earned enabled: management.elfTraining.cutterElfTraining.milestones[0].earned