thepaperpilot/Advent-Incremental
1
0
Fork 0
mirror of https://github.com/thepaperpilot/Advent-Incremental.git synced 2024-11-22 00:21:34 +00:00
Code Issues Releases Activity Actions

Implemented Bell lv1-3

Browse source
This commit is contained in:
Anthony Lawn 2022-12-12 09:45:15 -06:00
parent 2493012c3f
commit db50be95a5
3 changed files with 99 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,8 @@
* @hidden
*/
import Spacer from "components/layout/Spacer.vue";
import { setUpDailyProgressTracker } from "data/common";
import Modal from "components/Modal.vue";
import { createCollapsibleModifierSections, setUpDailyProgressTracker } from "data/common";
import { main } from "data/projEntry";
import { createBuyable, GenericBuyable } from "features/buyable";
import { createClickable } from "features/clickables/clickable";
@ -14,15 +15,20 @@ import { createResource, displayResource, Resource } from "features/resources/re
import { createUpgrade, GenericUpgrade } from "features/upgrades/upgrade";
import { globalBus } from "game/events";
import { BaseLayer, createLayer } from "game/layers";
import { createExponentialModifier, createSequentialModifier, Modifier } from "game/modifiers";
import { noPersist } from "game/persistence";
import Decimal, { DecimalSource, format, formatWhole } from "util/bignum";
import { WithRequired } from "util/common";
import { render, renderGrid, renderRow } from "util/vue";
import { unref } from "vue";
import { computed, ComputedRef, ref, unref } from "vue";
import dyes from "./dyes";
import management from "./management";
import paper from "./paper";
import plastic from "./plastic";
import trees from "./trees";
import dyes from "./dyes";
import management from "./management";
export type BoxesBuyable = GenericBuyable & { resource: Resource; freeLevels: ComputedRef<DecimalSource>; totalAmount: ComputedRef<Decimal> };
const id = "boxes";
const day = 6;
const layer = createLayer(id, function (this: BaseLayer) {
@ -31,11 +37,20 @@ const layer = createLayer(id, function (this: BaseLayer) {
const boxes = createResource<DecimalSource>(0, "boxes");
const boxGain = createSequentialModifier(() => [
createExponentialModifier(() => ({
exponent: 1.1,
description: "Bell Level 2",
enabled: management.elfTraining.boxElfTraining.milestones[1].earned
}))
]) as WithRequired<Modifier, "description" | "revert">;
const boxesConversion = createCumulativeConversion(() => ({
scaling: createPolynomialScaling(1e10, 1),
baseResource: trees.logs,
gainResource: noPersist(boxes),
roundUpCost: true
roundUpCost: true,
gainModifier: boxGain
}));
const makeBoxes = createClickable(() => ({
@ -163,51 +178,72 @@ const layer = createLayer(id, function (this: BaseLayer) {
const logBoxesBuyable = createBuyable(() => ({
display: {
title: "Carry more logs",
description: "Use boxes to carry even more logs, boosting their gain",
description: jsx(() => <>Use boxes to carry even more logs, boosting their gain<br /><br /><div>Amount: {formatWhole(logBoxesBuyable.amount.value)}{Decimal.gt(logBoxesBuyable.freeLevels.value, 0) ? <> (+{formatWhole(logBoxesBuyable.freeLevels.value)})</> : null}</div></>),
effectDisplay: jsx(() => (
<>{format(Decimal.div(logBoxesBuyable.amount.value, 2).add(1))}x</>
))
<>{format(Decimal.div(logBoxesBuyable.totalAmount.value, 2).add(1))}x</>
)),
showAmount: false
},
resource: noPersist(boxes),
cost() {
let v = this.amount.value;
v = Decimal.pow(0.95, paper.books.boxBook.amount.value).times(v);
return Decimal.pow(3, v).times(100).div(dyes.boosts.orange2.value);
let scaling = 3;
if (management.elfTraining.boxElfTraining.milestones[2].earned.value) {
scaling--;
}
return Decimal.pow(scaling, v).times(100).div(dyes.boosts.orange2.value);
},
visibility: () => showIf(logsUpgrade.bought.value)
})) as GenericBuyable & { resource: Resource };
visibility: () => showIf(logsUpgrade.bought.value),
freeLevels: computed(() => management.elfTraining.boxElfTraining.milestones[0].earned.value ? Decimal.max(ashBoxesBuyable.amount.value, 1).sqrt().floor().add(Decimal.max(coalBoxesBuyable.amount.value, 1).sqrt().floor()) : 0),
totalAmount: computed(() => Decimal.add(logBoxesBuyable.amount.value, logBoxesBuyable.freeLevels.value))
})) as BoxesBuyable;
const ashBoxesBuyable = createBuyable(() => ({
display: {
title: "Carry more ash",
description: "Use boxes to carry even more ash, boosting its gain",
description: jsx(() => <>Use boxes to carry even more ash, boosting its gain<br /><br /><div>Amount: {formatWhole(ashBoxesBuyable.amount.value)}{Decimal.gt(ashBoxesBuyable.freeLevels.value, 0) ? <> (+{formatWhole(ashBoxesBuyable.freeLevels.value)})</> : null}</div></>),
effectDisplay: jsx(() => (
<>{format(Decimal.div(ashBoxesBuyable.amount.value, 2).add(1))}x</>
))
<>{format(Decimal.div(ashBoxesBuyable.totalAmount.value, 2).add(1))}x</>
)),
showAmount: false
},
resource: noPersist(boxes),
cost() {
let v = this.amount.value;
v = Decimal.pow(0.95, paper.books.boxBook.amount.value).times(v);
return Decimal.pow(5, v).times(1000).div(dyes.boosts.orange2.value);
let scaling = 5;
if (management.elfTraining.boxElfTraining.milestones[2].earned.value) {
scaling--;
}
return Decimal.pow(scaling, v).times(1000).div(dyes.boosts.orange2.value);
},
visibility: () => showIf(ashUpgrade.bought.value)
})) as GenericBuyable & { resource: Resource };
visibility: () => showIf(ashUpgrade.bought.value),
freeLevels: computed(() => management.elfTraining.boxElfTraining.milestones[0].earned.value ? Decimal.max(logBoxesBuyable.amount.value, 1).sqrt().floor().add(Decimal.max(coalBoxesBuyable.amount.value, 1).sqrt().floor()) : 0),
totalAmount: computed(() => Decimal.add(ashBoxesBuyable.amount.value, ashBoxesBuyable.freeLevels.value))
})) as BoxesBuyable;
const coalBoxesBuyable = createBuyable(() => ({
display: {
title: "Carry more coal",
description: "Use boxes to carry even more coal, boosting its gain",
description: jsx(() => <>Use boxes to carry even more coal, boosting its gain<br /><br /><div>Amount: {formatWhole(coalBoxesBuyable.amount.value)}{Decimal.gt(coalBoxesBuyable.freeLevels.value, 0) ? <> (+{formatWhole(coalBoxesBuyable.freeLevels.value)})</> : null}</div></>),
effectDisplay: jsx(() => (
<>{format(Decimal.div(coalBoxesBuyable.amount.value, 2).add(1))}x</>
))
<>{format(Decimal.div(coalBoxesBuyable.totalAmount.value, 2).add(1))}x</>
)),
showAmount: false
},
resource: noPersist(boxes),
cost() {
let v = this.amount.value;
v = Decimal.pow(0.95, paper.books.boxBook.amount.value).times(v);
return Decimal.pow(7, v).times(1000).div(dyes.boosts.orange2.value);
let scaling = 7;
if (management.elfTraining.boxElfTraining.milestones[2].earned.value) {
scaling--;
}
return Decimal.pow(scaling, v).times(1000).div(dyes.boosts.orange2.value);
},
visibility: () => showIf(coalUpgrade.bought.value)
})) as GenericBuyable & { resource: Resource };
visibility: () => showIf(coalUpgrade.bought.value),
freeLevels: computed(() => management.elfTraining.boxElfTraining.milestones[0].earned.value ? Decimal.max(logBoxesBuyable.amount.value, 1).sqrt().floor().add(Decimal.max(ashBoxesBuyable.amount.value, 1).sqrt().floor()) : 0),
totalAmount: computed(() => Decimal.add(coalBoxesBuyable.amount.value, coalBoxesBuyable.freeLevels.value))
})) as BoxesBuyable;
const buyables = { logBoxesBuyable, ashBoxesBuyable, coalBoxesBuyable };
globalBus.on("update", diff => {
@ -221,12 +257,35 @@ const layer = createLayer(id, function (this: BaseLayer) {
.add(boxes.value);
});
const [generalTab, generalTabCollapsed] = createCollapsibleModifierSections(() => [
{
title: "Boxes Gain",
modifier: boxGain,
base: 1
}
]);
const showModifiersModal = ref(false);
const modifiersModal = jsx(() => (
<Modal
modelValue={showModifiersModal.value}
onUpdate:modelValue={(value: boolean) => (showModifiersModal.value = value)}
v-slots={{
header: () => <h2>{name} Modifiers</h2>,
body: generalTab
}}
/>
));
const { total: totalBoxes, trackerDisplay } = setUpDailyProgressTracker({
resource: boxes,
goal: 5e4,
name,
day,
color
color,
modal: {
display: modifiersModal,
show: showModifiersModal
}
});
return {

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

@ -349,15 +349,15 @@ const layer = createLayer(id, function (this: BaseLayer) {
description: "Shepherding for Dummies",
enabled: paper.upgrades.clothUpgrade.bought
})),
createMultiplicativeModifier(() => ({
multiplier: hollyEffect,
description: "Holly Level 3",
enabled: management.elfTraining.cutterElfTraining.milestones[2].earned
})),
createMultiplicativeModifier(() => ({
multiplier: gingersnapEffect,
description: "Gingersnap Level 2",
enabled: management.elfTraining.clothElfTraining.milestones[1].earned
})),
createMultiplicativeModifier(() => ({
multiplier: hollyEffect,
description: "Holly Level 3",
enabled: management.elfTraining.cutterElfTraining.milestones[2].earned
}))
]);
const computedSheepGain = computed(() => sheepGain.apply(1));
@ -379,15 +379,15 @@ const layer = createLayer(id, function (this: BaseLayer) {
description: "Shepherding for Dummies",
enabled: paper.upgrades.clothUpgrade.bought
})),
createMultiplicativeModifier(() => ({
multiplier: hollyEffect,
description: "Holly Level 3",
enabled: management.elfTraining.cutterElfTraining.milestones[2].earned
})),
createMultiplicativeModifier(() => ({
multiplier: gingersnapEffect,
description: "Gingersnap Level 2",
enabled: management.elfTraining.clothElfTraining.milestones[1].earned
})),
createMultiplicativeModifier(() => ({
multiplier: hollyEffect,
description: "Holly Level 3",
enabled: management.elfTraining.cutterElfTraining.milestones[2].earned
}))
]);
const computedShearingAmount = computed(() => shearingAmount.apply(1));
@ -409,15 +409,15 @@ const layer = createLayer(id, function (this: BaseLayer) {
description: "Shepherding for Dummies",
enabled: paper.upgrades.clothUpgrade.bought
})),
createMultiplicativeModifier(() => ({
multiplier: hollyEffect,
description: "Holly Level 3",
enabled: management.elfTraining.cutterElfTraining.milestones[2].earned
})),
createMultiplicativeModifier(() => ({
multiplier: gingersnapEffect,
description: "Gingersnap Level 2",
enabled: management.elfTraining.clothElfTraining.milestones[1].earned
})),
createMultiplicativeModifier(() => ({
multiplier: hollyEffect,
description: "Holly Level 3",
enabled: management.elfTraining.cutterElfTraining.milestones[2].earned
}))
]);
const computedSpinningAmount = computed(() => spinningAmount.apply(1));

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

@ -110,8 +110,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
enabled: upgrades.yellowDyeUpg.bought
})));
modifiers.push(createMultiplicativeModifier(() => ({
// adding e, which apparently isn't a constant
multiplier: () => Decimal.add(cloth.cloth.value, 2.718281828459).ln(),
multiplier: () => Decimal.add(cloth.cloth.value, Math.E).ln(),
description: "Gingersnap Level 1",
enabled: management.elfTraining.clothElfTraining.milestones[0].earned
})));