Beta v1.0

index.html

@@ -63,9 +63,17 @@
 				<li>Rebalanced the Super-Booster era (now up to 1e9,250 points)</li>
 				<li>Implemented a game version variable</li>
 			</ul><br><br>
+			<h3>Beta v1.0</h3>
+			<ul>
+				<li>Made sure any built-in saves had Auto-Save turned on</li>
+				<li>Fixed a visual bug for mobile users</li>
+				<li>Added a "time played" display in the info tab</li>
+				<li>Implemented a NaN check system</li>
+			</ul><br><br>
 		</div>
 		<div v-if="player.tab=='info'" class="col right">
 			<button class="back" onclick="showTab('tree')">←</button><br><br><br><br><br>
+			Time Played: {{ formatTime(player.timePlayed) }}<br><br><br>
 			<div id="cl" onclick="showTab('changelog')">Changelog</div><br><br><br>
 			<h3>Hotkeys</h3><br><br>
 			P: Prestige reset<br>
@@ -161,25 +169,25 @@
 					<tr><td v-bind:class="{ milestone: player.s.best.lt(12), milestoneDone: player.s.best.gte(12) }">12 space energy<br>Generators reset nothing</td></tr>
 					</table><br><br>
 					<button onclick="respecSpaceBuildings()" v-bind:class="{ longUpg: true, can: player.s.unl, locked: !player.s.unl }">Respec Space Buildings</button><br>
-					<table><tr>
-						<td v-for="id in 5">
+					<div class="upgRow">
+						<div v-for="id in 5">
 							<button v-if="tmp.sbUnl>=id" v-bind:class="{ upg: true, can: (player.g.power.gte(getSpaceBuildingCost(id))&&player.s.unl&&getSpace().gte(1)), locked: (!(player.g.power.gte(getSpaceBuildingCost(id))&&player.s.unl&&getSpace().gte(1))), s: true }" v-on:click="buyBuilding(id)">Building {{id}}<br>Level: {{formatWhole(player.s.buildings[id])}}<br>Cost: {{format(getSpaceBuildingCost(id))}} Generator Power<br>Effect: {{getSpaceBuildingEffDesc(id)}}</button>
-						</td>
-					</tr></table>
+						</div>
+					</div>
 				</div>
 				<div v-if="layer=='sb'">
-					<table><tr><td v-bind:class="{ milestone: player.sb.best.lt(3), milestoneDone: player.sb.best.gte(3) }">3 Super-Boosters<br>Keep Prestige Upgrades on reset</td></tr></table>
-					<table><tr><td v-bind:class="{ milestone: player.sb.best.lt(4), milestoneDone: player.sb.best.gte(4) }">4 Super-Boosters<br>Keep Booster/Generator milestones on reset</td></tr></table>
+					<table><tr><td v-bind:class="{ milestone: player.sb.best.lt(3), milestoneDone: player.sb.best.gte(3) }">3 Super-Boosters<br>Keep Prestige Upgrades on reset</td></tr>
+					<tr><td v-bind:class="{ milestone: player.sb.best.lt(4), milestoneDone: player.sb.best.gte(4) }">4 Super-Boosters<br>Keep Booster/Generator milestones on reset</td></tr></table>
 				</div>
 				<br><br><br>
 				<button v-if="LAYER_TYPE[layer]=='normal'" v-bind:class="{ [layer]: true, reset: true, locked: tmp.layerAmt[layer].lt(tmp.layerReqs[layer]), can: tmp.layerAmt[layer].gte(tmp.layerReqs[layer]) }" v-on:click="doReset(layer)">+{{formatWhole(tmp.resetGain[layer])}} {{LAYER_RES[layer]}}<br>Next at {{ format(tmp.nextAt[layer]) }} {{ LAYER_AMT_NAMES[layer] }}</button>
 				<button v-if="LAYER_TYPE[layer]=='static'" v-bind:class="{ [layer]: true, reset: true, locked: tmp.layerAmt[layer].lt(tmp.nextAt[layer]), can: tmp.layerAmt[layer].gte(tmp.nextAt[layer]) }" v-on:click="doReset(layer)">+{{formatWhole(tmp.resetGain[layer])}} {{LAYER_RES[layer]}}<br>Req: {{format(tmp.nextAt[layer])}} {{ LAYER_AMT_NAMES[layer] }}</button>
 				<br><br><br>
