Merge branch 'dev' into streamline-create-programs

index.html

@@ -908,7 +908,7 @@
                 </form>
             </div>
             <div id="game-options-right-panel">
-                <a class="a-link-button" style="display:block;" href="https://bitburner.wikia.com/wiki/Changelog" target="_blank"> Changelog </a>
+                <a class="a-link-button" style="display:block;" href="https://bitburner.readthedocs.io/en/latest/changelog.html" target="_blank"> Changelog </a>
                 <a class="a-link-button" style="display:block;" href="https://bitburner.wikia.com" target="_blank">Wiki</a>
                 <a class="a-link-button" style="display:block;" href="https://www.reddit.com/r/bitburner" target="_blank">Subreddit</a>
                 <a id="save-game-link" class="a-link-button" style="display:inline-block;width:46%;"> Save Game </a>

package.json

@@ -62,6 +62,9 @@
     "sinon": "^2.3.2",
     "source-map": "^0.7.3",
     "style-loader": "^0.21.0",
+    "ts-loader": "^4.4.1",
+    "tslint": "^5.10.0",
+    "typescript": "^2.9.2",
     "url-loader": "^1.0.1",
     "watchpack": "^1.6.0",
     "webpack": "^4.12.0",
@@ -84,6 +87,7 @@
     "start:dev": "webpack-dev-server",
     "build": "webpack --mode production",
     "build:dev": "webpack --mode development",
+    "lint:typescript": "tslint --project . --exclude **/*.d.ts --format stylish src/**/*.ts utils/**/*.ts",
     "watch": "webpack --watch --mode production",
     "watch:dev": "webpack --watch --mode development"
   },

src/Constants.js

