From 8e07cc999d8488e5707ccdcd0045f898957c9e45 Mon Sep 17 00:00:00 2001
From: Olivier Gagnon <oli.gagnon4418@gmail.com>
Date: Mon, 11 Oct 2021 18:14:10 -0400
Subject: [PATCH] change GB to TBPBEB

---
 src/Hacknet/ui/HacknetNodeElem.tsx      | 3 ++-
 src/Hacknet/ui/HacknetServerElem.tsx    | 3 ++-
 src/Locations/ui/RamButton.tsx          | 4 +++-
 src/Locations/ui/TechVendorLocation.tsx | 3 ++-
 src/NetscriptFunctions.ts               | 4 +++-
 src/Terminal/commands/runScript.ts      | 5 +++--
 src/ui/numeralFormat.ts                 | 4 ++++
 7 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/Hacknet/ui/HacknetNodeElem.tsx b/src/Hacknet/ui/HacknetNodeElem.tsx
index e2dd832de..523333fa9 100644
--- a/src/Hacknet/ui/HacknetNodeElem.tsx
+++ b/src/Hacknet/ui/HacknetNodeElem.tsx
@@ -28,6 +28,7 @@ import { TableCell } from "../../ui/React/Table";
 import TableBody from "@mui/material/TableBody";
 import Table from "@mui/material/Table";
 import TableRow from "@mui/material/TableRow";
