mirror of
https://github.com/thepaperpilot/Advent-Incremental.git
synced 2025-02-16 09:31:43 +00:00
Cleanup
This commit is contained in:
parent
49198eb746
commit
e3b3167003
1 changed files with 28 additions and 11 deletions
|
@ -123,11 +123,27 @@ const layer = createLayer(id, () => {
|
||||||
...modifiers: Modifier[]
|
...modifiers: Modifier[]
|
||||||
) {
|
) {
|
||||||
const exp = persistent<DecimalSource>(0);
|
const exp = persistent<DecimalSource>(0);
|
||||||
var costMulti = ["Holly","Ivy","Hope","Jack","Mary","Noel","Joy","Faith","Snowball","Star","Bell","Gingersnap"].indexOf(elf.name)+1
|
let costMulti =
|
||||||
if(elf.name == "Star" || elf.name == "Bell"){
|
[
|
||||||
costMulti /= 3
|
"Holly",
|
||||||
|
"Ivy",
|
||||||
|
"Hope",
|
||||||
|
"Jack",
|
||||||
|
"Mary",
|
||||||
|
"Noel",
|
||||||
|
"Joy",
|
||||||
|
"Faith",
|
||||||
|
"Snowball",
|
||||||
|
"Star",
|
||||||
|
"Bell",
|
||||||
|
"Gingersnap"
|
||||||
|
].indexOf(elf.name) + 1;
|
||||||
|
if (elf.name == "Star" || elf.name == "Bell") {
|
||||||
|
costMulti /= 3;
|
||||||
}
|
}
|
||||||
const expRequiredForNextLevel = computed(() => Decimal.pow(10, level.value).mul(4000).mul(costMulti));
|
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(4000).div(costMulti).add(1).log10().floor(),
|
Decimal.mul(9, exp.value).div(4000).div(costMulti).add(1).log10().floor(),
|
||||||
|
@ -1034,13 +1050,13 @@ 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(2e4, schools.amount.value)
|
const woodFactor = Decimal.pow(2e4, schools.amount.value);
|
||||||
const coalFactor = Decimal.pow(2000, schools.amount.value)
|
const coalFactor = Decimal.pow(2000, schools.amount.value);
|
||||||
return {
|
return {
|
||||||
wood: woodFactor.mul(1e21),
|
wood: woodFactor.mul(1e21),
|
||||||
coal: coalFactor.mul(1e32),
|
coal: coalFactor.mul(1e32),
|
||||||
|
@ -1131,9 +1147,9 @@ const layer = createLayer(id, () => {
|
||||||
multiplying elves' XP gain by {format(classroomEffect.value)}
|
multiplying elves' XP gain by {format(classroomEffect.value)}
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
Costs {format(classroomCost.value.wood)} logs,{format(classroomCost.value.paper)}{" "}
|
Costs {format(classroomCost.value.wood)} logs,
|
||||||
paper, {format(classroomCost.value.boxes)} boxes,{" "}
|
{format(classroomCost.value.paper)} paper, {format(classroomCost.value.boxes)}{" "}
|
||||||
{format(classroomCost.value.metalIngots)} metal ingots
|
boxes, {format(classroomCost.value.metalIngots)} metal ingots
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)),
|
)),
|
||||||
|
@ -1308,7 +1324,8 @@ const layer = createLayer(id, () => {
|
||||||
{render(modifiersModal)}
|
{render(modifiersModal)}
|
||||||
{render(dayProgress)}
|
{render(dayProgress)}
|
||||||
<br />
|
<br />
|
||||||
{renderCol(schools, classrooms)} {renderGrid([teaching, classroomUpgrade])} {renderGrid(upgrades)}
|
{renderCol(schools, classrooms)} {renderGrid([teaching, classroomUpgrade])}{" "}
|
||||||
|
{renderGrid(upgrades)}
|
||||||
{Decimal.gt(schools.amount.value, 0) ? (
|
{Decimal.gt(schools.amount.value, 0) ? (
|
||||||
<>
|
<>
|
||||||
<br />
|
<br />
|
||||||
|
|
Loading…
Add table
Reference in a new issue