mirror of
https://github.com/thepaperpilot/Advent-Incremental.git
synced 2024-11-22 00:21:34 +00:00
balance up to all milestone 1s
This commit is contained in:
parent
6eaf6b69de
commit
55ecd21d55
2 changed files with 20 additions and 15 deletions
|
@ -120,16 +120,19 @@ const layer = createLayer(id, () => {
|
||||||
...modifiers: Modifier[]
|
...modifiers: Modifier[]
|
||||||
) {
|
) {
|
||||||
const exp = persistent<DecimalSource>(0);
|
const exp = persistent<DecimalSource>(0);
|
||||||
const costMulti = ["Holly","Ivy","Hope","Jack","Mary","Noel","Joy","Faith","Snowball","Star","Bell","Gingersnap"].indexOf(elf.name)+1
|
var costMulti = ["Holly","Ivy","Hope","Jack","Mary","Noel","Joy","Faith","Snowball","Star","Bell","Gingersnap"].indexOf(elf.name)+1
|
||||||
const expRequiredForNextLevel = computed(() => Decimal.pow(10, level.value).mul(2022).mul(costMulti));
|
if(elf.name == "Star" || elf.name == "Bell"){
|
||||||
|
costMulti /= 3
|
||||||
|
}
|
||||||
|
const expRequiredForNextLevel = computed(() => Decimal.pow(10, level.value).mul(4000).mul(costMulti));
|
||||||
const level = computed(() =>
|
const level = computed(() =>
|
||||||
Decimal.min(
|
Decimal.min(
|
||||||
Decimal.mul(9, exp.value).div(2022).div(costMulti).add(1).log10().floor(),
|
Decimal.mul(9, exp.value).div(4000).div(costMulti).add(1).log10().floor(),
|
||||||
schools.amount.value
|
schools.amount.value
|
||||||
).toNumber()
|
).toNumber()
|
||||||
);
|
);
|
||||||
const expToNextLevel = computed(() =>
|
const expToNextLevel = computed(() =>
|
||||||
Decimal.sub(exp.value, Decimal.pow(10, level.value).sub(1).div(9).mul(2022))
|
Decimal.sub(exp.value, Decimal.pow(10, level.value).sub(1).div(9).mul(4000))
|
||||||
);
|
);
|
||||||
const bar = createBar(() => ({
|
const bar = createBar(() => ({
|
||||||
direction: Direction.Right,
|
direction: Direction.Right,
|
||||||
|
@ -224,7 +227,7 @@ const layer = createLayer(id, () => {
|
||||||
requirement: "Holly Level 1",
|
requirement: "Holly Level 1",
|
||||||
effectDisplay: jsx(() => (
|
effectDisplay: jsx(() => (
|
||||||
<>
|
<>
|
||||||
Multiply log gain by <sup>3</sup>
|
Multiply log gain by <sup>9</sup>
|
||||||
<Sqrt>Cutter amount</Sqrt>.
|
<Sqrt>Cutter amount</Sqrt>.
|
||||||
</>
|
</>
|
||||||
))
|
))
|
||||||
|
@ -244,7 +247,7 @@ const layer = createLayer(id, () => {
|
||||||
requirement: "Holly Level 3",
|
requirement: "Holly Level 3",
|
||||||
effectDisplay: jsx(() => (
|
effectDisplay: jsx(() => (
|
||||||
<>
|
<>
|
||||||
Multiply all cloth actions' effectiveness by <sup>3</sup>
|
Multiply all cloth actions' effectiveness by <sup>9</sup>
|
||||||
<Sqrt>Cutter amount</Sqrt>.
|
<Sqrt>Cutter amount</Sqrt>.
|
||||||
</>
|
</>
|
||||||
))
|
))
|
||||||
|
@ -364,7 +367,7 @@ const layer = createLayer(id, () => {
|
||||||
createMilestone(() => ({
|
createMilestone(() => ({
|
||||||
display: {
|
display: {
|
||||||
requirement: "Jack Level 1",
|
requirement: "Jack Level 1",
|
||||||
effectDisplay: "Heated cutters are less expensive."
|
effectDisplay: '"Fahrenheit 451" affects "Heated Cutters" twice.'
|
||||||
},
|
},
|
||||||
shouldEarn: () => heatedCutterElfTraining.level.value >= 1
|
shouldEarn: () => heatedCutterElfTraining.level.value >= 1
|
||||||
})),
|
})),
|
||||||
|
@ -1023,17 +1026,18 @@ const layer = createLayer(id, () => {
|
||||||
resource: trees.logs,
|
resource: trees.logs,
|
||||||
cost: 1e50
|
cost: 1e50
|
||||||
}));
|
}));
|
||||||
const upgrades = { focusUpgrade1, focusUpgrade2, focusUpgrade3 };
|
const upgrades = [ focusUpgrade1, focusUpgrade2, focusUpgrade3 ];
|
||||||
// ------------------------------------------------------------------------------- Schools
|
// ------------------------------------------------------------------------------- Schools
|
||||||
|
|
||||||
const schoolCost = computed(() => {
|
const schoolCost = computed(() => {
|
||||||
const schoolFactor = Decimal.pow(10, schools.amount.value);
|
const schoolFactor = Decimal.pow(10, schools.amount.value);
|
||||||
const woodFactor = Decimal.pow(1e6, schools.amount.value)
|
const woodFactor = Decimal.pow(2e4, schools.amount.value)
|
||||||
|
const coalFactor = Decimal.pow(2000, schools.amount.value)
|
||||||
return {
|
return {
|
||||||
wood: woodFactor.mul(1e21),
|
wood: woodFactor.mul(1e21),
|
||||||
coal: schoolFactor.mul(1e32),
|
coal: coalFactor.mul(1e32),
|
||||||
paper: schoolFactor.mul(1e18),
|
paper: coalFactor.mul(1e18),
|
||||||
boxes: schoolFactor.mul(1e13),
|
boxes: woodFactor.mul(1e13),
|
||||||
metalIngots: schoolFactor.mul(1e12),
|
metalIngots: schoolFactor.mul(1e12),
|
||||||
cloth: schoolFactor.mul(1e4),
|
cloth: schoolFactor.mul(1e4),
|
||||||
plastic: schoolFactor.mul(1e6),
|
plastic: schoolFactor.mul(1e6),
|
||||||
|
@ -1093,7 +1097,7 @@ const layer = createLayer(id, () => {
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const classroomCost = computed(() => {
|
const classroomCost = computed(() => {
|
||||||
const classroomFactor = Decimal.add(schools.amount.value, 1).pow(1.5);
|
const classroomFactor = Decimal.add(classrooms.amount.value, 1).pow(1.5);
|
||||||
return {
|
return {
|
||||||
wood: classroomFactor.mul(1e21),
|
wood: classroomFactor.mul(1e21),
|
||||||
paper: classroomFactor.mul(1e18),
|
paper: classroomFactor.mul(1e18),
|
||||||
|
@ -1295,7 +1299,7 @@ const layer = createLayer(id, () => {
|
||||||
{render(modifiersModal)}
|
{render(modifiersModal)}
|
||||||
{render(dayProgress)}
|
{render(dayProgress)}
|
||||||
<br />
|
<br />
|
||||||
{renderCol(schools, classrooms)} {renderGrid([teaching, classroomUpgrade])}
|
{renderCol(schools, classrooms)} {renderGrid([teaching, classroomUpgrade])} {renderGrid(upgrades)}
|
||||||
{Decimal.gt(schools.amount.value, 0) ? (
|
{Decimal.gt(schools.amount.value, 0) ? (
|
||||||
<>
|
<>
|
||||||
<br />
|
<br />
|
||||||
|
|
|
@ -241,6 +241,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
||||||
let v = this.amount.value;
|
let v = this.amount.value;
|
||||||
if (Decimal.gte(v, 100)) v = Decimal.pow(v, 2).div(100);
|
if (Decimal.gte(v, 100)) v = Decimal.pow(v, 2).div(100);
|
||||||
if (Decimal.gte(v, 1e5)) v = Decimal.pow(v, 2).div(1e5);
|
if (Decimal.gte(v, 1e5)) v = Decimal.pow(v, 2).div(1e5);
|
||||||
|
if (Decimal.gte(v, 1e15)) v = Decimal.pow(v, 10).div(1e135);
|
||||||
v = Decimal.pow(0.95, paper.books.expandersBook.amount.value).times(v);
|
v = Decimal.pow(0.95, paper.books.expandersBook.amount.value).times(v);
|
||||||
return Decimal.pow(Decimal.add(v, 1), 1.5).times(500);
|
return Decimal.pow(Decimal.add(v, 1), 1.5).times(500);
|
||||||
},
|
},
|
||||||
|
@ -483,7 +484,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
||||||
enabled: dyes.upgrades.blueDyeUpg.bought
|
enabled: dyes.upgrades.blueDyeUpg.bought
|
||||||
})),
|
})),
|
||||||
createMultiplicativeModifier(() => ({
|
createMultiplicativeModifier(() => ({
|
||||||
multiplier: computed(() => Decimal.add(computedAutoCuttingAmount.value, 1).root(3)),
|
multiplier: computed(() => Decimal.add(computedAutoCuttingAmount.value, 1).root(9)),
|
||||||
description: "Holly Level 1",
|
description: "Holly Level 1",
|
||||||
enabled: management.elfTraining.cutterElfTraining.milestones[0].earned
|
enabled: management.elfTraining.cutterElfTraining.milestones[0].earned
|
||||||
})),
|
})),
|
||||||
|
|
Loading…
Reference in a new issue