+import { numeralWrapper } from "../../ui/numeralFormat";
 
 interface IProps {
   node: HacknetNode;
@@ -163,7 +164,7 @@ export function HacknetNodeElem(props: IProps): React.ReactElement {
               <Typography>RAM:</Typography>
             </TableCell>
             <TableCell>
-              <Typography>{node.ram}GB</Typography>
+              <Typography>{numeralWrapper.formatRAM(node.ram)}</Typography>
             </TableCell>
             <TableCell>
               <Button onClick={upgradeRamOnClick}>{upgradeRamContent}</Button>
diff --git a/src/Hacknet/ui/HacknetServerElem.tsx b/src/Hacknet/ui/HacknetServerElem.tsx
index 7aa7453b2..49385b916 100644
--- a/src/Hacknet/ui/HacknetServerElem.tsx
+++ b/src/Hacknet/ui/HacknetServerElem.tsx
@@ -31,6 +31,7 @@ import { TableCell } from "../../ui/React/Table";
 import TableBody from "@mui/material/TableBody";
 import Table from "@mui/material/Table";
 import TableRow from "@mui/material/TableRow";
+import { numeralWrapper } from "../../ui/numeralFormat";
 
 interface IProps {
   node: HacknetServer;
@@ -213,7 +214,7 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
               <Typography>RAM:</Typography>
             </TableCell>
             <TableCell>
-              <Typography>{node.maxRam}GB</Typography>
+              <Typography>{numeralWrapper.formatRAM(node.maxRam)}</Typography>
             </TableCell>
             <TableCell>
               <Button onClick={upgradeRamOnClick}>{upgradeRamContent}</Button>
diff --git a/src/Locations/ui/RamButton.tsx b/src/Locations/ui/RamButton.tsx
index d3c093aa4..2f89f72d7 100644
--- a/src/Locations/ui/RamButton.tsx
+++ b/src/Locations/ui/RamButton.tsx
@@ -8,6 +8,7 @@ import { purchaseRamForHomeComputer } from "../../Server/ServerPurchases";
 
 import { Money } from "../../ui/React/Money";
 import { MathComponent } from "mathjax-react";
+import { numeralWrapper } from "../../ui/numeralFormat";
 
 type IProps = {
   p: IPlayer;
@@ -31,7 +32,8 @@ export function RamButton(props: IProps): React.ReactElement {
     <Tooltip title={<MathComponent tex={String.raw`\large{cost = 3.2 \times 10^3 \times 1.58^{log_2{(ram)}}}`} />}>
       <span>
         <Button disabled={!props.p.canAfford(cost)} onClick={buy}>
-          Upgrade 'home' RAM ({homeComputer.maxRam}GB -&gt;&nbsp;{homeComputer.maxRam * 2}GB) -&nbsp;
+          Upgrade 'home' RAM ({numeralWrapper.formatRAM(homeComputer.maxRam)} -&gt;&nbsp;
+          {numeralWrapper.formatRAM(homeComputer.maxRam * 2)}) -&nbsp;
           <Money money={cost} player={props.p} />
         </Button>
       </span>
diff --git a/src/Locations/ui/TechVendorLocation.tsx b/src/Locations/ui/TechVendorLocation.tsx
index 458c66065..7ce85f4a8 100644
--- a/src/Locations/ui/TechVendorLocation.tsx
+++ b/src/Locations/ui/TechVendorLocation.tsx
@@ -17,6 +17,7 @@ import { getPurchaseServerCost } from "../../Server/ServerPurchases";
 import { Money } from "../../ui/React/Money";
 import { use } from "../../ui/Context";
 import { PurchaseServerModal } from "./PurchaseServerModal";
+import { numeralWrapper } from "../../ui/numeralFormat";
 
 interface IServerProps {
   ram: number;
@@ -30,7 +31,7 @@ function ServerButton(props: IServerProps): React.ReactElement {
   return (
     <>
       <Button onClick={() => setOpen(true)} disabled={!player.canAfford(cost)}>
-        Purchase {props.ram}GB Server&nbsp;-&nbsp;
+        Purchase {numeralWrapper.formatRAM(props.ram)} Server&nbsp;-&nbsp;
         <Money money={cost} player={player} />
       </Button>
       <PurchaseServerModal
diff --git a/src/NetscriptFunctions.ts b/src/NetscriptFunctions.ts
index 4ea504c9e..c06345e03 100644
--- a/src/NetscriptFunctions.ts
+++ b/src/NetscriptFunctions.ts
@@ -3280,7 +3280,9 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
       Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain);
       workerScript.log(
         "upgradeHomeRam",
-        `Purchased additional RAM for home computer! It now has ${homeComputer.maxRam}GB of RAM.`,
+        `Purchased additional RAM for home computer! It now has ${numeralWrapper.formatRAM(
+          homeComputer.maxRam,
+        )} of RAM.`,
       );
       return true;
     },
diff --git a/src/Terminal/commands/runScript.ts b/src/Terminal/commands/runScript.ts
index cd3956458..029dc7e68 100644
--- a/src/Terminal/commands/runScript.ts
+++ b/src/Terminal/commands/runScript.ts
@@ -7,6 +7,7 @@ import { startWorkerScript } from "../../NetscriptWorker";
 import { RunningScript } from "../../Script/RunningScript";
 import { findRunningScript } from "../../Script/ScriptHelpers";
 import * as libarg from "arg";
+import { numeralWrapper } from "../../ui/numeralFormat";
 
 export function runScript(
   terminal: ITerminal,
@@ -64,8 +65,8 @@ export function runScript(
         "This machine does not have enough RAM to run this script with " +
           numThreads +
           " threads. Script requires " +
-          ramUsage +
-          "GB of RAM",
+          numeralWrapper.formatRAM(ramUsage) +
+          " of RAM",
       );
       return;
     }
diff --git a/src/ui/numeralFormat.ts b/src/ui/numeralFormat.ts
index 6e45176ad..7a054cfbb 100644
--- a/src/ui/numeralFormat.ts
+++ b/src/ui/numeralFormat.ts
@@ -106,6 +106,10 @@ class NumeralFormatter {
   }
 
   formatRAM(n: number): string {
+    if (n < 1e3) return this.format(n, "0.00") + "GB";
+    if (n < 1e6) return this.format(n / 1e3, "0.00") + "TB";
+    if (n < 1e9) return this.format(n / 1e6, "0.00") + "PB";
+    if (n < 1e12) return this.format(n / 1e9, "0.00") + "EB";
     return this.format(n, "0.00") + "GB";
   }