-				<table>
-					<tr v-for="row in LAYER_UPGS[layer].rows">
-						<td v-for="col in LAYER_UPGS[layer].cols"><button v-if="LAYER_UPGS[layer][row*10+col].unl()" v-on:click="buyUpg(layer, row*10+col)" v-bind:class="{ [layer]: true, upg: true, bought: player[layer].upgrades.includes(row*10+col), locked: (player[layer].points.lt(LAYER_UPGS[layer][row*10+col].cost)&&!player[layer].upgrades.includes(row*10+col)), can: (player[layer].points.gte(LAYER_UPGS[layer][row*10+col].cost)&&!player[layer].upgrades.includes(row*10+col)) }">{{ LAYER_UPGS[layer][row*10+col].desc }}<br>Cost: {{ formatWhole(LAYER_UPGS[layer][row*10+col].cost) }} {{LAYER_RES[layer]}}<span v-if="LAYER_UPGS[layer][row*10+col].currently"><br>Currently: {{LAYER_UPGS[layer][row*10+col].effDisp(LAYER_UPGS[layer][row*10+col].currently())}}</span></button></td>
-					</tr>
-				</table>
+				<div class="upgTable">
+					<div v-for="row in LAYER_UPGS[layer].rows" class="upgRow">
+						<div v-for="col in LAYER_UPGS[layer].cols"><button v-if="LAYER_UPGS[layer][row*10+col].unl()" v-on:click="buyUpg(layer, row*10+col)" v-bind:class="{ [layer]: true, upg: true, bought: player[layer].upgrades.includes(row*10+col), locked: (player[layer].points.lt(LAYER_UPGS[layer][row*10+col].cost)&&!player[layer].upgrades.includes(row*10+col)), can: (player[layer].points.gte(LAYER_UPGS[layer][row*10+col].cost)&&!player[layer].upgrades.includes(row*10+col)) }">{{ LAYER_UPGS[layer][row*10+col].desc }}<br>Cost: {{ formatWhole(LAYER_UPGS[layer][row*10+col].cost) }} {{LAYER_RES[layer]}}<span v-if="LAYER_UPGS[layer][row*10+col].currently"><br>Currently: {{LAYER_UPGS[layer][row*10+col].effDisp(LAYER_UPGS[layer][row*10+col].currently())}}</span></button></div>
+					</div>
+				</div>
 				<br><br><br><br>
 			</div>
 		</div>

js/game.js

@@ -1,15 +1,17 @@
 var player;
 var tmp = {};
 var needCanvasUpdate = true;
