sg

src/Hacknet/HacknetHelpers.tsx

@@ -420,7 +420,6 @@ function processAllHacknetServerEarnings(player: IPlayer, numCycles: number): nu
     if (hserver instanceof Server) throw new Error(`player nodes shoud not be Server`);
     hserver.updateHashRate(player.hacknet_node_money_mult);
     const h = hserver.process(numCycles);
-    hserver.totalHashesGenerated += h;
     hashes += h;
   }
 

src/Hacknet/HacknetNode.ts

@@ -107,7 +107,7 @@ export class HacknetNode implements IHacknetNode {
     this.moneyGainRatePerSecond = calculateMoneyGainRate(this.level, this.ram, this.cores, prodMult);
     if (isNaN(this.moneyGainRatePerSecond)) {
       this.moneyGainRatePerSecond = 0;
-      dialogBoxCreate("Error in calculating Hacknet Node production. Please report to game developer", false);
+      dialogBoxCreate("Error in calculating Hacknet Node production. Please report to game developer");
     }
   }
 

src/Hacknet/HacknetServer.ts

@@ -77,8 +77,12 @@ export class HacknetServer extends BaseServer implements IHacknetNode {
   // Process this Hacknet Server in the game loop. Returns the number of hashes generated
   process(numCycles = 1): number {
     const seconds = (numCycles * CONSTANTS.MilliPerCycle) / 1000;
+    this.onlineTimeSeconds += seconds;
 
-    return this.hashRate * seconds;
+    const hashes = this.hashRate * seconds;
+    this.totalHashesGenerated += hashes;
+
+    return hashes;
   }
 
   upgradeCache(levels: number): void {

src/Hacknet/data/Constants.ts

@@ -18,7 +18,7 @@ export const HacknetNodeConstants: {
   MaxRam: number;
   MaxCores: number;
 } = {
-  MoneyGainPerLevel: 1.6,
+  MoneyGainPerLevel: 1.5,
 
   BaseCost: 1000,
   LevelBaseCost: 1,
@@ -36,11 +36,11 @@ export const HacknetNodeConstants: {
 };
 
 export const PurchaseMultipliers: {
-  [key: string]: number | string | undefined;
+  [key: string]: number | "MAX" | undefined;
   x1: number;
   x5: number;
   x10: number;
-  MAX: string;
+  MAX: "MAX";
 } = {
   x1: 1,
   x5: 5,

src/Hacknet/ui/HacknetNodeElem.tsx

@@ -20,9 +20,18 @@ import { HacknetNode } from "../HacknetNode";
 import { Money } from "../../ui/React/Money";
 import { MoneyRate } from "../../ui/React/MoneyRate";
 
+import Typography from "@mui/material/Typography";
+import Grid from "@mui/material/Grid";
+import Paper from "@mui/material/Paper";
+import Button from "@mui/material/Button";
+import { TableCell } from "../../ui/React/Table";
+import TableBody from "@mui/material/TableBody";
+import Table from "@mui/material/Table";
+import TableRow from "@mui/material/TableRow";
+
 interface IProps {
   node: HacknetNode;
-  purchaseMultiplier: number | string;
+  purchaseMultiplier: number | "MAX";
   rerender: () => void;
   player: IPlayer;
 }
@@ -33,10 +42,9 @@ export function HacknetNodeElem(props: IProps): React.ReactElement {
   const rerender = props.rerender;
 
   // Upgrade Level Button
-  let upgradeLevelContent, upgradeLevelClass;
+  let upgradeLevelContent;
   if (node.level >= HacknetNodeConstants.MaxLevel) {
     upgradeLevelContent = <>MAX LEVEL</>;
-    upgradeLevelClass = "std-button-disabled";
   } else {
     let multiplier = 0;
     if (purchaseMult === "MAX") {
@@ -49,28 +57,23 @@ export function HacknetNodeElem(props: IProps): React.ReactElement {
     const upgradeLevelCost = node.calculateLevelUpgradeCost(multiplier, props.player.hacknet_node_level_cost_mult);
     upgradeLevelContent = (
       <>
-        Upgrade x{multiplier} - <Money money={upgradeLevelCost} player={props.player} />
+        +{multiplier} -&nbsp;
+        <Money money={upgradeLevelCost} player={props.player} />
       </>
     );
-    if (props.player.money.lt(upgradeLevelCost)) {
-      upgradeLevelClass = "std-button-disabled";
-    } else {
-      upgradeLevelClass = "std-button";
-    }
   }
   function upgradeLevelOnClick(): void {
-    let numUpgrades = purchaseMult;
-    if (purchaseMult === "MAX") {
-      numUpgrades = getMaxNumberLevelUpgrades(props.player, node, HacknetNodeConstants.MaxLevel);
-    }
-    purchaseLevelUpgrade(props.player, node, numUpgrades as number);
+    const numUpgrades =
+      purchaseMult === "MAX"
+        ? getMaxNumberLevelUpgrades(props.player, node, HacknetNodeConstants.MaxLevel)
+        : purchaseMult;
+    purchaseLevelUpgrade(props.player, node, numUpgrades);
     rerender();
   }
 
-  let upgradeRamContent, upgradeRamClass;
+  let upgradeRamContent;
   if (node.ram >= HacknetNodeConstants.MaxRam) {
     upgradeRamContent = <>MAX RAM</>;
-    upgradeRamClass = "std-button-disabled";
   } else {
     let multiplier = 0;
     if (purchaseMult === "MAX") {
@@ -83,28 +86,21 @@ export function HacknetNodeElem(props: IProps): React.ReactElement {
     const upgradeRamCost = node.calculateRamUpgradeCost(multiplier, props.player.hacknet_node_ram_cost_mult);
     upgradeRamContent = (
       <>
-        Upgrade x{multiplier} - <Money money={upgradeRamCost} player={props.player} />
+        +{multiplier} -&nbsp;
+        <Money money={upgradeRamCost} player={props.player} />
       </>
     );
-    if (props.player.money.lt(upgradeRamCost)) {
-      upgradeRamClass = "std-button-disabled";
-    } else {
-      upgradeRamClass = "std-button";
-    }
   }
   function upgradeRamOnClick(): void {
-    let numUpgrades = purchaseMult;
-    if (purchaseMult === "MAX") {
-      numUpgrades = getMaxNumberRamUpgrades(props.player, node, HacknetNodeConstants.MaxRam);
-    }
-    purchaseRamUpgrade(props.player, node, numUpgrades as number);
+    const numUpgrades =
+      purchaseMult === "MAX" ? getMaxNumberRamUpgrades(props.player, node, HacknetNodeConstants.MaxRam) : purchaseMult;
+    purchaseRamUpgrade(props.player, node, numUpgrades);
     rerender();
   }
 
-  let upgradeCoresContent, upgradeCoresClass;
+  let upgradeCoresContent;
   if (node.cores >= HacknetNodeConstants.MaxCores) {
     upgradeCoresContent = <>MAX CORES</>;
-    upgradeCoresClass = "std-button-disabled";
   } else {
     let multiplier = 0;
     if (purchaseMult === "MAX") {
@@ -117,59 +113,75 @@ export function HacknetNodeElem(props: IProps): React.ReactElement {
     const upgradeCoreCost = node.calculateCoreUpgradeCost(multiplier, props.player.hacknet_node_core_cost_mult);
     upgradeCoresContent = (
       <>
-        Upgrade x{multiplier} - <Money money={upgradeCoreCost} player={props.player} />
+        +{multiplier} -&nbsp;
+        <Money money={upgradeCoreCost} player={props.player} />
       </>
     );
-    if (props.player.money.lt(upgradeCoreCost)) {
-      upgradeCoresClass = "std-button-disabled";
-    } else {
-      upgradeCoresClass = "std-button";
-    }
   }
   function upgradeCoresOnClick(): void {
-    let numUpgrades = purchaseMult;
-    if (purchaseMult === "MAX") {
-      numUpgrades = getMaxNumberCoreUpgrades(props.player, node, HacknetNodeConstants.MaxCores);
-    }
-    purchaseCoreUpgrade(props.player, node, numUpgrades as number);
+    const numUpgrades =
+      purchaseMult === "MAX"
+        ? getMaxNumberCoreUpgrades(props.player, node, HacknetNodeConstants.MaxCores)
+        : purchaseMult;
+    purchaseCoreUpgrade(props.player, node, numUpgrades);
     rerender();
   }
 
   return (
-    <li className={"hacknet-node"}>
-      <div className={"hacknet-node-container"}>
-        <div className={"row"}>
-          <h1 style={{ fontSize: "1em" }}>{node.name}</h1>
-        </div>
-        <div className={"row"}>
-          <p>Production:</p>
-          <span className={"text money-gold"}>
-            <Money money={node.totalMoneyGenerated} player={props.player} /> (
-            <MoneyRate money={node.moneyGainRatePerSecond} />)
-          </span>
-        </div>
-        <div className={"row"}>
-          <p>Level:</p>
-          <span className={"text upgradable-info"}>{node.level}</span>
-          <button className={upgradeLevelClass} onClick={upgradeLevelOnClick}>
-            {upgradeLevelContent}
-          </button>
-        </div>
-        <div className={"row"}>
-          <p>RAM:</p>
-          <span className={"text upgradable-info"}>{node.ram}GB</span>
-          <button className={upgradeRamClass} onClick={upgradeRamOnClick}>
-            {upgradeRamContent}
-          </button>
-        </div>
-        <div className={"row"}>
-          <p>Cores:</p>
-          <span className={"text upgradable-info"}>{node.cores}</span>
-          <button className={upgradeCoresClass} onClick={upgradeCoresOnClick}>
-            {upgradeCoresContent}
-          </button>
-        </div>
-      </div>
-    </li>
+    <Grid item component={Paper} p={1}>
+      <Table size="small">
+        <TableBody>
+          <TableRow>
+            <TableCell>
+              <Typography>{node.name}</Typography>
+            </TableCell>
+          </TableRow>
+          <TableRow>
+            <TableCell>
+              <Typography>Production:</Typography>
+            </TableCell>
+            <TableCell colSpan={2}>
+              <Typography>
+                <Money money={node.totalMoneyGenerated} player={props.player} /> (
+                <MoneyRate money={node.moneyGainRatePerSecond} />)
+              </Typography>
+            </TableCell>
+          </TableRow>
+          <TableRow>
+            <TableCell>
+              <Typography>Level:</Typography>
+            </TableCell>
+            <TableCell>
+              <Typography>{node.level}</Typography>
+            </TableCell>
+            <TableCell>
+              <Button onClick={upgradeLevelOnClick}>{upgradeLevelContent}</Button>
+            </TableCell>
+          </TableRow>
+          <TableRow>
+            <TableCell>
+              <Typography>RAM:</Typography>
+            </TableCell>
+            <TableCell>
+              <Typography>{node.ram}GB</Typography>
+            </TableCell>
+            <TableCell>
+              <Button onClick={upgradeRamOnClick}>{upgradeRamContent}</Button>
+            </TableCell>
+          </TableRow>
+          <TableRow>
+            <TableCell>
+              <Typography>Cores:</Typography>
+            </TableCell>
+            <TableCell>
+              <Typography>{node.cores}</Typography>
+            </TableCell>
+            <TableCell>
+              <Button onClick={upgradeCoresOnClick}>{upgradeCoresContent}</Button>
+            </TableCell>
+          </TableRow>
+        </TableBody>
+      </Table>
+    </Grid>
   );
 }

src/Hacknet/ui/HacknetRoot.tsx

@@ -38,7 +38,7 @@ export function HacknetRoot(props: IProps): React.ReactElement {
   function rerender(): void {
     setRerender((old) => !old);
   }
-  const [purchaseMultiplier, setPurchaseMultiplier] = useState<number | string>(PurchaseMultipliers.x1);
+  const [purchaseMultiplier, setPurchaseMultiplier] = useState<number | "MAX">(PurchaseMultipliers.x1);
 
   useEffect(() => {
     const id = setInterval(rerender, 200);

src/Hacknet/ui/HacknetServerElem.tsx

@@ -183,7 +183,7 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
             </TableCell>
             <TableCell colSpan={2}>
               <Typography>
-                {Hashes(node.totalHashesGenerated)} ({HashRate(node.hashRate)})
+                <Hashes hashes={node.totalHashesGenerated} /> (<HashRate hashes={node.hashRate} />)
               </Typography>
             </TableCell>
           </TableRow>
@@ -192,7 +192,9 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
               <Typography>Hash Capacity:</Typography>
             </TableCell>
             <TableCell colSpan={2}>
-              <Typography>{Hashes(node.hashCapacity)}</Typography>
+              <Typography>
+                <Hashes hashes={node.hashCapacity} />
+              </Typography>
             </TableCell>
           </TableRow>
           <TableRow>

src/Hacknet/ui/HacknetUpgradeElem.tsx

@@ -60,7 +60,7 @@ export function HacknetUpgradeElem(props: IProps): React.ReactElement {
         <CopyableText value={upg.name} />
       </Typography>
       <Typography>
-        Cost: {Hashes(cost)}, Bought: {level} times
+        Cost: <Hashes hashes={cost} />, Bought: {level} times
       </Typography>
 
       <Typography>{upg.desc}</Typography>

src/Hacknet/ui/HashUpgradeModal.tsx

@@ -6,8 +6,6 @@ import React, { useState, useEffect } from "react";
 import { HashManager } from "../HashManager";
 import { HashUpgrades } from "../HashUpgrades";
 
-import { IPlayer } from "../../PersonObjects/IPlayer";
-
 import { Hashes } from "../../ui/React/Hashes";
 import { HacknetUpgradeElem } from "./HacknetUpgradeElem";
 import { Modal } from "../../ui/React/Modal";
@@ -40,7 +38,9 @@ export function HashUpgradeModal(props: IProps): React.ReactElement {
     <Modal open={props.open} onClose={props.onClose}>
       <>
         <Typography>Spend your hashes on a variety of different upgrades</Typography>
-        <Typography>Hashes: {Hashes(player.hashManager.hashes)}</Typography>
+        <Typography>
+          Hashes: <Hashes hashes={player.hashManager.hashes} />
+        </Typography>
         {Object.keys(HashUpgrades).map((upgName) => {
           const upg = HashUpgrades[upgName];
           return (

src/Hacknet/ui/MultiplierButtons.tsx

@@ -9,14 +9,17 @@ import { PurchaseMultipliers } from "../data/Constants";
 import Button from "@mui/material/Button";
 
 interface IMultiplierProps {
-  className: string;
-  key: string;
+  disabled: boolean;
   onClick: () => void;
   text: string;
 }
 
 function MultiplierButton(props: IMultiplierProps): React.ReactElement {
-  return <Button onClick={props.onClick}>{props.text}</Button>;
+  return (
+    <Button disabled={props.disabled} onClick={props.onClick}>
+      {props.text}
+    </Button>
+  );
 }
 
 interface IProps {
@@ -35,13 +38,12 @@ export function MultiplierButtons(props: IProps): React.ReactElement {
   for (let i = 0; i < mults.length; ++i) {
     const mult = mults[i];
     const btnProps = {
-      className: props.purchaseMultiplier === PurchaseMultipliers[mult] ? "std-button-disabled" : "std-button",
-      key: mult,
+      disabled: props.purchaseMultiplier === PurchaseMultipliers[mult],
       onClick: onClicks[i],
       text: mult,
     };
 
-    buttons.push(<MultiplierButton {...btnProps} />);
+    buttons.push(<MultiplierButton key={mult} {...btnProps} />);
   }
 
   return <>{buttons}</>;

src/Hacknet/ui/PlayerInfo.tsx

@@ -24,7 +24,7 @@ export function PlayerInfo(props: IProps): React.ReactElement {
 
   let prod;
   if (hasServers) {
-    prod = HashRate(props.totalProduction);
+    prod = <HashRate hashes={props.totalProduction} />;
   } else {
     prod = <MoneyRate money={props.totalProduction} />;
   }
@@ -39,7 +39,8 @@ export function PlayerInfo(props: IProps): React.ReactElement {
       {hasServers && (
         <>
           <Typography>
-            Hashes: {Hashes(props.player.hashManager.hashes)} / {Hashes(props.player.hashManager.capacity)}
+            Hashes: <Hashes hashes={props.player.hashManager.hashes} /> /{" "}
+            <Hashes hashes={props.player.hashManager.capacity} />
           </Typography>
         </>
       )}

src/Hacknet/ui/PurchaseButton.tsx

@@ -7,7 +7,6 @@ import { hasHacknetServers, hasMaxNumberHacknetServers } from "../HacknetHelpers
 import { Player } from "../../Player";
 import { Money } from "../../ui/React/Money";
 
-import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 
 interface IProps {
@@ -18,28 +17,30 @@ interface IProps {
 
 export function PurchaseButton(props: IProps): React.ReactElement {
   const cost = props.cost;
-  let className = Player.canAfford(cost) ? "std-button" : "std-button-disabled";
   let text;
-  let style = {};
   if (hasHacknetServers(Player)) {
     if (hasMaxNumberHacknetServers(Player)) {
-      className = "std-button-disabled";
       text = <>Hacknet Server limit reached</>;
-      style = { color: "red" };
     } else {
       text = (
         <>
-          Purchase Hacknet Server - <Money money={cost} player={Player} />
+          Purchase Hacknet Server -&nbsp;
+          <Money money={cost} player={Player} />
         </>
       );
     }
   } else {
     text = (
       <>
-        Purchase Hacknet Node - <Money money={cost} player={Player} />
+        Purchase Hacknet Node -&nbsp;
+        <Money money={cost} player={Player} />
       </>
     );
   }
 
-  return <Button onClick={props.onClick}>{text}</Button>;
+  return (
+    <Button disabled={!Player.canAfford(cost)} onClick={props.onClick}>
+      {text}
+    </Button>
+  );
 }