From 977643f5f631529fabfb5c2950f33e62a25e21ae Mon Sep 17 00:00:00 2001
From: Acamaeda <acamaeda@gmail.com>
Date: Sun, 29 Nov 2020 00:40:01 -0500
Subject: [PATCH] Added fullDisplay to challenges

---
 changelog.md     |  2 +-
 js/components.js | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/changelog.md b/changelog.md
index 1874bb6..a6c6478 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,7 +4,7 @@
 - Added softcap and softcapPower features (for Normal layers)
 - Offline time limit and default max tick length were fixed (previously the limits were 1000x too large)
 - Added fixOldSaves.
-- You can use HTML in mainDisplay.
+- You can use HTML in main-display.
 - Fixed a number of minor oddities.
 
 ### v2.2.3 - 11/28/20
diff --git a/js/components.js b/js/components.js
index d0f15f0..ad03f75 100644
--- a/js/components.js
+++ b/js/components.js
@@ -122,10 +122,13 @@ function loadVue() {
 		<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 && 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>
-			Goal: {{format(tmp[layer].challenges[data].goal)}} {{tmp[layer].challenges[data].currencyDisplayName ? tmp[layer].challenges[data].currencyDisplayName : "points"}}<br>
-			Reward: <span v-html="tmp[layer].challenges[data].rewardDescription"></span><br>
-			<span v-if="tmp[layer].challenges[data].rewardEffect!==undefined">Currently: <span v-html="(tmp[layer].challenges[data].rewardDisplay) ? (tmp[layer].challenges[data].rewardDisplay) : format(tmp[layer].challenges[data].rewardEffect)"></span></span>
+			<span v-if="tmp[layer].challenges[data].fullDisplay" v-html="tmp[layer].challenges[data].fullDisplay"></span>
+			<span v-else>
+				<span v-html="tmp[layer].challenges[data].challengeDescription"></span><br>
+				Goal: {{format(tmp[layer].challenges[data].goal)}} {{tmp[layer].challenges[data].currencyDisplayName ? tmp[layer].challenges[data].currencyDisplayName : "points"}}<br>
+				Reward: <span v-html="tmp[layer].challenges[data].rewardDescription"></span><br>
+				<span v-if="tmp[layer].challenges[data].rewardEffect!==undefined">Currently: <span v-html="(tmp[layer].challenges[data].rewardDisplay) ? (tmp[layer].challenges[data].rewardDisplay) : format(tmp[layer].challenges[data].rewardEffect)"></span></span>
+			</span>
 		</div>
 		`
 	})