From 851c5c8b31b339db810566dab641f6872b228552 Mon Sep 17 00:00:00 2001
From: Jacorb90 <39597610+Jacorb90@users.noreply.github.com>
Date: Tue, 8 Sep 2020 12:48:48 -0400
Subject: [PATCH] Beta v1.2 Alpha 12

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

diff --git a/index.html b/index.html
index 939b308..dd798c1 100644
--- a/index.html
+++ b/index.html
@@ -15,6 +15,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.2 Alpha 12</h3>
+			<ul>
+				<li>Balanced up to 1e9,200,000 Points, 5e18 Magic, and 1e16 Balance Energy</li>
+			</ul><br>
 			<h3>Beta v1.2 Alpha 11</h3>
 			<ul>
 				<li>Balanced up to 1e7,650,000 Points, 1e16 Magic, and 4e13 Balance Energy</li>
diff --git a/js/game.js b/js/game.js
index 9273b47..3ff2924 100644
--- a/js/game.js
+++ b/js/game.js
@@ -746,7 +746,7 @@ const LAYER_UPGS = {
 		},
 	},
 	s: {
-		rows: 3,
+		rows: 4,
 		cols: 4,
 		11: {
 			desc: "Add a free level to all Space Buildings.",
@@ -820,6 +820,28 @@ const LAYER_UPGS = {
 			currently: function() { return Decimal.pow(Object.values(player.s.buildings).reduce((a,b) => Decimal.add(a,b)), 0.2).div(17.5) },
 			effDisp: function(x) { return "Add "+format(x)+" to exponent" },
 		},
+		41: {
+			desc: "Total Space cheapens Space Buildings.",
+			cost: new Decimal(128),
+			unl: function() { return player.ba.upgrades.includes(51) },
+			currently: function() { return Decimal.pow("1e4000", getSpace().plus(player.s.spent).sqrt()) },
+			effDisp: function(x) { return "/"+format(x) },
+		},
+		42: {
+			desc: "The Space Building cost formula is 40% weaker.",
+			cost: new Decimal(131),
+			unl: function() { return player.ba.upgrades.includes(51) },
+		},
+		43: {
+			desc: "Space Building 2 uses a better formula.",
+			cost: new Decimal(133),
+			unl: function() { return player.ba.upgrades.includes(51) },
+		},
+		44: {
+			desc: "Placeholder",
+			cost: new Decimal(1/0),
+			unl: function() { return player.ba.upgrades.includes(51) },
+		},
 	},
 	sb: {
 		rows: 2,
@@ -866,7 +888,7 @@ const LAYER_UPGS = {
 		cols: 0,
 	},
 	q: {
-		rows: 4,
+		rows: 5,
 		cols: 4,
 		11: {
 			desc: "Quirks & Hindrance Spirit boost Point, Prestige Point, and Enhance Point gain.",
@@ -965,6 +987,28 @@ const LAYER_UPGS = {
 			currently: function() { return player.q.energy.plus(1).log10().plus(1) },
 			effDisp: function(x) { return format(x)+"x" },
 		},
+		51: {
+			desc: "Get free Quirk Layers based on your Quirk Energy.",
+			cost: new Decimal("1e2100"),
+			unl: function() { return player.ba.upgrades.includes(52) },
+			currently: function() { return player.q.energy.plus(1).log10().plus(1).log10() },
+			effDisp: function(x) { return "+"+format(x) },
+		},
+		52: {
+			desc: "Placeholder",
+			cost: new Decimal(1/0),
+			unl: function() { return player.ba.upgrades.includes(52) },
+		},
+		53: {
+			desc: "Placeholder",
+			cost: new Decimal(1/0),
+			unl: function() { return player.ba.upgrades.includes(52) },
+		},
+		54: {
+			desc: "Placeholder",
+			cost: new Decimal(1/0),
+			unl: function() { return player.ba.upgrades.includes(52) },
+		},
 	},
 	hb: {
 		rows: 1,
@@ -1163,7 +1207,7 @@ const LAYER_UPGS = {
 		},
 	},
 	ba: {
-		rows: 4,
+		rows: 5,
 		cols: 4,
 		11: {
 			desc: "All Balance Energy effects use better formulas.",
@@ -1261,6 +1305,26 @@ const LAYER_UPGS = {
 			cost: new Decimal(2e12),
 			unl: function() { return player.ba.upgrades.includes(42)||player.ba.upgrades.includes(43) },
 		},
+		51: {
+			desc: "Unlock 4 new Space Upgrades.",
+			cost: new Decimal(4e13),
+			unl: function() { return player.ba.upgrades.includes(43) },
+		},
+		52: {
+			desc: "Unlock 4 new Quirk Upgrades.",
+			cost: new Decimal(2e14),
+			unl: function() { return player.ba.upgrades.includes(51) },
+		},
+		53: {
+			desc: "???",
+			cost: new Decimal(1/0),
+			unl: function() { return false },
+		},
+		54: {
+			desc: "???",
+			cost: new Decimal(1/0),
+			unl: function() { return false },
+		},
 	},
 }
 
@@ -2219,13 +2283,15 @@ function getSpace() {
 
 function getSpaceBuildingCostMod() {
 	let mod = new Decimal(1)
-	if (player.s.upgrades.includes(24)&&!(tmp.hcActive?tmp.hcActive[12]:true)) mod = new Decimal(0.5)
+	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)
 	return mod;
 }
 
 function getSpaceBuildingCostMult() {
 	let mult = new Decimal(1)
 	if (player.ss.unl) mult = mult.div(tmp.ssEff2)
+	if (player.s.upgrades.includes(41)) mult = mult.div(LAYER_UPGS.s[41].currently())
 	return mult
 }
 
@@ -2281,8 +2347,9 @@ function getSpaceBuildingEff(x) {
 			if (player.ba.upgrades.includes(42)) ret = ret.pow(LAYER_UPGS.ba[42].currently())
 			return ret;
 			break;
-		case 2: 
-			return bought.sqrt()
+		case 2: 	
+			if (player.s.upgrades.includes(43)) return Decimal.pow(1.0001, bought).times(bought.sqrt())
+			else return bought.sqrt()
 			break;
 		case 3: 
 			return Decimal.pow(1e18, bought.pow(0.9))
@@ -2417,6 +2484,7 @@ function getQuirkLayerMult() {
 
 function getExtraQuirkLayers() {
 	let layers = new Decimal(0);
+	if (player.q.upgrades.includes(51)) layers = layers.plus(LAYER_UPGS.q[51].currently())
 	if (player.m.upgrades.includes(24)) layers = layers.plus(LAYER_UPGS.m[24].currently())
 	if (player.m.upgrades.includes(34)) layers = layers.plus(1)
 	return layers;