v0.52.9

Switch out test runner for jest

.babelrc

@@ -1,3 +0,0 @@
-{
-  "presets": ["@babel/preset-react"]
-}

.dockerignore

@@ -0,0 +1,14 @@
+node_modules/
+
+.git
+.gitattributes
+.gitignore
+.editorconfig
+
+.dockerignore
+Dockerfile
+docker-compose.yml
+
+*.md
+Quotes.txt
+netscript_tests/

.eslintignore

@@ -2,3 +2,7 @@ node_modules/
 doc/build/
 dist/
 tests/*.bundle.*
+src/ThirdParty/*
+src/ScriptEditor/CodeMirrorNetscriptMode.js
+src/ScriptEditor/CodeMirrorNetscriptLint.js
+src/JSInterpreter.js

.gitignore

@@ -1,8 +1,12 @@
+.vscode
 Changelog.txt
 Netburner.txt
 /doc/build
 /node_modules
 /dist/*.map
-/tests/*.map
-/tests/*.bundle.*
-/tests/*.css
+/test/*.map
+/test/*.bundle.*
+/test/*.css
+
+# editor files
+.vscode

Dockerfile

@@ -0,0 +1,35 @@
+FROM node:15.14.0 AS base
+
+WORKDIR /app
+
+# Scripts used in the npm preinstall hook
+COPY scripts/engines-check.js scripts/semver.js scripts/
+
+# Adding our dependencies and install before adding the rest of the files
+# This prevents reinstallation of npm packages for every subsequent code modification
+ENV npm_config_update_notifier=false
+COPY package.json package-lock.json ./
+RUN npm ci --loglevel=error --no-audit --no-fund && npm rebuild node-sass
+
+# Adding all the remaining source files
+COPY . .
+
+# We need more than the default 512MB otherwise webpack will throw 'heap out of memory' exceptions
+# https://nodejs.org/api/cli.html#cli_max_old_space_size_size_in_megabytes
+ENV NODE_OPTIONS=--max-old-space-size=1536
+
+FROM base AS dev
+# This is the main development build using the file watcher if you mount volumes
+USER node
+EXPOSE 8000
+CMD npm run start:container
+
+FROM base AS prod-dist
+# We'll simply build the production dist files here to later reuse in a simple webserver
+RUN npm run build
+
+FROM nginx:1.20.0-alpine AS prod
+WORKDIR /usr/share/nginx/html
+COPY --from=prod-dist /app/dist ./dist
+COPY --from=prod-dist /app/index.html /app/favicon.ico /app/license.txt ./
+EXPOSE 80

Quotes.txt

@@ -1,13 +1,13 @@
 Collection of Quotes
 
-The past is relevant only as data
+The past is relevant only as data.
 
 Pull on the new flesh like borrowed gloves and burn your fingers once again.
 
 A weapon is a tool. A tool for killing and destroying. And there will be times
 when you must kill and destroy. Then you will choose and equip yourself with the tools
 that you need. But remember the weakness of weapons. They are an extension --
-You are the killer and destroyer. You are whole, with or without them.
+you are the killer and destroyer. You are whole, with or without them.
 
 For all that we have done, as a civilization, as individuals, the universe is
 not stable, and nor is any single thing within it. Stars consume themselves,

README.md

@@ -1,6 +1,7 @@
 # Bitburner
-Bitburner is a cyberpunk hacking-themed incremental game. The game can be
-played at https://danielyxie.github.io/bitburner.
+Bitburner is a programming-based [incremental game](https://en.wikipedia.org/wiki/Incremental_game)
+that revolves around hacking and cyberpunk themes.
+The game can be played at https://danielyxie.github.io/bitburner.
 
 # Documentation
 The game's official documentation can be found on [Read The

README_contribution.md

@@ -0,0 +1,23 @@
+Deploying a new version
+-----------------------
+
+Update the following
+- `src/Constants.ts` `Version` and `LatestUpdate`
+- `package.json` `version`
+- `doc/source/conf.py` `version` and `release`
+- `doc/source/changelog.rst`
+- post to discord
+- post to reddit.com/r/Bitburner
+
+Deploying `dev` to the Beta Branch
+----------------------------------
+
+TODO
+
+Development Workflow Best Practices
+-----------------------------------
+
+- Work in a new branch forked from the `dev` branch to isolate your new code
+    - Keep code-changes on a branch as small as possible. This makes it easier for code review. Each branch should be its own independent feature.
+    - 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`

babel.config.js

@@ -0,0 +1,9 @@
+const TEST = process.env.NODE_ENV === "test";
+
+module.exports = {
+    "presets": [
+        "@babel/preset-react",
+        TEST && "@babel/preset-env",
+        TEST && "@babel/preset-typescript",
+    ].filter(Boolean),
+}

css/activescripts.scss

@@ -0,0 +1,126 @@
+@import "theme";
+
+.active-scripts-list {
+    list-style-type: none;
+}
+
+#active-scripts-container {
+    position: fixed;
+    padding-top: 10px;
+
+    > p {
+        width: 70%;
+        margin: 6px;
+        padding: 4px;
+    }
+
+    .accordion-header {
+        > pre {
+            color: white;
+        }
+    }
+}
+
+.active-scripts-server-header {
+    background-color: #444;
+    font-size: $defaultFontSize * 1.25;
+    color: #fff;
+    margin: 6px 6px 0 6px;
+    padding: 6px;
+    cursor: pointer;
+    width: 60%;
+    text-align: left;
+    border: none;
+    outline: none;
+
+    &:after {
+        content: '\02795'; /* "plus" sign (+) */
+        font-size: $defaultFontSize * 0.8125;
+        color: #fff;
+        float: right;
+        margin-left: 5px;
+    }
+
+    &.active, &:hover {
+        background-color: #555;
+    }
+}
+
+.active-scripts-server-header.active {
+    &:after {
+        content: "\2796"; /* "minus" sign (-) */
+        font-size: $defaultFontSize * 0.8125;
+        color: #fff;
+        float: right;
+        margin-left: 5px;
+    }
+
+    &:hover {
+        background-color: #666;
+    }
+}
+
+.active-scripts-server-panel {
+    margin: 0 6px 6px 6px;
+    padding: 0 6px 6px 6px;
+    width: 55%;
+    margin-left: 5%;
+    display: none;
+
+    div, ul, ul > li {
+        background-color: #555;
+    }
+}
+
+.active-scripts-script-header {
+    background-color: #555;
+    border: none;
+    color: var(--my-font-color);
+    cursor: pointer;
+    display: block;
+    outline: none;
+    padding: 4px 25px 4px 10px;
+    position: relative;
+    text-align: left;
+    width: auto;
+
+    &:after {
+        content: '\02795'; /* "plus" sign (+) */
+        font-size: $defaultFontSize * 0.8125;
+        float: right;
+        margin-left: 5px;
+        color: transparent;
+        text-shadow: 0 0 0 var(--my-font-color);
+        position: absolute;
+        bottom: 4px;
+    }
+
+    &.active:after {
+        content: "\2796"; /* "minus" sign (-) */
+    }
+
+    &:hover,
+    &.active:hover {
+        background-color: #666;
+    }
+
+    &.active {
+        background-color: #555;
+    }
+}
+
+.active-scripts-script-panel {
+    background-color: #555;
+    display: none;
+    font-size: 14px;
+    margin-bottom: 6px;
+    padding: 0 18px;
+    width: auto;
+
+    pre, h2, ul, li {
+        background-color: #555;
+        width: auto;
+        color: #fff;
+        margin-left: 5%;
+    }
+}

css/augmentations.scss

@@ -0,0 +1,30 @@
+/**
+ * Styling for the Augmentations UI. This is the page that displays all of the
+ * player's owned and purchased Augmentations and Source-Files. It also allows
+ * the player to install Augmentations
+ */
+@import "theme";
+
+#augmentations-container {
+    position: fixed;
+    padding-top: 10px;
+}
+
+#augmentations-content {
+    > p {
+        font-size: $defaultFontSize * 0.875;
+        width: 70%;
+    }
+}
+
+.augmentations-list {
+    button,
+    div {
+        color: var(--my-font-color);
+        text-decoration: none;
+    }
+
+    button {
+        padding: 4px;
+    }
+}

css/bladeburner.scss

@@ -80,7 +80,7 @@
             transform: rotate(-45deg);
         }
     }
-    input[type=checkbox] {
+    input[type="checkbox"] {
         margin: 3px;
         visibility: hidden;
         &:checked + label:after {

css/buttons.scss

@@ -1,5 +1,6 @@
 @import "mixins";
 @import "theme";
+@import "styles";
 
 /**
  * Styling for all buttons
@@ -16,6 +17,7 @@ button {
 
 .a-link-button,
 .std-button {
+    @extend .noselect;
     text-decoration: none;
     background-color: #555;
     color: #fff;
@@ -23,11 +25,6 @@ button {
     margin: 5px;
     border: 1px solid #333;
 
-    -moz-user-select: none;
-    -ms-user-select: none;
-    -khtml-user-select: none;
-    -webkit-user-select: none;
-
     &:hover {
         background-color: #666;
     }
@@ -38,6 +35,7 @@ button {
 }
 
 .a-link-button-inactive,
+.std-button-disabled,
 .std-button:disabled {
     text-decoration: none;
     background-color: #333;
@@ -67,6 +65,7 @@ button {
 
 .a-link-button-bought,
 .std-button-bought {
+    @extend .noselect;
     text-decoration: none;
     background-color: #0a0;
     color: #fff;

css/casino.scss

@@ -0,0 +1,24 @@
+.casino-card {
+    padding: 10px;
+    border: solid 1px #808080;
+    background-color: white;
+    display: inline-block;
+    border-radius: 10px;
+    font-size: 14pt;
+    text-align: center;
+    margin: 3px;
+    font-weight: bold;
+}
+
+.casino-card .value {
+    font-size: 15pt;
+    font-family: sans-serif;
+}
+
+.casino-card.red {
+    color: red;
+}
+
+.casino-card.black {
+    color: black;
+}

css/characteroverview.scss

@@ -2,7 +2,7 @@
 @import "theme";
 
 /**
- * Styling for the Character Overview Panel (top-right)
+ * Styling for the Character Overview Panel (top-right panel)
  */
 
 #character-overview-wrapper {
@@ -43,14 +43,8 @@
     background-color: #444;
 }
 
- .character-stat-cell {
-     text-align: right;
- }
-
-#character-hack-wrapper td,
-#character-agi-wrapper td {
-    border-bottom: 1px #aaa solid;
-    padding-bottom: 10px;
+.character-stat-cell {
+    text-align: right;
 }
 
 #character-str-wrapper td,
@@ -58,11 +52,24 @@
     padding-top: 10px;
 }
 
+.character-divider td {
+    border-top: 1px #aaa solid;
+    padding-top: 10px;
+}
+
 #character-hp-wrapper    { color: $my-stat-hp-color;    }
+.character-hp-cell       { color: $my-stat-hp-color;    }
 #character-money-wrapper { color: $my-stat-money-color; }
+.character-money-cell    { color: $my-stat-money-color; }
 #character-hack-wrapper  { color: $my-stat-hack-color;  }
+.character-hack-cell     { color: $my-stat-hack-color;  }
 #character-cha-wrapper   { color: $my-stat-cha-color;   }
+.character-cha-cell      { color: $my-stat-cha-color;   }
 #character-int-wrapper   { color: $my-stat-int-color;   }
+.character-int-cell      { color: $my-stat-int-color;   }
+.character-combat-cell   { color: $my-stat-physical;    }
+#character-work-wrapper  { color: $my-stat-hack-color;   }
+.character-work-cell     { color: $my-stat-hack-color;   }
 
 .character-overview-btn {
     @include borderRadius(12px);

css/codemirror-overrides.scss

@@ -6,7 +6,7 @@
 
 #codemirror-form-wrapper {
     height: 80%;
-    margin: 10px 0px 0px 6px;
+    margin: 10px 0 0 6px;
 }
 
 .CodeMirror {
@@ -22,11 +22,11 @@
  * Highlight matches
  */
 .cm-matchhighlight {
-    background-color: #8F908A;
+    background-color: #8f908a;
 }
 
 .CodeMirror-selection-highlight-scrollbar {
-    background-color: #8F908A;
+    background-color: #8f908a;
 }
 
 /**
@@ -35,7 +35,7 @@
 .cm-whitespace::before {
     position: absolute;
     pointer-events: none;
-    color: #404F7D;
+    color: #404f7d;
 }
 
 /**

css/dev-menu.css

@@ -1,36 +1,32 @@
 .add-exp-button {
-	margin-right: 0px;
+    margin-right: 0;
 }
 
 .remove-exp-button {
-	margin-left:0px;
+    margin-left: 0;
 }
 
 .exp-input {
-	margin-right: 0px;
-	margin-left:0px;
-	
-	margin-top: 5px;
-	margin-bottom: 5px;
+    margin: 5px 0 5px 0;
 
-	padding: 2px 5px;
+    padding: 2px 5px;
 }
 
 .text-center {
-	margin: auto;
-	text-align: center;
-	vertical-align: middle;
+    margin: auto;
+    text-align: center;
+    vertical-align: middle;
 }
 
 .touch-right {
-	margin-right: 0px;
+    margin-right: 0;
 }
 
 .touch-left {
-	margin-left: 0px;
+    margin-left: 0;
 }
 
 .touch-sides {
-	margin-left: 0px;
-	margin-right: 0px;
-}
+    margin-left: 0;
+    margin-right: 0;
+}

css/hacknetnodes.scss

@@ -0,0 +1,75 @@
+@import "mixins";
+@import "theme";
+
+/**
+ * Styling for the Hacknet Nodes UI Page
+ */
+
+#hacknet-nodes-container {
+    position: fixed;
+    padding: 10px;
+}
+
+.hacknet-general-info {
+    margin: 10px;
+    width: 70vw;
+}
+
+#hacknet-nodes-container li {
+    float: left;
+    overflow: hidden;
+    white-space: nowrap;
+
+    &.hacknet-node {
+        $boxShadowArgs: inset 0 0 8px rgba(0, 0, 0, 0.1), 0 0 16px rgba(0, 0, 0, 0.1);
+        @include boxShadow($boxShadowArgs);
+
+        margin: 6px;
+        padding: 7px;
+        width: 35vw;
+        border: 2px solid var(--my-highlight-color);
+    }
+}
+
+#hacknet-nodes-list {
+    list-style: none;
+    width: 82vw;
+}
+
+#hacknet-nodes-money {
+    margin: 10px;
+    float: left;
+}
+
+#hacknet-nodes-money-multipliers-div {
+    display: inline-block;
+    width: 70vw;
+}
+
+#hacknet-nodes-multipliers {
+    float: right;
+}
+
+#hacknet-nodes-purchase-button {
+    display: inline-block;
+}
+
+.hacknet-node-container {
+    display: inline-table;
+
+    .row {
+        display: table-row;
+        height: 30px;
+
+        p {
+            display: table-cell;
+        }
+    }
+
+    .upgradable-info {
+        display: inline-block;
+        margin: 0 4px; /* Don't want the vertical margin/padding, just left & right */
+        padding: 0 4px;
+        width: $defaultFontSize * 4;
+    }
+}

css/infiltration.scss

@@ -0,0 +1,56 @@
+@import "theme";
+
+.blinking-cursor {
+  font-weight: 100;
+  color: #2E3D48;
+  -webkit-animation: 1s cursorblink step-end infinite;
+  -moz-animation: 1s cursorblink step-end infinite;
+  -ms-animation: 1s cursorblink step-end infinite;
+  -o-animation: 1s cursorblink step-end infinite;
+  animation: 1s cursorblink step-end infinite;
+}
+
+@keyframes "cursorblink" {
+  from, to {
+    color: transparent;
+  }
+  50% {
+    color: $hacker-green;
+  }
+}
+
+@-moz-keyframes cursorblink {
+  from, to {
+    color: transparent;
+  }
+  50% {
+    color: $hacker-green;
+  }
+}
+
+@-webkit-keyframes "cursorblink" {
+  from, to {
+    color: transparent;
+  }
+  50% {
+    color: $hacker-green;
+  }
+}
+
+@-ms-keyframes "cursorblink" {
+  from, to {
+    color: transparent;
+  }
+  50% {
+    color: $hacker-green;
+  }
+}
+
+@-o-keyframes "cursorblink" {
+  from, to {
+    color: transparent;
+  }
+  50% {
+    color: $hacker-green;
+  }
+}

css/interactivetutorial.scss

@@ -69,3 +69,22 @@
     float: right;
     padding: 4px;
 }
+
+.interactive-tutorial-command {
+    background-color: #000;
+    color: $hacker-green;
+    white-space: nowrap;
+}
+
+.interactive-tutorial-code {
+    background-color: #272822;
+    color: white;
+    padding: 3px;
+}
+
+.interactive-tutorial-tab {
+    background-color: #555;
+    color: #e6e6e6;
+    padding: 3px;
+    box-shadow: 0 0 3px #000;
+}

css/menupages.scss

@@ -18,201 +18,6 @@
     position: fixed;
 }
 
