diff --git a/js/data/achievements.js b/js/data/achievements.js index a51c369..a8fc468 100644 --- a/js/data/achievements.js +++ b/js/data/achievements.js @@ -153,14 +153,34 @@ addLayer("ach", { tooltip: "Get all row 3 directory upgrades." }, 63: { - name: "Wait that's all of them?", + name: "Now it gets expensive.", done() { return player.f.upgrades.map(x => x - 40).filter(x => x >= 0 && x < 9).length == 4 }, tooltip: "Get all row 4 directory upgrades." }, 64: { - name: "I didn't know what else to put here", - done() { return player.i.points.gt(0) }, - tooltip: "Reset for 1 integral.
Current endgame." + name: "Extreme.", + done() { return player.f.upgrades.map(x => x - 50).filter(x => x >= 0 && x < 9).length == 4 }, + tooltip: "Get all row 5 directory upgrades." + }, + 65: { + name: "100 times over.", + done() { return player.f.total.gte(100) }, + tooltip: "Get 100 Files." + }, + 71: { + name: "Alright I'm out of ideas.", + done() { return player.f.upgrades.map(x => x - 60).filter(x => x >= 0 && x < 9).length == 2 }, + tooltip: "Get all row 6 directory upgrades." + }, + 72: { + name: "I guess one last achivement?", + done() { return getBuyableAmount('f', 11).gte(5) }, + tooltip: "Get 5 The finale of the intro buyables." + }, + 73: { + name: "And then comes the prestige layer", + done() { return player.points.log(2).gte(128) }, + tooltip: "Reach " + format(Decimal.pow(2, 128)) + " points" }, }, tabFormat: [ diff --git a/js/data/files.js b/js/data/files.js index a3b2f2a..86a2a6d 100644 --- a/js/data/files.js +++ b/js/data/files.js @@ -18,7 +18,11 @@ 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: "custom", // 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() { + let exp = 1.3 + if (hasUpgrade(this.layer, 52)) exp **= 0.9 + return exp + }, // Prestige currency exponent base() { let base = 1.3 if (hasUpgrade(this.layer, 41)) base **= 0.95 @@ -28,7 +32,7 @@ addLayer("f", { let tlyr = tmp[this.layer] let plyr = player[this.layer] let amount = tlyr.baseAmount.div(tlyr.requires).log(tlyr.base).pow(Decimal.div(1, tlyr.exponent)).add(1) - .sub(plyr.points.mul(2).add(plyr.total).div(3)).floor().max(0) + .sub(plyr.points.mul(2).add(plyr.total).div(3)).sqrt().floor().max(0) if (isNaN(amount)) return new Decimal(0) if (!canMax && amount.gte(1)) return new Decimal(1) return amount @@ -37,8 +41,8 @@ addLayer("f", { let tlyr = tmp[this.layer] let plyr = player[this.layer] if (!canMax) return plyr.points.mul(2).add(plyr.total).div(3).pow(tlyr.exponent).pow_base(tlyr.base).mul(tlyr.requires) - return tlyr.getResetGain.add(1).add(plyr.points).mul(2).add(plyr.total).div(3).pow(tlyr.exponent).pow_base(tlyr.base) - .mul(tlyr.requires) + return tlyr.getResetGain.pow(2).add(plyr.points).mul(2).add(plyr.total).div(3).pow(tlyr.exponent) + .pow_base(tlyr.base).mul(tlyr.requires) }, canReset() { return tmp[this.layer].getResetGain.gte(1) @@ -65,26 +69,25 @@ addLayer("f", { milestones: { 0: { requirementDescription: "1 total File.", - effectDescription() { - return "Total levels and super levels boost point gen.
Effect: x" - + format(getTotalLevel().add(getTotalSuperLevel()).add(7).log(3)) + "." - }, + effectDescription: "Triple PP and SPP gen.", done() { return player.f.total.gte(1) } }, 1: { requirementDescription: "2 total Files.", - effectDescription: "Triple PP and SPP gen.", + effectDescription() { + return "Total levels and super levels boost point gen.
Effect: x" + + format(getTotalLevel().add(getTotalSuperLevel()).add(7).log(2)) + "." + }, done() { return player.f.total.gte(2) } }, - 2: { - requirementDescription: "3 total Files.", - effectDescription: "SPP no longer resets PP.", - done() { return player.f.total.gte(3) }, - toggles: [["sp", "resetsPP"]] - }, 3: { - requirementDescription: "4 total Files.", + requirementDescription: "3 total Files.", effectDescription: "Halve PP req.", + done() { return player.f.total.gte(3) } + }, + 2: { + requirementDescription: "4 total Files.", + effectDescription: "SPP no longer resets PP.", done() { return player.f.total.gte(4) } }, 4: { @@ -121,16 +124,16 @@ addLayer("f", { }, 10: { requirementDescription: "25 total Files.", - effectDescription() { - return "Total super levels boost second softcap.
Effect: ^" - + format(getTotalSuperLevel().pow(1/10).add(1).log(10).add(1).log(10).add(1)) + "." - }, + effectDescription: "Autobuy both SPP buyables.", done() { return player.f.total.gte(25) } }, 11: { - requirementDescription: "35 total Files.", - effectDescription: "Autobuy both SPP buyables.", - done() { return player.f.total.gte(35) } + requirementDescription: "50 total Files.", + effectDescription() { + return "Total super levels boost second softcap.
Effect: ^" + + format(getTotalSuperLevel().pow(1/10).add(1).log(10).add(1)) + "." + }, + done() { return player.f.total.gte(50) } }, }, upgrades: { @@ -190,10 +193,10 @@ addLayer("f", { branches: [32] }, 43: { - description: "Files divide PP cost.", + description: "Total Files divide PP cost.", cost: 9, canAfford() { return hasUpgrade(this.layer, 32) && hasUpgrade(this.layer, 33) }, - effect() { return player[this.layer].points.add(3).log(2).add(1) }, + effect() { return player[this.layer].total.add(3).log(2).add(1) }, effectDisplay() { return "/" + format(this.effect()) + "." }, branches: [32, 33] }, @@ -202,6 +205,64 @@ addLayer("f", { cost: 8, canAfford() { return hasUpgrade(this.layer, 23) && hasUpgrade(this.layer, 33) }, branches: [[23, 2], 33] + }, + 51: { + description: "Multiply all rank effects by 2.", + cost: 15, + canAfford() { return hasUpgrade(this.layer, 41) && hasUpgrade(this.layer, 43) }, + branches: [41, [43, 2]] + }, + 52: { + description: "Raise File cost exponent ^0.8.", + cost: 13, + canAfford() { return hasUpgrade(this.layer, 42) }, + branches: [42] + }, + 53: { + description: "Total files boost point gen.", + cost: 14, + canAfford() { return hasUpgrade(this.layer, 43) }, + effect() { return player[this.layer].points.log(10).add(1) }, + effectDisplay() { return "^" + format(this.effect()) + "." }, + branches: [43] + }, + 54: { + description: "Halve base SPP cost.", + cost: 13, + canAfford() { return hasUpgrade(this.layer, 43) }, + branches: [43] + }, + 61: { + description: "Decrease the second softcap's log base.", + cost: 20, + canAfford() { return hasUpgrade(this.layer, 51) && hasUpgrade(this.layer, 52) }, + branches: [51, 52] + }, + 62: { + description: "Gain 20% of your SPP gain per second.", + cost: 20, + canAfford() { return hasUpgrade(this.layer, 53) && hasUpgrade(this.layer, 44) }, + branches: [53, [44, 2]] + } + }, + buyables: { + 11: { + title: "The finale of the intro", + effect() { return Decimal.pow(1.5, getBuyableAmount(this.layer, this.id)) }, + cost() { return Decimal.mul(getBuyableAmount(this.layer, this.id), 10) }, + display() { + return "Increase point gen.

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))) + " Files." + }, + canAfford() { + return Decimal.gte(player[this.layer].points, this.cost()) + && hasUpgrade(this.layer, 61) && hasUpgrade(this.layer, 62) + }, + buy() { + addBuyables(this.layer, this.id, 1) + player[this.layer].points = player[this.layer].points.sub(this.cost()) + } } }, clickables: { @@ -212,6 +273,7 @@ addLayer("f", { if (player[this.layer].upgrades == 0) player.ach.has55 = true player[this.layer].points = player[this.layer].total player[this.layer].upgrades = [] + player[this.layer].buyables[11] = new Decimal(0) doReset('f', true) } }, @@ -251,8 +313,11 @@ addLayer("f", { [11], [21, 22, 23], [31, 32, 33], - [41, 42, 43, 44] - ]] + [41, 42, 43, 44], + [51, 52, 53, 54], + [61, 62] + ]], + "buyables" ], unlocked() { return hasMilestone('f', 4) } }, diff --git a/js/data/integrals.js b/js/data/integrals.js index c3ae817..3f117aa 100644 --- a/js/data/integrals.js +++ b/js/data/integrals.js @@ -7,7 +7,7 @@ addLayer("i", { points: new Decimal(0) }}, color: "#a62222", - requires: Decimal.pow(2, 127), // Can be a function that takes requirement increases into account + requires: Decimal.pow(2, 127.9), // Can be a function that takes requirement increases into account resource: "integrals", // Name of prestige currency baseResource: "points", // Name of resource prestige is based on baseAmount() {return player.points}, // Get the current amount of baseResource diff --git a/js/data/progress.js b/js/data/progress.js index 59d1b1b..1203b1d 100644 --- a/js/data/progress.js +++ b/js/data/progress.js @@ -9,7 +9,7 @@ addLayer("p", { color: "#0c6949", requires() { let req = new Decimal(1) - if (hasMilestone('f', 3)) { req = req.mul(0.5) } + if (hasMilestone('f', 2)) { req = req.mul(0.5) } if (hasUpgrade('f', 33)) { req = req.mul(0.75) } if (hasUpgrade('f', 43)) { req = req.div(upgradeEffect('f', 43)) } return req @@ -23,7 +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) + if (hasMilestone('f', 0)) mult = mult.mul(3) return mult }, gainExp() { // Calculate the exponent on main currency from bonuses @@ -32,7 +32,7 @@ addLayer("p", { doReset(resettingLayer) { if (layers[resettingLayer].row <= this.row) return; let keep = [] - if (hasMilestone('f', 2) && resettingLayer == 'sp' && player.sp.resetsPP) keep.push("points") + if (hasMilestone('f', 3) && resettingLayer == 'sp') keep.push("points") layerDataReset(this.layer, keep) }, row: 0, // Row the layer is in on the tree (0 is the first row) @@ -212,7 +212,7 @@ addLayer("p", { 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: " + format(getBuyableAmount(this.layer, this.id)) + return "Decrease Gamma effect log 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." }, diff --git a/js/data/ranks.js b/js/data/ranks.js index 1257e2f..b8e8cb1 100644 --- a/js/data/ranks.js +++ b/js/data/ranks.js @@ -6,7 +6,7 @@ function getAlphaRankCost(points = player.p.points) { return getAlphaRank(points).add(1).mul(20) } function getAlphaRankEffect(points = player.p.points) { - return getAlphaRank(points).div(25) + return getAlphaRank(points).div(25).mul(hasUpgrade('f', 51) + 1) } function getBetaRank(points = player.p.points) { if (Decimal.eq(points, 0)) return new Decimal(0) @@ -16,7 +16,7 @@ function getBetaRankCost(points = player.p.points) { return getBetaRank(points).add(1).mul(15) } function getBetaRankEffect(points = player.p.points) { - return getBetaRank(points).div(100).mul(3) + return getBetaRank(points).div(100).mul(3).mul(hasUpgrade('f', 51) + 1) } function getGammaRank(points = player.p.points) { if (Decimal.eq(points, 0)) return new Decimal(0) @@ -26,7 +26,7 @@ function getGammaRankCost(points = player.p.points) { return getGammaRank(points).add(1).mul(12) } function getGammaRankEffect(points = player.p.points) { - return getGammaRank(points).div(15) + return getGammaRank(points).div(15).mul(hasUpgrade('f', 51) + 1) } function getDeltaRank(points = player.p.points) { if (Decimal.eq(points, 0)) return new Decimal(0) @@ -36,7 +36,7 @@ function getDeltaRankCost(points = player.p.points) { return getDeltaRank(points).add(1).mul(10) } function getDeltaRankEffect(points = player.p.points) { - return getDeltaRank(points).div(20) + return getDeltaRank(points).div(20).mul(hasUpgrade('f', 51) + 1) } function getEpsilonRank(points = player.p.points) { if (Decimal.eq(points, 0)) return new Decimal(0) @@ -46,7 +46,7 @@ function getEpsilonRankCost(points = player.p.points) { return getEpsilonRank(points).add(1).mul(8) } function getEpsilonRankEffect(points = player.p.points) { - return getEpsilonRank(points).div(10) + return getEpsilonRank(points).div(10).mul(hasUpgrade('f', 51) + 1) } function getZetaRank(points = player.p.points) { if (Decimal.eq(points, 0)) return new Decimal(0) @@ -56,7 +56,7 @@ function getZetaRankCost(points = player.p.points) { return getZetaRank(points).add(1).mul(7) } function getZetaRankEffect(points = player.p.points) { - return getZetaRank(points).div(5) + return getZetaRank(points).div(5).mul(hasUpgrade('f', 51) + 1) } function getTotalRank() { diff --git a/js/data/super progress.js b/js/data/super progress.js index b9dc347..d9bd1ff 100644 --- a/js/data/super progress.js +++ b/js/data/super progress.js @@ -4,11 +4,14 @@ addLayer("sp", { position: 1, // Horizontal position within a row. By default it uses the layer id and sorts in alphabetical order startData() { return { unlocked: false, - points: new Decimal(0), - resetsPP: true + points: new Decimal(0) }}, color: "#107f76", - requires: 5000, // Can be a function that takes requirement increases into account + requires() { + let req = new Decimal(5000) + if (hasUpgrade('f', 54)) req = req.div(2) + return req + }, // Can be a function that takes requirement increases into account resource: "super progress points", // Name of prestige currency baseResource: "points", // Name of resource prestige is based on baseAmount() {return player.points}, // Get the current amount of baseResource @@ -16,7 +19,7 @@ addLayer("sp", { exponent: 0.35, // Prestige currency exponent gainMult() { // Calculate the multiplier for main currency from bonuses let mult = new Decimal(1) - if (hasMilestone('f', 1)) mult = mult.mul(3) + if (hasMilestone('f', 0)) mult = mult.mul(3) return mult }, gainExp() { // Calculate the exponent on main currency from bonuses @@ -27,11 +30,16 @@ addLayer("sp", { hotkeys: [ {key: "s", description: "S: Reset for super progress points", onPress(){if (canReset(this.layer)) doReset(this.layer)}}, ], + passiveGeneration() { + let gain = 0 + if (hasUpgrade('f', 62)) gain += 0.2 + return gain + }, onPrestige(gain) { if (player.p.points.eq(0)) { player.ach.has45 = true } }, automate() { - if (hasMilestone('f', 11)) { + if (hasMilestone('f', 10)) { Object.values(tmp[this.layer].buyables).forEach(i => { if (i.canAfford) i.buy() }) } }, diff --git a/js/mod.js b/js/mod.js index 3403361..0680a40 100644 --- a/js/mod.js +++ b/js/mod.js @@ -13,11 +13,19 @@ let modInfo = { // Set your version in num and name let VERSION = { - num: "1.2", - name: "First Release", + num: "1.5", + name: "The great rebalancing", } let changelog = `

