Change jazzy

This commit is contained in:
thepaperpilot 2022-12-18 15:00:28 -06:00
parent 68ff7bbeb4
commit 507cf0f081
3 changed files with 9 additions and 12 deletions

View file

@ -1826,10 +1826,6 @@ const layer = createLayer(id, () => {
focusCooldown: persistent<number>(0),
focusTime: persistent<number>(0)
};
const mastered = persistent<boolean>(false);
const masteryEffectActive = computed(
() => mastered.value || main.currentlyMastering.value?.name === name
);
// ------------------------------------------------------------------------------- Return
@ -1907,8 +1903,7 @@ const layer = createLayer(id, () => {
</>
)),
mastery,
mastered
mastery
};
});

View file

@ -35,6 +35,7 @@ import oil from "./oil";
import paper from "./paper";
import plastic from "./plastic";
import workshop from "./workshop";
import wrappingPaper from "./wrapping-paper";
const id = "metal";
const day = 7;
@ -185,6 +186,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
.log10(),
description: "The Ultimate Metal Dye",
enabled: oil.row3Upgrades[4].bought
})),
createMultiplicativeModifier(() => ({
multiplier: wrappingPaper.boosts.jazzy1,
description: "Jazzy Wrapping Paper",
enabled: computed(() => Decimal.gt(wrappingPaper.boosts.jazzy1.value, 1))
}))
]);
const computedAutoSmeltSpeed = computed(() => autoSmeltSpeed.apply(0));

View file

@ -187,7 +187,7 @@ const layer = createLayer(id, () => {
{
desc: computed(
() => `
-${format(unref(boosts.jazzy1))} to elf cost scaling
x${format(unref(boosts.jazzy1))} to auto-smelting speed
`
)
}
@ -256,11 +256,7 @@ const layer = createLayer(id, () => {
const boosts = {
christmas1: computed(() => Decimal.add(wrappingPaper.christmas.buyable.amount.value, 1)), // Probably not the best way to do this, but it works
rainbow1: computed(() => Decimal.pow(2, wrappingPaper.rainbow.buyable.amount.value)),
jazzy1: computed(() =>
Decimal.ln(
Decimal.add(Decimal.ln(Decimal.add(wrappingPaper.jazzy.buyable.amount.value, 1)), 1)
)
),
jazzy1: computed(() => Decimal.add(wrappingPaper.jazzy.buyable.amount.value, 1)),
sunshine1: computed(() => Decimal.add(wrappingPaper.sunshine.buyable.amount.value, 1)),
ocean1: computed(() => Decimal.pow(1.5, wrappingPaper.ocean.buyable.amount.value)),
beach1: computed(() => Decimal.add(wrappingPaper.beach.buyable.amount.value, 1))