Merge branch 'danielyxie:dev' into dev

src/Netscript/killWorkerScript.ts

@@ -66,8 +66,6 @@ function killWorkerScriptByPid(pid: number, rerenderUi = true): boolean {
 }
 
 function stopAndCleanUpWorkerScript(workerScript: WorkerScript, rerenderUi = true): void {
-  workerScript.env.stopFlag = true;
-  killNetscriptDelay(workerScript);
   if (typeof workerScript.atExit === "function") {
     try {
       workerScript.atExit();
@@ -78,6 +76,8 @@ function stopAndCleanUpWorkerScript(workerScript: WorkerScript, rerenderUi = tru
     }
     workerScript.atExit = undefined;
   }
+  workerScript.env.stopFlag = true;
+  killNetscriptDelay(workerScript);
   removeWorkerScript(workerScript, rerenderUi);
 }
 

src/NetscriptEvaluator.ts

@@ -18,7 +18,7 @@ export function makeRuntimeRejectMsg(workerScript: WorkerScript, msg: string): s
     throw new Error(`WorkerScript constructed with invalid server ip: ${workerScript.hostname}`);
   }
 
-  return "|" + server.hostname + "|" + workerScript.name + "|" + msg;
+  return "|DELIMITER|" + server.hostname + "|DELIMITER|" + workerScript.name + "|DELIMITER|" + msg;
 }
 
 export function resolveNetscriptRequestedThreads(
@@ -50,7 +50,7 @@ export function isScriptErrorMessage(msg: string): boolean {
   if (!isString(msg)) {
     return false;
   }
-  const splitMsg = msg.split("|");
+  const splitMsg = msg.split("|DELIMITER|");
   if (splitMsg.length != 4) {
     return false;
   }

src/NetscriptWorker.ts

@@ -539,7 +539,7 @@ function createAndAddWorkerScript(runningScriptObj: RunningScript, server: BaseS
       return;
     } else if (w instanceof WorkerScript) {
       if (isScriptErrorMessage(w.errorMessage)) {
-        const errorTextArray = w.errorMessage.split("|");
+        const errorTextArray = w.errorMessage.split("|DELIMITER|");
         if (errorTextArray.length != 4) {
           console.error("ERROR: Something wrong with Error text in evaluator...");
           console.error("Error text: " + w.errorMessage);

src/ScriptEditor/NetscriptDefinitions.ts

@@ -3249,7 +3249,7 @@ interface NS extends TIX, Singularity {
      * hack("foodnstuff", { threads: 5 }); // Only use 5 threads to hack
      * \`\`\`
      * @ramCost 0.1 GB
-     * @param {string} host IP or hostname of the target server to hack.
+     * @param {string} host Hostname or IP of the target server to hack.
      * @param {object} [opts] Optional parameters for configuring function behavior.
      * @returns {Promise<number>} The amount of money stolen if the hack is successful, and zero otherwise.
      */
@@ -3274,7 +3274,7 @@ interface NS extends TIX, Singularity {
      * grow("foodnstuff", { threads: 5 }); // Only use 5 threads to grow
      * \`\`\`
      * @ramCost 0.15 GB
-     * @param {string} host IP or hostname of the target server to grow.
+     * @param {string} host Hostname or IP of the target server to grow.
      * @param {object} [opts] Optional parameters for configuring function behavior.
      * @returns {Promise<number>} The number by which the money on the server was multiplied for the growth.
      */
@@ -3295,7 +3295,7 @@ interface NS extends TIX, Singularity {
      * weaken("foodnstuff", { threads: 5 }); // Only use 5 threads to weaken
      * \`\`\`
      * @ramCost 0.15 GB
-     * @param {string} host IP or hostname of the target server to weaken.
+     * @param {string} host Hostname or IP of the target server to weaken.
      * @param {object} [opts] Optional parameters for configuring function behavior.
      * @returns {Promise<number>} The amount by which the target server’s security level was decreased. This is equivalent to 0.05 multiplied by the number of script threads.
      */
@@ -3316,7 +3316,7 @@ interface NS extends TIX, Singularity {
      * //If this function returns 50, this means that if your next {@link hack} call is run on a script with 50 threads, it will steal $1m from the foodnstuff server.
      * \`\`\`
      * @ramCost 1 GB
-     * @param {string} host IP or hostname of the target server to analyze.
+     * @param {string} host Hostname or IP of the target server to analyze.
      * @param {number} hackAmount Amount of money you want to hack from the server.
      * @returns {number} The number of threads needed to {@link hack} the server for hackAmount money.
      */
@@ -3334,7 +3334,7 @@ interface NS extends TIX, Singularity {
      * //This means that if hack the foodnstuff server, then you will steal 1% of its total money. If you {@link hack} using N threads, then you will steal N% of its total money.
      * \`\`\`
      * @ramCost 1 GB
-     * @param {string} host IP or hostname of the target server.
+     * @param {string} host Hostname or IP of the target server.
      * @returns {number} The percentage of money you will steal from the target server with a single hack.
      */
     hackAnalyzePercent (host: Host): number;
@@ -3345,7 +3345,7 @@ interface NS extends TIX, Singularity {
      * This returned value is in decimal form, not percentage.
      *
      * @ramCost 1 GB
-     * @param {string} host IP or hostname of the target server.
+     * @param {string} host Hostname or IP of the target server.
      * @returns {number} The chance you have of successfully hacking the target server.
      */
     hackChance (host: Host): number;
@@ -3364,7 +3364,7 @@ interface NS extends TIX, Singularity {
      * //If this returns 100, then this means you need to call {@link grow} 100 times in order to double the money (or once with 100 threads).
      * \`\`\`
      * @ramCost 1 GB
-     * @param {string} host IP or hostname of the target server.
+     * @param {string} host Hostname or IP of the target server.
      * @param {number} growthAmount Multiplicative factor by which the server is grown. Decimal form..
      * @returns {number} The amount of {@link grow} calls needed to grow the specified server by the specified amount
      */
@@ -3462,11 +3462,11 @@ interface NS extends TIX, Singularity {
      * \`\`\`
      * @ramCost 0 GB
      * @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 {string} [host] Optional. Hostname or IP of the server that the script is on.
      * @param {...string} [args] Arguments to identify which scripts to get logs for.
      * @returns {string[]} Returns an string array, where each line is an element in the array. The most recently logged line is at the end of the array.
      */
-    getScriptLogs (fn?: Script, ip?: Host, ...args: any[]): string[];
+    getScriptLogs (fn?: Script, host?: Host, ...args: any[]): string[];
 
     /**
      * Opens a script’s logs. This is functionally the same as the tail Terminal command.
@@ -3492,10 +3492,11 @@ interface NS extends TIX, Singularity {
      * tail("foo.script", "foodnstuff", 1, "test");
      * \`\`\`
      * @ramCost 0 GB
-     * @param {string} host IP or hostname of the server to scan.
-     * @param {boolean} hostnames Optional boolean specifying whether the function should output hostnames (if true) or IP addresses (if false).
+     * @param {string} [fn] Optional. Filename of the script being tailed. If omitted, the current script is tailed.
+     * @param {string} [host] Optional. Hostname or IP of the script being tailed. Defaults to the server this script is running on. If args are specified, this is not optional.
+     * @param {any[]} ...args Arguments for the script being tailed.
      */
-    tail (fn?: Script, ip?: Host, ...args: any[]): void;
+    tail (fn?: Script, host?: Host, ...args: any[]): void;
 
     /**
      * Returns an array containing the hostnames or IPs of all servers that are one
@@ -3503,7 +3504,7 @@ interface NS extends TIX, Singularity {
      * array are strings.
      *
      * @ramCost 0.2 GB
-     * @param {string} host IP or hostname of the server to scan.
+     * @param {string} host Hostname or IP of the server to scan.
      * @param {boolean} hostnames Optional boolean specifying whether the function should output hostnames (if true) or IP addresses (if false).
      * @returns {string[]} Returns an string of hostnames or IP.
      */
@@ -3517,7 +3518,7 @@ interface NS extends TIX, Singularity {
      * nuke("foodnstuff");
      * \`\`\`
      * @ramCost 0.05 GB
-     * @param {string} host IP or hostname of the target server.
+     * @param {string} host Hostname or IP of the target server.
      */
     nuke (host: Host): void;
 
@@ -3529,7 +3530,7 @@ interface NS extends TIX, Singularity {
      * brutessh("foodnstuff");
      * \`\`\`
      * @ramCost 0.05 GB
-     * @param {string} host IP or hostname of the target server.
+     * @param {string} host Hostname or IP of the target server.
      */
     brutessh (host: Host): void;
 
@@ -3541,7 +3542,7 @@ interface NS extends TIX, Singularity {
      * ftpcrack("foodnstuff");
      * \`\`\`
      * @ramCost 0.05 GB
-     * @param {string} host IP or hostname of the target server.
+     * @param {string} host Hostname or IP of the target server.
      */
     ftpcrack (host: Host): void;
 
@@ -3553,7 +3554,7 @@ interface NS extends TIX, Singularity {
      * relaysmtp("foodnstuff");
      * \`\`\`
      * @ramCost 0.05 GB
-     * @param {string} host IP or hostname of the target server.
+     * @param {string} host Hostname or IP of the target server.
      */
     relaysmtp (host: Host): void;
 
@@ -3565,7 +3566,7 @@ interface NS extends TIX, Singularity {
      * httpworm("foodnstuff");
      * \`\`\`
      * @ramCost 0.05 GB
-     * @param {string} host IP or hostname of the target server.
+     * @param {string} host Hostname or IP of the target server.
      */
     httpworm (host: Host): void;
 
@@ -3577,7 +3578,7 @@ interface NS extends TIX, Singularity {
      * sqlinject("foodnstuff");
      * \`\`\`
      * @ramCost 0.05 GB
-     * @param {string} host IP or hostname of the target server.
+     * @param {string} host Hostname or IP of the target server.
      */
     sqlinject (host: Host): void;
 
@@ -3652,7 +3653,7 @@ interface NS extends TIX, Singularity {
      * \`\`\`
      * @ramCost 1.3 GB
      * @param {string} script Filename of script to execute.
-     * @param {string} host IP or hostname of the \`target server\` on which to execute the script.
+     * @param {string} host Hostname or IP 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 {...string} [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 {number} Returns the PID of a successfully started script, and 0 otherwise.
@@ -3707,7 +3708,7 @@ interface NS extends TIX, Singularity {
      * \`\`\`
      * @ramCost 0.5 GB
      * @param {string} script Filename of the script to kill
-     * @param {string} host IP or hostname of the server on which to kill the script.
+     * @param {string} host Hostname or IP of the server on which to kill the script.
      * @param {...string} [args] Arguments to identify which script to kill.
      * @returns {boolean} True if the script is successfully killed, and false otherwise.
      */
@@ -3890,6 +3891,16 @@ interface NS extends TIX, Singularity {
      */
     getHacknetMultipliers (): HacknetMultipliers;
 
+    /**
+     * Returns a server object for the given server. Defaults to the running script's server if host is not specified.
+     *
+     * @ramCost 2 GB
+     * @param {string} [host] Optional. Hostname or IP for the requested server object.
+     * @returns {Server} The requested server object.
+     */
+    getServer (host?: Host): Server;
+
+
     /**
      * Returns the amount of money available on a server.
      * Running this function on the home computer will return the player’s money.
@@ -4128,10 +4139,10 @@ interface NS extends TIX, Singularity {
      * Returns an array with either the hostnames or IPs of all of the servers you have purchased.
      *
      * @ramCost 2.25 GB
-     * @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.
+     * @param {boolean} [hostnameMode]. Optional. Defaults to true. Returns hostnames if true, and IPs if false.
      * @returns {string[]} Returns an array with either the hostnames or IPs of all of the servers you have purchased.
      */
-    getPurchasedServers (hostname?: boolean): Host[];
+    getPurchasedServers (hostnameMode?: boolean): Host[];
 
     /**
      * Returns the maximum number of servers you can purchase.

src/ScriptEditor/ui/OptionsModal.tsx

@@ -45,7 +45,9 @@ export function OptionsModal(props: IProps): React.ReactElement {
           <MenuItem value="vs-dark">dark</MenuItem>
           <MenuItem value="light">light</MenuItem>
           <MenuItem value="monokai">monokai</MenuItem>
-        </Select>
+          <MenuItem value="solarish-dark">solarish-dark</MenuItem>
+	  <MenuItem value="solarish-light">solarish-light</MenuItem>
+	</Select>
       </Box>
 
       <Box display="flex" flexDirection="row" alignItems="center">

src/ScriptEditor/ui/themes.ts

@@ -63,4 +63,159 @@ export async function loadThemes(monaco: { editor: any }): Promise<void> {
       "editor.selectionHighlightBorder": "#222218",
     },
   });
+
+  monaco.editor.defineTheme("solarish-dark", {
+    base: "vs-dark",
+    inherit: true,
+    rules: [
+      {
+        background: "002b36",
+        token: "",
+      },
+      {
+        foreground: "586e75",
+        token: "comment",
+      },
+      {
+        foreground: "00afaf",
+        token: "string",
+      },
+      {
+        token: "number",
+        foreground: "00afaf",
+      },
+      {
+        token: "otherkeyvars",
+        foreground: "268bd2",
+      },
+      {
+        foreground: "268bd2",
+        token: "function",
+      },
+      {
+        foreground: "859900",
+        token: "keyword",
+      },
+      {
+        token: "storage.type.function.js",
+        foreground: "cb4b16",
+      },
+      {
+        token: "ns",
+        foreground: "cb4b16",
+      },
+      {
+        token: "netscriptfunction",
+        foreground: "268bd2",
+      },
+      {
+        token: "otherkeywords",
+        foreground: "268bd2",
+      },
+      {
+      	token: "type.identifier.js",
+	foreground: "b58900",
+      },
+      {
+      	token: "delimiter.square.js",
+	foreground: "0087ff",
+      },
+      {
+      	token: "delimiter.bracket.js",
+	foreground: "0087ff",
+      },
+      {
+        token: "this",
+        foreground: "cb4b16",
+      },
+    ],
+    colors: {
+      "editor.foreground": "#839496",
+      "editor.background": "#002b36",
+      "editor.selectionBackground": "#073642",
+      "editor.lineHighlightBackground": "#073642",
+      "editorCursor.foreground": "#819090",
+      "editorWhitespace.foreground": "#073642",
+      "editorIndentGuide.activeBackground": "#9D550FB0",
+      "editor.selectionHighlightBorder": "#222218",
+    },
+  });
+
+  monaco.editor.defineTheme("solarish-light", {
+    base: "vs",
+    inherit: true,
+    rules: [
+      {
+        foreground: "657b83",
+	background: "fdf6e3",
+        token: "",
+      },
+      {
+        foreground: "586e75",
+        token: "comment",
+      },
+      {
+        foreground: "2aa198",
+        token: "string",
+      },
+      {
+        token: "number",
+        foreground: "2aa198",
+      },
+      {
+        token: "otherkeyvars",
+        foreground: "268bd2",
+      },
+      {
+        foreground: "268bd2",
+        token: "function",
+      },
+      {
+        foreground: "859900",
+        token: "keyword",
+      },
+      {
+        token: "storage.type.function.js",
+        foreground: "bc4b16",
+      },
+      {
+        token: "ns",
+        foreground: "cb4b16",
+      },
+      {
+        token: "netscriptfunction",
+        foreground: "268bd2",
+      },
+      {
+        token: "otherkeywords",
+        foreground: "268bd2",
+      },
+      {
+      	token: "type.identifier.js",
+	foreground: "b58900",
+      },
+      {
+      	token: "delimiter.square.js",
+	foreground: "0087ff",
+      },
+      {
+      	token: "delimiter.bracket.js",
+	foreground: "0087ff",
+      },
+      {
+        token: "this",
+        foreground: "cb4b16",
+      },
+    ],
+    colors: {
+      "editor.foreground": "#657b83",
+      "editor.background": "#fdf6e3",
+      "editor.selectionBackground": "#eee8d5",
+      "editor.lineHighlightBackground": "#eee8d5",
+      "editorCursor.foreground": "#657b83",
+      "editorWhitespace.foreground": "#eee8d5",
+      "editorIndentGuide.activeBackground": "#eee8d5",
+      "editor.selectionHighlightBorder": "#073642",
+    },
+  });
 }

src/ui/WorkInProgressRoot.tsx

@@ -222,7 +222,7 @@ export function WorkInProgressRoot(): React.ReactElement {
 
   if (player.workType == CONSTANTS.WorkTypeCompanyPartTime) {
     function cancel(): void {
-      player.finishWork(true);
+      player.finishWorkPartTime(true);
       router.toJob();
     }
     function unfocus(): void {