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

Browse source
This commit is contained in:
ducdat0507 2022-12-15 10:43:44 +07:00
commit f1797beb2f
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -848,11 +848,7 @@ const layer = createLayer(id, () => {
createMilestone(() => ({
display: {
requirement: "Gingersnap Level 5",
effectDisplay: jsx(() => (
<>
<Sqrt>Well depth</Sqrt> divides metal machine costs
</>
))
effectDisplay: "Unlock another row of focus upgrades"
},
visibility: () => showIf(clothElfMilestones[3].earned.value && main.day.value >= 13),
shouldEarn: () => clothElfTraining.level.value >= 5
@ -936,7 +932,11 @@ const layer = createLayer(id, () => {
createMilestone(() => ({
display: {
requirement: "Twinkle Level 5",
effectDisplay: "Unlock another row of focus upgrades"
effectDisplay: jsx(() => (
<>
<Sqrt>Well depth</Sqrt> divides metal machine costs
</>
))
},
visibility: () => showIf(metalElfMilestones[3].earned.value && main.day.value >= 13),
shouldEarn: () => metalElfTraining.level.value >= 5
@ -1349,7 +1349,7 @@ const layer = createLayer(id, () => {
"The bar moves slower when it's closer to the right and faster when it's closer to the left"
},
resource: trees.logs,
visibility: () => showIf(elfTraining.metalElfTraining.milestones[4].earned.value),
visibility: () => showIf(elfTraining.clothElfTraining.milestones[4].earned.value),
cost: 1e40
}));
const focusUpgrade5 = createUpgrade(() => ({
@ -1358,7 +1358,7 @@ const layer = createLayer(id, () => {
description: "The bar moves 2x slower"
},
resource: trees.logs,
visibility: () => showIf(elfTraining.metalElfTraining.milestones[4].earned.value),
visibility: () => showIf(elfTraining.clothElfTraining.milestones[4].earned.value),
cost: 1e45
}));
const focusUpgrade6 = createUpgrade(() => ({
@ -1367,7 +1367,7 @@ const layer = createLayer(id, () => {
description: "Focus now applies to 6 elves."
},
resource: trees.logs,
visibility: () => showIf(elfTraining.metalElfTraining.milestones[4].earned.value),
visibility: () => showIf(elfTraining.clothElfTraining.milestones[4].earned.value),
cost: 1e50
}));
const upgrades2 = [focusUpgrade4, focusUpgrade5, focusUpgrade6];
@ -1453,9 +1453,9 @@ const layer = createLayer(id, () => {
})) as GenericBuyable;
const classroomCost = computed(() => {
var v = classrooms.amount.value;
if(Decimal.gte(v,100)) v=Decimal.pow(v,2).div(100)
if(Decimal.gte(v,1e4)) v=Decimal.pow(v,8).div(1e28)
let v = classrooms.amount.value;
if (Decimal.gte(v, 50)) v = Decimal.pow(v, 2).div(50);
if (Decimal.gte(v, 200)) v = Decimal.pow(v, 2).div(200);
const classroomFactor = Decimal.add(v, 1).pow(1.5);
return {
wood: classroomFactor.mul(1e21),
@ -1689,7 +1689,7 @@ const layer = createLayer(id, () => {
<br />
<br />
{render(focusButton)}
{renderGrid(upgrades)}
{renderGrid(upgrades, upgrades2)}
<br />
{renderGrid(
[focusMeter],

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

@ -408,7 +408,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
let v = new Decimal(this.amount.value);
v = Decimal.pow(0.95, paper.books.metalBook.totalAmount.value).times(v);
let cost = Decimal.pow(1.15, v).times(10);
if (management.elfTraining.clothElfTraining.milestones[4].earned.value) {
if (management.elfTraining.metalElfTraining.milestones[4].earned.value) {
cost = Decimal.div(cost, Decimal.add(oil.depth.value, 1).sqrt());
}
if (management.elfTraining.metalElfTraining.milestones[3].earned.value) {
@ -420,7 +420,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
if (management.elfTraining.metalElfTraining.milestones[3].earned.value) {
x = Decimal.mul(x, 10);
}
if (management.elfTraining.clothElfTraining.milestones[4].earned.value) {
if (management.elfTraining.metalElfTraining.milestones[4].earned.value) {
x = Decimal.mul(x, Decimal.add(oil.depth.value, 1).sqrt());
}
let v = Decimal.div(x, 10).log(1.15);
@ -452,7 +452,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
let v = new Decimal(this.amount.value);
v = Decimal.pow(0.95, paper.books.metalBook.totalAmount.value).times(v);
let cost = Decimal.pow(1.15, Decimal.times(v, 10)).times(10);
if (management.elfTraining.clothElfTraining.milestones[4].earned.value) {
if (management.elfTraining.metalElfTraining.milestones[4].earned.value) {
cost = Decimal.div(cost, Decimal.add(oil.depth.value, 1).sqrt());
}
if (management.elfTraining.metalElfTraining.milestones[3].earned.value) {
@ -464,7 +464,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
if (management.elfTraining.metalElfTraining.milestones[3].earned.value) {
x = Decimal.mul(x, 10);
}
if (management.elfTraining.clothElfTraining.milestones[4].earned.value) {
if (management.elfTraining.metalElfTraining.milestones[4].earned.value) {
x = Decimal.mul(x, Decimal.add(oil.depth.value, 1).sqrt());
}
let v = Decimal.div(x, 10).log(1.15).div(10);
@ -496,7 +496,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
let v = new Decimal(this.amount.value);
v = Decimal.pow(0.95, paper.books.metalBook.totalAmount.value).times(v);
let cost = Decimal.pow(10, v).times(1e12);
if (management.elfTraining.clothElfTraining.milestones[4].earned.value) {
if (management.elfTraining.metalElfTraining.milestones[4].earned.value) {
cost = Decimal.div(cost, Decimal.add(oil.depth.value, 1).sqrt());
}
if (management.elfTraining.metalElfTraining.milestones[3].earned.value) {
@ -508,7 +508,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
if (management.elfTraining.metalElfTraining.milestones[3].earned.value) {
x = Decimal.mul(x, 10);
}
if (management.elfTraining.clothElfTraining.milestones[4].earned.value) {
if (management.elfTraining.metalElfTraining.milestones[4].earned.value) {
x = Decimal.mul(x, Decimal.add(oil.depth.value, 1).sqrt());
}
let v = Decimal.div(x, 1e12).log(10);