From 8d0be453f2547f44cf2e978535ae1bfb81251279 Mon Sep 17 00:00:00 2001 From: EmeraldBlock <69981203+EmeraldBlock@users.noreply.github.com> Date: Sun, 27 Sep 2020 21:06:18 -0500 Subject: [PATCH 1/3] Change delivered text font size Decreased font size of delivered shapes text to fit it within hub body --- src/js/game/systems/hub.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/js/game/systems/hub.js b/src/js/game/systems/hub.js index 2270f941..017d2f15 100644 --- a/src/js/game/systems/hub.js +++ b/src/js/game/systems/hub.js @@ -77,10 +77,8 @@ export class HubSystem extends GameSystemWithFilter { const delivered = this.root.hubGoals.getCurrentGoalDelivered(); const deliveredText = "" + formatBigNumber(delivered); - if (delivered > 9999) { + if (delivered > 999) { context.font = "bold 16px GameFont"; - } else if (delivered > 999) { - context.font = "bold 20px GameFont"; } else { context.font = "bold 25px GameFont"; } From e9dfaf1f18f3fd46569f7a793bbf43ab8939ee6b Mon Sep 17 00:00:00 2001 From: EmeraldBlock <69981203+EmeraldBlock@users.noreply.github.com> Date: Sun, 27 Sep 2020 21:16:16 -0500 Subject: [PATCH 2/3] Change formatBigNumber Modifies function formatBigNumber so that it displays values up to a certain number of significant figures. Also added third "precision" argument, defaults to 3 significant figures --- src/js/core/utils.js | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/js/core/utils.js b/src/js/core/utils.js index a469a7a0..ddab18f2 100644 --- a/src/js/core/utils.js +++ b/src/js/core/utils.js @@ -266,9 +266,10 @@ export function findNiceIntegerValue(num) { * Formats a big number * @param {number} num * @param {string=} separator The decimal separator for numbers like 50.1 (separator='.') + * @param {number=} number of significant figures to include (for values >= 1000) * @returns {string} */ -export function formatBigNumber(num, separator = T.global.decimalSeparator) { +export function formatBigNumber(num, separator = T.global.decimalSeparator, precision = 3) { const sign = num < 0 ? "-" : ""; num = Math.abs(num); @@ -286,23 +287,21 @@ export function formatBigNumber(num, separator = T.global.decimalSeparator) { if (num < 1000) { return sign + "" + num; - } else { - let leadingDigits = num; - let suffix = ""; - for (let suffixIndex = 0; suffixIndex < bigNumberSuffixTranslationKeys.length; ++suffixIndex) { - leadingDigits = leadingDigits / 1000; - suffix = T.global.suffix[bigNumberSuffixTranslationKeys[suffixIndex]]; - if (leadingDigits < 1000) { - break; - } - } - const leadingDigitsRounded = round1Digit(leadingDigits); - const leadingDigitsNoTrailingDecimal = leadingDigitsRounded - .toString() - .replace(".0", "") - .replace(".", separator); - return sign + leadingDigitsNoTrailingDecimal + suffix; } + let leadingDigits = num; + let suffixIndex = 0; + for (; suffixIndex < bigNumberSuffixTranslationKeys.length; ++suffixIndex) { + leadingDigits = leadingDigits / 1000; + if (leadingDigits < 1000) { + break; + } + } + const suffix = T.global.suffix[bigNumberSuffixTranslationKeys[suffixIndex]]; + const leadingDigitsRounded = Number(leadingDigits.toPrecision(precision)); + const leadingDigitsNoTrailingDecimal = leadingDigitsRounded + .toString() + .replace(".", separator); + return sign + leadingDigitsNoTrailingDecimal + suffix; } /** From 75e99e772004d3b2892c553d7e1b869e2b6df8f4 Mon Sep 17 00:00:00 2001 From: EmeraldBlock <69981203+EmeraldBlock@users.noreply.github.com> Date: Sun, 27 Sep 2020 21:34:36 -0500 Subject: [PATCH 3/3] compact a line --- src/js/core/utils.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/js/core/utils.js b/src/js/core/utils.js index ddab18f2..451b84bd 100644 --- a/src/js/core/utils.js +++ b/src/js/core/utils.js @@ -298,9 +298,7 @@ export function formatBigNumber(num, separator = T.global.decimalSeparator, prec } const suffix = T.global.suffix[bigNumberSuffixTranslationKeys[suffixIndex]]; const leadingDigitsRounded = Number(leadingDigits.toPrecision(precision)); - const leadingDigitsNoTrailingDecimal = leadingDigitsRounded - .toString() - .replace(".", separator); + const leadingDigitsNoTrailingDecimal = leadingDigitsRounded.toString().replace(".", separator); return sign + leadingDigitsNoTrailingDecimal + suffix; }