From dde4c00276a751ee63e0b1fae73a05401bbb0675 Mon Sep 17 00:00:00 2001
From: Harley White <acamaeda@gmail.com>
Date: Mon, 7 Jun 2021 00:29:22 -0400
Subject: [PATCH] Added thing-tree

---
 changelog.md       |  3 ++-
 docs/upgrades.md   |  2 +-
 index.html         |  2 ++
 js/Demo/demoMod.js |  2 +-
 js/components.js   | 14 ++++++++++++--
 js/game.js         |  2 +-
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/changelog.md b/changelog.md
index 2d5cdef..859097c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,8 +1,9 @@
 # The Modding Tree changelog:
 
+## v2.6.1 - 6/7/21
 - Added global background style to mod.js.
 - Tree branches can have custom line widths.
-- If an upgrade has both canAfford and cost, it checks both.
+- If an upgrade has both canAfford and cost, it checks both. (So you can use canAfford for other things)
 - Releasing a held buyable/clickable with onHold doesn't click it again.
 - Attempt to fix buttons sometimes not updating.
 - Improvements to theme code, partially by Cubedey.
diff --git a/docs/upgrades.md b/docs/upgrades.md
index 465705d..bfb5d9f 100644
--- a/docs/upgrades.md
+++ b/docs/upgrades.md
@@ -65,4 +65,4 @@ If you want to do something more complicated like upgrades that cost two currenc
 
 
 
-- branches: **optional**, This is primarially useful for upgrade trees. An array of upgrade ids. A line will appear from this upgrade to all of the upgrades in the list. Alternatively, an entry in the array can be a 2 or 3-element array consisting of the upgrade id and a color value. The color value can either be a string with a hex color code, or a number from 1-3 (theme-affected colors). The third element optionally specifies line width.
\ No newline at end of file
+- branches: **optional**, This is primarially useful for upgrade trees. An array of upgrade ids. A line will appear from this upgrade to all of the upgrades in the list. Alternatively, an entry in the array can be a 2-element array consisting of the upgrade id and a color value. The color value can either be a string with a hex color code, or a number from 1-3 (theme-affected colors). A third element in the array optionally specifies line width.
\ No newline at end of file
diff --git a/index.html b/index.html
index 24c1eec..8e03186 100644
--- a/index.html
+++ b/index.html
@@ -126,5 +126,7 @@
 			<bg :layer="player.tab" ></bg>
 
 		</div>
+		<div class = "bg2" v-bind:style = "tmp.backgroundStyle"></div>
+
 	</div>
 </body>
\ No newline at end of file
diff --git a/js/Demo/demoMod.js b/js/Demo/demoMod.js
index 579511a..d70c1db 100644
--- a/js/Demo/demoMod.js
+++ b/js/Demo/demoMod.js
@@ -11,7 +11,7 @@ let modInfo = {
 
 // Set your version in num and name
 let VERSION = {
-	num: "2.6.0.1",
+	num: "2.6.1",
 	name: "Fixed Reality",
 }
 
diff --git a/js/components.js b/js/components.js
index cbc8559..9443830 100644
--- a/js/components.js
+++ b/js/components.js
@@ -510,16 +510,26 @@ function loadVue() {
 		computed: {
 			key() {return this.$vnode.key}
 		},
+		template: `<thing-tree :layer="layer" :data = "data" :type = "'upgrade'"></thing-tree>`
+	})
+
+	// Data is an array with the structure of the tree
+	Vue.component('thing-tree', {
+		props: ['layer', 'data', 'type'],
+		computed: {
+			key() {return this.$vnode.key}
+		},
 		template: `<div>
 		<span class="upgRow" v-for="(row, r) in data"><table>
-			<span v-for="id in row" style = "{width: 0px; height: 0px;}" v-if="tmp[layer].upgrades[id]!== undefined && tmp[layer].upgrades[id].unlocked" class="upgAlign">
-				<upgrade :layer = "layer" :data = "id" v-bind:style="tmp[layer].componentStyles.upgrade" class = "treeThing"></upgrade>
+			<span v-for="id in row" style = "{width: 0px; height: 0px;}" v-if="tmp[layer][type+'s'][id]!== undefined && tmp[layer][type+'s'][id].unlocked" class="upgAlign">
+				<div v-bind:is="type" :layer = "layer" :data = "id" v-bind:style="tmp[layer].componentStyles[type]" class = "treeThing"></div>
 			</span>
 			<tr><table><button class="treeNode hidden"></button></table></tr>
 		</span></div>
 	`
 	})
 
+
 	// Updates the value in player[layer][data]
 	Vue.component('text-input', {
 		props: ['layer', 'data'],
diff --git a/js/game.js b/js/game.js
index e5728ad..7ad2765 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.6.0.1",
+	tmtNum: "2.6.1",
 	tmtName: "Fixed Reality"
 }