thepaperpilot/Advent-Incremental
1
0
Fork 0
mirror of https://github.com/thepaperpilot/Advent-Incremental.git synced 2025-03-14 01:51:40 +00:00
Code Issues Releases Activity Actions

Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental into main

Browse source
This commit is contained in:
unsoftcapped3 2022-12-15 03:12:16 +00:00
commit f4a5b92069
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/data/layers/boxes.tsx
View file

@ -179,7 +179,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
visibility: () => showIf(management.elfTraining.boxElfTraining.milestones[4].earned.value),
display: {
title: "Carry dye in boxes",
description: "Double all dye gain"
description: "Double all dye gain but reset all dyes"
},
onPurchase() {
(["red", "yellow", "blue", "orange", "green", "purple"] as const).forEach(dyeColor => {

6
src/data/layers/elves.tsx
View file

@ -650,8 +650,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
description: jsx(() => (
<>
{options.description}
{upgrade.bought.value &&
!["Peppermint", "Twinkle", "Cocoa", "Frosty"].includes(
{upgrade.bought.value ||
["Peppermint", "Twinkle", "Cocoa", "Frosty"].includes(
options.name
) ? null : (
<>
@ -813,7 +813,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
name: "Bell",
description:
"Bell will automatically purchase all box buyables you can afford, without actually spending any boxes.",
buyable: Object.values(boxes.buyables),
buyable: [...Object.values(boxes.buyables), ...Object.values(boxes.buyables2)],
cooldownModifier: boxCooldown,
visibility: () => showIf(plastic.elfUpgrades.boxElf.bought.value)
});

7
src/data/layers/management.tsx
View file

@ -523,7 +523,7 @@ const layer = createLayer(id, () => {
requirement: "Mary Level 5",
effectDisplay: jsx(() => (
<>
Auto smelting speed is multiplied by <Sqrt>total XP/1000</Sqrt>.
Auto smelting speed is multiplied by <Sqrt>total XP/1e6</Sqrt>.
</>
))
},
@ -1309,8 +1309,9 @@ const layer = createLayer(id, () => {
focusTargets.value = {};
const newCount = Decimal.min(count, range);
while (newCount.gt(x)) {
const roll = Object.values(elfTraining)[Math.floor(Math.random() * range)]?.name ?? "";
if (!focusTargets.value[roll]) {
const elf = Object.values(elfTraining)[Math.floor(Math.random() * range)];
const roll = elf?.name ?? "";
if (!focusTargets.value[roll] && unref(elf.visibility) === Visibility.Visible) {
focusTargets.value[roll] = true;
x++;
}

2
src/data/layers/metal.tsx
View file

@ -151,7 +151,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
enabled: dyes.upgrades.redDyeUpg2.bought
})),
createMultiplicativeModifier(() => ({
multiplier: () => Decimal.div(management.totalElfExp.value, 1000).add(1).sqrt(),
multiplier: () => Decimal.div(management.totalElfExp.value, 1e6).add(1).sqrt(),
description: "Mary Level 5",
enabled: management.elfTraining.heatedPlanterElfTraining.milestones[4].earned
})),