From c5bb9aaf7c6d6cfefde9d651284f52d7416a3edf Mon Sep 17 00:00:00 2001
From: Jacorb90 <39597610+Jacorb90@users.noreply.github.com>
Date: Sat, 29 Aug 2020 22:28:21 -0400
Subject: [PATCH] Beta v1.1 Alpha 15

---
 index.html |  4 ++++
 js/game.js | 26 ++++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index a33d98a..e78dccb 100644
--- a/index.html
+++ b/index.html
@@ -16,6 +16,10 @@
 		<div class="vl"></div>
 		<div v-if="player.tab=='changelog'" class="col right">
 			<button class="back" onclick="showTab('tree')">←</button><br><br>
+			<h3>Beta v1.1 Alpha 15</h3>
+			<ul>
+				<li>Balanced up to 1e635,000 Points (don't worry, the crazy inflation stops here)</li>
+			</ul><br>
 			<h3>Beta v1.1 Alpha 14</h3>
 			<ul>
 				<li>Implemented the fourth row 4 layer unlock</li>
diff --git a/js/game.js b/js/game.js
index afc43a4..61dab0c 100644
--- a/js/game.js
+++ b/js/game.js
@@ -828,25 +828,30 @@ const LAYER_UPGS = {
 	},
 	hb: {
 		rows: 1,
-		cols: 2,
+		cols: 3,
 		11: {
 			desc: "Super-Boosters are stronger based on your Hyper-Boosters.",
 			cost: new Decimal(2),
 			unl: function() { return player.hb.unl },
-			currently: function() { return player.hb.points.sqrt().div((player.hb.order>0)?25:4).plus(1) },
+			currently: function() { return player.hb.points.sqrt().div(4).plus(1) },
 			effDisp: function(x) { return format(x.sub(1).times(100))+"% stronger" },
 		},
 		12: {
 			desc: "Hyper-Boosters are stronger based on your Super-Boosters.",
 			cost: new Decimal(2),
 			unl: function() { return player.hb.unl },
-			currently: function() { return player.sb.points.div(10).plus(1).log10().div((player.hb.order>0)?5:1).plus(1) },
+			currently: function() { return player.sb.points.div(10).plus(1).log10().plus(1) },
 			effDisp: function(x) { return format(x.sub(1).times(100))+"% stronger" },
 		},
+		13: {
+			desc: "This layer behaves as if you chose it first.",
+			cost: new Decimal(2),
+			unl: function() { return player.hb.order>0||(player.ss.upgrades.includes(15))||player.hb.upgrades.includes(13) },
+		},
 	},
 	ss: {
 		rows: 1,
-		cols: 4,
+		cols: 5,
 		11: {
 			desc: "You get more Space based on your Subspace Energy.",
 			cost: new Decimal(1),
@@ -867,10 +872,15 @@ const LAYER_UPGS = {
 			unl: function() { return player.ss.unl },
 		},
 		14: {
-			desc: "Super-Boosters are 5.5% cheaper.",
+			desc: "Super-Boosters are 8.25% cheaper.",
 			cost: new Decimal(2),
 			unl: function() { return player.hb.unl },
 		},
+		15: {
+			desc: "This layer behaves as if you chose it first.",
+			cost: new Decimal(3),
+			unl: function() { return player.ss.order>0||(player.hb.upgrades.includes(13))||player.ss.upgrades.includes(15) },
+		},
 	},
 }
 
@@ -1215,7 +1225,7 @@ function getLayerGainMult(layer) {
 			if (player.h.challs.includes(21)) mult = mult.div(H_CHALLS[21].currently())
 			break;
 		case "sb":
-			if (player.ss.upgrades.includes(14)) mult = mult.div(1.055)
+			if (player.ss.upgrades.includes(14)) mult = mult.div(1.0825)
 			break;
 		case "h": 
 			if (player.q.upgrades.includes(22)) mult = mult.times(LAYER_UPGS.q[22].currently().h)
@@ -1246,6 +1256,7 @@ function getResetGain(layer) {
 		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 (gain.gte(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);
 	}
 	if (tmp.layerAmt[layer].lt(tmp.layerReqs[layer])) return new Decimal(0)
@@ -1256,6 +1267,7 @@ function getResetGain(layer) {
 function getNextAt(layer) {
 	if (LAYER_TYPE[layer]=="static") {
 		let amt = player[layer].points
+		if (amt.gte(1225)) amt = amt.pow(10).div(Decimal.pow(1225, 9))
 		if (amt.gte(12)) amt = amt.pow(2).div(12)
 		let extraCost = Decimal.pow(LAYER_BASE[layer], amt.pow(LAYER_EXP[layer])).times(tmp.gainMults[layer])
 		let cost = extraCost.times(tmp.layerReqs[layer]).max(tmp.layerReqs[layer])
@@ -1440,6 +1452,8 @@ function buyUpg(layer, id) {
 		if (!player.e.upgrades.includes(23)) player.e.upgrades.push(23)
 	}
 	if (layer=="s"&&id==33) player.s.order = 0;
+	if (layer=="hb"&&id==13) player.hb.order = 0;
+	if (layer=="ss"&&id==15) player.ss.order = 0;
 }
 
 function getPointGen() {