Merge branch 'dev' of https://github.com/rderfler/bitburner into dev

.github/PULL_REQUEST_TEMPLATE

@@ -9,3 +9,6 @@
 
 - Include how it was tested
 - Include screenshot / gif (if possible)
+
+
+Make sure you run `npm run format` and `npm run lint` before pushing.

.github/workflows/bump-version.yml

@@ -4,28 +4,28 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version (format: x.y.z)'
+        description: "Version (format: x.y.z)"
         required: true
       versionNumber:
-        description: 'Version Number (for saves migration)'
+        description: "Version Number (for saves migration)"
         required: true
       changelog:
-        description: 'Changelog (url that points to RAW markdown)'
+        description: "Changelog (url that points to RAW markdown)"
-        default: ''
+        default: ""
       buildApp:
-        description: 'Include Application Build'
+        description: "Include Application Build"
         type: boolean
-        default: 'true'
+        default: "true"
         required: true
       buildDoc:
-        description: 'Include Documentation Build'
+        description: "Include Documentation Build"
         type: boolean
-        default: 'true'
+        default: "true"
         required: true
       prepareRelease:
-        description: 'Prepare Draft Release'
+        description: "Prepare Draft Release"
         type: boolean
-        default: 'true'
+        default: "true"
         required: true
 
 jobs:
@@ -46,7 +46,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: 16.13.1
-          cache: 'npm'
+          cache: "npm"
       - name: Install NPM dependencies for version updater
         working-directory: ./tools/bump-version
         run: npm ci

.github/workflows/check-for-generated-files.yml

@@ -58,7 +58,7 @@ jobs:
 
       - name: Get Comment Body
         id: get-comment-body
-        if : steps.get-warnings.outputs.has_warnings == 'true'
+        if: steps.get-warnings.outputs.has_warnings == 'true'
         run: |
           cat warnings.txt > comment.txt
           echo "" >> comment.txt
@@ -73,12 +73,12 @@ jobs:
 
           echo ::set-output name=body::$body
       - name: Add github comment on problem
-        if : steps.get-warnings.outputs.has_warnings == 'true'
+        if: steps.get-warnings.outputs.has_warnings == 'true'
         uses: peter-evans/commit-comment@v1
         with:
           body: ${{ steps.get-comment-body.outputs.body }}
       - name: Flag as error
-        if : steps.get-warnings.outputs.has_warnings == 'true'
+        if: steps.get-warnings.outputs.has_warnings == 'true'
         run: |
           COMMIT_WARNINGS=$(cat warnings.txt)
           echo "::warning:: $COMMIT_WARNINGS"

.github/workflows/fetch-changes.yml

@@ -3,10 +3,10 @@ on:
   workflow_dispatch:
     inputs:
       fromCommit:
-        description: 'From Commit SHA (full-length)'
+        description: "From Commit SHA (full-length)"
         required: true
       toCommit:
-        description: 'To Commit SHA (full-length, if omitted will use latest)'
+        description: "To Commit SHA (full-length, if omitted will use latest)"
 
 jobs:
   fetchChangelog:
@@ -17,7 +17,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: 16.13.1
-          cache: 'npm'
+          cache: "npm"
       - name: Install NPM dependencies
         working-directory: ./tools/fetch-changelog
         run: npm ci

doc/BN14.md

@@ -25,8 +25,8 @@ I need equations that test many different aspect of "math culture", it can be ch
 
 All variable purchasing will be scriptable.
 
-
 All equation must have:
+
 - several variables that can be upgraded, at least 1 variable must be strategic in it's upgrading (upgrading too much can cause drop in performance)
 - Some sort of math twist that requires some thinking, like (-2)^c1 alters between positive and negative.
 

doc/CONTRIBUTING.md

@@ -115,7 +115,6 @@ Fork and clone the repo
   - Regularly rebase your branch against `dev` to make sure you have the latest updates pulled.
   - When merging, always merge your branch into `dev`. When releasing a new update, then merge `dev` into `master`
 
-
 ## Running locally.
 
 Install
@@ -131,7 +130,6 @@ Inside the root of the repo run
 After that you can open any browser and navigate to `localhost:8000` and play the game.
 Saving a file will reload the game automatically.
 
-
 ### How to build the electron app
 
 Tested on Node v16.13.1 (LTS) on Windows

doc/FAQ.md

@@ -23,10 +23,11 @@ Yes, just export the save file from the options menu & import it in the other pl
 ## Game is stuck after running scripts!
 
 You may have created an infinite loop with no sleep. You'll have to restart the game by killing all scripts.
-* On Browser: Stick `?noScript` at the end of the URL
+
-* On Steam:
+- On Browser: Stick `?noScript` at the end of the URL
-  * In the menu, "Reloads" -> "Reload & Kill All Scripts".
+- On Steam:
-  * If this does not work, when launching the game, use the kill all script options.
+  - In the menu, "Reloads" -> "Reload & Kill All Scripts".
+  - If this does not work, when launching the game, use the kill all script options.
 
 ---
 
@@ -51,11 +52,13 @@ You can navigate to the game files by right-clicking the game in your library an
 ## Steam: Game won't launch
 
 ### **On Windows**
