Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2025-01-04 12:27:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Final fix for 1.6

Browse Source
This commit is contained in:
Olivier Gagnon 2022-03-29 15:33:22 -04:00
parent ac34829649
commit 05cf27d3d0
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/ui/numeralFormat.ts
View File

@ -16,7 +16,6 @@ import "numeral/locales/ru";
import { Settings } from "../Settings/Settings"; import { Settings } from "../Settings/Settings";
const extraFormats = [1e15, 1e18, 1e21, 1e24, 1e27, 1e30]; const extraFormats = [1e15, 1e18, 1e21, 1e24, 1e27, 1e30];
const extraNotations = ["q", "Q", "s", "S", "o", "n"]; const extraNotations = ["q", "Q", "s", "S", "o", "n"];
const gigaMultiplier = { standard: 1e9, iec60027_2: 2 ** 30 }; const gigaMultiplier = { standard: 1e9, iec60027_2: 2 ** 30 };
@ -52,7 +51,7 @@ class NumeralFormatter {
} }
formatBigNumber(n: number): string { formatBigNumber(n: number): string {
return this.format(n, "0.[000]a"); return this.format(n, "0.000a");
} }
// TODO: leverage numeral.js to do it. This function also implies you can // TODO: leverage numeral.js to do it. This function also implies you can
@ -67,10 +66,10 @@ class NumeralFormatter {
} }
} }
if (nAbs < 1000) { if (nAbs < 1000) {
return this.format(n, "0.[" + "0".repeat(decimalPlaces) + "]"); return this.format(n, "0." + "0".repeat(decimalPlaces));
} }
const str = this.format(n, "0.[" + "0".repeat(decimalPlaces) + "]a"); const str = this.format(n, "0." + "0".repeat(decimalPlaces) + "a");
if (str === "NaNt") return this.format(n, "0.[" + " ".repeat(decimalPlaces) + "]e+0"); if (str === "NaNt") return this.format(n, "0." + " ".repeat(decimalPlaces) + "e+0");
return str; return str;
} }
@ -113,8 +112,7 @@ class NumeralFormatter {
} }
formatRAM(n: number): string { formatRAM(n: number): string {
if(Settings.UseIEC60027_2) if (Settings.UseIEC60027_2) {
{
return this.format(n * gigaMultiplier.iec60027_2, "0.00ib"); return this.format(n * gigaMultiplier.iec60027_2, "0.00ib");
} }
return this.format(n * gigaMultiplier.standard, "0.00b"); return this.format(n * gigaMultiplier.standard, "0.00b");
@ -189,7 +187,7 @@ class NumeralFormatter {
} }
parseCustomLargeNumber(str: string): number { parseCustomLargeNumber(str: string): number {
const numericRegExp = new RegExp('^(\-?\\d+\\.?\\d*)([' + extraNotations.join("") + ']?)$'); const numericRegExp = new RegExp("^(-?\\d+\\.?\\d*)([" + extraNotations.join("") + "]?)$");
const match = str.match(numericRegExp); const match = str.match(numericRegExp);
if (match == null) { if (match == null) {
return NaN; return NaN;
@ -203,14 +201,17 @@ class NumeralFormatter {
} }
largestAbsoluteNumber(n1: number, n2 = 0, n3 = 0): number { largestAbsoluteNumber(n1: number, n2 = 0, n3 = 0): number {
if(isNaN(n1)) n1=0; if (isNaN(n1)) n1 = 0;
if(isNaN(n2)) n2=0; if (isNaN(n2)) n2 = 0;
if(isNaN(n3)) n3=0; if (isNaN(n3)) n3 = 0;
const largestAbsolute = Math.max(Math.abs(n1), Math.abs(n2), Math.abs(n3)); const largestAbsolute = Math.max(Math.abs(n1), Math.abs(n2), Math.abs(n3));
switch(largestAbsolute) { switch (largestAbsolute) {
case Math.abs(n1): return n1; case Math.abs(n1):
case Math.abs(n2): return n2; return n1;
case Math.abs(n3): return n3; case Math.abs(n2):
return n2;
case Math.abs(n3):
return n3;
} }
return 0; return 0;
} }
@ -222,21 +223,29 @@ class NumeralFormatter {
const parsed = parseFloat(s); const parsed = parseFloat(s);
const selfParsed = this.parseCustomLargeNumber(s); const selfParsed = this.parseCustomLargeNumber(s);
// Check for one or more NaN values // Check for one or more NaN values
if (isNaN(parsed) && numeralValue === null && isNaN(selfParsed)) { // 3x NaN if (isNaN(parsed) && numeralValue === null && isNaN(selfParsed)) {
// 3x NaN
return NaN; return NaN;
} else if (isNaN(parsed) && isNaN(selfParsed)) { // 2x NaN } else if (isNaN(parsed) && isNaN(selfParsed)) {
// 2x NaN
return numeralValue; return numeralValue;
} else if (numeralValue === null && isNaN(selfParsed)) { // 2x NaN } else if (numeralValue === null && isNaN(selfParsed)) {
// 2x NaN
return parsed; return parsed;
} else if (isNaN(parsed) && numeralValue === null) { // 2x NaN } else if (isNaN(parsed) && numeralValue === null) {
// 2x NaN
return selfParsed; return selfParsed;
} else if (isNaN(parsed)) { // 1x NaN } else if (isNaN(parsed)) {
// 1x NaN
return this.largestAbsoluteNumber(numeralValue, selfParsed); return this.largestAbsoluteNumber(numeralValue, selfParsed);
} else if (numeralValue === null) { // 1x NaN } else if (numeralValue === null) {
// 1x NaN
return this.largestAbsoluteNumber(parsed, selfParsed); return this.largestAbsoluteNumber(parsed, selfParsed);
} else if (isNaN(selfParsed)) { // 1x NaN } else if (isNaN(selfParsed)) {
// 1x NaN
return this.largestAbsoluteNumber(numeralValue, parsed); return this.largestAbsoluteNumber(numeralValue, parsed);
} else { // no NaN } else {
// no NaN
return this.largestAbsoluteNumber(numeralValue, parsed, selfParsed); return this.largestAbsoluteNumber(numeralValue, parsed, selfParsed);
} }
} }