Changelog:



+

v1.5


+ - Clarified Debased effect.
+ - Decreased SPP requirement.
+ - Reshuffled some Filestones.
+ - Added a new softcap.
+ - Added more Filestones and Directory upgrades.
+ - Added a Directory buyable.
+ - Slightly decreased Integral cost.

v1.2


- Added a few missing format() calls.
- Added a note for the hardcap.
@@ -64,7 +72,8 @@ function getPointGen() { gain = gain.mul(getZetaEffect()) gain = gain.mul(getLambdaEffect()) gain = gain.mul(tmp.ach.effect) - if (hasMilestone('f', 0)) gain = gain.mul(getTotalLevel().add(7).log(3)) + gain = gain.mul(buyableEffect('f', 11)) + if (hasMilestone('f', 1)) gain = gain.mul(getTotalLevel().add(7).log(2)) if (hasMilestone('f', 6)) gain = gain.mul(player.f.total.div(2).add(1)) // exponentiative if (gain.gte(1)) { @@ -73,12 +82,13 @@ function getPointGen() { gain = gain.pow(buyableEffect('sp', 12)) if (hasMilestone('f', 3)) gain = gain.pow(2) if (hasUpgrade('f', 11)) gain = gain.pow(upgradeEffect('f', 11)) + if (hasUpgrade('f', 53)) gain = gain.pow(upgradeEffect('f', 53)) } // softcaps gain = softcap(gain, getKappaEffect().mul(1000), d => d.add(1).log(Math.E).add(1).pow(2).sub(1).div(2)) gain = softcap(gain, - Decimal.pow(1e6, (hasMilestone('f', 10) ? getTotalSuperLevel().add(1).log(2).add(1).log(2).add(1) : 1)), - d => d.add(1).log(1.5).add(1) + Decimal.pow(1e6, (hasMilestone('f', 11) ? getTotalSuperLevel().add(1).log(2).add(1).log(2).add(1) : 1)), + d => d.add(1).log(3 - hasUpgrade('f', 61)).add(1) ) gain = softcap(gain, Decimal.pow(2, 128), _ => new Decimal(0), player.points) return gain @@ -94,10 +104,10 @@ var displayThings = [ () => getPointGen().gte(getKappaEffect().mul(1000)) ? "Your points per second are being logarithmically softcapped over " + format(getKappaEffect().mul(1000)) + "/s" : "", () => getPointGen().gte( - Decimal.pow(1e6, hasMilestone('f', 10) ? getTotalSuperLevel().pow(1/10).add(1).log(10).add(1).log(10).add(1) : 1) + Decimal.pow(1e6, hasMilestone('f', 10) ? getTotalSuperLevel().pow(1/10).add(1).log(10).add(1) : 1) ) ? "Your points per second are being logarithmically softcapped again over " + format(Decimal.pow( - 1e6, hasMilestone('f', 10) ? getTotalSuperLevel().pow(1/10).add(1).log(10).add(1).log(10).add(1) : 1 + 1e6, hasMilestone('f', 11) ? getTotalSuperLevel().pow(1/10).add(1).log(10).add(1) : 1 )) + "/s" : "", () => getPointGen().add(player.points).gte(Decimal.pow(2, 128)) ? "Your points per second are being hardcapped over "