nif/just_another_tree
1
0
Fork 0
generated from incremental-social/The-Modding-Tree
Code Issues Pull requests Activity Actions

development

Browse source 
i think the file cost formulae are off
This commit is contained in:
Nif 2024-03-23 11:29:06 +00:00
parent 308aad9c86
commit 7e082cc0e6
6 changed files with 121 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
js/data/achievements.js
View file

@ -84,8 +84,8 @@ addLayer("ach", {
},
34: {
name: "Super!",
done() { return player.sp.points.gte(1) },
tooltip: "Reset for 1 SPP."
done() { return player.points.gte(5000) },
tooltip: "Reach 5000 points."
},
35: {
name: "Where were you??",
@ -129,11 +129,11 @@ addLayer("ach", {
},
53: {
name: "A new prestige layer!",
done() { return player.sp.points.gte(5000) },
tooltip: "Reach 5000 SPP."
done() { return player.sp.points.gte(250) },
tooltip: "Reach 250 SPP."
},
54: {
name: "Ok so that speeds things up",
name: "Retention!",
done() { return hasMilestone('f', 2) },
tooltip: "Earn Filestone 3."
},
@ -158,7 +158,7 @@ addLayer("ach", {
tooltip: "Get all row 4 directory upgrades."
},
64: {
name: "Well that exploded",
name: "I didn't know what else to put here",
done() { return player.i.points.gt(0) },
tooltip: "Reset for 1 integral.<br>Current endgame."
},

109
js/data/files.js
View file

@ -9,21 +9,45 @@ addLayer("f", {
}},
color: "#7f1bae",
requires() {
let req = new Decimal(5000)
if (hasUpgrade(this.layer, 32)) { req = req.mul(0.75) }
if (hasMilestone(this.layer, 7)) { req = req.mul(0.8) }
let req = new Decimal(250)
if (hasUpgrade(this.layer, 32)) { req = req.mul(0.5) }
if (hasMilestone(this.layer, 9)) { req = req.mul(0.5) }
return req
}, // Can be a function that takes requirement increases into account
resource: "files", // Name of prestige currency
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.5, // Prestige currency exponent
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
base() {
let base = 1.5
let base = 1.3
if (hasUpgrade(this.layer, 41)) base **= 0.95
return base
},
getResetGain(canMax = tmp[this.layer].canBuyMax) {
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)
if (isNaN(amount)) return new Decimal(0)
if (!canMax && amount.gte(1)) return new Decimal(1)
return amount
},
getNextAt(canMax = tmp[this.layer].canBuyMax) {
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)
},
canReset() {
return tmp[this.layer].getResetGain.gte(1)
},
prestigeButtonText() {
return "Reset for " + format(tmp[this.layer].getResetGain.max(1)) + " " + tmp[this.layer].resource + "<br><br>Req: "
+ format(tmp[this.layer].baseAmount) + "/" + format(tmp[this.layer].getNextAt) + " " + tmp[this.layer].baseResource
},
prestigeNotify() { return tmp[this.layer].canReset },
gainMult() { // Calculate the multiplier for main currency from bonuses
return new Decimal(1)
},
@ -31,7 +55,7 @@ addLayer("f", {
return new Decimal(1)
},
canBuyMax() {
return hasMilestone(this.layer, 6)
return hasMilestone(this.layer, 8)
},
row: 2, // Row the layer is in on the tree (0 is the first row)
displayRow: 0,
@ -42,7 +66,8 @@ addLayer("f", {
0: {
requirementDescription: "1 total File.",
effectDescription() {
return "Total levels boost point gen.<br>Effect: x" + format(getTotalLevel().add(1).log(5).add(1)) + "."
return "Total levels and super levels boost point gen.<br>Effect: x"
+ format(getTotalLevel().add(getTotalSuperLevel()).add(7).log(3)) + "."
},
done() { return player.f.total.gte(1) }
},
@ -53,12 +78,13 @@ addLayer("f", {
},
2: {
requirementDescription: "3 total Files.",
effectDescription: "Multiply PP requirement by 0.5x.",
done() { return player.f.total.gte(3) }
effectDescription: "SPP no longer resets PP.",
done() { return player.f.total.gte(3) },
toggles: [["sp", "resetsPP"]]
},
3: {
requirementDescription: "4 total Files.",
effectDescription: "Square point gen.",
effectDescription: "Halve PP req.",
done() { return player.f.total.gte(4) }
},
4: {
@ -67,31 +93,44 @@ addLayer("f", {
done() { return player.f.total.gte(5) }
},
5: {
requirementDescription: "7 total Files.",
requirementDescription: "6 total Files.",
effectDescription: "You can now get fractional levels.",
done() { return player.f.total.gte(6) }
},
6: {
requirementDescription: "8 total Files.",
effectDescription() {
return "Total Files boost point gen.<br>Effect: x" + format(player[this.layer].total.div(2).add(1)) + "."
},
done() { return player.f.total.gte(7) }
},
6: {
requirementDescription: "10 total Files.",
effectDescription: "You can buy max files.",
done() { return player.f.total.gte(10) }
done() { return player.f.total.gte(8) }
},
7: {
requirementDescription: "15 total Files.",
effectDescription: "Multiply file cost by x0.8.",
done() { return player.f.total.gte(15) }
requirementDescription: "10 total Files.",
effectDescription: "Autobuy all PP buyables.",
done() { return player.f.total.gte(10) }
},
8: {
requirementDescription: "20 total Files.",
effectDescription: "Autobuy all PP buyables.",
done() { return player.f.total.gte(20) }
requirementDescription: "15 total Files.",
effectDescription: "You can buy max files.",
done() { return player.f.total.gte(15) }
},
9: {
requirementDescription: "30 total Files.",
effectDescription: "You can now get fractional levels.",
done() { return player.f.total.gte(30) }
requirementDescription: "20 total Files.",
effectDescription: "Halve base file cost.",
done() { return player.f.total.gte(20) }
},
10: {
requirementDescription: "25 total Files.",
effectDescription() {
return "Total super levels boost second softcap.<br>Effect: ^"
+ format(getTotalSuperLevel().pow(1/10).add(1).log(10).add(1).log(10).add(1)) + "."
},
done() { return player.f.total.gte(25) }
},
11: {
requirementDescription: "35 total Files.",
effectDescription: "Autobuy both SPP buyables.",
done() { return player.f.total.gte(35) }
},
},
upgrades: {
@ -127,7 +166,7 @@ addLayer("f", {
branches: [21]
},
32: {
description: "Multiply base File cost by 0.75.",
description: "Halve base File cost.",
cost: 6,
canAfford() { return hasUpgrade(this.layer, 21) && hasUpgrade(this.layer, 22) },
branches: [21, 22]
@ -170,12 +209,8 @@ addLayer("f", {
display() { return "Reset directory" },
onClick() {
if (confirm("Are you sure you want to respec? This will cause a File reset.")) {
if (player[this.layer].upgrades == 0) {
player.ach.has55 = true
}
for (let i of player[this.layer].upgrades) {
player[this.layer].points = player[this.layer].points.add(tmp[this.layer].upgrades[i].cost)
}
if (player[this.layer].upgrades == 0) player.ach.has55 = true
player[this.layer].points = player[this.layer].total
player[this.layer].upgrades = []
doReset('f', true)
}
@ -187,7 +222,7 @@ addLayer("f", {
}
}
},
layerShown(){ return player.p.points.gte(4000) || player[this.layer].unlocked },
layerShown(){ return player.sp.points.gte(400) || player[this.layer].unlocked },
branches: ['p'],
tabFormat: {
filestones: {
@ -198,8 +233,8 @@ addLayer("f", {
"blank",
"blank",
["row", [
["milestones", [0, 2, 4, 6, 8]],
["milestones", [1, 3, 5, 7, 9]]
["milestones", [0, 2, 4, 6, 8, 10]],
["milestones", [1, 3, 5, 7, 9, 11]]
]]
]
},

12
js/data/levels.js
View file

@ -8,7 +8,7 @@ function inverseCumulativeExponential(base, levels) {
function getAlphaLevel(points = player.p.points) {
if (Decimal.eq(points, 0)) return new Decimal(0)
const level = inverseCumulativeExponential(1.1, Decimal.pow(points, buyableEffect('p', 13).pow(-1)))
return hasMilestone('f', 9) ? level : level.floor()
return hasMilestone('f', 5) ? level : level.floor()
}
function getAlphaCost(points = player.p.points) {
return cumulativeExponential(1.1, getAlphaLevel(points).floor()).pow(buyableEffect('p', 13))
@ -19,7 +19,7 @@ function getAlphaEffect(points = player.p.points) {
function getBetaLevel(points = player.p.points) {
if (Decimal.eq(points, 0)) return new Decimal(0)
const level = inverseCumulativeExponential(1.25, Decimal.div(Decimal.pow(points, buyableEffect('p', 13).pow(-1)), 5))
return hasMilestone('f', 9) ? level : level.floor()
return hasMilestone('f', 5) ? level : level.floor()
}
function getBetaCost(points = player.p.points) {
return cumulativeExponential(1.25, getBetaLevel(points).floor()).mul(5).pow(buyableEffect('p', 13))
@ -30,7 +30,7 @@ function getBetaEffect(points = player.p.points) {
function getGammaLevel(points = player.p.points) {
if (Decimal.eq(points, 0)) return new Decimal(0)
const level = inverseCumulativeExponential(1.5, Decimal.div(Decimal.pow(points, buyableEffect('p', 13).pow(-1)), 15))
return hasMilestone('f', 9) ? level : level.floor()
return hasMilestone('f', 5) ? level : level.floor()
}
function getGammaCost(points = player.p.points) {
return cumulativeExponential(1.5, getGammaLevel(points).floor()).mul(15).pow(buyableEffect('p', 13))
@ -41,7 +41,7 @@ function getGammaEffect(points = player.p.points) {
function getDeltaLevel(points = player.p.points) {
if (Decimal.eq(points, 0)) return new Decimal(0)
const level = inverseCumulativeExponential(2, Decimal.div(Decimal.pow(points, buyableEffect('p', 13).pow(-1)), 30))
return hasMilestone('f', 9) ? level : level.floor()
return hasMilestone('f', 5) ? level : level.floor()
}
function getDeltaCost(points = player.p.points) {
return cumulativeExponential(2, getDeltaLevel(points).floor()).mul(30).pow(buyableEffect('p', 13))
@ -52,7 +52,7 @@ function getDeltaEffect(points = player.p.points) {
function getEpsilonLevel(points = player.p.points) {
if (Decimal.eq(points, 0)) return new Decimal(0)
const level = inverseCumulativeExponential(2.5, Decimal.div(Decimal.pow(points, buyableEffect('p', 13).pow(-1)), 50))
return hasMilestone('f', 9) ? level : level.floor()
return hasMilestone('f', 5) ? level : level.floor()
}
function getEpsilonCost(points = player.p.points) {
return cumulativeExponential(2.5, getEpsilonLevel(points).floor()).mul(50).pow(buyableEffect('p', 13))
@ -63,7 +63,7 @@ function getEpsilonEffect(points = player.p.points) {
function getZetaLevel(points = player.p.points) {
if (Decimal.eq(points, 0)) return new Decimal(0)
const level = inverseCumulativeExponential(3, Decimal.div(Decimal.pow(points, buyableEffect('p', 13).pow(-1)), 80))
return hasMilestone('f', 9) ? level : level.floor()
return hasMilestone('f', 5) ? level : level.floor()
}
function getZetaCost(points = player.p.points) {
return cumulativeExponential(3, getZetaLevel(points).floor()).mul(80).pow(buyableEffect('p', 13))

12
js/data/progress.js
View file

@ -9,7 +9,7 @@ addLayer("p", {
color: "#0c6949",
requires() {
let req = new Decimal(1)
if (hasMilestone('f', 2)) { req = req.mul(0.5) }
if (hasMilestone('f', 3)) { 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
@ -27,7 +27,13 @@ addLayer("p", {
return mult
},
gainExp() { // Calculate the exponent on main currency from bonuses
return buyableEffect('sp', 11)
return new Decimal(1)
},
doReset(resettingLayer) {
if (layers[resettingLayer].row <= this.row) return;
let keep = []
if (hasMilestone('f', 2) && resettingLayer == 'sp' && player.sp.resetsPP) keep.push("points")
layerDataReset(this.layer, keep)
},
row: 0, // Row the layer is in on the tree (0 is the first row)
hotkeys: [
@ -40,7 +46,7 @@ addLayer("p", {
return gain
},
automate() {
if (hasMilestone('f', 8)) {
if (hasMilestone('f', 7)) {
Object.values(tmp[this.layer].buyables).forEach(i => { if (i.canAfford) i.buy() })
}
},

20
js/data/super progress.js
View file

@ -4,22 +4,23 @@ 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)
points: new Decimal(0),
resetsPP: true
}},
color: "#107f76",
requires: 15000, // Can be a function that takes requirement increases into account
requires: 5000, // 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
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
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)
return mult
},
gainExp() { // Calculate the exponent on main currency from bonuses
return new Decimal(1)
return buyableEffect('sp', 11)
},
row: 1, // Row the layer is in on the tree (0 is the first row)
displayRow: 0,
@ -29,6 +30,11 @@ addLayer("sp", {
onPrestige(gain) {
if (player.p.points.eq(0)) { player.ach.has45 = true }
},
automate() {
if (hasMilestone('f', 11)) {
Object.values(tmp[this.layer].buyables).forEach(i => { if (i.canAfford) i.buy() })
}
},
bars: {
eta: {
direction: RIGHT,
@ -72,7 +78,7 @@ addLayer("sp", {
progress() { return player[this.layer].points.div(getKappaCost()) },
display() {
return "Kappa - Level " + format(getKappaLevel()) + " (" + format(player[this.layer].points) + "/" + format(getKappaCost())
+ ")<br>Effect: x" + format(getKappaEffect()) + " to softcap."
+ ")<br>Effect: x" + format(getKappaEffect()) + " to first softcap."
},
fillStyle: {backgroundColor: "#107f76"},
unlocked() { return getIotaLevel().gt(0) }
@ -96,7 +102,7 @@ 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.<br><br>Amount: " + format(getBuyableAmount(this.layer, this.id))
return "Increase SPP gain.<br><br>Amount: " + format(getBuyableAmount(this.layer, this.id))
+ ".<br>Effect: ^" + format(this.effect(getBuyableAmount(this.layer, this.id))) + ".<br>Cost: "
+ format(this.cost(getBuyableAmount(this.layer, this.id))) + " total super levels."
},
@ -153,6 +159,6 @@ addLayer("sp", {
unlocked() { return getTotalSuperLevel().gte(18) }
},
},
layerShown(){ return player.points.gte(10000) || player[this.layer].unlocked },
layerShown(){ return player.points.gte(4000) || player[this.layer].unlocked },
branches: ['p'],
})

18
js/mod.js
View file

@ -64,7 +64,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(1).log(5).add(1))
if (hasMilestone('f', 0)) gain = gain.mul(getTotalLevel().add(7).log(3))
if (hasMilestone('f', 6)) gain = gain.mul(player.f.total.div(2).add(1))
// exponentiative
if (gain.gte(1)) {
gain = gain.pow(getEpsilonEffect())
@ -75,6 +76,10 @@ function getPointGen() {
}
// 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)
)
gain = softcap(gain, Decimal.pow(2, 128), _ => new Decimal(0), player.points)
return gain
}
@ -87,9 +92,16 @@ function addedPlayerData() { return {
var displayThings = [
"All exponentiative upgrades only take affect above 1.",
() => getPointGen().gte(getKappaEffect().mul(1000)) ? "Your points per second are being logarithmically softcapped over "
+ format(getKappaEffect().mul(1000)) + "/s" : "",
+ 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)
) ? "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
)) + "/s"
: "",
() => getPointGen().add(player.points).gte(Decimal.pow(2, 128)) ? "Your points per second are being hardcapped over "
+ format(Decimal.pow(2, 128)) : ""
+ format(Decimal.pow(2, 128)) : ""
]
// Determines when the game "ends"