diff --git a/js/data/achievements.js b/js/data/achievements.js index d124619..1df8cb3 100644 --- a/js/data/achievements.js +++ b/js/data/achievements.js @@ -165,13 +165,13 @@ addLayer("ach", { }, tabFormat: [ "blank", - ["raw-html", function () { return "Achievements: " + player[this.layer].achievements.length + "/" + (Object.keys(tmp[this.layer].achievements).length - 2) }], - ["raw-html", function () { return "Effect: x" + tmp[this.layer].effect + " to point gen." }], + ["raw-html", function () { return "Achievements: " + format(player[this.layer].achievements.length) + "/" + format(Object.keys(tmp[this.layer].achievements).length - 2) }], + ["raw-html", function () { return "Effect: x" + format(tmp[this.layer].effect) + " to point gen." }], "blank", "achievements" ], tooltip() { - return player[this.layer].achievements.length + " achievement" + (player[this.layer].achievements.length == 1 ? "" : "s") + return format(player[this.layer].achievements.length) + " achievement" + format(player[this.layer].achievements.length == 1 ? "" : "s") }, row: "side", // Row the layer is in on the tree (0 is the first row) layerShown(){return true} diff --git a/js/data/files.js b/js/data/files.js index 1dcea25..c48d36b 100644 --- a/js/data/files.js +++ b/js/data/files.js @@ -18,9 +18,9 @@ addLayer("f", { baseResource: "super progress points", // Name of resource prestige is based on baseAmount() {return player.sp.points}, // Get the current amount of baseResource type: "static", // normal: cost to gain currency depends on amount gained. static: cost depends on how much you already have - exponent: 1.3, // Prestige currency exponent + exponent: 1.5, // Prestige currency exponent base() { - let base = 2 + let base = 1.5 if (hasUpgrade(this.layer, 41)) base **= 0.95 return base }, @@ -42,13 +42,13 @@ addLayer("f", { 0: { requirementDescription: "1 total File.", effectDescription() { - return "Total levels boost point gen.
Effect: x" + getTotalLevel().add(1).log(5).add(1) + "." + return "Total levels boost point gen.
Effect: x" + format(getTotalLevel().add(1).log(5).add(1)) + "." }, done() { return player.f.total.gte(1) } }, 1: { requirementDescription: "2 total Files.", - effectDescription: "Triple point gen.", + effectDescription: "Triple PP and SPP gen.", done() { return player.f.total.gte(2) } }, 2: { @@ -69,7 +69,7 @@ addLayer("f", { 5: { requirementDescription: "7 total Files.", effectDescription() { - return "Total Files boost point gen.
Effect: x" + player[this.layer].total.div(2).add(1) + "." + return "Total Files boost point gen.
Effect: x" + format(player[this.layer].total.div(2).add(1)) + "." }, done() { return player.f.total.gte(7) } }, @@ -98,7 +98,7 @@ addLayer("f", { 11: { description: "Total rank boosts point gen.", effect() { return getTotalRank().add(2) }, - effectDisplay() { return "^" + this.effect() + "." }, + effectDisplay() { return "^" + format(this.effect()) + "." }, cost: 1, canAfford() { return hasMilestone(this.layer, 4) }, }, @@ -155,7 +155,7 @@ addLayer("f", { cost: 9, canAfford() { return hasUpgrade(this.layer, 32) && hasUpgrade(this.layer, 33) }, effect() { return player[this.layer].points.add(3).log(2).add(1) }, - effectDisplay() { return "/" + this.effect() + "." }, + effectDisplay() { return "/" + format(this.effect()) + "." }, branches: [32, 33] }, 44: { diff --git a/js/data/progress.js b/js/data/progress.js index a40f1d1..c4ce4d8 100644 --- a/js/data/progress.js +++ b/js/data/progress.js @@ -23,6 +23,7 @@ addLayer("p", { let mult = new Decimal(1) mult = mult.mul(buyableEffect(this.layer, 11)) mult = mult.mul(getThetaEffect()) + if (hasMilestone('f', 1)) mult = mult.mul(3) return mult }, gainExp() { // Calculate the exponent on main currency from bonuses @@ -50,8 +51,8 @@ addLayer("p", { height: 50, progress() { return player[this.layer].points.div(getAlphaCost()) }, display() { - return "Alpha - Level " + getAlphaLevel() + " (" + player[this.layer].points + "/" + getAlphaCost() - + ")
Effect: +" + getAlphaEffect() + " to point gen." + return "Alpha - Level " + format(getAlphaLevel()) + " (" + format(player[this.layer].points) + "/" + format(getAlphaCost()) + + ")
Effect: +" + format(getAlphaEffect()) + " to point gen." }, fillStyle: {backgroundColor: "#0c6949"} }, @@ -61,8 +62,8 @@ addLayer("p", { height: 50, progress() { return getAlphaLevel().div(getAlphaRankCost()) }, display() { - return "Alpha - Rank " + getAlphaRank() + " (" + getAlphaLevel() + "/" + getAlphaRankCost() - + ")
Effect: +" + getAlphaRankEffect() + " to Alpha effect base." + return "Alpha - Rank " + format(getAlphaRank()) + " (" + format(getAlphaLevel()) + "/" + format(getAlphaRankCost()) + + ")
Effect: +" + format(getAlphaRankEffect()) + " to Alpha effect base." }, fillStyle: {backgroundColor: "#0c6949"}, }, @@ -72,8 +73,8 @@ addLayer("p", { height: 50, progress() { return player[this.layer].points.div(getBetaCost()) }, display() { - return "Beta - Level " + getBetaLevel() + " (" + player[this.layer].points + "/" + getBetaCost() - + ")
Effect: x" + getBetaEffect() + " to point gen." + return "Beta - Level " + format(getBetaLevel()) + " (" + format(player[this.layer].points) + "/" + format(getBetaCost()) + + ")
Effect: x" + format(getBetaEffect()) + " to point gen." }, fillStyle: {backgroundColor: "#0c6949"}, unlocked() { return getAlphaLevel().gt(0) } @@ -84,8 +85,8 @@ addLayer("p", { height: 50, progress() { return getBetaLevel().div(getBetaRankCost()) }, display() { - return "Beta - Rank " + getBetaRank() + " (" + getBetaLevel() + "/" + getBetaRankCost() - + ")
Effect: +" + getBetaRankEffect() + " to Beta effect base." + return "Beta - Rank " + format(getBetaRank()) + " (" + format(getBetaLevel()) + "/" + format(getBetaRankCost()) + + ")
Effect: +" + format(getBetaRankEffect()) + " to Beta effect base." }, fillStyle: {backgroundColor: "#0c6949"}, unlocked() { return getAlphaLevel().gt(0) } @@ -96,8 +97,8 @@ addLayer("p", { height: 50, progress() { return player[this.layer].points.div(getGammaCost()) }, display() { - return "Gamma - Level " + getGammaLevel() + " (" + player[this.layer].points + "/" + getGammaCost() - + ")
Effect: x" + getGammaEffect() + " to point gen." + return "Gamma - Level " + format(getGammaLevel()) + " (" + format(player[this.layer].points) + "/" + format(getGammaCost()) + + ")
Effect: x" + format(getGammaEffect()) + " to point gen." }, fillStyle: {backgroundColor: "#0c6949"}, unlocked() { return getBetaLevel().gt(0) } @@ -108,8 +109,8 @@ addLayer("p", { height: 50, progress() { return getGammaLevel().div(getGammaRankCost()) }, display() { - return "Gamma - Rank " + getGammaRank() + " (" + getGammaLevel() + "/" + getGammaRankCost() - + ")
Effect: +" + getGammaRankEffect() + " to Gamma effect exponent." + return "Gamma - Rank " + format(getGammaRank()) + " (" + format(getGammaLevel()) + "/" + format(getGammaRankCost()) + + ")
Effect: +" + format(getGammaRankEffect()) + " to Gamma effect exponent." }, fillStyle: {backgroundColor: "#0c6949"}, unlocked() { return getBetaLevel().gt(0) } @@ -120,8 +121,8 @@ addLayer("p", { height: 50, progress() { return player[this.layer].points.div(getDeltaCost()) }, display() { - return "Delta - Level " + getDeltaLevel() + " (" + player[this.layer].points + "/" + getDeltaCost() - + ")
Effect: x" + getDeltaEffect() + " to point gen." + return "Delta - Level " + format(getDeltaLevel()) + " (" + format(player[this.layer].points) + "/" + format(getDeltaCost()) + + ")
Effect: x" + format(getDeltaEffect()) + " to point gen." }, fillStyle: {backgroundColor: "#0c6949"}, unlocked() { return getGammaLevel().gt(0) } @@ -132,8 +133,8 @@ addLayer("p", { height: 50, progress() { return getDeltaLevel().div(getDeltaRankCost()) }, display() { - return "Delta - Rank " + getDeltaRank() + " (" + getDeltaLevel() + "/" + getDeltaRankCost() - + ")
Effect: +" + getDeltaRankEffect() + " to Delta effect base." + return "Delta - Rank " + format(getDeltaRank()) + " (" + format(getDeltaLevel()) + "/" + format(getDeltaRankCost()) + + ")
Effect: +" + format(getDeltaRankEffect()) + " to Delta effect base." }, fillStyle: {backgroundColor: "#0c6949"}, unlocked() { return getGammaLevel().gt(0) } @@ -144,8 +145,8 @@ addLayer("p", { height: 50, progress() { return player[this.layer].points.div(getEpsilonCost()) }, display() { - return "Epsilon - Level " + getEpsilonLevel() + " (" + player[this.layer].points + "/" + getEpsilonCost() - + ")
Effect: ^" + getEpsilonEffect() + " to point gen." + return "Epsilon - Level " + format(getEpsilonLevel()) + " (" + format(player[this.layer].points) + "/" + format(getEpsilonCost()) + + ")
Effect: ^" + format(getEpsilonEffect()) + " to point gen." }, fillStyle: {backgroundColor: "#0c6949"}, unlocked() { return getDeltaLevel().gt(0) } @@ -156,8 +157,8 @@ addLayer("p", { height: 50, progress() { return getEpsilonLevel().div(getEpsilonRankCost()) }, display() { - return "Epsilon - Rank " + getEpsilonRank() + " (" + getEpsilonLevel() + "/" + getEpsilonRankCost() - + ")
Effect: +" + getEpsilonRankEffect() + " to Epsilon effect base." + return "Epsilon - Rank " + format(getEpsilonRank()) + " (" + format(getEpsilonLevel()) + "/" + format(getEpsilonRankCost()) + + ")
Effect: +" + format(getEpsilonRankEffect()) + " to Epsilon effect base." }, fillStyle: {backgroundColor: "#0c6949"}, unlocked() { return getDeltaLevel().gt(0) } @@ -168,8 +169,8 @@ addLayer("p", { height: 50, progress() { return player[this.layer].points.div(getZetaCost()) }, display() { - return "Zeta - Level " + getZetaLevel() + " (" + player[this.layer].points + "/" + getZetaCost() - + ")
Effect: x" + getZetaEffect() + " to point gen." + return "Zeta - Level " + format(getZetaLevel()) + " (" + format(player[this.layer].points) + "/" + format(getZetaCost()) + + ")
Effect: x" + format(getZetaEffect()) + " to point gen." }, fillStyle: {backgroundColor: "#0c6949"}, unlocked() { return getEpsilonLevel().gt(0) } @@ -180,8 +181,8 @@ addLayer("p", { height: 50, progress() { return getZetaLevel().div(getZetaRankCost()) }, display() { - return "Zeta - Rank " + getZetaRank() + " (" + getZetaLevel() + "/" + getZetaRankCost() - + ")
Effect: +" + getZetaRankEffect() + " to Zeta effect base." + return "Zeta - Rank " + format(getZetaRank()) + " (" + format(getZetaLevel()) + "/" + format(getZetaRankCost()) + + ")
Effect: +" + format(getZetaRankEffect()) + " to Zeta effect base." }, fillStyle: {backgroundColor: "#0c6949"}, unlocked() { return getEpsilonLevel().gt(0) } @@ -193,37 +194,33 @@ addLayer("p", { effect() { return Decimal.pow(1.1, getBuyableAmount(this.layer, this.id)) }, cost() { return Decimal.pow(getBuyableAmount(this.layer, this.id), 1.2).mul(5).add(50) }, display() { - return "Increase progress point gain.

Amount: " + getBuyableAmount(this.layer, this.id) - + ".
Effect: x" + this.effect(getBuyableAmount(this.layer, this.id)) + ".
Cost: " - + this.cost(getBuyableAmount(this.layer, this.id)) + " total levels." + return "Increase progress point gain.

Amount: " + format(getBuyableAmount(this.layer, this.id)) + + ".
Effect: x" + format(this.effect(getBuyableAmount(this.layer, this.id))) + ".
Cost: " + + format(this.cost(getBuyableAmount(this.layer, this.id))) + " total levels." }, canAfford() { return Decimal.gte(getTotalLevel(), this.cost()) }, buy() { addBuyables(this.layer, this.id, 1) } }, 12: { title: "Rebased", - effect() { return Decimal.add( - getBuyableAmount(this.layer, this.id), hasUpgrade('f', 21) ? 2 : 0 - ).pow_base(0.95) }, + effect() { return Decimal.add(getBuyableAmount(this.layer, this.id), hasUpgrade('f', 21) ? 2 : 0).pow_base(0.95) }, cost() { return Decimal.pow(getBuyableAmount(this.layer, this.id), 1.4).mul(7).add(80) }, display() { - return "Decrease Gamma effect base.

Amount: " + getBuyableAmount(this.layer, this.id) - + ".
Effect: ^" + this.effect(getBuyableAmount(this.layer, this.id)) + ".
Cost: " - + this.cost(getBuyableAmount(this.layer, this.id)) + " total levels." + return "Decrease Gamma effect base.

Amount: " + format(getBuyableAmount(this.layer, this.id)) + + ".
Effect: ^" + format(this.effect(getBuyableAmount(this.layer, this.id))) + ".
Cost: " + + format(this.cost(getBuyableAmount(this.layer, this.id))) + " total levels." }, canAfford() { return Decimal.gte(getTotalLevel(), this.cost()) }, buy() { addBuyables(this.layer, this.id, 1) } }, 13: { title: "Shorter bars", - effect() { return Decimal.add( - getBuyableAmount(this.layer, this.id), hasUpgrade('f', 22) ? 2 : 0 - ).pow_base(0.98) }, + effect() { return Decimal.add(getBuyableAmount(this.layer, this.id), hasUpgrade('f', 22) ? 2 : 0).pow_base(0.98) }, cost() { return Decimal.pow(getBuyableAmount(this.layer, this.id), 1.6).mul(10).add(100) }, display() { - return "Decrease all level costs.

Amount: " + getBuyableAmount(this.layer, this.id) - + ".
Effect: ^" + this.effect(getBuyableAmount(this.layer, this.id)) + ".
Cost: " - + this.cost(getBuyableAmount(this.layer, this.id)) + " total levels." + return "Decrease all level costs.

Amount: " + format(getBuyableAmount(this.layer, this.id)) + + ".
Effect: ^" + format(this.effect(getBuyableAmount(this.layer, this.id))) + ".
Cost: " + + format(this.cost(getBuyableAmount(this.layer, this.id))) + " total levels." }, canAfford() { return Decimal.gte(getTotalLevel(), this.cost()) }, buy() { addBuyables(this.layer, this.id, 1) } @@ -243,8 +240,8 @@ addLayer("p", { "main-display", ["row", ["prestige-button", ["clickable", 11]]], "resource-display", - ["raw-html", () => "You have " + getTotalLevel() + " level" + (getTotalLevel().eq(1) ? "" : "s") + "."], - ["raw-html", () => "You have " + getTotalRank() + " rank" + (getTotalRank().eq(1) ? "" : "s") + "."], + ["raw-html", () => "You have " + format(getTotalLevel()) + " level" + (getTotalLevel().eq(1) ? "" : "s") + "."], + ["raw-html", () => "You have " + format(getTotalRank()) + " rank" + (getTotalRank().eq(1) ? "" : "s") + "."], "blank", "blank", ["bar", "alpha"], @@ -260,8 +257,8 @@ addLayer("p", { "main-display", ["row", ["prestige-button", ["clickable", 11]]], "resource-display", - ["raw-html", () => "You have " + getTotalLevel() + " level" + (getTotalLevel().eq(1) ? "" : "s") + "."], - ["raw-html", () => "You have " + getTotalRank() + " rank" + (getTotalRank().eq(1) ? "" : "s") + "."], + ["raw-html", () => "You have " + format(getTotalLevel()) + " level" + (getTotalLevel().eq(1) ? "" : "s") + "."], + ["raw-html", () => "You have " + format(getTotalRank()) + " rank" + (getTotalRank().eq(1) ? "" : "s") + "."], "blank", "blank", ["bar", "alphaRank"], @@ -278,8 +275,8 @@ addLayer("p", { "main-display", ["row", ["prestige-button", ["clickable", 11]]], "resource-display", - ["raw-html", () => "You have " + getTotalLevel() + " level" + (getTotalLevel().eq(1) ? "" : "s") + "."], - ["raw-html", () => "You have " + getTotalRank() + " rank" + (getTotalRank().eq(1) ? "" : "s") + "."], + ["raw-html", () => "You have " + format(getTotalLevel()) + " level" + (getTotalLevel().eq(1) ? "" : "s") + "."], + ["raw-html", () => "You have " + format(getTotalRank()) + " rank" + (getTotalRank().eq(1) ? "" : "s") + "."], "blank", "blank", "buyables" diff --git a/js/data/super progress.js b/js/data/super progress.js index 6a4cbed..25bd376 100644 --- a/js/data/super progress.js +++ b/js/data/super progress.js @@ -14,7 +14,9 @@ addLayer("sp", { type: "normal", // normal: cost to gain currency depends on amount gained. static: cost depends on how much you already have exponent: 0.5, // Prestige currency exponent gainMult() { // Calculate the multiplier for main currency from bonuses - return new Decimal(1) + let mult = new Decimal(1) + if (hasMilestone('f', 1)) mult = mult.mul(3) + return mult }, gainExp() { // Calculate the exponent on main currency from bonuses return new Decimal(1) @@ -34,8 +36,8 @@ addLayer("sp", { height: 50, progress() { return player[this.layer].points.div(getEtaCost()) }, display() { - return "Eta - Level " + getEtaLevel() + " (" + player[this.layer].points + "/" + getEtaCost() - + ")
Effect: +" + getEtaEffect() + " to point gen." + return "Eta - Level " + format(getEtaLevel()) + " (" + format(player[this.layer].points) + "/" + format(getEtaCost()) + + ")
Effect: +" + format(getEtaEffect()) + " to point gen." }, fillStyle: {backgroundColor: "#107f76"} }, @@ -45,8 +47,8 @@ addLayer("sp", { height: 50, progress() { return player[this.layer].points.div(getThetaCost()) }, display() { - return "Theta - Level " + getThetaLevel() + " (" + player[this.layer].points + "/" + getThetaCost() - + ")
Effect: x" + getThetaEffect() + " to PP." + return "Theta - Level " + format(getThetaLevel()) + " (" + format(player[this.layer].points) + "/" + format(getThetaCost()) + + ")
Effect: x" + format(getThetaEffect()) + " to PP." }, fillStyle: {backgroundColor: "#107f76"}, unlocked() { return getEtaLevel().gt(0) } @@ -57,8 +59,8 @@ addLayer("sp", { height: 50, progress() { return player[this.layer].points.div(getIotaCost()) }, display() { - return "Iota - Level " + getIotaLevel() + " (" + player[this.layer].points + "/" + getIotaCost() - + ")
Effect: ^" + getIotaEffect() + " to point gen." + return "Iota - Level " + format(getIotaLevel()) + " (" + format(player[this.layer].points) + "/" + format(getIotaCost()) + + ")
Effect: ^" + format(getIotaEffect()) + " to point gen." }, fillStyle: {backgroundColor: "#107f76"}, unlocked() { return getThetaLevel().gt(0) } @@ -69,8 +71,8 @@ addLayer("sp", { height: 50, progress() { return player[this.layer].points.div(getKappaCost()) }, display() { - return "Kappa - Level " + getKappaLevel() + " (" + player[this.layer].points + "/" + getKappaCost() - + ")
Effect: x" + getKappaEffect() + " to softcap." + return "Kappa - Level " + format(getKappaLevel()) + " (" + format(player[this.layer].points) + "/" + format(getKappaCost()) + + ")
Effect: x" + format(getKappaEffect()) + " to softcap." }, fillStyle: {backgroundColor: "#107f76"}, unlocked() { return getIotaLevel().gt(0) } @@ -81,8 +83,8 @@ addLayer("sp", { height: 50, progress() { return player[this.layer].points.div(getLambdaCost()) }, display() { - return "Lambda - Level " + getLambdaLevel() + " (" + player[this.layer].points + "/" + getLambdaCost() - + ")
Effect: x" + getLambdaEffect() + " to point gen." + return "Lambda - Level " + format(getLambdaLevel()) + " (" + format(player[this.layer].points) + "/" + format(getLambdaCost()) + + ")
Effect: x" + format(getLambdaEffect()) + " to point gen." }, fillStyle: {backgroundColor: "#107f76"}, unlocked() { return getKappaLevel().gt(0) } @@ -94,9 +96,9 @@ addLayer("sp", { effect() { return Decimal.div(getBuyableAmount(this.layer, this.id), 20).add(1) }, cost() { return Decimal.pow(getBuyableAmount(this.layer, this.id), 1.2).mul(3).add(20) }, display() { - return "Increase PP gain.

Amount: " + getBuyableAmount(this.layer, this.id) - + ".
Effect: ^" + this.effect(getBuyableAmount(this.layer, this.id)) + ".
Cost: " - + this.cost(getBuyableAmount(this.layer, this.id)) + " total super levels." + return "Increase PP gain.

Amount: " + format(getBuyableAmount(this.layer, this.id)) + + ".
Effect: ^" + format(this.effect(getBuyableAmount(this.layer, this.id))) + ".
Cost: " + + format(this.cost(getBuyableAmount(this.layer, this.id))) + " total super levels." }, canAfford() { return Decimal.gte(getTotalSuperLevel(), this.cost()) }, buy() { addBuyables(this.layer, this.id, 1) } @@ -106,9 +108,9 @@ addLayer("sp", { effect() { return Decimal.pow(getBuyableAmount(this.layer, this.id), 1.3).add(1) }, cost() { return Decimal.pow(getBuyableAmount(this.layer, this.id), 1.2).mul(5).add(25) }, display() { - return "Increase point gen.

Amount: " + getBuyableAmount(this.layer, this.id) - + ".
Effect: ^" + this.effect(getBuyableAmount(this.layer, this.id)) + ".
Cost: " - + this.cost(getBuyableAmount(this.layer, this.id)) + " total super levels." + return "Increase point gen.

Amount: " + format(getBuyableAmount(this.layer, this.id)) + + ".
Effect: ^" + format(this.effect(getBuyableAmount(this.layer, this.id))) + ".
Cost: " + + format(this.cost(getBuyableAmount(this.layer, this.id))) + " total super levels." }, canAfford() { return Decimal.gte(getTotalSuperLevel(), this.cost()) }, buy() { addBuyables(this.layer, this.id, 1) } @@ -128,7 +130,7 @@ addLayer("sp", { "main-display", ["row", ["prestige-button", ["clickable", 11]]], "resource-display", - ["raw-html", () => "You have " + getTotalSuperLevel() + " super level" + (getTotalSuperLevel().eq(1) ? "" : "s") + "."], + ["raw-html", () => "You have " + format(getTotalSuperLevel()) + " super level" + (getTotalSuperLevel().eq(1) ? "" : "s") + "."], "blank", "blank", ["bar", "eta"], @@ -143,7 +145,7 @@ addLayer("sp", { "main-display", ["row", ["prestige-button", ["clickable", 11]]], "resource-display", - ["raw-html", () => "You have " + getTotalSuperLevel() + " super level" + (getTotalSuperLevel().eq(1) ? "" : "s") + "."], + ["raw-html", () => "You have " + format(getTotalSuperLevel()) + " super level" + (getTotalSuperLevel().eq(1) ? "" : "s") + "."], "blank", "blank", "buyables", diff --git a/js/mod.js b/js/mod.js index e6f4ef0..d15745f 100644 --- a/js/mod.js +++ b/js/mod.js @@ -57,7 +57,6 @@ function getPointGen() { gain = gain.mul(getLambdaEffect()) gain = gain.mul(tmp.ach.effect) if (hasMilestone('f', 0)) gain = gain.mul(getTotalLevel().add(1).log(5).add(1)) - if (hasMilestone('f', 1)) gain = gain.mul(3) // exponentiative if (gain.gte(1)) { gain = gain.pow(getEpsilonEffect())