Compare commits

..

No commits in common. "53fc5552b2f0c6abfaf46599e6e043b3ab419ac3" and "d234facbe3af1fb3b3aade50516b992607612c5a" have entirely different histories.

5 changed files with 14 additions and 31 deletions

View file

@ -134,8 +134,8 @@ addLayer("ach", {
}, },
54: { 54: {
name: "Retention!", name: "Retention!",
done() { return hasMilestone('f', 3) }, done() { return hasMilestone('f', 2) },
tooltip: "Earn Filestone 4." tooltip: "Earn Filestone 3."
}, },
55: { 55: {
name: "Well that was useful", name: "Well that was useful",
@ -179,8 +179,8 @@ addLayer("ach", {
}, },
73: { 73: {
name: "And then comes the prestige layer", name: "And then comes the prestige layer",
done() { return player.points.log(2).gte(127.9) }, done() { return player.points.log(2).gte(128) },
tooltip: "Reach " + format(Decimal.pow(2, 127.9)) + " points" tooltip: "Reach " + format(Decimal.pow(2, 128)) + " points"
}, },
}, },
tabFormat: [ tabFormat: [

View file

@ -31,20 +31,18 @@ addLayer("f", {
getResetGain(canMax = tmp[this.layer].canBuyMax) { getResetGain(canMax = tmp[this.layer].canBuyMax) {
let tlyr = tmp[this.layer] let tlyr = tmp[this.layer]
let plyr = player[this.layer] let plyr = player[this.layer]
let amount = tlyr.baseAmount.div(tlyr.requires).log(tlyr.base) let amount = tlyr.baseAmount.div(tlyr.requires).log(tlyr.base).pow(Decimal.div(1, tlyr.exponent)).add(1)
if (amount.gte(0)) amount = amount.root(tlyr.exponent).add(1)
.sub(plyr.points.mul(2).add(plyr.total).div(3)).sqrt().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 (isNaN(amount)) return new Decimal(0)
if (!canMax && amount.gte(1)) return new Decimal(1) if (!canMax && amount.gte(1)) return new Decimal(1)
return amount.max(0) return amount
}, },
getNextAt(canMax = tmp[this.layer].canBuyMax) { getNextAt(canMax = tmp[this.layer].canBuyMax) {
let tlyr = tmp[this.layer] let tlyr = tmp[this.layer]
let plyr = player[this.layer] let plyr = player[this.layer]
if (!canMax) return plyr.points.mul(2).add(plyr.total).div(3).pow(tlyr.exponent) 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.pow(2).add(plyr.points).mul(2).add(plyr.total).div(3).pow(tlyr.exponent)
.pow_base(tlyr.base).mul(tlyr.requires) .pow_base(tlyr.base).mul(tlyr.requires)
return tlyr.getResetGain.plus(1).pow(2).add(plyr.points.mul(2).add(plyr.total).div(3))
.minus(1).pow(tlyr.exponent).pow_base(tlyr.base).mul(tlyr.requires)
}, },
canReset() { canReset() {
return tmp[this.layer].getResetGain.gte(1) return tmp[this.layer].getResetGain.gte(1)
@ -82,12 +80,12 @@ addLayer("f", {
}, },
done() { return player.f.total.gte(2) } done() { return player.f.total.gte(2) }
}, },
2: { 3: {
requirementDescription: "3 total Files.", requirementDescription: "3 total Files.",
effectDescription: "Halve PP req.", effectDescription: "Halve PP req.",
done() { return player.f.total.gte(3) } done() { return player.f.total.gte(3) }
}, },
3: { 2: {
requirementDescription: "4 total Files.", requirementDescription: "4 total Files.",
effectDescription: "SPP no longer resets PP.", effectDescription: "SPP no longer resets PP.",
done() { return player.f.total.gte(4) } done() { return player.f.total.gte(4) }
@ -286,7 +284,7 @@ addLayer("f", {
} }
} }
}, },
layerShown(){ return player.sp.points.gte(200) || player[this.layer].unlocked }, layerShown(){ return player.sp.points.gte(400) || player[this.layer].unlocked },
branches: ['p'], branches: ['p'],
tabFormat: { tabFormat: {
filestones: { filestones: {

View file

@ -17,9 +17,7 @@ addNode("blank", {
addLayer("tree-tab", { addLayer("tree-tab", {
tabFormat: [ tabFormat: [["tree", function() {return (layoutInfo.treeLayout ? layoutInfo.treeLayout : TREE_LAYERS)}]],
["tree", [["p", "sp", "f"], ["i"]]]
],
previousTab: "", previousTab: "",
leftTab: true, leftTab: true,
}) })

View file

@ -13,15 +13,11 @@ let modInfo = {
// Set your version in num and name // Set your version in num and name
let VERSION = { let VERSION = {
num: "1.6", num: "1.5",
name: "The great rebalancing", name: "The great rebalancing",
} }
let changelog = `<h1>Changelog:</h1><br><br> let changelog = `<h1>Changelog:</h1><br><br>
<h3>v1.6</h3><br>
- General bugfixing.<br>
- Made the tree manually generated.<br>
- Fixed the .<br>
<h3>v1.5</h3><br> <h3>v1.5</h3><br>
- Clarified some effects.<br> - Clarified some effects.<br>
- Decreased SPP requirement.<br> - Decreased SPP requirement.<br>

View file

@ -411,17 +411,8 @@ function gridRun(layer, func, data, id) {
return layers[layer].grid[func]; return layers[layer].grid[func];
} }
/****************** // Small functions
* CUSTOM METHODS *
*******************/
function softcap(number, after, method, delta = new Decimal(0)) { function softcap(number, after, method, delta = new Decimal(0)) {
if (Decimal.add(number, delta).lt(after)) { return new Decimal(number) } if (Decimal.add(number, delta).lt(after)) { return new Decimal(number) }
else { return method(Decimal.add(number, delta).sub(after)).add(after).sub(delta) } else { return method(Decimal.add(number, delta).sub(after)).add(after).sub(delta) }
} }
function unlockAll() {
player.sp.unlocked = true
player.f.unlocked = true
player.f.milestones.push("8")
player.i.unlocked = true
}