-/* Active scripts */
-.active-scripts-list {
-    list-style-type: none;
-}
-
-#active-scripts-container {
-    position: fixed;
-    padding-top: 10px;
-}
-
-#active-scripts-text,
-#active-scripts-total-prod {
-    width: 70%;
-    margin: 6px;
-    padding: 4px;
-}
-
-.active-scripts-server-header {
-    background-color: #444;
-    font-size: $defaultFontSize * 1.25;
-    color: #fff;
-    margin: 6px 6px 0 6px;
-    padding: 6px;
-    cursor: pointer;
-    width: 60%;
-    text-align: left;
-    border: none;
-    outline: none;
-}
-
-.active-scripts-server-header.active,
-.active-scripts-server-header:hover {
-    background-color: #555;
-}
-
-.active-scripts-server-header.active:hover {
-    background-color: #666;
-}
-
-.active-scripts-server-header:after {
-    content: '\02795'; /* "plus" sign (+) */
-    font-size: $defaultFontSize * 0.8125;
-    color: #fff;
-    float: right;
-    margin-left: 5px;
-}
-
-.active-scripts-server-header.active:after {
-    content: "\2796"; /* "minus" sign (-) */
-    font-size: $defaultFontSize * 0.8125;
-    color: #fff;
-    float: right;
-    margin-left: 5px;
-}
-
-.active-scripts-server-panel {
-    margin: 0 6px 6px 6px;
-    padding: 0 6px 6px 6px;
-    width: 55%;
-    margin-left: 5%;
-    display: none;
-}
-
-.active-scripts-server-panel div,
-.active-scripts-server-panel ul,
-.active-scripts-server-panel ul > li {
-    background-color: #555;
-}
-
-.active-scripts-script-header {
-    background-color: #555;
-    color: var(--my-font-color);
-    padding: 4px 25px 4px 10px;
-    cursor: pointer;
-    width: auto;
-    text-align: left;
-    border: none;
-    outline: none;
-    position: relative;
-
-    &:after {
-        content: '\02795'; /* "plus" sign (+) */
-        font-size: $defaultFontSize * 0.8125;
-        float: right;
-        margin-left: 5px;
-        color: transparent;
-        text-shadow: 0 0 0 var(--my-font-color);
-        position: absolute;
-        bottom: 4px;
-    }
-
-    &.active:after {
-        content: "\2796"; /* "minus" sign (-) */
-    }
-
-    &:hover,
-    &.active:hover {
-        background-color: #666;
-    }
-
-    &.active {
-        background-color: #555;
-    }
-}
-
-.active-scripts-script-panel {
-    padding: 0 18px;
-    background-color: #555;
-    width: auto;
-    display: none;
-    margin-bottom: 6px;
-
-    p, h2, ul, li {
-        background-color: #555;
-        width: auto;
-        color: #fff;
-        margin-left: 5%;
-    }
-}
-
-/* Hacknet Nodes */
-#hacknet-nodes-container {
-    position: fixed;
-    padding: 10px;
-}
-
-#hacknet-nodes-text,
-#hacknet-nodes-container li {
-    margin: 10px;
-    padding: 10px;
-}
-
-#hacknet-nodes-container li {
-    float: left;
-    overflow: hidden;
-    white-space: nowrap;
-
-    &.hacknet-node {
-        $boxShadowArgs: inset 0 0 8px rgba(0, 0, 0, 0.1), 0 0 16px rgba(0, 0, 0, 0.1);
-        @include boxShadow($boxShadowArgs);
-
-        margin: 6px;
-        padding: 7px;
-        width: 35vw;
-        border: 2px solid var(--my-highlight-color);
-    }
-}
-
-#hacknet-nodes-list {
-    list-style: none;
-    width: 82vw;
-}
-
-#hacknet-nodes-money {
-    margin: 10px;
-    float: left;
-}
-
-#hacknet-nodes-money-multipliers-div {
-    display: inline-block;
-    width: 70vw;
-}
-
-#hacknet-nodes-multipliers {
-    float: right;
-}
-
-#hacknet-nodes-purchase-button {
-    display: inline-block;
-}
-
-.hacknet-node-container {
-    display: inline-table;
-
-    .row {
-        display: table-row;
-        height: 30px;
-
-        p {
-            display: table-cell;
-        }
-    }
-
-    .upgradable-info {
-        display: inline-block;
-        margin: 0 4px; /* Don't want the vertical margin/padding, just left & right */
-        padding: 0 4px;
-        width: $defaultFontSize * 4;
-    }
-}
-
-.menu-page-text {
-    width: 70vw;
-}
-
 /* World */
 #world-container {
     position: fixed;
@@ -260,19 +65,6 @@
     width: 70%;
 }
 
-#faction-donate-amount-txt,
-#faction-donate-input {
-    padding: 6px;
-    margin: 6px;
-    display: inline-block;
-    color: var(--my-font-color);
-    background-color: #000;
-}
-
-#faction-donate-amount-txt {
-    width: 50%;
-}
-
 #faction-container p,
 #faction-container pre {
     padding: 4px 6px;
@@ -288,45 +80,12 @@
     word-wrap: break-word;       /* Internet Explorer 5.5+ */
 }
 
-/* Faction Augmentations */
-#faction-augmentations-container {
-    position: fixed;
-    padding-top: 10px;
-
-    p, a, ul, h1 {
-        margin: 8px;
-        padding: 4px;
-    }
-}
-
 /* World */
 #world-container li {
     margin: 0 0 15px 0;
     list-style-type: none;
 }
 
-/* Augmentations */
-#augmentations-container {
-    position: fixed;
-    padding-top: 10px;
-}
-
-.augmentations-list {
-    button,
-    div {
-        color: var(--my-font-color);
-        text-decoration: none;
-    }
-
-    button {
-        padding: 2px 5px;
-    }
-
-    div {
-        padding: 6px;
-    }
-}
-
 /* Tutorial */
 #tutorial-container {
     position: fixed;
@@ -391,39 +150,6 @@
 /* Infiltration */
 #infiltration-container {
     position: fixed;
-    padding: 6px;
-
-    span {
-        margin: 0;
-        padding: 0;
-    }
-}
-
-#infiltration-left-panel,
-#infiltration-right-panel {
-    display: inline-block;
-    border: 1px solid #fff;
-    width: 35%;
-    height: 75%;
-    top: 10px;
-    overflow-y: auto;
-    overflow-x: auto;
-}
-
-#infiltration-faction-select {
-    color: #fff;
-}
-
-#infiltration-left-panel p,
-#infiltration-right-panel p {
-    margin: 4px;
-}
-
-#infiltration-buttons {
-    margin-top: 20px;
-}
-
-#infiltration-buttons .a-link-button {
-    display: inline;
-    width: 25%;
+    margin: 5px;
+    width: 70%;
 }

css/milestones.scss

@@ -0,0 +1,5 @@
+#milestones-container {
+    position: fixed;
+    padding: 6px;
+    width: 60%;
+}

css/popupboxes.scss

@@ -1,9 +1,10 @@
 @import "mixins";
 @import "theme";
+@import "styles";
 
 /* Pop-up boxes */
 .popup-box-container {
-    display: none; /* Hidden by default */
+    display: none; /* Initially hidden */
     position: fixed; /* Stay in place */
     z-index: 10; /* Sit on top */
     left: 0;
@@ -12,7 +13,6 @@
     justify-content: center;
     width: 100%;
     height: 100%;
-    overflow: auto;
     background-color: rbga(var(--my-background-color), 0.4);
 }
 
@@ -23,6 +23,7 @@
     width: 70%;
     max-height: 80%;
     overflow-y: auto;
+    z-index: 11; /* Sit on top of the container */
     color: var(--my-font-color);
 }
 
@@ -56,8 +57,7 @@
     background-color: #000;
 }
 
-.dialog-box-container,
-#log-box-container {
+.dialog-box-container {
     display: block;
     position: absolute;
     z-index: 10;
@@ -72,8 +72,54 @@
     border: 5px solid var(--my-highlight-color);
 }
 
-.dialog-box-content,
-#log-box-content {
+
+.log-box-container {
+    display: flex;
+    flex-flow: column;
+    background-color: gray;
+    width: 50%;
+    position: absolute;
+    left: 50%;
+    top: 40%;
+    margin: -10% 0 0 -25%;
+    height: auto;
+    max-height: 50%;
+    z-index: 10;
+    background-color: var(--my-background-color);
+    border: 2px solid var(--my-highlight-color);
+}
+
+.log-box-header {
+    background-color: #333;
+    border: 1px solid var(--my-highlight-color);
+    display: flex;
+    flex: row nowrap;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.log-box-log-container {
+    overflow-y: auto;
+}
+
+.log-box-button {
+    color: #aaa;
+    font-size: $defaultFontSize;
+    font-weight: bold;
+    padding: 2px;
+    margin: 6px;
+    border: 1px solid #fff;
+    background-color: #000;
+}
+
+.log-box-button:hover,
+.log-box-button:focus {
+    color: var(--my-font-color);
+    text-decoration: none;
+    cursor: pointer;
+}
+
+.dialog-box-content {
     z-index: 2;
     background-color: var(--my-background-color);
     padding: 10px;
@@ -87,6 +133,7 @@
 .dialog-box-close-button {
     @include borderRadius(12px);
     @include boxShadow(1px 1px 3px #000);
+    @extend .noselect;
 
     float: right;
     color: #aaa;

css/redpill.scss

@@ -7,16 +7,28 @@
     position: fixed;
 }
 
-
 .bitnode {
-    color: #00f;
-}
+    &.level-0 {
+        color: red;
+    }
 
-.bitnode-destroyed {
-    color: #f00;
-}
+    &.level-1 {
+        color: yellow;
+    }
 
-.bitnode:hover,
-.bitnode-destroyed:hover {
-    color: #fff;
+    &.level-2 {
+        color: #48d1cc;
+    }
+
+    &.level-3 {
+        color: blue;
+    }
+
+    &.unimplemented {
+        color: gray;
+    }
+
+    &:hover {
+        color: #fff;
+    }
 }

css/resleeving.scss

@@ -1,4 +1,4 @@
-    /**
+/**
  * Styling for the Re-Sleeving Page
  */
 @import "theme";
@@ -15,7 +15,7 @@
 
 .resleeve-panel {
     display: inline-block;
-    margin: 0px;
+    margin: 0;
     padding: 2px;
 }
 

css/scripteditor.scss

@@ -9,19 +9,6 @@
     background-color: transparent;
 }
 
-#ace-editor {
-    margin: 10px;
-    height: 80%;
-    width: 100%;
-    margin-left: 6px;
-    padding-left: 6px;
-    padding-top: 6px;
-    padding-bottom: 6px;
-    border: 2px solid var(--my-highlight-color);
-    z-index: 1;
-    font-family: $fontFamily;
-}
-
 /* This temp element is used for auto adjusting filename field */
 .tmp-element {
     visibility: hidden;
@@ -47,7 +34,6 @@
 
 #script-editor-filename-wrapper {
     background-color: #555;
-    margin-left: 6px;
     margin-right: 0;
     padding-left: 6px;
     width: 100%;
@@ -68,13 +54,14 @@
     @include boxShadow($boxShadowArgs);
 
     background-color: #555;
+    border: 2px solid var(--my-highlight-color);
+    color: #fff;
     display: inline-block;
     float: center;
-    resize: none;
-    color: #fff;
     margin: 4px;
     padding: 2px;
-    border: 2px solid var(--my-highlight-color);
+    resize: none;
+    width: 60%;
 }
 
 #script-editor-status {
@@ -107,17 +94,14 @@
     }
 }
 
-/* Specific overrides for Ace Editor */
-.ace_line,
-.ace_line * {
-    background-color: transparent;
-    margin: 0;
-    padding: 0;
+.editor-options-container {
+    display: flex;
+    flex-flow: column;
 }
 
-.ace_text-input {
-    font-size: $defaultFontSize;
-    background-color: transparent;
-}
-
-/* Specified overrides for Code mirror Editor are defined in codemirror-override.scss */
+.editor-options-line {
+    display: flex;
+    flex: row nowrap;
+    align-items: center;
+    justify-content: start;
+}

css/sleeves.scss

@@ -20,7 +20,7 @@
 
 .sleeve-panel {
     display: inline-block;
-    margin: 0px;
+    margin: 0;
     padding: 2px;
 
     select {

css/stockmarket.scss

@@ -7,35 +7,45 @@
     p {
         font-size: $defaultFontSize * 0.8125;
     }
+
     a {
         font-size: $defaultFontSize * 0.875;
     }
-    h2 {
+}
+
+.stock-market-info-and-purchases {
+    > h2 {
+        display: block;
         margin-top: 10px;
         margin-left: 10px;
+    }
+
+    > p {
         display: block;
+        margin-left: 10px;
+        width: 70%;
+    }
+
+    > a, > button {
+        margin: 10px;
     }
 }
 
-#stock-market-list li {
-    button {
-        font-size: $defaultFontSize;
+#stock-market-list {
+    list-style: none;
+
+    li {
+        button {
+            font-size: $defaultFontSize;
+        }
     }
 }
 
-#stock-market-container p {
-    padding: 6px;
-    margin: 6px;
-    width: 70%;
-}
-
-#stock-market-container a {
-    margin: 10px;
-}
-
 #stock-market-watchlist-filter {
+    display: block;
+    margin: 5px 5px 5px 10px;
+    padding: 4px;
     width: 50%;
-    margin-left: 10px;
 }
 
 .stock-market-input {
@@ -47,14 +57,36 @@
     color: var(--my-font-color);
 }
 
+.stock-market-price-movement-warning {
+    border: 1px solid white;
+    color: red;
+    margin: 2px;
+    padding: 2px;
+}
+
 .stock-market-position-text {
     color: #fff;
-    display: inline-block;
+    display: block;
+
+    p {
+        color: #fff;
+        display: inline-block;
+        margin: 4px;
+    }
+
+    h3 {
+        margin: 4px;
+    }
 }
 
 .stock-market-order-list {
     overflow-y: auto;
     max-height: 100px;
+
+    li {
+        color: #fff;
+        padding: 4px;
+    }
 }
 
 .stock-market-order-cancel-btn {

css/styles.scss

@@ -17,7 +17,10 @@ body {
 p,
 pre,
 h2,
-.text {
+h3,
+h4,
+.text,
+td {
     color: var(--my-font-color);
 }
 
@@ -35,6 +38,10 @@ li {
     list-style-type: none;
 }
 
+br {
+    @extend .noselect;
+}
+
 #entire-game-container {
     background-color: transparent;
 }
@@ -79,6 +86,28 @@ a:visited {
     right: 0;
 }
 
+#factions-tab {
+    position: relative;
+}
+
+#factions-notification {
+    font-size: $defaultFontSize * 0.625;
+    position: absolute; /* Position the badge within the relatively positioned button */
+    top: 0;
+    right: 0;
+}
+
+#augmentations-tab {
+    position: relative;
+}
+
+#augmentations-notification {
+    font-size: $defaultFontSize * 0.625;
+    position: absolute; /* Position the badge within the relatively positioned button */
+    top: 0;
+    right: 0;
+}
+
 .notification-on {
     background-color: #fa3e3e;
     color: #fff;
@@ -205,14 +234,15 @@ a:visited {
 }
 
 .status-text {
-    display: inline-block;
-    position: fixed;
     z-index: 2;
     -webkit-animation: status-text 3s 1;
 }
 
 #status-text-container {
     background-color: transparent;
+    position: absolute;
+    top: 0;
+    left: 50%;
 }
 
 #status-text {
