merge v0.56.0

src/Netscript/killWorkerScript.ts

@@ -10,7 +10,6 @@ import { RunningScript } from "../Script/RunningScript";
 import { GetServer } from "../Server/AllServers";
 
 import { compareArrays } from "../utils/helpers/compareArrays";
-import { roundToTwo } from "../utils/helpers/roundToTwo";
 
 export function killWorkerScript(runningScriptObj: RunningScript, hostname: string, rerenderUi?: boolean): boolean;
 export function killWorkerScript(workerScript: WorkerScript): boolean;
@@ -90,15 +89,6 @@ function removeWorkerScript(workerScript: WorkerScript, rerenderUi = true): void
       return;
     }
 
-    // Recalculate ram used on that server
-    server.ramUsed = roundToTwo(server.ramUsed - workerScript.ramUsage);
-    if (server.ramUsed < 0) {
-      console.warn(
-        `Server (${server.hostname}) RAM usage went negative (if it's due to floating pt imprecision, it's okay): ${server.ramUsed}`,
-      );
-      server.ramUsed = 0;
-    }
-
     // Delete the RunningScript object from that server
     for (let i = 0; i < server.runningScripts.length; ++i) {
       const runningScript = server.runningScripts[i];
@@ -108,6 +98,10 @@ function removeWorkerScript(workerScript: WorkerScript, rerenderUi = true): void
       }
     }
 
+    // Recalculate ram used on that server
+    server.ramUsed = 0;
+    for (const rs of server.runningScripts) server.ramUsed += rs.ramUsage * rs.threads;
+
     // Delete script from global pool (workerScripts)
     const res = workerScripts.delete(workerScript.pid);
     if (!res) {