From b9a858af565f604ab291309534ad330dabf5b82b Mon Sep 17 00:00:00 2001
From: Harley White <acamaeda@gmail.com>
Date: Thu, 29 Apr 2021 17:49:35 -0400
Subject: [PATCH] Added respec confirmation checkbox

Plus more tooltip fixes
---
 js/components.js                 | 11 +++++++----
 js/technical/systemComponents.js |  7 ++++---
 js/utils.js                      |  2 +-
 js/utils/save.js                 |  1 +
 style.css                        |  1 +
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/js/components.js b/js/components.js
index 0de1004..31c12a8 100644
--- a/js/components.js
+++ b/js/components.js
@@ -241,7 +241,10 @@ function loadVue() {
 		props: ['layer', 'data'],
 		template: `
 		<div v-if="tmp[layer].buyables" class="upgTable">
-			<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>
+				<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>
 			<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>
@@ -274,7 +277,7 @@ function loadVue() {
 		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>
-	`
+			`
 	})
 
 	// data = button size, in px
@@ -367,7 +370,7 @@ function loadVue() {
 
 	// data = id
 	Vue.component('achievement', {
-		props: ['layer', 'data', 'hover'],
+		props: ['layer', 'data'],
 		template: `
 		<div v-if="tmp[layer].achievements && tmp[layer].achievements[data]!== undefined && tmp[layer].achievements[data].unlocked" v-bind:class="{ [layer]: true, achievement: true, tooltipBox:true, locked: !hasAchievement(layer, data), bought: hasAchievement(layer, data)}"
 			v-bind:style="tmp[layer].achievements[data].computedStyle">
@@ -410,7 +413,7 @@ function loadVue() {
 	Vue.component('slider', {
 		props: ['layer', 'data'],
 		template: `
-			<div class="tooltipBox" @mouseover="hover = true" @mouseleave="hover = false">
+			<div class="tooltipBox">
 			<tooltip :text="player[layer][data[0]]"></tooltip><input type="range" v-model="player[layer][data[0]]" :min="data[1]" :max="data[2]"></div>
 		`
 	})
diff --git a/js/technical/systemComponents.js b/js/technical/systemComponents.js
index 699249c..4ccaad8 100644
--- a/js/technical/systemComponents.js
+++ b/js/technical/systemComponents.js
@@ -12,9 +12,9 @@ var systemComponents = {
 	},
 
 	'tree-node': {
-		props: ['layer', 'abb', 'size', 'hover'],
+		props: ['layer', 'abb', 'size'],
 		template: `
-		<button v-if="nodeShown(layer)"       @mouseover="hover = true" @mouseleave="hover = false"
+		<button v-if="nodeShown(layer)"       
 			v-bind:id="layer"
 			v-on:click="function() {
 				if (shiftDown) player[layer].forceTooltip = !player[layer].forceTooltip
@@ -40,7 +40,7 @@ var systemComponents = {
 			v-bind:style="tmp[layer].computedNodeStyle">
 			<span v-html="(abb !== '' && tmp[layer].image === undefined) ? abb : '&nbsp;'"></span>
 			<tooltip
-			v-bind:text="(tmp[layer].tooltip == '') ? false : (tmp[layer].isLayer) ? (
+			:text="(tmp[layer].tooltip == '') ? false : (tmp[layer].isLayer) ? (
 				player[layer].unlocked ? (tmp[layer].tooltip ? tmp[layer].tooltip : formatWhole(player[layer].points) + ' ' + tmp[layer].resource)
 				: (tmp[layer].tooltipLocked ? tmp[layer].tooltipLocked : 'Reach ' + formatWhole(tmp[layer].requires) + ' ' + tmp[layer].baseResource + ' to unlock (You have ' + formatWhole(tmp[layer].baseAmount) + ' ' + tmp[layer].baseResource + ')')
 			)
@@ -170,6 +170,7 @@ var systemComponents = {
         `
     },
 
+
 	'tooltip' : {
 		props: ['text'],
 		template: `<div class="tooltip" v-html="text"></div>
diff --git a/js/utils.js b/js/utils.js
index 31f5ca9..28b9149 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -3,7 +3,7 @@
 function respecBuyables(layer) {
 	if (!layers[layer].buyables) return
 	if (!layers[layer].buyables.respec) return
-	if (!confirm("Are you sure you want to respec? This will force you to do a \"" + (tmp[layer].name ? tmp[layer].name : layer) + "\" reset as well!")) return
+	if (!player[layer].noRespecConfirm && !confirm("Are you sure you want to respec? This will force you to do a \"" + (tmp[layer].name ? tmp[layer].name : layer) + "\" reset as well!")) return
 	run(layers[layer].buyables.respec, layers[layer].buyables)
 	updateBuyableTemp(layer)
 	document.activeElement.blur()
diff --git a/js/utils/save.js b/js/utils/save.js
index 3801bae..2403578 100644
--- a/js/utils/save.js
+++ b/js/utils/save.js
@@ -74,6 +74,7 @@ function getStartLayerData(layer) {
 		layerdata.forceTooltip = false;
 
 	layerdata.buyables = getStartBuyables(layer);
+	if (layerdata.noRespecConfirm === undefined) layerdata.noRespecConfirm = false
 	if (layerdata.clickables == undefined)
 		layerdata.clickables = getStartClickables(layer);
 	layerdata.spentOnBuyables = new Decimal(0);
diff --git a/style.css b/style.css
index 27752a3..2cae9d3 100644
--- a/style.css
+++ b/style.css
@@ -558,6 +558,7 @@ ul {
   }
   
   .tooltip { 
+	pointer-events: none;
 	text-align: center;
 	width: 150px;
 	font-size: 16px;