@@ -243,8 +273,8 @@ a:visited {
 /* Accordion menus (Header with collapsible panel) */
 .accordion-header {
     background-color: #444;
-    font-size: $defaultFontSize * 1.25;
     color: #fff;
+    font-size: $defaultFontSize * 1.25;
     margin: 6px 6px 0 6px;
     padding: 4px 6px;
     cursor: pointer;
@@ -333,6 +363,68 @@ a:visited {
     color: $my-stat-cha-color;
 }
 
+.reputation {
+    color: $light-yellow;
+}
+
 .smallfont {
     font-size: $defaultFontSize * 0.8125;
 }
+
+.samefont {
+    font-size: inherit;
+}
+
+.noscrollbar {
+    -ms-overflow-style: none;  /* IE and Edge */
+    /* stylelint-disable-next-line property-no-unknown */
+    scrollbar-width: none;  /* Firefox https://developer.mozilla.org/en-US/docs/Web/CSS/scrollbar-width */
+}
+
+.noscrollbar::-webkit-scrollbar {
+    display: none;
+}
+
+input[type="checkbox"] {
+    filter: invert(1) sepia(1) hue-rotate(41deg) brightness(100%) saturate(10);
+}
+
+.optionCheckbox {
+    margin: 5px;
+    float: right;
+}
+
+.optionRange {
+    -webkit-appearance: none;
+    background: #777;
+    outline: none;
+    opacity: 0.7;
+    height: 10px;
+    -webkit-transition: 0.2s;
+    transition: opacity 0.2s;
+    margin: 3px;
+}
+
+.optionRange::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 10px;
+    height: 10px;
+    background: var(--my-font-color);
+    cursor: pointer;
+}
+
+.optionRange::-moz-range-thumb {
+    width: 10px;
+    height: 10px;
+    background: var(--my-font-color);
+    cursor: pointer;
+}
+
+.noselect {
+    -moz-user-select: -moz-none;
+    -khtml-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}

css/tooltips.scss

@@ -35,7 +35,7 @@
         left: 50%;
         transform: translate(-100%, -100%);
 
-         /* Backwards compatibility */
+        /* Backwards compatibility */
         -webkit-transform: translate(-100%, -100%);
         -moz-transform: translate(-100%, -100%);
         -o-transform: translate(-100%, -100%);
@@ -85,3 +85,45 @@
 .tooltip:hover .tooltiptextlow {
     visibility: visible;
 }
+
+.copy_tooltip {
+    position: relative;
+    display: inline-block;
+}
+
+.copy_tooltip_copied {
+    color: #fff;
+    transition: color 0.3s;
+}
+
+.copy_tooltip .copy_tooltip_text {
+    visibility: hidden;
+    font-size: 15px;
+    padding: 5px;
+    background-color: var(--my-background-color);
+    color: #fff;
+    text-align: center;
+    position: absolute;
+    z-index: 1;
+    top: 120%;
+    left: 5%;
+    opacity: 0;
+    border: 2px solid var(--my-highlight-color);
+}
+
+.copy_tooltip .copy_tooltip_text::after {
+    content: "";
+    position: absolute;
+    bottom: 100%;
+    left: 50%;
+    margin-left: -6px;
+    border-width: 8px;
+    border-style: solid;
+    border-color: transparent transparent white transparent;
+}
+
+.copy_tooltip .copy_tooltip_text_visible {
+    visibility: visible;
+    opacity: 1;
+    transition: opacity 0.3s;
+}

css/treant.css

@@ -7,16 +7,16 @@
 .Treant.Treant-loaded .pseudo { visibility: visible; }
 .Treant > .pseudo { width: 0; height: 0; border: none; padding: 0; }
 .Treant .collapse-switch { width: 3px; height: 3px; display: block; border: 1px solid black; position: absolute; top: 1px; right: 1px; cursor: pointer; }
-.Treant .collapsed .collapse-switch { background-color: #868DEE; }
+.Treant .collapsed .collapse-switch { background-color: #868dee; }
 .Treant > .node img {	border: none; float: left; }
 .Treant > .node {
     cursor: pointer;
-	padding: 4px;
-	min-width: 60px;
-	text-align: center;
-	border: 2px solid #E8E8E3;
-	border-radius: 2px;
-	box-shadow: 1px 1px 1px rgba(0,0,0,.5);
+    padding: 4px;
+    min-width: 60px;
+    text-align: center;
+    border: 2px solid #e8e8e3;
+    border-radius: 2px;
+    box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
     font-size: 12px;
 }
 

css/workinprogress.scss

@@ -26,7 +26,7 @@
     margin: 10px;
 }
 
-#work-in-progress-cancel-button {
+.work-button {
     @include borderRadius(12px);
     @include boxShadow(1px 1px 3px #000);
 
@@ -39,8 +39,8 @@
     border: 3px solid #fff;
 }
 
-#work-in-progress-cancel-button:hover,
-#work-in-progress-cancel-button:focus {
+.work-button:hover,
+.work-button:focus {
     color: #fff;
     text-decoration: none;
     cursor: pointer;

dist/engineStyle.bundle.js

@@ -0,0 +1,2 @@
+!function(n){function t(t){for(var e,i,f=t[0],c=t[1],l=t[2],p=0,s=[];p<f.length;p++)i=f[p],u[i]&&s.push(u[i][0]),u[i]=0;for(e in c)Object.prototype.hasOwnProperty.call(c,e)&&(n[e]=c[e]);for(a&&a(t);s.length;)s.shift()();return r.push.apply(r,l||[]),o()}function o(){for(var n,t=0;t<r.length;t++){for(var o=r[t],e=!0,f=1;f<o.length;f++){var c=o[f];0!==u[c]&&(e=!1)}e&&(r.splice(t--,1),n=i(i.s=o[0]))}return n}var e={},u={1:0},r=[];function i(t){if(e[t])return e[t].exports;var o=e[t]={i:t,l:!1,exports:{}};return n[t].call(o.exports,o,o.exports,i),o.l=!0,o.exports}i.m=n,i.c=e,i.d=function(n,t,o){i.o(n,t)||Object.defineProperty(n,t,{enumerable:!0,get:o})},i.r=function(n){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(n,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(n,"__esModule",{value:!0})},i.t=function(n,t){if(1&t&&(n=i(n)),8&t)return n;if(4&t&&"object"==typeof n&&n&&n.__esModule)return n;var o=Object.create(null);if(i.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:n}),2&t&&"string"!=typeof n)for(var e in n)i.d(o,e,function(t){return n[t]}.bind(null,e));return o},i.n=function(n){var t=n&&n.__esModule?function(){return n.default}:function(){return n};return i.d(t,"a",t),t},i.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)},i.p="";var f=window.webpackJsonp=window.webpackJsonp||[],c=f.push.bind(f);f.push=t,f=f.slice();for(var l=0;l<f.length;l++)t(f[l]);var a=c;r.push([866,0]),o()}({803:function(n,t,o){},805:function(n,t,o){},807:function(n,t,o){},809:function(n,t,o){},811:function(n,t,o){},813:function(n,t,o){},815:function(n,t,o){},817:function(n,t,o){},819:function(n,t,o){},821:function(n,t,o){},823:function(n,t,o){},825:function(n,t,o){},827:function(n,t,o){},829:function(n,t,o){},831:function(n,t,o){},833:function(n,t,o){},835:function(n,t,o){},837:function(n,t,o){},839:function(n,t,o){},841:function(n,t,o){},843:function(n,t,o){},845:function(n,t,o){},847:function(n,t,o){},849:function(n,t,o){},851:function(n,t,o){},853:function(n,t,o){},855:function(n,t,o){},857:function(n,t,o){},859:function(n,t,o){},861:function(n,t,o){},863:function(n,t,o){},866:function(n,t,o){"use strict";o.r(t);o(865),o(863),o(861),o(859),o(857),o(855),o(853),o(851),o(849),o(847),o(845),o(843),o(841),o(839),o(837),o(835),o(833),o(831),o(829),o(827),o(825),o(823),o(821),o(819),o(817),o(815),o(813),o(811),o(809),o(807),o(805),o(803)}});
+//# sourceMappingURL=engineStyle.bundle.js.map

doc/source/advancedgameplay/bitnodes.rst

@@ -56,8 +56,3 @@ through destroying BitNodes is:
 
 * Source-Files
 * Scripts on the home computer
-
-BitNode Details
-^^^^^^^^^^^^^^^
-
-TODO

doc/source/advancedgameplay/sleeves.rst

@@ -50,7 +50,7 @@ Duplicate Sleeves. It is a numeral value between 1 and 100, and it affects how m
 is earned when the sleeve is performing a task.
 
 Let N be the sleeve's synchronization. When the sleeve earns experience by performing
-a task, both the sleeve and the player's original host consciousness of N% of the
+a task, both the sleeve and the player's original host consciousness gain N% of the
 amount of experience normally earned by the task. All of the player's other sleeves
 earn ((N/100)^2 * 100)% of the experience.
 
@@ -80,6 +80,19 @@ when you normally install Augmentations.
 The cost of purchasing an Augmentation for a Duplicate Sleeve is **not** affected
 by how many Augmentations you have purchased for yourself, and vice versa.
 
+Memory
+~~~~~~
+Sleeve memory dictates what a sleeve's synchronization will be when its reset by
+switching BitNodes. For example, if a sleeve has a memory of 10, then when you
+switch BitNodes its synchronization will initially be set to 10, rather than 1.
+
+Memory can only be increased by purchasing upgrades from The Covenant. Just like
+the ability to purchase additional sleeves, this is only available in BitNodes-10
+and above, and is only available after defeating BitNode-10 at least once.
+
+Memory is a persistent stat, meaning it never gets reset back to 1.
+The maximum possible value for a sleeve's memory is 100.
+
 Re-sleeving
 ^^^^^^^^^^^
 Re-sleeving is the process of digitizing and transferring your consciousness into a

doc/source/advancedgameplay/sourcefiles.rst

@@ -15,73 +15,53 @@ of level 3.
 List of all Source-Files
 ^^^^^^^^^^^^^^^^^^^^^^^^
 +------------------------------------+-------------------------------------------------------------------------------------+
-| BitNode-1: Source Genesis          | * Lets the player start with 32 GB of RAM on home computer                          |
-|                                    | * Increases all of the player's multipliers by 16%/24%/28%                          |
+| BitNode-1: Source Genesis          | * Lets the player start with 32 GB of RAM on home computer.                         |
+|                                    | * Increases all of the player's multipliers by 16%/24%/28%.                         |
 +------------------------------------+-------------------------------------------------------------------------------------+
-| BitNode-2: Rise of the Underworld  | * Increases the player's crime success rate, crime money, and                       |
-|                                    |   charisma multipliers by 24%/36%/42%                                               |
+| BitNode-2: Rise of the Underworld  | * Lets the player create Gangs in other BitNodes (although some                     |
+|                                    |   BitNodes will disable this mechanic).                                             |
+|                                    | * Increases the player's crime success rate, crime money, and                       |
+|                                    |   charisma multipliers by 24%/36%/42%.                                              |
 +------------------------------------+-------------------------------------------------------------------------------------+
 | BitNode-3: Corporatocracy          | * Lets the player create Corporations in other BitNodes (although some              |
-|                                    |   BitNodes will disable this mechanic)                                              |
-|                                    | * Increases the player's charisma and company salary multipliers by 8%/12%/14%      |
+|                                    |   BitNodes will disable this mechanic).                                             |
+|                                    | * Increases the player's charisma and company salary multipliers by 8%/12%/14%.     |
 +------------------------------------+-------------------------------------------------------------------------------------+
 | BitNode-4: The Singularity         | * Lets the player access and use Netscript Singularity Functions in other BitNodes. |
-|                                    | * Each level of this Source-File opens up more of the Singularity Functions to use  |
+|                                    | * Each level of this Source-File opens up more of the Singularity Functions to use. |
 +------------------------------------+-------------------------------------------------------------------------------------+
-| BitNode-5: Artificial Intelligence | * Unlocks :ref:`gameplay_intelligence`                                              |
-|                                    | * Unlocks :js:func:`getBitNodeMultipliers` Netscript function                       |
-|                                    | * Increases all of the player's hacking-related multipliers by 8%/12%/14%           |
+| BitNode-5: Artificial Intelligence | * Unlocks :ref:`gameplay_intelligence`.                                             |
+|                                    | * Unlocks :js:func:`getBitNodeMultipliers` and :js:func:`getServer`                 |
+|                                    |   Netscript functions, as well as :ref:`netscriptformulas`.                         |
+|                                    | * Increases all of the player's hacking-related multipliers by 8%/12%/14%.          |
 +------------------------------------+-------------------------------------------------------------------------------------+
-| BitNode-6: Bladeburners            | * Unlocks the Bladeburner feature in other BitNodes                                 |
+| BitNode-6: Bladeburners            | * Unlocks the Bladeburner feature in other BitNodes.                                |
 |                                    | * Increases all of the player's level and experience gain rate multipliers for      |
-|                                    |   combat stats by 8%/12%/14%                                                        |
+|                                    |   combat stats by 8%/12%/14%.                                                       |
 +------------------------------------+-------------------------------------------------------------------------------------+
-| BitNode-7: Bladeburners 2079       | * Allows the player to access the :ref:`netscript_bladeburnerapi` in other BitNodes |
-|                                    | * Increases all of the player's Bladeburner multipliers by 8%/12%/14%               |
+| BitNode-7: Bladeburners 2079       | * Allows the player to access the :ref:`netscript_bladeburnerapi` in other BitNodes.|
+|                                    | * Increases all of the player's Bladeburner multipliers by 8%/12%/14%.              |
 +------------------------------------+-------------------------------------------------------------------------------------+
-| BitNode-8: Ghost of Wall Street    | * Increases the player's hacking growth multiplier by 12%/18%/21%                   |
+| BitNode-8: Ghost of Wall Street    | * Increases the player's hacking growth multiplier by 12%/18%/21%.                  |
 |                                    | * Level 1 grants permanent access to :ref:`WSE <gameplay_stock_market>` and         |
-|                                    |   :ref:`TIX API <netscript_tixapi>`                                                 |
-|                                    | * Level 2 grants permanent access to shorting stocks                                |
-|                                    | * Level 3 grants permanent access to use limit/stop orders                          |
+|                                    |   :ref:`TIX API <netscript_tixapi>`.                                                |
+|                                    | * Level 2 grants permanent access to shorting stocks.                               |
+|                                    | * Level 3 grants permanent access to use limit/stop orders.                         |
 +------------------------------------+-------------------------------------------------------------------------------------+
-| BitNode-9: Coming Soon             |                                                                                     |
+| BitNode-9: Hacktocracy             | * Level 1 permanently unlocks the Hacknet Server in other BitNodes.                 |
+|                                    | * Level 2 lets the player start with 128 GB of RAM on home computer.                |
+|                                    | * Level 3 grants a highly-upgraded Hacknet Server when entering a new BitNode (it   |
+|                                    |   will be lost after installing augments).                                          |
 +------------------------------------+-------------------------------------------------------------------------------------+
-| BitNode-10: Digital Carbon         | * Each level of this grants a Duplicate Sleeve                                      |
-|                                    | * Allows the player to access the :ref:`netscript_sleeveapi` in other BitNodes      |
+| BitNode-10: Digital Carbon         | * Each level of this grants a Duplicate Sleeve.                                     |
+|                                    | * Allows the player to access the :ref:`netscript_sleeveapi` in other BitNodes.     |
 +------------------------------------+-------------------------------------------------------------------------------------+
 | BitNode-11: The Big Crash          | * Company favor increases both the player's salary and reputation gain at that      |
-|                                    |   company by 1% per favor (rather than just the reputation gain)                    |
+|                                    |   company by 1% per favor (rather than just the reputation gain).                   |
 |                                    | * Increases the player's company salary and reputation gain multipliers by          |
-|                                    |   24%/36%/42%                                                                       |
+|                                    |   32%/48%/56%.                                                                      |
 +------------------------------------+-------------------------------------------------------------------------------------+
-| BitNode-12: The Recursion          | * There is no maximum level for this Source-File                                    |
-|                                    | * Each level of this Source-File increases all of the player's multipliers by 1%.   |
-|                                    | * This affect is multiplicative with itself. This means that level N of this        |
-|                                    |   Source-File will result in a multiplier of 1.01^N (or 0.99^N for multipliers      |
-|                                    |   that decrease)                                                                    |
-+------------------------------------+-------------------------------------------------------------------------------------+
-|                                    |                                                                                     |
-+------------------------------------+-------------------------------------------------------------------------------------+
-|                                    |                                                                                     |
-+------------------------------------+-------------------------------------------------------------------------------------+
-|                                    |                                                                                     |
-+------------------------------------+-------------------------------------------------------------------------------------+
-|                                    |                                                                                     |
-+------------------------------------+-------------------------------------------------------------------------------------+
-|                                    |                                                                                     |
-+------------------------------------+-------------------------------------------------------------------------------------+
-|                                    |                                                                                     |
-+------------------------------------+-------------------------------------------------------------------------------------+
-|                                    |                                                                                     |
-+------------------------------------+-------------------------------------------------------------------------------------+
-|                                    |                                                                                     |
-+------------------------------------+-------------------------------------------------------------------------------------+
-|                                    |                                                                                     |
-+------------------------------------+-------------------------------------------------------------------------------------+
-|                                    |                                                                                     |
-+------------------------------------+-------------------------------------------------------------------------------------+
-|                                    |                                                                                     |
-+------------------------------------+-------------------------------------------------------------------------------------+
-|                                    |                                                                                     |
+| BitNode-12: The Recursion          | * There is no maximum level for this Source-File.                                   |
+|                                    | * Lets the player start with Neuroflux Governor equal to the level of this          |
+|                                    |   Source-File.                                                                      |
 +------------------------------------+-------------------------------------------------------------------------------------+

doc/source/basicgameplay/augmentations.rst

@@ -11,7 +11,7 @@ user's physical and mental faculties.
 Augmentations provide persistent upgrades in the form of multipliers.
 These multipliers apply to a wide variety of things such as stats,
 experience gain, and hacking, just to name a few. Your multipliers
-can be viewed in the 'Character' page (:ref:`keyboard shortcut <shortcuts>` Alt + c)
+can be viewed in the 'Character' page (:ref:`keyboard shortcut <shortcuts>` Alt + c).
 
 How to acquire Augmentations
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

doc/source/basicgameplay/codingcontracts.rst

@@ -40,7 +40,7 @@ solutions. Some may be numbers, others may be strings or arrays.
 If a contract asks for a specific solution format, then
 use that. Otherwise, follow these rules when submitting solutions:
 
-* String-type solutions should not have quotation marks surrounding
+* String-type solutions should **not** have quotation marks surrounding
   the string (unless specifically asked for). Only quotation
   marks that are part of the actual string solution should be included.
 * Array-type solutions should be submitted with each element
