From 510cf78da3aeb93951a6d93a976c640f470cb6cf Mon Sep 17 00:00:00 2001
From: Jacorb90 <39597610+Jacorb90@users.noreply.github.com>
Date: Mon, 7 Sep 2020 12:33:50 -0400
Subject: [PATCH] Beta v1.2 Alpha 10

---
 index.html |  7 +++++++
 js/game.js | 54 ++++++++++++++++++++++++++++++++++++------------------
 style.css  | 16 ++++++++--------
 3 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/index.html b/index.html
index 5359b5a..3ec9ab3 100644
--- a/index.html
+++ b/index.html
@@ -15,6 +15,12 @@
 		<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 10</h3>
+			<ul>
+				<li>Made a few visual fixes</li>
+				<li>Adjusted the 1,070 Generator upgrade to cost 1,068 Generators instead</li>
+				<li>Balanced up to 1e6,800,000 Points, 1e14 Magic, and 1.5e12 Balance Energy</li>
+			</ul><br>
 			<h3>Beta v1.2 Alpha 9</h3>
 			<ul>
 				<li>Added hints for h8 & h10</li>
@@ -439,6 +445,7 @@
 				</div>
 				<div v-if="layer=='m'">
 					<br>
+					Note: Activating a Spell uses 1 Magic.<br><br>
 					<div class="upgRow">
 						<div v-for="id in 3">
 							<button v-bind:class="{ upg: true, bought: spellActive(id), can: ((player.m.points.gte(1))&&player.m.unl&&!spellActive(id)), locked: (!(player.m.points.gte(1)||spellActive(id))), m: true }" v-on:click="activateSpell(id)"><h3>{{SPELL_NAMES[id]}}</h3><br>Time Left: {{formatTime(player.m.spellTimes[id])}}<br>Effect: {{getSpellDesc(id)}}</button>
diff --git a/js/game.js b/js/game.js
index 472d39e..c389500 100644
--- a/js/game.js
+++ b/js/game.js
@@ -292,11 +292,15 @@ const LAYER_EFFS = {
 	},
 	hb: function() { return Decimal.pow(Decimal.add(1.6, addToHBBase()), player.hb.points.pow(getHyperBoosterExp()).times(getHyperBoosterPow())) },
 	ss: function() { return player.ss.points.pow(2.5).times(getSubspaceGainMult()) },
-	ba: function() { return {
-		power: player.ba.points.pow(0.2).pow(tmp.baExp ? tmp.baExp : 1).pow(player.ba.upgrades.includes(41)?2:1),
-		pos: player.ba.points.pow(0.7).pow(tmp.baExp ? tmp.baExp : 1),
-		neg: player.ba.points.pow(0.65).times(0.4).pow(tmp.baExp ? tmp.baExp : 1),
-	}},
+	ba: function() { 
+		let points1 = player.ba.points
+		if (points1.gte(1e12)) points1 = points1.log10().pow(2).times(1e12/144).min(points1)
+		return {
+			power: points1.pow(0.2).pow(tmp.baExp ? tmp.baExp : 1).pow(player.ba.upgrades.includes(41)?2:1),
+			pos: player.ba.points.pow(0.7).pow(tmp.baExp ? tmp.baExp : 1),
+			neg: player.ba.points.pow(0.65).times(0.4).pow(tmp.baExp ? tmp.baExp : 1),
+		}
+	},
 }
 
 const LAYER_UPGS = {
@@ -528,7 +532,7 @@ const LAYER_UPGS = {
 		},
 		34: {
 			desc: "Generators are stronger based on their amount.",
-			cost: new Decimal(1070),
+			cost: new Decimal(1068),
 			unl: function() { return player.ss.upgrades.includes(21) },
 			currently: function() { return player.g.points.plus(1).log10().plus(1).log10().plus(1).sqrt() },
 			effDisp: function(x) { return format(x.sub(1).times(100))+"% stronger" },
@@ -1207,14 +1211,16 @@ const LAYER_UPGS = {
 			unl: function() { return player.ba.upgrades.includes(33)&&player.ba.upgrades.includes(34) },
 		},
 		42: {
-			desc: "???",
-			cost: new Decimal(1/0),
-			unl: function() { return false },
+			desc: "The Space Building 1 effect is stronger based on your Space Building 1 amount.",
+			cost: new Decimal(3e11),
+			unl: function() { return player.ba.upgrades.includes(33)&&player.ba.upgrades.includes(34) },
+			currently: function() { return player.s.buildings[1].plus(1).pow(0.8) },
+			effDisp: function(x) { return "^"+format(x) },
 		},
 		43: {
-			desc: "???",
-			cost: new Decimal(1/0),
-			unl: function() { return false },
+			desc: "The post-25 Extra Time Capsule cost scaling is disabled.",
+			cost: new Decimal(1e12),
+			unl: function() { return player.ba.upgrades.includes(41)||player.ba.upgrades.includes(42) },
 		},
 		44: {
 			desc: "???",
@@ -1670,6 +1676,7 @@ function getResetGain(layer) {
 	}
 	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);
 }
 
@@ -1683,7 +1690,9 @@ function getNextAt(layer) {
 		if (LAYER_RES_CEIL.includes(layer)) cost = cost.ceil()
 		return cost;
 	} else {
-		let next = tmp.resetGain[layer].plus(1).root(getGainExp(layer)).div(tmp.gainMults[layer]).root(LAYER_EXP[layer]).times(tmp.layerReqs[layer]).max(tmp.layerReqs[layer])
+		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])
 		if (LAYER_RES_CEIL.includes(layer)) next = next.ceil()
 		return next;
 	}
