From a160f86cff3a567581f2f55465e1897e292df79b Mon Sep 17 00:00:00 2001 From: Aarex Tiaokhiao Date: Sat, 12 Sep 2020 22:38:32 -0400 Subject: [PATCH] Beta 7 --- index.html | 22 ++++++ js/canvas.js | 1 + js/game.js | 213 ++++++++++++++++++++++++++++++++++++--------------- js/temp.js | 13 ++++ js/v.js | 3 +- 5 files changed, 189 insertions(+), 63 deletions(-) diff --git a/index.html b/index.html index 6bdd41e..5444f16 100644 --- a/index.html +++ b/index.html @@ -591,6 +591,21 @@ You have {{formatWhole(player.ps.points)}} Phantom Souls, {{getLayerEffDesc("ps")}} +
+

+ You have {{formatWhole(player.ba.points)}} Balance Energy +
+ +

+
+
+
+ +
+
+
+ Get {{formatWhole(player.g.points)}} / {{formatWhole(HYPERSPACE.nextCapReq())}} Generators to increase the cap of Super-Upgrades +


@@ -617,4 +632,11 @@
+ \ No newline at end of file diff --git a/js/canvas.js b/js/canvas.js index ba5693a..6ccd4b9 100644 --- a/js/canvas.js +++ b/js/canvas.js @@ -82,6 +82,7 @@ function drawTree() { } if (layerShown('i')) { drawTreeBranch("ss", "i") + drawTreeBranch("sg", "i") } if (layerShown('mb')) { drawTreeBranch("l", "mb") diff --git a/js/game.js b/js/game.js index 8070167..1b25ceb 100644 --- a/js/game.js +++ b/js/game.js @@ -197,7 +197,10 @@ function getStartPlayer() { points: new Decimal(0), best: new Decimal(0), upgrades: [], - hyperUpgrades: {}, + space: new Decimal(0), + spent: new Decimal(0), + superUpgrades: {}, + superUpgradeCap: new Decimal(1), }, i: { unl: false, @@ -253,7 +256,7 @@ const LAYER_RES = { ps: "phantom souls", sp: "super-prestige points", l: "life essence", - hs: "hyperspace", + hs: "hyperspace energy", i: "imperium bricks", } @@ -299,7 +302,7 @@ const LAYER_EXP = { ps: new Decimal(1.2), sp: new Decimal(2e-7), l: new Decimal(0.012), - hs: new Decimal(1e-9), + hs: new Decimal(40), i: new Decimal(1), } @@ -1437,31 +1440,31 @@ const LAYER_UPGS = { effDisp: function(x) { return format(x)+"x" }, }, 15: { - desc: "Balance Energy boosts Positivity and Negativity more.", - cost: new Decimal(1/0), - unl: function() { return player.ps.upgrades.includes(23) }, + desc: "Positivity and Negativity reduce the cost scaling of Space Buildings.", + cost: new Decimal(1e205), + unl: function() { return player.sp.upgrades.includes(44) }, + currently: function() { return player.ba.positivity.add(1).div(player.ba.negativity.add(1)).log10().div(20).add(1) }, + effDisp: function(x) { return format(Decimal.sub(1, x.recip()).times(100))+"%" }, }, 25: { - desc: "Positivity and Negativity reduce the cost scaling of Space Buildings.", - cost: new Decimal(1/0), - unl: function() { return player.ps.upgrades.includes(23) }, - currently: function() { return player.ba.positivity.add(1).div(player.ba.negativity.add(1)).log10().div(100).add(1).cbrt() }, - effDisp: function(x) { return format(x.sub(1).times(100))+"%" }, + desc: "Balance Energy boosts Positivity and Negativity more.", + cost: new Decimal(1e245), + unl: function() { return player.sp.upgrades.includes(44) }, }, 35: { desc: "Balance Upgrades reduce the Quirk Layer cost scaling more.", cost: new Decimal(1/0), - unl: function() { return player.ps.upgrades.includes(23) }, + unl: function() { return player.sp.upgrades.includes(44) }, }, 45: { desc: "???", cost: new Decimal(1/0), - unl: function() { return player.i.unl }, + unl: function() { return player.ps.upgrades.includes(23) }, }, 55: { desc: "???", cost: new Decimal(1/0), - unl: function() { return player.i.unl }, + unl: function() { return player.ps.upgrades.includes(23) }, }, }, ps: { @@ -1493,18 +1496,18 @@ const LAYER_UPGS = { }, 21: { desc: "Unlock the fifth Life Booster.", - cost: new Decimal(1), + cost: new Decimal(3), unl: function() { return player.hs.unl }, }, 22: { desc: "Phantom Souls reduce the post-12 scaling of all row 1 - 4 layer requirements.", cost: new Decimal(1/0), unl: function() { return player.hs.unl }, - currently: function() { return player.ps.points }, + currently: function() { return player.ps.points.div(100).add(1) }, effDisp: function(x) { return format(x) + "x" }, }, 23: { - desc: "Unlock 3 new Balance Upgrades.", + desc: "Unlock 2 new Balance Upgrades.", cost: new Decimal(1/0), unl: function() { return player.hs.unl }, }, @@ -1601,31 +1604,29 @@ const LAYER_UPGS = { }, 41: { desc: "Gain more Life Essence based on total SP.", - cost: new Decimal(1e6), + cost: new Decimal(8e5), unl: function() { return player.l.unl }, - currently: function() { return player.sp.total.div(1e6).add(1).sqrt() }, + currently: function() { return player.sp.total.div(5e5).add(1).sqrt() }, effDisp: function(x) { return format(x)+"x" }, }, 42: { desc: "Life Essence speeds up the Life Power production.", - cost: new Decimal(2e6), + cost: new Decimal(1.5e6), unl: function() { return player.l.unl }, currently: function() { return player.l.points.add(1).log(1.5).add(1).cbrt() }, effDisp: function(x) { return format(x)+"x" }, }, 43: { - desc: "Gain more Hyperspace based on best SP.", - cost: new Decimal(1/0), + desc: "Gain more Hyperspace Energy based on best SP.", + cost: new Decimal(6e5), unl: function() { return player.hs.unl }, - currently: function() { return new Decimal(1) }, + currently: function() { return player.sp.best.div(5e5).add(1).sqr() }, effDisp: function(x) { return format(x)+"x" }, }, 44: { - desc: "Total SP strengthens all Hyper-Upgrades.", - cost: new Decimal(1/0), + desc: "Unlock 3 new Balance Upgrades.", + cost: new Decimal(1.2e6), unl: function() { return player.hs.unl }, - currently: function() { return new Decimal(1) }, - effDisp: function(x) { return format(x.sub(1).times(100))+"%" }, }, 51: { desc: "Add 1 extra Hyper-Booster to its effect.", @@ -1883,10 +1884,14 @@ function checkForVars() { if (player.keepGoing === undefined) player.keepGoing = false if (player.i.lifeBricks === undefined) { player.l = start.l - player.hs = start.hs player.i = start.i delete player.c } + if (player.hs.space === undefined) { + var order = player.hs.order + player.hs = start.hs + player.hs.order = order + } } function convertToDecimal() { @@ -1915,7 +1920,10 @@ function convertToDecimal() { player.ba.negativity = new Decimal(player.ba.negativity) player.l.power = new Decimal(player.l.power) for (let i=1;i<=5;i++) if (player.l.boosters[i]) player.l.boosters[i] = new Decimal(player.l.boosters[i]) - for (let i=1;i<=MAX_BUILDINGS;i++) if (player.hs.hyperUpgrades[i]) player.hs.hyperUpgrades[i] = new Decimal(player.hs.hyperUpgrades[i]) + player.hs.space = new Decimal(player.hs.space) + player.hs.spent = new Decimal(player.hs.spent) + for (let i=1;i<=MAX_BUILDINGS;i++) if (player.hs.superUpgrades[i]) player.hs.superUpgrades[i] = new Decimal(player.hs.superUpgrades[i]) + player.hs.superUpgradeCap = new Decimal(player.hs.superUpgradeCap) player.i.lifeBricks = new Decimal(player.i.lifeBricks) player.i.extraBuildings = new Decimal(player.i.extraBuildings) } @@ -1960,11 +1968,14 @@ function format(decimal, precision=3) { player.hasNaN = true; return "NaN" } + if (decimal.lt(0)) return "-"+format(decimal.neg(), precision) if (decimal.eq(1/0)) return "Infinity" - if (decimal.gte("eee1000")) return exponentialFormat(decimal, precision) - else if (decimal.gte("ee1000")) return "ee"+format(decimal.log10().log10()) - else if (decimal.gte("1e1000000")) return "e"+format(decimal.log10().floor()) - else if (decimal.gte("1e1000")) return decimal.div(Decimal.pow(10, decimal.log10().floor())).toStringWithDecimalPlaces(3)+"e"+format(decimal.log10().floor()) + if (decimal.gte("eeee1000000")) { + var slog = decimal.slog() + if (slog.gte(1e6)) return "F" + format(slog.floor()) + else return Decimal.pow(10, slog.sub(slog.floor())).toStringWithDecimalPlaces(3) + "F" + commaFormat(slog.floor(), 0) + } else if (decimal.gte("1e1000000")) return "e"+formatWhole(decimal.log10()) + else if (decimal.gte("1e1000")) return decimal.div(Decimal.pow(10, decimal.log10().floor())).toStringWithDecimalPlaces(3)+"e"+commaFormat(decimal.log10().floor()) else if (decimal.gte(1e9)) return exponentialFormat(decimal, precision) else if (decimal.gte(1e3)) return commaFormat(decimal, 0) else return commaFormat(decimal, precision) @@ -2061,7 +2072,7 @@ function getLayerReq(layer) { if (player.l.order>0) req = new Decimal("1e1000") break; case "hs": - if (player.hs.order>0) req = new Decimal(915) + if (player.hs.order>0) req = new Decimal(905) break; } return req @@ -2149,13 +2160,13 @@ function getLayerGainMult(layer) { break; case "hs": if (player.sp.upgrades.includes(43)) mult = mult.times(LAYER_UPGS.sp[43].currently()) - if (player.l.unl && tmp.l !== undefined && tmp.l.lbUnl >= 5) mult = mult.times(tmp.l.lbEff[4]) + if (player.l.unl && tmp.l !== undefined && tmp.l.lbUnl >= 5) mult = mult.times(tmp.l.lbEff[5]) break; } return mult } -function getGainExp(layer) { +function getLayerGainExp(layer) { let exp = new Decimal(1); switch(layer) { case "p": @@ -2164,8 +2175,8 @@ function getGainExp(layer) { case "l": if (player.l.order > 0) exp = exp.div(2) break; - case "hs": - if (player.hs.order > 0) exp = exp.div(2) + case "hs": + if (player.hs.order > 0) exp = exp.div(5) break; } return exp; @@ -2174,40 +2185,41 @@ function getGainExp(layer) { function getResetGain(layer) { if (LAYER_TYPE[layer]=="static") { if ((!canBuyMax(layer)) || tmp.layerAmt[layer].lt(tmp.layerReqs[layer])) return new Decimal(1) - let gain = tmp.layerAmt[layer].div(tmp.layerReqs[layer]).div(tmp.gainMults[layer]).max(1).log(LAYER_BASE[layer]).pow(Decimal.pow(LAYER_EXP[layer], -1)) - if (LAYER_ROW[layer] < 4 && layer != "hb") { + let gain = tmp.layerAmt[layer].div(tmp.layerReqs[layer]).div(tmp.gainMults[layer]).max(1).log(LAYER_BASE[layer]).times(tmp.gainExp[layer]).pow(Decimal.pow(LAYER_EXP[layer], -1)) + if ((LAYER_ROW[layer] < 4 && layer != "hb") || layer == "ps") { if (gain.gte(12)) { - if (fixValue(tmp.scaling12b).gt(1)) gain = gain.times(tmp.scaling12b).add(tmp.scaling12b.sub(1).times(12)) + if (LAYER_ROW[layer] < 4 && fixValue(tmp.scaling12b).gt(1)) gain = gain.times(tmp.scaling12b).add(tmp.scaling12b.sub(1).times(12)) gain = gain.times(12).sqrt() } if (gain.gte(1225)) gain = gain.times(Decimal.pow(1225, 9)).pow(0.1) } return gain.floor().sub(player[layer].points).plus(1).max(1); + } else { + if (tmp.layerAmt[layer].lt(tmp.layerReqs[layer])) return new Decimal(0) + let gain = tmp.layerAmt[layer].div(tmp.layerReqs[layer]).pow(LAYER_EXP[layer]).times(tmp.gainMults[layer]).pow(tmp.gainExp[layer]) + if (gain.gte("e1e7")) gain = gain.sqrt().times("e5e6") + return gain.floor().max(0); } - if (tmp.layerAmt[layer].lt(tmp.layerReqs[layer])) return new Decimal(0) - let gain = tmp.layerAmt[layer].div(tmp.layerReqs[layer]).pow(LAYER_EXP[layer]).times(tmp.gainMults[layer]).pow(getGainExp(layer)) - if (gain.gte("e1e7")) gain = gain.sqrt().times("e5e6") - return gain.floor().max(0); } function getNextAt(layer) { if (LAYER_TYPE[layer]=="static") { let amt = player[layer].points - if (LAYER_ROW[layer] < 4 && layer != "hb") { + if ((LAYER_ROW[layer] < 4 && layer != "hb") || layer == "ps") { if (amt.gte(1225)) amt = amt.pow(10).div(Decimal.pow(1225, 9)) if (amt.gte(12)) { amt = amt.pow(2).div(12) - if (fixValue(tmp.scaling12b).gt(1)) amt = amt.sub(tmp.scaling12b.sub(1).times(12)).div(tmp.scaling12b) + if (LAYER_ROW[layer] < 4 && fixValue(tmp.scaling12b).gt(1)) amt = amt.sub(tmp.scaling12b.sub(1).times(12)).div(tmp.scaling12b) } } - let extraCost = Decimal.pow(LAYER_BASE[layer], amt.pow(LAYER_EXP[layer])).times(tmp.gainMults[layer]) + let extraCost = Decimal.pow(LAYER_BASE[layer], amt.pow(LAYER_EXP[layer]).div(tmp.gainExp[layer])).times(tmp.gainMults[layer]) let cost = extraCost.times(tmp.layerReqs[layer]).max(tmp.layerReqs[layer]) if (LAYER_RES_CEIL.includes(layer)) cost = cost.ceil() return cost; } else { let next = tmp.resetGain[layer].plus(1) if (next.gte("e1e7")) next = next.div("e5e6").pow(2) - next = next.root(getGainExp(layer)).div(tmp.gainMults[layer]).root(LAYER_EXP[layer]).times(tmp.layerReqs[layer]).max(tmp.layerReqs[layer]) + next = next.root(tmp.gainExp[layer]).div(tmp.gainMults[layer]).root(LAYER_EXP[layer]).times(tmp.layerReqs[layer]).max(tmp.layerReqs[layer]) if (LAYER_RES_CEIL.includes(layer)) next = next.ceil() return next; } @@ -2224,7 +2236,6 @@ function nodeShown(layer) { } function layerShown(layer) { - if (layerUnl(layer)) return true switch(layer) { case "p": return true @@ -2812,6 +2823,7 @@ function getSpaceBuildingCostMod() { if (player.s.upgrades.includes(24)&&!(tmp.hcActive?tmp.hcActive[12]:true)) mod = mod.times(0.5) if (player.s.upgrades.includes(42)) mod = mod.times(0.6) if (spellActive(4)) mod = mod.times(Decimal.sub(1, tmp.spellEffs[4].sub(1))) + if (player.ba.upgrades.includes(15)) mod = mod.div(LAYER_UPGS.ba[15].currently()) return mod; } @@ -2868,6 +2880,10 @@ function getSpaceBuildingEff(x) { if (tmp.s.trueSbUnl