+
 If the game is installed on a network drive, it will fail to start due to a [limitation in Chromium](https://github.com/electron/electron/issues/27356).
 
 If you cannot move the game to another drive, you'll have to add the `--no-sandbox` launch option. In your Steam Library, Right click the game and hit "Properties". You'll see the launch option section in the "General" window.
 
 ### **On Linux**
+
 The game is built natively, do not use Proton unless native does not work.
 
 When launching the game, you will be prompted with three options. If the standard launch does not work, you may attempt the `--disable-seccomp-filter-sandbox` or `--no-sandbox` launch option. If this still does not work, the game should be able to start by launching it directly or through the terminal. See [How do I get to the game files?](#game-files).
@@ -68,17 +71,17 @@ When launching the game, you will be prompted with three options. If the standar
 
 You may want access the logs to get information about crashes or such.
 
-  * on Linux: `~/.config/bitburner/logs/main.log`
+- on Linux: `~/.config/bitburner/logs/main.log`
-  * on macOS: `~/Library/Logs/bitburner/main.log`
+- on macOS: `~/Library/Logs/bitburner/main.log`
-  * on Windows: `%USERPROFILE%\AppData\Roaming\bitburner\logs\main.log`
+- on Windows: `%USERPROFILE%\AppData\Roaming\bitburner\logs\main.log`
 
 ### Config (using [electron-store](https://github.com/sindresorhus/electron-store#readme))
 
 Configuration file will be written to disk in the application data directory.
 
-  * on Linux: `~/.config/bitburner/config.json`
+- on Linux: `~/.config/bitburner/config.json`
-  * on macOS: `~/Library/Application\ Support/bitburner/config.json`
+- on macOS: `~/Library/Application\ Support/bitburner/config.json`
-  * on Windows: `%USERPROFILE%\AppData\Roaming\bitburner\config.json`
+- on Windows: `%USERPROFILE%\AppData\Roaming\bitburner\config.json`
 
 ---
 

doc/source/basicgameplay/codingcontracts.rst

@@ -196,6 +196,23 @@ The list contains the name of (i.e. the value returned by
 |                                    | |                                                                                        |
 |                                    | | Determine how many unique paths there are from start to finish.                        |
 +------------------------------------+------------------------------------------------------------------------------------------+
+| Shortest Path in a Grid            | | You are given a 2D array of numbers (array of array of numbers) representing           |
+|                                    | | a grid. The 2D array contains 1's and 0's, where 1 represents an obstacle and          |
+|                                    | | 0 represents a free space.                                                             |
+|                                    | |                                                                                        |
+|                                    | | Assume you are initially positioned in top-left corner of that grid and that you       |
+|                                    | | are trying to reach the bottom-right corner. In each step, you may move to the up,     |
+|                                    | | down, left or right. Furthermore, you cannot move onto spaces which have obstacles.    |
+|                                    | |                                                                                        |
+|                                    | | Determine if paths exist from start to destination, and find the shortest one.         |
+|                                    | |                                                                                        |
+|                                    | | Examples:                                                                              |
+|                                    | |  [[0,1,0,0,0],                                                                         |
+|                                    | |   [0,0,0,1,0]] -> "DRRURRD"                                                            |
+|                                    | |  [[0,1],                                                                               |
+|                                    | |   [1,0]]       -> ""                                                                   |
+|                                    | |                                                                                        |
++------------------------------------+------------------------------------------------------------------------------------------+
 | Sanitize Parentheses in Expression | | Given a string with parentheses and letters, remove the minimum number of invalid      |
 |                                    | | parentheses in order to validate the string. If there are multiple minimal ways        |
 |                                    | | to validate the string, provide all of the possible results.                           |

electron/achievements.js

@@ -10,7 +10,7 @@ async function enableAchievementsInterval(window) {
   // here. Hey if it works it works.
   const steamAchievements = greenworks.getAchievementNames();
   log.silly(`All Steam achievements ${JSON.stringify(steamAchievements)}`);
-  const playerAchieved = (await Promise.all(steamAchievements.map(checkSteamAchievement))).filter(name => !!name);
+  const playerAchieved = (await Promise.all(steamAchievements.map(checkSteamAchievement))).filter((name) => !!name);
   log.debug(`Player has Steam achievements ${JSON.stringify(playerAchieved)}`);
   const intervalID = setInterval(async () => {
     try {
@@ -26,7 +26,7 @@ async function enableAchievementsInterval(window) {
       log.error(error);
 
       // The interval probably did not get cleared after a window kill
-      log.warn('Clearing achievements timer');
+      log.warn("Clearing achievements timer");
       clearInterval(intervalID);
       return;
     }
@@ -36,10 +36,14 @@ async function enableAchievementsInterval(window) {
 
 function checkSteamAchievement(name) {
   return new Promise((resolve) => {
-    greenworks.getAchievement(name, playerHas => resolve(playerHas ? name : ""), err => {
+    greenworks.getAchievement(
+      name,
+      (playerHas) => resolve(playerHas ? name : ""),
+      (err) => {
         log.warn(`Failed to get Steam achievement ${name} status: ${err}`);
         resolve("");
-    });
+      },
+    );
   });
 }
 
@@ -50,5 +54,6 @@ function disableAchievementsInterval(window) {
 }
 
 module.exports = {
-  enableAchievementsInterval, disableAchievementsInterval
+  enableAchievementsInterval,
-}
+  disableAchievementsInterval,
+};

electron/api-server.js

@@ -12,25 +12,27 @@ async function initialize(win) {
   window = win;
   server = http.createServer(async function (req, res) {
     let body = "";
-    res.setHeader('Content-Type', 'application/json');
+    res.setHeader("Content-Type", "application/json");
 
     req.on("data", (chunk) => {
       body += chunk.toString(); // convert Buffer to string
     });
 
     req.on("end", async () => {
-      const providedToken = req.headers?.authorization?.replace('Bearer ', '') ?? '';
+      const providedToken = req.headers?.authorization?.replace("Bearer ", "") ?? "";
       const isValid = providedToken === getAuthenticationToken();
       if (isValid) {
-        log.debug('Valid authentication token');
+        log.debug("Valid authentication token");
       } else {
-        log.log('Invalid authentication token');
+        log.log("Invalid authentication token");
         res.writeHead(401);
 
-        res.end(JSON.stringify({
+        res.end(
+          JSON.stringify({
             success: false,
-          msg: 'Invalid authentication token'
+            msg: "Invalid authentication token",
-        }));
+          }),
+        );
         return;
       }
 
@@ -40,16 +42,18 @@ async function initialize(win) {
       } catch (error) {
         log.warn(`Invalid body data`);
         res.writeHead(400);
-        res.end(JSON.stringify({
+        res.end(
+          JSON.stringify({
             success: false,
-          msg: 'Invalid body data'
+            msg: "Invalid body data",
-        }));
+          }),
+        );
 
         return;
       }
 
       let result;
-      switch(req.method) {
+      switch (req.method) {
         // Request files
         case "GET":
           result = await window.webContents.executeJavaScript(`document.getFiles()`);
@@ -62,10 +66,12 @@ async function initialize(win) {
           if (!data) {
             log.warn(`Invalid script update request - No data`);
             res.writeHead(400);
-            res.end(JSON.stringify({
+            res.end(
+              JSON.stringify({
                 success: false,
-              msg: 'Invalid script update request - No data'
+                msg: "Invalid script update request - No data",
-            }));
+              }),
+            );
             return;
           }
 
@@ -84,19 +90,20 @@ async function initialize(win) {
         log.warn(`Api Server Error`, result.msg);
       }
 
-      res.end(JSON.stringify({
+      res.end(
+        JSON.stringify({
           success: result.res,
           msg: result.msg,
-        data: result.data
+          data: result.data,
-      }));
+        }),
-
+      );
     });
   });
 
-  const autostart = config.get('autostart', false);
+  const autostart = config.get("autostart", false);
   if (autostart) {
     try {
-      await enable()
+      await enable();
     } catch (error) {
       return Promise.reject(error);
     }
@@ -105,15 +112,14 @@ async function initialize(win) {
   return Promise.resolve();
 }
 
-
 function enable() {
   if (isListening()) {
-    log.warn('API server already listening');
+    log.warn("API server already listening");
     return Promise.resolve();
   }
 
-  const port = config.get('port', 9990);
+  const port = config.get("port", 9990);
-  const host = config.get('host', '127.0.0.1');
+  const host = config.get("host", "127.0.0.1");
   log.log(`Starting http server on port ${port} - listening on ${host}`);
 
   // https://stackoverflow.com/a/62289870
@@ -125,13 +131,10 @@ function enable() {
         resolve();
       }
     });
-    server.once('error', (err) => {
+    server.once("error", (err) => {
       if (!startFinished) {
         startFinished = true;
-        console.log(
+        console.log("There was an error starting the server in the error listener:", err);
-          'There was an error starting the server in the error listener:',
-          err
-        );
         reject(err);
       }
     });
@@ -140,11 +143,11 @@ function enable() {
 
 function disable() {
   if (!isListening()) {
-    log.warn('API server not listening');
+    log.warn("API server not listening");
     return Promise.resolve();
   }
 
-  log.log('Stopping http server');
+  log.log("Stopping http server");
   return server.close();
 }
 
@@ -162,31 +165,35 @@ function isListening() {
 
 function toggleAutostart() {
   const newValue = !isAutostart();
-  config.set('autostart', newValue);
+  config.set("autostart", newValue);
   log.log(`New autostart value is '${newValue}'`);
 }
 
 function isAutostart() {
-  return config.get('autostart');
+  return config.get("autostart");
 }
 
 function getAuthenticationToken() {
-  const token = config.get('token');
+  const token = config.get("token");
   if (token) return token;
 
   const newToken = generateToken();
-  config.set('token', newToken);
+  config.set("token", newToken);
   return newToken;
 }
 
 function generateToken() {
   const buffer = crypto.randomBytes(48);
-  return buffer.toString('base64')
+  return buffer.toString("base64");
 }
 
 module.exports = {
   initialize,
-  enable, disable, toggleServer,
+  enable,
-  toggleAutostart, isAutostart,
+  disable,
-  getAuthenticationToken, isListening,
+  toggleServer,
-}
+  toggleAutostart,
+  isAutostart,
+  getAuthenticationToken,
+  isListening,
+};

electron/exit.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8"/>
+    <meta charset="utf-8" />
     <title>Bitburner</title>
     <style>
       body {

electron/export.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8"/>
+    <meta charset="utf-8" />
     <title>Bitburner</title>
     <style>
       body {

electron/gameWindow.js

@@ -15,19 +15,20 @@ const debug = process.argv.includes("--debug");
 
 async function createWindow(killall) {
   const setStopProcessHandler = global.app_handlers.stopProcess;
+  app.setAppUserModelId("Bitburner");
 
   let icon;
-  if (process.platform == 'linux') {
+  if (process.platform == "linux") {
-    icon = path.join(__dirname, 'icon.png');
+    icon = path.join(__dirname, "icon.png");
   }
 
-  const tracker = windowTracker('main');
+  const tracker = windowTracker("main");
   const window = new BrowserWindow({
     icon,
     show: false,
     backgroundThrottling: false,
     backgroundColor: "#000000",
-    title: 'Bitburner',
+    title: "Bitburner",
     x: tracker.state.x,
     y: tracker.state.y,
     width: tracker.state.width,
@@ -36,7 +37,7 @@ async function createWindow(killall) {
     minHeight: 400,
     webPreferences: {
       nativeWindowOpen: true,
-      preload: path.join(__dirname, 'preload.js'),
+      preload: path.join(__dirname, "preload.js"),
     },
   });
 
@@ -51,12 +52,12 @@ async function createWindow(killall) {
 
   window.webContents.on("new-window", async function (e, url) {
     // Let's make sure sure we have a proper url
-    let parsedUrl
+    let parsedUrl;
     try {
       parsedUrl = new URL(url);
     } catch (_) {
       // This is an invalid url, let's just do nothing
-      log.warn(`Invalid url found: ${url}`)
+      log.warn(`Invalid url found: ${url}`);
       e.preventDefault();
       return;
     }
@@ -73,11 +74,13 @@ async function createWindow(killall) {
 
       if (!isChild) {
         // If we're not relative to our app's path let's abort
-        log.warn(`Requested path ${filePath.dir}${path.sep}${filePath.base} is not relative to the app: ${appPath.dir}${path.sep}${appPath.base}`)
+        log.warn(
+          `Requested path ${filePath.dir}${path.sep}${filePath.base} is not relative to the app: ${appPath.dir}${path.sep}${appPath.base}`,
+        );
         e.preventDefault();
       } else if (!fileExists) {
         // If the file does not exist let's abort
-        log.warn(`Requested path ${filePath.dir}${path.sep}${filePath.base} does not exist`)
+        log.warn(`Requested path ${filePath.dir}${path.sep}${filePath.base} does not exist`);
         e.preventDefault();
       }
 
@@ -89,7 +92,7 @@ async function createWindow(killall) {
       let urlToOpen = parsedUrl.toString();
       if (parsedUrl.search) {
         log.log(`Cannot open a path with parameters: ${parsedUrl.search}`);
-        urlToOpen = urlToOpen.replace(parsedUrl.search, '');
+        urlToOpen = urlToOpen.replace(parsedUrl.search, "");
         // It would be possible to launch an URL with parameter using this, but it would mess up the process again...
         // const escapedUri = parsedUrl.href.replace('&', '^&');
         // cp.spawn("cmd.exe", ["/c", "start", escapedUri], { detached: true, stdio: "ignore" });

electron/greenworks.js

@@ -3,83 +3,91 @@
 // found in the LICENSE file.
 
 // The source code can be found in https://github.com/greenheartgames/greenworks
-var fs = require('fs');
+var fs = require("fs");
 
 var greenworks;
 
-if (process.platform == 'darwin') {
+if (process.platform == "darwin") {
-  if (process.arch == 'x64')
+  if (process.arch == "x64") greenworks = require("./lib/greenworks-osx64");
-    greenworks = require('./lib/greenworks-osx64');
+  else if (process.arch == "ia32") greenworks = require("./lib/greenworks-osx32");
-  else if (process.arch == 'ia32')
+} else if (process.platform == "win32") {
-    greenworks = require('./lib/greenworks-osx32');
+  if (process.arch == "x64") greenworks = require("./lib/greenworks-win64");
-} else if (process.platform == 'win32') {
+  else if (process.arch == "ia32") greenworks = require("./lib/greenworks-win32");
-  if (process.arch == 'x64')
+} else if (process.platform == "linux") {
-    greenworks = require('./lib/greenworks-win64');
+  if (process.arch == "x64") greenworks = require("./lib/greenworks-linux64");
-  else if (process.arch == 'ia32')
+  else if (process.arch == "ia32") greenworks = require("./lib/greenworks-linux32");
-    greenworks = require('./lib/greenworks-win32');
-} else if (process.platform == 'linux') {
-  if (process.arch == 'x64')
-    greenworks = require('./lib/greenworks-linux64');
-  else if (process.arch == 'ia32')
-    greenworks = require('./lib/greenworks-linux32');
 }
 
 function error_process(err, error_callback) {
-  if (err && error_callback)
+  if (err && error_callback) error_callback(err);
-    error_callback(err);
 }
 
-greenworks.ugcGetItems = function(options, ugc_matching_type, ugc_query_type,
+greenworks.ugcGetItems = function (options, ugc_matching_type, ugc_query_type, success_callback, error_callback) {
-    success_callback, error_callback) {
+  if (typeof options !== "object") {
-  if (typeof options !== 'object') {
     error_callback = success_callback;
     success_callback = ugc_query_type;
     ugc_query_type = ugc_matching_type;
     ugc_matching_type = options;
     options = {
-      'app_id': greenworks.getAppId(),
+      app_id: greenworks.getAppId(),
-      'page_num': 1
+      page_num: 1,
+    };
   }
-  }
+  greenworks._ugcGetItems(options, ugc_matching_type, ugc_query_type, success_callback, error_callback);
-  greenworks._ugcGetItems(options, ugc_matching_type, ugc_query_type,
+};
-      success_callback, error_callback);
-}
 
-greenworks.ugcGetUserItems = function(options, ugc_matching_type,
+greenworks.ugcGetUserItems = function (
-    ugc_list_sort_order, ugc_list, success_callback, error_callback) {
+  options,
-  if (typeof options !== 'object') {
+  ugc_matching_type,
+  ugc_list_sort_order,
+  ugc_list,
+  success_callback,
+  error_callback,
+) {
+  if (typeof options !== "object") {
     error_callback = success_callback;
     success_callback = ugc_list;
     ugc_list = ugc_list_sort_order;
     ugc_list_sort_order = ugc_matching_type;
     ugc_matching_type = options;
     options = {
-      'app_id': greenworks.getAppId(),
+      app_id: greenworks.getAppId(),
-      'page_num': 1
+      page_num: 1,
+    };
   }
-  }
+  greenworks._ugcGetUserItems(
-  greenworks._ugcGetUserItems(options, ugc_matching_type, ugc_list_sort_order,
+    options,
-      ugc_list, success_callback, error_callback);
+    ugc_matching_type,
-}
+    ugc_list_sort_order,
+    ugc_list,
+    success_callback,
+    error_callback,
+  );
+};
 
-greenworks.ugcSynchronizeItems = function (options, sync_dir, success_callback,
+greenworks.ugcSynchronizeItems = function (options, sync_dir, success_callback, error_callback) {
-    error_callback) {
+  if (typeof options !== "object") {
-  if (typeof options !== 'object') {
     error_callback = success_callback;
     success_callback = sync_dir;
     sync_dir = options;
     options = {
-      'app_id': greenworks.getAppId(),
+      app_id: greenworks.getAppId(),
-      'page_num': 1
+      page_num: 1,
+    };
   }
-  }
+  greenworks._ugcSynchronizeItems(options, sync_dir, success_callback, error_callback);
-  greenworks._ugcSynchronizeItems(options, sync_dir, success_callback,
+};
-      error_callback);
-}
 
-greenworks.publishWorkshopFile = function(options, file_path, image_path, title,
+greenworks.publishWorkshopFile = function (
-    description, success_callback, error_callback) {
+  options,
-  if (typeof options !== 'object') {
+  file_path,
+  image_path,
+  title,
+  description,
+  success_callback,
+  error_callback,
+) {
+  if (typeof options !== "object") {
     error_callback = success_callback;
     success_callback = description;
     description = title;
@@ -87,18 +95,24 @@ greenworks.publishWorkshopFile = function(options, file_path, image_path, title,
     image_path = file_path;
     file_path = options;
     options = {
-      'app_id': greenworks.getAppId(),
+      app_id: greenworks.getAppId(),
-      'tags': []
+      tags: [],
+    };
   }
-  }
+  greenworks._publishWorkshopFile(options, file_path, image_path, title, description, success_callback, error_callback);
-  greenworks._publishWorkshopFile(options, file_path, image_path, title,
+};
-      description, success_callback, error_callback);
-}
 
-greenworks.updatePublishedWorkshopFile = function(options,
+greenworks.updatePublishedWorkshopFile = function (
-    published_file_handle, file_path, image_path, title, description,
+  options,
-    success_callback, error_callback) {
+  published_file_handle,
-  if (typeof options !== 'object') {
+  file_path,
+  image_path,
+  title,
+  description,
+  success_callback,
+  error_callback,
+) {
+  if (typeof options !== "object") {
     error_callback = success_callback;
     success_callback = description;
     description = title;
@@ -107,104 +121,166 @@ greenworks.updatePublishedWorkshopFile = function(options,
     file_path = published_file_handle;
     published_file_handle = options;
     options = {
-      'tags': [] // No tags are set
+      tags: [], // No tags are set
+    };
   }
-  }
+  greenworks._updatePublishedWorkshopFile(
-  greenworks._updatePublishedWorkshopFile(options, published_file_handle,
+    options,
-     file_path, image_path, title, description, success_callback,
+    published_file_handle,
-     error_callback);
+    file_path,
-}
+    image_path,
+    title,
+    description,
+    success_callback,
+    error_callback,
+  );
+};
 
 // An utility function for publish related APIs.
 // It processes remains steps after saving files to Steam Cloud.
-function file_share_process(file_name, image_name, next_process_func,
+function file_share_process(file_name, image_name, next_process_func, error_callback, progress_callback) {
-    error_callback, progress_callback) {
+  if (progress_callback) progress_callback("Completed on saving files on Steam Cloud.");
-  if (progress_callback)
+  greenworks.fileShare(
-    progress_callback("Completed on saving files on Steam Cloud.");
+    file_name,
-  greenworks.fileShare(file_name, function() {
+    function () {
-    greenworks.fileShare(image_name, function() {
+      greenworks.fileShare(
+        image_name,
+        function () {
           next_process_func();
-    }, function(err) { error_process(err, error_callback); });
+        },
-  }, function(err) { error_process(err, error_callback); });
+        function (err) {
+          error_process(err, error_callback);
+        },
+      );
+    },
+    function (err) {
+      error_process(err, error_callback);
+    },
+  );
 }
 
 // Publishing user generated content(ugc) to Steam contains following steps:
 // 1. Save file and image to Steam Cloud.
 // 2. Share the file and image.
 // 3. publish the file to workshop.
-greenworks.ugcPublish = function(file_name, title, description, image_name,
+greenworks.ugcPublish = function (
-    success_callback, error_callback, progress_callback) {
+  file_name,
-  var publish_file_process = function() {
+  title,
-    if (progress_callback)
+  description,
-      progress_callback("Completed on sharing files.");
+  image_name,
-    greenworks.publishWorkshopFile(file_name, image_name, title, description,
+  success_callback,
-        function(publish_file_id) { success_callback(publish_file_id); },
+  error_callback,
-        function(err) { error_process(err, error_callback); });
+  progress_callback,
+) {
+  var publish_file_process = function () {
+    if (progress_callback) progress_callback("Completed on sharing files.");
+    greenworks.publishWorkshopFile(
+      file_name,
+      image_name,
+      title,
+      description,
+      function (publish_file_id) {
+        success_callback(publish_file_id);
+      },
+      function (err) {
+        error_process(err, error_callback);
+      },
+    );
   };
-  greenworks.saveFilesToCloud([file_name, image_name], function() {
+  greenworks.saveFilesToCloud(
-    file_share_process(file_name, image_name, publish_file_process,
+    [file_name, image_name],
-        error_callback, progress_callback);
+    function () {
-  }, function(err) { error_process(err, error_callback); });
+      file_share_process(file_name, image_name, publish_file_process, error_callback, progress_callback);
-}
+    },
+    function (err) {
+      error_process(err, error_callback);
+    },
+  );
+};
 
 // Update publish ugc steps:
 // 1. Save new file and image to Steam Cloud.
 // 2. Share file and images.
 // 3. Update published file.
-greenworks.ugcPublishUpdate = function(published_file_id, file_name, title,
+greenworks.ugcPublishUpdate = function (
-    description, image_name, success_callback, error_callback,
+  published_file_id,
-    progress_callback) {
+  file_name,
-  var update_published_file_process = function() {
+  title,
-    if (progress_callback)
+  description,
-      progress_callback("Completed on sharing files.");
+  image_name,
-    greenworks.updatePublishedWorkshopFile(published_file_id,
+  success_callback,
-        file_name, image_name, title, description,
+  error_callback,
-        function() { success_callback(); },
+  progress_callback,
-        function(err) { error_process(err, error_callback); });
+) {
+  var update_published_file_process = function () {
+    if (progress_callback) progress_callback("Completed on sharing files.");
+    greenworks.updatePublishedWorkshopFile(
+      published_file_id,
+      file_name,
+      image_name,
+      title,
+      description,
+      function () {
+        success_callback();
+      },
+      function (err) {
+        error_process(err, error_callback);
+      },
+    );
   };
 
-  greenworks.saveFilesToCloud([file_name, image_name], function() {
+  greenworks.saveFilesToCloud(
-    file_share_process(file_name, image_name, update_published_file_process,
+    [file_name, image_name],
-        error_callback, progress_callback);
+    function () {
-  }, function(err) { error_process(err, error_callback); });
+      file_share_process(file_name, image_name, update_published_file_process, error_callback, progress_callback);
-}
+    },
+    function (err) {
+      error_process(err, error_callback);
+    },
+  );
+};
 
 // Greenworks Utils APIs implmentation.
-greenworks.Utils.move = function(source_dir, target_dir, success_callback,
+greenworks.Utils.move = function (source_dir, target_dir, success_callback, error_callback) {
-    error_callback) {
+  fs.rename(source_dir, target_dir, function (err) {
-  fs.rename(source_dir, target_dir, function(err) {
     if (err) {
       if (error_callback) error_callback(err);
       return;
     }
-    if (success_callback)
+    if (success_callback) success_callback();
-      success_callback();
   });
-}
+};
 
-greenworks.init = function() {
+greenworks.init = function () {
   if (this.initAPI()) return true;
-  if (!this.isSteamRunning())
+  if (!this.isSteamRunning()) throw new Error("Steam initialization failed. Steam is not running.");
-    throw new Error("Steam initialization failed. Steam is not running.");
   var appId;
   try {
-    appId = fs.readFileSync('steam_appid.txt', 'utf8');
+    appId = fs.readFileSync("steam_appid.txt", "utf8");
   } catch (e) {
-    throw new Error("Steam initialization failed. Steam is running," +
+    throw new Error(
+      "Steam initialization failed. Steam is running," +
         "but steam_appid.txt is missing. Expected to find it in: " +
-                    require('path').resolve('steam_appid.txt'));
+        require("path").resolve("steam_appid.txt"),
+    );
   }
   if (!/^\d+ *\r?\n?$/.test(appId)) {
-    throw new Error("Steam initialization failed. " +
+    throw new Error(
+      "Steam initialization failed. " +
         "steam_appid.txt appears to be invalid; " +
-                    "it should contain a numeric ID: " + appId);
+        "it should contain a numeric ID: " +
+        appId,
+    );
   }
-  throw new Error("Steam initialization failed, but Steam is running, " +
+  throw new Error(
+    "Steam initialization failed, but Steam is running, " +
       "and steam_appid.txt is present and valid." +
-                  "Maybe that's not really YOUR app ID? " + appId.trim());
+      "Maybe that's not really YOUR app ID? " +
-}
+      appId.trim(),
+  );
+};
 
-var EventEmitter = require('events').EventEmitter;
+var EventEmitter = require("events").EventEmitter;
 greenworks.__proto__ = EventEmitter.prototype;
 EventEmitter.call(greenworks);
 
@@ -212,6 +288,6 @@ greenworks._steam_events.on = function () {
   greenworks.emit.apply(greenworks, arguments);
 };
 
-process.versions['greenworks'] = greenworks._version;
+process.versions["greenworks"] = greenworks._version;
 
 module.exports = greenworks;

electron/main.js

@@ -18,7 +18,7 @@ log.transports.console.level = config.get("console-log-level", "debug");
 log.catchErrors();
 log.info(`Started app: ${JSON.stringify(process.argv)}`);
 
-process.on('uncaughtException', function () {
+process.on("uncaughtException", function () {
   // The exception will already have been logged by electron-log
   process.exit(1);
 });
@@ -67,42 +67,43 @@ function setStopProcessHandler(app, window, enabled) {
     // So we'll alert the player to close their browser.
     if (global.app_playerOpenedExternalLink) {
       await dialog.showMessageBox({
-        title: 'Bitburner',
+        title: "Bitburner",
-        message: 'You may have to close your browser to properly exit the game.',
+        message: "You may have to close your browser to properly exit the game.",
-        detail: 'Steam will keep tracking Bitburner as "Running" if any process started within the game is still running.' +
+        detail:
-          ' This includes launching an external link, which opens up your browser.',
+          'Steam will keep tracking Bitburner as "Running" if any process started within the game is still running.' +
-        type: 'warning', buttons: ['OK']
+          " This includes launching an external link, which opens up your browser.",
+        type: "warning",
+        buttons: ["OK"],
       });
     }
     // We'll try to execute javascript on the page to see if we're stuck
     let canRunJS = false;
-    window.webContents.executeJavaScript('window.stop(); document.close()', true)
+    window.webContents.executeJavaScript("window.stop(); document.close()", true).then(() => (canRunJS = true));
-      .then(() => canRunJS = true);
     setTimeout(() => {
       // Wait a few milliseconds to prevent a race condition before loading the exit screen
       window.webContents.stop();
-      window.loadFile("exit.html")
+      window.loadFile("exit.html");
     }, 20);
 
     // Wait 200ms, if the promise has not yet resolved, let's crash the process since we're possibly in a stuck scenario
     setTimeout(() => {
       if (!canRunJS) {
         // We're stuck, let's crash the process
-        log.warn('Forcefully crashing the renderer process');
+        log.warn("Forcefully crashing the renderer process");
         window.webContents.forcefullyCrashRenderer();
       }
 
-      log.debug('Destroying the window');
+      log.debug("Destroying the window");
       window.destroy();
     }, 200);
-  }
+  };
 
   const clearWindowHandler = () => {
     window = null;
   };
 
   const stopProcessHandler = () => {
-    log.info('Quitting the app...');
+    log.info("Quitting the app...");
     app.isQuiting = true;
     app.quit();
     process.exit(0);
@@ -121,12 +122,12 @@ function setStopProcessHandler(app, window, enabled) {
     const restoreNewest = config.get("onload-restore-newest", true);
     if (restoreNewest && !isRestoreDisabled) {
       try {
-        await storage.restoreIfNewerExists(window)
+        await storage.restoreIfNewerExists(window);
       } catch (error) {
         log.error("Could not restore newer file", error);
       }
     }
-  }
+  };
 
   const receivedDisableRestoreHandler = async (event, arg) => {
     if (!window) {
@@ -140,7 +141,7 @@ function setStopProcessHandler(app, window, enabled) {
       isRestoreDisabled = false;
       log.debug("Re-enabling auto-restore");
     }, arg.duration);
-  }
+  };
 
   const receivedGameSavedHandler = async (event, arg) => {
     if (!window) {
@@ -149,7 +150,7 @@ function setStopProcessHandler(app, window, enabled) {
     }
 
     const { save, ...other } = arg;
-    log.silly("Received game saved info", {...other, save: `${save.length} bytes`});
+    log.silly("Received game saved info", { ...other, save: `${save.length} bytes` });
 
     if (storage.isAutosaveEnabled()) {
       saveToDisk(save, arg.fileName);
@@ -164,10 +165,11 @@ function setStopProcessHandler(app, window, enabled) {
         log.debug(`Auto-save to cloud disabled for save game under ${minimumPlaytime}ms (${playtime}ms)`);
       }
     }
-  }
+  };
 
-  const saveToCloud = debounce(async (save) => {
+  const saveToCloud = debounce(
-    log.debug("Saving to Steam Cloud ...")
+    async (save) => {
+      log.debug("Saving to Steam Cloud ...");
       try {
         const playerId = window.gameInfo.player.identifier;
         await storage.pushGameSaveToSteamCloud(save, playerId);
@@ -176,26 +178,33 @@ function setStopProcessHandler(app, window, enabled) {
         log.error(error);
         utils.writeToast(window, "Could not save to Steam Cloud.", "error", 5000);
       }
-  }, config.get("cloud-save-min-time", 1000 * 60 * 15), { leading: true });
+    },
+    config.get("cloud-save-min-time", 1000 * 60 * 15),
+    { leading: true },
+  );
 
-  const saveToDisk = debounce(async (save, fileName) => {
+  const saveToDisk = debounce(
-    log.debug("Saving to Disk ...")
+    async (save, fileName) => {
+      log.debug("Saving to Disk ...");
       try {
         const file = await storage.saveGameToDisk(window, { save, fileName });
-      log.silly(`Saved Game to '${file.replaceAll('\\', '\\\\')}'`);
+        log.silly(`Saved Game to '${file.replaceAll("\\", "\\\\")}'`);
       } catch (error) {
         log.error(error);
         utils.writeToast(window, "Could not save to disk", "error", 5000);
       }
-  }, config.get("disk-save-min-time", 1000 * 60 * 5), { leading: true });
+    },
+    config.get("disk-save-min-time", 1000 * 60 * 5),
+    { leading: true },
+  );
 
   if (enabled) {
     log.debug("Adding closing handlers");
     ipcMain.on("push-game-ready", receivedGameReadyHandler);
     ipcMain.on("push-game-saved", receivedGameSavedHandler);
-    ipcMain.on("push-disable-restore", receivedDisableRestoreHandler)
+    ipcMain.on("push-disable-restore", receivedDisableRestoreHandler);
     window.on("closed", clearWindowHandler);
-    window.on("close", closingWindowHandler)
+    window.on("close", closingWindowHandler);
     app.on("window-all-closed", stopProcessHandler);
   } else {
     log.debug("Removing closing handlers");
@@ -213,7 +222,7 @@ async function startWindow(noScript) {
 global.app_handlers = {
   stopProcess: setStopProcessHandler,
   createWindow: startWindow,
-}
+};
 
 app.whenReady().then(async () => {
   log.info("Application is ready!");
@@ -231,7 +240,8 @@ app.whenReady().then(async () => {
         title: "Bitburner",
         message: "Could not connect to Steam",
         detail: `${global.greenworksError}\n\nYou won't be able to receive achievements until this is resolved and you restart the game.`,
-        type: 'warning', buttons: ['OK']
+        type: "warning",
+        buttons: ["OK"],
       });
     }
   }

electron/menu.js

@@ -37,7 +37,7 @@ function getMenu(window) {
               log.error(error);
               utils.writeToast(window, "Could not load last save from disk", "error", 5000);
             }
-          }
+          },
         },
         {
           label: "Load From File",
@@ -51,9 +51,7 @@ function getMenu(window) {
                 { name: "Game Saves", extensions: ["json", "json.gz", "txt"] },
                 { name: "All", extensions: ["*"] },
               ],
-              properties: [
+              properties: ["openFile", "dontAddToRecent"],
-                "openFile", "dontAddToRecent",
-              ]
             });
             if (result.canceled) return;
             const file = result.filePaths[0];
@@ -65,7 +63,7 @@ function getMenu(window) {
               log.error(error);
               utils.writeToast(window, "Could not load save from disk", "error", 5000);
             }
-          }
+          },
         },
         {
           label: "Load From Steam Cloud",
@@ -78,7 +76,7 @@ function getMenu(window) {
               log.error(error);
               utils.writeToast(window, "Could not load from Steam Cloud", "error", 5000);
             }
-          }
+          },
         },
         {
           type: "separator",
@@ -89,8 +87,7 @@ function getMenu(window) {
           checked: storage.isSaveCompressionEnabled(),
           click: (menuItem) => {
             storage.setSaveCompressionConfig(menuItem.checked);
-            utils.writeToast(window,
+            utils.writeToast(window, `${menuItem.checked ? "Enabled" : "Disabled"} Save Compression`, "info", 5000);
-              `${menuItem.checked ? "Enabled" : "Disabled"} Save Compression`, "info", 5000);
             refreshMenu(window);
           },
         },
@@ -100,8 +97,7 @@ function getMenu(window) {
           checked: storage.isAutosaveEnabled(),
           click: (menuItem) => {
             storage.setAutosaveConfig(menuItem.checked);
-            utils.writeToast(window,
+            utils.writeToast(window, `${menuItem.checked ? "Enabled" : "Disabled"} Auto-Save to Disk`, "info", 5000);
-              `${menuItem.checked ? "Enabled" : "Disabled"} Auto-Save to Disk`, "info", 5000);
             refreshMenu(window);
           },
         },
@@ -112,8 +108,12 @@ function getMenu(window) {
           checked: storage.isCloudEnabled(),
           click: (menuItem) => {
             storage.setCloudEnabledConfig(menuItem.checked);
-            utils.writeToast(window,
+            utils.writeToast(
-              `${menuItem.checked ? "Enabled" : "Disabled"} Auto-Save to Steam Cloud`, "info", 5000);
+              window,
+              `${menuItem.checked ? "Enabled" : "Disabled"} Auto-Save to Steam Cloud`,
+              "info",
+              5000,
+            );
             refreshMenu(window);
           },
         },
@@ -123,8 +123,12 @@ function getMenu(window) {
           checked: config.get("onload-restore-newest", true),
           click: (menuItem) => {
             config.set("onload-restore-newest", menuItem.checked);
-            utils.writeToast(window,
+            utils.writeToast(
-              `${menuItem.checked ? "Enabled" : "Disabled"} Restore Newest on Load`, "info", 5000);
+              window,
+              `${menuItem.checked ? "Enabled" : "Disabled"} Restore Newest on Load`,
+              "info",
+              5000,
+            );
             refreshMenu(window);
           },
         },
@@ -153,7 +157,7 @@ function getMenu(window) {
               label: "Open Data Directory",
               click: () => shell.openPath(app.getPath("userData")),
             },
-          ]
+          ],
         },
         {
           type: "separator",
@@ -162,7 +166,7 @@ function getMenu(window) {
           label: "Quit",
           click: () => app.quit(),
         },
-      ]
+      ],
     },
     {
       label: "Edit",
@@ -210,29 +214,29 @@ function getMenu(window) {
       label: "API Server",
       submenu: [
         {
-          label: api.isListening() ? 'Disable Server' : 'Enable Server',
+          label: api.isListening() ? "Disable Server" : "Enable Server",
-          click: (async () => {
+          click: async () => {
             let success = false;
             try {
               await api.toggleServer();
               success = true;
             } catch (error) {
               log.error(error);
-              utils.showErrorBox('Error Toggling Server', error);
+              utils.showErrorBox("Error Toggling Server", error);
             }
             if (success && api.isListening()) {
               utils.writeToast(window, "Started API Server", "success");
             } else if (success && !api.isListening()) {
               utils.writeToast(window, "Stopped API Server", "success");
             } else {
-              utils.writeToast(window, 'Error Toggling Server', "error");
+              utils.writeToast(window, "Error Toggling Server", "error");
             }
             refreshMenu(window);
-          })
+          },
         },
         {
-          label: api.isAutostart() ? 'Disable Autostart' : 'Enable Autostart',
+          label: api.isAutostart() ? "Disable Autostart" : "Enable Autostart",
-          click: (async () => {
+          click: async () => {
             api.toggleAutostart();
             if (api.isAutostart()) {
               utils.writeToast(window, "Enabled API Server Autostart", "success");
@@ -240,42 +244,45 @@ function getMenu(window) {
               utils.writeToast(window, "Disabled API Server Autostart", "success");
             }
             refreshMenu(window);
-          })
+          },
         },
         {
-          label: 'Copy Auth Token',
+          label: "Copy Auth Token",
-          click: (async () => {
+          click: async () => {
             const token = api.getAuthenticationToken();
-            log.log('Wrote authentication token to clipboard');
+            log.log("Wrote authentication token to clipboard");
             clipboard.writeText(token);
             utils.writeToast(window, "Copied Authentication Token to Clipboard", "info");
-          })
+          },
         },
         {
-          type: 'separator',
+          type: "separator",
         },
         {
-          label: 'Information',
+          label: "Information",
           click: () => {
-            dialog.showMessageBox({
+            dialog
-              type: 'info',
+              .showMessageBox({
-              title: 'Bitburner > API Server Information',
+                type: "info",
-              message: 'The API Server is used to write script files to your in-game home.',
+                title: "Bitburner > API Server Information",
-              detail: 'There is an official Visual Studio Code extension that makes use of that feature.\n\n' +
+                message: "The API Server is used to write script files to your in-game home.",
-                'It allows you to write your script file in an external IDE and have them pushed over to the game automatically.\n' +
+                detail:
-                'If you want more information, head over to: https://github.com/bitburner-official/bitburner-vscode.',
+                  "There is an official Visual Studio Code extension that makes use of that feature.\n\n" +
-                buttons: ['Dismiss', 'Open Extension Link (GitHub)'],
+                  "It allows you to write your script file in an external IDE and have them pushed over to the game automatically.\n" +
+                  "If you want more information, head over to: https://github.com/bitburner-official/bitburner-vscode.",
+                buttons: ["Dismiss", "Open Extension Link (GitHub)"],
                 defaultId: 0,
                 cancelId: 0,
                 noLink: true,
-            }).then(({response}) => {
+              })
+              .then(({ response }) => {
                 if (response === 1) {
-                utils.openExternal('https://github.com/bitburner-official/bitburner-vscode');
+                  utils.openExternal("https://github.com/bitburner-official/bitburner-vscode");
                 }
               });
-          }
+          },
-        }
+        },
-      ]
+      ],
     },
     {
       label: "Zoom",
@@ -291,7 +298,7 @@ function getMenu(window) {
               utils.setZoomFactor(window, newZoom);
               refreshMenu(window);
             } else {
-              log.log('Max zoom out')
+              log.log("Max zoom out");
               utils.writeToast(window, "Cannot zoom in anymore", "warning");
             }
           },
@@ -307,7 +314,7 @@ function getMenu(window) {
               utils.setZoomFactor(window, newZoom);
               refreshMenu(window);
             } else {
-              log.log('Max zoom in')
+              log.log("Max zoom in");
               utils.writeToast(window, "Cannot zoom out anymore", "warning");
             }
           },
@@ -340,8 +347,8 @@ function getMenu(window) {
             } catch (error) {
               log.error(error);
             }
-          }
+          },
-        }
+        },
       ],
     },
   ]);
@@ -352,5 +359,6 @@ function refreshMenu(window) {
 }
 
 module.exports = {
-  getMenu, refreshMenu,
+  getMenu,
-}
+  refreshMenu,
+};

electron/preload.js

@@ -1,11 +1,10 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-const { ipcRenderer, contextBridge } = require('electron')
+const { ipcRenderer, contextBridge } = require("electron");
 const log = require("electron-log");
 
-contextBridge.exposeInMainWorld(
+contextBridge.exposeInMainWorld("electronBridge", {
-  "electronBridge", {
   send: (channel, data) => {
-      log.log("Send on channel " + channel)
+    log.log("Send on channel " + channel);
     // whitelist channels
     let validChannels = [
       "get-save-data-response",
@@ -20,7 +19,7 @@ contextBridge.exposeInMainWorld(
     }
   },
   receive: (channel, func) => {
-      log.log("Receive on channel " + channel)
+    log.log("Receive on channel " + channel);
     let validChannels = [
       "get-save-data-request",
       "get-save-info-request",
@@ -33,6 +32,5 @@ contextBridge.exposeInMainWorld(
       // Deliberately strip event as it includes `sender`
       ipcRenderer.on(channel, (event, ...args) => func(...args));
     }
-    }
+  },
-  }
+});
-);

electron/storage.js

@@ -16,9 +16,9 @@ const config = new Config();
 // https://stackoverflow.com/a/69418940
 const dirSize = async (directory) => {
   const files = await fs.readdir(directory);
-  const stats = files.map(file => fs.stat(path.join(directory, file)));
+  const stats = files.map((file) => fs.stat(path.join(directory, file)));
   return (await Promise.all(stats)).reduce((accumulator, { size }) => accumulator + size, 0);
-}
+};
 
 const getDirFileStats = async (directory) => {
   const files = await fs.readdir(directory);
@@ -26,30 +26,31 @@ const getDirFileStats = async (directory) => {
     const file = path.join(directory, f);
     return fs.stat(file).then((stat) => ({ file, stat }));
   });
-  const data = (await Promise.all(stats));
+  const data = await Promise.all(stats);
   return data;
 };
 
 const getNewestFile = async (directory) => {
-  const data = await getDirFileStats(directory)
+  const data = await getDirFileStats(directory);
   return data.sort((a, b) => b.stat.mtime.getTime() - a.stat.mtime.getTime())[0];
 };
 
 const getAllSaves = async (window) => {
   const rootDirectory = await getSaveFolder(window, true);
-  const data = await fs.readdir(rootDirectory, { withFileTypes: true});
+  const data = await fs.readdir(rootDirectory, { withFileTypes: true });
-  const savesPromises = data.filter((e) => e.isDirectory()).
+  const savesPromises = data
-    map((dir) => path.join(rootDirectory, dir.name)).
+    .filter((e) => e.isDirectory())
-    map((dir) => getDirFileStats(dir));
+    .map((dir) => path.join(rootDirectory, dir.name))
+    .map((dir) => getDirFileStats(dir));
   const saves = await Promise.all(savesPromises);
   const flat = flatten(saves);
   return flat;
-}
+};
 
 async function prepareSaveFolders(window) {
   const rootFolder = await getSaveFolder(window, true);
   const currentFolder = await getSaveFolder(window);
-  const backupsFolder = path.join(rootFolder, "/_backups")
+  const backupsFolder = path.join(rootFolder, "/_backups");
   await prepareFolders(rootFolder, currentFolder, backupsFolder);
 }
 
@@ -60,7 +61,7 @@ async function prepareFolders(...folders) {
       // eslint-disable-next-line no-await-in-loop
       await fs.stat(folder);
     } catch (error) {
-      if (error.code === 'ENOENT') {
+      if (error.code === "ENOENT") {
         log.warn(`'${folder}' not found, creating it...`);
         // eslint-disable-next-line no-await-in-loop
         await fs.mkdir(folder);
@@ -125,14 +126,14 @@ function isCloudEnabled() {
 function saveCloudFile(name, content) {
   return new Promise((resolve, reject) => {
     greenworks.saveTextToFile(name, content, resolve, reject);
-  })
+  });
 }
 
 function getFirstCloudFile() {
   const nbFiles = greenworks.getFileCount();
-  if (nbFiles === 0) throw new Error('No files in cloud');
+  if (nbFiles === 0) throw new Error("No files in cloud");
   const file = greenworks.getFileNameAndSize(0);
-  log.silly(`Found ${nbFiles} files.`)
+  log.silly(`Found ${nbFiles} files.`);
   log.silly(`First File: ${file.name} (${file.size} bytes)`);
   return file.name;
 }
@@ -153,7 +154,7 @@ function deleteCloudFile() {
 
 async function getSteamCloudQuota() {
   return new Promise((resolve, reject) => {
-    greenworks.getCloudQuota(resolve, reject)
+    greenworks.getCloudQuota(resolve, reject);
   });
 }
 
@@ -166,9 +167,9 @@ async function backupSteamDataToDisk(currentPlayerId) {
   if (previousPlayerId !== currentPlayerId) {
     const backupSave = await getSteamCloudSaveString();
     const backupFile = path.join(app.getPath("userData"), "/saves/_backups", `${previousPlayerId}.json.gz`);
-    const buffer = Buffer.from(backupSave, 'base64').toString('utf8');
+    const buffer = Buffer.from(backupSave, "base64").toString("utf8");
     saveContent = await gzip(buffer);
-    await fs.writeFile(backupFile, saveContent, 'utf8');
+    await fs.writeFile(backupFile, saveContent, "utf8");
     log.debug(`Saved backup game to '${backupFile}`);
   }
 }
@@ -219,7 +220,9 @@ async function saveGameToDisk(window, saveData) {
   const remainingSpaceBytes = maxFolderSizeBytes - saveFolderSizeBytes;
   log.debug(`Folder Usage: ${saveFolderSizeBytes} bytes`);
   log.debug(`Folder Capacity: ${maxFolderSizeBytes} bytes`);
-  log.debug(`Remaining: ${remainingSpaceBytes} bytes (${(saveFolderSizeBytes / maxFolderSizeBytes * 100).toFixed(2)}% used)`)
+  log.debug(
+    `Remaining: ${remainingSpaceBytes} bytes (${((saveFolderSizeBytes / maxFolderSizeBytes) * 100).toFixed(2)}% used)`,
+  );
   const shouldCompress = isSaveCompressionEnabled();
   const fileName = saveData.fileName;
   const file = path.join(currentFolder, fileName + (shouldCompress ? ".gz" : ""));
@@ -227,10 +230,10 @@ async function saveGameToDisk(window, saveData) {
     let saveContent = saveData.save;
     if (shouldCompress) {
       // Let's decode the base64 string so GZIP is more efficient.
-      const buffer = Buffer.from(saveContent, 'base64').toString('utf8');
+      const buffer = Buffer.from(saveContent, "base64").toString("utf8");
       saveContent = await gzip(buffer);
     }
-    await fs.writeFile(file, saveContent, 'utf8');
+    await fs.writeFile(file, saveContent, "utf8");
     log.debug(`Saved Game to '${file}'`);
     log.debug(`Save Size: ${saveContent.length} bytes`);
   } catch (error) {
@@ -240,7 +243,8 @@ async function saveGameToDisk(window, saveData) {
   const fileStats = await getDirFileStats(currentFolder);
   const oldestFiles = fileStats
     .sort((a, b) => a.stat.mtime.getTime() - b.stat.mtime.getTime())
-    .map(f => f.file).filter(f => f !== file);
+    .map((f) => f.file)
+    .filter((f) => f !== file);
 
   while (saveFolderSizeBytes > maxFolderSizeBytes && oldestFiles.length > 0) {
     const fileToRemove = oldestFiles.shift();
@@ -255,7 +259,12 @@ async function saveGameToDisk(window, saveData) {
     // eslint-disable-next-line no-await-in-loop
     saveFolderSizeBytes = await getFolderSizeInBytes(currentFolder);
     log.debug(`Save Folder: ${saveFolderSizeBytes} bytes`);
-    log.debug(`Remaining: ${maxFolderSizeBytes - saveFolderSizeBytes} bytes (${(saveFolderSizeBytes / maxFolderSizeBytes * 100).toFixed(2)}% used)`)
+    log.debug(
+      `Remaining: ${maxFolderSizeBytes - saveFolderSizeBytes} bytes (${(
+        (saveFolderSizeBytes / maxFolderSizeBytes) *
+        100
+      ).toFixed(2)}% used)`,
+    );
   }
 
   return file;
@@ -271,13 +280,13 @@ async function loadLastFromDisk(window) {
 async function loadFileFromDisk(path) {
   const buffer = await fs.readFile(path);
   let content;
-  if (path.endsWith('.gz')) {
+  if (path.endsWith(".gz")) {
     const uncompressedBuffer = await gunzip(buffer);
-    content = uncompressedBuffer.toString('base64');
+    content = uncompressedBuffer.toString("base64");
     log.debug(`Uncompressed file content (new size: ${content.length} bytes)`);
   } else {
-    content = buffer.toString('utf8');
+    content = buffer.toString("utf8");
-    log.debug(`Loaded file with ${content.length} bytes`)
+    log.debug(`Loaded file with ${content.length} bytes`);
   }
   return content;
 }
@@ -293,10 +302,10 @@ function getSaveInformation(window, save) {
 
 function getCurrentSave(window) {
   return new Promise((resolve) => {
-    ipcMain.once('get-save-data-response', (event, data) => {
+    ipcMain.once("get-save-data-response", (event, data) => {
       resolve(data);
     });
-    window.webContents.send('get-save-data-request');
+    window.webContents.send("get-save-data-request");
   });
 }
 
@@ -322,13 +331,12 @@ async function restoreIfNewerExists(window) {
   }
 
   try {
-    const saves = (await getAllSaves()).
+    const saves = (await getAllSaves()).sort((a, b) => b.stat.mtime.getTime() - a.stat.mtime.getTime());
-      sort((a, b) => b.stat.mtime.getTime() - a.stat.mtime.getTime());
     if (saves.length > 0) {
       disk.save = await loadFileFromDisk(saves[0].file);
       disk.data = await getSaveInformation(window, disk.save);
     }
-  } catch(error) {
+  } catch (error) {
     log.error("Could not retrieve disk file");
     log.debug(error);
   }
@@ -339,18 +347,17 @@ async function restoreIfNewerExists(window) {
     log.info("No data to import");
   } else if (!steam.data) {
     // We'll just compare using the lastSave field for now.
-    log.debug('Best potential save match: Disk');
+    log.debug("Best potential save match: Disk");
     bestMatch = disk;
   } else if (!disk.data) {
-    log.debug('Best potential save match: Steam Cloud');
+    log.debug("Best potential save match: Steam Cloud");
     bestMatch = steam;
-  } else if ((steam.data.lastSave >= disk.data.lastSave)
+  } else if (steam.data.lastSave >= disk.data.lastSave || steam.data.playtime + lowPlaytime > disk.data.playtime) {
-    || (steam.data.playtime + lowPlaytime > disk.data.playtime)) {
     // We want to prioritze steam data if the playtime is very close
-    log.debug('Best potential save match: Steam Cloud');
+    log.debug("Best potential save match: Steam Cloud");
     bestMatch = steam;
   } else {
-    log.debug('Best potential save match: disk');
+    log.debug("Best potential save match: disk");
     bestMatch = disk;
   }
   if (bestMatch) {
@@ -360,7 +367,7 @@ async function restoreIfNewerExists(window) {
       log.silly(bestMatch.data);
       await pushSaveGameForImport(window, bestMatch.save, true);
       return true;
-    } else if(bestMatch.data.playtime > currentData.playtime && currentData.playtime < lowPlaytime) {
+    } else if (bestMatch.data.playtime > currentData.playtime && currentData.playtime < lowPlaytime) {
       log.info("Found older save, but with more playtime, and current less than 15 mins played");
       log.silly(bestMatch.data);
       await pushSaveGameForImport(window, bestMatch.save, true);
@@ -373,12 +380,24 @@ async function restoreIfNewerExists(window) {
 }
 
 module.exports = {
-  getCurrentSave, getSaveInformation,
+  getCurrentSave,
-  restoreIfNewerExists, pushSaveGameForImport,
+  getSaveInformation,
-  pushGameSaveToSteamCloud, getSteamCloudSaveString, getSteamCloudQuota, deleteCloudFile,
+  restoreIfNewerExists,
-  saveGameToDisk, loadLastFromDisk, loadFileFromDisk,
+  pushSaveGameForImport,
-  getSaveFolder, prepareSaveFolders, getAllSaves,
+  pushGameSaveToSteamCloud,
-  isCloudEnabled, setCloudEnabledConfig,
+  getSteamCloudSaveString,
-  isAutosaveEnabled, setAutosaveConfig,
+  getSteamCloudQuota,
-  isSaveCompressionEnabled, setSaveCompressionConfig,
+  deleteCloudFile,
- };
+  saveGameToDisk,
+  loadLastFromDisk,
+  loadFileFromDisk,
+  getSaveFolder,
+  prepareSaveFolders,
+  getAllSaves,
+  isCloudEnabled,
+  setCloudEnabledConfig,
+  isAutosaveEnabled,
+  setAutosaveConfig,
+  isSaveCompressionEnabled,
+  setSaveCompressionConfig,
+};

electron/utils.js

@@ -9,39 +9,42 @@ const Config = require("electron-config");
 const config = new Config();
 
 function reloadAndKill(window, killScripts) {
-  const setStopProcessHandler = global.app_handlers.stopProcess
+  const setStopProcessHandler = global.app_handlers.stopProcess;
   const createWindowHandler = global.app_handlers.createWindow;
 
-  log.info('Reloading & Killing all scripts...');
+  log.info("Reloading & Killing all scripts...");
   setStopProcessHandler(app, window, false);
 
   achievements.disableAchievementsInterval(window);
   api.disable();
 
   window.webContents.forcefullyCrashRenderer();
-  window.on('closed', () => {
+  window.on("closed", () => {
     // Wait for window to be closed before opening the new one to prevent race conditions
-    log.debug('Opening new window');
+    log.debug("Opening new window");
     createWindowHandler(killScripts);
-  })
+  });
 
   window.close();
 }
 
 function promptForReload(window) {
   detachUnresponsiveAppHandler(window);
-  dialog.showMessageBox({
+  dialog
-    type: 'error',
+    .showMessageBox({
-    title: 'Bitburner > Application Unresponsive',
+      type: "error",
-    message: 'The application is unresponsive, possibly due to an infinite loop in your scripts.',
+      title: "Bitburner > Application Unresponsive",
-    detail:' Did you forget a ns.sleep(x)?\n\n' +
+      message: "The application is unresponsive, possibly due to an infinite loop in your scripts.",
-      'The application will be restarted for you, do you want to kill all running scripts?',
+      detail:
-    buttons: ['Restart', 'Cancel'],
+        " Did you forget a ns.sleep(x)?\n\n" +
+        "The application will be restarted for you, do you want to kill all running scripts?",
+      buttons: ["Restart", "Cancel"],
       defaultId: 0,
-    checkboxLabel: 'Kill all running scripts',
+      checkboxLabel: "Kill all running scripts",
       checkboxChecked: true,
       noLink: true,
-  }).then(({response, checkboxChecked}) => {
+    })
+    .then(({ response, checkboxChecked }) => {
       if (response === 0) {
         reloadAndKill(window, checkboxChecked);
       } else {
@@ -52,18 +55,15 @@ function promptForReload(window) {
 
 function attachUnresponsiveAppHandler(window) {
   window.unresponsiveHandler = () => promptForReload(window);
-  window.on('unresponsive', window.unresponsiveHandler);
+  window.on("unresponsive", window.unresponsiveHandler);
 }
 
 function detachUnresponsiveAppHandler(window) {
-  window.off('unresponsive', window.unresponsiveHandler);
+  window.off("unresponsive", window.unresponsiveHandler);
 }
 
 function showErrorBox(title, error) {
-  dialog.showErrorBox(
+  dialog.showErrorBox(title, `${error.name}\n\n${error.message}`);
-    title,
-    `${error.name}\n\n${error.message}`
-  );
 }
 
 function exportSaveFromIndexedDb() {
@@ -71,15 +71,15 @@ function exportSaveFromIndexedDb() {
     const dbRequest = indexedDB.open("bitburnerSave");
     dbRequest.onsuccess = () => {
       const db = dbRequest.result;
-      const transaction = db.transaction(['savestring'], "readonly");
+      const transaction = db.transaction(["savestring"], "readonly");
-      const store = transaction.objectStore('savestring');
+      const store = transaction.objectStore("savestring");
-      const request = store.get('save');
+      const request = store.get("save");
       request.onsuccess = () => {
-        const file = new Blob([request.result], {type: 'text/plain'});
+        const file = new Blob([request.result], { type: "text/plain" });
         const a = document.createElement("a");
         const url = URL.createObjectURL(file);
         a.href = url;
-        a.download = 'save.json';
+        a.download = "save.json";
         document.body.appendChild(a);
         a.click();
         setTimeout(function () {
@@ -87,24 +87,21 @@ function exportSaveFromIndexedDb() {
           window.URL.revokeObjectURL(url);
           resolve();
         }, 0);
-      }
+      };
-    }
+    };
   });
 }
 
 async function exportSave(window) {
-  await window.webContents
+  await window.webContents.executeJavaScript(`${exportSaveFromIndexedDb.toString()}; exportSaveFromIndexedDb();`, true);
-    .executeJavaScript(`${exportSaveFromIndexedDb.toString()}; exportSaveFromIndexedDb();`, true);
 }
 
 async function writeTerminal(window, message, type = null) {
-  await window.webContents
+  await window.webContents.executeJavaScript(`window.appNotifier.terminal("${message}", "${type}");`, true);
-    .executeJavaScript(`window.appNotifier.terminal("${message}", "${type}");`, true)
 }
 
 async function writeToast(window, message, type = "info", duration = 2000) {
-  await window.webContents
+  await window.webContents.executeJavaScript(`window.appNotifier.toast("${message}", "${type}", ${duration});`, true);
-    .executeJavaScript(`window.appNotifier.toast("${message}", "${type}", ${duration});`, true)
 }
 
 function openExternal(url) {
@@ -113,7 +110,7 @@ function openExternal(url) {
 }
 
 function getZoomFactor() {
-  const configZoom = config.get('zoom', 1);
+  const configZoom = config.get("zoom", 1);
   return configZoom;
 }
 
@@ -121,14 +118,20 @@ function setZoomFactor(window, zoom = null) {
   if (zoom === null) {
     zoom = 1;
   } else {
-    config.set('zoom', zoom);
+    config.set("zoom", zoom);
   }
   window.webContents.setZoomFactor(zoom);
 }
 
 module.exports = {
-  reloadAndKill, showErrorBox, exportSave,
+  reloadAndKill,
-  attachUnresponsiveAppHandler, detachUnresponsiveAppHandler,
+  showErrorBox,
-  openExternal, writeTerminal, writeToast,
+  exportSave,
-  getZoomFactor, setZoomFactor,
+  attachUnresponsiveAppHandler,
-}
+  detachUnresponsiveAppHandler,
+  openExternal,
+  writeTerminal,
+  writeToast,
+  getZoomFactor,
+  setZoomFactor,
+};

jest.config.js

@@ -4,12 +4,11 @@ module.exports = {
   transform: {
     "^.+\\.(js|jsx|ts|tsx)$": "babel-jest",
   },
-  testPathIgnorePatterns: [
+  testPathIgnorePatterns: [".cypress", "node_modules", "dist"],
-    '.cypress', 'node_modules', 'dist',
-  ],
   testEnvironment: "jsdom",
   moduleNameMapper: {
-    "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/test/__mocks__/fileMock.js",
+    "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$":
-    "\\.(css|less)$": "<rootDir>/test/__mocks__/styleMock.js"
+      "<rootDir>/test/__mocks__/fileMock.js",
-  }
+    "\\.(css|less)$": "<rootDir>/test/__mocks__/styleMock.js",
+  },
 };

package-lock.json

@@ -69,7 +69,7 @@
         "babel-jest": "^27.0.6",
         "babel-loader": "^8.0.5",
         "cypress": "^8.3.1",
-        "electron": "^14.0.2",
+        "electron": "^14.2.4",
         "electron-packager": "^15.4.0",
         "eslint": "^7.24.0",
         "file-loader": "^6.2.0",
@@ -7821,9 +7821,9 @@
       "dev": true
     },
     "node_modules/electron": {
-      "version": "14.0.2",
+      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-14.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-14.2.4.tgz",
-      "integrity": "sha512-LIJj795cfggUtLHIM84lseE7LC0kAs/HNVXoDFPTjtYzQikPX9XAIMI1BTJcod3j+U1ZXsayk9N4M3M890WD3w==",
+      "integrity": "sha512-uskCIp+fpohqVYtM2Q28rbXLqGjZ6sWYylXcX6N+K8jR8kR2eHuDMIkO8DzWrTsqA6t4UNAzn+bJnA3VfIIjQw==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -15190,9 +15190,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
+      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "node_modules/mixin-deep": {
       "version": "1.3.2",
@@ -16484,9 +16484,9 @@
       }
     },
     "node_modules/plist": {
-      "version": "3.0.4",
+      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz",
-      "integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==",
+      "integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==",
       "dev": true,
       "dependencies": {
         "base64-js": "^1.5.1",
@@ -28515,9 +28515,9 @@
       "dev": true
     },
     "electron": {
-      "version": "14.0.2",
+      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-14.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-14.2.4.tgz",
-      "integrity": "sha512-LIJj795cfggUtLHIM84lseE7LC0kAs/HNVXoDFPTjtYzQikPX9XAIMI1BTJcod3j+U1ZXsayk9N4M3M890WD3w==",
+      "integrity": "sha512-uskCIp+fpohqVYtM2Q28rbXLqGjZ6sWYylXcX6N+K8jR8kR2eHuDMIkO8DzWrTsqA6t4UNAzn+bJnA3VfIIjQw==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
@@ -34244,9 +34244,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
+      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "mixin-deep": {
       "version": "1.3.2",
@@ -35264,9 +35264,9 @@
       }
     },
     "plist": {
-      "version": "3.0.4",
+      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz",
-      "integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==",
+      "integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==",
       "dev": true,
       "requires": {
         "base64-js": "^1.5.1",

package.json

@@ -70,7 +70,7 @@
     "babel-jest": "^27.0.6",
     "babel-loader": "^8.0.5",
     "cypress": "^8.3.1",
-    "electron": "^14.0.2",
+    "electron": "^14.2.4",
     "electron-packager": "^15.4.0",
     "eslint": "^7.24.0",
     "file-loader": "^6.2.0",

src/Achievements/AchievementEntry.tsx

@@ -3,7 +3,7 @@ import React from "react";
 import { Box, Typography } from "@mui/material";
 
 import { Achievement } from "./Achievements";
-import { Settings } from "../Settings/Settings"
+import { Settings } from "../Settings/Settings";
 import { AchievementIcon } from "./AchievementIcon";
 
 interface IProps {
@@ -13,43 +13,58 @@ interface IProps {
   cssFiltersLocked: string;
 }
 
-export function AchievementEntry({ achievement, unlockedOn, cssFiltersUnlocked, cssFiltersLocked }: IProps): JSX.Element {
+export function AchievementEntry({
+  achievement,
+  unlockedOn,
+  cssFiltersUnlocked,
+  cssFiltersLocked,
+}: IProps): JSX.Element {
   if (!achievement) return <></>;
   const isUnlocked = !!unlockedOn;
 
   const mainColor = isUnlocked ? Settings.theme.primary : Settings.theme.secondarylight;
 
-  let achievedOn = '';
+  let achievedOn = "";
   if (unlockedOn) {
     achievedOn = new Date(unlockedOn).toLocaleString();
   }
 
   return (
-    <Box sx={{
+    <Box
-      border: `1px solid ${Settings.theme.well}`, mb: 2
+      sx={{
-    }}>
+        border: `1px solid ${Settings.theme.well}`,
-      <Box sx={{
+        mb: 2,
-        display: 'flex',
+      }}
-        flexDirection: 'row',
+    >
-        flexWrap: 'wrap',
+      <Box
-      }}>
+        sx={{
+          display: "flex",
+          flexDirection: "row",
+          flexWrap: "wrap",
+        }}
+      >
         <AchievementIcon
-          achievement={achievement} unlocked={isUnlocked} size="72px"
+          achievement={achievement}
-          colorFilters={isUnlocked ? cssFiltersUnlocked: cssFiltersLocked} />
+          unlocked={isUnlocked}
-        <Box sx={{
+          size="72px"
-          display: 'flex',
+          colorFilters={isUnlocked ? cssFiltersUnlocked : cssFiltersLocked}
-          flexDirection: 'column',
+        />
-          justifyContent: 'center',
+        <Box
-          px: 1
+          sx={{
-        }}>
+            display: "flex",
-          <Typography variant="h6" sx={{ color: mainColor}}>
+            flexDirection: "column",
+            justifyContent: "center",
+            px: 1,
+          }}
+        >
+          <Typography variant="h6" sx={{ color: mainColor }}>
             {achievement.Name}
           </Typography>
-          <Typography variant="body2" sx={{ maxWidth: '500px', color: mainColor}}>
+          <Typography variant="body2" sx={{ maxWidth: "500px", color: mainColor }}>
             {achievement.Description}
           </Typography>
           {isUnlocked && (
-            <Typography variant="caption" sx={{ fontSize: '12px', color: Settings.theme.primarydark }}>
+            <Typography variant="caption" sx={{ fontSize: "12px", color: Settings.theme.primarydark }}>
               Acquired on {achievedOn}
             </Typography>
           )}

src/Achievements/AchievementIcon.tsx

@@ -3,7 +3,7 @@ import React, { useState } from "react";
 import { Box } from "@mui/material";
 
 import { Achievement } from "./Achievements";
-import { Settings } from "../Settings/Settings"
+import { Settings } from "../Settings/Settings";
 
 interface IProps {
   achievement: Achievement;
@@ -16,20 +16,23 @@ export function AchievementIcon({ achievement, unlocked, colorFilters, size }: I
   const [imgLoaded, setImgLoaded] = useState(false);
   const mainColor = unlocked ? Settings.theme.primarydark : Settings.theme.secondarydark;
 
-  if (!achievement.Icon) return (<></>);
+  if (!achievement.Icon) return <></>;
   return (
     <Box
       sx={{
         border: `1px solid ${mainColor}`,
-        width: size, height: size,
+        width: size,
+        height: size,
         m: 1,
-        visibility: imgLoaded ? 'visible' : 'hidden'
+        visibility: imgLoaded ? "visible" : "hidden",
       }}
     >
-      <img src={`dist/icons/achievements/${encodeURI(achievement.Icon)}.svg`}
+      <img
+        src={`dist/icons/achievements/${encodeURI(achievement.Icon)}.svg`}
         style={{ filter: colorFilters, width: size, height: size }}
         onLoad={() => setImgLoaded(true)}
-        alt={achievement.Name} />
+        alt={achievement.Name}
+      />
     </Box>
   );
 }

src/Achievements/AchievementList.tsx

@@ -3,8 +3,8 @@ import React from "react";
 import { Accordion, AccordionSummary, AccordionDetails, Box, Typography } from "@mui/material";
 
 import { AchievementEntry } from "./AchievementEntry";
-import { Achievement,  PlayerAchievement} from "./Achievements";
+import { Achievement, PlayerAchievement } from "./Achievements";
-import { Settings } from "../Settings/Settings"
+import { Settings } from "../Settings/Settings";
 import { getFiltersFromHex } from "../ThirdParty/colorUtils";
 import { CorruptableText } from "../ui/React/CorruptableText";
 
@@ -18,32 +18,39 @@ export function AchievementList({ achievements, playerAchievements }: IProps): J
   const cssPrimary = getFiltersFromHex(Settings.theme.primary);
   const cssSecondary = getFiltersFromHex(Settings.theme.secondary);
 
-  const data = achievements.map(achievement => ({
+  const data = achievements
+    .map((achievement) => ({
       achievement,
-    unlockedOn: playerAchievements.find(playerAchievement => playerAchievement.ID === achievement.ID)?.unlockedOn,
+      unlockedOn: playerAchievements.find((playerAchievement) => playerAchievement.ID === achievement.ID)?.unlockedOn,
-  })).sort((a, b) => (b.unlockedOn ?? 0) - (a.unlockedOn ?? 0));
+    }))
+    .sort((a, b) => (b.unlockedOn ?? 0) - (a.unlockedOn ?? 0));
 
-  const unlocked = data.filter(entry => entry.unlockedOn);
+  const unlocked = data.filter((entry) => entry.unlockedOn);
 
   // Hidden achievements
-  const secret = data.filter(entry => !entry.unlockedOn && entry.achievement.Secret)
+  const secret = data.filter((entry) => !entry.unlockedOn && entry.achievement.Secret);
 
   // Locked behind locked content (bitnode x)
-  const unavailable = data.filter(entry => !entry.unlockedOn && !entry.achievement.Secret && entry.achievement.Visible && !entry.achievement.Visible());
+  const unavailable = data.filter(
+    (entry) =>
+      !entry.unlockedOn && !entry.achievement.Secret && entry.achievement.Visible && !entry.achievement.Visible(),
+  );
 
   // Remaining achievements
   const locked = data
-    .filter(entry => !unlocked.map(u => u.achievement.ID).includes(entry.achievement.ID))
+    .filter((entry) => !unlocked.map((u) => u.achievement.ID).includes(entry.achievement.ID))
-    .filter(entry => !secret.map(u => u.achievement.ID).includes(entry.achievement.ID))
+    .filter((entry) => !secret.map((u) => u.achievement.ID).includes(entry.achievement.ID))
-    .filter(entry => !unavailable.map(u => u.achievement.ID).includes(entry.achievement.ID));
+    .filter((entry) => !unavailable.map((u) => u.achievement.ID).includes(entry.achievement.ID));
 
   return (
     <Box sx={{ pr: 18, my: 2 }}>
-      <Box sx={{
+      <Box
-        display: 'flex',
+        sx={{
-        flexDirection: 'column',
+          display: "flex",
-        flexWrap: 'wrap',
+          flexDirection: "column",
-      }}>
+          flexWrap: "wrap",
+        }}
+      >
         {unlocked.length > 0 && (
           <Accordion defaultExpanded disableGutters square>
             <AccordionSummary>
@@ -52,12 +59,14 @@ export function AchievementList({ achievements, playerAchievements }: IProps): J
               </Typography>
             </AccordionSummary>
             <AccordionDetails sx={{ pt: 2 }}>
-              {unlocked.map(item => (
+              {unlocked.map((item) => (
-                <AchievementEntry key={`unlocked_${item.achievement.ID}`}
+                <AchievementEntry
+                  key={`unlocked_${item.achievement.ID}`}
                   achievement={item.achievement}
                   unlockedOn={item.unlockedOn}
                   cssFiltersUnlocked={cssPrimary}
-                  cssFiltersLocked={cssSecondary} />
+                  cssFiltersLocked={cssSecondary}
+                />
               ))}
             </AccordionDetails>
           </Accordion>
@@ -71,11 +80,13 @@ export function AchievementList({ achievements, playerAchievements }: IProps): J
               </Typography>
             </AccordionSummary>
             <AccordionDetails sx={{ pt: 2 }}>
-              {locked.map(item => (
+              {locked.map((item) => (
-                <AchievementEntry key={`locked_${item.achievement.ID}`}
+                <AchievementEntry
+                  key={`locked_${item.achievement.ID}`}
                   achievement={item.achievement}
                   cssFiltersUnlocked={cssPrimary}
-                  cssFiltersLocked={cssSecondary} />
+                  cssFiltersLocked={cssSecondary}
+                />
               ))}
             </AccordionDetails>
           </Accordion>
@@ -105,7 +116,7 @@ export function AchievementList({ achievements, playerAchievements }: IProps): J
             </AccordionSummary>
             <AccordionDetails>
               <Typography color="secondary" sx={{ mt: 1 }}>
-                {secret.map(item => (
+                {secret.map((item) => (
                   <span key={`secret_${item.achievement.ID}`}>
                     <CorruptableText content={item.achievement.ID}></CorruptableText>
                     <br />

src/Achievements/README.md

@@ -1,9 +1,9 @@
 # Adding Achievements
 
-* Add a .svg in `./assets/Steam/achievements/real`
+- Add a .svg in `./assets/Steam/achievements/real`
-* Create the achievement in Steam Dev Portal
+- Create the achievement in Steam Dev Portal
-* Run `sh ./assets/Steam/achievements/pack-for-web.sh`
+- Run `sh ./assets/Steam/achievements/pack-for-web.sh`
-* Run `node ./tools/fetch-steam-achievements-data DEVKEYHERE`
+- Run `node ./tools/fetch-steam-achievements-data DEVKEYHERE`
-  * Get your key here: https://steamcommunity.com/dev/apikey
+  - Get your key here: https://steamcommunity.com/dev/apikey
-* Add an entry in `./src/Achievements/Achievements.ts` -> achievements
+- Add an entry in `./src/Achievements/Achievements.ts` -> achievements
-* Commit `./dist/icons/achievements` & `./src/Achievements/AchievementData.json`
+- Commit `./dist/icons/achievements` & `./src/Achievements/AchievementData.json`

src/Augmentation/Augmentation.tsx

@@ -2,7 +2,6 @@
 import * as React from "react";
 import { IMap } from "../types";
 
-import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
 import { Faction } from "../Faction/Faction";
 import { Factions } from "../Faction/Factions";
 import { numeralWrapper } from "../ui/numeralFormat";
@@ -410,8 +409,8 @@ export class Augmentation {
     this.info = params.info;
     this.prereqs = params.prereqs ? params.prereqs : [];
 
-    this.baseRepRequirement = params.repCost * BitNodeMultipliers.AugmentationRepCost;
+    this.baseRepRequirement = params.repCost;
-    this.baseCost = params.moneyCost * BitNodeMultipliers.AugmentationMoneyCost;
+    this.baseCost = params.moneyCost;
     this.startingCost = this.baseCost;
     this.factions = params.factions;
 

src/Augmentation/AugmentationCreator.tsx

@@ -94,7 +94,7 @@ function getRandomBonus(): any {
   return bonuses[Math.floor(bonuses.length * randomNumber.random())];
 }
 
-export const generalAugmentations = [
+export const initGeneralAugmentations = (): Augmentation[] => [
   new Augmentation({
     name: AugmentationNames.HemoRecirculator,
     moneyCost: 4.5e7,
@@ -1484,9 +1484,22 @@ export const generalAugmentations = [
     ),
     factions: [FactionNames.TianDiHui],
   }),
+
+  // Grafting-exclusive Augmentation
+  new Augmentation({
+    name: AugmentationNames.CongruityImplant,
+    repCost: 0,
+    moneyCost: 50e12,
+    info:
+      "Developed by a pioneer in Grafting research, this implant " +
+      "generates pulses of stability which seem to have a nullifying " +
+      "effect versus the Entropy virus.",
+    stats: <>This Augmentation removes the Entropy virus, and prevents it from affecting you again.</>,
+    factions: [],
+  }),
 ];
 
-export const bladeburnerAugmentations = [
+export const initBladeburnerAugmentations = (): Augmentation[] => [
   new Augmentation({
     name: AugmentationNames.EsperEyewear,
     repCost: 1.25e3,
@@ -1751,7 +1764,7 @@ export const bladeburnerAugmentations = [
   }),
 ];
 
-export const churchOfTheMachineGodAugmentations = [
+export const initChurchOfTheMachineGodAugmentations = (): Augmentation[] => [
   new Augmentation({
     name: AugmentationNames.StaneksGift1,
     repCost: 0,

src/Augmentation/AugmentationHelpers.tsx

@@ -15,9 +15,9 @@ import { clearObject } from "../utils/helpers/clearObject";
 
 import { FactionNames } from "../Faction/data/FactionNames";
 import {
-  bladeburnerAugmentations,
+  initBladeburnerAugmentations,
-  churchOfTheMachineGodAugmentations,
+  initChurchOfTheMachineGodAugmentations,
-  generalAugmentations,
+  initGeneralAugmentations,
   initNeuroFluxGovernor,
   initUnstableCircadianModulator,
 } from "./AugmentationCreator";
@@ -49,9 +49,9 @@ function createAugmentations(): void {
   [
     initNeuroFluxGovernor(),
     initUnstableCircadianModulator(),
-    ...generalAugmentations,
+    ...initGeneralAugmentations(),
-    ...(factionExists(FactionNames.Bladeburners) ? bladeburnerAugmentations : []),
+    ...(factionExists(FactionNames.Bladeburners) ? initBladeburnerAugmentations() : []),
-    ...(factionExists(FactionNames.ChurchOfTheMachineGod) ? churchOfTheMachineGodAugmentations : []),
+    ...(factionExists(FactionNames.ChurchOfTheMachineGod) ? initChurchOfTheMachineGodAugmentations() : []),
   ].map(resetAugmentation);
 }
 
@@ -141,6 +141,12 @@ function applyAugmentation(aug: IPlayerOwnedAugmentation, reapply = false): void
     }
   }
 
+  // Special logic for Congruity Implant
+  if (aug.name === AugmentationNames.CongruityImplant && !reapply) {
+    Player.entropy = 0;
+    Player.applyEntropy(Player.entropy);
+  }
+
   // Push onto Player's Augmentation list
   if (!reapply) {
     const ownedAug = new PlayerOwnedAugmentation(aug.name);
@@ -148,8 +154,8 @@ function applyAugmentation(aug: IPlayerOwnedAugmentation, reapply = false): void
   }
 }
 
-function installAugmentations(): boolean {
+function installAugmentations(force?: boolean): boolean {
-  if (Player.queuedAugmentations.length == 0) {
+  if (Player.queuedAugmentations.length == 0 && !force) {
     dialogBoxCreate("You have not purchased any Augmentations to install!");
     return false;
   }
@@ -179,12 +185,14 @@ function installAugmentations(): boolean {
     augmentationList += aug.name + level + "<br>";
   }
   Player.queuedAugmentations = [];
+  if (!force) {
     dialogBoxCreate(
       "You slowly drift to sleep as scientists put you under in order " +
         "to install the following Augmentations:<br>" +
         augmentationList +
         "<br>You wake up in your home...you feel different...",
     );
+  }
   prestigeAugmentation();
   return true;
 }

src/Augmentation/data/AugmentationNames.ts

@@ -91,6 +91,7 @@ export enum AugmentationNames {
   BionicArms = "Bionic Arms",
   SNA = "Social Negotiation Assistant (S.N.A)",
   HydroflameLeftArm = "Hydroflame Left Arm",
+  CongruityImplant = "nickofolas Congruity Implant",
   EsperEyewear = "EsperTech Bladeburner Eyewear",
   EMS4Recombination = "EMS-4 Recombination",
   OrionShoulder = "ORION-MKIV Shoulder",

src/Bladeburner/Action.tsx

@@ -135,9 +135,7 @@ export class Action implements IAction {
     for (const decay of Object.keys(this.decays)) {
       if (this.decays.hasOwnProperty(decay)) {
         if (this.decays[decay] > 1) {
-          throw new Error(
+          throw new Error(`Invalid decays when constructing Action ${this.name}. Decay value cannot be greater than 1`);
-            `Invalid decays when constructing Action ${this.name}. Decay value cannot be greater than 1`,
-          );
         }
       }
     }

src/Bladeburner/GeneralActions.tsx

@@ -3,16 +3,16 @@ import { IMap } from "../types";
 
 export const GeneralActions: IMap<Action> = {};
 
-const actionNames : Array<string> = [
+const actionNames: Array<string> = [
   "Training",
   "Field Analysis",
   "Recruitment",
   "Diplomacy",
   "Hyperbolic Regeneration Chamber",
-  "Incite Violence"
+  "Incite Violence",
 ];
 
-for (const actionName of actionNames){
+for (const actionName of actionNames) {
   GeneralActions[actionName] = new Action({
     name: actionName,
   });

src/Bladeburner/Skills.ts

@@ -7,8 +7,7 @@ export const Skills: IMap<Skill> = {};
 (function () {
   Skills[SkillNames.BladesIntuition] = new Skill({
     name: SkillNames.BladesIntuition,
-    desc:
+    desc: "Each level of this skill increases your success chance for all Contracts, Operations, and BlackOps by 3%",
-      "Each level of this skill increases your success chance for all Contracts, Operations, and BlackOps by 3%",
     baseCost: 3,
     costInc: 2.1,
     successChanceAll: 3,

src/Bladeburner/data/BlackOperations.tsx

@@ -17,8 +17,8 @@ export const BlackOperations: {
         Zenyatta, along with the rest of the PMC, is a Synthoid.
         <br />
         <br />
-        The goal of {BlackOperationNames.OperationTyphoon} is to find and eliminate Zenyatta and RedWater by any means necessary. After the
+        The goal of {BlackOperationNames.OperationTyphoon} is to find and eliminate Zenyatta and RedWater by any means
-        task is completed, the actions must be covered up from the general public.
+        necessary. After the task is completed, the actions must be covered up from the general public.
       </>
     ),
   },
@@ -30,10 +30,10 @@ export const BlackOperations: {
         supporter of Synthoid rights. He must be removed.
         <br />
         <br />
-        The goal of {BlackOperationNames.OperationZero} is to covertly infiltrate AeroCorp and uncover any incriminating evidence or
+        The goal of {BlackOperationNames.OperationZero} is to covertly infiltrate AeroCorp and uncover any incriminating
-        information against Watataki that will cause him to be removed from his position at AeroCorp. Incriminating
+        evidence or information against Watataki that will cause him to be removed from his position at AeroCorp.
-        evidence can be fabricated as a last resort. Be warned that AeroCorp has some of the most advanced security
+        Incriminating evidence can be fabricated as a last resort. Be warned that AeroCorp has some of the most advanced
-        measures in the world.
+        security measures in the world.
       </>
     ),
   },
@@ -47,8 +47,8 @@ export const BlackOperations: {
         <br />
         <br />
         Samizdat has done a good job of keeping hidden and anonymous. However, we've just received intelligence that
-        their base of operations is in {CityName.Ishima}'s underground sewer systems. Your task is to investigate the sewer
+        their base of operations is in {CityName.Ishima}'s underground sewer systems. Your task is to investigate the
-        systems, and eliminate Samizdat. They must never publish anything again.
+        sewer systems, and eliminate Samizdat. They must never publish anything again.
       </>
     ),
   },
@@ -61,9 +61,9 @@ export const BlackOperations: {
         dangerous.
         <br />
         <br />
-        Your goal is to enter and destroy the Bioengineering department's facility in {CityName.Aevum}. The task is not just to
+        Your goal is to enter and destroy the Bioengineering department's facility in {CityName.Aevum}. The task is not
-        retire the Synthoids there, but also to destroy any information or research at the facility that is relevant to
+        just to retire the Synthoids there, but also to destroy any information or research at the facility that is
-        the Synthoids and their goals.
+        relevant to the Synthoids and their goals.
       </>
     ),
   },
@@ -96,10 +96,10 @@ export const BlackOperations: {
     desc: (
       <>
         The CIA has just encountered a new security threat. A new criminal group, lead by a shadowy operative who calls
-        himself Juggernaut, has been smuggling drugs and weapons (including suspected bioweapons) into {CityName.Sector12}. We
+        himself Juggernaut, has been smuggling drugs and weapons (including suspected bioweapons) into{" "}
-        also have reason to believe they tried to break into one of Universal Energy's facilities in order to cause a
+        {CityName.Sector12}. We also have reason to believe they tried to break into one of Universal Energy's
-        city-wide blackout. The CIA suspects that Juggernaut is a heavily-augmented Synthoid, and have thus enlisted our
+        facilities in order to cause a city-wide blackout. The CIA suspects that Juggernaut is a heavily-augmented
-        help.
+        Synthoid, and have thus enlisted our help.
         <br />
         <br />
         Your mission is to eradicate Juggernaut and his followers.
@@ -109,13 +109,13 @@ export const BlackOperations: {
   [BlackOperationNames.OperationRedDragon]: {
     desc: (
       <>
-        The {FactionNames.Tetrads} criminal organization is suspected of reverse-engineering the MK-VI Synthoid design. We believe they
+        The {FactionNames.Tetrads} criminal organization is suspected of reverse-engineering the MK-VI Synthoid design.
-        altered and possibly improved the design and began manufacturing their own Synthoid models in order to bolster
+        We believe they altered and possibly improved the design and began manufacturing their own Synthoid models in
-        their criminal activities.
+        order to bolster their criminal activities.
         <br />
         <br />
-        Your task is to infiltrate and destroy the {FactionNames.Tetrads}' base of operations in Los Angeles. Intelligence tells us
+        Your task is to infiltrate and destroy the {FactionNames.Tetrads}' base of operations in Los Angeles.
-        that their base houses one of their Synthoid manufacturing units.
+        Intelligence tells us that their base houses one of their Synthoid manufacturing units.
       </>
     ),
   },
@@ -138,23 +138,24 @@ export const BlackOperations: {
   [BlackOperationNames.OperationDeckard]: {
     desc: (
       <>
-        Despite your success in eliminating VitaLife's new android-replicating technology in {BlackOperationNames.OperationK}, we've
+        Despite your success in eliminating VitaLife's new android-replicating technology in{" "}
-        discovered that a small group of MK-VI Synthoids were able to make off with the schematics and design of the
+        {BlackOperationNames.OperationK}, we've discovered that a small group of MK-VI Synthoids were able to make off
-        technology before the Operation. It is almost a certainty that these Synthoids are some of the rogue MK-VI ones
+        with the schematics and design of the technology before the Operation. It is almost a certainty that these
-        from the Synthoid Uprising.
+        Synthoids are some of the rogue MK-VI ones from the Synthoid Uprising.
         <br />
         <br />
-        The goal of {BlackOperationNames.OperationDeckard} is to hunt down these Synthoids and retire them. I don't need to tell you how
+        The goal of {BlackOperationNames.OperationDeckard} is to hunt down these Synthoids and retire them. I don't need
-        critical this mission is.
+        to tell you how critical this mission is.
       </>
     ),
   },
   [BlackOperationNames.OperationTyrell]: {
     desc: (
       <>
-        A week ago {FactionNames.BladeIndustries} reported a small break-in at one of their {CityName.Aevum} Augmentation storage facilities. We
+        A week ago {FactionNames.BladeIndustries} reported a small break-in at one of their {CityName.Aevum}{" "}
-        figured out that {FactionNames.TheDarkArmy} was behind the heist, and didn't think any more of it. However, we've just
+        Augmentation storage facilities. We figured out that {FactionNames.TheDarkArmy} was behind the heist, and didn't
-        discovered that several known MK-VI Synthoids were part of that break-in group.
+        think any more of it. However, we've just discovered that several known MK-VI Synthoids were part of that
+        break-in group.
         <br />
         <br />
         We cannot have Synthoids upgrading their already-enhanced abilities with Augmentations. Your task is to hunt
@@ -165,15 +166,17 @@ export const BlackOperations: {
   [BlackOperationNames.OperationWallace]: {
     desc: (
       <>
-        Based on information gathered from {BlackOperationNames.OperationTyrell}, we've discovered that {FactionNames.TheDarkArmy} was well aware that
+        Based on information gathered from {BlackOperationNames.OperationTyrell}, we've discovered that{" "}
-        there were Synthoids amongst their ranks. Even worse, we believe that {FactionNames.TheDarkArmy} is working together with
+        {FactionNames.TheDarkArmy} was well aware that there were Synthoids amongst their ranks. Even worse, we believe
-        other criminal organizations such as {FactionNames.TheSyndicate} and that they are planning some sort of large-scale takeover
+        that {FactionNames.TheDarkArmy} is working together with other criminal organizations such as{" "}
-        of multiple major cities, most notably {CityName.Aevum}. We suspect that Synthoids have infiltrated the ranks of these
+        {FactionNames.TheSyndicate} and that they are planning some sort of large-scale takeover of multiple major
-        criminal factions and are trying to stage another Synthoid uprising.
+        cities, most notably {CityName.Aevum}. We suspect that Synthoids have infiltrated the ranks of these criminal
+        factions and are trying to stage another Synthoid uprising.
         <br />
         <br />
-        The best way to deal with this is to prevent it before it even happens. The goal of {BlackOperationNames.OperationWallace} is to
+        The best way to deal with this is to prevent it before it even happens. The goal of{" "}
-        destroy {FactionNames.TheDarkArmy} and Syndicate factions in {CityName.Aevum} immediately. Leave no survivors.
+        {BlackOperationNames.OperationWallace} is to destroy {FactionNames.TheDarkArmy} and Syndicate factions in{" "}
+        {CityName.Aevum} immediately. Leave no survivors.
       </>
     ),
   },
@@ -193,18 +196,18 @@ export const BlackOperations: {
   [BlackOperationNames.OperationHyron]: {
     desc: (
       <>
-        Our intelligence tells us that {FactionNames.FulcrumSecretTechnologies} is developing a quantum supercomputer using human brains as
+        Our intelligence tells us that {FactionNames.FulcrumSecretTechnologies} is developing a quantum supercomputer
-        core processors. This supercomputer is rumored to be able to store vast amounts of data and perform computations
+        using human brains as core processors. This supercomputer is rumored to be able to store vast amounts of data
-        unmatched by any other supercomputer on the planet. But more importantly, the use of organic human brains means
+        and perform computations unmatched by any other supercomputer on the planet. But more importantly, the use of
-        that the supercomputer may be able to reason abstractly and become self-aware.
+        organic human brains means that the supercomputer may be able to reason abstractly and become self-aware.
         <br />
         <br />
         I do not need to remind you why sentient-level AIs pose a serious threat to all of mankind.
         <br />
         <br />
-        The research for this project is being conducted at one of {FactionNames.FulcrumSecretTechnologies} secret facilities in {CityName.Aevum},
+        The research for this project is being conducted at one of {FactionNames.FulcrumSecretTechnologies} secret
-        codenamed 'Alpha Ranch'. Infiltrate the compound, delete and destroy the work, and then find and kill the
+        facilities in {CityName.Aevum}, codenamed 'Alpha Ranch'. Infiltrate the compound, delete and destroy the work,
-        project lead.
+        and then find and kill the project lead.
       </>
     ),
   },
@@ -213,8 +216,8 @@ export const BlackOperations: {
       <>
         DreamSense Technologies is an advertising company that uses special technology to transmit their ads into the
         people's dreams and subconcious. They do this using broadcast transmitter towers. Based on information from our
-        agents and informants in {CityName.Chongqing}, we have reason to believe that one of the broadcast towers there has been
+        agents and informants in {CityName.Chongqing}, we have reason to believe that one of the broadcast towers there
-        compromised by Synthoids and is being used to spread pro-Synthoid propaganda.
+        has been compromised by Synthoids and is being used to spread pro-Synthoid propaganda.
         <br />
         <br />
         The mission is to destroy this broadcast tower. Speed and stealth are of the utmost importance for this.
@@ -224,36 +227,38 @@ export const BlackOperations: {
   [BlackOperationNames.OperationIonStorm]: {
     desc: (
       <>
-        Our analysts have uncovered a gathering of MK-VI Synthoids that have taken up residence in the {CityName.Sector12} Slums.
+        Our analysts have uncovered a gathering of MK-VI Synthoids that have taken up residence in the{" "}
-        We don't know if they are rogue Synthoids from the Uprising, but we do know that they have been stockpiling
+        {CityName.Sector12} Slums. We don't know if they are rogue Synthoids from the Uprising, but we do know that they
-        weapons, money, and other resources. This makes them dangerous.
+        have been stockpiling weapons, money, and other resources. This makes them dangerous.
         <br />
         <br />
-        This is a full-scale assault operation to find and retire all of these Synthoids in the {CityName.Sector12} Slums.
+        This is a full-scale assault operation to find and retire all of these Synthoids in the {CityName.Sector12}{" "}
+        Slums.
       </>
     ),
   },
   [BlackOperationNames.OperationAnnihilus]: {
     desc: (
       <>
-        Our superiors have ordered us to eradicate everything and everyone in an underground facility located in {CityName.Aevum}.
+        Our superiors have ordered us to eradicate everything and everyone in an underground facility located in{" "}
-        They tell us that the facility houses many dangerous Synthoids and belongs to a terrorist organization called
+        {CityName.Aevum}. They tell us that the facility houses many dangerous Synthoids and belongs to a terrorist
-        '{FactionNames.TheCovenant}'. We have no prior intelligence about this organization, so you are going in blind.
+        organization called '{FactionNames.TheCovenant}'. We have no prior intelligence about this organization, so you
+        are going in blind.
       </>
     ),
   },
   [BlackOperationNames.OperationUltron]: {
     desc: (
       <>
-        {FactionNames.OmniTekIncorporated}, the original designer and manufacturer of Synthoids, has notified us of a malfunction in
+        {FactionNames.OmniTekIncorporated}, the original designer and manufacturer of Synthoids, has notified us of a
-        their AI design. This malfunction, when triggered, causes MK-VI Synthoids to become radicalized and seek out the
+        malfunction in their AI design. This malfunction, when triggered, causes MK-VI Synthoids to become radicalized
-        destruction of humanity. They say that this bug affects all MK-VI Synthoids, not just the rogue ones from the
+        and seek out the destruction of humanity. They say that this bug affects all MK-VI Synthoids, not just the rogue
-        Uprising.
+        ones from the Uprising.
         <br />
         <br />
-        {FactionNames.OmniTekIncorporated} has also told us they they believe someone has triggered this malfunction in a large group of MK-VI
+        {FactionNames.OmniTekIncorporated} has also told us they they believe someone has triggered this malfunction in
-        Synthoids, and that these newly-radicalized Synthoids are now amassing in {CityName.Volhaven} to form a terrorist group
+        a large group of MK-VI Synthoids, and that these newly-radicalized Synthoids are now amassing in{" "}
-        called Ultron.
+        {CityName.Volhaven} to form a terrorist group called Ultron.
         <br />
         <br />
         Intelligence suggests Ultron is heavily armed and that their members are augmented. We believe Ultron is making

src/Bladeburner/data/Constants.ts

@@ -1,4 +1,4 @@
-import { CityName } from './../../Locations/data/CityNames';
+import { CityName } from "./../../Locations/data/CityNames";
 export const BladeburnerConstants: {
   CityNames: string[];
   CyclesPerSecond: number;
@@ -28,7 +28,14 @@ export const BladeburnerConstants: {
   HrcHpGain: number;
   HrcStaminaGain: number;
 } = {
-  CityNames: [CityName.Aevum, CityName.Chongqing, CityName.Sector12, CityName.NewTokyo, CityName.Ishima, CityName.Volhaven],
+  CityNames: [
+    CityName.Aevum,
+    CityName.Chongqing,
+    CityName.Sector12,
+    CityName.NewTokyo,
+    CityName.Ishima,
+    CityName.Volhaven,
+  ],
   CyclesPerSecond: 5, // Game cycle is 200 ms
 
   StaminaGainPerSecond: 0.0085,

src/Bladeburner/ui/BlackOpPage.tsx

@@ -18,7 +18,10 @@ export function BlackOpPage(props: IProps): React.ReactElement {
         successively by completing the one before it.
         <br />
         <br />
-        <b>Your ultimate goal to climb through the ranks of {FactionNames.Bladeburners} is to complete all of the Black Ops.</b>
+        <b>
+          Your ultimate goal to climb through the ranks of {FactionNames.Bladeburners} is to complete all of the Black
+          Ops.
+        </b>
         <br />
         <br />
         Like normal operations, you may use a team for Black Ops. Failing a black op will incur heavy HP and rank

src/Bladeburner/ui/Stats.tsx

@@ -44,13 +44,15 @@ export function Stats(props: IProps): React.ReactElement {
   }
 
   return (
-    <Paper sx={{ p: 1, overflowY: 'auto', overflowX: 'hidden', wordBreak: 'break-all' }}>
+    <Paper sx={{ p: 1, overflowY: "auto", overflowX: "hidden", wordBreak: "break-all" }}>
-      <Box sx={{ display: 'flex', flexDirection: 'column', gap: 1, maxHeight: '60vh' }}>
+      <Box sx={{ display: "flex", flexDirection: "column", gap: 1, maxHeight: "60vh" }}>
-        <Box sx={{ alignSelf: 'flex-start', width: '100%' }}>
+        <Box sx={{ alignSelf: "flex-start", width: "100%" }}>
-          <Button onClick={() => setTravelOpen(true)} sx={{ width: '50%' }}>Travel</Button>
+          <Button onClick={() => setTravelOpen(true)} sx={{ width: "50%" }}>
+            Travel
+          </Button>
           <Tooltip title={!inFaction ? <Typography>Rank 25 required.</Typography> : ""}>
             <span>
-              <Button disabled={!inFaction} onClick={openFaction} sx={{ width: '50%' }}>
+              <Button disabled={!inFaction} onClick={openFaction} sx={{ width: "50%" }}>
                 Faction
               </Button>
             </span>
@@ -110,8 +112,8 @@ export function Stats(props: IProps): React.ReactElement {
           <Tooltip
             title={
               <Typography>
-                This is your Bladeburner division's estimate of how many Synthoids exist in your current city. An accurate
+                This is your Bladeburner division's estimate of how many Synthoids exist in your current city. An
-                population count increases success rate estimates.
+                accurate population count increases success rate estimates.
               </Typography>
             }
           >

src/Casino/SlotMachine.tsx

@@ -159,7 +159,7 @@ export function SlotMachine(props: IProps): React.ReactElement {
     const copy = index.slice();
     for (let i = 0; i < copy.length; i++) {
       if (copy[i] === locks[i] && !stoppedOne) continue;
-      copy[i] = (copy[i] - 1 >= 0) ? copy[i] - 1 : symbols.length - 1;
+      copy[i] = copy[i] - 1 >= 0 ? copy[i] - 1 : symbols.length - 1;
       stoppedOne = true;
     }
 
@@ -170,7 +170,7 @@ export function SlotMachine(props: IProps): React.ReactElement {
     }
   }
 
-  function getTable(index:number[], symbols:string[]): string[][] {
+  function getTable(index: number[], symbols: string[]): string[][] {
     return [
       [
         symbols[(index[0] + symbols.length - 1) % symbols.length],
@@ -209,7 +209,7 @@ export function SlotMachine(props: IProps): React.ReactElement {
     ]);
   }
 
-  function checkWinnings(t:string[][]): void {
+  function checkWinnings(t: string[][]): void {
     const getPaylineData = function (payline: number[][]): string[] {
       const data = [];
       for (const point of payline) {

src/Corporation/Actions.ts

@@ -17,7 +17,6 @@ import { Employee } from "./Employee";
 import { IndustryUpgrades } from "./IndustryUpgrades";
 import { ResearchMap } from "./ResearchMap";
 import { isRelevantMaterial } from "./ui/Helpers";
-import { CityName } from "src/Locations/data/CityNames";
 
 export function NewIndustry(corporation: ICorporation, industry: string, name: string): void {
   if (corporation.divisions.find(({ type }) => industry == type))

src/Corporation/Industry.ts

@@ -435,10 +435,10 @@ export class Industry implements IIndustry {
       const popularityGain = corporation.getDreamSenseGain(),
         awarenessGain = popularityGain * 4;
       if (popularityGain > 0) {
-        const awareness = this.awareness + (awarenessGain * marketCycles);
+        const awareness = this.awareness + awarenessGain * marketCycles;
         this.awareness = Math.min(awareness, Number.MAX_VALUE);
 
-        const popularity = this.popularity + (popularityGain * marketCycles);
+        const popularity = this.popularity + popularityGain * marketCycles;
         this.popularity = Math.min(popularity, Number.MAX_VALUE);
       }
 
@@ -1188,7 +1188,8 @@ export class Industry implements IIndustry {
               }
             }
 
-            product.maxsll = 0.5 *
+            product.maxsll =
+              0.5 *
               Math.pow(product.rat, 0.65) *
               marketFactor *
               corporation.getSalesMultiplier() *
@@ -1281,10 +1282,10 @@ export class Industry implements IIndustry {
       case 1: {
         //AdVert.Inc,
         const advMult = corporation.getAdvertisingMultiplier() * this.getAdvertisingMultiplier();
-        const awareness = (this.awareness + (3 * advMult)) * (1.01 * advMult);
+        const awareness = (this.awareness + 3 * advMult) * (1.01 * advMult);
         this.awareness = Math.min(awareness, Number.MAX_VALUE);
 
-        const popularity = (this.popularity + (1 * advMult)) * ((1 + getRandomInt(1, 3) / 100) * advMult);
+        const popularity = (this.popularity + 1 * advMult) * ((1 + getRandomInt(1, 3) / 100) * advMult);
         this.popularity = Math.min(popularity, Number.MAX_VALUE);
         break;
       }

src/Corporation/OfficeSpace.ts

@@ -177,7 +177,7 @@ export class OfficeSpace {
     let jobCount = this.employees.reduce((acc, employee) => (employee.pos === job ? acc + 1 : acc), 0);
 
     for (const employee of this.employees) {
-      if (jobCount == amount) return true
+      if (jobCount == amount) return true;
       if (employee.pos === EmployeePositions.Unassigned && jobCount <= amount) {
         employee.pos = job;
         jobCount++;

src/Corporation/data/Constants.ts

@@ -1,4 +1,4 @@
-import { CityName } from './../../Locations/data/CityNames';
+import { CityName } from "./../../Locations/data/CityNames";
 const CyclesPerMarketCycle = 50;
 const AllCorporationStates = ["START", "PURCHASE", "PRODUCTION", "SALE", "EXPORT"];
 export const CorporationConstants: {
@@ -38,7 +38,14 @@ export const CorporationConstants: {
   CyclesPerIndustryStateCycle: CyclesPerMarketCycle / AllCorporationStates.length,
   SecsPerMarketCycle: CyclesPerMarketCycle / 5,
 
-  Cities: [CityName.Aevum, CityName.Chongqing, CityName.Sector12, CityName.NewTokyo, CityName.Ishima, CityName.Volhaven],
+  Cities: [
+    CityName.Aevum,
+    CityName.Chongqing,
+    CityName.Sector12,
+    CityName.NewTokyo,
+    CityName.Ishima,
+    CityName.Volhaven,
+  ],
 
   WarehouseInitialCost: 5e9, //Initial purchase cost of warehouse
   WarehouseInitialSize: 100,
@@ -74,16 +81,6 @@ export const CorporationConstants: {
     "AI Cores",
     "Real Estate",
   ],
-  FundingRoundShares: [
+  FundingRoundShares: [0.1, 0.35, 0.25, 0.2],
-    0.1,
+  FundingRoundMultiplier: [4, 3, 3, 2.5],
-    0.35,
-    0.25,
-    0.2
-  ],
-  FundingRoundMultiplier: [
-    4,
-    3,
-    3,
-    2.5
-  ],
 };

src/Corporation/ui/BuybackSharesModal.tsx

@@ -6,8 +6,8 @@ import { useCorporation } from "./Context";
 import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 import TextField from "@mui/material/TextField";
-import { BuyBackShares } from '../Actions';
+import { BuyBackShares } from "../Actions";
-import { dialogBoxCreate } from '../../ui/React/DialogBox';
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { KEY } from "../../utils/helpers/keyCodes";
 
 interface IProps {
@@ -40,9 +40,8 @@ export function BuybackSharesModal(props: IProps): React.ReactElement {
   function buy(): void {
     if (disabled) return;
     try {
-      BuyBackShares(corp, player, shares)
+      BuyBackShares(corp, player, shares);
-    }
+    } catch (err) {
-    catch (err) {
       dialogBoxCreate(err + "");
     }
     props.onClose();

src/Corporation/ui/CityTabs.tsx

@@ -30,7 +30,7 @@ export function CityTabs(props: IProps): React.ReactElement {
   }
   return (
     <>
-      <Tabs variant="fullWidth" value={city} onChange={handleChange} sx={{ maxWidth: '65%' }}>
+      <Tabs variant="fullWidth" value={city} onChange={handleChange} sx={{ maxWidth: "65%" }}>
         {Object.values(division.offices).map(
           (office: OfficeSpace | 0) => office !== 0 && <Tab key={office.loc} label={office.loc} value={office.loc} />,
         )}

src/Corporation/ui/CorporationRoot.tsx

@@ -38,7 +38,7 @@ export function CorporationRoot(): React.ReactElement {
 
   return (
     <Context.Corporation.Provider value={corporation}>
-      <Tabs variant="scrollable" value={divisionName} onChange={handleChange} sx={{ maxWidth: '65%' }} scrollButtons>
+      <Tabs variant="scrollable" value={divisionName} onChange={handleChange} sx={{ maxWidth: "65%" }} scrollButtons>
         <Tab label={corporation.name} value={"Overview"} />
         {corporation.divisions.map((div) => (
           <Tab key={div.name} label={div.name} value={div.name} />

src/Corporation/ui/CreateCorporationModal.tsx

@@ -56,9 +56,11 @@ export function CreateCorporationModal(props: IProps): React.ReactElement {
   return (
     <Modal open={props.open} onClose={props.onClose}>
       <Typography>
-        Would you like to start a corporation? This will require $150b for registration and initial funding. {player.bitNodeN === 3 && (`This $150b
+        Would you like to start a corporation? This will require $150b for registration and initial funding.{" "}
+        {player.bitNodeN === 3 &&
+          `This $150b
         can either be self-funded, or you can obtain the seed money from the government in exchange for 500 million
-        shares`)}
+        shares`}
         <br />
         <br />
         If you would like to start one, please enter a name for your corporation below:

src/Corporation/ui/ExportModal.tsx

@@ -23,7 +23,9 @@ interface IProps {
 // Create a popup that lets the player manage exports
 export function ExportModal(props: IProps): React.ReactElement {
   const corp = useCorporation();
-  const possibleDivisions = corp.divisions.filter((division: IIndustry) => isRelevantMaterial(props.mat.name, division));
+  const possibleDivisions = corp.divisions.filter((division: IIndustry) =>
+    isRelevantMaterial(props.mat.name, division),
+  );
   if (possibleDivisions.length === 0) throw new Error("Export popup created with no divisions.");
   const defaultDivision = possibleDivisions[0];
   if (Object.keys(defaultDivision.warehouses).length === 0)

src/Corporation/ui/FindInvestorsModal.tsx

@@ -17,7 +17,11 @@ interface IProps {
 export function FindInvestorsModal(props: IProps): React.ReactElement {
   const corporation = useCorporation();
   const val = corporation.determineValuation();
-  if (corporation.fundingRound >= CorporationConstants.FundingRoundShares.length || corporation.fundingRound >= CorporationConstants.FundingRoundMultiplier.length) return <></>;
+  if (
+    corporation.fundingRound >= CorporationConstants.FundingRoundShares.length ||
+    corporation.fundingRound >= CorporationConstants.FundingRoundMultiplier.length
+  )
+    return <></>;
   const percShares = CorporationConstants.FundingRoundShares[corporation.fundingRound];
   const roundMultiplier = CorporationConstants.FundingRoundMultiplier[corporation.fundingRound];
   const funding = val * percShares * roundMultiplier;

src/Corporation/ui/IndustryProductEquation.tsx

@@ -18,7 +18,5 @@ export function IndustryProductEquation(props: IProps): React.ReactElement {
     prod.push("Products");
   }
 
-  return (
+  return <MathJaxWrapper>{"\\(" + reqs.join("+") + `\\Rightarrow ` + prod.join("+") + "\\)"}</MathJaxWrapper>;
-    <MathJaxWrapper>{"\\(" + reqs.join("+") + `\\Rightarrow ` + prod.join("+") + "\\)"}</MathJaxWrapper>
-  );
 }

src/Corporation/ui/IndustryWarehouse.tsx

@@ -42,9 +42,9 @@ interface IProps {
 const useStyles = makeStyles(() =>
   createStyles({
     retainHeight: {
-      minHeight: '3em',
+      minHeight: "3em",
     },
-  })
+  }),
 );
 
 function WarehouseRoot(props: IProps): React.ReactElement {
@@ -127,27 +127,53 @@ function WarehouseRoot(props: IProps): React.ReactElement {
     const mat = props.warehouse.materials[matName];
     if (!MaterialSizes.hasOwnProperty(matName)) continue;
     if (mat.qty === 0) continue;
-    breakdownItems.push(<>{matName}: {numeralWrapper.format(mat.qty * MaterialSizes[matName], "0,0.0")}</>);
+    breakdownItems.push(
+      <>
+        {matName}: {numeralWrapper.format(mat.qty * MaterialSizes[matName], "0,0.0")}
+      </>,
+    );
   }
 
   for (const prodName of Object.keys(division.products)) {
     const prod = division.products[prodName];
     if (prod === undefined) continue;
-    breakdownItems.push(<>{prodName}: {numeralWrapper.format(prod.data[props.warehouse.loc][0] * prod.siz, "0,0.0")}</>);
+    breakdownItems.push(
+      <>
+        {prodName}: {numeralWrapper.format(prod.data[props.warehouse.loc][0] * prod.siz, "0,0.0")}
+      </>,
+    );
   }
 
   let breakdown;
   if (breakdownItems && breakdownItems.length > 0) {
     breakdown = breakdownItems.reduce(
-      (previous: JSX.Element, current: JSX.Element): JSX.Element => previous && <>{previous}<br />{current}</> || <>{current}</>);
+      (previous: JSX.Element, current: JSX.Element): JSX.Element =>
+        (previous && (
+          <>
+            {previous}
+            <br />
+            {current}
+          </>
+        )) || <>{current}</>,
+    );
   } else {
-    breakdown = <>No items in storage.</>
+    breakdown = <>No items in storage.</>;
   }
 
   return (
     <Paper>
       <Box display="flex" alignItems="center">
-        <Tooltip title={props.warehouse.sizeUsed !== 0 ? <Typography><>{breakdown}</></Typography> : ""}>
+        <Tooltip
+          title={
+            props.warehouse.sizeUsed !== 0 ? (
+              <Typography>
+                <>{breakdown}</>
+              </Typography>
+            ) : (
+              ""
+            )
+          }
+        >
           <Typography color={props.warehouse.sizeUsed >= props.warehouse.size ? "error" : "primary"}>
             Storage: {numeralWrapper.formatBigNumber(props.warehouse.sizeUsed)} /{" "}
             {numeralWrapper.formatBigNumber(props.warehouse.size)}

src/Corporation/ui/MaterialElem.tsx

@@ -112,7 +112,7 @@ export function MaterialElem(props: IMaterialProps): React.ReactElement {
 
   return (
     <Paper>
-      <Box sx={{ display: 'grid', gridTemplateColumns: '2fr 1fr', m: '5px' }}>
+      <Box sx={{ display: "grid", gridTemplateColumns: "2fr 1fr", m: "5px" }}>
         <Box>
           <Tooltip
             title={
@@ -149,7 +149,7 @@ export function MaterialElem(props: IMaterialProps): React.ReactElement {
           </Tooltip>
         </Box>
 
-        <Box sx={{ "& button": { width: '100%' } }}>
+        <Box sx={{ "& button": { width: "100%" } }}>
           <Tooltip
             title={tutorial ? <Typography>Purchase your required materials to get production started!</Typography> : ""}
           >

src/Corporation/ui/Overview.tsx

@@ -89,7 +89,7 @@ export function Overview({ rerender }: IProps): React.ReactElement {
       <StatsTable rows={multRows} />
       <br />
       <BonusTime />
-      <Box sx={{ display: 'grid', gridTemplateColumns: 'repeat(3, 1fr)', width: 'fit-content' }}>
+      <Box sx={{ display: "grid", gridTemplateColumns: "repeat(3, 1fr)", width: "fit-content" }}>
         <Tooltip
           title={
             <Typography>

src/Corporation/ui/ResearchModal.tsx

@@ -16,7 +16,7 @@ import Box from "@mui/material/Box";
 import Collapse from "@mui/material/Collapse";
 import ExpandMore from "@mui/icons-material/ExpandMore";
 import ExpandLess from "@mui/icons-material/ExpandLess";
-import CheckIcon from '@mui/icons-material/Check';
+import CheckIcon from "@mui/icons-material/Check";
 
 interface INodeProps {
   n: Node | null;
@@ -66,19 +66,23 @@ function Upgrade({ n, division }: INodeProps): React.ReactElement {
       >
         {ele}
       </Tooltip>
-    )
+    );
-  }
+  };
 
   const but = (
     <Box>
       {wrapInTooltip(
         <span>
-          <Button color={color} disabled={disabled && !n.researched} onClick={research}
+          <Button
-            style={{ width: '100%', textAlign: 'left', justifyContent: 'unset' }}
+            color={color}
+            disabled={disabled && !n.researched}
+            onClick={research}
+            style={{ width: "100%", textAlign: "left", justifyContent: "unset" }}
           >
-            {n.researched && (<CheckIcon sx={{ mr: 1 }} />)}{n.text}
+            {n.researched && <CheckIcon sx={{ mr: 1 }} />}
+            {n.text}
           </Button>
-        </span>
+        </span>,
       )}
     </Box>
   );
@@ -87,20 +91,29 @@ function Upgrade({ n, division }: INodeProps): React.ReactElement {
 
   return (
     <Box>
-      <Box display="flex" sx={{ border: '1px solid ' + Settings.theme.well }}>
+      <Box display="flex" sx={{ border: "1px solid " + Settings.theme.well }}>
         {wrapInTooltip(
-          <span style={{ width: '100%' }}>
+          <span style={{ width: "100%" }}>
-            <Button color={color} disabled={disabled && !n.researched} onClick={research} sx={{
+            <Button
-              width: '100%',
+              color={color}
-              textAlign: 'left',
+              disabled={disabled && !n.researched}
-              justifyContent: 'unset',
+              onClick={research}
-              borderColor: Settings.theme.button
+              sx={{
-            }}>
+                width: "100%",
-              {n.researched && (<CheckIcon sx={{ mr: 1 }} />)}{n.text}
+                textAlign: "left",
+                justifyContent: "unset",
+                borderColor: Settings.theme.button,
+              }}
+            >
+              {n.researched && <CheckIcon sx={{ mr: 1 }} />}
+              {n.text}
             </Button>
-          </span>
+          </span>,
         )}
-        <Button onClick={() => setOpen((old) => !old)} sx={{ borderColor: Settings.theme.button, minWidth: 'fit-content' }}>
+        <Button
+          onClick={() => setOpen((old) => !old)}
+          sx={{ borderColor: Settings.theme.button, minWidth: "fit-content" }}
+        >
           {open ? <ExpandLess color="primary" /> : <ExpandMore color="primary" />}
         </Button>
       </Box>

src/Corporation/ui/SellSharesModal.tsx

@@ -51,7 +51,7 @@ export function SellSharesModal(props: IProps): React.ReactElement {
   function sell(): void {
     if (disabled) return;
     try {
-      const profit = SellShares(corp, player, shares)
+      const profit = SellShares(corp, player, shares);
       props.onClose();
       dialogBoxCreate(
         <>
@@ -65,7 +65,6 @@ export function SellSharesModal(props: IProps): React.ReactElement {
     } catch (err) {
       dialogBoxCreate(err + "");
     }
-
   }
 
   function onKeyDown(event: React.KeyboardEvent<HTMLInputElement>): void {

src/CotMG/data/Constants.ts

@@ -5,5 +5,5 @@ export const StanekConstants: {
 } = {
   RAMBonus: 0.1,
   BaseSize: 9,
-  MaxSize: 25
+  MaxSize: 25,
 };

src/DarkWeb/DarkWeb.tsx

@@ -107,7 +107,9 @@ export function buyAllDarkwebItems(): void {
   }
 
   if (cost > Player.money) {
-    Terminal.error("Not enough money to purchase remaining programs, " + numeralWrapper.formatMoney(cost) + " required");
+    Terminal.error(
+      "Not enough money to purchase remaining programs, " + numeralWrapper.formatMoney(cost) + " required",
+    );
     return;
   }
 

src/DevMenu/ui/Achievements.tsx

@@ -8,8 +8,8 @@ import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 import ButtonGroup from "@mui/material/ButtonGroup";
 import { Tooltip } from "@mui/material";
-import LockIcon from '@mui/icons-material/Lock';
+import LockIcon from "@mui/icons-material/Lock";
-import LockOpenIcon from '@mui/icons-material/LockOpen';
+import LockOpenIcon from "@mui/icons-material/LockOpen";
 
 import { IPlayer } from "../../PersonObjects/IPlayer";
 import { achievements } from "../../Achievements/Achievements";
@@ -21,26 +21,26 @@ interface IProps {
 }
 
 export function Achievements(props: IProps): React.ReactElement {
-  const [playerAchievement, setPlayerAchievements] = useState(props.player.achievements.map(m => m.ID));
+  const [playerAchievement, setPlayerAchievements] = useState(props.player.achievements.map((m) => m.ID));
 
   function grantAchievement(id: string): void {
     props.player.giveAchievement(id);
-    setPlayerAchievements(props.player.achievements.map(m => m.ID));
+    setPlayerAchievements(props.player.achievements.map((m) => m.ID));
   }
 
   function grantAllAchievements(): void {
-    Object.values(achievements).forEach(a => props.player.giveAchievement(a.ID));
+    Object.values(achievements).forEach((a) => props.player.giveAchievement(a.ID));
-    setPlayerAchievements(props.player.achievements.map(m => m.ID));
+    setPlayerAchievements(props.player.achievements.map((m) => m.ID));
   }
 
   function removeAchievement(id: string): void {
-    props.player.achievements = props.player.achievements.filter(a => a.ID !== id);
+    props.player.achievements = props.player.achievements.filter((a) => a.ID !== id);
-    setPlayerAchievements(props.player.achievements.map(m => m.ID));
+    setPlayerAchievements(props.player.achievements.map((m) => m.ID));
   }
 
   function clearAchievements(): void {
     props.player.achievements = [];
-    setPlayerAchievements(props.player.achievements.map(m => m.ID));
+    setPlayerAchievements(props.player.achievements.map((m) => m.ID));
   }
 
   function disableEngine(): void {
@@ -48,7 +48,7 @@ export function Achievements(props: IProps): React.ReactElement {
   }
 
   function enableEngine(): void {
-    props.engine.Counters.achievementsCounter = 0
+    props.engine.Counters.achievementsCounter = 0;
   }
 
   return (
@@ -60,8 +60,7 @@ export function Achievements(props: IProps): React.ReactElement {
         <table>
           <tbody>
             <tr>
-              <td>
+              <td></td>
-              </td>
               <td>
                 <Typography>Achievements:</Typography>
               </td>
@@ -76,7 +75,8 @@ export function Achievements(props: IProps): React.ReactElement {
             </tr>
             {Object.values(achievements).map((i) => {
               const achieved = playerAchievement.includes(i.ID);
-              return <tr key={"ach-" + i.ID}>
+              return (
+                <tr key={"ach-" + i.ID}>
                   <td>
                     {achieved ? (
                       <Tooltip title="Achieved">
@@ -89,8 +89,16 @@ export function Achievements(props: IProps): React.ReactElement {
                     )}
                   </td>
                   <td>
-                  <Tooltip title={<>{i.ID}<br />{i.Description}</>}>
+                    <Tooltip
-                    <Typography color={achieved ? 'primary': 'secondary'}>{i.Name}:</Typography>
+                      title={
+                        <>
+                          {i.ID}
+                          <br />
+                          {i.Description}
+                        </>
+                      }
+                    >
+                      <Typography color={achieved ? "primary" : "secondary"}>{i.Name}:</Typography>
                     </Tooltip>
                   </td>
                   <td>
@@ -100,6 +108,7 @@ export function Achievements(props: IProps): React.ReactElement {
                     </ButtonGroup>
                   </td>
                 </tr>
+              );
             })}
           </tbody>
         </table>

src/DevMenu/ui/Factions.tsx

@@ -37,7 +37,7 @@ export function Factions(props: IProps): React.ReactElement {
   }
 
   function receiveAllInvites(): void {
-    Object.values(FactionNames).forEach(faction => props.player.receiveInvite(faction))
+    Object.values(FactionNames).forEach((faction) => props.player.receiveInvite(faction));
   }
 
   function modifyFactionRep(modifier: number): (x: number) => void {

src/DevMenu/ui/General.tsx

@@ -46,7 +46,7 @@ export function General(props: IProps): React.ReactElement {
   }
 
   useEffect(() => {
-    if (error) throw new ReferenceError('Manually thrown error');
+    if (error) throw new ReferenceError("Manually thrown error");
   }, [error]);
 
   return (

src/Faction/FactionHelpers.tsx

@@ -203,7 +203,7 @@ export const getFactionAugmentationsFiltered = (player: IPlayer, faction: Factio
     // Remove special augs
     augs = augs.filter((a) => !a.isSpecial);
 
-    const blacklist: string[] = [AugmentationNames.NeuroFluxGovernor];
+    const blacklist: string[] = [AugmentationNames.NeuroFluxGovernor, AugmentationNames.CongruityImplant];
 
     if (player.bitNodeN !== 2) {
       // TRP is not available outside of BN2 for Gangs

src/Faction/FactionInfo.tsx

@@ -85,8 +85,6 @@ export class FactionInfo {
   }
 }
 
-
-
 /**
  * A map of all factions and associated info to them.
  */
@@ -143,8 +141,9 @@ export const FactionInfos: IMap<FactionInfo> = {
   [FactionNames.ECorp]: new FactionInfo(
     (
       <>
-        {FactionNames.ECorp}'s mission is simple: to connect the world of today with the technology of tomorrow. With our wide range of
+        {FactionNames.ECorp}'s mission is simple: to connect the world of today with the technology of tomorrow. With
-        Internet-related software and commercial hardware, {FactionNames.ECorp} makes the world's information universally accessible.
+        our wide range of Internet-related software and commercial hardware, {FactionNames.ECorp} makes the world's
+        information universally accessible.
       </>
     ),
     [],
@@ -159,12 +158,13 @@ export const FactionInfos: IMap<FactionInfo> = {
   [FactionNames.MegaCorp]: new FactionInfo(
     (
       <>
-        {FactionNames.MegaCorp} does what no other dares to do. We imagine. We create. We invent. We create what others have never even
+        {FactionNames.MegaCorp} does what no other dares to do. We imagine. We create. We invent. We create what others
-        dreamed of. Our work fills the world's needs for food, water, power, and transportation on an unprecedented
+        have never even dreamed of. Our work fills the world's needs for food, water, power, and transportation on an
-        scale, in ways that no other company can.
+        unprecedented scale, in ways that no other company can.
         <br />
         <br />
-        In our labs and factories and on the ground with customers, {FactionNames.MegaCorp} is ushering in a new era for the world.
+        In our labs and factories and on the ground with customers, {FactionNames.MegaCorp} is ushering in a new era for
+        the world.
       </>
     ),
     [],
@@ -194,7 +194,16 @@ export const FactionInfos: IMap<FactionInfo> = {
     true,
   ),
 
-  [FactionNames.BladeIndustries]: new FactionInfo(<>Augmentation is Salvation.</>, [], true, true, true, true, false, true),
+  [FactionNames.BladeIndustries]: new FactionInfo(
+    <>Augmentation is Salvation.</>,
+    [],
+    true,
+    true,
+    true,
+    true,
+    false,
+    true,
+  ),
 
   [FactionNames.NWO]: new FactionInfo(
     (
@@ -486,12 +495,39 @@ export const FactionInfos: IMap<FactionInfo> = {
     false,
   ),
 
-  [FactionNames.SlumSnakes]: new FactionInfo(<>{FactionNames.SlumSnakes} rule!</>, [], false, false, true, true, false, false),
+  [FactionNames.SlumSnakes]: new FactionInfo(
+    <>{FactionNames.SlumSnakes} rule!</>,
+    [],
+    false,
+    false,
+    true,
+    true,
+    false,
+    false,
+  ),
 
   // Earlygame factions - factions the player will prestige with early on that don't belong in other categories.
-  [FactionNames.Netburners]: new FactionInfo(<>{"~~//*>H4CK||3T 8URN3R5**>?>\\~~"}</>, [], true, true, false, false, false, false),
+  [FactionNames.Netburners]: new FactionInfo(
+    <>{"~~//*>H4CK||3T 8URN3R5**>?>\\~~"}</>,
+    [],
+    true,
+    true,
+    false,
+    false,
+    false,
+    false,
+  ),
 
-  [FactionNames.TianDiHui]: new FactionInfo(<>Obey Heaven and work righteously.</>, [], true, true, false, true, false, false),
+  [FactionNames.TianDiHui]: new FactionInfo(
+    <>Obey Heaven and work righteously.</>,
+    [],
+    true,
+    true,
+    false,
+    true,
+    false,
+    false,
+  ),
 
   [FactionNames.CyberSec]: new FactionInfo(
     (
@@ -517,7 +553,8 @@ export const FactionInfos: IMap<FactionInfo> = {
         It's too bad they won't live. But then again, who does?
         <br />
         <br />
-        Note that for this faction, reputation can only be gained through {FactionNames.Bladeburners} actions. Completing {FactionNames.Bladeburners}
+        Note that for this faction, reputation can only be gained through {FactionNames.Bladeburners} actions.
+        Completing {FactionNames.Bladeburners}
         contracts/operations will increase your reputation.
       </>
     ),

src/Faction/ui/AugmentationsPage.tsx

@@ -32,8 +32,6 @@ type IProps = {
 
 export function AugmentationsPage(props: IProps): React.ReactElement {
   const player = use.Player();
-  // Flag for whether the player has a gang with this faction
-  const isPlayersGang = player.inGang() && player.getGangName() === props.faction.name;
 
   const setRerender = useState(false)[1];
 

src/Faction/ui/FactionsRoot.tsx

@@ -2,8 +2,6 @@ import React, { useEffect, useState } from "react";
 
 import { Box, Button, Container, Paper, TableBody, TableRow, Typography } from "@mui/material";
 
-import { Augmentations } from "../../Augmentation/Augmentations";
-import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
 import { IPlayer } from "../../PersonObjects/IPlayer";
 import { Table, TableCell } from "../../ui/React/Table";
 import { IRouter } from "../../ui/Router";

src/Faction/ui/Info.tsx

@@ -59,9 +59,7 @@ export function Info(props: IProps): React.ReactElement {
               </Typography>
               <MathJaxWrapper>{"\\(\\huge{r = \\text{total faction reputation}}\\)"}</MathJaxWrapper>
               <MathJaxWrapper>
-                {
+                {"\\(\\huge{favor=1+\\left\\lfloor\\log_{1.02}\\left(\\frac{r+25000}{25500}\\right)\\right\\rfloor}\\)"}
-                  "\\(\\huge{favor=1+\\left\\lfloor\\log_{1.02}\\left(\\frac{r+25000}{25500}\\right)\\right\\rfloor}\\)"
-                }
               </MathJaxWrapper>
             </>
           }
@@ -86,7 +84,6 @@ export function Info(props: IProps): React.ReactElement {
 
               <MathJaxWrapper>{"\\(\\huge{r = reputation}\\)"}</MathJaxWrapper>
               <MathJaxWrapper>{"\\(\\huge{\\Delta r = \\Delta r \\times \\frac{100+favor}{100}}\\)"}</MathJaxWrapper>
-
             </>
           }
         >

src/Gang/AllGangs.ts

@@ -1,4 +1,4 @@
-import { FactionNames } from '../Faction/data/FactionNames';
+import { FactionNames } from "../Faction/data/FactionNames";
 import { Reviver } from "../utils/JSONReviver";
 
 interface GangTerritory {

src/Gang/Gang.ts

@@ -225,7 +225,6 @@ export class Gang implements IGang {
           if (AllGangs[otherGang].territory <= 0) return;
           const territoryGain = calculateTerritoryGain(thisGang, otherGang);
           AllGangs[thisGang].territory += territoryGain;
-          if (AllGangs[thisGang].territory > 0.999) AllGangs[thisGang].territory = 1;
           AllGangs[otherGang].territory -= territoryGain;
           if (thisGang === gangName) {
             this.clash(true); // Player won
@@ -239,9 +238,7 @@ export class Gang implements IGang {
           if (AllGangs[thisGang].territory <= 0) return;
           const territoryGain = calculateTerritoryGain(otherGang, thisGang);
           AllGangs[thisGang].territory -= territoryGain;
-          if (AllGangs[otherGang].territory < 0.001) AllGangs[otherGang].territory = 0;
           AllGangs[otherGang].territory += territoryGain;
-          if (AllGangs[otherGang].territory > 0.999) AllGangs[otherGang].territory = 1;
           if (thisGang === gangName) {
             this.clash(false); // Player lost
           } else if (otherGang === gangName) {
@@ -251,6 +248,11 @@ export class Gang implements IGang {
             AllGangs[thisGang].power *= 1 / 1.01;
           }
         }
+
+        const total = Object.values(AllGangs)
+          .map((g) => g.territory)
+          .reduce((p, c) => p + c, 0);
+        Object.values(AllGangs).forEach((g) => (g.territory /= total));
       }
     }
   }

src/Gang/data/power.ts

@@ -1,4 +1,4 @@
-import { FactionNames } from '../../Faction/data/FactionNames';
+import { FactionNames } from "../../Faction/data/FactionNames";
 export const PowerMultiplier: {
   [key: string]: number | undefined;
 } = {

src/Gang/ui/AscensionModal.tsx

@@ -51,7 +51,7 @@ export function AscensionModal(props: IProps): React.ReactElement {
         <br />
         Charisma: x{numeralWrapper.format(res.cha, "0.000")}
         <br />
-      </>
+      </>,
     );
     props.onClose();
   }

src/Gang/ui/EquipmentsSubpage.tsx

@@ -76,8 +76,8 @@ function UpgradeButton(props: IUpgradeButtonProps): React.ReactElement {
   return (
     <Tooltip title={<Typography dangerouslySetInnerHTML={{ __html: props.upg.desc }} />}>
       <span>
-        <Button onClick={onClick} sx={{ display: 'flex', flexDirection: 'column', width: '100%', height: '100%' }}>
+        <Button onClick={onClick} sx={{ display: "flex", flexDirection: "column", width: "100%", height: "100%" }}>
-          <Typography sx={{ display: 'block' }}>{props.upg.name}</Typography>
+          <Typography sx={{ display: "block" }}>{props.upg.name}</Typography>
           <Money money={gang.getUpgradeCost(props.upg)} />
         </Button>
       </span>
@@ -113,8 +113,8 @@ function GangMemberUpgradePanel(props: IPanelProps): React.ReactElement {
 
   const onChange = (event: SelectChangeEvent<string>): void => {
     setCurrentCategory(event.target.value);
-    rerender()
+    rerender();
-  }
+  };
 
   const weaponUpgrades = filterUpgrades(props.member.upgrades, UpgradeType.Weapon);
   const armorUpgrades = filterUpgrades(props.member.upgrades, UpgradeType.Armor);
@@ -123,11 +123,11 @@ function GangMemberUpgradePanel(props: IPanelProps): React.ReactElement {
   const augUpgrades = filterUpgrades(props.member.augmentations, UpgradeType.Augmentation);
 
   const categories: { [key: string]: (GangMemberUpgrade[] | UpgradeType)[] } = {
-    'Weapons': [weaponUpgrades, UpgradeType.Weapon],
+    Weapons: [weaponUpgrades, UpgradeType.Weapon],
-    'Armor': [armorUpgrades, UpgradeType.Armor],
+    Armor: [armorUpgrades, UpgradeType.Armor],
-    'Vehicles': [vehicleUpgrades, UpgradeType.Vehicle],
+    Vehicles: [vehicleUpgrades, UpgradeType.Vehicle],
-    'Rootkits': [rootkitUpgrades, UpgradeType.Rootkit],
+    Rootkits: [rootkitUpgrades, UpgradeType.Rootkit],
-    'Augmentations': [augUpgrades, UpgradeType.Augmentation]
+    Augmentations: [augUpgrades, UpgradeType.Augmentation],
   };
 
   const asc = {
@@ -140,7 +140,7 @@ function GangMemberUpgradePanel(props: IPanelProps): React.ReactElement {
   };
   return (
     <Paper>
-      <Box display="grid" sx={{ gridTemplateColumns: '1fr 1fr', m: 1, gap: 1 }}>
+      <Box display="grid" sx={{ gridTemplateColumns: "1fr 1fr", m: 1, gap: 1 }}>
         <span>
           <Typography variant="h5" color="primary">
             {props.member.name} ({props.member.task})
@@ -149,47 +149,70 @@ function GangMemberUpgradePanel(props: IPanelProps): React.ReactElement {
             title={
               <Typography>
                 Hk: x{numeralWrapper.formatMultiplier(props.member.hack_mult * asc.hack)}(x
-                {numeralWrapper.formatMultiplier(props.member.hack_mult)} Eq, x{numeralWrapper.formatMultiplier(asc.hack)}{" "}
+                {numeralWrapper.formatMultiplier(props.member.hack_mult)} Eq, x
-                Asc)
+                {numeralWrapper.formatMultiplier(asc.hack)} Asc)
                 <br />
                 St: x{numeralWrapper.formatMultiplier(props.member.str_mult * asc.str)}
-                (x{numeralWrapper.formatMultiplier(props.member.str_mult)} Eq, x{numeralWrapper.formatMultiplier(asc.str)}{" "}
+                (x{numeralWrapper.formatMultiplier(props.member.str_mult)} Eq, x
-                Asc)
+                {numeralWrapper.formatMultiplier(asc.str)} Asc)
                 <br />
                 Df: x{numeralWrapper.formatMultiplier(props.member.def_mult * asc.def)}
-                (x{numeralWrapper.formatMultiplier(props.member.def_mult)} Eq, x{numeralWrapper.formatMultiplier(asc.def)}{" "}
+                (x{numeralWrapper.formatMultiplier(props.member.def_mult)} Eq, x
-                Asc)
+                {numeralWrapper.formatMultiplier(asc.def)} Asc)
                 <br />
                 Dx: x{numeralWrapper.formatMultiplier(props.member.dex_mult * asc.dex)}
-                (x{numeralWrapper.formatMultiplier(props.member.dex_mult)} Eq, x{numeralWrapper.formatMultiplier(asc.dex)}{" "}
+                (x{numeralWrapper.formatMultiplier(props.member.dex_mult)} Eq, x
-                Asc)
+                {numeralWrapper.formatMultiplier(asc.dex)} Asc)
                 <br />
                 Ag: x{numeralWrapper.formatMultiplier(props.member.agi_mult * asc.agi)}
-                (x{numeralWrapper.formatMultiplier(props.member.agi_mult)} Eq, x{numeralWrapper.formatMultiplier(asc.agi)}{" "}
+                (x{numeralWrapper.formatMultiplier(props.member.agi_mult)} Eq, x
-                Asc)
+                {numeralWrapper.formatMultiplier(asc.agi)} Asc)
                 <br />
                 Ch: x{numeralWrapper.formatMultiplier(props.member.cha_mult * asc.cha)}
-                (x{numeralWrapper.formatMultiplier(props.member.cha_mult)} Eq, x{numeralWrapper.formatMultiplier(asc.cha)}{" "}
+                (x{numeralWrapper.formatMultiplier(props.member.cha_mult)} Eq, x
-                Asc)
+                {numeralWrapper.formatMultiplier(asc.cha)} Asc)
               </Typography>
             }
           >
             <Table>
               <TableBody>
-                <StatsRow name="Hacking" color={Settings.theme.hack} data={{ level: props.member.hack, exp: props.member.hack_exp }} />
+                <StatsRow
-                <StatsRow name="Strength" color={Settings.theme.combat} data={{ level: props.member.str, exp: props.member.str_exp }} />
+                  name="Hacking"
-                <StatsRow name="Defense" color={Settings.theme.combat} data={{ level: props.member.def, exp: props.member.def_exp }} />
+                  color={Settings.theme.hack}
-                <StatsRow name="Dexterity" color={Settings.theme.combat} data={{ level: props.member.dex, exp: props.member.dex_exp }} />
+                  data={{ level: props.member.hack, exp: props.member.hack_exp }}
-                <StatsRow name="Agility" color={Settings.theme.combat} data={{ level: props.member.agi, exp: props.member.agi_exp }} />
+                />
-                <StatsRow name="Charisma" color={Settings.theme.cha} data={{ level: props.member.cha, exp: props.member.cha_exp }} />
+                <StatsRow
+                  name="Strength"
+                  color={Settings.theme.combat}
+                  data={{ level: props.member.str, exp: props.member.str_exp }}
+                />
+                <StatsRow
+                  name="Defense"
+                  color={Settings.theme.combat}
+                  data={{ level: props.member.def, exp: props.member.def_exp }}
+                />
+                <StatsRow
+                  name="Dexterity"
+                  color={Settings.theme.combat}
+                  data={{ level: props.member.dex, exp: props.member.dex_exp }}
+                />
+                <StatsRow
+                  name="Agility"
+                  color={Settings.theme.combat}
+                  data={{ level: props.member.agi, exp: props.member.agi_exp }}
+                />
+                <StatsRow
+                  name="Charisma"
+                  color={Settings.theme.cha}
+                  data={{ level: props.member.cha, exp: props.member.cha_exp }}
+                />
               </TableBody>
             </Table>
           </Tooltip>
-
         </span>
 
         <span>
-          <Select onChange={onChange} value={currentCategory} sx={{ width: '100%', mb: 1 }}>
+          <Select onChange={onChange} value={currentCategory} sx={{ width: "100%", mb: 1 }}>
             {Object.keys(categories).map((k, i) => (
               <MenuItem key={i + 1} value={k}>
                 <Typography variant="h6">{k}</Typography>
@@ -197,32 +220,22 @@ function GangMemberUpgradePanel(props: IPanelProps): React.ReactElement {
             ))}
           </Select>
 
-          <Box sx={{ width: '100%' }}>
+          <Box sx={{ width: "100%" }}>
             {(categories[currentCategory][0] as GangMemberUpgrade[]).length === 0 && (
-              <Typography>
+              <Typography>All upgrades owned!</Typography>
-                All upgrades owned!
-              </Typography>
             )}
-            <Box display="grid" sx={{ gridTemplateColumns: '1fr 1fr' }}>
+            <Box display="grid" sx={{ gridTemplateColumns: "1fr 1fr" }}>
               {(categories[currentCategory][0] as GangMemberUpgrade[]).map((upg) => (
-                <UpgradeButton
+                <UpgradeButton key={upg.name} rerender={rerender} member={props.member} upg={upg} />
-                  key={upg.name}
-                  rerender={rerender}
-                  member={props.member}
-                  upg={upg}
-                />
               ))}
             </Box>
-            <NextReveal
+            <NextReveal type={categories[currentCategory][1] as UpgradeType} upgrades={props.member.upgrades} />
-              type={categories[currentCategory][1] as UpgradeType}
-              upgrades={props.member.upgrades}
-            />
           </Box>
         </span>
       </Box>
 
       <Typography sx={{ mx: 1 }}>Purchased Upgrades: </Typography>
-      <Box display="grid" sx={{ gridTemplateColumns: 'repeat(4, 1fr)', m: 1 }}>
+      <Box display="grid" sx={{ gridTemplateColumns: "repeat(4, 1fr)", m: 1 }}>
         {props.member.upgrades.map((upg: string) => (
           <PurchasedUpgrade key={upg} upgName={upg} />
         ))}
@@ -230,7 +243,7 @@ function GangMemberUpgradePanel(props: IPanelProps): React.ReactElement {
           <PurchasedUpgrade key={upg} upgName={upg} />
         ))}
       </Box>
-    </Paper >
+    </Paper>
   );
 }
 
@@ -238,13 +251,11 @@ export function EquipmentsSubpage(): React.ReactElement {
   const gang = useGang();
   const [filter, setFilter] = useState("");
 
-
   const handleFilterChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
     setFilter(event.target.value.toLowerCase());
-  }
+  };
 
-  const members = gang.members
+  const members = gang.members.filter((member) => member && member.name.toLowerCase().includes(filter));
-    .filter((member) => member && member.name.toLowerCase().includes(filter));
 
   return (
     <>
@@ -265,13 +276,13 @@ export function EquipmentsSubpage(): React.ReactElement {
         autoFocus
         InputProps={{
           startAdornment: <SearchIcon />,
-          spellCheck: false
+          spellCheck: false,
         }}
         placeholder="Filter by member name"
-        sx={{ m: 1, width: '15%' }}
+        sx={{ m: 1, width: "15%" }}
       />
 
-      <Box display="grid" sx={{ gridTemplateColumns: '1fr 1fr', width: '100%' }}>
+      <Box display="grid" sx={{ gridTemplateColumns: "1fr 1fr", width: "100%" }}>
         {members.map((member: GangMember) => (
           <GangMemberUpgradePanel key={member.name} member={member} />
         ))}

src/Gang/ui/GangMemberCard.tsx

@@ -16,7 +16,7 @@ interface IProps {
 
 export function GangMemberCard(props: IProps): React.ReactElement {
   return (
-    <Box component={Paper} sx={{ width: 'auto' }}>
+    <Box component={Paper} sx={{ width: "auto" }}>
       <Box sx={{ m: 1 }}>
         <ListItemText primary={<b>{props.member.name}</b>} />
         <GangMemberCardContent member={props.member} />

src/Gang/ui/GangMemberCardContent.tsx

@@ -26,15 +26,17 @@ export function GangMemberCardContent(props: IProps): React.ReactElement {
   return (
     <>
       {props.member.canAscend() && (
-        <Box sx={{ display: 'flex', justifyContent: 'space-between', my: 1 }}>
+        <Box sx={{ display: "flex", justifyContent: "space-between", my: 1 }}>
-          <Button onClick={() => setAscendOpen(true)} style={{ flexGrow: 1, borderRightWidth: 0 }}>Ascend</Button>
+          <Button onClick={() => setAscendOpen(true)} style={{ flexGrow: 1, borderRightWidth: 0 }}>
+            Ascend
+          </Button>
           <AscensionModal
             open={ascendOpen}
             onClose={() => setAscendOpen(false)}
             member={props.member}
             onAscend={() => setRerender((old) => !old)}
           />
-          <Button onClick={() => setHelpOpen(true)} style={{ width: 'fit-content', borderLeftWidth: 0 }}>
+          <Button onClick={() => setHelpOpen(true)} style={{ width: "fit-content", borderLeftWidth: 0 }}>
             <HelpIcon />
           </Button>
           <StaticModal open={helpOpen} onClose={() => setHelpOpen(false)}>
@@ -53,7 +55,7 @@ export function GangMemberCardContent(props: IProps): React.ReactElement {
           </StaticModal>
         </Box>
       )}
-      <Box display="grid" sx={{ gridTemplateColumns: '1fr 1fr', width: '100%', gap: 1 }}>
+      <Box display="grid" sx={{ gridTemplateColumns: "1fr 1fr", width: "100%", gap: 1 }}>
         <GangMemberStats member={props.member} />
         <TaskSelector onTaskChange={() => setRerender((old) => !old)} member={props.member} />
       </Box>

src/Gang/ui/GangMemberList.tsx

@@ -20,7 +20,7 @@ export function GangMemberList(): React.ReactElement {
 
   const handleFilterChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
     setFilter(event.target.value.toLowerCase());
-  }
+  };
 
   const members = gang.members
     .filter((member) => member && member.name.toLowerCase().includes(filter))
@@ -38,23 +38,18 @@ export function GangMemberList(): React.ReactElement {
         autoFocus
         InputProps={{
           startAdornment: <SearchIcon />,
-          spellCheck: false
+          spellCheck: false,
         }}
         placeholder="Filter by member name"
-        sx={{ m: 1, width: '15%' }}
+        sx={{ m: 1, width: "15%" }}
       />
       <OptionSwitch
         checked={ascendOnly}
-        onChange={(newValue) => (setAscendOnly(newValue))}
+        onChange={(newValue) => setAscendOnly(newValue)}
         text="Show only ascendable"
-        tooltip={
+        tooltip={<>Filter the members list by whether or not the member can be ascended.</>}
-          <>
-            Filter the members list by whether or not the member
-            can be ascended.
-          </>
-        }
       />
-      <Box display="grid" sx={{ gridTemplateColumns: 'repeat(2, 1fr)' }}>
+      <Box display="grid" sx={{ gridTemplateColumns: "repeat(2, 1fr)" }}>
         {members.map((member: GangMember) => (
           <GangMemberCard key={member.name} member={member} />
         ))}

src/Gang/ui/GangRoot.tsx

@@ -32,7 +32,7 @@ export function GangRoot(): React.ReactElement {
 
   return (
     <Context.Gang.Provider value={gang}>
-      <Tabs variant="fullWidth" value={value} onChange={handleChange} sx={{ minWidth: 'fit-content', maxWidth: '45%' }}>
+      <Tabs variant="fullWidth" value={value} onChange={handleChange} sx={{ minWidth: "fit-content", maxWidth: "45%" }}>
         <Tab label="Management" />
         <Tab label="Equipment" />
         <Tab label="Territory" />

src/Gang/ui/RecruitButton.tsx

@@ -25,10 +25,10 @@ export function RecruitButton(props: IProps): React.ReactElement {
     const respect = gang.getRespectNeededToRecruitMember();
     return (
       <Box display="flex" alignItems="center" sx={{ mx: 1 }}>
-        <Button disabled>
+        <Button disabled>Recruit Gang Member</Button>
-          Recruit Gang Member
+        <Typography sx={{ ml: 1 }}>
-        </Button>
+          {numeralWrapper.formatRespect(respect)} respect needed to recruit next member
-        <Typography sx={{ ml: 1 }}>{numeralWrapper.formatRespect(respect)} respect needed to recruit next member</Typography>
+        </Typography>
       </Box>
     );
   }

src/Gang/ui/TaskSelector.tsx

@@ -21,11 +21,9 @@ export function TaskSelector(props: IProps): React.ReactElement {
   const gang = useGang();
   const [currentTask, setCurrentTask] = useState(props.member.task);
 
-  const contextMember = gang.members.find(member => member.name == props.member.name)
+  const contextMember = gang.members.find((member) => member.name == props.member.name);
-  if (contextMember &&
+  if (contextMember && contextMember.task != currentTask) {
-    contextMember.task != currentTask
+    setCurrentTask(contextMember.task);
-  ) {
-    setCurrentTask(contextMember.task)
   }
 
   function onChange(event: SelectChangeEvent<string>): void {
@@ -39,7 +37,7 @@ export function TaskSelector(props: IProps): React.ReactElement {
 
   return (
     <Box>
-      <Select onChange={onChange} value={currentTask} sx={{ width: '100%' }}>
+      <Select onChange={onChange} value={currentTask} sx={{ width: "100%" }}>
         <MenuItem key={0} value={"Unassigned"}>
           Unassigned
         </MenuItem>

src/Gang/ui/TerritoryInfoModal.tsx

@@ -13,9 +13,7 @@ export const TerritoryInfoModal = ({ open, onClose }: IProps): React.ReactElemen
   return (
     <Modal open={open} onClose={onClose}>
       <>
-        <Typography variant='h4'>
+        <Typography variant="h4">Clashing</Typography>
-          Clashing
-        </Typography>
         <Typography>
           Every ~20 seconds, your gang has a chance to 'clash' with other gangs. Your chance to win a clash depends on
           your gang's power, which is listed in the display below. Your gang's power slowly accumulates over time. The
@@ -29,26 +27,22 @@ export const TerritoryInfoModal = ({ open, onClose }: IProps): React.ReactElemen
           gang.
         </Typography>
         <br />
-        <Typography variant='h4'>
+        <Typography variant="h4">Territory</Typography>
-          Territory
-        </Typography>
         <Typography>
-          The amount of territory you have affects all aspects of your Gang members' production, including money, respect,
+          The amount of territory you have affects all aspects of your Gang members' production, including money,
-          and wanted level. It is very beneficial to have high territory control.
+          respect, and wanted level. It is very beneficial to have high territory control.
           <br />
           <br />
-          To increase your chances of winning territory, assign gang members to "Territory Warfare". This will build your
+          To increase your chances of winning territory, assign gang members to "Territory Warfare". This will build
-          gang power. Then, enable "Engage in Territory Warfare" to start fighting over territory.
+          your gang power. Then, enable "Engage in Territory Warfare" to start fighting over territory.
         </Typography>
         <br />
-        <Typography variant='h4'>
+        <Typography variant="h4">Territory Clash Chance</Typography>
-          Territory Clash Chance
-        </Typography>
         <Typography>
           This percentage represents the chance you have of 'clashing' with another gang. If you do not wish to
           gain/lose territory, then keep this percentage at 0% by not engaging in territory warfare.
         </Typography>
       </>
-    </Modal >
+    </Modal>
   );
-}
+};

src/Gang/ui/TerritorySubpage.tsx

@@ -3,16 +3,7 @@
  */
 import React, { useState } from "react";
 
-import {
+import { Container, Button, Paper, Box, Tooltip, Switch, FormControlLabel, Typography } from "@mui/material";
-  Container,
-  Button,
-  Paper,
-  Box,
-  Tooltip,
-  Switch,
-  FormControlLabel,
-  Typography
-} from "@mui/material";
 import { Help } from "@mui/icons-material";
 
 import { numeralWrapper } from "../../ui/numeralFormat";
@@ -41,35 +32,51 @@ export function TerritorySubpage(): React.ReactElement {
       </Button>
 
       <Box component={Paper} sx={{ p: 1, mb: 1 }}>
-        <Typography variant="h6" sx={{ display: 'flex', alignItems: 'center', flexWrap: 'wrap' }}>
+        <Typography variant="h6" sx={{ display: "flex", alignItems: "center", flexWrap: "wrap" }}>
           {gang.facName} (Your gang)
         </Typography>
 
         <FormControlLabel
-          control={<Switch
+          control={
+            <Switch
               checked={gang.territoryWarfareEngaged}
               onChange={(event) => (gang.territoryWarfareEngaged = event.target.checked)}
-          />}
+            />
-          label={<Tooltip
+          }
-            title={<Typography>
+          label={
+            <Tooltip
+              title={
+                <Typography>
                   Engaging in Territory Warfare sets your clash chance to 100%. Disengaging will cause your clash chance
                   to gradually decrease until it reaches 0%.
-            </Typography>}>
+                </Typography>
+              }
+            >
               <Typography>Engage in Territory Warfare</Typography>
-          </Tooltip>} />
+            </Tooltip>
+          }
+        />
         <br />
         <FormControlLabel
-          control={<Switch
+          control={
+            <Switch
               checked={gang.notifyMemberDeath}
               onChange={(event) => (gang.notifyMemberDeath = event.target.checked)}
-          />}
+            />
-          label={<Tooltip
+          }
-            title={<Typography>
+          label={
-              If this is enabled, then you will receive a pop-up notifying you whenever one of your Gang Members dies
+            <Tooltip
-              in a territory clash.
+              title={
-            </Typography>}>
+                <Typography>
+                  If this is enabled, then you will receive a pop-up notifying you whenever one of your Gang Members
+                  dies in a territory clash.
+                </Typography>
+              }
+            >
               <Typography>Notify about Gang Member Deaths</Typography>
-          </Tooltip>} />
+            </Tooltip>
+          }
+        />
 
         <Typography>
           <b>Territory Clash Chance:</b> {numeralWrapper.formatPercentage(gang.territoryClashChance, 3)} <br />
@@ -77,13 +84,13 @@ export function TerritorySubpage(): React.ReactElement {
           <b>Territory:</b> {formatTerritory(AllGangs[gang.facName].territory)}% <br />
         </Typography>
       </Box>
-      <Box sx={{ display: 'grid', gridTemplateColumns: 'repeat(3, 1fr)' }}>
+      <Box sx={{ display: "grid", gridTemplateColumns: "repeat(3, 1fr)" }}>
         {gangNames.map((name) => (
           <OtherGangTerritory key={name} name={name} />
         ))}
       </Box>
       <TerritoryInfoModal open={infoOpen} onClose={() => setInfoOpen(false)} />
-    </Container >
+    </Container>
   );
 }
 function formatTerritory(n: number): string {
@@ -109,7 +116,7 @@ function OtherGangTerritory(props: ITerritoryProps): React.ReactElement {
   const clashVictoryChance = playerPower / (power + playerPower);
   return (
     <Box component={Paper} sx={{ p: 1 }}>
-      <Typography variant="h6" sx={{ display: 'flex', alignItems: 'center', flexWrap: 'wrap' }}>
+      <Typography variant="h6" sx={{ display: "flex", alignItems: "center", flexWrap: "wrap" }}>
         {props.name}
       </Typography>
       <Typography>

src/Hacking.ts

@@ -49,7 +49,8 @@ export function calculatePercentMoneyHacked(server: Server, player: IPlayer): nu
 
   const difficultyMult = (100 - server.hackDifficulty) / 100;
   const skillMult = (player.hacking - (server.requiredHackingSkill - 1)) / player.hacking;
-  const percentMoneyHacked = (difficultyMult * skillMult * player.hacking_money_mult * BitNodeMultipliers.ScriptHackMoney) / balanceFactor;
+  const percentMoneyHacked =
+    (difficultyMult * skillMult * player.hacking_money_mult * BitNodeMultipliers.ScriptHackMoney) / balanceFactor;
   if (percentMoneyHacked < 0) {
     return 0;
   }

src/Hacknet/HacknetNode.ts

@@ -21,14 +21,13 @@ import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver"
 import { ObjectValidator, minMax } from "../utils/Validator";
 
 export class HacknetNode implements IHacknetNode {
-
   static validationData: ObjectValidator<HacknetNode> = {
     cores: minMax(1, 1, HacknetNodeConstants.MaxCores),
     level: minMax(1, 1, HacknetNodeConstants.MaxLevel),
     ram: minMax(1, 1, HacknetNodeConstants.MaxRam),
     onlineTimeSeconds: minMax(0, 0, Infinity),
-    totalMoneyGenerated: minMax(0, 0, Infinity)
+    totalMoneyGenerated: minMax(0, 0, Infinity),
-  }
+  };
 
   // Node's number of cores
   cores = 1;

src/Hacknet/ui/HacknetRoot.tsx

@@ -137,7 +137,7 @@ export function HacknetRoot(props: IProps): React.ReactElement {
 
       {hasHacknetServers(props.player) && <Button onClick={() => setOpen(true)}>Spend Hashes on Upgrades</Button>}
 
-      <Box sx={{ display: 'grid', width: 'fit-content', gridTemplateColumns: 'repeat(3, 1fr)' }}>{nodes}</Box>
+      <Box sx={{ display: "grid", width: "fit-content", gridTemplateColumns: "repeat(3, 1fr)" }}>{nodes}</Box>
       <HashUpgradeModal open={open} onClose={() => setOpen(false)} />
     </>
   );

src/Literature/Literatures.ts

@@ -1,4 +1,4 @@
-import { CityName } from './../Locations/data/CityNames';
+import { CityName } from "./../Locations/data/CityNames";
 import { Literature } from "./Literature";
 import { LiteratureNames } from "./data/LiteratureNames";
 import { IMap } from "../types";

src/Locations/ui/CasinoLocation.tsx

@@ -34,7 +34,7 @@ export function CasinoLocation(props: IProps): React.ReactElement {
   return (
     <>
       {game === GameType.None && (
-        <Box sx={{ display: 'grid', width: 'fit-content' }}>
+        <Box sx={{ display: "grid", width: "fit-content" }}>
           <Button onClick={() => updateGame(GameType.Coin)}>Play coin flip</Button>
           <Button onClick={() => updateGame(GameType.Slots)}>Play slots</Button>
           <Button onClick={() => updateGame(GameType.Roulette)}>Play roulette</Button>

src/Locations/ui/CompanyLocation.tsx

@@ -228,9 +228,9 @@ export function CompanyLocation(props: IProps): React.ReactElement {
           <br />
         </>
       )}
-      <Box sx={{ display: 'grid', width: 'fit-content' }}>
+      <Box sx={{ display: "grid", width: "fit-content" }}>
         {isEmployedHere && (
-          <Box sx={{ display: 'grid', gridTemplateColumns: '1fr 1fr' }}>
+          <Box sx={{ display: "grid", gridTemplateColumns: "1fr 1fr" }}>
             <Button onClick={work}>Work</Button>
             <Button onClick={() => setQuitOpen(true)}>Quit</Button>
             <QuitJobModal
@@ -241,9 +241,7 @@ export function CompanyLocation(props: IProps): React.ReactElement {
               onClose={() => setQuitOpen(false)}
             />
           </Box>
-        )
+        )}
-
-        }
         {company.hasAgentPositions() && (
           <ApplyToJobButton
             company={company}

src/Locations/ui/CoresButton.tsx

@@ -31,11 +31,7 @@ export function CoresButton(props: IProps): React.ReactElement {
   }
 
   return (
-    <Tooltip
+    <Tooltip title={<MathJaxWrapper>{`\\(\\large{cost = 10^9 \\cdot 7.5 ^{\\text{cores}}}\\)`}</MathJaxWrapper>}>
-      title={
-        <MathJaxWrapper>{`\\(\\large{cost = 10^9 \\cdot 7.5 ^{\\text{cores}}}\\)`}</MathJaxWrapper>
-      }
-    >
       <span>
         <br />
         <Typography>

src/Locations/ui/GenericLocation.tsx

@@ -96,8 +96,13 @@ export function GenericLocation({ loc }: IProps): React.ReactElement {
       <Typography variant="h4" sx={{ mt: 1 }}>
         {backdoorInstalled && !Settings.DisableTextEffects ? (
           <Tooltip title={`Backdoor installed on ${loc.name}.`}>
-            <span><CorruptableText content={loc.name} /></span>
+            <span>
-          </Tooltip>) : loc.name}
+              <CorruptableText content={loc.name} />
+            </span>
+          </Tooltip>
+        ) : (
+          loc.name
+        )}
       </Typography>
       {locContent}
     </>

src/Locations/ui/GymLocation.tsx

@@ -59,7 +59,7 @@ export function GymLocation(props: IProps): React.ReactElement {
   const cost = CONSTANTS.ClassGymBaseCost * calculateCost();
 
   return (
-    <Box sx={{ display: 'grid', width: 'fit-content' }}>
+    <Box sx={{ display: "grid", width: "fit-content" }}>
       <Button onClick={trainStrength}>
         Train Strength (<Money money={cost} player={props.p} /> / sec)
       </Button>

src/Locations/ui/RamButton.tsx

@@ -11,6 +11,7 @@ import { Money } from "../../ui/React/Money";
 import { numeralWrapper } from "../../ui/numeralFormat";
 
 import { MathJaxWrapper } from "../../MathJaxWrapper";
+import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
 
 type IProps = {
   p: IPlayer;
@@ -30,10 +31,12 @@ export function RamButton(props: IProps): React.ReactElement {
     props.rerender();
   }
 
+  const bnMult = BitNodeMultipliers.HomeComputerRamCost === 1 ? "" : `\\cdot ${BitNodeMultipliers.HomeComputerRamCost}`;
+  console.log(BitNodeMultipliers.HomeComputerRamCost);
   return (
     <Tooltip
       title={
-        <MathJaxWrapper>{`\\(\\large{cost = 3.2 \\cdot 10^3 \\cdot 1.58^{log_2{(ram)}}}\\)`}</MathJaxWrapper>
+        <MathJaxWrapper>{`\\(\\large{cost = ram \\cdot 3.2 \\cdot 10^4 \\cdot 1.58^{log_2{(ram)}}} ${bnMult}\\)`}</MathJaxWrapper>
       }
     >
       <span>

src/Locations/ui/SlumsLocation.tsx

@@ -114,7 +114,7 @@ export function SlumsLocation(): React.ReactElement {
   const heistChance = Crimes.Heist.successRate(player);
 
   return (
-    <Box sx={{ display: 'grid', width: 'fit-content' }}>
+    <Box sx={{ display: "grid", width: "fit-content" }}>
       <Tooltip title={<>Attempt to shoplift from a low-end retailer</>}>
         <Button onClick={shoplift}>
           Shoplift ({numeralWrapper.formatPercentage(shopliftChance)} chance of success)

src/Locations/ui/SpecialLocation.tsx

@@ -155,7 +155,11 @@ export function SpecialLocation(props: IProps): React.ReactElement {
     if (!player.canAccessGrafting()) {
       return <></>;
     }
-    return <Button onClick={handleGrafting} sx={{ my: 5 }}>Enter the secret lab</Button>;
+    return (
+      <Button onClick={handleGrafting} sx={{ my: 5 }}>
+        Enter the secret lab
+      </Button>
+    );
   }
 
   function handleCotMG(): void {

src/Locations/ui/TechVendorLocation.tsx

@@ -70,9 +70,7 @@ export function TechVendorLocation(props: IProps): React.ReactElement {
   return (
     <>
       <br />
-      <Box sx={{ display: 'grid', width: 'fit-content' }}>
+      <Box sx={{ display: "grid", width: "fit-content" }}>{purchaseServerButtons}</Box>
-        {purchaseServerButtons}
-      </Box>
       <br />
       <Typography>
         <i>"You can order bigger servers via scripts. We don't take custom orders in person."</i>

src/Locations/ui/UniversityLocation.tsx

@@ -75,7 +75,7 @@ export function UniversityLocation(props: IProps): React.ReactElement {
   const earnCharismaExpTooltip = `Gain charisma experience!`;
 
   return (
-    <Box sx={{ display: 'grid', width: 'fit-content' }}>
+    <Box sx={{ display: "grid", width: "fit-content" }}>
       <Tooltip title={earnHackingExpTooltip}>
         <Button onClick={study}>Study Computer Science (free)</Button>
       </Tooltip>

src/MathJaxWrapper.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React from "react";
 import { MathJax, MathJaxContext } from "better-react-mathjax";
 
 interface IProps {
@@ -10,5 +10,5 @@ export function MathJaxWrapper({ children }: IProps): React.ReactElement {
     <MathJaxContext version={3} src={"dist/ext/MathJax-3.2.0/es5/tex-chtml.js"}>
       <MathJax>{children}</MathJax>
     </MathJaxContext>
-  )
+  );
 }

src/Netscript/RamCostGenerator.ts

@@ -226,7 +226,7 @@ export const RamCosts: IMap<any> = {
   universityCourse: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
   gymWorkout: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
   travelToCity: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
-  goToLocation: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
+  goToLocation: SF4Cost(RamCostConstants.ScriptSingularityFn3RamCost),
   purchaseTor: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
   purchaseProgram: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),
   getCurrentServer: SF4Cost(RamCostConstants.ScriptSingularityFn1RamCost),

src/NetscriptFunctions.ts

@@ -119,7 +119,6 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       console.warn(`WorkerScript detected NaN for threadcount for ${workerScript.name} on ${workerScript.hostname}`);
       threads = 1;
     }
-
     workerScript.dynamicRamUsage += ramCost;
     if (workerScript.dynamicRamUsage > 1.01 * workerScript.ramUsage) {
       throw makeRuntimeRejectMsg(
@@ -521,8 +520,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
     sprintf: sprintf,
     vsprintf: vsprintf,
     scan: function (_hostname: unknown = workerScript.hostname): string[] {
-      const hostname = helper.string("scan", "hostname", _hostname);
       updateDynamicRam("scan", getRamCost(Player, "scan"));
+      const hostname = helper.string("scan", "hostname", _hostname);
       const server = safeGetServer(hostname, "scan");
       const out = [];
       for (let i = 0; i < server.serversOnNetwork.length; i++) {
@@ -536,14 +535,14 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return out;
     },
     hack: function (_hostname: unknown, { threads: requestedThreads, stock }: BasicHGWOptions = {}): Promise<number> {
-      const hostname = helper.string("hack", "hostname", _hostname);
       updateDynamicRam("hack", getRamCost(Player, "hack"));
+      const hostname = helper.string("hack", "hostname", _hostname);
       return hack(hostname, false, { threads: requestedThreads, stock: stock });
     },
     hackAnalyzeThreads: function (_hostname: unknown, _hackAmount: unknown): number {
+      updateDynamicRam("hackAnalyzeThreads", getRamCost(Player, "hackAnalyzeThreads"));
       const hostname = helper.string("hackAnalyzeThreads", "hostname", _hostname);
       const hackAmount = helper.number("hackAnalyzeThreads", "hackAmount", _hackAmount);
-      updateDynamicRam("hackAnalyzeThreads", getRamCost(Player, "hackAnalyzeThreads"));
 
       // Check argument validity
       const server = safeGetServer(hostname, "hackAnalyzeThreads");
@@ -573,8 +572,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return hackAmount / Math.floor(server.moneyAvailable * percentHacked);
     },
     hackAnalyze: function (_hostname: unknown): number {
-      const hostname = helper.string("hackAnalyze", "hostname", _hostname);
       updateDynamicRam("hackAnalyze", getRamCost(Player, "hackAnalyze"));
+      const hostname = helper.string("hackAnalyze", "hostname", _hostname);
 
       const server = safeGetServer(hostname, "hackAnalyze");
       if (!(server instanceof Server)) {
@@ -585,13 +584,13 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return calculatePercentMoneyHacked(server, Player);
     },
     hackAnalyzeSecurity: function (_threads: unknown): number {
-      const threads = helper.number("hackAnalyzeSecurity", "threads", _threads);
       updateDynamicRam("hackAnalyzeSecurity", getRamCost(Player, "hackAnalyzeSecurity"));
+      const threads = helper.number("hackAnalyzeSecurity", "threads", _threads);
       return CONSTANTS.ServerFortifyAmount * threads;
     },
     hackAnalyzeChance: function (_hostname: unknown): number {
-      const hostname = helper.string("hackAnalyzeChance", "hostname", _hostname);
       updateDynamicRam("hackAnalyzeChance", getRamCost(Player, "hackAnalyzeChance"));
+      const hostname = helper.string("hackAnalyzeChance", "hostname", _hostname);
 
       const server = safeGetServer(hostname, "hackAnalyzeChance");
       if (!(server instanceof Server)) {
@@ -601,32 +600,32 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
 
       return calculateHackingChance(server, Player);
     },
-    sleep: async function (_time: unknown = 0): Promise<void> {
+    sleep: async function (_time: unknown = 0): Promise<true> {
-      const time = helper.number("sleep", "time", _time);
       updateDynamicRam("sleep", getRamCost(Player, "sleep"));
+      const time = helper.number("sleep", "time", _time);
       if (time === undefined) {
         throw makeRuntimeErrorMsg("sleep", "Takes 1 argument.");
       }
       workerScript.log("sleep", () => `Sleeping for ${time} milliseconds`);
       return netscriptDelay(time, workerScript).then(function () {
-        return Promise.resolve();
+        return Promise.resolve(true);
       });
     },
-    asleep: function (_time: unknown = 0): Promise<void> {
+    asleep: function (_time: unknown = 0): Promise<true> {
-      const time = helper.number("asleep", "time", _time);
       updateDynamicRam("asleep", getRamCost(Player, "asleep"));
+      const time = helper.number("asleep", "time", _time);
       if (time === undefined) {
         throw makeRuntimeErrorMsg("asleep", "Takes 1 argument.");
       }
       workerScript.log("asleep", () => `Sleeping for ${time} milliseconds`);
-      return new Promise((resolve) => setTimeout(resolve, time));
+      return new Promise((resolve) => setTimeout(() => resolve(true), time));
     },
     grow: async function (
       _hostname: unknown,
       { threads: requestedThreads, stock }: BasicHGWOptions = {},
     ): Promise<number> {
-      const hostname = helper.string("grow", "hostname", _hostname);
       updateDynamicRam("grow", getRamCost(Player, "grow"));
+      const hostname = helper.string("grow", "hostname", _hostname);
       const threads = resolveNetscriptRequestedThreads(
         workerScript,
         "grow",
@@ -685,10 +684,10 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       });
     },
     growthAnalyze: function (_hostname: unknown, _growth: unknown, _cores: unknown = 1): number {
+      updateDynamicRam("growthAnalyze", getRamCost(Player, "growthAnalyze"));
       const hostname = helper.string("growthAnalyze", "hostname", _hostname);
       const growth = helper.number("growthAnalyze", "growth", _growth);
       const cores = helper.number("growthAnalyze", "cores", _cores);
-      updateDynamicRam("growthAnalyze", getRamCost(Player, "growthAnalyze"));
 
       // Check argument validity
       const server = safeGetServer(hostname, "growthAnalyze");
@@ -703,13 +702,13 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return numCycleForGrowth(server, Number(growth), Player, cores);
     },
     growthAnalyzeSecurity: function (_threads: unknown): number {
-      const threads = helper.number("growthAnalyzeSecurity", "threads", _threads);
       updateDynamicRam("growthAnalyzeSecurity", getRamCost(Player, "growthAnalyzeSecurity"));
+      const threads = helper.number("growthAnalyzeSecurity", "threads", _threads);
       return 2 * CONSTANTS.ServerFortifyAmount * threads;
     },
     weaken: async function (_hostname: unknown, { threads: requestedThreads }: BasicHGWOptions = {}): Promise<number> {
-      const hostname = helper.string("weaken", "hostname", _hostname);
       updateDynamicRam("weaken", getRamCost(Player, "weaken"));
+      const hostname = helper.string("weaken", "hostname", _hostname);
       const threads = resolveNetscriptRequestedThreads(
         workerScript,
         "weaken",
@@ -762,9 +761,9 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       });
     },
     weakenAnalyze: function (_threads: unknown, _cores: unknown = 1): number {
+      updateDynamicRam("weakenAnalyze", getRamCost(Player, "weakenAnalyze"));
       const threads = helper.number("weakenAnalyze", "threads", _threads);
       const cores = helper.number("weakenAnalyze", "cores", _cores);
-      updateDynamicRam("weakenAnalyze", getRamCost(Player, "weakenAnalyze"));
       const coreBonus = 1 + (cores - 1) / 16;
       return CONSTANTS.ServerWeakenAmount * threads * coreBonus * BitNodeMultipliers.ServerWeakenRate;
     },
@@ -789,8 +788,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       workerScript.print(argsToString(args));
     },
     printf: function (_format: unknown, ...args: any[]): void {
-      const format = helper.string("printf", "format", _format);
       updateDynamicRam("printf", getRamCost(Player, "printf"));
+      const format = helper.string("printf", "format", _format);
       if (typeof format !== "string") {
         throw makeRuntimeErrorMsg("printf", "First argument must be string for the format.");
       }
@@ -821,8 +820,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       Terminal.print(`${workerScript.scriptRef.filename}: ${str}`);
     },
     tprintf: function (_format: unknown, ...args: any[]): void {
-      const format = helper.string("printf", "format", _format);
       updateDynamicRam("tprintf", getRamCost(Player, "tprintf"));
+      const format = helper.string("printf", "format", _format);
       if (typeof format !== "string") {
         throw makeRuntimeErrorMsg("tprintf", "First argument must be string for the format.");
       }
@@ -851,8 +850,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       workerScript.scriptRef.clearLog();
     },
     disableLog: function (_fn: unknown): void {
-      const fn = helper.string("disableLog", "fn", _fn);
       updateDynamicRam("disableLog", getRamCost(Player, "disableLog"));
+      const fn = helper.string("disableLog", "fn", _fn);
       if (fn === "ALL") {
         for (const fn of Object.keys(possibleLogs)) {
           workerScript.disableLogs[fn] = true;
@@ -866,8 +865,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       }
     },
     enableLog: function (_fn: unknown): void {
-      const fn = helper.string("enableLog", "fn", _fn);
       updateDynamicRam("enableLog", getRamCost(Player, "enableLog"));
+      const fn = helper.string("enableLog", "fn", _fn);
       if (fn === "ALL") {
         for (const fn of Object.keys(possibleLogs)) {
           delete workerScript.disableLogs[fn];
@@ -880,8 +879,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       workerScript.log("enableLog", () => `Enabled logging for ${fn}`);
     },
     isLogEnabled: function (_fn: unknown): boolean {
-      const fn = helper.string("isLogEnabled", "fn", _fn);
       updateDynamicRam("isLogEnabled", getRamCost(Player, "isLogEnabled"));
+      const fn = helper.string("isLogEnabled", "fn", _fn);
       if (possibleLogs[fn] === undefined) {
         throw makeRuntimeErrorMsg("isLogEnabled", `Invalid argument: ${fn}.`);
       }
@@ -915,8 +914,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       LogBoxEvents.emit(runningScriptObj);
     },
     nuke: function (_hostname: unknown): boolean {
-      const hostname = helper.string("tail", "hostname", _hostname);
       updateDynamicRam("nuke", getRamCost(Player, "nuke"));
+      const hostname = helper.string("tail", "hostname", _hostname);
       if (hostname === undefined) {
         throw makeRuntimeErrorMsg("nuke", "Takes 1 argument.");
       }
@@ -940,8 +939,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return true;
     },
     brutessh: function (_hostname: unknown): boolean {
-      const hostname = helper.string("brutessh", "hostname", _hostname);
       updateDynamicRam("brutessh", getRamCost(Player, "brutessh"));
+      const hostname = helper.string("brutessh", "hostname", _hostname);
       if (hostname === undefined) {
         throw makeRuntimeErrorMsg("brutessh", "Takes 1 argument.");
       }
@@ -963,8 +962,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return true;
     },
     ftpcrack: function (_hostname: unknown): boolean {
-      const hostname = helper.string("ftpcrack", "hostname", _hostname);
       updateDynamicRam("ftpcrack", getRamCost(Player, "ftpcrack"));
+      const hostname = helper.string("ftpcrack", "hostname", _hostname);
       if (hostname === undefined) {
         throw makeRuntimeErrorMsg("ftpcrack", "Takes 1 argument.");
       }
@@ -986,8 +985,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return true;
     },
     relaysmtp: function (_hostname: unknown): boolean {
-      const hostname = helper.string("relaysmtp", "hostname", _hostname);
       updateDynamicRam("relaysmtp", getRamCost(Player, "relaysmtp"));
+      const hostname = helper.string("relaysmtp", "hostname", _hostname);
       if (hostname === undefined) {
         throw makeRuntimeErrorMsg("relaysmtp", "Takes 1 argument.");
       }
@@ -1009,8 +1008,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return true;
     },
     httpworm: function (_hostname: unknown): boolean {
-      const hostname = helper.string("httpworm", "hostname", _hostname);
       updateDynamicRam("httpworm", getRamCost(Player, "httpworm"));
+      const hostname = helper.string("httpworm", "hostname", _hostname);
       if (hostname === undefined) {
         throw makeRuntimeErrorMsg("httpworm", "Takes 1 argument");
       }
@@ -1032,8 +1031,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return true;
     },
     sqlinject: function (_hostname: unknown): boolean {
-      const hostname = helper.string("sqlinject", "hostname", _hostname);
       updateDynamicRam("sqlinject", getRamCost(Player, "sqlinject"));
+      const hostname = helper.string("sqlinject", "hostname", _hostname);
       if (hostname === undefined) {
         throw makeRuntimeErrorMsg("sqlinject", "Takes 1 argument.");
       }
@@ -1055,9 +1054,9 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return true;
     },
     run: function (_scriptname: unknown, _threads: unknown = 1, ...args: any[]): number {
+      updateDynamicRam("run", getRamCost(Player, "run"));
       const scriptname = helper.string("run", "scriptname", _scriptname);
       const threads = helper.number("run", "threads", _threads);
-      updateDynamicRam("run", getRamCost(Player, "run"));
       if (scriptname === undefined) {
         throw makeRuntimeErrorMsg("run", "Usage: run(scriptname, [numThreads], [arg1], [arg2]...)");
       }
@@ -1072,10 +1071,10 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return runScriptFromScript(Player, "run", scriptServer, scriptname, args, workerScript, threads);
     },
     exec: function (_scriptname: unknown, _hostname: unknown, _threads: unknown = 1, ...args: any[]): number {
+      updateDynamicRam("exec", getRamCost(Player, "exec"));
       const scriptname = helper.string("exec", "scriptname", _scriptname);
       const hostname = helper.string("exec", "hostname", _hostname);
       const threads = helper.number("exec", "threads", _threads);
-      updateDynamicRam("exec", getRamCost(Player, "exec"));
       if (scriptname === undefined || hostname === undefined) {
         throw makeRuntimeErrorMsg("exec", "Usage: exec(scriptname, server, [numThreads], [arg1], [arg2]...)");
       }
@@ -1086,9 +1085,9 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return runScriptFromScript(Player, "exec", server, scriptname, args, workerScript, threads);
     },
     spawn: function (_scriptname: unknown, _threads: unknown = 1, ...args: any[]): void {
+      updateDynamicRam("spawn", getRamCost(Player, "spawn"));
       const scriptname = helper.string("spawn", "scriptname", _scriptname);
       const threads = helper.number("spawn", "threads", _threads);
-      updateDynamicRam("spawn", getRamCost(Player, "spawn"));
       if (!scriptname || !threads) {
         throw makeRuntimeErrorMsg("spawn", "Usage: spawn(scriptname, threads)");
       }
@@ -1160,8 +1159,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       }
     },
     killall: function (_hostname: unknown = workerScript.hostname): boolean {
-      const hostname = helper.string("killall", "hostname", _hostname);
       updateDynamicRam("killall", getRamCost(Player, "killall"));
+      const hostname = helper.string("killall", "hostname", _hostname);
       if (hostname === undefined) {
         throw makeRuntimeErrorMsg("killall", "Takes 1 argument");
       }
@@ -1188,8 +1187,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       }
     },
     scp: async function (scriptname: any, _hostname1: unknown, hostname2?: any): Promise<boolean> {
-      const hostname1 = helper.string("scp", "hostname1", _hostname1);
       updateDynamicRam("scp", getRamCost(Player, "scp"));
+      const hostname1 = helper.string("scp", "hostname1", _hostname1);
       if (arguments.length !== 2 && arguments.length !== 3) {
         throw makeRuntimeErrorMsg("scp", "Takes 2 or 3 arguments");
       }
@@ -1346,9 +1345,9 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       });
     },
     ls: function (_hostname: unknown, _grep: unknown = ""): string[] {
+      updateDynamicRam("ls", getRamCost(Player, "ls"));
       const hostname = helper.string("ls", "hostname", _hostname);
       const grep = helper.string("ls", "grep", _grep);
-      updateDynamicRam("ls", getRamCost(Player, "ls"));
       if (hostname === undefined) {
         throw makeRuntimeErrorMsg("ls", "Usage: ls(hostname/ip, [grep filter])");
       }
@@ -1415,8 +1414,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return allFiles;
     },
     ps: function (_hostname: unknown = workerScript.hostname): ProcessInfo[] {
-      const hostname = helper.string("ps", "hostname", _hostname);
       updateDynamicRam("ps", getRamCost(Player, "ps"));
+      const hostname = helper.string("ps", "hostname", _hostname);
       const server = safeGetServer(hostname, "ps");
       const processes = [];
       for (const script of server.runningScripts) {
@@ -1430,8 +1429,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return processes;
     },
     hasRootAccess: function (_hostname: unknown): boolean {
-      const hostname = helper.string("hasRootAccess", "hostname", _hostname);
       updateDynamicRam("hasRootAccess", getRamCost(Player, "hasRootAccess"));
+      const hostname = helper.string("hasRootAccess", "hostname", _hostname);
       if (hostname === undefined) {
         throw makeRuntimeErrorMsg("hasRootAccess", "Takes 1 argument");
       }
@@ -1480,8 +1479,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return copy;
     },
     getServer: function (_hostname: unknown = workerScript.hostname): IServerDef {
-      const hostname = helper.string("getServer", "hostname", _hostname);
       updateDynamicRam("getServer", getRamCost(Player, "getServer"));
+      const hostname = helper.string("getServer", "hostname", _hostname);
       const server = safeGetServer(hostname, "getServer");
       const copy = Object.assign({}, server) as any;
       // These fields should be hidden.
@@ -1504,8 +1503,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return copy;
     },
     getServerMoneyAvailable: function (_hostname: unknown): number {
-      const hostname = helper.string("getServerMoneyAvailable", "hostname", _hostname);
       updateDynamicRam("getServerMoneyAvailable", getRamCost(Player, "getServerMoneyAvailable"));
+      const hostname = helper.string("getServerMoneyAvailable", "hostname", _hostname);
       const server = safeGetServer(hostname, "getServerMoneyAvailable");
       if (!(server instanceof Server)) {
         workerScript.log("getServerMoneyAvailable", () => "Cannot be executed on this server.");
@@ -1529,8 +1528,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return server.moneyAvailable;
     },
     getServerSecurityLevel: function (_hostname: unknown): number {
-      const hostname = helper.string("getServerSecurityLevel", "hostname", _hostname);
       updateDynamicRam("getServerSecurityLevel", getRamCost(Player, "getServerSecurityLevel"));
+      const hostname = helper.string("getServerSecurityLevel", "hostname", _hostname);
       const server = safeGetServer(hostname, "getServerSecurityLevel");
       if (!(server instanceof Server)) {
         workerScript.log("getServerSecurityLevel", () => "Cannot be executed on this server.");
@@ -1546,8 +1545,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return server.hackDifficulty;
     },
     getServerBaseSecurityLevel: function (_hostname: unknown): number {
-      const hostname = helper.string("getServerBaseSecurityLevel", "hostname", _hostname);
       updateDynamicRam("getServerBaseSecurityLevel", getRamCost(Player, "getServerBaseSecurityLevel"));
+      const hostname = helper.string("getServerBaseSecurityLevel", "hostname", _hostname);
       workerScript.log(
         "getServerBaseSecurityLevel",
         () => `getServerBaseSecurityLevel is deprecated because it's not useful.`,
@@ -1567,8 +1566,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return server.baseDifficulty;
     },
     getServerMinSecurityLevel: function (_hostname: unknown): number {
-      const hostname = helper.string("getServerMinSecurityLevel", "hostname", _hostname);
       updateDynamicRam("getServerMinSecurityLevel", getRamCost(Player, "getServerMinSecurityLevel"));
+      const hostname = helper.string("getServerMinSecurityLevel", "hostname", _hostname);
       const server = safeGetServer(hostname, "getServerMinSecurityLevel");
       if (!(server instanceof Server)) {
         workerScript.log("getServerMinSecurityLevel", () => "Cannot be executed on this server.");
@@ -1584,8 +1583,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return server.minDifficulty;
     },
     getServerRequiredHackingLevel: function (_hostname: unknown): number {
-      const hostname = helper.string("getServerRequiredHackingLevel", "hostname", _hostname);
       updateDynamicRam("getServerRequiredHackingLevel", getRamCost(Player, "getServerRequiredHackingLevel"));
+      const hostname = helper.string("getServerRequiredHackingLevel", "hostname", _hostname);
       const server = safeGetServer(hostname, "getServerRequiredHackingLevel");
       if (!(server instanceof Server)) {
         workerScript.log("getServerRequiredHackingLevel", () => "Cannot be executed on this server.");
@@ -1601,8 +1600,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return server.requiredHackingSkill;
     },
     getServerMaxMoney: function (_hostname: unknown): number {
-      const hostname = helper.string("getServerMaxMoney", "hostname", _hostname);
       updateDynamicRam("getServerMaxMoney", getRamCost(Player, "getServerMaxMoney"));
+      const hostname = helper.string("getServerMaxMoney", "hostname", _hostname);
       const server = safeGetServer(hostname, "getServerMaxMoney");
       if (!(server instanceof Server)) {
         workerScript.log("getServerMaxMoney", () => "Cannot be executed on this server.");
@@ -1618,8 +1617,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return server.moneyMax;
     },
     getServerGrowth: function (_hostname: unknown): number {
-      const hostname = helper.string("getServerGrowth", "hostname", _hostname);
       updateDynamicRam("getServerGrowth", getRamCost(Player, "getServerGrowth"));
+      const hostname = helper.string("getServerGrowth", "hostname", _hostname);
       const server = safeGetServer(hostname, "getServerGrowth");
       if (!(server instanceof Server)) {
         workerScript.log("getServerGrowth", () => "Cannot be executed on this server.");
@@ -1632,8 +1631,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return server.serverGrowth;
     },
     getServerNumPortsRequired: function (_hostname: unknown): number {
-      const hostname = helper.string("getServerNumPortsRequired", "hostname", _hostname);
       updateDynamicRam("getServerNumPortsRequired", getRamCost(Player, "getServerNumPortsRequired"));
+      const hostname = helper.string("getServerNumPortsRequired", "hostname", _hostname);
       const server = safeGetServer(hostname, "getServerNumPortsRequired");
       if (!(server instanceof Server)) {
         workerScript.log("getServerNumPortsRequired", () => "Cannot be executed on this server.");
@@ -1649,8 +1648,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return server.numOpenPortsRequired;
     },
     getServerRam: function (_hostname: unknown): [number, number] {
-      const hostname = helper.string("getServerRam", "hostname", _hostname);
       updateDynamicRam("getServerRam", getRamCost(Player, "getServerRam"));
+      const hostname = helper.string("getServerRam", "hostname", _hostname);
       workerScript.log(
         "getServerRam",
         () => `getServerRam is deprecated in favor of getServerMaxRam / getServerUsedRam`,
@@ -1663,28 +1662,28 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return [server.maxRam, server.ramUsed];
     },
     getServerMaxRam: function (_hostname: unknown): number {
-      const hostname = helper.string("getServerMaxRam", "hostname", _hostname);
       updateDynamicRam("getServerMaxRam", getRamCost(Player, "getServerMaxRam"));
+      const hostname = helper.string("getServerMaxRam", "hostname", _hostname);
       const server = safeGetServer(hostname, "getServerMaxRam");
       workerScript.log("getServerMaxRam", () => `returned ${numeralWrapper.formatRAM(server.maxRam)}`);
       return server.maxRam;
     },
     getServerUsedRam: function (_hostname: unknown): number {
-      const hostname = helper.string("getServerUsedRam", "hostname", _hostname);
       updateDynamicRam("getServerUsedRam", getRamCost(Player, "getServerUsedRam"));
+      const hostname = helper.string("getServerUsedRam", "hostname", _hostname);
       const server = safeGetServer(hostname, "getServerUsedRam");
       workerScript.log("getServerUsedRam", () => `returned ${numeralWrapper.formatRAM(server.ramUsed)}`);
       return server.ramUsed;
     },
     serverExists: function (_hostname: unknown): boolean {
-      const hostname = helper.string("serverExists", "hostname", _hostname);
       updateDynamicRam("serverExists", getRamCost(Player, "serverExists"));
+      const hostname = helper.string("serverExists", "hostname", _hostname);
       return GetServer(hostname) !== null;
     },
     fileExists: function (_filename: unknown, _hostname: unknown = workerScript.hostname): boolean {
+      updateDynamicRam("fileExists", getRamCost(Player, "fileExists"));
       const filename = helper.string("fileExists", "filename", _filename);
       const hostname = helper.string("fileExists", "hostname", _hostname);
-      updateDynamicRam("fileExists", getRamCost(Player, "fileExists"));
       if (filename === undefined) {
         throw makeRuntimeErrorMsg("fileExists", "Usage: fileExists(scriptname, [server])");
       }
@@ -1729,8 +1728,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return getPurchaseServerMaxRam();
     },
     getPurchasedServerCost: function (_ram: unknown): number {
-      const ram = helper.number("getPurchasedServerCost", "ram", _ram);
       updateDynamicRam("getPurchasedServerCost", getRamCost(Player, "getPurchasedServerCost"));
+      const ram = helper.number("getPurchasedServerCost", "ram", _ram);
 
       const cost = getPurchaseServerCost(ram);
       if (cost === Infinity) {
@@ -1741,10 +1740,10 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return cost;
     },
     purchaseServer: function (_name: unknown, _ram: unknown): string {
+      updateDynamicRam("purchaseServer", getRamCost(Player, "purchaseServer"));
       const name = helper.string("purchaseServer", "name", _name);
       const ram = helper.number("purchaseServer", "ram", _ram);
       if (arguments.length !== 2) throw makeRuntimeErrorMsg("purchaseServer", "Takes 2 arguments");
-      updateDynamicRam("purchaseServer", getRamCost(Player, "purchaseServer"));
       let hostnameStr = String(name);
       hostnameStr = hostnameStr.replace(/\s+/g, "");
       if (hostnameStr == "") {
@@ -1805,8 +1804,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return newServ.hostname;
     },
     deleteServer: function (_name: unknown): boolean {
-      const name = helper.string("purchaseServer", "name", _name);
       updateDynamicRam("deleteServer", getRamCost(Player, "deleteServer"));
+      const name = helper.string("purchaseServer", "name", _name);
       let hostnameStr = String(name);
       hostnameStr = hostnameStr.replace(/\s\s+/g, "");
       const server = GetServer(hostnameStr);
@@ -1890,8 +1889,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return res;
     },
     writePort: function (_port: unknown, data: any = ""): Promise<any> {
-      const port = helper.number("writePort", "port", _port);
       updateDynamicRam("writePort", getRamCost(Player, "writePort"));
+      const port = helper.number("writePort", "port", _port);
       if (typeof data !== "string" && typeof data !== "number") {
         throw makeRuntimeErrorMsg(
           "writePort",
@@ -1902,9 +1901,9 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return Promise.resolve(iport.write(data));
     },
     write: function (_port: unknown, data: any = "", _mode: unknown = "a"): Promise<void> {
+      updateDynamicRam("write", getRamCost(Player, "write"));
       const port = helper.string("write", "port", _port);
       const mode = helper.string("write", "mode", _mode);
-      updateDynamicRam("write", getRamCost(Player, "write"));
       if (isString(port)) {
         // Write to script or text file
         let fn = port;
@@ -1957,8 +1956,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       }
     },
     tryWritePort: function (_port: unknown, data: any = ""): Promise<any> {
-      let port = helper.number("tryWritePort", "port", _port);
       updateDynamicRam("tryWritePort", getRamCost(Player, "tryWritePort"));
+      let port = helper.number("tryWritePort", "port", _port);
       if (typeof data !== "string" && typeof data !== "number") {
         throw makeRuntimeErrorMsg(
           "tryWritePort",
@@ -1983,16 +1982,16 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       }
     },
     readPort: function (_port: unknown): any {
-      const port = helper.number("readPort", "port", _port);
       updateDynamicRam("readPort", getRamCost(Player, "readPort"));
+      const port = helper.number("readPort", "port", _port);
       // Read from port
       const iport = helper.getValidPort("readPort", port);
       const x = iport.read();
       return x;
     },
     read: function (_port: unknown): string {
-      const port = helper.string("read", "port", _port);
       updateDynamicRam("read", getRamCost(Player, "read"));
+      const port = helper.string("read", "port", _port);
       if (isString(port)) {
         // Read from script or text file
         const fn = port;
@@ -2021,15 +2020,15 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       }
     },
     peek: function (_port: unknown): any {
-      const port = helper.number("peek", "port", _port);
       updateDynamicRam("peek", getRamCost(Player, "peek"));
+      const port = helper.number("peek", "port", _port);
       const iport = helper.getValidPort("peek", port);
       const x = iport.peek();
       return x;
     },
     clear: function (_file: unknown): void {
-      const file = helper.string("peek", "file", _file);
       updateDynamicRam("clear", getRamCost(Player, "clear"));
+      const file = helper.string("peek", "file", _file);
       if (isString(file)) {
         // Clear text file
         const fn = file;
@@ -2046,21 +2045,21 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       }
     },
     clearPort: function (_port: unknown): void {
-      const port = helper.number("clearPort", "port", _port);
       updateDynamicRam("clearPort", getRamCost(Player, "clearPort"));
+      const port = helper.number("clearPort", "port", _port);
       // Clear port
       const iport = helper.getValidPort("clearPort", port);
       iport.clear();
     },
     getPortHandle: function (_port: unknown): IPort {
-      const port = helper.number("getPortHandle", "port", _port);
       updateDynamicRam("getPortHandle", getRamCost(Player, "getPortHandle"));
+      const port = helper.number("getPortHandle", "port", _port);
       const iport = helper.getValidPort("getPortHandle", port);
       return iport;
     },
     rm: function (_fn: unknown, hostname: any): boolean {
-      const fn = helper.string("rm", "fn", _fn);
       updateDynamicRam("rm", getRamCost(Player, "rm"));
+      const fn = helper.string("rm", "fn", _fn);
 
       if (hostname == null || hostname === "") {
         hostname = workerScript.hostname;
@@ -2075,9 +2074,9 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return status.res;
     },
     scriptRunning: function (_scriptname: unknown, _hostname: unknown): boolean {
+      updateDynamicRam("scriptRunning", getRamCost(Player, "scriptRunning"));
       const scriptname = helper.string("scriptRunning", "scriptname", _scriptname);
       const hostname = helper.string("scriptRunning", "hostname", _hostname);
-      updateDynamicRam("scriptRunning", getRamCost(Player, "scriptRunning"));
       const server = safeGetServer(hostname, "scriptRunning");
       for (let i = 0; i < server.runningScripts.length; ++i) {
         if (server.runningScripts[i].filename == scriptname) {
@@ -2087,9 +2086,9 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return false;
     },
     scriptKill: function (_scriptname: unknown, _hostname: unknown): boolean {
+      updateDynamicRam("scriptKill", getRamCost(Player, "scriptKill"));
       const scriptname = helper.string("scriptKill", "scriptname", _scriptname);
       const hostname = helper.string("scriptKill", "hostname", _hostname);
-      updateDynamicRam("scriptKill", getRamCost(Player, "scriptKill"));
       const server = safeGetServer(hostname, "scriptKill");
       let suc = false;
       for (let i = 0; i < server.runningScripts.length; i++) {
@@ -2106,9 +2105,9 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return workerScript.name;
     },
     getScriptRam: function (_scriptname: unknown, _hostname: unknown = workerScript.hostname): number {
+      updateDynamicRam("getScriptRam", getRamCost(Player, "getScriptRam"));
       const scriptname = helper.string("getScriptRam", "scriptname", _scriptname);
       const hostname = helper.string("getScriptRam", "hostname", _hostname);
-      updateDynamicRam("getScriptRam", getRamCost(Player, "getScriptRam"));
       const server = safeGetServer(hostname, "getScriptRam");
       for (let i = 0; i < server.scripts.length; ++i) {
         if (server.scripts[i].filename == scriptname) {
@@ -2146,8 +2145,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       };
     },
     getHackTime: function (_hostname: unknown = workerScript.hostname): number {
-      const hostname = helper.string("getHackTime", "hostname", _hostname);
       updateDynamicRam("getHackTime", getRamCost(Player, "getHackTime"));
+      const hostname = helper.string("getHackTime", "hostname", _hostname);
       const server = safeGetServer(hostname, "getHackTime");
       if (!(server instanceof Server)) {
         workerScript.log("getHackTime", () => "invalid for this kind of server");
@@ -2160,8 +2159,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return calculateHackingTime(server, Player) * 1000;
     },
     getGrowTime: function (_hostname: unknown = workerScript.hostname): number {
-      const hostname = helper.string("getGrowTime", "hostname", _hostname);
       updateDynamicRam("getGrowTime", getRamCost(Player, "getGrowTime"));
+      const hostname = helper.string("getGrowTime", "hostname", _hostname);
       const server = safeGetServer(hostname, "getGrowTime");
       if (!(server instanceof Server)) {
         workerScript.log("getGrowTime", () => "invalid for this kind of server");
@@ -2174,8 +2173,8 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return calculateGrowTime(server, Player) * 1000;
     },
     getWeakenTime: function (_hostname: unknown = workerScript.hostname): number {
-      const hostname = helper.string("getWeakenTime", "hostname", _hostname);
       updateDynamicRam("getWeakenTime", getRamCost(Player, "getWeakenTime"));
+      const hostname = helper.string("getWeakenTime", "hostname", _hostname);
       const server = safeGetServer(hostname, "getWeakenTime");
       if (!(server instanceof Server)) {
         workerScript.log("getWeakenTime", () => "invalid for this kind of server");
@@ -2239,9 +2238,9 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       }
     },
     nFormat: function (_n: unknown, _format: unknown): string {
+      updateDynamicRam("nFormat", getRamCost(Player, "nFormat"));
       const n = helper.number("nFormat", "n", _n);
       const format = helper.string("nFormat", "format", _format);
-      updateDynamicRam("nFormat", getRamCost(Player, "nFormat"));
       if (isNaN(n)) {
         return "";
       }
@@ -2249,9 +2248,9 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return numeralWrapper.format(n, format);
     },
     tFormat: function (_milliseconds: unknown, _milliPrecision: unknown = false): string {
+      updateDynamicRam("tFormat", getRamCost(Player, "tFormat"));
       const milliseconds = helper.number("tFormat", "milliseconds", _milliseconds);
       const milliPrecision = helper.boolean(_milliPrecision);
-      updateDynamicRam("tFormat", getRamCost(Player, "tFormat"));
       return convertTimeMsToTimeElapsedString(milliseconds, milliPrecision);
     },
     getTimeSinceLastAug: function (): number {
@@ -2259,21 +2258,21 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       return Player.playtimeSinceLastAug;
     },
     alert: function (_message: unknown): void {
-      const message = helper.string("alert", "message", _message);
       updateDynamicRam("alert", getRamCost(Player, "alert"));
+      const message = helper.string("alert", "message", _message);
       dialogBoxCreate(message);
     },
     toast: function (_message: unknown, _variant: unknown = "success", duration: any = 2000): void {
+      updateDynamicRam("toast", getRamCost(Player, "toast"));
       const message = helper.string("toast", "message", _message);
       const variant = helper.string("toast", "variant", _variant);
-      updateDynamicRam("toast", getRamCost(Player, "toast"));
       if (!["success", "info", "warning", "error"].includes(variant))
         throw new Error(`variant must be one of "success", "info", "warning", or "error"`);
       SnackbarEvents.emit(message, variant as any, duration);
     },
     prompt: function (_txt: unknown, options?: { type?: string; options?: string[] }): Promise<boolean | string> {
-      const txt = helper.string("toast", "txt", _txt);
       updateDynamicRam("prompt", getRamCost(Player, "prompt"));
+      const txt = helper.string("toast", "txt", _txt);
 
       return new Promise(function (resolve) {
         PromptEvent.emit({
@@ -2288,10 +2287,10 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       _target: unknown,
       _hostname: unknown = workerScript.hostname,
     ): Promise<boolean> {
+      updateDynamicRam("wget", getRamCost(Player, "wget"));
       const url = helper.string("wget", "url", _url);
       const target = helper.string("wget", "target", _target);
       const hostname = helper.string("wget", "hostname", _hostname);
-      updateDynamicRam("wget", getRamCost(Player, "wget"));
       if (!isScriptFilename(target) && !target.endsWith(".txt")) {
         workerScript.log("wget", () => `Invalid target file: '${target}'. Must be a script or text file.`);
         return Promise.resolve(false);
@@ -2450,10 +2449,10 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS {
       }; // Wrap the user function to prevent WorkerScript leaking as 'this'
     },
     mv: function (_host: unknown, _source: unknown, _destination: unknown): void {
+      updateDynamicRam("mv", getRamCost(Player, "mv"));
       const host = helper.string("mv", "host", _host);
       const source = helper.string("mv", "source", _source);
       const destination = helper.string("mv", "destination", _destination);
-      updateDynamicRam("mv", getRamCost(Player, "mv"));
 
       if (!isValidFilePath(source)) throw makeRuntimeErrorMsg("mv", `Invalid filename: '${source}'`);
       if (!isValidFilePath(destination)) throw makeRuntimeErrorMsg("mv", `Invalid filename: '${destination}'`);

src/NetscriptFunctions/Bladeburner.ts

@@ -56,53 +56,56 @@ export function NetscriptBladeburner(
     return actionObj;
   };
 
+  const updateRam = (funcName: string): void =>
+    helper.updateDynamicRam(funcName, getRamCost(player, "bladeburner", funcName));
+
   return {
     getContractNames: function (): string[] {
-      helper.updateDynamicRam("getContractNames", getRamCost(player, "bladeburner", "getContractNames"));
+      updateRam("getContractNames");
       checkBladeburnerAccess("getContractNames");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
       return bladeburner.getContractNamesNetscriptFn();
     },
     getOperationNames: function (): string[] {
-      helper.updateDynamicRam("getOperationNames", getRamCost(player, "bladeburner", "getOperationNames"));
+      updateRam("getOperationNames");
       checkBladeburnerAccess("getOperationNames");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
       return bladeburner.getOperationNamesNetscriptFn();
     },
     getBlackOpNames: function (): string[] {
-      helper.updateDynamicRam("getBlackOpNames", getRamCost(player, "bladeburner", "getBlackOpNames"));
+      updateRam("getBlackOpNames");
       checkBladeburnerAccess("getBlackOpNames");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
       return bladeburner.getBlackOpNamesNetscriptFn();
     },
     getBlackOpRank: function (_blackOpName: unknown): number {
+      updateRam("getBlackOpRank");
       const blackOpName = helper.string("getBlackOpRank", "blackOpName", _blackOpName);
-      helper.updateDynamicRam("getBlackOpRank", getRamCost(player, "bladeburner", "getBlackOpRank"));
       checkBladeburnerAccess("getBlackOpRank");
       const action: any = getBladeburnerActionObject("getBlackOpRank", "blackops", blackOpName);
       return action.reqdRank;
     },
     getGeneralActionNames: function (): string[] {
-      helper.updateDynamicRam("getGeneralActionNames", getRamCost(player, "bladeburner", "getGeneralActionNames"));
+      updateRam("getGeneralActionNames");
       checkBladeburnerAccess("getGeneralActionNames");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
       return bladeburner.getGeneralActionNamesNetscriptFn();
     },
     getSkillNames: function (): string[] {
-      helper.updateDynamicRam("getSkillNames", getRamCost(player, "bladeburner", "getSkillNames"));
+      updateRam("getSkillNames");
       checkBladeburnerAccess("getSkillNames");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
       return bladeburner.getSkillNamesNetscriptFn();
     },
     startAction: function (_type: unknown, _name: unknown): boolean {
+      updateRam("startAction");
       const type = helper.string("startAction", "type", _type);
       const name = helper.string("startAction", "name", _name);
-      helper.updateDynamicRam("startAction", getRamCost(player, "bladeburner", "startAction"));
       checkBladeburnerAccess("startAction");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
@@ -113,23 +116,23 @@ export function NetscriptBladeburner(
       }
     },
     stopBladeburnerAction: function (): void {
-      helper.updateDynamicRam("stopBladeburnerAction", getRamCost(player, "bladeburner", "stopBladeburnerAction"));
+      updateRam("stopBladeburnerAction");
       checkBladeburnerAccess("stopBladeburnerAction");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
       return bladeburner.resetAction();
     },
     getCurrentAction: function (): BladeburnerCurAction {
-      helper.updateDynamicRam("getCurrentAction", getRamCost(player, "bladeburner", "getCurrentAction"));
+      updateRam("getCurrentAction");
       checkBladeburnerAccess("getCurrentAction");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
       return bladeburner.getTypeAndNameFromActionId(bladeburner.action);
     },
     getActionTime: function (_type: unknown, _name: unknown): number {
+      updateRam("getActionTime");
       const type = helper.string("getActionTime", "type", _type);
       const name = helper.string("getActionTime", "name", _name);
-      helper.updateDynamicRam("getActionTime", getRamCost(player, "bladeburner", "getActionTime"));
       checkBladeburnerAccess("getActionTime");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
@@ -147,12 +150,9 @@ export function NetscriptBladeburner(
       }
     },
     getActionEstimatedSuccessChance: function (_type: unknown, _name: unknown): [number, number] {
+      updateRam("getActionEstimatedSuccessChance");
       const type = helper.string("getActionEstimatedSuccessChance", "type", _type);
       const name = helper.string("getActionEstimatedSuccessChance", "name", _name);
-      helper.updateDynamicRam(
-        "getActionEstimatedSuccessChance",
-        getRamCost(player, "bladeburner", "getActionEstimatedSuccessChance"),
-      );
       checkBladeburnerAccess("getActionEstimatedSuccessChance");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
@@ -170,10 +170,10 @@ export function NetscriptBladeburner(
       }
     },
     getActionRepGain: function (_type: unknown, _name: unknown, _level: unknown): number {
+      updateRam("getActionRepGain");
       const type = helper.string("getActionRepGain", "type", _type);
       const name = helper.string("getActionRepGain", "name", _name);
       const level = helper.number("getActionRepGain", "level", _level);
-      helper.updateDynamicRam("getActionRepGain", getRamCost(player, "bladeburner", "getActionRepGain"));
       checkBladeburnerAccess("getActionRepGain");
       const action = getBladeburnerActionObject("getActionRepGain", type, name);
       let rewardMultiplier;
@@ -186,9 +186,9 @@ export function NetscriptBladeburner(
       return action.rankGain * rewardMultiplier * BitNodeMultipliers.BladeburnerRank;
     },
     getActionCountRemaining: function (_type: unknown, _name: unknown): number {
+      updateRam("getActionCountRemaining");
       const type = helper.string("getActionCountRemaining", "type", _type);
       const name = helper.string("getActionCountRemaining", "name", _name);
-      helper.updateDynamicRam("getActionCountRemaining", getRamCost(player, "bladeburner", "getActionCountRemaining"));
       checkBladeburnerAccess("getActionCountRemaining");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
@@ -199,43 +199,43 @@ export function NetscriptBladeburner(
       }
     },
     getActionMaxLevel: function (_type: unknown, _name: unknown): number {
+      updateRam("getActionMaxLevel");
       const type = helper.string("getActionMaxLevel", "type", _type);
       const name = helper.string("getActionMaxLevel", "name", _name);
-      helper.updateDynamicRam("getActionMaxLevel", getRamCost(player, "bladeburner", "getActionMaxLevel"));
       checkBladeburnerAccess("getActionMaxLevel");
       const action = getBladeburnerActionObject("getActionMaxLevel", type, name);
       return action.maxLevel;
     },
     getActionCurrentLevel: function (_type: unknown, _name: unknown): number {
+      updateRam("getActionCurrentLevel");
       const type = helper.string("getActionCurrentLevel", "type", _type);
       const name = helper.string("getActionCurrentLevel", "name", _name);
-      helper.updateDynamicRam("getActionCurrentLevel", getRamCost(player, "bladeburner", "getActionCurrentLevel"));
       checkBladeburnerAccess("getActionCurrentLevel");
       const action = getBladeburnerActionObject("getActionCurrentLevel", type, name);
       return action.level;
     },
     getActionAutolevel: function (_type: unknown, _name: unknown): boolean {
+      updateRam("getActionAutolevel");
       const type = helper.string("getActionAutolevel", "type", _type);
       const name = helper.string("getActionAutolevel", "name", _name);
-      helper.updateDynamicRam("getActionAutolevel", getRamCost(player, "bladeburner", "getActionAutolevel"));
       checkBladeburnerAccess("getActionAutolevel");
       const action = getBladeburnerActionObject("getActionCurrentLevel", type, name);
       return action.autoLevel;
     },
     setActionAutolevel: function (_type: unknown, _name: unknown, _autoLevel: unknown = true): void {
+      updateRam("setActionAutolevel");
       const type = helper.string("setActionAutolevel", "type", _type);
       const name = helper.string("setActionAutolevel", "name", _name);
       const autoLevel = helper.boolean(_autoLevel);
-      helper.updateDynamicRam("setActionAutolevel", getRamCost(player, "bladeburner", "setActionAutolevel"));
       checkBladeburnerAccess("setActionAutolevel");
       const action = getBladeburnerActionObject("setActionAutolevel", type, name);
       action.autoLevel = autoLevel;
     },
     setActionLevel: function (_type: unknown, _name: unknown, _level: unknown = 1): void {
+      updateRam("setActionLevel");
       const type = helper.string("setActionLevel", "type", _type);
       const name = helper.string("setActionLevel", "name", _name);
       const level = helper.number("setActionLevel", "level", _level);
-      helper.updateDynamicRam("setActionLevel", getRamCost(player, "bladeburner", "setActionLevel"));
       checkBladeburnerAccess("setActionLevel");
       const action = getBladeburnerActionObject("setActionLevel", type, name);
       if (level < 1 || level > action.maxLevel) {
@@ -247,22 +247,22 @@ export function NetscriptBladeburner(
       action.level = level;
     },
     getRank: function (): number {
-      helper.updateDynamicRam("getRank", getRamCost(player, "bladeburner", "getRank"));
+      updateRam("getRank");
       checkBladeburnerAccess("getRank");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
       return bladeburner.rank;
     },
     getSkillPoints: function (): number {
-      helper.updateDynamicRam("getSkillPoints", getRamCost(player, "bladeburner", "getSkillPoints"));
+      updateRam("getSkillPoints");
       checkBladeburnerAccess("getSkillPoints");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
       return bladeburner.skillPoints;
     },
     getSkillLevel: function (_skillName: unknown): number {
+      updateRam("getSkillLevel");
       const skillName = helper.string("getSkillLevel", "skillName", _skillName);
-      helper.updateDynamicRam("getSkillLevel", getRamCost(player, "bladeburner", "getSkillLevel"));
       checkBladeburnerAccess("getSkillLevel");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
@@ -273,8 +273,8 @@ export function NetscriptBladeburner(
       }
     },
     getSkillUpgradeCost: function (_skillName: unknown): number {
+      updateRam("getSkillUpgradeCost");
       const skillName = helper.string("getSkillUpgradeCost", "skillName", _skillName);
-      helper.updateDynamicRam("getSkillUpgradeCost", getRamCost(player, "bladeburner", "getSkillUpgradeCost"));
       checkBladeburnerAccess("getSkillUpgradeCost");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
@@ -285,8 +285,8 @@ export function NetscriptBladeburner(
       }
     },
     upgradeSkill: function (_skillName: unknown): boolean {
+      updateRam("upgradeSkill");
       const skillName = helper.string("upgradeSkill", "skillName", _skillName);
-      helper.updateDynamicRam("upgradeSkill", getRamCost(player, "bladeburner", "upgradeSkill"));
       checkBladeburnerAccess("upgradeSkill");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
@@ -297,9 +297,9 @@ export function NetscriptBladeburner(
       }
     },
     getTeamSize: function (_type: unknown, _name: unknown): number {
+      updateRam("getTeamSize");
       const type = helper.string("getTeamSize", "type", _type);
       const name = helper.string("getTeamSize", "name", _name);
-      helper.updateDynamicRam("getTeamSize", getRamCost(player, "bladeburner", "getTeamSize"));
       checkBladeburnerAccess("getTeamSize");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
@@ -310,10 +310,10 @@ export function NetscriptBladeburner(
       }
     },
     setTeamSize: function (_type: unknown, _name: unknown, _size: unknown): number {
+      updateRam("setTeamSize");
       const type = helper.string("setTeamSize", "type", _type);
       const name = helper.string("setTeamSize", "name", _name);
       const size = helper.number("setTeamSize", "size", _size);
-      helper.updateDynamicRam("setTeamSize", getRamCost(player, "bladeburner", "setTeamSize"));
       checkBladeburnerAccess("setTeamSize");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
@@ -324,11 +324,8 @@ export function NetscriptBladeburner(
       }
     },
     getCityEstimatedPopulation: function (_cityName: unknown): number {
+      updateRam("getCityEstimatedPopulation");
       const cityName = helper.string("getCityEstimatedPopulation", "cityName", _cityName);
-      helper.updateDynamicRam(
-        "getCityEstimatedPopulation",
-        getRamCost(player, "bladeburner", "getCityEstimatedPopulation"),
-      );
       checkBladeburnerAccess("getCityEstimatedPopulation");
       checkBladeburnerCity("getCityEstimatedPopulation", cityName);
       const bladeburner = player.bladeburner;
@@ -336,8 +333,8 @@ export function NetscriptBladeburner(
       return bladeburner.cities[cityName].popEst;
     },
     getCityCommunities: function (_cityName: unknown): number {
+      updateRam("getCityCommunities");
       const cityName = helper.string("getCityCommunities", "cityName", _cityName);
-      helper.updateDynamicRam("getCityCommunities", getRamCost(player, "bladeburner", "getCityCommunities"));
       checkBladeburnerAccess("getCityCommunities");
       checkBladeburnerCity("getCityCommunities", cityName);
       const bladeburner = player.bladeburner;
@@ -345,8 +342,8 @@ export function NetscriptBladeburner(
       return bladeburner.cities[cityName].comms;
     },
     getCityChaos: function (_cityName: unknown): number {
+      updateRam("getCityChaos");
       const cityName = helper.string("getCityChaos", "cityName", _cityName);
-      helper.updateDynamicRam("getCityChaos", getRamCost(player, "bladeburner", "getCityChaos"));
       checkBladeburnerAccess("getCityChaos");
       checkBladeburnerCity("getCityChaos", cityName);
       const bladeburner = player.bladeburner;
@@ -354,15 +351,15 @@ export function NetscriptBladeburner(
       return bladeburner.cities[cityName].chaos;
     },
     getCity: function (): string {
-      helper.updateDynamicRam("getCity", getRamCost(player, "bladeburner", "getCity"));
+      updateRam("getCity");
       checkBladeburnerAccess("getCityChaos");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
       return bladeburner.city;
     },
     switchCity: function (_cityName: unknown): boolean {
+      updateRam("switchCity");
       const cityName = helper.string("switchCity", "cityName", _cityName);
-      helper.updateDynamicRam("switchCity", getRamCost(player, "bladeburner", "switchCity"));
       checkBladeburnerAccess("switchCity");
       checkBladeburnerCity("switchCity", cityName);
       const bladeburner = player.bladeburner;
@@ -371,21 +368,21 @@ export function NetscriptBladeburner(
       return true;
     },
     getStamina: function (): [number, number] {
-      helper.updateDynamicRam("getStamina", getRamCost(player, "bladeburner", "getStamina"));
+      updateRam("getStamina");
       checkBladeburnerAccess("getStamina");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
       return [bladeburner.stamina, bladeburner.maxStamina];
     },
     joinBladeburnerFaction: function (): boolean {
-      helper.updateDynamicRam("joinBladeburnerFaction", getRamCost(player, "bladeburner", "joinBladeburnerFaction"));
+      updateRam("joinBladeburnerFaction");
       checkBladeburnerAccess("joinBladeburnerFaction", true);
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
       return bladeburner.joinBladeburnerFactionNetscriptFn(workerScript);
     },
     joinBladeburnerDivision: function (): boolean {
-      helper.updateDynamicRam("joinBladeburnerDivision", getRamCost(player, "bladeburner", "joinBladeburnerDivision"));
+      updateRam("joinBladeburnerDivision");
       if (player.bitNodeN === 7 || player.sourceFileLvl(7) > 0) {
         if (player.bitNodeN === 8) {
           return false;
@@ -413,7 +410,7 @@ export function NetscriptBladeburner(
       return false;
     },
     getBonusTime: function (): number {
-      helper.updateDynamicRam("getBonusTime", getRamCost(player, "bladeburner", "getBonusTime"));
+      updateRam("getBonusTime");
       checkBladeburnerAccess("getBonusTime");
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");

src/NetscriptFunctions/CodingContract.ts

@@ -24,6 +24,9 @@ export function NetscriptCodingContract(
     return contract;
   };
 
+  const updateRam = (funcName: string): void =>
+    helper.updateDynamicRam(funcName, getRamCost(player, "codingcontract", funcName));
+
   return {
     attempt: function (
       answer: any,
@@ -31,9 +34,9 @@ export function NetscriptCodingContract(
       _hostname: unknown = workerScript.hostname,
       { returnReward }: CodingAttemptOptions = { returnReward: false },
     ): boolean | string {
+      updateRam("attempt");
       const filename = helper.string("attempt", "filename", _filename);
       const hostname = helper.string("attempt", "hostname", _hostname);
-      helper.updateDynamicRam("attempt", getRamCost(player, "codingcontract", "attempt"));
       const contract = getCodingContract("attempt", hostname, filename);
 
       // Convert answer to string. If the answer is a 2D array, then we have to
@@ -83,16 +86,16 @@ export function NetscriptCodingContract(
       }
     },
     getContractType: function (_filename: unknown, _hostname: unknown = workerScript.hostname): string {
+      updateRam("getContractType");
       const filename = helper.string("getContractType", "filename", _filename);
       const hostname = helper.string("getContractType", "hostname", _hostname);
-      helper.updateDynamicRam("getContractType", getRamCost(player, "codingcontract", "getContractType"));
       const contract = getCodingContract("getContractType", hostname, filename);
       return contract.getType();
     },
     getData: function (_filename: unknown, _hostname: unknown = workerScript.hostname): any {
+      updateRam("getData");
       const filename = helper.string("getContractType", "filename", _filename);
       const hostname = helper.string("getContractType", "hostname", _hostname);
-      helper.updateDynamicRam("getData", getRamCost(player, "codingcontract", "getData"));
       const contract = getCodingContract("getData", hostname, filename);
       const data = contract.getData();
       if (data.constructor === Array) {
@@ -112,16 +115,16 @@ export function NetscriptCodingContract(
       }
     },
     getDescription: function (_filename: unknown, _hostname: unknown = workerScript.hostname): string {
+      updateRam("getDescription");
       const filename = helper.string("getDescription", "filename", _filename);
       const hostname = helper.string("getDescription", "hostname", _hostname);
-      helper.updateDynamicRam("getDescription", getRamCost(player, "codingcontract", "getDescription"));
       const contract = getCodingContract("getDescription", hostname, filename);
       return contract.getDescription();
     },
     getNumTriesRemaining: function (_filename: unknown, _hostname: unknown = workerScript.hostname): number {
+      updateRam("getNumTriesRemaining");
       const filename = helper.string("getNumTriesRemaining", "filename", _filename);
       const hostname = helper.string("getNumTriesRemaining", "hostname", _hostname);
-      helper.updateDynamicRam("getNumTriesRemaining", getRamCost(player, "codingcontract", "getNumTriesRemaining"));
       const contract = getCodingContract("getNumTriesRemaining", hostname, filename);
       return contract.getMaxNumTries() - contract.tries;
     },