From e292224c2d6e88ec086d9fdb37c9393bf3218180 Mon Sep 17 00:00:00 2001
From: wktr <94459237+WiktorProj@users.noreply.github.com>
Date: Sun, 8 Sep 2024 17:00:43 +0200
Subject: [PATCH] fixed

---
 MeTMT/index.html                  |  2 ++
 MeTMT/js/utils/NumberFormating.js | 40 ++++++++++++++-----------------
 MeTMT/js/utils/options.js         |  2 +-
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/MeTMT/index.html b/MeTMT/index.html
index 50509e7..ccda4ea 100644
--- a/MeTMT/index.html
+++ b/MeTMT/index.html
@@ -22,6 +22,8 @@
 
 	<script src="js/technical/temp.js"></script>
 	<script src="js/technical/displays.js"></script>
+
+	<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@antimatter-dimensions/notations@1.6.0"></script>
 	
 	<script src="js/game.js"></script>
 	<script src="js/utils.js"></script>
diff --git a/MeTMT/js/utils/NumberFormating.js b/MeTMT/js/utils/NumberFormating.js
index b8ec918..412bbc7 100644
--- a/MeTMT/js/utils/NumberFormating.js
+++ b/MeTMT/js/utils/NumberFormating.js
@@ -131,35 +131,31 @@ function invertOOM(x){
 }
 
 function standardFormat(decimal) {
-    let formattingSymbols = [
+    first = ["", "k", "M", "B", "T", "Q", "q", "S", "s", "O", "N"]
+    symbols = [
         [
-            "", "k", "M", "B", "T", "Qu", "Qi", "Sx", "Sp", "O", "N", 
-            "Dc", "UDc", "DDc", "TDc", "QDc", "QiDc", "SDc", "SpDc", "ODc", "NDc",
-            "Vg", "UVg", "DVg", "TVg", "QVg", "QiVg", "SVg", "SpVg", "OVg", "NVg",
-            "Tg", "UTg", "DTg", "TTg", "QTg", "QiTg", "STg", "SpTg", "OTg", "NTg",
-            "Qg", "UQg", "DQg", "TQg", "QQg", "QiQg", "SQg", "SpQg", "OQg", "NQg",
-            "qg", "Uqg", "Dqg", "Tqg", "Qqg", "Qiqg", "Sqg", "Spqg", "Oqg", "Nqg",
-            "Sg", "USg", "DSg", "TSg", "QSg", "QiSg", "SSg", "SpSg", "OSg", "NSg",
-            "sg", "Usg", "Dsg", "Tsg", "Qsg", "Qisg", "Ssg", "Spsg", "Osg", "Nsg",
-            "Og", "UOg", "DOg", "TOg", "QOg", "QiOg", "SOg", "SpOg", "OOg", "NOg",
-            "Ng", "UNg", "DNg", "TNg", "QNg", "QiNg", "SNg", "SpNg", "ONg", "NNg"
+            "", "U", "D", "T", "Q", "q", "S", "s", "O", "N"
         ],
         [
-            "", "C", "D", "Tc", "Qc", "Qic", "Sc", "Spc", "Oc", "Nc"
+            "", "Dc", "Vg", "Tg", "Qg", "qg", "Sg", "sg", "Og", "Ng"
         ],
         [
-            "", "", "", "", "", "", "", "", "", ""
-        ]
+            "", "C", "D", "Tc", "Qc", "qc", "Sc", "sc", "Oc", "Nc"
+        ],
+        [
+            "", "Mi", "D-Mi", "T-Mi", "Q-Mi", "q-Mi", "S-Mi", "s-Mi", "O-Mi", "N-Mi"
+        ],
     ]
     decimal = new Decimal(decimal)
-    e3 = decimal.log10().div(3).floor()
-    if (decimal.gte(1e33)) { 
-        formattingSymbols[0][1] = "U"
-        formattingSymbols[0][2] = "D"
-        formattingSymbols[0][3] = "T"
-    }
-    if (formattingSymbols[2][e3.div(1000).floor()] == undefined ) return defaultFormat(decimal)
-    return defaultFormat(decimal.div(new Decimal(1000).pow(e3)), e3.gt(0) ? 2 : 1) + formattingSymbols[2][e3.div(1000).floor()] + formattingSymbols[0][e3.mod(101)] + formattingSymbols[1][e3.div(101).floor().mod(11)]
+    if (decimal.eq(0)) return "0"
+    e = decimal.log10().div(3).floor().clampMin(0)
+    prefix = ""
+    prefix += symbols[3][e.div(1000).floor().mod(10)]
+    prefix += symbols[0][e.sub(1).mod(10)]
+    prefix += symbols[1][e.div(10).floor().mod(10)]
+    prefix += symbols[2][e.div(100).floor().mod(10)]
+    if (first[e] != undefined) prefix = first[e]
+    return defaultFormat(decimal.div(new Decimal(10).pow(e.times(3)))) + prefix
 }
 
 setInterval(function() {
diff --git a/MeTMT/js/utils/options.js b/MeTMT/js/utils/options.js
index 27eb8d7..3d0a1e6 100644
--- a/MeTMT/js/utils/options.js
+++ b/MeTMT/js/utils/options.js
@@ -76,7 +76,7 @@ function changeFormat() {
 			options.formatting = "blind";
 			break;
 		case "blind":
-			options.formatting = "default";
+			options.formatting = "standard";
 			break;
 		case "standard":
 			options.formatting = "default";