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-14 04:11:50 +00:00
commit 40f766b04d
3 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -490,15 +490,15 @@ const layer = createLayer(id, function (this: BaseLayer) {
blue1: computed(() => Decimal.add(dyes.blue.amount.value, 1).log2().sqrt().times(5e6)),
orange1: computed(() =>
Decimal.pow(2, Decimal.add(dyes.orange.amount.value, 1).log2().sqrt()).pow(
upgrades.coalUpg.bought.value ? 1.2 : 1
)
Decimal.pow(2, Decimal.add(dyes.orange.amount.value, 1).log2().sqrt())
.pow(upgrades.coalUpg.bought.value ? 1.2 : 1)
.pow(management.elfTraining.clothElfTraining.milestones[3].earned.value ? 1.1 : 1)
),
orange2: computed(() => Decimal.add(dyes.orange.amount.value, 1).log2().plus(1)),
green1: computed(() =>
Decimal.pow(2, Decimal.add(dyes.green.amount.value, 1).log2().sqrt()).pow(
upgrades.coalUpg.bought.value ? 1.2 : 1
)
Decimal.pow(2, Decimal.add(dyes.green.amount.value, 1).log2().sqrt())
.pow(upgrades.coalUpg.bought.value ? 1.2 : 1)
.pow(management.elfTraining.clothElfTraining.milestones[3].earned.value ? 1.1 : 1)
),
green2: computed(() =>
Decimal.add(dyes.green.amount.value, 1)
@ -507,9 +507,9 @@ const layer = createLayer(id, function (this: BaseLayer) {
.pow(upgrades.coalUpg.bought.value ? 2 : 1)
),
purple1: computed(() =>
Decimal.pow(2, Decimal.add(dyes.purple.amount.value, 1).log2().sqrt()).pow(
upgrades.coalUpg.bought.value ? 1.2 : 1
)
Decimal.pow(2, Decimal.add(dyes.purple.amount.value, 1).log2().sqrt())
.pow(upgrades.coalUpg.bought.value ? 1.2 : 1)
.pow(management.elfTraining.clothElfTraining.milestones[3].earned.value ? 1.1 : 1)
),
purple2: computed(() => Decimal.add(dyes.purple.amount.value, 1).log2().plus(1))
};

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

@ -796,7 +796,8 @@ const layer = createLayer(id, () => {
createMilestone(() => ({
display: {
requirement: "Gingersnap Level 4",
effectDisplay: "Raise secondary dyes' first effects to the 1.1 but reset primary dyes"
effectDisplay:
"Raise secondary dyes' first effects to the 1.1 but reset primary dyes"
},
visibility: () => showIf(clothElfMilestones[2].earned.value && main.day.value >= 13),
shouldEarn: () => clothElfTraining.level.value >= 4,
@ -810,7 +811,11 @@ const layer = createLayer(id, () => {
createMilestone(() => ({
display: {
requirement: "Gingersnap Level 5",
effectDisplay: "Well depth divides metal machine costs"
effectDisplay: jsx(() => (
<>
<Sqrt>Well depth</Sqrt> divides metal machine costs
</>
))
},
visibility: () => showIf(clothElfMilestones[3].earned.value && main.day.value >= 13),
shouldEarn: () => clothElfTraining.level.value >= 5

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

@ -381,7 +381,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
cost() {
let v = new Decimal(this.amount.value);
v = Decimal.pow(0.95, paper.books.metalBook.totalAmount.value).times(v);
return Decimal.pow(1.15, v).times(10);
let cost = Decimal.pow(1.15, v).times(10);
if (management.elfTraining.clothElfTraining.milestones[4].earned.value) {
cost = Decimal.div(cost, Decimal.add(oil.depth.value, 1).sqrt());
}
return cost;
},
display: {
title: "Metal Drill",
@ -407,7 +411,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
cost() {
let v = new Decimal(this.amount.value);
v = Decimal.pow(0.95, paper.books.metalBook.totalAmount.value).times(v);
return Decimal.pow(1.15, Decimal.times(v, 10)).times(10);
let cost = Decimal.pow(1.15, Decimal.times(v, 10)).times(10);
if (management.elfTraining.clothElfTraining.milestones[4].earned.value) {
cost = Decimal.div(cost, Decimal.add(oil.depth.value, 1).sqrt());
}
return cost;
},
display: {
title: "Industrial Crucible",
@ -433,7 +441,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
cost() {
let v = new Decimal(this.amount.value);
v = Decimal.pow(0.95, paper.books.metalBook.totalAmount.value).times(v);
return Decimal.pow(10, v).times(1e12);
let cost = Decimal.pow(10, v).times(1e12);
if (management.elfTraining.clothElfTraining.milestones[4].earned.value) {
cost = Decimal.div(cost, Decimal.add(oil.depth.value, 1).sqrt());
}
return cost;
},
display: {
title: "Hotter Forges",