UI: General devmenu followup changes (#885)

src/DevMenu/ui/General.tsx

@@ -8,14 +8,16 @@ import {
   Select,
   SelectChangeEvent,
   TextField,
-  Tooltip,
   Typography,
 } from "@mui/material";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 
 import { Player } from "@player";
 import { FactionName } from "@enums";
+import { useRerender } from "../../ui/React/hooks";
 import { Money } from "../../ui/React/Money";
+import { NumberInput } from "../../ui/React/NumberInput";
+import { Hashes } from "../../ui/React/Hashes";
 import { Router } from "../../ui/GameRoot";
 import { Page } from "../../ui/Router";
 import { Bladeburner } from "../../Bladeburner/Bladeburner";
@@ -23,30 +25,34 @@ import { GangConstants } from "../../Gang/data/Constants";
 import { checkForMessagesToSend } from "../../Message/MessageHelpers";
 import { ThemeEvents } from "../../Themes/ui/Theme";
 import { getEnumHelper } from "../../utils/EnumHelper";
+import { formatRam } from "../../ui/formatNumber";
 
 export function General(): React.ReactElement {
+  const rerender = useRerender(400);
   const [error, setError] = useState(false);
   const [corporationName, setCorporationName] = useState("");
   const [gangFaction, setGangFaction] = useState(FactionName.SlumSnakes);
   const [devMoney, setDevMoney] = useState(0);
   const [hash, setHash] = useState(Player.hashManager.hashes);
-  const [homeRam, setHomeRam] = useState(Player.getHomeComputer().maxRam);
 
   // Money functions
-  const moneyValues = [1e6, 1e9, 1e12, 1e15, Infinity];
   const addCustomMoney = () => !Number.isNaN(devMoney) && Player.gainMoney(devMoney, "other");
-  const addMoney = (n: number) => () => Player.gainMoney(n, "other");
+  const addMoney = (n: number) => () => n && Player.gainMoney(n, "other");
-  const setMoney = (n: number) => () => (Player.money = Number(n));
+  const setMoney = (n: number) => () => {
-  const addHashes = () => (Player.hashManager.hashes += hash);
+    if (!isNaN(n)) Player.money = n;
+  };
+  const addHashes = () => hash && Player.hashManager.storeHashes(hash);
+
+  const homeComputer = Player.getHomeComputer();
 
   // Ram functions
   const doubleRam = () => {
-    Player.getHomeComputer().maxRam *= 2;
+    homeComputer.maxRam *= 2;
-    setHomeRam(homeRam * 2);
+    rerender();
   };
-  const setRam = (gb: number) => () => {
+  const ramSetter = (gb: number) => () => {
-    Player.getHomeComputer().maxRam = gb;
+    homeComputer.maxRam = gb;
-    setHomeRam(gb);
+    rerender();
   };
 
   // Node-clearing functions
@@ -103,17 +109,8 @@ export function General(): React.ReactElement {
     if (error) throw new ReferenceError("Manually thrown error");
   }, [error]);
 
-  // Component css
+  const moneyValues = [1e6, 1e9, 1e12, 1e15, Infinity];
-  const smallButtonStyle = { width: "12rem" };
+  const ramValues = [8, 64, 1024, 1048576, 1073741824];
-  const largeButtonStyle = { width: "20rem" };
-  const noArrowsNumberField = {
-    "& input::-webkit-outer-spin-button, & input::-webkit-inner-spin-button": {
-      display: "none",
-    },
-    "& input[type=number]": {
-      MozAppearance: "textfield",
-    },
-  };
 
   return (
     <Accordion TransitionProps={{ unmountOnExit: true }}>
@@ -121,67 +118,50 @@ export function General(): React.ReactElement {
         <Typography>General</Typography>
       </AccordionSummary>
       <AccordionDetails>
+        <Typography>
+          Money (current: <Money money={Player.money} />)
+        </Typography>
         {moneyValues.map((value) => (
           <Button key={`add money ${value}`} onClick={addMoney(value)}>
-            <pre>
+            +&nbsp;
-              + <Money money={value} />
+            <Money money={value} />
-            </pre>
           </Button>
         ))}
         <br />
-        <Typography>Add Money</Typography>
+        <NumberInput placeholder={"$$$"} onChange={setDevMoney} />
-        <TextField
+        <Button onClick={addCustomMoney}>Give Money</Button>
-          placeholder={"$$$"}
+        <Button onClick={setMoney(0)}>Clear Money</Button>
-          type="number"
+        {Player.hashManager.capacity > 0 && (
-          onChange={(x) => setDevMoney(parseFloat(x.target.value))}
+          <>
-          sx={noArrowsNumberField}
+            <br />
-        />
+            <br />
-        <Button style={smallButtonStyle} onClick={addCustomMoney}>
+            <Typography>
-          Give Money
+              Hashes (current: <Hashes hashes={Player.hashManager.hashes} /> /&nbsp;
-        </Button>
+              <Hashes hashes={Player.hashManager.capacity} />)
-        <Button
+            </Typography>
-          style={smallButtonStyle}
+            <NumberInput disabled={!Player.hashManager} placeholder={"hashes"} onChange={setHash} />
-          onClick={setMoney(0)}
+            <Button disabled={!Player.hashManager} onClick={addHashes}>
-          title="This sets your money to $0, this means the money you had will just vanish without being accounted for where it went and may offset some metrics."
+              Give Hashes
-        >
+            </Button>
-          Clear Money
+            <Button disabled={!Player.hashManager} onClick={() => (Player.hashManager.hashes = 0)}>
-        </Button>
+              Clear Hashes
+            </Button>
+          </>
+        )}
         <br />
-        <TextField
-          disabled={!Player.hashManager}
-          type="number"
-          placeholder={"add Hacknet hashes"}
-          onChange={(x) => setHash(parseFloat(x.target.value))}
-          sx={noArrowsNumberField}
-        />
-        <Button disabled={!Player.hashManager} style={smallButtonStyle} onClick={addHashes}>
-          Give Hashes
-        </Button>
-        <Button disabled={!Player.hashManager} style={smallButtonStyle} onClick={() => (Player.hashManager.hashes = 0)}>
-          Clear Hashes
-        </Button>
         <br />
-        <Tooltip placement="top-start" title={`Current RAM: ${Player.getHomeComputer().maxRam} GB`}>
+        <Typography>Max Home RAM (current: {formatRam(homeComputer.maxRam)})</Typography>
-          <Typography>Set Home Server RAM</Typography>
+        {ramValues.map((gb) => (
-        </Tooltip>
+          <Button key={gb} onClick={ramSetter(gb)}>
-        <Tooltip placement="top" title="Starting RAM">
+            {formatRam(gb)}
-          <Button onClick={setRam(8)}>8 GB</Button>
+          </Button>
-        </Tooltip>
+        ))}
-        <Button onClick={setRam(64)}>64 GB</Button>
+        <Button onClick={doubleRam}>RAM *= 2</Button>
-        <Button onClick={setRam(1024)}>1 TB</Button>
+        <br />
-        <Button onClick={setRam(1048576)}>1.05 PB</Button>
-        <Tooltip placement="top" title="Max RAM sold by Alpha Ent.">
-          <Button onClick={setRam(1073741824)}>1.07 EB</Button>
-        </Tooltip>
-        <Tooltip placement="top" title="Double Home server's current RAM">
-          <Button onClick={doubleRam}>RAM *= 2</Button>
-        </Tooltip>
         <br />
         <Typography>Corporation:</Typography>
         {Player.corporation ? (
-          <Button style={smallButtonStyle} onClick={destroyCorporation}>
+          <Button onClick={destroyCorporation}>Destroy Corporation</Button>
-            Destroy Corporation
-          </Button>
         ) : (
           <>
             <TextField
@@ -189,18 +169,14 @@ export function General(): React.ReactElement {
               value={corporationName}
               onChange={(x) => setCorporationName(x.target.value)}
             />
-            <br />
+            <Button onClick={createCorporation}>Create Corporation</Button>
-            <Button style={smallButtonStyle} onClick={createCorporation}>
-              Create Corporation
-            </Button>
           </>
         )}
         <br />
-        <Typography>Gang Faction:</Typography>
+        <br />
+        <Typography>Gang:</Typography>
         {Player.gang ? (
-          <Button style={smallButtonStyle} onClick={stopGang}>
+          <Button onClick={stopGang}>Leave Gang</Button>
-            Leave Gang
-          </Button>
         ) : (
           <>
             <Select value={gangFaction} onChange={setGangFactionDropdown}>
@@ -210,45 +186,28 @@ export function General(): React.ReactElement {
                 </MenuItem>
               ))}
             </Select>
-            <br />
+            <Button onClick={startGang}>Create Gang</Button>
-            <Button style={smallButtonStyle} onClick={startGang}>
-              Create Gang
-            </Button>
           </>
         )}
         <br />
+        <br />
         <Typography>Bladeburner:</Typography>
         {Player.bladeburner ? (
-          <Button style={smallButtonStyle} onClick={leaveBladeburner}>
+          <Button onClick={leaveBladeburner}>Leave BladeBurner</Button>
-            Leave BladeBurner
-          </Button>
         ) : (
-          <Button style={smallButtonStyle} onClick={joinBladeburner}>
+          <Button onClick={joinBladeburner}>Join BladeBurner</Button>
-            Join BladeBurner
-          </Button>
         )}
         <br />
-        <Typography>General:</Typography>
-        <Button style={largeButtonStyle} onClick={quickB1tFlum3}>
-          Quick b1t_flum3.exe
-        </Button>
-        <Button style={largeButtonStyle} onClick={b1tflum3}>
-          Run b1t_flum3.exe
-        </Button>
         <br />
-        <Button style={largeButtonStyle} onClick={quickHackW0r1dD43m0n}>
+        <Typography>Misc:</Typography>
-          Quick w0rld_d34m0n
+        <Button onClick={quickB1tFlum3}>Quick b1t_flum3.exe</Button>
-        </Button>
+        <Button onClick={b1tflum3}>Run b1t_flum3.exe</Button>
-        <Button style={largeButtonStyle} onClick={hackW0r1dD43m0n}>
-          Hack w0rld_d34m0n
-        </Button>
         <br />
-        <Button style={largeButtonStyle} onClick={() => setError(true)}>
+        <Button onClick={quickHackW0r1dD43m0n}>Quick w0rld_d34m0n</Button>
-          Throw Error
+        <Button onClick={hackW0r1dD43m0n}>Hack w0rld_d34m0n</Button>
-        </Button>
+        <br />
-        <Button style={largeButtonStyle} onClick={checkMessages}>
+        <Button onClick={() => setError(true)}>Throw Error</Button>
-          Check Messages
+        <Button onClick={checkMessages}>Check Messages</Button>
-        </Button>
       </AccordionDetails>
     </Accordion>
   );