+var NaNalert = false;
 
 function getStartPlayer() {
 	return {
 		tab: "tree",
 		time: Date.now(),
 		autosave: true,
-		versionType: "alpha",
-		version: 10,
+		versionType: "beta",
+		version: 1.0,
 		timePlayed: 0,
+		hasNaN: false,
 		points: new Decimal(10),
 		p: {
 			unl: false,
@@ -718,7 +720,7 @@ function versionCheck() {
 	}
 	if (player.versionType=="alpha") {
 		if (player.version<10&&player.sb.unl) {
-			if (confirm("The Super-Booster era has been rebalanced since the last time you were here, so... would you like to import a built-in save for where you should start at?")) importSave(SAVES.PRE_SUPER_BOOSTERS)
+			if (confirm("Since the last time you played, several changes to Super-Booster effects have been made. Would you like to roll back your save to that point in the progression, in order for you to experience the new features properly?")) importSave(SAVES.PRE_SUPER_BOOSTERS)
 			setVersion = false;
 		}
 	}
@@ -746,6 +748,7 @@ function checkForVars() {
 	if (player.s.buildings[5] === undefined) player.s.buildings[5] = new Decimal(0);
 	if (player.sb === undefined) player.sb = getStartPlayer().sb
 	if (player.timePlayed === undefined) player.timePlayed = 0
+	if (player.hasNaN === undefined) player.hasNaN = false
 }
 
 function convertToDecimal() {
@@ -789,6 +792,10 @@ function commaFormat(num, precision) {
 
 function format(decimal, precision=3) {
 	decimal = new Decimal(decimal)
+	if (isNaN(decimal.sign)||isNaN(decimal.layer)||isNaN(decimal.mag)) {
+		player.hasNaN = true;
+		return "NaN"
+	}
 	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())
@@ -802,6 +809,12 @@ function formatWhole(decimal) {
 	return format(decimal, 0)
 }
 
+function formatTime(s) {
+	if (s<60) return format(s)+"s"
+	else if (s<3600) return formatWhole(Math.floor(s/60))+"m "+format(s%60)+"s"
+	else return formatWhole(Math.floor(s/3600))+"h "+formatWhole(Math.floor(s/60)%60)+"m "+format(s%60)+"s"
+}
+
 function showTab(name) {
 	if (!TAB_REQS[name]()) return
 	player.tab = name
@@ -1323,6 +1336,7 @@ function getSuperBoosterPow() {
 }
 
 function gameLoop(diff) {
+	if (isNaN(diff)) diff = 0;
 	player.timePlayed += diff
 	if (player.p.upgrades.includes(11)) player.points = player.points.plus(tmp.pointGen.times(diff))
 	if (player.g.unl) player.g.power = player.g.power.plus(tmp.layerEffs.g.times(diff))
@@ -1333,6 +1347,11 @@ function gameLoop(diff) {
 	}
 	if (player.b.auto&&player.t.best.gte(5)) doReset("b")
 	if (player.g.auto&&player.s.best.gte(5)) doReset("g")
+	
+	if (player.hasNaN&&!NaNalert) {
+		alert("We have detected a corruption in your save. Please visit https://discord.gg/wwQfgPa for help.")
+		NaNalert = true;
+	}
 }
 
 function hardReset() {

js/saves.js

@@ -1,3 +1,3 @@
 const SAVES = {
-	PRE_SUPER_BOOSTERS: "eyJ0YWIiOiJvcHRpb25zIiwidGltZSI6MTU5ODE5ODI4NjQ4OCwiYXV0b3NhdmUiOmZhbHNlLCJwb2ludHMiOiIzLjM2MDE5MjY3OTg3MzQ4M2U0MTQzIiwicCI6eyJ1bmwiOnRydWUsInBvaW50cyI6IjIuMTIyNTcyOTgwNzY0MzE0NmUyNzYzIiwidXBncmFkZXMiOlsxMSwxMiwyMSwyMiwxMywyM10sImJlc3QiOiI1MTAyMjYwMDYifSwiYiI6eyJ1bmwiOnRydWUsInBvaW50cyI6IjE4MCIsInVwZ3JhZGVzIjpbMTEsMTIsMTMsMjIsMjEsMjNdLCJiZXN0IjoiMTgwIiwiYXV0byI6dHJ1ZX0sImciOnsidW5sIjp0cnVlLCJwb2ludHMiOiIxMzkiLCJwb3dlciI6IjIuMzQzMTU4NzU3MzI3NDg1ZTMzOSIsInVwZ3JhZGVzIjpbMTEsMTIsMTMsMTQsMTUsMjIsMjEsMjMsMjQsMjVdLCJiZXN0IjoiMTM5IiwiYXV0byI6dHJ1ZX0sImUiOnsidW5sIjp0cnVlLCJwb2ludHMiOiIxLjcwMTUwMzUzMzA1ODEwNzZlODYiLCJiZXN0IjoiMS43MDE1MDM1MzMwNTgxMDc2ZTg2IiwiZW5oYW5jZXJzIjoiMzMiLCJ1cGdyYWRlcyI6WzExLDEyLDEzLDE0LDE1LDIxLDIzLDIyLDI0LDI1XSwib3JkZXIiOjB9LCJ0Ijp7InVubCI6dHJ1ZSwib3JkZXIiOjAsInBvaW50cyI6IjE2IiwiYmVzdCI6IjE2IiwiZW5lcmd5IjoiMS4wODAzMzg2NzQwOTI4NzZlOTQiLCJleHRDYXBzdWxlcyI6IjI2IiwidXBncmFkZXMiOlsxMSwxMiwxMywxNCwyMSwyMiwyMywyNCwzMSwzMiwzM119LCJzIjp7InVubCI6dHJ1ZSwib3JkZXIiOjAsInBvaW50cyI6IjE2IiwiYmVzdCI6IjE2Iiwic3BlbnQiOiI2OCIsImJ1aWxkaW5ncyI6eyIxIjoiMTciLCIyIjoiMjYiLCIzIjoiMTMiLCI0IjoiOCIsIjUiOiI0In0sInVwZ3JhZGVzIjpbMTEsMTIsMTMsMTQsMjEsMjMsMjQsMzEsMjIsMzIsMzMsMzRdfSwic2IiOnsidW5sIjpmYWxzZSwib3JkZXIiOjAsInBvaW50cyI6IjAiLCJiZXN0IjoiMCIsInVwZ3JhZGVzIjpbXX0sInZlcnNpb25UeXBlIjoiYWxwaGEiLCJ2ZXJzaW9uIjoxMH0",
+	PRE_SUPER_BOOSTERS: "eyJ0YWIiOiJvcHRpb25zIiwidGltZSI6MTU5ODE5ODI4NjQ4OCwiYXV0b3NhdmUiOnRydWUsInBvaW50cyI6IjMuMzYwMTkyNjc5ODczNDgzZTQxNDMiLCJwIjp7InVubCI6dHJ1ZSwicG9pbnRzIjoiMi4xMjI1NzI5ODA3NjQzMTQ2ZTI3NjMiLCJ1cGdyYWRlcyI6WzExLDEyLDIxLDIyLDEzLDIzXSwiYmVzdCI6IjUxMDIyNjAwNiJ9LCJiIjp7InVubCI6dHJ1ZSwicG9pbnRzIjoiMTgwIiwidXBncmFkZXMiOlsxMSwxMiwxMywyMiwyMSwyM10sImJlc3QiOiIxODAiLCJhdXRvIjp0cnVlfSwiZyI6eyJ1bmwiOnRydWUsInBvaW50cyI6IjEzOSIsInBvd2VyIjoiMi4zNDMxNTg3NTczMjc0ODVlMzM5IiwidXBncmFkZXMiOlsxMSwxMiwxMywxNCwxNSwyMiwyMSwyMywyNCwyNV0sImJlc3QiOiIxMzkiLCJhdXRvIjp0cnVlfSwiZSI6eyJ1bmwiOnRydWUsInBvaW50cyI6IjEuNzAxNTAzNTMzMDU4MTA3NmU4NiIsImJlc3QiOiIxLjcwMTUwMzUzMzA1ODEwNzZlODYiLCJlbmhhbmNlcnMiOiIzMyIsInVwZ3JhZGVzIjpbMTEsMTIsMTMsMTQsMTUsMjEsMjMsMjIsMjQsMjVdLCJvcmRlciI6MH0sInQiOnsidW5sIjp0cnVlLCJvcmRlciI6MCwicG9pbnRzIjoiMTYiLCJiZXN0IjoiMTYiLCJlbmVyZ3kiOiIxLjA4MDMzODY3NDA5Mjg3NmU5NCIsImV4dENhcHN1bGVzIjoiMjYiLCJ1cGdyYWRlcyI6WzExLDEyLDEzLDE0LDIxLDIyLDIzLDI0LDMxLDMyLDMzXX0sInMiOnsidW5sIjp0cnVlLCJvcmRlciI6MCwicG9pbnRzIjoiMTYiLCJiZXN0IjoiMTYiLCJzcGVudCI6IjY4IiwiYnVpbGRpbmdzIjp7IjEiOiIxNyIsIjIiOiIyNiIsIjMiOiIxMyIsIjQiOiI4IiwiNSI6IjQifSwidXBncmFkZXMiOlsxMSwxMiwxMywxNCwyMSwyMywyNCwzMSwyMiwzMiwzMywzNF19LCJzYiI6eyJ1bmwiOmZhbHNlLCJvcmRlciI6MCwicG9pbnRzIjoiMCIsImJlc3QiOiIwIiwidXBncmFkZXMiOltdfSwidmVyc2lvblR5cGUiOiJhbHBoYSIsInZlcnNpb24iOjEwfQ==",
 }

js/v.js

@@ -8,6 +8,7 @@ function loadVue() {
 		  tmp,
 		  format,
 		  formatWhole,
+		  formatTime,
 		  layerUnl,
 		  getLayerEffDesc,
 		  doReset,

style.css

@@ -23,6 +23,24 @@ html, body {
 	height: 100%;
 }
 
+.upgTable {
+	display: flex !important;
+	flex-flow: column wrap;
+	justify-content: center;
+	align-items: center;
+	max-width: 100%;
+	margin: 0 auto;
+}
+
+.upgRow {
+	display: flex !important;
+	flex-flow: row wrap;
+	justify-content: center;
+	align-items: center;
+	max-width: 100%;
+	margin: 0 auto;
+}
+
 h1, h2 {
 	display: inline;
 }