From bbcb4802ffe0cc951bbe3ecb0ca3eb7da4f37ee5 Mon Sep 17 00:00:00 2001
From: Harley White <acamaeda@gmail.com>
Date: Thu, 29 Apr 2021 23:42:17 -0400
Subject: [PATCH] Moved respec checkbox to respec-button, update
 version+changelog

---
 changelog.md          |  9 ++++++++-
 js/Demo/demoLayers.js |  2 +-
 js/Demo/demoMod.js    |  2 +-
 js/components.js      | 12 ++++++------
 js/game.js            |  2 +-
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/changelog.md b/changelog.md
index e4bbac2..04c1b45 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,10 @@
 # The Modding Tree changelog:
 
+# v2.4.1 - 4/29/21
+- A number of minor fixes, many thanks to thepaperpilot.
+- The respec confirmation checkbox is now part of the respec-button component.
+- Added a few missing changes to the 2.4 changelog (the two at the bottom)
+
 ## v2.4: Rationalized Edition - 4/29/21
 - Completely reworked tooltips. Shift-click a node to force its tooltip to stay displayed. (And hopefully finally fixed flickering!)
 - Added text-input and slider components.
@@ -10,10 +15,12 @@
 - You no longer need to supply 'rows' and 'cols' for any Big Features.
 - Node symbols can use HTML.
 - Added documentation for the respec button.
-- Added ctrlDown and shiftDown variables.
 - Added prestigeNotify to subtabs, and prestigeNotify in subtabs also highlights the layer node.
 - The version number no longer contains special characters or irrational numbers.
 
+- Added ctrlDown and shiftDown variables.
+- Tooltips now use HTML (this means you need to replace any newlines with <br>)
+
 
 # v2.π.1 - 4/7/21
 - Fixed formatting for some larger numbers.
diff --git a/js/Demo/demoLayers.js b/js/Demo/demoLayers.js
index 9771015..4657669 100644
--- a/js/Demo/demoLayers.js
+++ b/js/Demo/demoLayers.js
@@ -360,7 +360,7 @@ addLayer("c", {
         },
         tooltip() { // Optional, tooltip displays when the layer is unlocked
             let tooltip = formatWhole(player[this.layer].points) + " " + this.resource
-            if (player[this.layer].buyables[11].gt(0)) tooltip += "\n" + formatWhole(player[this.layer].buyables[11]) + " Exhancers"
+            if (player[this.layer].buyables[11].gt(0)) tooltip += "<br>" + formatWhole(player[this.layer].buyables[11]) + " Exhancers"
             return tooltip
         },
         shouldNotify() { // Optional, layer will be highlighted on the tree if true.
diff --git a/js/Demo/demoMod.js b/js/Demo/demoMod.js
index 48743c2..7a538e9 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.4",
+	num: "2.4.1",
 	name: "Rationalized Edition",
 }
 
diff --git a/js/components.js b/js/components.js
index 31c12a8..b53f088 100644
--- a/js/components.js
+++ b/js/components.js
@@ -241,10 +241,7 @@ function loadVue() {
 		props: ['layer', 'data'],
 		template: `
 		<div v-if="tmp[layer].buyables" class="upgTable">
-			<div>
-				<div class="tooltipBox"><input type="checkbox" v-model="player[layer].noRespecConfirm" ><tooltip v-bind:text="'Disable respec confirmation'"></tooltip></div>
-				<respec-button v-if="tmp[layer].buyables.respec && !(tmp[layer].buyables.showRespec !== undefined && tmp[layer].buyables.showRespec == false)" :layer = "layer" v-bind:style="[{'margin-bottom': '12px'}, tmp[layer].componentStyles['respec-button']]"></respec-button>
-			</div>
+			<respec-button v-if="tmp[layer].buyables.respec && !(tmp[layer].buyables.showRespec !== undefined && tmp[layer].buyables.showRespec == false)" :layer = "layer" v-bind:style="[{'margin-bottom': '12px'}, tmp[layer].componentStyles['respec-button']]"></respec-button>
 			<div v-for="row in tmp[layer].buyables.rows" class="upgRow">
 				<div v-for="col in tmp[layer].buyables.cols"><div v-if="tmp[layer].buyables[row*10+col]!== undefined && tmp[layer].buyables[row*10+col].unlocked" class="upgAlign" v-bind:style="{'margin-left': '7px', 'margin-right': '7px',  'height': (data ? data : 'inherit'),}">
 					<buyable :layer = "layer" :data = "row*10+col" :size = "data"></buyable>
@@ -276,10 +273,13 @@ function loadVue() {
 	Vue.component('respec-button', {
 		props: ['layer', 'data'],
 		template: `
-			<button v-if="tmp[layer].buyables && tmp[layer].buyables.respec && !(tmp[layer].buyables.showRespec !== undefined && tmp[layer].buyables.showRespec == false)" v-on:click="respecBuyables(layer)" v-bind:class="{ longUpg: true, can: player[layer].unlocked, locked: !player[layer].unlocked }">{{tmp[layer].buyables.respecText ? tmp[layer].buyables.respecText : "Respec"}}</button>
+			<div>
+				<div class="tooltipBox"><input type="checkbox" v-model="player[layer].noRespecConfirm" ><tooltip v-bind:text="'Disable respec confirmation'"></tooltip></div>
+				<button v-if="tmp[layer].buyables && tmp[layer].buyables.respec && !(tmp[layer].buyables.showRespec !== undefined && tmp[layer].buyables.showRespec == false)" v-on:click="respecBuyables(layer)" v-bind:class="{ longUpg: true, can: player[layer].unlocked, locked: !player[layer].unlocked }">{{tmp[layer].buyables.respecText ? tmp[layer].buyables.respecText : "Respec"}}</button>
+			</div>
 			`
 	})
-
+	
 	// data = button size, in px
 	Vue.component('clickables', {
 		props: ['layer', 'data'],
diff --git a/js/game.js b/js/game.js
index 4eab945..2589d21 100644
--- a/js/game.js
+++ b/js/game.js
@@ -5,7 +5,7 @@ var scrolled = false;
 
 // Don't change this
 const TMT_VERSION = {
-	tmtNum: "2.4.0.1",
+	tmtNum: "2.4.1",
 	tmtName: "Rationalized Edition"
 }