From 247ad64c58a6226e1905777c6eed7aacb81ff97e Mon Sep 17 00:00:00 2001
From: Harley White <acamaeda@gmail.com>
Date: Wed, 2 Jun 2021 16:59:37 -0400
Subject: [PATCH] Challenge fixes

---
 changelog.md     | 3 +++
 js/components.js | 2 +-
 js/utils.js      | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index 9ea1375..edeedc6 100644
--- a/changelog.md
+++ b/changelog.md
@@ -5,6 +5,9 @@
 - The prestige/sec display now shows decimals.
 - resetsNothing now works immediately on a reset that enables it.
 - Added onComplete for milestones.
+
+- Fixed challenges with no currencyDisplayName using "points" instead of the mod's pointsName.
+- inChallenge no longer can return undefined.
 - Fixed certain things skipping negative rows (now they are treated like non-numeric rows, and don't appear in the tree still).
 - Things are 0.2% more optimized.
 
diff --git a/js/components.js b/js/components.js
index bc1ca2d..d9eb8dc 100644
--- a/js/components.js
+++ b/js/components.js
@@ -144,7 +144,7 @@ function loadVue() {
 			<span v-if="layers[layer].challenges[data].fullDisplay" v-html="run(layers[layer].challenges[data].fullDisplay, layers[layer].challenges[data])"></span>
 			<span v-else>
 				<span v-html="tmp[layer].challenges[data].challengeDescription"></span><br>
-				Goal:  <span v-if="tmp[layer].challenges[data].goalDescription" v-html="tmp[layer].challenges[data].goalDescription"></span><span v-else>{{format(tmp[layer].challenges[data].goal)}} {{tmp[layer].challenges[data].currencyDisplayName ? tmp[layer].challenges[data].currencyDisplayName : "points"}}</span><br>
+				Goal:  <span v-if="tmp[layer].challenges[data].goalDescription" v-html="tmp[layer].challenges[data].goalDescription"></span><span v-else>{{format(tmp[layer].challenges[data].goal)}} {{tmp[layer].challenges[data].currencyDisplayName ? tmp[layer].challenges[data].currencyDisplayName : modInfo.pointsName}}</span><br>
 				Reward: <span v-html="tmp[layer].challenges[data].rewardDescription"></span><br>
 				<span v-if="layers[layer].challenges[data].rewardDisplay!==undefined">Currently: <span v-html="(tmp[layer].challenges[data].rewardDisplay) ? (run(layers[layer].challenges[data].rewardDisplay, layers[layer].challenges[data])) : format(tmp[layer].challenges[data].rewardEffect)"></span></span>
 			</span>
diff --git a/js/utils.js b/js/utils.js
index 9a348c3..a5015f5 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -131,7 +131,8 @@ function inChallenge(layer, id) {
 	if (challenge == id) return true
 
 	if (layers[layer].challenges[challenge].countsAs)
-		return tmp[layer].challenges[challenge].countsAs.includes(id)
+		return tmp[layer].challenges[challenge].countsAs.includes(id) || false
+	return false
 }
 
 // ************ Misc ************