mirror of
https://github.com/thepaperpilot/Advent-Incremental.git
synced 2024-11-22 08:31:35 +00:00
Change jazzy
This commit is contained in:
parent
68ff7bbeb4
commit
ad0c1434e0
4 changed files with 11 additions and 27 deletions
|
@ -554,10 +554,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
||||||
));
|
));
|
||||||
|
|
||||||
const trainingCost = computed(() => {
|
const trainingCost = computed(() => {
|
||||||
let cost = Decimal.pow(
|
let cost = Decimal.pow(4, totalElves.value).times(1e6);
|
||||||
Decimal.sub(4, wrappingPaper.boosts.jazzy1.value),
|
|
||||||
totalElves.value
|
|
||||||
).times(1e6);
|
|
||||||
if (Decimal.gte(totalElves.value, 9)) {
|
if (Decimal.gte(totalElves.value, 9)) {
|
||||||
cost = Decimal.times(cost, 1e15);
|
cost = Decimal.times(cost, 1e15);
|
||||||
}
|
}
|
||||||
|
@ -1076,11 +1073,6 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
||||||
Decimal.gte(coal.coal.value, coalGoal)
|
Decimal.gte(coal.coal.value, coalGoal)
|
||||||
) {
|
) {
|
||||||
main.completeDay();
|
main.completeDay();
|
||||||
} else if (
|
|
||||||
main.currentlyMastering.value?.name === name &&
|
|
||||||
Decimal.gte(coal.coal.value, options.masteryGoal ?? options.goal)
|
|
||||||
) {
|
|
||||||
main.completeMastery();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -1193,10 +1185,6 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
||||||
{ earned: persistent<boolean>(false) }
|
{ earned: persistent<boolean>(false) }
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
const mastered = persistent<boolean>(false);
|
|
||||||
const masteryEffectActive = computed(
|
|
||||||
() => mastered.value || main.currentlyMastering.value?.name === name
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
name,
|
name,
|
||||||
|
@ -1241,8 +1229,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
||||||
{milestonesDisplay()}
|
{milestonesDisplay()}
|
||||||
</>
|
</>
|
||||||
)),
|
)),
|
||||||
mastery,
|
mastery
|
||||||
mastered
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1826,10 +1826,6 @@ const layer = createLayer(id, () => {
|
||||||
focusCooldown: persistent<number>(0),
|
focusCooldown: persistent<number>(0),
|
||||||
focusTime: persistent<number>(0)
|
focusTime: persistent<number>(0)
|
||||||
};
|
};
|
||||||
const mastered = persistent<boolean>(false);
|
|
||||||
const masteryEffectActive = computed(
|
|
||||||
() => mastered.value || main.currentlyMastering.value?.name === name
|
|
||||||
);
|
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------- Return
|
// ------------------------------------------------------------------------------- Return
|
||||||
|
|
||||||
|
@ -1907,8 +1903,7 @@ const layer = createLayer(id, () => {
|
||||||
</>
|
</>
|
||||||
)),
|
)),
|
||||||
|
|
||||||
mastery,
|
mastery
|
||||||
mastered
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -35,6 +35,7 @@ import oil from "./oil";
|
||||||
import paper from "./paper";
|
import paper from "./paper";
|
||||||
import plastic from "./plastic";
|
import plastic from "./plastic";
|
||||||
import workshop from "./workshop";
|
import workshop from "./workshop";
|
||||||
|
import wrappingPaper from "./wrapping-paper";
|
||||||
|
|
||||||
const id = "metal";
|
const id = "metal";
|
||||||
const day = 7;
|
const day = 7;
|
||||||
|
@ -185,6 +186,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
||||||
.log10(),
|
.log10(),
|
||||||
description: "The Ultimate Metal Dye",
|
description: "The Ultimate Metal Dye",
|
||||||
enabled: oil.row3Upgrades[4].bought
|
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));
|
const computedAutoSmeltSpeed = computed(() => autoSmeltSpeed.apply(0));
|
||||||
|
|
|
@ -187,7 +187,7 @@ const layer = createLayer(id, () => {
|
||||||
{
|
{
|
||||||
desc: computed(
|
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 = {
|
const boosts = {
|
||||||
christmas1: computed(() => Decimal.add(wrappingPaper.christmas.buyable.amount.value, 1)), // Probably not the best way to do this, but it works
|
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)),
|
rainbow1: computed(() => Decimal.pow(2, wrappingPaper.rainbow.buyable.amount.value)),
|
||||||
jazzy1: computed(() =>
|
jazzy1: computed(() => Decimal.add(wrappingPaper.jazzy.buyable.amount.value, 1)),
|
||||||
Decimal.ln(
|
|
||||||
Decimal.add(Decimal.ln(Decimal.add(wrappingPaper.jazzy.buyable.amount.value, 1)), 1)
|
|
||||||
)
|
|
||||||
),
|
|
||||||
sunshine1: computed(() => Decimal.add(wrappingPaper.sunshine.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)),
|
ocean1: computed(() => Decimal.pow(1.5, wrappingPaper.ocean.buyable.amount.value)),
|
||||||
beach1: computed(() => Decimal.add(wrappingPaper.beach.buyable.amount.value, 1))
|
beach1: computed(() => Decimal.add(wrappingPaper.beach.buyable.amount.value, 1))
|
||||||
|
|
Loading…
Reference in a new issue