@@ -204,8 +204,8 @@ The list contains the name of (i.e. the value returned by
 |                                    | | the string, the result should be an array with only an empty string.                   |
 |                                    | |                                                                                        |
 |                                    | | Examples:                                                                              |
-|                                    | |  ()())() -> ["()()()", "(())()"]                                                       |
-|                                    | |  (a)())() -> ["(a)()()", "(a())()"]                                                    |
+|                                    | |  ()())() -> [()()(), (())()]                                                           |
+|                                    | |  (a)())() -> [(a)()(), (a())()]                                                        |
 |                                    | |  )( -> [""]                                                                            |
 +------------------------------------+------------------------------------------------------------------------------------------+
 | Find All Valid Math Expressions    | | You are given a string which contains only digits between 0 and 9 as well as a target  |
@@ -214,10 +214,12 @@ The list contains the name of (i.e. the value returned by
 |                                    | |                                                                                        |
 |                                    | | The answer should be provided as an array of strings containing the valid expressions. |
 |                                    | |                                                                                        |
+|                                    | | NOTE: Numbers in an expression cannot have leading 0's                                 |
+|                                    | |                                                                                        |
 |                                    | | Examples:                                                                              |
 |                                    | |  Input: digits = "123", target = 6                                                     |
-|                                    | |  Output: ["1+2+3", "1*2*3"]                                                            |
+|                                    | |  Output: [1+2+3, 1*2*3]                                                                |
 |                                    | |                                                                                        |
 |                                    | |  Input: digits = "105", target = 5                                                     |
-|                                    | |  Output: ["1*0+5", "10-5"]                                                             |
+|                                    | |  Output: [1*0+5, 10-5]                                                                 |
 +------------------------------------+------------------------------------------------------------------------------------------+

doc/source/basicgameplay/factions.rst

@@ -35,7 +35,7 @@ List of Factions and their Requirements
 | Early Game          | Faction Name   | Requirements                            | Joining this Faction prevents |
 |  Factions           |                |                                         | you from joining:             |
 +                     +----------------+-----------------------------------------+-------------------------------+
-|                     | CyberSec       | * Hack CSEC Manually                    |                               |
+|                     | CyberSec       | * Install a backdoor on the CSEC server |                               |
 +                     +----------------+-----------------------------------------+-------------------------------+
 |                     | Tian Di Hui    | * $1m                                   |                               |
 |                     |                | * Hacking Level 50                      |                               |
@@ -74,13 +74,16 @@ List of Factions and their Requirements
 |                     |                |                                         | * New Tokyo                   |
 |                     |                |                                         | * Ishima                      |
 +---------------------+----------------+-----------------------------------------+-------------------------------+
-| Hacking             | NiteSec        | * Hack avmnite-02h manually             |                               |
-| Groups              |                | * Home Computer RAM of at least 32GB    |                               |
+| Hacking             | NiteSec        | * Install a backdoor on the avmnite-02h |                               |
+| Groups              |                |   server                                |                               |
+|                     |                | * Home Computer RAM of at least 32GB    |                               |
 +                     +----------------+-----------------------------------------+-------------------------------+
-|                     | The Black Hand | * Hack I.I.I.I manually                 |                               |
+|                     | The Black Hand | * Install a backdoor on the I.I.I.I     |                               |
+|                     |                |   server                                |                               |
 |                     |                | * Home Computer RAM of at least 64GB    |                               |
 +                     +----------------+-----------------------------------------+-------------------------------+
-|                     | Bitrunners     | * Hack run4theh111z manually            |                               |
+|                     | Bitrunners     | * Install a backdoor on the run4theh111z|                               |
+|                     |                |   server                                |                               |
 |                     |                | * Home Computer RAM of at least 128GB   |                               |
 +---------------------+----------------+-----------------------------------------+-------------------------------+
 | Megacorporations    | ECorp          | * Have 200k reputation with             |                               |
@@ -112,7 +115,8 @@ List of Factions and their Requirements
 +                     +----------------+-----------------------------------------+-------------------------------+
 |                     | Fulcrum Secret | * Have 250k reputation with             |                               |
 |                     | Technologies   |   the Corporation                       |                               |
-|                     |                | * Hack fulcrumassets manually           |                               |
+|                     |                | * Install a backdoor on the             |                               |
+|                     |                |   fulcrumassets server                  |                               |
 +---------------------+----------------+-----------------------------------------+-------------------------------+
 | Criminal            | Slum Snakes    | * All Combat Stats of 30                |                               |
 | Organizations       |                | * -9 Karma                              |                               |

doc/source/basicgameplay/stats.rst

@@ -124,6 +124,6 @@ Gain experience by:
 
 * Committing certain crimes
 * Infiltration
-* Working out at a gym
+* Studying at a university
 * Working a relevant job at a company
 * Doing Field work for a Faction

doc/source/basicgameplay/stockmarket.rst

@@ -7,10 +7,14 @@ buy and sell stocks in order to make money.
 
 The WSE can be found in the 'City' tab, and is accessible in every city.
 
-Automating the Stock Market
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-You can write scripts to perform automatic and algorithmic trading on the Stock Market.
-See :ref:`netscript_tixapi` for more details. 
+Fundamentals
+------------
+The Stock Market is not as simple as "buy at price X and sell at price Y". The following
+are several fundamental concepts you need to understand about the stock market.
+
+.. note:: For those that have experience with finance/trading/investing, please be aware
+          that the game's stock market does not function exactly like it does in the real
+          world. So these concepts below should seem similar, but won't be exactly the same.
 
 Positions: Long vs Short
 ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -21,16 +25,73 @@ is the exact opposite. In a Short position you purchase shares of a stock and
 earn a profit if the price of that stock decreases. This is also called 'shorting'
 a stock.
 
-NOTE: Shorting stocks is not available immediately, and must be unlocked later in the
-game.
+.. note:: Shorting stocks is not available immediately, and must be unlocked later in the
+          game.
+
+Forecast & Second-Order Forecast
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+A stock's forecast is its likelihood of increasing or decreasing in value. The
+forecast is typically represented by its probability of increasing in either
+a decimal or percentage form. For example, a forecast of 70% means the stock
+has a 70% chance of increasing and a 30% chance of decreasing.
+
+A stock's second-order forecast is the target value that its forecast trends towards.
+For example, if a stock has a forecast of 60% and a second-order forecast of 70%,
+then the stock's forecast should slowly trend towards 70% over time. However, this is
+determined by RNG so there is a chance that it may never reach 70%.
+
+Both the forecast and the second-order forecast change over time.
+
+A stock's forecast can be viewed after purchasing Four Sigma (4S) Market Data
+access. This lets you see the forecast info on the Stock Market UI. If you also
+purchase access to the 4S Market Data TIX API, then you can view a stock's forecast
+using the :js:func:`getStockForecast` function.
+
+A stock's second-order forecast is always hidden.
+
+.. _gameplay_stock_market_spread:
+
+Spread (Bid Price & Ask Price)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The **bid price** is the maximum price at which someone will buy a stock on the
+stock market.
+
+The **ask price** is the minimum price that a seller is willing to receive for a stock
+on the stock market
+
+The ask price will always be higher than the bid price (This is because if a seller
+is willing to receive less than the bid price, that transaction is guaranteed to
+happen). The difference between the bid and ask price is known as the **spread**.
+A stock's "price" will be the average of the bid and ask price.
+
+The bid and ask price are important because these are the prices at which a
+transaction actually occurs. If you purchase a stock in the long position, the cost
+of your purchase depends on that stock's ask price. If you then try to sell that
+stock (still in the long position), the price at which you sell is the stock's
+bid price. Note that this is reversed for a short position. Purchasing a stock
+in the short position will occur at the stock's bid price, and selling a stock
+in the short position will occur at the stock's ask price.
+
+Transactions Influencing Stock Forecast
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Buying or selling a large number of shares
+of a stock will influence that stock's forecast & second-order forecast.
+The forecast is the likelihood that the stock will increase or decrease in price.
+The magnitude of this effect depends on the number of shares being transacted.
+More shares will have a bigger effect.
+
+The effect that transactions have on a stock's second-order forecast is
+significantly smaller than the effect on its forecast.
+
+.. _gameplay_stock_market_order_types:
 
 Order Types
 ^^^^^^^^^^^
 There are three different types of orders you can make to buy or sell stocks on the exchange:
 Market Order, Limit Order, and Stop Order.
 
-Note that Limit Orders and Stop Orders are not available immediately, and must be unlocked
-later in the game.
+.. note:: Limit Orders and Stop Orders are not available immediately, and must be unlocked
+          later in the game.
 
 When you place a Market Order to buy or sell a stock, the order executes immediately at
 whatever the current price of the stock is. For example if you choose to short a stock
@@ -71,3 +132,77 @@ A Limit Order to sell will execute if the stock's price <= order's price
 A Stop Order to buy will execute if the stock's price <= order's price
 
 A Stop Order to sell will execute if the stock's price >= order's price.
+
+.. _gameplay_stock_market_player_actions_influencing_stock:
+
+Player Actions Influencing Stocks
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+It is possible for your actions elsewhere in the game to influence the stock market.
+
+Hacking
+    If a server has a corresponding stock (e.g. *foodnstuff* server -> FoodNStuff
+    stock), then hacking that server can decrease the stock's second-order
+    forecast. This causes the corresponding stock's forecast to trend downwards in value
+    over time.
+
+    This effect only occurs if you set the *stock* option to
+    true when calling the :js:func:`hack` function. The chance that hacking a
+    server will cause this effect is based on what percentage of the
+    server's total money you steal.
+
+    A single hack will have a minor
+    effect, but continuously hacking a server for lots of money over time
+    will have a noticeable effect in making the stock's forecast trend downwards.
+
+Growing
+    If a server has a corresponding stock (e.g. *foodnstuff* server -> FoodNStuff
+    stock), then growing that server's money can increase the stock's
+    second-order forecast. This causes the corresponding stock's
+    forecast to trend upwards in value over time.
+
+    This effect only occurs if you set the *stock* option to true when calling the
+    :js:func:`grow` function. The chance that growing a server will cause this
+    effect is based on what percentage of the server's total money to add to it.
+
+    A single grow operation will have a minor effect, but continuously growing
+    a server for lots of money over time will have a noticeable effect in making
+    the stock's forecast trend upwards.
+
+Working for a Company
+    If a company has a corresponding stock, then working for that company will
+    increase the corresponding stock's second-order forecast. This will
+    cause the stock's forecast to (slowly) trend upwards in value
+    over time.
+
+    The potency of this effect is based on how "effective" you are when you work
+    (i.e. its based on your stats and multipliers).
+
+Automating the Stock Market
+---------------------------
+You can write scripts to perform automatic and algorithmic trading on the Stock Market.
+See :ref:`netscript_tixapi` for more details.
+
+Under the Hood
+--------------
+Stock prices are updated every ~6 seconds.
+
+Whether a stock's price moves up or down is determined by RNG. However,
+stocks have properties that can influence the way their price moves. These properties
+are hidden, although some of them can be made visible by purchasing the
+Four Sigma (4S) Market Data upgrade. Some examples of these properties are:
+
+* Volatility
+* Likelihood of increasing or decreasing (i.e. the stock's forecast)
+* Likelihood of forecast increasing or decreasing (i.e. the stock's second-order forecast)
+* How easily a stock's price/forecast is influenced by transactions
+* Spread percentage
+* Maximum price (not a real maximum, more of a "soft cap")
+
+Each stock has its own unique values for these properties.
+
+Offline Progression
+-------------------
+The Stock Market does not change or process anything while the game has closed.
+However, it does accumulate time when offline. This accumulated time allows
+the stock market to run 50% faster when the game is opened again. This means
+that stock prices will update every ~4 seconds instead of 6.

doc/source/basicgameplay/terminal.rst

@@ -16,6 +16,85 @@ the terminal and enter::
 
     nano .fconf
 
+
+.. _terminal_filesystem:
+
+Filesystem (Directories)
+------------------------
+The Terminal contains a **very** basic filesystem that allows you to store and
+organize your files into different directories. Note that this is **not** a true
+filesystem implementation. Instead, it is done almost entirely using string manipulation.
+For this reason, many of the nice & useful features you'd find in a real
+filesystem do not exist.
+
+Here are the Terminal commands you'll commonly use when dealing with the filesystem.
+
+* :ref:`ls_terminal_command`
+* :ref:`cd_terminal_command`
+* :ref:`mv_terminal_command`
+
+Directories
+^^^^^^^^^^^
+In order to create a directory, simply name a file using a full absolute Linux-style path::
+
+    /scripts/myScript.js
+
+This will automatically create a "directory" called :code:`scripts`. This will also work
+for subdirectories::
+
+    /scripts/hacking/helpers/myHelperScripts.script
+
+Files in the root directory do not need to begin with a forward slash::
+
+    thisIsAFileInTheRootDirectory.txt
+
+Note that there is no way to manually create or remove directories. The creation and
+deletion of directories is automatically handled as you name/rename/delete
+files.
+
+Absolute vs Relative Paths
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+Many Terminal commands accept absolute both absolute and relative paths for specifying a
+file.
+
+An absolute path specifies the location of the file from the root directory (/).
+Any path that begins with the forward slash is an absolute path::
+
+    $ nano /scripts/myScript.js
+    $ cat /serverList.txt
+
+A relative path specifies the location of the file relative to the current working directory.
+Any path that does **not** begin with a forward slash is a relative path. Note that the
+Linux-style dot symbols will work for relative paths::
+
+    . (a single dot) - represents the current directory
+    .. (two dots) - represents the parent directory
+
+    $ cd ..
+    $ nano ../scripts/myScript.js
+    $ nano ../../helper.js
+
+Netscript
+^^^^^^^^^
+Note that in order to reference a file, :ref:`netscript` functions require the
+**full** absolute file path. For example
+
+.. code:: javascript
+
+    run("/scripts/hacking/helpers.myHelperScripts.script");
+    rm("/logs/myHackingLogs.txt");
+    rm("thisIsAFileInTheRootDirectory.txt");
+
+.. note:: A full file path **must** begin with a forward slash (/) if that file
+          is not in the root directory.
+
+Missing Features
+^^^^^^^^^^^^^^^^
+These features that are typically in Linux filesystems have not yet been added to the game:
+
+* Tab autocompletion does not work with relative paths
+* :code:`mv` only accepts full filepaths for the destination argument. It does not accept directories
+
 Commands
 --------
 
@@ -69,6 +148,14 @@ has root access, what ports are opened/closed, and also hacking-related informat
 such as an estimated chance to successfully hack, an estimate of how much money is
 available on the server, etc.
 
+backdoor
+^^^^^^^^
+
+Installs a backdoor on the current server. Root access is required to do this.
+
+Servers will give different bonuses when you install a backdoor.
+This can pass faction tests or give bonsues such as discounts from companies.
+
 buy
 ^^^
 
@@ -98,6 +185,25 @@ Display a message (.msg), literature (.lit), or text (.txt) file::
     $ cat foo.lit
     $ cat servers.txt
 
+.. _cd_terminal_command:
+
+cd
+^^
+
+    $ cd [dir]
+
+Change to the specified directory.
+
+See :ref:`terminal_filesystem` for details on directories.
+
+Note that this command works even for directories that don't exist. If you change
+to a directory that doesn't exist, it will not be created. A directory is only created
+once there is a file in it::
+
+    $ cd scripts/hacking
+    $ cd /logs
+    $ cd ..
+
 check
 ^^^^^
 
@@ -214,9 +320,12 @@ kill
 ^^^^
 
     $ kill [script name] [args...]
+    $ kill [pid]
 
-Kill the script specified by the script name and arguments. Each argument must
-be separated by a space. Remember that a running script is uniquely identified
+Kill the script specified by the script filename and arguments OR by its PID.
+
+If you are killing the script using its filename and arguments, then each argument
+must be separated by a space. Remember that a running script is uniquely identified
 by both its name and the arguments that are used to start it. So, if a script
 was ran with the following arguments::
 
@@ -226,35 +335,42 @@ Then to kill this script the same arguments would have to be used::
 
     $ kill foo.script 50e3 sigma-cosmetics
 
-Note that after issuing the 'kill' command for a script, it may take a few seconds for
-the script to actually stop running.
+If you are killing the script using its PID, then the PID argument must be numeric. 
 
 killall
 ^^^^^^^
 
 Kills all scripts on the current server.
 
+.. _ls_terminal_command:
+
 ls
 ^^
 
-    $ ls [| grep pattern]
+    $ ls [dir] [| grep pattern]
 
-Prints files on the current server to the Terminal screen.
+Prints files and directories on the current server to the Terminal screen.
 
-If this command is run with no arguments, then it prints all files on the current
-server to the Terminal screen. The files will be displayed in alphabetical
-order.
+If this command is run with no arguments, then it prints all files and directories on the current
+server to the Terminal screen. Directories will be printed first in alphabetical order,
+followed by the files (also in alphabetical order).
 
-The '| grep pattern' is an optional parameter that can be used to only display files
-whose filenames match the specified pattern. For example, if you wanted to only display
-files with the .script extension, you could use::
+The :code:`dir` optional parameter allows you to specify the directory for which to display
+files.
 
+The :code:`| grep pattern` optional parameter allows you to only display files and directories
+with a certain pattern in their names.
+
+Examples::
+
+    // List files/directories with the '.script' extension in the current directory
     $ ls | grep .script
 
-Alternatively, if you wanted to display all files with the word *purchase* in the filename,
-you could use::
+    // List files/directories with the '.js' extension in the root directory
+    $ ls / | grep .js
 
-    $ ls | grep purchase
+    // List files/directories with the word 'purchase' in the name, in the :code:`scripts` directory
+    $ ls scripts | grep purchase
 
 
 lscpu
@@ -282,6 +398,28 @@ The first example above will print the amount of RAM needed to run 'foo.script'
 with a single thread. The second example above will print the amount of RAM needed
 to run 'foo.script' with 50 threads.
 
+.. _mv_terminal_command:
+
+mv
+^^
+
+    $ mv [source] [destination]
+
+Move the source file to the specified destination in the filesystem.
+See :ref:`terminal_filesystem` for more details about the Terminal's filesystem.
+This command only works for scripts and text files (.txt). It cannot, however,  be used
+to convert from script to text file, or vice versa.
+
+This function can also be used to rename files.
+
+.. note:: Unlike the Linux :code:`mv` command, the *destination* argument must be the
+          full filepath. It cannot be a directory.
+
+Examples::
+
+    $ mv hacking.script scripts/hacking.script
+    $ mv myScript.js myOldScript.js
+
 nano
 ^^^^
 
@@ -383,6 +521,8 @@ sudov
 
 Prints whether or not you have root access to the current server.
 
+.. _tail_terminal_command:
+
 tail
 ^^^^
 
@@ -456,7 +596,7 @@ The data can only be downloaded to a script (.script, .ns, .js) or a text file
 (.txt). If the target file already exists, it will be overwritten by this command.
 
 Note that will not be possible to download data from many websites because they
-do not allow cross-origin origin sharing (CORS). This includes websites such
+do not allow cross-origin resource sharing (CORS). This includes websites such
 as gist and pastebin. One notable site it will work on is rawgithub. Example::
 
     $ wget https://raw.githubusercontent.com/danielyxie/bitburner/master/README.md game_readme.txt

doc/source/conf.py

@@ -64,9 +64,9 @@ documentation_title = '{0} Documentation'.format(project)
 # built documents.
 #
 # The short X.Y version.
-version = '0.45'
+version = '0.52'
 # The full version, including alpha/beta/rc tags.
-release = '0.45.0'
+release = '0.52.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/source/guidesandtips.rst

@@ -2,10 +2,11 @@ Guides & Tips
 =============
 
 Getting Started Guide for Intermediate Programmers
-What BitNode should I do?
+
 Beginners FAQ
 
 .. toctree::
    :maxdepth: 3
 
     Getting Started Guide for Beginner Programmers <guidesandtips/gettingstartedguideforbeginnerprogrammers>
+    What BitNode should I do?<guidesandtips/recommendedbitnodeorder>

doc/source/guidesandtips/gettingstartedguideforbeginnerprogrammers.rst

@@ -634,18 +634,18 @@ This tells me that I can reach :code:`CSEC` by going through :code:`iron-gym`::
     Make sure you notice the required hacking skill for the :code:`CSEC` server.
     This is a random value between 51 and 60. Although you receive the message
     from CSEC once you hit 50 hacking, you cannot actually pass their test
-    until your hacking is high enough to hack their server.
+    until your hacking is high enough to install a backdoor on their server.
 
-After you are connected to the :code:`CSEC` server, you can hack it. Note that this
+After you are connected to the :code:`CSEC` server, you can backdoor it. Note that this
 server requires one open port in order to gain root access. We can open the SSH port
 using the :code:`BruteSSH.exe` program we created earlier. In |Terminal|::
 
     $ run BruteSSH.exe
     $ run NUKE.exe
-    $ hack
+    $ backdoor
 
-Keep hacking the server until you are successful. After you successfully hack it, you should
-receive a faction invitation from |CyberSec| shortly afterwards. Accept it. If you accidentally
+After you successfully install the backdoor, you should receive a faction
+invitation from |CyberSec| shortly afterwards. Accept it. If you accidentally
 reject the invitation, that's okay. Just go to the :code:`Factions` tab
 (|Keyboard shortcut| Alt + f) and you should see an option that lets you
 accept the invitation.
@@ -860,7 +860,7 @@ Random Tips
 .. Substitution definitions
 .. |Alpha Enterprises|      replace:: :code:`Alpha Enterprises`
 .. |Augmentations tab|      replace:: :code:`Augmentations` tab
-.. |AutoLink|               replace:: :code:`NUKE.exe`
+.. |AutoLink|               replace:: :code:`AutoLink.exe`
 .. |BruteSSH|               replace:: :code:`BruteSSH.exe`
 .. |City tab|               replace:: :code:`City` tab
 .. |CyberSec|               replace:: :code:`CyberSec`

doc/source/guidesandtips/recommendedbitnodeorder.rst

@@ -0,0 +1,488 @@
+What BitNode should I do?
+=========================
+
+.. warning:: This page contains spoilers regarding the game's story/plot-line.
+
+After destroying their first :ref:`BitNode <gameplay_bitnodes>`, many players
+wonder which BitNode they should tackle next. This guide hopefully helps answer
+that question.
+
+Overview of each BitNode
+------------------------
+
+BitNode-1: Source Genesis
+^^^^^^^^^^^^^^^^^^^^^^^^^
+Description
+    The first BitNode created by the Enders to imprison the minds of humans. It became
+    the prototype and testing-grounds for all of the BitNodes that followed.
+    This is the first BitNode that you play through. It has no special
+    modifications or mechanics.
+
+Source-File
+    :Max Level: 3
+
+    This Source-File lets the player start with 32GB of RAM on his/her home computer when
+    entering a new BitNode, and also increases all of the player's multipliers by:
+
+    * Level 1: 16%
+    * Level 2: 24%
+    * Level 3: 28%
+
+Difficulty
+    The easiest BitNode
+
+BitNode-2: Rise of the Underworld
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Description
+    Organized crime groups quickly filled the void of power left behind from the collapse of
+    Western government in the 2050s. As society and civlization broke down, people quickly
+    succumbed to the innate human impulse of evil and savagery. The organized crime
+    factions quickly rose to the top of the modern world.
+
+    In this BitNode:
+
+    * Your hacking level is reduced by 20%
+    * The growth rate and maximum amount of money available on servers are significantly decreased
+    * The amount of money gained from crimes and Infiltration is tripled
+    * Certain Factions (Slum Snakes, Tetrads, The Syndicate, The Dark Army, Speakers for the Dead,
+      NiteSec, The Black Hand) give the player the ability to form and manage their own gangs. These gangs
+      will earn the player money and reputation with the corresponding Faction
+    * Every Augmentation in the game will be available through the Factions listed above
+    * For every Faction NOT listed above, reputation gains are halved
+    * You will no longer gain passive reputation with Factions
+
+Source-File
+    :Max Level: 3
+
+    This Source-File allows you to form gangs in other BitNodes once your karma decreases to a certain value.
+    It also increases the player's crime success rate, crime money, and charisma multipliers by:
+
+    * Level 1: 24%
+    * Level 2: 36%
+    * Level 3: 42%
+
+Difficulty
+    Fairly easy, as hacking is still very profitable and the costs of various purchases/upgrades
+    is not increased. The gang mechanic may seem strange as its very different from anything
+    else, but it can be very powerful once you get the hang of it.
+
+BitNode-3: Corporatocracy
+^^^^^^^^^^^^^^^^^^^^^^^^^
+Description
+    Our greatest illusion is that a healthy society can revolve around a
+    single-minded pursuit of wealth.
+    Sometime in the early 21st century economic and political globalization turned
+    the world into a corporatocracy, and it never looked back. Now, the privileged
+    elite will happily bankrupt their own countrymen, decimate their own community,
+    and evict their neighbors from houses in their desperate bid to increase their wealth.
+    In this BitNode you can create and manage your own corporation. Running a successful corporation
+    has the potential of generating massive profits. All other forms of income are reduced by 75%. Furthermore:
+
+    * The price and reputation cost of all Augmentations is tripled
+    * The starting and maximum amount of money on servers is reduced by 75%
+    * Server growth rate is reduced by 80%
+    * You now only need 75 favour with a faction in order to donate to it, rather than 150
+
+Source-File
+    :Max Level: 3
+
+    This Source-File lets you create corporations on other BitNodes (although
+    some BitNodes will disable this mechanic). This Source-File also increases your
+    charisma and company salary multipliers by:
+
+    * Level 1: 8%
+    * Level 2: 12%
+    * Level 3: 14%
+
+Difficulty
+    Somewhat-steep learning curve as you learn how to use and manage Corporations. Afterwards,
+    however, the BitNode is easy as Corporations can be very profitable.
+
+BitNode-4: The Singularity
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+Description
+    The Singularity has arrived. The human race is gone, replaced by artificially superintelligent
+    beings that are more machine than man.
+
+    In this BitNode, progressing is significantly harder:
+
+    * Experience gain rates for all stats are reduced.
+    * Most methods of earning money will now give significantly less.
+
+    In this BitNode you will gain access to a new set of Netscript Functions known as Singularity Functions.
+    These functions allow you to control most aspects of the game through scripts, including
+    working for factions/companies, purchasing/installing Augmentations, and creating programs.
+
+Source-File
+    :Max Level: 3
+
+    This Source-File lets you access and use the Singularity Functions in other BitNodes.
+    Each level of this Source-File will open up more Singularity Functions that you can use.
+
+Difficulty:
+    Depending on what Source-Files you have unlocked before attempting this BitNode,
+    it can range from easy to moderate.
+
+BitNode-5: Artificial Intelligence
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Description
+    They said it couldn't be done. They said the human brain,
+    along with its consciousness and intelligence, couldn't be replicated. They said the complexity
+    of the brain results from unpredictable, nonlinear interactions that couldn't be modeled
+    by 1's and 0's. They were wrong.
+
+    In this BitNode:
+
+    * The base security level of servers is doubled
+    * The starting money on servers is halved, but the maximum money remains the same
+    * Most methods of earning money now give significantly less
+    * Infiltration gives 50% more reputation and money
+    * Corporations have 50% lower valuations and are therefore less profitable
+    * Augmentations are more expensive
+    * Hacking experience gain rates are reduced
+
+Source-File
+    :Max Level: 3
+
+    This Source-File grants you a special new stat called Intelligence.
+
+    Intelligence is unique because it is permanent and persistent (it never gets reset back to 1). However
+    gaining Intelligence experience is much slower than other stats, and it is also hidden (you won't know
+    when you gain experience and how much). Higher Intelligence levels will boost your production for many actions
+    in the game.
+
+    In addition, this Source-File will unlock the :js:func:`getBitNodeMultipliers()` Netscript function,
+    and will also raise all of your hacking-related multipliers by:
+
+    * Level 1: 8%
+    * Level 2: 12%
+    * Level 3: 14%
+
+Difficulty
+    Depending on what Source-Files you have unlocked before attempting this BitNode, it
+    can range from easy to moderate.
+
+BitNode-6: Bladeburners
+^^^^^^^^^^^^^^^^^^^^^^^
+Description
+    In the middle of the 21st century, OmniTek Incorporated began designing and manufacturing advanced synthetic
+    androids, or Synthoids for short. They achieved a major technological breakthrough in the sixth generation
+    of their Synthoid design, called MK-VI, by developing a hyperintelligent AI. Many argue that this was
+    the first sentient AI ever created. This resulted in Synthoid models that were stronger, faster, and more intelligent
+    than the humans that had created them.
+
+    In this BitNode you will be able to access the Bladeburner Division at the NSA, which provides
+    a new mechanic for progression. Furthermore:
+
+    * Hacking and Hacknet Nodes will be less profitable
+    * Your hacking level is reduced by 65%
+    * Hacking experience gain from scripts is reduced by 75%
+    * Corporations have 80% lower valuations and are therefore less profitable
+    * Working for companies is 50% less profitable
+    * Crimes and Infiltration are 25% less profitable
+
+Source-File
+    :Max Level: 3
+
+    This Source-File allows you to access the NSA's Bladeburner Division in other
+    BitNodes. In addition, this Source-File will raise both the level and experience
+    gain rate of all your combat stats by:
+
+    * Level 1: 8%
+    * Level 2: 12%
+    * Level 3: 14%
+
+Difficulty
+    Initially difficult due to the fact that hacking is no longer profitable and you have
+    to learn a new mechanic. After you get the hang of the Bladeburner mechanic, however,
+    it becomes moderately easy.
+
+BitNode-7: Bladeburners 2079
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Description
+    In the middle of the 21st century, you were doing cutting-edge work at OmniTek Incorporated
+    as part of the AI design team for advanced synthetic androids, or Synthoids for short. You helped
+    achieve a major technological breakthrough in the sixth generation of the company's Synthoid
+    design, called MK-VI, by developing a hyperintelligent AI. Many argue that this was the first
+    sentient AI ever created. This resulted in Synthoid models that were stronger, faster,
+    and more intelligent than the humans that had created them.
+
+    In this BitNode you will be able to access the Bladeburner API, which allows you to access
+    Bladeburner functionality through Netscript. Furthermore:
+
+    * The rank you gain from Bladeburner contracts/operations is reduced by 40%
+    * Bladeburner skills cost twice as many skill points
+    * Augmentations are 3x more expensive
+    * Hacking and Hacknet Nodes will be significantly less profitable
+    * Your hacking level is reduced by 65%
+    * Hacking experience gain from scripts is reduced by 75%
+    * Corporations have 80% lower valuations and are therefore less profitable
+    * Working for companies is 50% less profitable
+    * Crimes and Infiltration are 25% less profitable
+
+Source-File
+    :Max Level: 3
+
+    This Source-File allows you to access the Bladeburner Netscript API in other
+    BitNodes. In addition, this Source-File will increase all of your Bladeburner multipliers by:
+
+    * Level 1: 8%
+    * Level 2: 12%
+    * Level 3: 14%
+
+Difficulty
+    Slightly more difficult than BitNode-6. However, you will be able to automate more
+    aspects of the Bladeburner feature, which means it will be more passive.
+
+BitNode-8: Ghost of Wall Street
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Description
+    You are trying to make a name for yourself as an up-and-coming hedge fund manager on Wall Street.
+
+    In this BitNode:
+
+    * You start with $250 million
+    * The only way to earn money is by trading on the stock market
+    * You start with a WSE membership and access to the TIX API
+    * You are able to short stocks and place different types of orders (limit/stop)
+    * You can immediately donate to factions to gain reputation
+
+Source-File
+    :Max Level: 3
+
+    This Source-File grants the following benefits:
+
+    * Level 1: Permanent access to WSE and TIX API
+    * Level 2: Ability to short stocks in other BitNodes
+    * Level 3: Ability to use limit/stop orders in other BitNodes
+
+    This Source-File also increases your hacking growth multipliers by:
+
+    * Level 1: 12%
+    * Level 2: 18%
+    * Level 3: 21%
+
+Difficulty
+    Very difficult until you unlock the Four Sigma (4S) Market Data API. After you
+    unlock the API however, it becomes moderately easy.
+
+BitNode-9: Hacktocracy
+^^^^^^^^^^^^^^^^^^^^^^
+Description
+    When Fulcrum Technologies released their open-source Linux distro Chapeau, it quickly
+    became the OS of choice for the underground hacking community. Chapeau became especially
+    notorious for  powering the Hacknet, a global, decentralized network used for nefarious
+    purposes. Fulcrum quickly abandoned the project and dissociated themselves from it.
+
+    This BitNode unlocks the Hacknet Server, an upgraded version of the Hacknet Node. Hacknet Servers generate
+    hashes, which can be spent on a variety of different upgrades.
+
+    In this BitNode:
+
+    * Your stats are significantly decreased
+    * You cannnot purchase additional servers
+    * Hacking is significantly less profitable
+
+Source-File
+    :Max Level: 3
+
+    This Source-File grants the following benefits:
+
+    * Level 1: Permanently unlocks the Hacknet Server in other BitNodes
+    * Level 2: You start with 128GB of RAM on your home computer when entering a new BitNode
+    * Level 3: Grants a highly-upgraded Hacknet Server when entering a new BitNode
+
+    (Note that the Level 3 effect of this Source-File only applies when entering a new BitNode, NOT
+    when installing Augmentations.)
+
+Difficulty
+    Hard
+
+BitNode-10: Digital Carbon
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+Description
+    In 2084, VitaLife unveiled to the world the Persona Core, a technology that allowed people
+    to digitize their consciousness. Their consciousness could then be transferred into Synthoids
+    or other bodies by trasmitting the digitized data. Human bodies became nothing more than 'sleeves'
+    for the human consciousness. Mankind had finally achieved immortality - at least for those
+    that could afford it.
+
+    This BitNode unlocks Sleeve technology. Sleeve technology allows you to:
+
+    1. Re-sleeve: Purchase and transfer your consciousness into a new body
+    2. Duplicate Sleeves: Duplicate your consciousness into Synthoids, allowing you to perform different tasks synchronously
+
+    In this BitNode:
+
+    * Your stats are significantly decreased
+    * All methods of gaining money are half as profitable (except Stock Market)
+    * Purchased servers are more expensive, have less max RAM, and a lower maximum limit
+    * Augmentations are 5x as expensive and require twice as much reputation
+
+Source-File
+    :Max Level: 3
+
+    This Source-File unlocks Sleeve technology in other BitNodes.
+    Each level of this Source-File also grants you a Duplicate Sleeve.
+
+Difficulty
+    Hard
+
+BitNode-11: The Big Crash
+^^^^^^^^^^^^^^^^^^^^^^^^^
+Description
+    The 2050s was defined by the massive amounts of violent civil unrest and anarchic rebellion that rose all around the world. It was this period
+    of disorder that eventually lead to the governmental reformation of many global superpowers, most notably
+    the USA and China. But just as the world was slowly beginning to recover from these dark times, financial catastrophe hit.
+    In many countries, the high cost of trying to deal with the civil disorder bankrupted the governments. In all of this chaos and confusion, hackers
+    were able to steal billions of dollars from the world's largest electronic banks, prompting an international banking crisis as
+    governments were unable to bail out insolvent banks. Now, the world is slowly crumbling in the middle of the biggest economic crisis of all time.
+
+    In this BitNode:
+
+    * Your hacking stat and experience gain are halved
+    * The starting and maximum amount of money available on servers is significantly decreased
+    * The growth rate of servers is significantly reduced
+    * Weakening a server is twice as effective
+    * Company wages are decreased by 50%
+    * Corporation valuations are 99% lower and are therefore significantly less profitable
+    * Hacknet Node production is significantly decreased
+    * Crime and Infiltration are more lucrative
+    * Augmentations are twice as expensive
+
+Source-File
+    :Max Level: 3
+
+    Destroying this BitNode will give you Source-File 11, or if you already have this Source-File it will
+    upgrade its level up to a maximum of 3. This Source-File makes it so that company favor increases BOTH
+    the player's salary and reputation gain rate at that company by 1% per favor (rather than just the reputation gain).
+    This Source-File also increases the player's company salary and reputation gain multipliers by:
+
+    * Level 1: 32%
+    * Level 2: 48%
+    * Level 3: 56%
+
+Difficulty
+    Hard
+
+BitNode-12: The Recursion
+^^^^^^^^^^^^^^^^^^^^^^^^^
+Description
+    Every time this BitNode is destroyed, it becomes slightly harder.
+
+Source-File
+    :Max Level: Infinity
+
+    Each level of Source-File 12 will let you start with Neuroflux Governor
+    equal to the level of this Source-File.
+
+    This BitNode is meant to be done passively or when waiting for new content.
+
+Difficulty
+    Initially very easy, but then it (obviously) becomes harder as you continue to do it.
+
+Recommended BitNodes
+--------------------
+As a player, you are not forced to tackle the BitNodes in any particular order. You are
+free to choose whichever ones you want. The "best" order can vary between players,
+depending on what you like to do any what kind of player you are. In general, here
+are the recommended BitNodes for different things:
+
+For fast progression
+^^^^^^^^^^^^^^^^^^^^
+.. note:: This does not recommend the absolute fastest path, as I don't know what
+          exactly the fastest path is. But it does recommend the BitNodes that are
+          commonly considered to be optimal by players.
+
+1. Repeat **BitNode-1: Source Genesis** until you max out its Source-File. Its Source-File
+   is extremely powerful, as it raises all multipliers by a significant amount.
+
+2. Do **BitNode-5: Artificial Intelligence** once or twice. The intelligence stat it unlocks
+   will gradually build up as you continue to play the game, and will be helpful
+   in the future. The Source-File also provides hacking multipliers, which are
+   strong because hacking is typically one of the best ways of earning money.
+
+3. (Optional) Consider doing **BitNode-4: The Singularity**. Its Source-File does not directly make you
+   more powerful in any way, but it does unlock :ref:`netscript_singularityfunctions` which
+   let you automate significantly more aspects of the game.
+
+4. Do **BitNode-3: Corporatocracy** once to unlock the Corporation mechanic. This mechanic
+   has high profit potential.
+
+5. Do **BitNode-6: Bladeburners** once to unlock the Bladeburners mechanic. The Bladeburner
+   mechanic is useful for some of the future BitNodes (such as 9 and 10).
+
+6. Do **BitNode-9: Hacktocracy** to unlock the Hacknet Server mechanic. You can
+   consider repeating it as well, as its Level 2 and 3 effects are pretty helpful as well.
+
+.. todo:: To be continued as more BitNodes get added
+
+For the strongest Source-Files
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Note that the strongest Source-Files are typically rewarded by the hardest BitNodes.
+
+The strongest Source-File is that from **BitNode-1: Source Genesis**, as it raises
+all multipliers by a significant amount.
+
+Similarly, the Source-File from **BitNode-12: The Recursion** is also very strong
+because it raises all multipliers. Each level of Source-File 12 is fairly weak,
+but its effectiveness gets better over time since the effects of Source-Files and
+Augmentations are multiplicative with each other.
+
+The Source-File from **BitNode-9: Hacktocracy** is good because it unlocks the Hacknet
+Server mechanic. The Hacknet Server mechanic causes Hacknet Nodes to produce a new
+currency called *hashes*, rather than money. *Hashes* can be spent on powerful upgrades
+that benefit your hacking, Corporation, Bladeburner, etc.
+
+The Duplicate Sleeves granted by the Source-File from **BitNode-10: Digital Carbon**
+are strong, but only after you have several of them and have spent some time/money upgrading
+them.
+
+For more scripting/hacking
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+**BitNode-4: The Singularity** unlocks the :ref:`netscript_singularityfunctions`, which
+can be used to automate many different aspects of the game, including working for factions/companies,
+purchasing & installing Augmentations, and creating programs
+
+**BitNode-6** and **BitNode-7** unlock Bladeburner and its corresponding
+:ref:`Netscript API <netscript_bladeburnerapi>`. This allows you to automate an entire
+new mechanic.
+
+**BitNode-2: Rise of the Underworld** also unlocks a new mechanic and Netscript API for automating
+it (the Gang mechanic). However, it is not as interesting as Bladeburner (in my opinion)
+
+**BitNode-9: Hacktocracy** unlocks the Hacknet Server mechanic and several new
+functions in the :ref:`Hacknet Node API <netscript_hacknetnodeapi>` for using it.
+
+For new mechanics
+^^^^^^^^^^^^^^^^^
+**BitNode-2: Rise of the Underworld** unlocks a new mechanic in which you can
+manage a gang. Gangs earn you money and can be very profitable once they get large
+and powerful. The biggest benefit of gangs, however, is that they make all
+Augmentations available to you through their corresponding faction.
+
+**BitNode-3: Corporatocracy** unlocks a new mechanic in which you can manage a
+corporation. You can earn money through Corporations by selling your stocks, or by
+configuring your corporation to pay dividends to shareholders. If your Corporation
+gets big enough, it can also bribe factions in exchange for faction reputation.
+
+**BitNode-6: Bladeburners** unlocks a new mechanic that centers around combat rather
+than hacking. The main benefit of the Bladeburner mechanic is that it offers a new
+method of destroying a BitNode.
+
+**BitNode-9: Hacktocracy** unlocks the Hacknet Server, which is an upgraded version of a
+Hacknet Node. The Hacknet Server generates a computational unit called a *hash*. *Hashes*
+can be spent on a variety of different upgrades that can benefit your hacking,
+Corporation, Bladeburner progress, and more. It transforms the Hacknet Node from a
+simple money-generator to a more interesting mechanic.
+
+**BitNode-10: Digital Carbon** unlocks two new mechanics: Re-Sleeving and
+Duplicate Sleeves.
+
+For a Challenge
+^^^^^^^^^^^^^^^
+In general, the higher BitNodes are more difficult than the lower ones.
+**BitNode-12: The Recursion** is an obvious exception as it gets progressively harder.
+
+**BitNode-8: Ghost of Wall Street** provides a unique challenge as the only method
+of earning money in that BitNode is through trading at the stock market.

doc/source/index.rst

@@ -5,8 +5,9 @@
 
 Welcome to Bitburner's documentation!
 =====================================
-Bitburner is a cyberpunk-themed `incremental game <https://en.wikipedia.org/wiki/Incremental_game>`_ that is currently in the
-early beta stage of development. The game `can be played here <https://danielyxie.github.io/bitburner/>`_.
+Bitburner is a programming-based `incremental game <https://en.wikipedia.org/wiki/Incremental_game>`_
+that revolves around hacking and cyberpunk themes. The game is currently in the
+early beta stage of development. It `can be played here <https://danielyxie.github.io/bitburner/>`_.
 
 What is Bitburner?
 ------------------
@@ -26,6 +27,7 @@ secrets that you've been searching for.
     Script Editors <scripteditors>
     Game Frozen or Stuck? <gamefrozen>
     Guides & Tips <guidesandtips>
+    Tools & Resources <toolsandresources>
     Changelog <changelog>
     Donate <https://paypal.me/danielyxie>
 

doc/source/netscript.rst

@@ -30,4 +30,5 @@ to reach out to the developer!
     Gang API <netscript/netscriptgangapi>
     Coding Contract API <netscript/netscriptcodingcontractapi>
     Sleeve API <netscript/netscriptsleeveapi>
+    Formulas API <netscript/netscriptformulasapi>
     Miscellaneous <netscript/netscriptmisc>

doc/source/netscript/advancedfunctions/getBitNodeMultipliers.rst

@@ -3,14 +3,22 @@ getBitNodeMultipliers() Netscript Function
 
 .. js:function:: getBitNodeMultipliers()
 
-    Returns an object containing the current BitNode multipliers. This function requires Source-File 5 in order
-    to run. The multipliers are returned in decimal forms (e.g. 1.5 instead of 150%). The multipliers represent
-    the difference between the current BitNode and the original BitNode (BitNode-1). For example, if the
-    *CrimeMoney* multiplier has a value of 0.1, then that means that committing crimes in the current BitNode
-    will only give 10% of the money you would have received in BitNode-1.
+    :RAM cost: 4 GB
 
-    The structure of the returned object is subject to change as BitNode multipliers get added to the game.
-    Refer to the `source code here <https://github.com/danielyxie/bitburner/blob/master/src/BitNode/BitNodeMultipliers.ts>`_
+    If you are not in BitNode-5, then you must have Source-File 5-1 in order to
+    run this function.
+
+    Returns an object containing the current BitNode multipliers. The
+    multipliers are returned in decimal forms (e.g. 1.5 instead of 150%). The
+    multipliers represent the difference between the current BitNode and the
+    original BitNode (BitNode-1). For example, if the *CrimeMoney* multiplier
+    has a value of 0.1, then that means that committing crimes in the current
+    BitNode will only give 10% of the money you would have received in
+    BitNode-1.
+
+    The structure of the returned object is subject to change as BitNode
+    multipliers get added to the game. Refer to the `source code here
+    <https://github.com/danielyxie/bitburner/blob/master/src/BitNode/BitNodeMultipliers.ts>`_
     to see the name of the BitNode multipliers.
 
     Example::

doc/source/netscript/advancedfunctions/getHackGrowWeakenTimes.rst

@@ -1,15 +0,0 @@
-getHackTime(), getGrowTime(), & getWeakenTime()
-===============================================
-
-The :js:func:`getHackTime`, :js:func:`getGrowTime`, and :js:func:`getWeakenTime`
-all take an additional third optional parameter for specifying a specific intelligence
-level to see how that would affect the hack/grow/weaken times. This parameter
-defaults to your current intelligence level.
-
-(Intelligence is unlocked after obtaining Source-File 5).
-
-The function signatures are then::
-
-    getHackTime(hostname/ip[, hackLvl=current level, intLvl=current level])
-    getGrowTime(hostname/ip[, hackLvl=current level, intLvl=current level])
-    getWeakenTime(hostname/ip[, hackLvl=current level, intLvl=current level])

doc/source/netscript/advancedfunctions/getServer.rst

@@ -0,0 +1,40 @@
+getServer() Netscript Function
+==========================================
+
+.. js:function:: getServer([hostname])
+
+    :RAM cost: 2 GB
+    :param string hostname: Hostname of the server, defaults to host server.
+
+    If you are not in BitNode-5, then you must have Source-File 5-1 in order to run this function.
+
+    This function is meant to be used in conjunction with the :doc:`formulas API<../netscriptformulasapi>`.
+
+    Returns an object with the Server's stats. The object has the following properties::
+
+        {
+            cpuCores
+            ftpPortOpen
+            hasAdminRights
+            hostname
+            httpPortOpen
+            ip
+            isConnectedTo
+            maxRam
+            organizationName
+            ramUsed
+            smtpPortOpen
+            sqlPortOpen
+            sshPortOpen
+            baseDifficulty
+            hackDifficulty
+            backdoorInstalled
+            minDifficulty
+            moneyAvailable
+            moneyMax
+            numOpenPortsRequired
+            openPortCount
+            purchasedByPlayer
+            requiredHackingSkill
+            serverGrowth
+        }

doc/source/netscript/basicfunctions/brutessh.rst

@@ -1,13 +1,17 @@
 brutessh() Netscript Function
 =============================
 
-.. js:function:: brutessh(hostname/ip)
+.. js:function:: brutessh(hostname)
 
-    :param string hostname/ip: IP or hostname of the target server
-    :RAM cost: 0 GB
+    :RAM cost: 0.05 GB
 
-    Runs the BruteSSH.exe program on the target server. BruteSSH.exe must exist on your home computer.
+    :param string hostname: Hostname of the target server.
 
-    Example::
+    Runs the ``BruteSSH.exe`` program on the target server. ``BruteSSH.exe``
+    must exist on your home computer.
+
+    Examples:
+
+    .. code-block:: javascript
 
         brutessh("foodnstuff");

doc/source/netscript/basicfunctions/clear.rst

@@ -1,13 +1,16 @@
 clear() Netscript Function
 ==========================
 
-.. js:function:: clear(port/fn)
+.. js:function:: clear(portOrFilename)
 
-    :param string/number port/fn: Port or text file to clear
     :RAM cost: 1 GB
 
-    This function is used to clear data in a `Netscript Ports <http://bitburner.wikia.com/wiki/Netscript_Ports>`_ or a text file.
+    :param string/number portOrFilename: Port or text file to clear.
 
-    If the *port/fn* argument is a number between 1 and 20, then it specifies a port and will clear it (deleting all data from the underlying queue).
+    This function is used to clear data in a :ref:`Netscript Port <netscript_ports>` or a text file.
 
-    If the *port/fn* argument is a string, then it specifies the name of a text file (.txt) and will delete all data from that text file.
+    If the ``portOrFilename`` argument is a number between 1 and 20, then it
+    specifies a port and will clear it (deleting all data from the underlying queue).
+
+    If the ``portOrFilename`` argument is a string, then it specifies the name
+    of a text file (.txt) and will delete all data from that text file.

doc/source/netscript/basicfunctions/clearLog.rst

@@ -5,4 +5,13 @@ clearLog() Netscript Function
 
     :RAM cost: 0 GB
 
-    Clears the script's logs
+    Clears the script's logs. Useful when making monitoring scripts.
+
+    Examples:
+
+    .. code-block:: javascript
+
+        while(true) {
+            clearLog();
+            print(getServerMoneyAvailable('foodnstuff'));
+        }

doc/source/netscript/basicfunctions/deleteServer.rst

@@ -3,12 +3,12 @@ deleteServer() Netscript Function
 
 .. js:function:: deleteServer(hostname)
 
-    :param string hostname: Hostname of the server to delete
     :RAM cost: 2.25 GB
+    :param string hostname: Hostname of the server to delete.
+    :returns: ``true`` if successful, ``false`` otherwise.
 
-    Deletes one of your purchased servers, which is specified by its hostname.
+    Deletes the specified purchased server.
 
-    The *hostname* argument can be any data type, but it will be converted to a string. Whitespace is automatically removed from
-    the string. This function will not delete a server that still has scripts running on it.
-
-    Returns true if successful, and false otherwise.
+    The ``hostname`` argument can be any data type, but it will be converted to
+    a string. Whitespace is automatically removed from the string. This function
+    will not delete a server that still has scripts running on it.

doc/source/netscript/basicfunctions/disableLog.rst

@@ -1,16 +1,11 @@
 disableLog() Netscript Function
 ===============================
 
-.. js:function:: disableLog(fn)
+.. js:function:: disableLog(functionName)
 
-    :param string fn: Name of function for which to disable logging
     :RAM cost: 0 GB
 
+    :param string functionName: Name of function for which to disable logging.
+
     Disables logging for the given function. Logging can be disabled for
     all functions by passing 'ALL' as the argument.
-
-    Note that this does not completely remove all logging functionality.
-    This only stops a function from logging
-    when the function is successful. If the function fails, it will still log the reason for failure.
-
-    Notable functions that cannot have their logs disabled: run, exec, exit

doc/source/netscript/basicfunctions/enableLog.rst

@@ -1,10 +1,12 @@
 enableLog() Netscript Function
 ==============================
 
-.. js:function:: enableLog(fn)
+.. js:function:: enableLog(functionName)
 
-    :param string fn: Name of function for which to enable logging
     :RAM cost: 0 GB
 
-    Re-enables logging for the given function. If 'ALL' is passed into this function
-    as an argument, then it will revert the effects of disableLog('ALL')
+    :param string functionName: Name of function for which to enable logging.
+
+    Re-enables logging for the given function. If 'ALL' is passed into this
+    function as an argument, then it will revert the effects of
+    ``disableLog('ALL')``

doc/source/netscript/basicfunctions/exec.rst

@@ -1,34 +1,40 @@
 exec() Netscript Function
 =========================
 
-.. js:function:: exec(script, hostname/ip, [numThreads=1], [args...])
+.. js:function:: exec(script, hostname[, numThreads=1[, args...]])
 
-    :param string script: Filename of script to execute
-    :param string hostname/ip: IP or hostname of the 'target server' on which to execute the script
-    :param number numThreads: Optional thread count for new script. Set to 1 by default. Will be rounded to nearest integer
-    :param args...:
-        Additional arguments to pass into the new script that is being run. Note that if any arguments are being
-        passed into the new script, then the third argument *numThreads* must be filled in with a value.
     :RAM cost: 1.3 GB
 
-    Run a script as a separate process on a specified server. This is similar to the *run* function except
-    that it can be used to run a script on any server, instead of just the current server.
+    :param string script: Filename of script to execute.
+    :param string hostname: Hostname of the target server on which to execute the script.
+    :param number numThreads: Optional thread count for new script. Set to 1 by
+        default. Will be rounded to nearest integer
+    :param args...: Additional arguments to pass into the new script that is
+        being run. Note that if any arguments are being
+        passed into the new script, then the third argument ``numThreads`` must
+        be filled in with a value.
+    :returns: Newly created process id on success, 0 on failure.
 
-    Returns true if the script is successfully started, and false otherwise.
+    Run a script as a separate process on a specified server. This is similar to
+    the :doc:`run<run>` function except that it can be used to run a script on any
+    server, instead of just the current server.
 
-    Running this function with a *numThreads* argument of 0 will return false without running the script.
-    However, running this function with a negative *numThreads* argument will cause a runtime error.
+    .. warning:: Running this function with a ``numThreads`` argument of 0 or
+                 less will cause a runtime error.
 
-    The simplest way to use the *exec* command is to call it with just the script name and the target server.
-    The following example will try to run *generic-hack.script* on the *foodnstuff* server::
+    The simplest way to use the :doc:`exec<exec>` command is to call it with
+    just the script name and the target server. The following example will try
+    to run ``generic-hack.script`` on the ``foodnstuff`` server::
 
         exec("generic-hack.script", "foodnstuff");
 
-    The following example will try to run the script *generic-hack.script* on the *joesguns* server with 10 threads::
+    The following example will try to run the script ``generic-hack.script`` on
+    the ``joesguns`` server with 10 threads::
 
         exec("generic-hack.script", "joesguns", 10);
 
-    This last example will try to run the script *foo.script* on the *foodnstuff* server with 5 threads. It will also pass
-    the number 1 and the string "test" in as arguments to the script::
+    This last example will try to run the script ``foo.script`` on the
+    ``foodnstuff`` server with 5 threads. It will also pass the number 1 and the
+    string "test" in as arguments to the script::
 
         exec("foo.script", "foodnstuff", 5, 1, "test");

doc/source/netscript/basicfunctions/exit.rst

@@ -5,4 +5,13 @@ exit() Netscript Function
 
     :RAM cost: 0 GB
 
-    Terminates the current script immediately
+    Terminates the current script immediately.
+
+    .. warning:: In :ref:`netscriptjs`, execution may continue past a call to
+        this function; while some game-related functions (e.g. those with an
+        ``ns.`` prefix) will not function after this function has been called,
+        there might still be unintended behavior if you assume ``exit`` will
+        immediately halt execution, like it does in :ref:`netscript1`. To be
+        safe, you should probably ``return`` from the main function instead
+        of/in addition to calling ``ns.exit()`` when halting a NetscriptJS
+        script.

doc/source/netscript/basicfunctions/fileExists.rst

@@ -1,25 +1,29 @@
 fileExists() Netscript Function
 ===============================
 
-.. js:function:: fileExists(filename, [hostname/ip])
+.. js:function:: fileExists(filename[, hostname])
 
-    :param string filename: Filename of file to check
-    :param string hostname/ip:
-        Hostname or IP of target server. This is optional. If it is not specified then the
-        function will use the current server as the target server
     :RAM cost: 0.1 GB
 
-    Returns a boolean indicating whether the specified file exists on the target server. The filename
-    for scripts is case-sensitive, but for other types of files it is not. For example, *fileExists("brutessh.exe")*
-    will work fine, even though the actual program is named "BruteSSH.exe".
+    :param string filename: Filename of file to check.
+    :param string hostname:
+        Hostname of target server. This is optional. If it is not specified then
+        the function will use the current server as the target server.
+    :returns: ``true`` if the file exists, ``false`` if it doesn't.
 
-    If the *hostname/ip* argument is omitted, then the function will search through the current server (the server
-    running the script that calls this function) for the file.
+    The filename for scripts is case-sensitive, but for other types of files it
+    is not. For example, ``fileExists("brutessh.exe")`` will work fine, even
+    though the actual program is named ``BruteSSH.exe``.
 
-    Examples::
+    If the ``hostname`` argument is omitted, then the function will search
+    through the server running the script that calls this function for the file.
 
-        fileExists("foo.script", "foodnstuff");
-        fileExists("ftpcrack.exe");
+    Examples:
 
-    The first example above will return true if the script named *foo.script* exists on the *foodnstuff* server, and false otherwise.
-    The second example above will return true if the current server contains the *FTPCrack.exe* program, and false otherwise.
+    .. code-block:: javascript
+
+        fileExists("foo.script", "foodnstuff"); // returns: false
+        fileExists("ftpcrack.exe"); // returns: true
+
+    The first example above will return true if the script named ``foo.script`` exists on the ``foodnstuff`` server, and false otherwise.
+    The second example above will return true if the current server contains the ``FTPCrack.exe`` program, and false otherwise.

doc/source/netscript/basicfunctions/flags.rst

@@ -0,0 +1,46 @@
+flags() Netscript Function
+============================
+
+.. js:function:: flags(data)
+
+    :RAM cost: 0 GB
+    :param data array of pairs of strings: Flags definition.
+    :returns: Object containing all the flags that were parsed or default.
+
+    This function allows for a more flexible way of parsing script arguments
+    than to just pass a fixed list in a fixed order. Options can be given
+    names, and passed in any order, while having defined default values.
+
+    The flag definition is an array of pairs of values: the first value is the
+    name of the flag, and the 2nd value is the default value for that flag.
+
+    The return object is a map containing flag names to the value. It also 
+    contains the special field '_', which contains all arguments that were not
+    flags.
+
+    Example:
+
+    .. code-block:: javascript
+
+        // example.script
+        var data = flags([
+            ['delay', 0], // a default number means this flag is a number
+            ['server', 'foodnstuff'], //  a default string means this flag is a string
+            ['exclude', []], // a default array means this flag is a default array of string
+            ['help', false], // a default boolean means this flag is a boolean
+        ]);
+        tprint(data);
+        /*
+        [home ~/]> run example.script
+        {"_":[],"delay":0,"server":"foodnstuff","exclude":[],"help":false}
+        [home ~/]> run example.script --delay 3000
+        {"_":[],"server":"foodnstuff","exclude":[],"help":false,"delay":3000}
+        [home ~/]> run example.script --delay 3000 --server harakiri-sushi
+        {"_":[],"exclude":[],"help":false,"delay":3000,"server":"harakiri-sushi"}
+        [home ~/]> run example.script --delay 3000 --server harakiri-sushi hello world
+        {"_":["hello","world"],"exclude":[],"help":false,"delay":3000,"server":"harakiri-sushi"}
+        [home ~/]> run example.script --delay 3000 --server harakiri-sushi hello world --exclude a --exclude b
+        {"_":["hello","world"],"help":false,"delay":3000,"server":"harakiri-sushi","exclude":["a","b"]}
+        [home ~/]> run example.script --help
+        {"_":[],"delay":0,"server":"foodnstuff","exclude":[],"help":true}
+        */

doc/source/netscript/basicfunctions/ftpcrack.rst

@@ -1,13 +1,17 @@
 ftpcrack() Netscript Function
 =============================
 
-.. js:function:: ftpcrack(hostname/ip)
+.. js:function:: ftpcrack(hostname)
 
-    :param string hostname/ip: IP or hostname of the target server
-    :RAM cost: 0 GB
+    :RAM cost: 0.05 GB
 
-    Runs the FTPCrack.exe program on the target server. FTPCrack.exe must exist on your home computer.
+    :param string hostname: Hostname of the target server.
 
-    Example::
+    Runs the ``FTPCrack.exe`` program on the target server. ``FTPCrack.exe``
+    must exist on your home computer.
+
+    Examples:
+
+    .. code-block:: javascript
 
         ftpcrack("foodnstuff");

doc/source/netscript/basicfunctions/getFavorToDonate.rst

@@ -4,5 +4,10 @@ getFavorToDonate() Netscript Function
 .. js:function:: getFavorToDonate()
 
     :RAM cost: 0.1 GB
+    :returns: Amount of faction favor required to unlock donation.
 
-    Returns the amount of Faction favor required to be able to donate to a faction.
+    Example:
+
+    .. code-block:: javascript
+
+        getFavorToDonate() // returns: 150

doc/source/netscript/basicfunctions/getGrowTime.rst

@@ -1,13 +1,23 @@
 getGrowTime() Netscript Function
 ================================
 
-.. js:function:: getGrowTime(hostname/ip[, hackLvl=current level])
+.. js:function:: getGrowTime(hostname[, hackLvl=current level])
 
-    :param string hostname/ip: Hostname or IP of target server
-    :param number hackLvl: Optional hacking level for the calculation. Defaults to player's current hacking level
     :RAM cost: 0.05 GB
 
-    Returns the amount of time in seconds it takes to execute the *grow()* Netscript function on the target server.
+    :param string hostname: Hostname of target server.
+    :param number hackLvl: Optional hacking level for the calculation. Defaults
+        to player's current hacking level.
+    :returns: seconds it takes to execute :doc:`grow<grow>` on that server.
 
-    The function takes in an optional *hackLvl* parameter that can be specified
-    to see what the grow time would be at different hacking levels.
+    The function takes in an optional ``hackLvl`` parameter that can be
+    specified to see what the grow time would be at different hacking levels.
+
+    Example:
+
+    .. code-block:: javascript
+
+        getGrowTime("foodnstuff"); // returns: 53.4
+
+.. note:: For Hacknet Servers (the upgraded version of a Hacknet Node), this function will
+              return ``Infinity``.

doc/source/netscript/basicfunctions/getHackTime.rst

@@ -1,13 +1,22 @@
 getHackTime() Netscript Function
 ================================
 
-.. js:function:: getHackTime(hostname/ip[, hackLvl=current level])
+.. js:function:: getHackTime(hostname[, hackLvl=current level])
 
-    :param string hostname/ip: Hostname or IP of target server
-    :param number hackLvl: Optional hacking level for the calculation. Defaults to player's current hacking level
     :RAM cost: 0.05 GB
+    :param string hostname: Hostname of target server.
+    :param number hackLvl: Optional hacking level for the calculation. Defaults
+        to player's current hacking level.
+    :returns: seconds it takes to execute :doc:`hack<hack>` on that server.
 
-    Returns the amount of time in seconds it takes to execute the *hack()* Netscript function on the target server.
+    The function takes in an optional ``hackLvl`` parameter that can be
+    specified to see what the hack time would be at different hacking levels.
 
-    The function takes in an optional *hackLvl* parameter that can be specified
-    to see what the hack time would be at different hacking levels.
+    Example:
+
+    .. code-block:: javascript
+
+        getHackTime("foodnstuff"); // returns: 53.4
+
+    .. note:: For Hacknet Servers (the upgraded version of a Hacknet Node), this function will
+              return :code:`Infinity`. 

doc/source/netscript/basicfunctions/getHackingLevel.rst

@@ -4,5 +4,10 @@ getHackingLevel() Netscript Function
 .. js:function:: getHackingLevel()
 
     :RAM cost: 0.05 GB
+    :returns: The player's current hacking level.
 
-    Returns the player's current hacking level
+    Example:
+
+    .. code-block:: javascript
+
+        getHackingLevel(); // returns: 124

doc/source/netscript/basicfunctions/getHackingMultipliers.rst

@@ -4,9 +4,11 @@ getHackingMultipliers() Netscript Function
 .. js:function:: getHackingMultipliers()
 
     :RAM cost: 4 GB
+    :returns: object containing the player's hacking multipliers. These
+        multipliers are returned in decimal forms, not percentages (e.g. 1.5
+        instead of 150%).
 
-    Returns an object containing the Player's hacking related multipliers. These multipliers are
-    returned in decimal forms, not percentages (e.g. 1.5 instead of 150%). The object has the following structure::
+    Structure::
 
         {
             chance: Player's hacking chance multiplier,
@@ -15,7 +17,9 @@ getHackingMultipliers() Netscript Function
             growth: Player's hacking growth multiplier
         }
 
-    Example of how this can be used::
+    Example:
+
+    .. code-block:: javascript
 
         mults = getHackingMultipliers();
         print(mults.chance);

doc/source/netscript/basicfunctions/getHacknetMultipliers.rst

@@ -4,9 +4,11 @@ getHacknetMultipliers() Netscript Function
 .. js:function:: getHacknetMultipliers()
 
     :RAM cost: 4 GB
+    :returns: object containing the player's hacknet multipliers. These
+        multipliers are returned in decimal forms, not percentages (e.g. 1.5
+        instead of 150%).
 
-    Returns an object containing the Player's hacknet related multipliers. These multipliers are
-    returned in decimal forms, not percentages (e.g. 1.5 instead of 150%). The object has the following structure::
+    Structure::
 
         {
             production: Player's hacknet production multiplier,
@@ -16,7 +18,9 @@ getHacknetMultipliers() Netscript Function
             levelCost: Player's hacknet level cost multiplier
         }
 
-    Example of how this can be used::
+    Example:
+
+    .. code-block:: javascript
 
         mults = getHacknetMultipliers();
         print(mults.production);

doc/source/netscript/basicfunctions/getHostname.rst

@@ -4,5 +4,10 @@ getHostname() Netscript Function
 .. js:function:: getHostname()
 
     :RAM cost: 0.05 GB
+    :returns: Hostname of the server this script is running on.
 
-    Returns a string with the hostname of the server that the script is running on
+    Example:
+
+    .. code-block:: javascript
+
+        getHostname(); // returns: "foodnstuff"

doc/source/netscript/basicfunctions/getPlayer.rst

@@ -0,0 +1,101 @@
+getPlayer() Netscript Function
+==============================
+
+.. js:function:: getPlayer()
+
+    :RAM cost: 0.5 GB
+
+    The result of this function can be passed to the :doc:`formulas API<../netscriptformulasapi>`.
+
+    Returns an object with the Player's stats. The object has the following properties::
+
+        {
+            hacking_skill:                   Current Hacking skill level
+            hp:                              Current health points
+            max_hp:                          Maximum health points
+            strength:                        Current Strength skill level
+            defense:                         Current Defense skill level
+            dexterity:                       Current Dexterity skill level
+            agility:                         Current Agility skill level
+            charisma:                        Current Charisma skill level
+            intelligence:                    Current Intelligence skill level (from BitNode-5)
+            hacking_chance_mult:             Hacking Chance multiplier (from Source-Files and Augments)
+            hacking_speed_mult:              Hacking Speed multiplier (from Source-Files and Augments)
+            hacking_money_mult:              Hacking Money multiplier (from Source-Files and Augments)
+            hacking_grow_mult:               Hacking Growth multiplier (from Source-Files and Augments)
+            hacking_exp:                     Current Hacking experience points
+            strength_exp:                    Current Strength experience points
+            defense_exp:                     Current Defense experience points
+            dexterity_exp:                   Current Dexterity experience points
+            agility_exp:                     Current Agility experience points
+            charisma_exp:                    Current Charisma experience points
+            hacking_mult:                    Hacking Level multiplier (from Source-Files and Augments)
+            strength_mult:                   Strength Level multiplier (from Source-Files and Augments)
+            defense_mult:                    Defense Level multiplier (from Source-Files and Augments)
+            dexterity_mult:                  Dexterity Level multiplier (from Source-Files and Augments)
+            agility_mult:                    Agility Level multiplier (from Source-Files and Augments)
+            charisma_mult:                   Charisma Level multiplier (from Source-Files and Augments)
+            hacking_exp_mult:                Hacking Experience multiplier (from Source-Files and Augments)
+            strength_exp_mult:               Strength Experience multiplier (from Source-Files and Augments)
+            defense_exp_mult:                Defense Experience multiplier (from Source-Files and Augments)
+            dexterity_exp_mult:              Dexterity Experience multiplier (from Source-Files and Augments)
+            agility_exp_mult:                Agility Experience multiplier (from Source-Files and Augments)
+            charisma_exp_mult:               Charisma Experience multiplier (from Source-Files and Augments)
+            company_rep_mult:                Company reputation gain multiplier (from Source-Files and Augments)
+            faction_rep_mult:                Faction reputation gain multiplier (from Source-Files and Augments)
+            money:                           Current money
+            city:                            Name of city you are currently in
+            location:                        Name of the last location visited
+            crime_money_mult:                Crime money multiplier (from Source-Files and Augments)
+            crime_success_mult:              Crime success multiplier (from Source-Files and Augments)
+            isWorking:                       Boolean indicating whether the player is currently performing work
+            workType:                        Name of the kind of work the player is performing
+            currentWorkFactionName:          Name of the faction the player is currently working for
+            currentWorkFactionDescription:   Description of the kind of work the player is currently doing
+            workHackExpGainRate:             Amount of Hacking experience the player will gain every cycle (fifth of a second)
+            workStrExpGainRate:              Amount of Strength experience the player will gain every cycle
+            workDefExpGainRate:              Amount of Defense experience the player will gain every cycle
+            workDexExpGainRate:              Amount of Dexterity experience the player will gain every cycle
+            workAgiExpGainRate:              Amount of Agility experience the player will gain every cycle
+            workChaExpGainRate:              Amount of Charisma experience the player will gain every cycle
+            workRepGainRate:                 Amount of Reputation the player will gain every cycle
+            workMoneyGainRate:               Amount of Money the player will gain every cycle
+            workMoneyLossRate:               Amount of Money the player will lose every cycle
+            workHackExpGained:               Total Hacking experience gained while working thus far
+            workStrExpGained:                Total Strength experience gained while working thus far
+            workDefExpGained:                Total Defense experience gained while working thus far
+            workDexExpGained:                Total Dexterity experience gained while working thus far
+            workAgiExpGained:                Total Agility experience gained while working thus far
+            workChaExpGained:                Total Charisma experience gained while working thus far
+            workRepGained:                   Total Reputation gained while working thus far
+            workMoneyGained:                 Total Money gained while working thus far
+            createProgramName:               Name of the program the player is currently creating
+            createProgramReqLvl:             Hacking skill required to make that program
+            className:                       Name of the class the player is currently studying
+            crimeType:                       Name of the crime the player last started
+            work_money_mult:                 Salary multiplier (from Source-Files and Augments)
+            hacknet_node_money_mult:         Hacknet Node production multiplier (from Source-Files and Augments)
+            hacknet_node_purchase_cost_mult: Hacknet Node purchase cost multiplier (from Source-Files and Augments)
+            hacknet_node_ram_cost_mult:      Hacknet Node RAM upgrade cost multiplier (from Source-Files and Augments)
+            hacknet_node_core_cost_mult:     Hacknet Node Core purchase cost multiplier (from Source-Files and Augments)
+            hacknet_node_level_cost_mult:    Hacknet Node level upgrade cost multiplier (from Source-Files and Augments)
+            hasWseAccount:                   Boolean indicating whether the player has a WSE Account
+            hasTixApiAccess:                 Boolean indicating whether the player has TIX API Access
+            has4SData:                       Boolean indicating whether the player has 4S Market Data Access
+            has4SDataTixApi:                 Boolean indicating whether the player has 4S Market Data TIX API Access
+            bladeburner_max_stamina_mult:    Bladeburner Max Stamina multiplier (from Source-Files and Augments)
+            bladeburner_stamina_gain_mult:   Bladeburner Stamina Gain multiplier (from Source-Files and Augments)
+            bladeburner_success_chance_mult: Bladeburner Success Chance multiplier (from Source-Files and Augments)
+            bitNodeN:                        Current BitNode number
+            totalPlaytime:                   Total amount of time the game has been running, in milliseconds
+            playtimeSinceLastAug:            Milliseconds since the last time Augmentations were installed
+            playtimeSinceLastBitnode:        Milliseconds since this BitNode was started
+            jobs:                            A mapping of companies the player works for to the title of the player's job at that company
+            factions:                        An array of factions the player is currently a member of
+            tor:                             Boolean indicating whether or not you have a tor router
+        }
+
+    Example::
+
+        player = getPlayer();
+        print('My charisma level is: ' + player.charisma);

doc/source/netscript/basicfunctions/getPortHandle.rst

@@ -3,9 +3,9 @@ getPortHandle() Netscript Function
 
 .. js:function:: getPortHandle(port)
 
-    :param number port: Port number
     :RAM cost: 10 GB
 
-    Get a handle to a Netscript Port. See more details here: :ref:`netscript_ports`
+    :param number port: Port number
+    :returns: portHandle object. See :ref:`netscript_ports`
 
     **WARNING:** Port Handles only work in :ref:`netscriptjs`. They will not work in :ref:`netscript1`.

doc/source/netscript/basicfunctions/getPurchasedServerCost.rst

@@ -6,11 +6,10 @@ getPurchasedServerCost() Netscript Function
     :RAM cost: 0.25 GB
 
     :param number ram: Amount of RAM of a potential purchased server. Must be a power of 2 (2, 4, 8, 16, etc.). Maximum value of 1048576 (2^20)
+    :returns: Cost to purchase a server with the specified amount of ``ram``.
 
-    Returns the cost to purchase a server with the specified amount of *ram*.
+    Example:
 
-    Examples::
+    .. code-block:: javascript
 
-        for (i = 1; i <= 20; i++) {
-            tprint(i + " -- " + getPurchasedServerCost(Math.pow(2, i)));
-        }
+        getPurchasedServerCost(8192); // returns: 450560000

doc/source/netscript/basicfunctions/getPurchasedServerLimit.rst

@@ -4,5 +4,10 @@ getPurchasedServerLimit() Netscript Function
 .. js:function:: getPurchasedServerLimit()
 
     :RAM cost: 0.05 GB
+    :returns: The maximum number of servers you can purchase.
 
-    Returns the maximum number of servers you can purchase
+    Example:
+
+    .. code-block:: javascript
+
+        getPurchasedServerLimit() // returns: 25

doc/source/netscript/basicfunctions/getPurchasedServerMaxRam.rst

@@ -4,5 +4,10 @@ getPurchasedServerMaxRam() Netscript Function
 .. js:function:: getPurchasedServerMaxRam()
 
     :RAM cost: 0.05 GB
+    :returns: The maximum RAM that a purchased server can have.
 
-    Returns the maximum RAM that a purchased server can have
+    Example:
+
+    .. code-block:: javascript
+
+        getPurchasedServerMaxRam(); // returns: 1048576

doc/source/netscript/basicfunctions/getPurchasedServers.rst

@@ -1,11 +1,13 @@
 getPurchasedServers() Netscript Function
 ========================================
 
-.. js:function:: getPurchasedServers([hostname=true])
+.. js:function:: getPurchasedServers()
 
-    :param boolean hostname:
-        Specifies whether hostnames or IP addresses should be returned. If it's true then hostnames will be returned, and if false
-        then IPs will be returned. If this argument is omitted then it is true by default
     :RAM cost: 2.25 GB
+    :returns: String array of hostnames of all of the servers you have purchased.
 
-    Returns an array with either the hostnames or IPs of all of the servers you have purchased.
+    Example:
+
+    .. code-block:: javascript
+
+        getPurchasedServers(); // returns: ['grow-server-0', 'grow-server-1', 'weaken-server-0']

doc/source/netscript/basicfunctions/getRunningScript.rst

@@ -0,0 +1,88 @@
+getRunningScript() Netscript Function
+=====================================
+
+.. js:function:: getRunningScript()
+
+    :RAM cost: 0.3 GB
+    :returns: Script object or null if not found.
+
+    The object has the following properties:
+
+    .. code-block:: javascript
+
+        {
+            // Script arguments
+            args
+
+            // Script filename
+            filename
+
+            // This script's logs. An array of log entries
+            logs
+
+            // Flag indicating whether the logs have been updated since
+            // the last time the UI was updated
+            logUpd
+
+            // Total amount of hacking experience earned from this script when offline
+            offlineExpGained
+
+            // Total amount of money made by this script when offline
+            offlineMoneyMade
+
+            // Number of seconds that the script has been running offline
+            offlineRunningTime
+
+            // Total amount of hacking experience earned from this script when online
+            onlineExpGained
+
+            // Total amount of money made by this script when online
+            onlineMoneyMade
+
+            // Number of seconds that this script has been running online
+            onlineRunningTime
+
+            // Process ID.
+            pid
+
+            // How much RAM this script uses for ONE thread
+            ramUsage
+
+            // IP of the server on which this script is running
+            server
+
+            // Number of threads that this script is running with
+            threads
+        }
+
+    Examples:
+
+    .. code-block:: javascript
+
+        getRunningScript(); // get the current script.
+
+.. js:function:: getRunningScript(pid)
+
+    :RAM cost: 0.3 GB
+    :param number pid: PID of the script.
+    :returns: Script object or null if not found.
+
+    Examples:
+
+    .. code-block:: javascript
+
+        getRunningScript(42); // get the script with pid 42.
+
+.. js:function:: getRunningScript(fn, hostname[, args...])
+
+    :RAM cost: 0.3 GB
+    :param number fn: Filename of the target script.
+    :param number hostname: Hostname of the server running the script.
+    :param number args...: Arguments that the script is running with.
+    :returns: Script object or null if not found.
+
+    Examples:
+
+    .. code-block:: javascript
+
+        getRunningScript("example.script", "home", "foodnstuff"); // get the script called "example.script" on "home" with argument "foodnstuff"

doc/source/netscript/basicfunctions/getScriptExpGain.rst

@@ -1,14 +1,17 @@
 getScriptExpGain() Netscript Function
 =====================================
 
-.. js:function:: getScriptExpGain([scriptname], [hostname/ip], [args...])
+.. js:function:: getScriptExpGain([scriptname[, hostname[, args...]]])
 
-    :param string scriptname: Filename of script
-    :param string hostname/ip: Server on which script is running
-    :param args...: Arguments that the script is running with
     :RAM cost: 0.1 GB
+    :param string scriptname: Filename of script.
+    :param string hostname: Server on which script is running.
+    :param args...: Arguments that the script is running with.
+    :returns: The amount of hacking experience the specified script generates
+        while online.
 
-    Returns the amount of hacking experience the specified script generates while online (when the game is open, does not apply for offline experience gains).
-    Remember that a script is uniquely identified by both its name and its arguments.
+    This function can also return the total experience gain rate of all of your
+    active scripts by running the function with no arguments.
 
-    This function can also return the total experience gain rate of all of your active scripts by running the function with no arguments.
+    .. note:: A script is uniquely identified by both its name and its
+        arguments.

doc/source/netscript/basicfunctions/getScriptIncome.rst

@@ -1,18 +1,19 @@
 getScriptIncome() Netscript Function
 ====================================
 
-.. js:function:: getScriptIncome([scriptname], [hostname/ip], [args...])
+.. js:function:: getScriptIncome([scriptname[, hostname/ip[, [args...]]])
 
+    :RAM cost: 0.1 GB
     :param string scriptname: Filename of script
     :param string hostname/ip: Server on which script is running
     :param args...: Arguments that the script is running with
-    :RAM cost: 0.1 GB
+    :returns: Amount of income the specified script generates while online.
 
-    Returns the amount of income the specified script generates while online (when the game is open, does not apply for offline income).
-    Remember that a script is uniquely identified by both its name and its arguments. So for example if you ran a script with the arguments
-    "foodnstuff" and "5" then in order to use this function to get that script's income you must specify those same arguments in the same order
-    in this function call.
+    If called with no arguments this function will return an array of two
+    values. The first value is the total income ($ / second) of all of your
+    active scripts (scripts that are currently running on any server). The
+    second value is the total income ($ / second) that you've earned from
+    scripts since you last installed Augmentations.
 
-    This function can also be called with no arguments. If called with no arguments, then this function will return an array of two values. The
-    first value is the total income ($ / second) of all of your active scripts (scripts that are currently running on any server). The second value
-    is the total income ($ / second) that you've earned from scripts since you last installed Augmentations.
+    .. note:: A script is uniquely identified by both its name and its
+        arguments.

doc/source/netscript/basicfunctions/getScriptLogs.rst

@@ -1,27 +1,27 @@
 getScriptLogs() Netscript Function
 ==================================
 
-.. js:function:: getScriptLogs([fn], [hostname/ip=current ip], [args...])
+.. js:function:: getScriptLogs([filename[, hostname=current hostname[, args...]]])
 
-    :param string fn: Optional. Filename of script to get logs from.
-    :param string ip: Optional. IP or hostname of the server that the script is on
-    :param args...: Arguments to identify which scripts to get logs for
     :RAM cost: 0 GB
+    :param string filename: Optional. Filename of script to get logs from.
+    :param string hostname: Optional. Hostname of the server running the script.
+    :param args...: Arguments to identify which scripts to get logs for
+    :returns: Array of string, each line being a logged line. Chronological.
 
-    Returns a script's logs. The logs are returned as an array, where each
-    line is an element in the array. The most recently logged line is at the
-    end of the array.
+    .. note:: There is a maximum number of lines that a script stores in its logs.
+        This is configurable in the game's options.
 
-    Note that there is a maximum number of lines that a script stores in its logs.
-    This is configurable in the game's options.
+    If the function is called with no arguments, it will return the current
+    script's logs.
 
-    If the function is called with no arguments, it will return the current script's logs.
+    Otherwise, the ``filename``, ``hostname``, and ``args...`` arguments can be
+    used to get the logs from another script. Remember that scripts are uniquely
+    identified by both their names and arguments.
 
-    Otherwise, the `fn`, `hostname/ip,` and `args...` arguments can be used to get the logs
-    from another script. Remember that scripts are uniquely identified by both
-    their names and arguments.
+    Example:
 
-    Examples::
+    .. code-block:: javascript
 
         // Get logs from foo.script on the current server that was run with no args
         getScriptLogs("foo.script");

doc/source/netscript/basicfunctions/getScriptName.rst

@@ -4,5 +4,10 @@ getScriptName() Netscript Function
 .. js:function:: getScriptName()
 
     :RAM cost: 0 GB
+    :returns: Current script name.
 
-    Returns the current script name
+    Example:
+
+    .. code-block:: javascript
+
+        getScriptName(); // returns: "example.script"

doc/source/netscript/basicfunctions/getScriptRam.rst

@@ -1,11 +1,16 @@
 getScriptRam() Netscript Function
-===========================
+=================================
 
-.. js:function:: getScriptRam(scriptname[, hostname/ip])
+.. js:function:: getScriptRam(filename[, hostname])
 
-    :param string scriptname: Filename of script. This is case-sensitive.
-    :param string hostname/ip: Hostname or IP of target server the script is located on. This is optional, If it is not specified then the function will set the current server as the target server.
     :RAM cost: 0.1 GB
+    :param string filename: Filename of script.
+    :param string hostname: Hostname of target server the script is located on.
+        Default to the server this script is running on.
+    :returns: Amount of RAM required to run the script, 0 if it does not exist.
 
-    Returns the amount of RAM required to run the specified script on the target server. Returns
-    0 if the script does not exist.
+    Example:
+
+    .. code-block:: javascript
+
+        getScriptRam("grow.script"); // returns: 1.75

doc/source/netscript/basicfunctions/getServerBaseSecurityLevel.rst

@@ -1,12 +1,28 @@
 getServerBaseSecurityLevel() Netscript Function
 ===============================================
 
-.. js:function:: getServerBaseSecurityLevel(hostname/ip)
+.. js:function:: getServerBaseSecurityLevel(hostname)
 
-    :param string hostname/ip: Hostname or IP of target server
     :RAM cost: 0.1 GB
+    :param string hostname: Hostname of target server.
+    :returns: Base security level of target server.
 
-    Returns the base security level of the target server. This is the security level that the server starts out with.
-    This is different than *getServerSecurityLevel()* because *getServerSecurityLevel()* returns the current
-    security level of a server, which can constantly change due to *hack()*, *grow()*, and *weaken()*, calls on that
-    server. The base security level will stay the same until you reset by installing an Augmentation(s).
+    The base security level is the security level that the server starts out with.
+    
+    This function isn't particularly useful.
+    :doc:`getServerSecurityLevel<getServerSecurityLevel>` and
+    :doc:`getServerMinSecurityLevel<getServerMinSecurityLevel>` are more often
+    used.
+
+    Example:
+
+    .. code-block:: javascript
+
+        getServerBaseSecurityLevel('foodnstuff'); // returns: 9
+
+.. note:: This is different than :doc:`getServerSecurityLevel<getServerSecurityLevel>`
+        because :doc:`getServerSecurityLevel<getServerSecurityLevel>` returns the current
+        security level of a server, which can constantly change due to
+        :doc:`hack<hack>`, :doc:`grow<grow>`, and :doc:`weaken<weaken>` calls on
+        that server. The base security level will stay the same until you reset
+        by installing augmentation(s).

doc/source/netscript/basicfunctions/getServerGrowth.rst

@@ -1,12 +1,19 @@
 getServerGrowth() Netscript Function
 ====================================
 
-.. js:function:: getServerGrowth(hostname/ip)
+.. js:function:: getServerGrowth(hostname)
 
-    :param string hostname/ip: Hostname or IP of target server
     :RAM cost: 0.1 GB
+    :param string hostname: Hostname of target server.
+    :returns: Server growth parameter.
 
-    Returns the server's instrinsic "growth parameter". This growth parameter is a number
-    between 1 and 100 that represents how quickly the server's money grows. This parameter affects the
-    percentage by which the server's money is increased when using the *grow()* function. A higher
-    growth parameter will result in a higher percentage increase from *grow()*.
+    The growth parameter is a number, typically between 1 and 100, that affects
+    the percentage by which the server's money is increased when using the
+    :doc:`grow<grow>` function. A higher growth parameter will result in a
+    higher percentage increase.
+
+    Example:
+
+    .. code-block:: javascript
+
+        getServerGrowth('foodnstuff'); // returns: 5

doc/source/netscript/basicfunctions/getServerMaxMoney.rst

@@ -1,9 +1,14 @@
 getServerMaxMoney() Netscript Function
 ======================================
 
-.. js:function:: getServerMaxMoney(hostname/ip)
+.. js:function:: getServerMaxMoney(hostname)
 
-    :param string hostname/ip: Hostname or IP of target server
     :RAM cost: 0.1 GB
+    :param string hostname: Hostname of target server.
+    :returns: Maximum amount of money that can be available on a server.
 
-    Returns the maximum amount of money that can be available on a server
+    Example:
+
+    .. code-block:: javascript
+
+        getServerMaxMoney('foodnstuff'); // returns: 50000000

doc/source/netscript/basicfunctions/getServerMaxRam.rst

@@ -0,0 +1,15 @@
+getServerMaxRam() Netscript Function
+====================================
+
+.. js:function:: getServerMaxRam(hostname)
+
+    :RAM cost: 0.05 GB
+    :param string hostname: Hostname of target server.
+    :returns: Total ram available on that server. In GB.
+
+    Example:
+
+    .. code-block:: javascript
+
+        maxRam = getServerMaxRam("helios"); // returns: 16
+        print("helios has "+maxRam + "GB");

doc/source/netscript/basicfunctions/getServerMinSecurityLevel.rst

@@ -1,9 +1,14 @@
 getServerMinSecurityLevel() Netscript Function
 ==============================================
 
-.. js:function:: getServerMinSecurityLevel(hostname/ip)
+.. js:function:: getServerMinSecurityLevel(hostname)
 
-    :param string hostname/ip: Hostname or IP of target server
     :RAM cost: 0.1 GB
+    :param string hostname: Hostname of target server.
+    :returns: The minimum security level of the target server.
 
-    Returns the minimum security level of the target server
+    Example:
+
+    .. code-block:: javascript
+
+        getServerMinSecurityLevel('foodnstuff'); // returns: 3

doc/source/netscript/basicfunctions/getServerMoneyAvailable.rst

@@ -1,15 +1,19 @@
 getServerMoneyAvailable() Netscript Function
 ============================================
 
-.. js:function:: getServerMoneyAvailable(hostname/ip)
+.. js:function:: getServerMoneyAvailable(hostname)
 
-    :param string hostname/ip: Hostname or IP of target server
     :RAM cost: 0.1 GB
+    :param string hostname: Hostname of target server.
+    :returns: Money available on that server.
 
-    Returns the amount of money available on a server. **Running this function on the home computer will return
-    the player's money.**
+    .. note::
 
-    Example::
+        Running this function on the home computer will return the player's money.
 
-        getServerMoneyAvailable("foodnstuff");
-        getServerMoneyAvailable("home"); //Returns player's money
+    Example:
+
+    .. code-block:: javascript
+
+        getServerMoneyAvailable("foodnstuff"); // returns: 120000
+        getServerMoneyAvailable("home"); // returns: 1000

doc/source/netscript/basicfunctions/getServerNumPortsRequired.rst

@@ -1,9 +1,15 @@
 getServerNumPortsRequired() Netscript Function
 ==============================================
 
-.. js:function:: getServerNumPortsRequired(hostname/ip)
+.. js:function:: getServerNumPortsRequired(hostname)
 
-    :param string hostname/ip: Hostname or IP of target server
     :RAM cost: 0.1 GB
+    :param string hostname: Hostname of target server.
+    :returns: The number of open ports required to successfully run NUKE.exe on
+        the specified server.
 
-    Returns the number of open ports required to successfully run NUKE.exe on the specified server.
+    Example:
+
+    .. code-block:: javascript
+
+        getServerNumPortsRequired("unitalife"); // returns: 4

doc/source/netscript/basicfunctions/getServerRam.rst

@@ -1,17 +1,25 @@
 getServerRam() Netscript Function
 =================================
 
-.. js:function:: getServerRam(hostname/ip)
+.. js:function:: getServerRam(hostname)
+
+    .. warning:: This function is deprecated. It still functions, but new
+                 scripts should prefer :doc:`getServerMaxRam<getServerMaxRam>`
+                 and :doc:`getServerUsedRam<getServerUsedRam>` instead.
 
-    :param string hostname/ip: Hostname or IP of target server
     :RAM cost: 0.1 GB
+    :param string hostname: Hostname of target server.
+    :returns: An array of 2 numbers; the first number is the total RAM, and the
+        second is the used RAM.
 
     Returns an array with two elements that gives information about a server's memory (RAM). The first
     element in the array is the amount of RAM that the server has total (in GB). The second element in
     the array is the amount of RAM that is currently being used on the server (in GB).
 
-    Example::
+    Example:
 
-        res = getServerRam("helios");
+    .. code-block:: javascript
+
+        res = getServerRam("helios"); // returns: [5, 10]
         totalRam = res[0];
         ramUsed = res[1];

doc/source/netscript/basicfunctions/getServerRequiredHackingLevel.rst

@@ -1,9 +1,14 @@
 getServerRequiredHackingLevel() Netscript Function
 ==================================================
 
-.. js:function:: getServerRequiredHackingLevel(hostname/ip)
+.. js:function:: getServerRequiredHackingLevel(hostname)
 
-    :param string hostname/ip: Hostname or IP of target server
     :RAM cost: 0.1 GB
+    :param string hostname: Hostname of target server.
+    :returns: The required hacking level of target server.
 
-    Returns the required hacking level of the target server
+    Example:
+
+    .. code-block:: javascript
+
+        getServerRequiredHackingLevel("foodnstuff"); // returns: 5

doc/source/netscript/basicfunctions/getServerSecurityLevel.rst

@@ -1,10 +1,14 @@
 getServerSecurityLevel() Netscript Function
 ===========================================
 
-.. js:function:: getServerSecurityLevel(hostname/ip)
+.. js:function:: getServerSecurityLevel(hostname)
 
-    :param string hostname/ip: Hostname or IP of target server
     :RAM cost: 0.1 GB
+    :param string hostname: Hostname of target server.
+    :returns: The security level of the target server.
 
-    Returns the security level of the target server. A server's security level is denoted by a number, typically
-    between 1 and 100 (but it can go above 100).
+    Example:
+
+    .. code-block:: javascript
+
+        getServerSecurityLevel("foodnstuff"); // returns: 3.45

doc/source/netscript/basicfunctions/getServerUsedRam.rst

@@ -0,0 +1,15 @@
+getServerUsedRam() Netscript Function
+=====================================
+
+.. js:function:: getServerUsedRam(hostname)
+
+    :RAM cost: 0.05 GB
+    :param string hostname: Hostname of target server.
+    :returns: Used ram on that server. In GB.
+
+    Example:
+
+    .. code-block:: javascript
+
+        usedRam = getServerUsedRam("harakiri-sushi"); // returns: 5.6
+        print("harakiri-sushi uses "+usedRam + "GB");

doc/source/netscript/basicfunctions/getTimeSinceLastAug.rst

@@ -4,5 +4,10 @@ getTimeSinceLastAug() Netscript Function
 .. js:function:: getTimeSinceLastAug()
 
     :RAM cost: 0.05 GB
+    :returns: Milliseconds since you last installed augmentations.
 
-    Returns the amount of time in milliseconds that have passed since you last installed Augmentations
+    Example:
+
+    .. code-block:: javascript
+
+        getTimeSinceLastAug(); // returns: 13912400