thepaperpilot/Advent-Incremental
1
0
Fork 0
mirror of https://github.com/thepaperpilot/Advent-Incremental.git synced 2025-01-31 07:31:37 +00:00
Code Issues Releases Activity Actions

Merge remote-tracking branch 'origin/main' into days-15-16

Browse source
This commit is contained in:
thepaperpilot 2022-12-18 14:58:02 -06:00
commit 68ff7bbeb4
13 changed files with 47 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/Layer.vue
View file

@ -237,3 +237,9 @@ export default defineComponent({
text-shadow: 0 0 7px var(--foreground);
}
</style>
<style>
.layer-tab.minimized > * > .desc {
color: var(--accent1);
font-size: 30px;
}
</style>

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

@ -653,8 +653,9 @@ const layer = createLayer(id, function (this: BaseLayer) {
)),
minimizedDisplay: jsx(() => (
<div>
{name} - {format(boxes.value)} {boxes.displayName}
</div>
{name}{" "}
<span class="desc">{format(boxes.value)} {boxes.displayName}</span>
</div>
)),
mastery,
mastered

5
src/data/layers/cloth.tsx
View file

@ -658,8 +658,9 @@ const layer = createLayer(id, function (this: BaseLayer) {
)),
minimizedDisplay: jsx(() => (
<div>
{name} - {format(cloth.value)} {cloth.displayName}
</div>
{name}{" "}
<span class="desc">{format(cloth.value)} {cloth.displayName}</span>
</div>
)),
mastery,
mastered

17
src/data/layers/coal.tsx
View file

@ -132,7 +132,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
},
style: {
color: colorText,
width: "160px"
width: "160px",
flexGrow: 1
}
})) as ElfBuyable & { resource: Resource };
@ -196,7 +197,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
},
style: {
color: colorText,
width: "160px"
width: "160px",
flexGrow: 1
},
visibility: () => showIf(unlockBonfire.bought.value)
})) as ElfBuyable & { resource: Resource };
@ -262,7 +264,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
},
style: {
color: colorText,
width: "160px"
width: "160px",
flexGrow: 1
},
visibility: () => showIf(unlockKiln.bought.value)
})) as ElfBuyable & { resource: Resource };
@ -334,7 +337,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
},
style: {
color: colorText,
width: "160px"
width: "160px",
flexGrow: 1
},
visibility: () => showIf(metal.coalDrill.bought.value)
})) as ElfBuyable & { resource: Resource };
@ -1174,8 +1178,9 @@ const layer = createLayer(id, function (this: BaseLayer) {
)),
minimizedDisplay: jsx(() => (
<div>
{name} - {format(coal.value)} {coal.displayName}
</div>
{name}{" "}
<span class="desc">{format(coal.value)} {coal.displayName}</span>
</div>
)),
mastery,
mastered

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

