From 22e12c06b5d6babe2ac2c89dcfe1b8708503c13a Mon Sep 17 00:00:00 2001
From: Harley White <acamaeda@gmail.com>
Date: Thu, 3 Jun 2021 00:01:31 -0400
Subject: [PATCH] Improved marks

---
 changelog.md                     | 5 +++++
 js/components.js                 | 2 +-
 js/technical/systemComponents.js | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/changelog.md b/changelog.md
index f059f25..1c9c130 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,17 +3,22 @@
 ### v2.5.12 - 6/2/21
 - Fixed issues with NaN checking. Saves should never break now unless something really unusual happens.
 - Fixed demo.html
+- Fixed branches not working on the right tab.
+- Fixed background color not working on the left tab.
+- Fixed branches not updating when tree tab is not shown.
 - You can now use "this" in tabFormat!
 - Added onComplete for milestones.
 - Added addBuyables.
 - The prestige/sec display now shows decimals.
 - resetsNothing now works immediately on a reset that enables it.
+- Made the star on maxed challenges larger.
 
 - 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.
 - Fixed problems in the documentation.
+- Added more customization to the "mark" component (but not an easy way to access it)
 
 ### v2.5.11.1 - 5/27/21
 - Fixed issues caused when the tree tab is disabled.
diff --git a/js/components.js b/js/components.js
index ab23ccd..9e1259d 100644
--- a/js/components.js
+++ b/js/components.js
@@ -148,7 +148,7 @@ function loadVue() {
 				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>
-			<node-mark :layer='layer' :data='tmp[layer].challenges[data].marked' :offset="10"></node-mark></span>
+			<node-mark :layer='layer' :data='tmp[layer].challenges[data].marked' :offset="20" :scale="1.5"></node-mark></span>
 
 		</div>
 		`
diff --git a/js/technical/systemComponents.js b/js/technical/systemComponents.js
index 3f6642c..9fc4f18 100644
--- a/js/technical/systemComponents.js
+++ b/js/technical/systemComponents.js
@@ -187,10 +187,10 @@ var systemComponents = {
 	},
 
 	'node-mark': {
-		props: ['layer', 'data'],
+		props: ['layer', 'data', 'offset', 'scale'],
 		template: `<div v-if='data'>
-			<div v-if='data === true' class='star' style='position: absolute; left: -10px; top: -10px;'></div>
-			<img v-else class='mark' style='position: absolute; left: -25px; top: -10px;' v-bind:src="data"></div>
+			<div v-if='data === true' class='star' v-bind:style='{position: "absolute", left: (offset-10) + "px", top: (offset-10) + "px", transform: "scale( " + scale + ", " + scale + ")"}'></div>
+			<img v-else class='mark' v-bind:style='{position: "absolute", left: (offset-10) + "px", top: (offset-10) + "px", transform: "scale( " + scale + ", " + scale + ")"}' v-bind:src="data"></div>
 		</div>
 		`
 	},