From ca76d130fdfeaa24473654670817d52dc35ffaed Mon Sep 17 00:00:00 2001
From: Acamaeda <acamaeda@gmail.com>
Date: Thu, 29 Oct 2020 20:33:39 -0400
Subject: [PATCH] Fixed issues with challenges

---
 changelog.md        |  1 +
 demo.html           |  2 +-
 js/Demo/demoMod.js  |  6 ++----
 js/Demo/demoTree.js | 11 +++++++----
 js/utils.js         |  6 +++++-
 js/v.js             |  2 +-
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/changelog.md b/changelog.md
index 1190593..e3c707c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -5,6 +5,7 @@
 - Added shouldNotify to subtab/microtab buttons. (You can make them highlighted)
 - Added commas to large exponents.
 - NaN is now handled more intelligently.
+- The "hide completed challenges" setting now only hides challenges at max completions.
 - Thank you to thepaperpilot for fixing errors in docs and the infobox appearance!
 
 ### v2.1.4 - 10/25/20
diff --git a/demo.html b/demo.html
index 4fce880..a79a315 100644
--- a/demo.html
+++ b/demo.html
@@ -154,7 +154,7 @@
 				<span v-if="canGenPoints()"  class="overlayThing">({{format(getPointGen())}}/sec)</span>
 				<div v-for="thing in tmp.displayThings" class="overlayThing"><span v-if="thing" v-html="thing"></span></div>
 			</div>
-			<tree :data="(treeLayout ? treeLayout : TREE_LAYERS)"></tree>
+			<tree :data="(layoutInfo.treeLayout ? layoutInfo.treeLayout : TREE_LAYERS)"></tree>
 		</div>
 		<div v-for="layer in LAYERS" >
 			<div v-if="player.navTab == 'none'" id="fakeHead" style="visibility: hidden;">
diff --git a/js/Demo/demoMod.js b/js/Demo/demoMod.js
index 3d3d6a3..ef4c759 100644
--- a/js/Demo/demoMod.js
+++ b/js/Demo/demoMod.js
@@ -8,14 +8,12 @@ let modInfo = {
 	initialStartPoints: new Decimal (10), // Used for hard resets and new players
 	
 	offlineLimit: 1,  // In hours
-	startTab: "none",
-	startNavTab: "tree",
 }
 
 // Set your version in num and name
 let VERSION = {
-	num: "2.1.3.1",
-	name: " We should have thought of this sooner!",
+	num: "2.2",
+	name: "Uprooted",
 }
 
 // If you add new functions anywhere inside of a layer, and those functions have an effect when called, add them here.
diff --git a/js/Demo/demoTree.js b/js/Demo/demoTree.js
index f759d44..59707db 100644
--- a/js/Demo/demoTree.js
+++ b/js/Demo/demoTree.js
@@ -1,9 +1,12 @@
 // treeLayout will override the default tree's layout if used
-var treeLayout = "";
-/*var treeLayout = [["f", "c"],
-        ["g", "spook", "h"]]
-*/
+var layoutInfo = {
+    startTab: "none",
+	showTree: true,
 
+    treeLayout: ""
+
+    
+}
 
 // A "ghost" layer which offsets f in the tree
 addNode("spook", {
diff --git a/js/utils.js b/js/utils.js
index 8371970..d294910 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -453,6 +453,10 @@ function hasChallenge(layer, id){
 	return (player[layer].challenges[id])
 }
 
+function maxedChallenge(layer, id){
+	return (player[layer].challenges[id] >= tmp[layer].challenges[id].completionLimit)
+}
+
 function challengeCompletions(layer, id){
 	return (player[layer].challenges[id])
 }
@@ -585,7 +589,7 @@ function inChallenge(layer, id){
 	if (challenge==id) return true
 
 	if (layers[layer].challenges[challenge].countsAs)
-		return tmp[layer].challenges[id].countsAs.includes(id)
+		return tmp[layer].challenges[challenge].countsAs.includes(id)
 }
 
 // ************ Misc ************
diff --git a/js/v.js b/js/v.js
index 261d673..1997f6a 100644
--- a/js/v.js
+++ b/js/v.js
@@ -119,7 +119,7 @@ function loadVue() {
 	Vue.component('challenge', {
 		props: ['layer', 'data'],
 		template: `
-		<div v-if="tmp[layer].challenges && tmp[layer].challenges[data]!== undefined && tmp[layer].challenges[data].unlocked && !(player.hideChallenges && hasChallenge(layer, [data]))" v-bind:class="{hChallenge: true, done: hasChallenge(layer, data), canComplete: player[layer].activeChallenge == data&&!hasChallenge(layer, data)&&canCompleteChallenge(layer, data)}">
+		<div v-if="tmp[layer].challenges && tmp[layer].challenges[data]!== undefined && tmp[layer].challenges[data].unlocked && !(player.hideChallenges && maxedChallenge(layer, [data]))" v-bind:class="{hChallenge: true, done: hasChallenge(layer, data), canComplete: player[layer].activeChallenge == data&&!hasChallenge(layer, data)&&canCompleteChallenge(layer, data)}">
 			<br><h3 v-html="tmp[layer].challenges[data].name"></h3><br><br>
 			<button v-bind:class="{ longUpg: true, can: true, [layer]: true }" v-bind:style="{'background-color': tmp[layer].color}" v-on:click="startChallenge(layer, data)">{{player[layer].activeChallenge==(data)?(canCompleteChallenge(layer, data)?"Finish":"Exit Early"):(hasChallenge(layer, data)?"Completed":"Start")}}</button><br><br>
 			<span v-html="tmp[layer].challenges[data].challengeDescription"></span><br>