Skip to content

Commit e292224

Browse files
committed
fixed
1 parent b73bef9 commit e292224

File tree

3 files changed

+21
-23
lines changed

3 files changed

+21
-23
lines changed

MeTMT/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
<script src="js/technical/temp.js"></script>
2424
<script src="js/technical/displays.js"></script>
25+
26+
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@antimatter-dimensions/[email protected]"></script>
2527

2628
<script src="js/game.js"></script>
2729
<script src="js/utils.js"></script>

MeTMT/js/utils/NumberFormating.js

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -131,35 +131,31 @@ function invertOOM(x){
131131
}
132132

133133
function standardFormat(decimal) {
134-
let formattingSymbols = [
134+
first = ["", "k", "M", "B", "T", "Q", "q", "S", "s", "O", "N"]
135+
symbols = [
135136
[
136-
"", "k", "M", "B", "T", "Qu", "Qi", "Sx", "Sp", "O", "N",
137-
"Dc", "UDc", "DDc", "TDc", "QDc", "QiDc", "SDc", "SpDc", "ODc", "NDc",
138-
"Vg", "UVg", "DVg", "TVg", "QVg", "QiVg", "SVg", "SpVg", "OVg", "NVg",
139-
"Tg", "UTg", "DTg", "TTg", "QTg", "QiTg", "STg", "SpTg", "OTg", "NTg",
140-
"Qg", "UQg", "DQg", "TQg", "QQg", "QiQg", "SQg", "SpQg", "OQg", "NQg",
141-
"qg", "Uqg", "Dqg", "Tqg", "Qqg", "Qiqg", "Sqg", "Spqg", "Oqg", "Nqg",
142-
"Sg", "USg", "DSg", "TSg", "QSg", "QiSg", "SSg", "SpSg", "OSg", "NSg",
143-
"sg", "Usg", "Dsg", "Tsg", "Qsg", "Qisg", "Ssg", "Spsg", "Osg", "Nsg",
144-
"Og", "UOg", "DOg", "TOg", "QOg", "QiOg", "SOg", "SpOg", "OOg", "NOg",
145-
"Ng", "UNg", "DNg", "TNg", "QNg", "QiNg", "SNg", "SpNg", "ONg", "NNg"
137+
"", "U", "D", "T", "Q", "q", "S", "s", "O", "N"
146138
],
147139
[
148-
"", "C", "D", "Tc", "Qc", "Qic", "Sc", "Spc", "Oc", "Nc"
140+
"", "Dc", "Vg", "Tg", "Qg", "qg", "Sg", "sg", "Og", "Ng"
149141
],
150142
[
151-
"", "", "", "", "", "", "", "", "", ""
152-
]
143+
"", "C", "D", "Tc", "Qc", "qc", "Sc", "sc", "Oc", "Nc"
144+
],
145+
[
146+
"", "Mi", "D-Mi", "T-Mi", "Q-Mi", "q-Mi", "S-Mi", "s-Mi", "O-Mi", "N-Mi"
147+
],
153148
]
154149
decimal = new Decimal(decimal)
155-
e3 = decimal.log10().div(3).floor()
156-
if (decimal.gte(1e33)) {
157-
formattingSymbols[0][1] = "U"
158-
formattingSymbols[0][2] = "D"
159-
formattingSymbols[0][3] = "T"
160-
}
161-
if (formattingSymbols[2][e3.div(1000).floor()] == undefined ) return defaultFormat(decimal)
162-
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)]
150+
if (decimal.eq(0)) return "0"
151+
e = decimal.log10().div(3).floor().clampMin(0)
152+
prefix = ""
153+
prefix += symbols[3][e.div(1000).floor().mod(10)]
154+
prefix += symbols[0][e.sub(1).mod(10)]
155+
prefix += symbols[1][e.div(10).floor().mod(10)]
156+
prefix += symbols[2][e.div(100).floor().mod(10)]
157+
if (first[e] != undefined) prefix = first[e]
158+
return defaultFormat(decimal.div(new Decimal(10).pow(e.times(3)))) + prefix
163159
}
164160

165161
setInterval(function() {

MeTMT/js/utils/options.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function changeFormat() {
7676
options.formatting = "blind";
7777
break;
7878
case "blind":
79-
options.formatting = "default";
79+
options.formatting = "standard";
8080
break;
8181
case "standard":
8282
options.formatting = "default";

0 commit comments

Comments
 (0)