@ -96,7 +96,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
modifiers.push(
createMultiplicativeModifier(() => ({
multiplier() {
return Decimal.add(dyes.red.amount.value, 1).log10().pow(0.75);
return Decimal.add(dyes.red.amount.value, 1).log10().add(1).pow(0.75);
},
description: "Dye Synergy I"
}))

5
src/data/layers/letters.tsx
View file

@ -303,8 +303,9 @@ const layer = createLayer(id, function (this: BaseLayer) {
)),
minimizedDisplay: jsx(() => (
<div>
{name} - {format(letters.value)} {letters.displayName}
</div>
{name}{" "}
<span class="desc">{format(letters.value)} {letters.displayName}</span>
</div>
)),
mastery,
mastered

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

@ -1228,16 +1228,6 @@ const layer = createLayer(id, () => {
multiplier: 2,
description: "Focus Upgrade 1",
enabled: focusUpgrade1.bought
})),
createAdditiveModifier(() => ({
addend() {
return Decimal.add(dyes.dyes.orange.amount.value, dyes.dyes.purple.amount.value)
.add(dyes.dyes.green.amount.value)
.add(1)
.cbrt();
},
description: "Colorful Focus",
enabled: oil.row3Upgrades[2].bought
}))
]) as WithRequired<Modifier, "revert" | "description">;
const maximumElvesModifier = createSequentialModifier(() => [

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

@ -203,9 +203,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
createMultiplicativeModifier(() => ({
multiplier: 3,
description: "Twinkle Level 3",
enabled: () =>
management.elfTraining.metalElfTraining.milestones[2].earned.value &&
!main.isMastery.value
enabled: management.elfTraining.metalElfTraining.milestones[2].earned
})),
createMultiplicativeModifier(() => ({
multiplier: () => Decimal.add(industrialCrucible.amount.value, 1).sqrt(),
@ -770,8 +768,9 @@ const layer = createLayer(id, function (this: BaseLayer) {
)),
minimizedDisplay: jsx(() => (
<div>
{name} - {format(metal.value)} {metal.displayName}
</div>
{name}{" "}
<span class="desc">{format(metal.value)} {metal.displayName}</span>
</div>
)),
mastery,
mastered

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

@ -1352,10 +1352,10 @@ const layer = createLayer(id, function (this: BaseLayer) {
}),
minimizedDisplay: jsx(() => (
<div>
{name} - {format(oil.value)} {oil.displayName}
</div>
{name}{" "}
<span class="desc">{format(oil.value)} {oil.displayName}</span>
</div>
)),
mastery,
mastered
};

5
src/data/layers/paper.tsx
View file

@ -533,8 +533,9 @@ const layer = createLayer(id, function (this: BaseLayer) {
)),
minimizedDisplay: jsx(() => (
<div>
{name} - {format(paper.value)} {paper.displayName}
</div>
{name}{" "}
<span class="desc">{format(paper.value)} {paper.displayName}</span>
</div>
)),
mastery,
mastered

9
src/data/layers/plastic.tsx
View file

@ -280,9 +280,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
createMultiplicativeModifier(() => ({
multiplier: () => Decimal.add(oil.buildExtractor.amount.value, 1).pow(1.25),
description: "Snowball Level 4",
enabled: () =>
management.elfTraining.kilnElfTraining.milestones[3].earned.value &&
!main.isMastery.value
enabled: management.elfTraining.kilnElfTraining.milestones[3].earned
})),
createMultiplicativeModifier(() => ({
multiplier: () => Decimal.add(dyes.secondaryDyeSum.value, 1).cbrt(),
@ -385,8 +383,9 @@ const layer = createLayer(id, function (this: BaseLayer) {
)),
minimizedDisplay: jsx(() => (
<div>
{name} - {format(plastic.value)} {plastic.displayName}
</div>
{name}{" "}
<span class="desc">{format(plastic.value)} {plastic.displayName}</span>
</div>
)),
mastery,
mastered

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

@ -778,6 +778,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
Decimal.times(computedAutoPlantingAmount.value, diff)
);
saplings.value = Decimal.sub(saplings.value, amountPlanted);
if(Decimal.gte(saplings.value, computedTotalTrees.value)) saplings.value = computedTotalTrees.value;
});
const netSaplingGain = computed(() =>
@ -917,8 +918,9 @@ const layer = createLayer(id, function (this: BaseLayer) {
)),
minimizedDisplay: jsx(() => (
<div>
{name} - {format(logs.value)} {logs.displayName}
</div>
{name}{" "}
<span class="desc">{format(logs.value)} {logs.displayName}</span>
</div>
)),
mastery,
mastered

3
src/data/layers/workshop.tsx
View file

@ -393,7 +393,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
)),
minimizedDisplay: jsx(() => (
<div>
{name} - {format(foundationProgress.value)}% {foundationProgress.displayName}
{name}{" "}
<span class="desc">{formatWhole(foundationProgress.value)}% {foundationProgress.displayName}</span>
</div>
)),
mastery,