From 1df1409a990dee3ed647007b4df2662ae2c98c01 Mon Sep 17 00:00:00 2001
From: Acamaeda <acamaeda@gmail.com>
Date: Sun, 22 Nov 2020 17:15:03 -0500
Subject: [PATCH] Fixed right tab overlaying issue

---
 changelog.md       | 2 ++
 demo.html          | 2 +-
 index.html         | 7 -------
 js/Demo/demoMod.js | 2 +-
 js/components.js   | 2 +-
 js/game.js         | 2 +-
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/changelog.md b/changelog.md
index b671d4f..6ed1bda 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,7 @@
 # The Modding Tree changelog:
 
+### v2.2.2 - 11/22/20
+- Fixed right half of the screen being unclickable in some circumstances.
 - Fixed tree branches being offset.
 - Fix to lastSafeTab.
 
diff --git a/demo.html b/demo.html
index 4511971..ea72517 100644
--- a/demo.html
+++ b/demo.html
@@ -73,7 +73,7 @@
 			<layer-tab :layer="player.navTab == 'none' ? player.tab : player.navTab" ></layer-tab>
 
 		</div>
-		<div v-if="player.navTab !== 'none' && !(gameEnded && !player.keepGoing)" v-bind:class="{ fullWidth: player.navTab == 'none', col: player.navTab != 'none', right: player.navTab != 'none', fast: true, tab: true}">
+		<div v-if="player.navTab !== 'none' && player.tab !== 'none' && !(gameEnded && !player.keepGoing)" v-bind:class="{ fullWidth: player.navTab == 'none', col: player.navTab != 'none', right: player.navTab != 'none', fast: true, tab: true}">
 			<div v-for="layer in LAYERS" >
 				<div v-if="player.tab==layer" > 
 					<layer-tab :layer="layer" :back="'none'" :spacing="'50px'"></layer-tab>
diff --git a/index.html b/index.html
index 509fefd..e401d0a 100644
--- a/index.html
+++ b/index.html
@@ -73,12 +73,5 @@
 			<layer-tab :layer="player.navTab == 'none' ? player.tab : player.navTab" ></layer-tab>
 
 		</div>
-		<div v-if="player.navTab !== 'none' && !(gameEnded && !player.keepGoing)" v-bind:class="{ fullWidth: player.navTab == 'none', col: player.navTab != 'none', right: player.navTab != 'none', fast: true, tab: true}">
-			<div v-for="layer in LAYERS" >
-				<div v-if="player.tab==layer" > 
-					<layer-tab :layer="layer" :back="'none'" :spacing="'50px'"></layer-tab>
-				</div>
-			</div>
-		</div>
 	</div>
 </body>
\ No newline at end of file
diff --git a/js/Demo/demoMod.js b/js/Demo/demoMod.js
index 7bd8517..ca5c1fc 100644
--- a/js/Demo/demoMod.js
+++ b/js/Demo/demoMod.js
@@ -12,7 +12,7 @@ let modInfo = {
 
 // Set your version in num and name
 let VERSION = {
-	num: "2.2.1",
+	num: "2.2.2",
 	name: "Uprooted",
 }
 
diff --git a/js/components.js b/js/components.js
index c9625ba..dbd4d80 100644
--- a/js/components.js
+++ b/js/components.js
@@ -206,7 +206,7 @@ function loadVue() {
 	Vue.component('main-display', {
 		props: ['layer'],
 		template: `
-		<div><span v-if="player[layer].points.lt('1e1000')">You have </span><h2 v-bind:style="{'color': tmp[layer].color, 'text-shadow': '0px 0px 10px' + tmp[layer].color}">{{formatWhole(player[layer].points)}}</h2> {{tmp[layer].resource}}<span v-if="tmp[layer].effectDescription">, {{tmp[layer].effectDescription}}</span><br><br></span>
+		<div><span v-if="player[layer].points.lt('1e1000')">You have </span><h2 v-bind:style="{'color': tmp[layer].color, 'text-shadow': '0px 0px 10px' + tmp[layer].color}">{{formatWhole(player[layer].points)}}</h2> {{tmp[layer].resource}}<span v-if="tmp[layer].effectDescription">, {{tmp[layer].effectDescription}}</span><br><br></div>
 		`
 	})
 
diff --git a/js/game.js b/js/game.js
index 5b774be..3aba20e 100644
--- a/js/game.js
+++ b/js/game.js
@@ -4,7 +4,7 @@ var gameEnded = false;
 
 // Don't change this
 const TMT_VERSION = {
-	tmtNum: "2.2.1",
+	tmtNum: "2.2.2",
 	tmtName: "Uprooted"
 }