From ed814ef39a3c6130e0aa39d10f474ffad6ee8b05 Mon Sep 17 00:00:00 2001 From: Daniel van Noord Date: Thu, 3 Dec 2020 19:00:27 +0100 Subject: [PATCH] FIx for floating numbers --- CookieMonster.js | 7 +++++-- src/Disp.js | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index 81d4165..463fb1d 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -1224,8 +1224,11 @@ CM.Disp.Beautify = function(num, frac, forced) { } num = num.toString(); var timesTenToPowerThree = Math.trunc(Math.log10(num) / 3) - if (timesTenToPowerThree < 2) { - answer = num; + if (num == "0") { + return num + } + else if (timesTenToPowerThree < 2) { + answer = Math.round(num * 100) / 100; } else if (CM.Config.Scale == 3 && !forced || forced == 3) { // Scientific notation, 123456789 => 1.235E+8 answer = num[0] + '.' diff --git a/src/Disp.js b/src/Disp.js index 756bb74..a38b41a 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -342,8 +342,11 @@ CM.Disp.Beautify = function(num, frac, forced) { } num = num.toString(); var timesTenToPowerThree = Math.trunc(Math.log10(num) / 3) - if (timesTenToPowerThree < 2) { - answer = num; + if (num == "0") { + return num + } + else if (timesTenToPowerThree < 2) { + answer = Math.round(num * 100) / 100; } else if (CM.Config.Scale == 3 && !forced || forced == 3) { // Scientific notation, 123456789 => 1.235E+8 answer = num[0] + '.'