@@ -42,11 +42,11 @@ let CONSTANTS = {
 
     /* Netscript Constants */
     //RAM Costs for different commands
-    ScriptBaseRamCost:              1.4,
+    ScriptBaseRamCost:              1.6,
     ScriptDomRamCost:               100,
-    ScriptWhileRamCost:             0.2,
+    ScriptWhileRamCost:             0,
-    ScriptForRamCost:               0.2,
+    ScriptForRamCost:               0,
-    ScriptIfRamCost:                0.15,
+    ScriptIfRamCost:                0,
     ScriptHackRamCost:              0.1,
     ScriptGrowRamCost:              0.15,
     ScriptWeakenRamCost:            0.15,
@@ -490,17 +490,15 @@ let CONSTANTS = {
 
     LatestUpdate:
     "v0.38.1<br>"  +
-    "* Bug Fix: Using 'Object.prototype' functions like toLocaleString() or toString() should no longer cause errors in NetscriptJS<br>" +
+    "* Added 'var' declarations in Netscript 1.0 (only works with 'var', not 'let' or 'const')<br>"  +
-    "* Implemented by Github user hydroflame:<br>"  +
+    "* Script base RAM cost is now 1.6 GB (increased from 1.4 GB)<br>" +
-    "*** Accessing the 'window' and 'document' objects in Netscript JS now requires a large amount of RAM (100 GB)<br>" +
+    "* While/for loops and if statements no longer cost RAM in scripts<br>"  +
-    "*** Added game option to suppress travel confirmation<br>"  +
+    "* Made short-circuit evaluation logic more consistent in Netscript 1.0 (see https://github.com/danielyxie/bitburner/issues/308)<br>" +
-    "*** Text on buttons can no longer be highlighted<br>" +
+    "* Changelog button in the Options menu now links to the new Changelog URL (by Github user thePalindrome)<br>" +
-    "*** Bug Fix: Fixed an issue that caused NaN values when exporting Real Estate in Corporations<br>" +
+    "* Skill level calculation is now 'smoother' (by Github user hydroflame)<br>" +
-    "*** Bug Fix: Competition and Demand displays in Corporation are now correct (were reversed before)<br>" +
+    "* Added a button to 'beautify' scripts in the text editor (by Github user hydroflame)<br>" +
-    "*** Added ps() Netscript function<br>"  +
+    "* Added favicon (by Github user kopelli)"
-    "*** Bug Fix: grow() should no longer return/log a negative value when it runs on a server that's already at max money<br>" +
+
-    "*** Bug Fix: serverExists() Netscript function should now properly return false for non-existent hostname/ips<br>" +
-    "*** Bug Fix: Sever's security level should now properly increase when its money is grown to max value"
 
 }
 

src/DarkWeb.js

@@ -109,6 +109,7 @@ const DarkWebItems = {
     SQLInjectProgram: new DarkWebItem(Programs.SQLInjectProgram, 250000000, "Opens up SQL Ports"),
     DeepscanV1:       new DarkWebItem(Programs.DeepscanV1, 500000, "Enables 'scan-analyze' with a depth up to 5"),
     DeepscanV2:       new DarkWebItem(Programs.DeepscanV2, 25000000, "Enables 'scan-analyze' with a depth up to 10"),
+    AutolinkProgram:  new DarkWebItem(Programs.AutoLink, 1000000, "Enables direct connect via 'scan-analyze'"),
 };
 
 

src/Gang.js

@@ -336,17 +336,17 @@ function GangMember(name) {
 }
 
 //Same formula for Player
-GangMember.prototype.calculateSkill = function(exp) {
+GangMember.prototype.calculateSkill = function(exp, mult=1) {
-    return Math.max(Math.floor(32 * Math.log(exp + 534.5) - 200), 1);
+    return Math.max(Math.floor(mult*(32 * Math.log(exp + 534.5) - 200)), 1);
 }
 
 GangMember.prototype.updateSkillLevels = function() {
-    this.hack   = Math.floor(this.calculateSkill(this.hack_exp) * this.hack_mult);
+    this.hack   = this.calculateSkill(this.hack_exp, this.hack_mult);
-    this.str    = Math.floor(this.calculateSkill(this.str_exp) * this.str_mult);
+    this.str    = this.calculateSkill(this.str_exp, this.str_mult);
-    this.def    = Math.floor(this.calculateSkill(this.def_exp) * this.def_mult);
+    this.def    = this.calculateSkill(this.def_exp, this.def_mult);
-    this.dex    = Math.floor(this.calculateSkill(this.dex_exp) * this.dex_mult);
+    this.dex    = this.calculateSkill(this.dex_exp, this.dex_mult);
-    this.agi    = Math.floor(this.calculateSkill(this.agi_exp) * this.agi_mult);
+    this.agi    = this.calculateSkill(this.agi_exp, this.agi_mult);
-    this.cha    = Math.floor(this.calculateSkill(this.cha_exp) * this.cha_mult);
+    this.cha    = this.calculateSkill(this.cha_exp, this.cha_mult);
 }
 
 GangMember.prototype.calculatePower = function() {

src/HelpText.ts

@@ -1,40 +1,43 @@
-/* HelpText.js */
+/* tslint:disable:max-line-length completed-docs variable-name*/
-let TerminalHelpText =
+export const TerminalHelpText: string =
-                "Type 'help name' to learn more about the command 'name'<br><br>" +
+    "Type 'help name' to learn more about the command 'name'<br><br>" +
-                'alias [-g] [name="value"]      Create or display Terminal aliases<br>' +
+    'alias [-g] [name="value"]      Create or display Terminal aliases<br>' +
-                "analyze                        Get information about the current machine <br>" +
+    "analyze                        Get information about the current machine <br>" +
-                "buy [-l/program]               Purchase a program through the Dark Web<br>" +
+    "buy [-l/program]               Purchase a program through the Dark Web<br>" +
-                "cat [file]                     Display a .msg, .lit, or .txt file<br>" +
+    "cat [file]                     Display a .msg, .lit, or .txt file<br>" +
-                "check [script] [args...]       Print a script's logs to Terminal<br>" +
+    "check [script] [args...]       Print a script's logs to Terminal<br>" +
-                "clear                          Clear all text on the terminal <br>" +
+    "clear                          Clear all text on the terminal <br>" +
-                "cls                            See 'clear' command <br>" +
+    "cls                            See 'clear' command <br>" +
-                "connect [ip/hostname]          Connects to a remote server<br>" +
+    "connect [ip/hostname]          Connects to a remote server<br>" +
-                "download [script/text file]    Downloads scripts or text files to your computer<br>" +
+    "download [script/text file]    Downloads scripts or text files to your computer<br>" +
-                "free                           Check the machine's memory (RAM) usage<br>" +
+    "free                           Check the machine's memory (RAM) usage<br>" +
-                "hack                           Hack the current machine<br>" +
+    "hack                           Hack the current machine<br>" +
-                "help [command]                 Display this help text, or the help text for a command<br>" +
+    "help [command]                 Display this help text, or the help text for a command<br>" +
-                "home                           Connect to home computer<br>" +
+    "home                           Connect to home computer<br>" +
-                "hostname                       Displays the hostname of the machine<br>" +
+    "hostname                       Displays the hostname of the machine<br>" +
-                "ifconfig                       Displays the IP address of the machine<br>" +
+    "ifconfig                       Displays the IP address of the machine<br>" +
-                "kill [script] [args...]        Stops the specified script on the current server <br>" +
+    "kill [script] [args...]        Stops the specified script on the current server <br>" +
-                "killall                        Stops all running scripts on the current machine<br>" +
+    "killall                        Stops all running scripts on the current machine<br>" +
-                "ls [| grep pattern]            Displays all files on the machine<br>" +
+    "ls [| grep pattern]            Displays all files on the machine<br>" +
-                "lscpu                          Displays the number of CPU cores on the machine<br>" +
+    "lscpu                          Displays the number of CPU cores on the machine<br>" +
-                "mem [script] [-t] [n]          Displays the amount of RAM required to run the script<br>" +
+    "mem [script] [-t] [n]          Displays the amount of RAM required to run the script<br>" +
-                "nano [file]                    Text editor - Open up and edit a script or text file<br>" +
+    "nano [file]                    Text editor - Open up and edit a script or text file<br>" +
-                "ps                             Display all scripts that are currently running<br>" +
+    "ps                             Display all scripts that are currently running<br>" +
-                "rm [file]                      Delete a file from the server<br>" +
+    "rm [file]                      Delete a file from the server<br>" +
-                "run [name] [-t] [n] [args...]  Execute a program or script<br>" +
+    "run [name] [-t] [n] [args...]  Execute a program or script<br>" +
-                "scan                           Prints all immediately-available network connections<br>" +
+    "scan                           Prints all immediately-available network connections<br>" +
-                "scan-analyze [d] [-a]          Prints info for all servers up to <i>d</i> nodes away<br>" +
+    "scan-analyze [d] [-a]          Prints info for all servers up to <i>d</i> nodes away<br>" +
-                "scp [file] [server]            Copies a file to a destination server<br>" +
+    "scp [file] [server]            Copies a file to a destination server<br>" +
-                "sudov                          Shows whether you have root access on this computer<br>" +
+    "sudov                          Shows whether you have root access on this computer<br>" +
-                "tail [script] [args...]        Displays dynamic logs for the specified script<br>" +
+    "tail [script] [args...]        Displays dynamic logs for the specified script<br>" +
-                "theme [preset] | bg txt hlgt   Change the color scheme of the UI<br>" +
+    "theme [preset] | bg txt hlgt   Change the color scheme of the UI<br>" +
-                "top                            Displays all running scripts and their RAM usage<br>" +
+    "top                            Displays all running scripts and their RAM usage<br>" +
-                'unalias "[alias name]"         Deletes the specified alias<br>';
+    'unalias "[alias name]"         Deletes the specified alias<br>';
 
-let HelpTexts = {
+interface IMap<T> {
+    [key: string]: T;
+}
+export const HelpTexts: IMap<string> = {
     alias:          'alias [-g] [name="value"] <br>' +
                     "Create or display aliases. An alias enables a replacement of a word with another string. " +
                     "It can be used to abbreviate a commonly used command, or commonly used parts of a command. The NAME " +
@@ -212,6 +215,4 @@ let HelpTexts = {
                     'unalias "r"<br><br>' +
                     "It is not necessary to differentiate between global and non-global aliases when using 'unalias'",
 
-}
+};
-
-export {TerminalHelpText, HelpTexts};

src/NetscriptEvaluator.js

@@ -224,6 +224,9 @@ function evaluate(exp, workerScript) {
             case "AssignmentExpression":
                 return evalAssignment(exp, workerScript);
                 break;
+            case "VariableDeclaration":
+                return evalVariableDeclaration(exp, workerScript);
+                break;
             case "UpdateExpression":
                 if (exp.argument.type==="Identifier"){
                     if (exp.argument.name in env.vars){
@@ -333,11 +336,11 @@ function evaluate(exp, workerScript) {
 function evalBinary(exp, workerScript){
     return evaluate(exp.left, workerScript).then(function(expLeft) {
         //Short circuiting
-        if (expLeft == true && exp.operator === "||") {
+        if (expLeft && exp.operator === "||") {
-            return Promise.resolve(true);
+            return Promise.resolve(expLeft);
         }
-        if (expLeft == false && exp.operator === "&&") {
+        if (!expLeft && exp.operator === "&&") {
-            return Promise.resolve(false);
+            return Promise.resolve(expLeft);
         }
         return evaluate(exp.right, workerScript).then(function(expRight) {
             switch (exp.operator){
@@ -511,6 +514,41 @@ function evalAssignment(exp, workerScript) {
     });
 }
 
+function evalVariableDeclaration(exp, workerScript) {
+    var env = workerScript.env;
+    if (env.stopFlag) {return Promise.reject(workerScript);}
+
+    if (!(exp.declarations instanceof Array)) {
+        return Promise.reject(makeRuntimeRejectMsg(workerScript, "Variable declarations parsed incorrectly. This may be a syntax error"));
+    }
+
+    if (exp.kind !== "var") {
+        return Promise.reject(makeRuntimeRejectMsg(workerScript, "Only 'var' declarations are currently allowed (let, const, etc. are not allowed)"));
+    }
+
+    return Promise.all(exp.declarations.map((decl)=>{
+        evalVariableDeclarator(decl, workerScript);
+    })).then(function(res) {
+        return Promise.resolve(res);
+    });
+}
+
+//A Variable Declaration contains an array of Variable Declarators
+function evalVariableDeclarator(exp, workerScript) {
+    var env = workerScript.env;
+    if (exp.type !== "VariableDeclarator") {
+        return Promise.reject(makeRuntimeRejectMsg(workerScript, "Invalid AST Node passed into evalVariableDeclarator: " + exp.type));
+    }
+    if (exp.init == null) {
+        env.set(exp.id.name, null);
+        return Promise.resolve(null);
+    } else {
+        return evaluate(exp.init, workerScript).then(function(initValue) {
+            env.set(exp.id.name, initValue);
+        });
+    }
+}
+
 function evaluateIf(exp, workerScript, i) {
     var env = workerScript.env;
     return evaluate(exp.test, workerScript).then(function(condRes) {

src/NetscriptFunctions.js

@@ -36,7 +36,7 @@ import {StockMarket, StockSymbols, SymbolToStockMap, initStockSymbols,
         Stock, shortStock, sellShort, OrderTypes,
         PositionTypes, placeOrder, cancelOrder}     from "./StockMarket.js";
 import {post}                                       from "./Terminal.js";
-import {TextFile, getTextFile, createTextFile}      from "./TextFile.js";
+import {TextFile, getTextFile, createTextFile}      from "./TextFile";
 
 import {WorkerScript, workerScripts,
         killWorkerScript, NetscriptPorts}           from "./NetscriptWorker.js";

src/NetscriptWorker.js

@@ -194,7 +194,7 @@ function runScriptsLoop() {
             } else {
                 try {
                     var ast = parse(workerScripts[i].code, {sourceType:"module"});
-                    //console.log(ast);
+                    console.log(ast);
                 } catch (e) {
                     console.log("Error parsing script: " + workerScripts[i].name);
                     dialogBoxCreate("Syntax ERROR in " + workerScripts[i].name + ":<br>" +  e);

src/Player.js

@@ -201,6 +201,7 @@ function PlayerObject() {
 	this.lastUpdate = 0;
     this.totalPlaytime = 0;
     this.playtimeSinceLastAug = 0;
+    this.playtimeSinceLastBitnode = 0;
 
     //Production since last Augmentation installation
     this.scriptProdSinceLastAug = 0;
@@ -390,6 +391,7 @@ PlayerObject.prototype.prestigeSourceFile = function() {
     this.corporation = 0;
 
     this.playtimeSinceLastAug = 0;
+    this.playtimeSinceLastBitnode = 0;
     this.scriptProdSinceLastAug = 0;
 }
 
@@ -422,17 +424,17 @@ PlayerObject.prototype.receiveInvite = function(factionName) {
 }
 
 //Calculates skill level based on experience. The same formula will be used for every skill
-PlayerObject.prototype.calculateSkill = function(exp) {
+PlayerObject.prototype.calculateSkill = function(exp, mult=1) {
-    return Math.max(Math.floor(32 * Math.log(exp + 534.5) - 200), 1);
+    return Math.max(Math.floor(mult*(32 * Math.log(exp + 534.5) - 200)), 1);
 }
 
 PlayerObject.prototype.updateSkillLevels = function() {
-	this.hacking_skill = Math.max(1, Math.floor(this.calculateSkill(this.hacking_exp) * this.hacking_mult * BitNodeMultipliers.HackingLevelMultiplier));
+	this.hacking_skill = Math.max(1, Math.floor(this.calculateSkill(this.hacking_exp, this.hacking_mult) * BitNodeMultipliers.HackingLevelMultiplier));
-	this.strength      = Math.floor(this.calculateSkill(this.strength_exp) * this.strength_mult);
+	this.strength      = this.calculateSkill(this.strength_exp, this.strength_mult);
-    this.defense       = Math.floor(this.calculateSkill(this.defense_exp) * this.defense_mult);
+    this.defense       = this.calculateSkill(this.defense_exp, this.defense_mult);
-    this.dexterity     = Math.floor(this.calculateSkill(this.dexterity_exp) * this.dexterity_mult);
+    this.dexterity     = this.calculateSkill(this.dexterity_exp, this.dexterity_mult);
-    this.agility       = Math.floor(this.calculateSkill(this.agility_exp) * this.agility_mult);
+    this.agility       = this.calculateSkill(this.agility_exp, this.agility_mult);
-    this.charisma      = Math.floor(this.calculateSkill(this.charisma_exp) * this.charisma_mult);
+    this.charisma      = this.calculateSkill(this.charisma_exp, this.charisma_mult);
 
     if (this.intelligence > 0) {
         this.intelligence = Math.floor(this.calculateSkill(this.intelligence_exp));

src/SaveObject.js

@@ -503,8 +503,10 @@ function loadImportedGame(saveObj, saveString) {
     var time = numCyclesOffline * Engine._idleSpeed;
     if (Player.totalPlaytime == null) {Player.totalPlaytime = 0;}
     if (Player.playtimeSinceLastAug == null) {Player.playtimeSinceLastAug = 0;}
+    if (Player.playtimeSinceLastBitnode == null) {Player.playtimeSinceLastBitnode = 0;}
     Player.totalPlaytime += time;
     Player.playtimeSinceLastAug += time;
+    Player.playtimeSinceLastBitnode += time;
 
     //Re-apply augmentations
     Player.reapplyAllAugmentations();

src/Script.js

@@ -30,7 +30,7 @@ import {Player}                                 from "./Player.js";
 import {AllServers, processSingleServerGrowth}  from "./Server.js";
 import {Settings}                               from "./Settings.js";
 import {post, Terminal}                         from "./Terminal.js";
-import {TextFile}                               from "./TextFile.js";
+import {TextFile}                               from "./TextFile";
 
 import {parse, Node}                            from "../utils/acorn.js";
 import {dialogBoxCreate}                        from "../utils/DialogBox.js";
@@ -60,7 +60,7 @@ function scriptEditorInit() {
     }
     var beautifyButton = createElement("a", {
         class:"a-link-button", display:"inline-block",
-        innerText:"beautify",
+        innerText:"Beautify",
         clickListener:()=>{
             beautifyScript();
             return false;

src/Terminal.js

@@ -5,11 +5,12 @@ import {substituteAliases, printAliases,
 import {CONSTANTS}                          from "./Constants.js";
 import {Programs}                           from "./CreateProgram.js";
 import {executeDarkwebTerminalCommand,
-        checkIfConnectedToDarkweb}          from "./DarkWeb.js";
+        checkIfConnectedToDarkweb,
+        DarkWebItems}                       from "./DarkWeb.js";
 import {Engine}                             from "./engine.js";
 import {FconfSettings, parseFconfSettings,
         createFconf}                        from "./Fconf.js";
-import {TerminalHelpText, HelpTexts}        from "./HelpText.js";
+import {TerminalHelpText, HelpTexts}        from "./HelpText";
 import {iTutorialNextStep, iTutorialSteps,
         iTutorialIsRunning,
         currITutorialStep}                  from "./InteractiveTutorial.js";
@@ -29,8 +30,7 @@ import {AllServers, GetServerByHostname,
 import {Settings}                           from "./Settings.js";
 import {SpecialServerIps,
         SpecialServerNames}                 from "./SpecialServerIps.js";
-import {TextFile, getTextFile,
+import {TextFile, getTextFile}              from "./TextFile";
-        createTextFile}                     from "./TextFile.js";
 
 import {containsAllStrings, longestCommonStart,
         formatNumber, isString}             from "../utils/StringHelperFunctions.js";
@@ -409,9 +409,12 @@ function determineAllPossibilitiesForTabCompletion(input, index=0) {
     }
 
     if (input.startsWith ("buy ")) {
-        return [Programs.BruteSSHProgram.name, Programs.FTPCrackProgram.name, Programs.RelaySMTPProgram.name,
+        let options = [];
-                Programs.HTTPWormProgram.name, Programs.SQLInjectProgram.name, Programs.DeepscanV1.name,
+        for(const i in DarkWebItems) {
-                Programs.DeepscanV2.name].concat(Object.keys(GlobalAliases));
+            const item = DarkWebItems[i]
+            options.push(item.program);
+        }
+        return options.concat(Object.keys(GlobalAliases));
     }
 
     if (input.startsWith("scp ") && index == 1) {

src/TextFile.js

@@ -1,90 +0,0 @@
-import {Server}                             from "./Server.js";
-import {dialogBoxCreate}                    from "../utils/DialogBox.js";
-import {Reviver, Generic_toJSON,
-        Generic_fromJSON}                   from "../utils/JSONReviver.js";
-
-function TextFile(fn="", txt="") {
-    this.fn = fn.endsWith(".txt") ? fn : fn + ".txt";
-    this.fn = this.fn.replace(/\s+/g, '');
-    this.text = String(txt);
-}
-
-TextFile.prototype.append = function(txt) {
-    this.text += String(txt);
-}
-
-TextFile.prototype.write = function(txt) {
-    this.text = String(txt);
-}
-
-TextFile.prototype.read = function() {
-    return this.txt;
-}
-
-TextFile.prototype.show = function() {
-    dialogBoxCreate(this.fn + "<br><br>" + this.text, true);
-}
-
-TextFile.prototype.download = function() {
-    var filename = this.fn;
-    var file = new Blob([this.text], {type: 'text/plain'});
-    if (window.navigator.msSaveOrOpenBlob) {// IE10+
-        window.navigator.msSaveOrOpenBlob(file, filename);
-    } else { // Others
-        var a = document.createElement("a"),
-                url = URL.createObjectURL(file);
-        a.href = url;
-        a.download = this.fn;
-        document.body.appendChild(a);
-        a.click();
-        setTimeout(function() {
-            document.body.removeChild(a);
-            window.URL.revokeObjectURL(url);
-        }, 0);
-    }
-}
-
-TextFile.prototype.toJSON = function() {
-	return Generic_toJSON("TextFile", this);
-}
-
-TextFile.fromJSON = function(value) {
-	return Generic_fromJSON(TextFile, value.data);
-}
-
-Reviver.constructors.TextFile = TextFile;
-
-function getTextFile(fn, server) {
-    if (!fn.endsWith(".txt")) {fn += ".txt";}
-    for (var i = 0; i < server.textFiles.length; ++i) {
-        if (server.textFiles[i].fn === fn) {
-            return server.textFiles[i];
-        }
-    }
-    return null;
-}
-
-//Returns the TextFile object that was just created
-function createTextFile(fn, txt, server) {
-    if (getTextFile(fn, server) !== null) {
-        console.log("ERROR: createTextFile failed because the specified " +
-                    "server already has a text file with the same fn");
-        return;
-    }
-    var file = new TextFile(fn, txt);
-    server.textFiles.push(file);
-    return file;
-}
-
-function deleteTextFile(fn, server) {
-    if (!fn.endsWith(".txt")) {fn += ".txt";}
-    for (var i = 0; i < server.textFiles.length; ++i) {
-        if (server.textFiles[i].fn === fn) {
-            server.textFiles.splice(i, 1);
-            return true;
-        }
-    }
-    return false;
-}
-
-export {TextFile, getTextFile, createTextFile};

src/TextFile.ts

@@ -0,0 +1,147 @@
+import { dialogBoxCreate } from "../utils/DialogBox";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
+
+/**
+ * Represents a plain text file that is typically stored on a server.
+ */
+export class TextFile {
+    /**
+     * Initiatizes a TextFile from a JSON save state.
+     */
+    static fromJSON(value: any): TextFile {
+        return Generic_fromJSON(TextFile, value.data);
+    }
+
+    /**
+     * The full file name.
+     */
+    fn: string;
+
+    /**
+     * The content of the file.
+     */
+    text: string;
+
+    constructor(fn: string = "", txt: string = "") {
+        this.fn = (fn.endsWith(".txt") ? fn : `${fn}.txt`).replace(/\s+/g, "");
+        this.text = txt;
+    }
+
+    /**
+     * Concatenates the raw values to the end of current content.
+     */
+    append(txt: string): void {
+        this.text += txt;
+    }
+
+    /**
+     * Serves the file to the user as a downloadable resource through the browser.
+     */
+    download(): void {
+        const filename: string = this.fn;
+        const file: Blob = new Blob([ this.text ], { type: "text/plain" });
+        /* tslint:disable-next-line:strict-boolean-expressions */
+        if (window.navigator.msSaveOrOpenBlob) {
+            // IE10+
+            window.navigator.msSaveOrOpenBlob(file, filename);
+        } else {
+            // Others
+            const a: HTMLAnchorElement = document.createElement("a");
+            const url: string = URL.createObjectURL(file);
+            a.href = url;
+            a.download = this.fn;
+            document.body.appendChild(a);
+            a.click();
+            setTimeout(
+                () => {
+                    document.body.removeChild(a);
+                    window.URL.revokeObjectURL(url);
+                },
+                0);
+        }
+    }
+
+    /**
+     * Retrieve the content of the file.
+     */
+    read(): string {
+        return this.text;
+    }
+
+    /**
+     * Shows the content to the user via the game's dialog box.
+     */
+    show(): void {
+        dialogBoxCreate(`${this.fn}<br /><br />${this.text}`, true);
+    }
+
+    /**
+     * Serialize the current file to a JSON save state.
+     */
+    toJSON(): any {
+        return Generic_toJSON("TextFile", this);
+    }
+
+    /**
+     * Replaces the current content with the text provided.
+     */
+    write(txt: string): void {
+        this.text = txt;
+    }
+}
+
+Reviver.constructors.TextFile = TextFile;
+
+/**
+ * Retrieve the file object for the filename on the specified server.
+ * @param fn The file name to look for
+ * @param server The server object to look in
+ * @returns The file object, or null if it couldn't find it.
+ */
+export function getTextFile(fn: string, server: any): TextFile | null {
+    const filename: string = !fn.endsWith(".txt") ? `${fn}.txt` : fn;
+
+    for (const file of (server.textFiles as TextFile[])) {
+        if (file.fn === filename) {
+            return file;
+        }
+    }
+
+    return null;
+}
+
+/**
+ * Creates a TextFile on the target server.
+ * @param fn The file name to create.
+ * @param txt The contents of the file.
+ * @param server The server that the file should be created on.
+ * @returns The instance of the file.
+ */
+export function createTextFile(fn: string, txt: string, server: any): TextFile | undefined {
+    if (getTextFile(fn, server) !== null) {
+        // This should probably be a `throw`...
+        /* tslint:disable-next-line:no-console */
+        console.error(`A file named "${fn}" already exists on server ${server.hostname}.`);
+
+        return undefined;
+    }
+    const file: TextFile = new TextFile(fn, txt);
+    server.textFiles.push(file);
+
+    return file;
+}
+
+/* tslint:disable-next-line:no-unused-variable */
+function deleteTextFile(fn: string, server: any): boolean {
+    const filename: string = !fn.endsWith(".txt") ? `${fn}.txt` : fn;
+    /* tslint:disable-next-line:typedef */
+    for (let i = 0; i < server.textFiles.length; ++i) {
+        if (server.textFiles[i].fn === filename) {
+            server.textFiles.splice(i, 1);
+
+            return true;
+        }
+    }
+
+    return false;
+}

src/engine.js

@@ -576,6 +576,11 @@ let Engine = {
             intText = 'Intelligence:  ' + (Player.intelligence).toLocaleString() + "<br><br><br>";
         }
 
+        let bitNodeTimeText = "";
+        if(Player.sourceFiles.length > 0) {
+            bitNodeTimeText = 'Time played since last Bitnode destroyed: ' + convertTimeMsToTimeElapsedString(Player.playtimeSinceLastBitnode) + '<br>';
+        }
+
         Engine.Display.characterInfo.appendChild(createElement("pre", {
             innerHTML:
             '<b>General</b><br><br>' +
@@ -629,6 +634,7 @@ let Engine = {
             'Hacknet Nodes owned: ' + Player.hacknetNodes.length + '<br>' +
             'Augmentations installed: ' + Player.augmentations.length + '<br>' +
             'Time played since last Augmentation: ' + convertTimeMsToTimeElapsedString(Player.playtimeSinceLastAug) + '<br>' +
+            bitNodeTimeText +
             'Time played: ' + convertTimeMsToTimeElapsedString(Player.totalPlaytime),
         }));
 
@@ -914,8 +920,10 @@ let Engine = {
         var time = numCycles * Engine._idleSpeed;
         if (Player.totalPlaytime == null) {Player.totalPlaytime = 0;}
         if (Player.playtimeSinceLastAug == null) {Player.playtimeSinceLastAug = 0;}
+        if (Player.playtimeSinceLastBitnode == null) {Player.playtimeSinceLastBitnode = 0;}
         Player.totalPlaytime += time;
         Player.playtimeSinceLastAug += time;
+        Player.playtimeSinceLastBitnode += time;
 
         //Start Manual hack
         if (Player.startAction == true) {
@@ -1335,8 +1343,10 @@ let Engine = {
             var time = numCyclesOffline * Engine._idleSpeed;
             if (Player.totalPlaytime == null) {Player.totalPlaytime = 0;}
             if (Player.playtimeSinceLastAug == null) {Player.playtimeSinceLastAug = 0;}
+            if (Player.playtimeSinceLastBitnode == null) {Player.playtimeSinceLastBitnode = 0;}
             Player.totalPlaytime += time;
             Player.playtimeSinceLastAug += time;
+            Player.playtimeSinceLastBitnode += time;
 
             Player.lastUpdate = Engine._lastUpdate;
             Engine.start();                 //Run main game loop and Scripts loop

tsconfig.json

@@ -0,0 +1,11 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "sourceMap": true,
+        "strict": true
+    },
+    "exclude": [
+        "node_modules"
+    ]
+}

tslint.json

@@ -0,0 +1,76 @@
+{
+    "defaultSeverity": "error",
+    "extends": [
+        "tslint:all"
+    ],
+    "jsRules": {},
+    "linterOptions": {
+        "exclude": [
+            "node_modules/"
+        ]
+    },
+    "rules": {
+        "completed-docs": [
+            true,
+            {
+                "classes": true,
+                "enums": true,
+                "enum-members": true,
+                "functions": {
+                    "visibilities": [
+                        "exported"
+                    ]
+                },
+                "interfaces": true,
+                "methods": {
+                    "privacies": [
+                        "public"
+                    ]
+                },
+                "namespaces": true,
+                "properties": true,
+                "types": true,
+                "variables": {
+                    "visibilities": [
+                        "exported"
+                    ]
+                }
+            }
+        ],
+        "linebreak-style": false,
+        "member-access": [
+            true,
+            "no-public"
+        ],
+        "no-any": false,
+        "no-inferrable-types": [
+            true,
+            "ignore-params",
+            "ignore-properties"
+        ],
+        "no-null-keyword": false,
+        "no-unsafe-any": false,
+        "object-literal-key-quotes": [
+            true,
+            "as-needed"
+        ],
+        "only-arrow-functions": [
+            true,
+            "allow-declarations",
+            "allow-named-functions"
+        ],
+        "typedef": [
+            true,
+            "call-signatures",
+            "arrow-call-signatures",
+            "parameter",
+            "arrow-parameter",
+            "property-declaration",
+            "variable-declaration",
+            "member-variable-declaration",
+            "object-destructuring",
+            "array-destructuring"
+        ]
+    },
+    "rulesDirectory": []
+}

utils/DialogBox.d.ts

@@ -0,0 +1,2 @@
+export function dialogBoxCreate(txt: string, preformatted: boolean): void;
+export var dialogBoxOpened: boolean;

utils/JSONReviver.d.ts

@@ -0,0 +1,10 @@
+interface IReviverValue {
+    ctor: string;
+    data: object
+}
+export function Generic_fromJSON<T>(ctor: new () => T, data: any): T;
+export function Generic_toJSON(ctorName: string, obj: object, keys?: string[]): string;
+export function Reviver(key, value: IReviverValue);
+export namespace Reviver {
+    export var constructors: any;
+}

webpack.config.js

@@ -2,7 +2,6 @@ var path = require('path');
 var webpack = require('webpack');
 
 module.exports = (env, argv) => ({
-    //mode: "development",
     plugins: [
         new webpack.DefinePlugin({
             'process.env.NODE_ENV': argv.mode === 'development' ? "\"development\"" : "\"production\""
@@ -28,7 +27,13 @@ module.exports = (env, argv) => ({
         filename: "[name].bundle.js"
     },
     module: {
-        rules: []
+        rules: [
+            {
+                test: /\.tsx?$/,
+                loader: 'ts-loader',
+                exclude: /node_modules/
+            }
+        ]
     },
     optimization: {
         removeAvailableModules: true,
@@ -47,5 +52,12 @@ module.exports = (env, argv) => ({
     },
     devServer: {
         publicPath: "/dist",
+    },
+    resolve: {
+        extensions: [
+            ".tsx",
+            ".ts",
+            ".js"
+        ]
     }
 });