@@ -2135,7 +2144,7 @@ function getTimeEnergyLimitMult() {
 
 function getExtCapsuleCost() {
 	let amt = player.t.extCapsules
-	if (amt.gte(25)) amt = amt.pow(2).div(25)
+	if (amt.gte(25) && !player.ba.upgrades.includes(43)) amt = amt.pow(2).div(25)
 	let cost = amt.times(0.4).pow(1.2).plus(1).times(10)
 	return cost.floor()
 }
@@ -2150,7 +2159,7 @@ function buyExtCapsule() {
 
 function maxExtTimeCapsules() {
 	let target = player.b.points.plus(1).div(10).sub(1).root(1.2).div(0.4)
-	if (target.gte(25)) target = target.times(25).sqrt()
+	if (target.gte(25)&&!player.ba.upgrades.includes(43)) target = target.times(25).sqrt()
 	target = target.plus(1).floor().max(0)
 	player.t.extCapsules = player.t.extCapsules.max(target)
 }
@@ -2220,9 +2229,12 @@ function getSpaceBuildingEff(x) {
 	if (tmp.sbUnl<x) bought = new Decimal(0);
 	let power = getSpaceBuildingPow()
 	bought = bought.times(power)
+	let ret;
 	switch(x) {
 		case 1: 
-			return Decimal.pow(Decimal.add(1, bought.pow((player.s.upgrades.includes(31)&&!(tmp.hcActive?tmp.hcActive[12]:true))?2.75:1)), player.s.points.sqrt()).times(Decimal.mul(4, bought.pow((player.s.upgrades.includes(31)&&!(tmp.hcActive?tmp.hcActive[12]:true))?2.75:1))).max(1)
+			ret = Decimal.pow(Decimal.add(1, bought.pow((player.s.upgrades.includes(31)&&!(tmp.hcActive?tmp.hcActive[12]:true))?2.75:1)), player.s.points.sqrt()).times(Decimal.mul(4, bought.pow((player.s.upgrades.includes(31)&&!(tmp.hcActive?tmp.hcActive[12]:true))?2.75:1))).max(1)
+			if (player.ba.upgrades.includes(42)) ret = ret.pow(LAYER_UPGS.ba[42].currently())
+			return ret;
 			break;
 		case 2: 
 			return bought.sqrt()
@@ -2231,7 +2243,9 @@ function getSpaceBuildingEff(x) {
 			return Decimal.pow(1e18, bought.pow(0.9))
 			break;
 		case 4: 
-			return bought.plus(1).pow(1.25)
+			ret = bought.plus(1).pow(1.25)
+			if (ret.gte(1e6)) ret = ret.log10().times(1e6/6)
+			return ret;
 			break;
 		case 5: 
 			return bought.sqrt().times(2)
@@ -2510,7 +2524,11 @@ const H_CHALLS = {
 		unl: function() { return player.m.upgrades.includes(31) },
 		goal: new Decimal("1e1150"),
 		reward: "Gain more Hindrance Spirit based on your Quirk Energy.",
-		currently: function() { return player.q.energy.plus(1).sqrt() },
+		currently: function() { 
+			let ret = player.q.energy.plus(1).sqrt() 
+			if (ret.gte("1.8e308")) ret = ret.sqrt().times(Decimal.sqrt("1.8e308"))
+			return ret;
+		},
 		effDisp: function(x) { return format(x)+"x" },
 	},
 	72: {
diff --git a/style.css b/style.css
index c0daa79..61790f1 100644
--- a/style.css
+++ b/style.css
@@ -48,8 +48,8 @@ h1, h2 {
 .treeNode {
 	height: 100px;
 	width: 100px;
+	border: 1px solid black;
 	border-radius: 50%;
-	border-color: black;
 	font-size: 40px;
 }
 
@@ -77,7 +77,7 @@ h1, h2 {
 	top: 0px;
 	left: 0px;
 	background-color: black;
-	border-color: black;
+	border: 1px solid black;
 	color: white;
 	font-size: 40px;
 	cursor: pointer;
@@ -92,14 +92,14 @@ h1, h2 {
 	height: 100px;
 	width: 150px;
 	border-radius: 50%;
-	border-color: black;
+	border: 1px solid black;
 }
 
 .upg {
 	height: 120px;
 	width: 120px;
 	border-radius: 25%;
-	border-color: black;
+	border: 1px solid black;
 	font-size: 10px;
 }
 
@@ -107,14 +107,14 @@ h1, h2 {
 	height: 200px;
 	width: 200px;
 	border-radius: 25%;
-	border-color: black;
+	border: 1px solid black;
 }
 
 .longUpg {
 	height: 50px;
 	width: 120px;
 	border-radius: 50%;
-	border-color: black;
+	border: 1px solid black;
 	font-size: 10px;
 }
 
@@ -122,7 +122,7 @@ h1, h2 {
 	height: 40px;
 	width: 40px;
 	border-radius: 25%;
-	border-color: black;
+	border: 1px solid black;
 }
 
 .p {
@@ -318,7 +318,7 @@ h1, h2 {
 	height: 100px;
 	width: 100px;
 	border-radius: 25%;
-	border-color: black;
+	border: 1px solid black;
 	background-color: #a1a1a1;
 	color: black;
 	cursor: pointer;