thepaperpilot/Advent-Incremental
1
0
Fork 0
mirror of https://github.com/thepaperpilot/Advent-Incremental.git synced 2024-11-25 01:41:48 +00:00
Code Issues Releases Activity Actions

Style changes

Browse source
This commit is contained in:
thepaperpilot 2022-11-30 21:48:54 -06:00
parent 4d52c73dea
commit 2688dbbc69
1 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -146,21 +146,12 @@ const layer = createLayer(id, function (this: BaseLayer) {
enabled: manualCutUpgrade1.bought enabled: manualCutUpgrade1.bought
})), })),
createAdditiveModifier(() => ({ createAdditiveModifier(() => ({
addend: autoComputedCuttingAmount, addend: computedAutoCuttingAmount,
description: "Smart Knives", description: "Smart Knives",
enabled: manualCutUpgrade3.bought enabled: manualCutUpgrade3.bought
})) }))
]); ]);
const manualComputedCuttingAmount = computed(() => manualCuttingAmount.apply(1)); const computedManualCuttingAmount = computed(() => manualCuttingAmount.apply(1));
const autoCuttingAmount = createSequentialModifier(() => [
createAdditiveModifier(() => ({
addend: 1,
description: "Automated Knives",
enabled: autoCutUpgrade1.bought
}))
]);
const autoComputedCuttingAmount = computed(() => autoCuttingAmount.apply(0));
const manualCuttingCooldown = createSequentialModifier(() => [ const manualCuttingCooldown = createSequentialModifier(() => [
createMultiplicativeModifier(() => ({ createMultiplicativeModifier(() => ({
multiplier: 0.5, multiplier: 0.5,
@ -170,6 +161,15 @@ const layer = createLayer(id, function (this: BaseLayer) {
]); ]);
const computedManualCuttingCooldown = computed(() => manualCuttingCooldown.apply(1)); const computedManualCuttingCooldown = computed(() => manualCuttingCooldown.apply(1));
const autoCuttingAmount = createSequentialModifier(() => [
createAdditiveModifier(() => ({
addend: 1,
description: "Automated Knives",
enabled: autoCutUpgrade1.bought
}))
]);
const computedAutoCuttingAmount = computed(() => autoCuttingAmount.apply(0));
const manualPlantingAmount = createSequentialModifier(() => [ const manualPlantingAmount = createSequentialModifier(() => [
createAdditiveModifier(() => ({ createAdditiveModifier(() => ({
addend: 1, addend: 1,
@ -177,12 +177,12 @@ const layer = createLayer(id, function (this: BaseLayer) {
enabled: manualPlantUpgrade1.bought enabled: manualPlantUpgrade1.bought
})), })),
createAdditiveModifier(() => ({ createAdditiveModifier(() => ({
addend: autoComputedPlantingAmount, addend: computedAutoPlantingAmount,
description: "Smart Spades", description: "Smart Spades",
enabled: manualPlantUpgrade3.bought enabled: manualPlantUpgrade3.bought
})) }))
]); ]);
const manualComputedPlantingAmount = computed(() => manualPlantingAmount.apply(1)); const computedManualPlantingAmount = computed(() => manualPlantingAmount.apply(1));
const manualPlantingCooldown = createSequentialModifier(() => [ const manualPlantingCooldown = createSequentialModifier(() => [
createMultiplicativeModifier(() => ({ createMultiplicativeModifier(() => ({
multiplier: 0.5, multiplier: 0.5,
@ -199,7 +199,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
enabled: autoPlantUpgrade1.bought enabled: autoPlantUpgrade1.bought
})) }))
]); ]);
const autoComputedPlantingAmount = computed(() => autoPlantingAmount.apply(0)); const computedAutoPlantingAmount = computed(() => autoPlantingAmount.apply(0));
const logGain = createSequentialModifier(() => [ const logGain = createSequentialModifier(() => [
createMultiplicativeModifier(() => ({ createMultiplicativeModifier(() => ({
@ -229,8 +229,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
title: "Cut trees", title: "Cut trees",
description: jsx(() => ( description: jsx(() => (
<> <>
Cut down up to {formatWhole(manualComputedCuttingAmount.value)} tree Cut down up to {formatWhole(computedManualCuttingAmount.value)} tree
{Decimal.eq(manualComputedCuttingAmount.value, 1) ? "" : "s"} at once! {Decimal.eq(computedManualCuttingAmount.value, 1) ? "" : "s"} at once!
<br /> <br />
{render(manualCutProgressBar)} {render(manualCutProgressBar)}
</> </>
@ -243,7 +243,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
Decimal.gt(trees.value, 0) && Decimal.gt(trees.value, 0) &&
Decimal.gte(manualCutProgress.value, computedManualCuttingCooldown.value), Decimal.gte(manualCutProgress.value, computedManualCuttingCooldown.value),
onClick() { onClick() {
const amount = Decimal.min(trees.value, manualComputedCuttingAmount.value); const amount = Decimal.min(trees.value, computedManualCuttingAmount.value);
trees.value = Decimal.sub(trees.value, amount); trees.value = Decimal.sub(trees.value, amount);
logs.value = Decimal.add(logs.value, logGain.apply(amount)); logs.value = Decimal.add(logs.value, logGain.apply(amount));
saplings.value = Decimal.add(saplings.value, amount); saplings.value = Decimal.add(saplings.value, amount);
@ -279,8 +279,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
title: "Plant trees", title: "Plant trees",
description: jsx(() => ( description: jsx(() => (
<> <>
Plant up to {formatWhole(manualComputedPlantingAmount.value)} tree Plant up to {formatWhole(computedManualPlantingAmount.value)} tree
{Decimal.eq(manualComputedPlantingAmount.value, 1) ? "" : "s"} at once! {Decimal.eq(computedManualPlantingAmount.value, 1) ? "" : "s"} at once!
<br /> <br />
{render(manualPlantProgressBar)} {render(manualPlantProgressBar)}
</> </>
@ -293,7 +293,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
Decimal.gt(saplings.value, 0) && Decimal.gt(saplings.value, 0) &&
Decimal.gte(manualPlantProgress.value, computedManualPlantingCooldown.value), Decimal.gte(manualPlantProgress.value, computedManualPlantingCooldown.value),
onClick() { onClick() {
const amount = Decimal.min(saplings.value, manualComputedPlantingAmount.value); const amount = Decimal.min(saplings.value, computedManualPlantingAmount.value);
trees.value = Decimal.add(trees.value, amount); trees.value = Decimal.add(trees.value, amount);
saplings.value = Decimal.sub(saplings.value, amount); saplings.value = Decimal.sub(saplings.value, amount);
manualPlantProgress.value = 0; manualPlantProgress.value = 0;
@ -340,7 +340,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
const amountCut = Decimal.min( const amountCut = Decimal.min(
trees.value, trees.value,
Decimal.times(autoComputedCuttingAmount.value, diff) Decimal.times(computedAutoCuttingAmount.value, diff)
); );
trees.value = Decimal.sub(trees.value, amountCut); trees.value = Decimal.sub(trees.value, amountCut);
logs.value = Decimal.add(logs.value, logGain.apply(amountCut)); logs.value = Decimal.add(logs.value, logGain.apply(amountCut));
@ -348,7 +348,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
const amountPlanted = Decimal.min( const amountPlanted = Decimal.min(
saplings.value, saplings.value,
Decimal.times(autoComputedPlantingAmount.value, diff) Decimal.times(computedAutoPlantingAmount.value, diff)
); );
trees.value = Decimal.add(trees.value, amountPlanted); trees.value = Decimal.add(trees.value, amountPlanted);
saplings.value = Decimal.sub(saplings.value, amountPlanted); saplings.value = Decimal.sub(saplings.value, amountPlanted);
@ -380,7 +380,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
<MainDisplay resource={saplings} color="green" style="margin-bottom: 0" /> <MainDisplay resource={saplings} color="green" style="margin-bottom: 0" />
<MainDisplay resource={trees} color="green" style="margin-bottom: 0" /> <MainDisplay resource={trees} color="green" style="margin-bottom: 0" />
<br /> <br />
{Decimal.gt(autoComputedCuttingAmount.value, 0) ? ( {Decimal.gt(computedAutoCuttingAmount.value, 0) ? (
<> <>
<Tooltip <Tooltip
display={jsx(() => display={jsx(() =>
@ -389,12 +389,12 @@ const layer = createLayer(id, function (this: BaseLayer) {
direction={Direction.Down} direction={Direction.Down}
style="width: 400px; text-align: left" style="width: 400px; text-align: left"
> >
You cut down {format(autoComputedCuttingAmount.value)} trees/s You cut down {format(computedAutoCuttingAmount.value)} trees/s
</Tooltip> </Tooltip>
<br /> <br />
</> </>
) : null} ) : null}
{Decimal.gt(autoComputedPlantingAmount.value, 0) ? ( {Decimal.gt(computedAutoPlantingAmount.value, 0) ? (
<> <>
<Tooltip <Tooltip
display={jsx(() => display={jsx(() =>
@ -403,7 +403,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
direction={Direction.Down} direction={Direction.Down}
style="width: 400px; text-align: left" style="width: 400px; text-align: left"
> >
You plant {format(autoComputedPlantingAmount.value)} trees/s You plant {format(computedAutoPlantingAmount.value)} trees/s
</Tooltip> </Tooltip>
<br /> <br />
</> </>