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

css/styles.css

@@ -138,6 +138,11 @@ a:link, a:visited {
     padding: 5px;
     margin: 5px;
     border: 1px solid #333333;
+
+    -moz-user-select: none;
+    -ms-user-select: none;
+    -khtml-user-select: none;
+    -webkit-user-select: none;
 }
 
 .a-link-button:hover {

index.html

@@ -821,6 +821,16 @@
                     <input type="checkbox" name="settingsSuppressFactionInvites" id="settingsSuppressFactionInvites">
                 </fieldset>
 
+                <!-- Suppress travel confirmation -->
+                <fieldset>
+                    <label for="settingsSuppressTravelConfirmation" class="tooltip">Suppress Travel Confirmation:
+                        <span class="tooltiptext">
+                            If this is set, the confirmation message before traveling will not show up. You will automatically be deducted the travel cost as soon as you click.
+                        </span>
+                    </label>
+                    <input type="checkbox" name="settingsSuppressTravelConfirmation" id="settingsSuppressTravelConfirmation">
+                </fieldset>
+
                 <!-- Disable Terminal and Navigation Shortcuts -->
                 <fieldset>
                     <label for="settingsDisableHotkeys" class="tooltip">Disable Hotkeys:

package.json

@@ -10,35 +10,27 @@
     "acorn-dynamic-import": "^2.0.0",
     "ajv": "^5.1.5",
     "ajv-keywords": "^2.0.0",
-    "async": "^2.1.2",
+    "async": "^2.6.1",
     "bluebird": "^3.5.1",
     "brace": "^0.11.1",
     "decimal.js": "7.2.3",
-    "enhanced-resolve": "^3.4.0",
+    "enhanced-resolve": "^4.0.0",
     "escope": "^3.6.0",
-    "file-saver": "^1.3.3",
+    "file-saver": "^1.3.8",
     "interpret": "^1.0.0",
     "jquery": "^3.3.1",
     "json-loader": "^0.5.4",
-    "json5": "^0.5.1",
     "jsplumb": "^2.6.8",
     "jszip": "^3.1.5",
     "loader-runner": "^2.3.0",
     "loader-utils": "^1.1.0",
     "memory-fs": "~0.4.1",
-    "mkdirp": "~0.5.0",
-    "node-libs-browser": "^2.0.0",
     "numeral": "2.0.6",
-    "source-map": "^0.5.3",
     "sprintf-js": "^1.1.1",
-    "supports-color": "^4.2.1",
+    "tapable": "^1.0.0",
-    "tapable": "^0.2.7",
+    "uglifyjs-webpack-plugin": "^1.2.5",
-    "uglifyjs-webpack-plugin": "^0.4.6",
     "uuid": "^3.2.1",
-    "w3c-blob": "0.0.1",
+    "w3c-blob": "0.0.1"
-    "watchpack": "^1.4.0",
-    "webpack-sources": "^1.0.1",
-    "yargs": "^8.0.2"
   },
   "description": "A cyberpunk-themed incremental game",
   "devDependencies": {
@@ -47,45 +39,36 @@
     "bundle-loader": "~0.5.0",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
-    "codacy-coverage": "^2.0.1",
+    "css-loader": "^0.28.11",
-    "codecov.io": "^0.1.2",
-    "coffee-loader": "~0.7.1",
-    "coffee-script": "^1.10.0",
-    "coveralls": "^2.11.2",
-    "css-loader": "^0.28.3",
     "es6-promise-polyfill": "^1.1.1",
-    "eslint": "^4.3.0",
+    "eslint": "^4.19.1",
-    "eslint-plugin-node": "^5.1.1",
+    "eslint-plugin-node": "^6.0.1",
-    "express": "~4.13.1",
+    "file-loader": "^1.1.11",
-    "extract-text-webpack-plugin": "^3.0.0",
-    "file-loader": "^0.11.2",
     "i18n-webpack-plugin": "^1.0.0",
     "istanbul": "^0.4.5",
-    "jade": "^1.11.0",
-    "jade-loader": "~0.8.0",
     "js-beautify": "^1.5.10",
-    "less": "^2.5.1",
+    "json5": "^1.0.1",
-    "less-loader": "^4.0.3",
+    "less": "^3.0.4",
-    "lodash": "^4.17.4",
+    "less-loader": "^4.1.0",
+    "lodash": "^4.17.10",
+    "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
     "mocha-lcov-reporter": "^1.0.0",
-    "nsp": "^2.6.1",
+    "nsp": "^3.2.1",
     "raw-loader": "~0.5.0",
-    "react": "^15.2.1",
-    "react-dom": "^15.2.1",
     "script-loader": "~0.7.0",
     "should": "^11.1.1",
-    "simple-git": "^1.65.0",
+    "simple-git": "^1.96.0",
     "sinon": "^2.3.2",
-    "style-loader": "^0.18.1",
+    "source-map": "^0.7.3",
-    "url-loader": "~0.5.0",
+    "style-loader": "^0.21.0",
-    "val-loader": "^1.0.2",
+    "url-loader": "^1.0.1",
-    "vm-browserify": "~0.0.0",
+    "watchpack": "^1.6.0",
-    "webpack": "^4.1.1",
+    "webpack": "^4.12.0",
-    "webpack-cli": "^2.0.12",
+    "webpack-cli": "^3.0.4",
-    "webpack-dev-middleware": "^1.9.0",
+    "webpack-dev-middleware": "^3.1.3",
     "webpack-dev-server": "^3.1.4",
-    "worker-loader": "^0.8.0"
+    "worker-loader": "^2.0.0"
   },
   "engines": {
     "node": ">=4.3.0 <5.0.0 || >=5.10"

src/CompanyManagement.js

@@ -231,7 +231,8 @@ let MaterialSizes = {
     Chemicals:  0.05,
     Drugs:      0.02,
     Robots:     0.5,
-    "AICores": 0.1
+    AICores:    0.1,
+    RealEstate: 0,
 }
 
 function Product(params={}) {
@@ -2334,10 +2335,10 @@ Warehouse.prototype.createMaterialUI = function(mat, matName, parentRefs) {
     //If Market Research upgrades are unlocked, add competition and demand info
     var cmpAndDmdText = "";
     if (company.unlockUpgrades[2] === 1) {
-        cmpAndDmdText += "<br>Competition: " + formatNumber(mat.cmp, 3);
+        cmpAndDmdText += "<br>Demand: " + formatNumber(mat.dmd, 3);
     }
     if (company.unlockUpgrades[3] === 1) {
-        cmpAndDmdText += "<br>Demand: " + formatNumber(mat.dmd, 3);
+        cmpAndDmdText += "<br>Competition: " + formatNumber(mat.cmp, 3);
     }
     var innerTxt = "<p class='tooltip'>" + mat.name + ": " + formatNumber(mat.qty, 3) +
                    "(" + formatNumber(totalGain, 3) +  "/s)" +

src/Constants.js

@@ -43,6 +43,7 @@ let CONSTANTS = {
     /* Netscript Constants */
     //RAM Costs for different commands
     ScriptBaseRamCost:              1.4,
+    ScriptCheatRamCost:            1e21, // if someone tries to cheat by using window or document we just spike the ram cost.
     ScriptWhileRamCost:             0.2,
     ScriptForRamCost:               0.2,
     ScriptIfRamCost:                0.15,

src/Location.js

@@ -11,6 +11,7 @@ import {Player}                                 from "./Player.js";
 import {Server, AllServers, AddToAllServers}    from "./Server.js";
 import {purchaseServer,
         purchaseRamForHomeComputer}             from "./ServerPurchases.js";
+import {Settings}                               from "./Settings.js";
 import {SpecialServerNames, SpecialServerIps}   from "./SpecialServerIps.js";
 
 import {dialogBoxCreate}                        from "../utils/DialogBox.js";
@@ -326,9 +327,9 @@ function displayLocationContent() {
         repGain = repGain[0];
         jobReputation.innerHTML = "Company reputation: " + formatNumber(company.playerReputation, 4) +
                                   "<span class='tooltiptext'>You will earn " +
-                                  formatNumber(repGain, 4) +
+                                  formatNumber(repGain, 0) +
                                   " faction favor upon resetting after installing an Augmentation</span>";
-        companyFavor.innerHTML = "Company Favor: " + formatNumber(company.favor, 4) +
+        companyFavor.innerHTML = "Company Favor: " + formatNumber(company.favor, 0) +
                                  "<span class='tooltiptext'>Company favor increases the rate at which " +
                                  "you earn reputation for this company by 1% per favor. Company favor " +
                                  "is gained whenever you reset after installing an Augmentation. The amount of " +
@@ -2002,11 +2003,13 @@ function purchaseTorRouter() {
     AddToAllServers(darkweb);
     SpecialServerIps.addIp("Darkweb Server", darkweb.ip);
 
-    document.getElementById("location-purchase-tor").setAttribute("class", "a-link-button-inactive");
+    const purchaseTor = document.getElementById("location-purchase-tor");
+    purchaseTor.setAttribute("class", "a-link-button-bought");
+    purchaseTor.innerHTML = "TOR Router - purchased";
 
     Player.getHomeComputer().serversOnNetwork.push(darkweb.ip);
     darkweb.serversOnNetwork.push(Player.getHomeComputer().ip);
-    dialogBoxCreate("You have purchased a Tor router!<br>You now have access to the dark web from your home computer<br>Use the scan/netstat commands to search for the dark web connection.");
+    dialogBoxCreate("You have purchased a Tor router!<br>You now have access to the dark web from your home computer<br>Use the scan/scan-analyze commands to search for the dark web connection.");
 }
 
 function displayUniversityLocationContent(costMult) {
@@ -2144,6 +2147,10 @@ function setJobRequirementTooltip(loc, entryPosType, btn) {
 }
 
 function travelBoxCreate(destCityName, cost) {
+    if(Settings.SuppressTravelConfirmation) {
+        travelToCity(destCityName, cost);
+        return;
+    }
     var yesBtn = yesNoBoxGetYesButton(), noBtn = yesNoBoxGetNoButton();
     yesBtn.innerHTML = "Yes";
     noBtn.innerHTML = "No";

src/NetscriptEvaluator.js

@@ -833,7 +833,9 @@ function runScriptFromScript(server, scriptname, args, workerScript, threads=1)
                 return Promise.resolve(false);
             } else {
                 //Able to run script
+                if(workerScript.disableLogs.ALL == null && workerScript.disableLogs.exec == null && workerScript.disableLogs.run == null && workerScript.disableLogs.spawn == null) {
                     workerScript.scriptRef.log("Running script: " + scriptname + " on " + server.hostname + " with " + threads + " threads and args: " + printArray(args) + ". May take a few seconds to start up...");
+                }
                 var runningScriptObj = new RunningScript(script, args);
                 runningScriptObj.threads = threads;
                 server.runningScripts.push(runningScriptObj);    //Push onto runningScripts

src/NetscriptFunctions.js

@@ -14,6 +14,7 @@ import {CONSTANTS}                                  from "./Constants.js";
 import {Programs}                                   from "./CreateProgram.js";
 import {parseDarkwebItemPrice, DarkWebItems}        from "./DarkWeb.js";
 import {Engine}                                     from "./engine.js";
+import {AllGangs}                                   from "./Gang.js";
 import {Factions, Faction, joinFaction,
         factionExists, purchaseAugmentation}        from "./Faction.js";
 import {getCostOfNextHacknetNode, purchaseHacknet}  from "./HacknetNode.js";
@@ -308,8 +309,10 @@ function NetscriptFunctions(workerScript) {
             }
             return netscriptDelay(growTime, workerScript).then(function() {
                 if (workerScript.env.stopFlag) {return Promise.reject(workerScript);}
+                const moneyBefore = server.moneyAvailable;
                 server.moneyAvailable += (1 * threads); //It can be grown even if it has no money
                 var growthPercentage = processSingleServerGrowth(server, 450 * threads);
+                const moneyAfter = server.moneyAvailable;
                 workerScript.scriptRef.recordGrow(server.ip, threads);
                 var expGain = scriptCalculateExpGain(server) * threads;
                 if (growthPercentage == 1) {
@@ -317,7 +320,7 @@ function NetscriptFunctions(workerScript) {
                 }
                 if (workerScript.disableLogs.ALL == null && workerScript.disableLogs.grow == null) {
                     workerScript.scriptRef.log("Available money on " + server.hostname + " grown by " +
-                                                formatNumber(growthPercentage*100 - 100, 6) + "%. Gained " +
+                                                formatNumber((moneyAfter/moneyBefore)*100 - 100, 6) + "%. Gained " +
                                                 formatNumber(expGain, 4) + " hacking exp (t=" + threads +")");
                 }
                 workerScript.scriptRef.onlineExpGained += expGain;
@@ -948,6 +951,23 @@ function NetscriptFunctions(workerScript) {
             allFiles.sort();
             return allFiles;
         },
+        ps : function(ip=workerScript.serverIp) {
+            if (workerScript.checkingRam) {
+                return updateStaticRam("ps", CONSTANTS.ScriptScanRamCost);
+            }
+            updateDynamicRam("ps", CONSTANTS.ScriptScanRamCost);
+            var server = getServer(ip);
+            if (server == null){
+                workerScript.scriptRef.log("ps() failed. Invalid IP or hostname passed in: " + ip);
+                throw makeRuntimeRejectMsg(workerScript, "ps() failed. Invalid IP or hostname passed in: " + ip);
+            }
+            const processes = [];
+            for(const i in server.runningScripts) {
+                const script = server.runningScripts[i];
+                processes.push({filename:script.filename, threads: script.threads, args: script.args.slice()})
+            }
+            return processes;
+        },
         hasRootAccess : function(ip) {
             if (workerScript.checkingRam) {
                 return updateStaticRam("hasRootAccess", CONSTANTS.ScriptHasRootAccessRamCost);
@@ -2777,6 +2797,12 @@ function NetscriptFunctions(workerScript) {
                 }
             }
 
+            // if the player is in a gang and the target faction is any of the gang faction, fail
+            if(Player.gang != null && AllGangs[name] !== undefined) {
+                workerScript.scriptRef.log("ERROR: Faction specified in workForFaction() does not offer work at the moment.");
+                return;
+            }
+
             if (inMission) {
                 workerScript.scriptRef.log("ERROR: workForFaction() failed because you are in the middle of a mission.");
                 return;

src/Script.js

@@ -448,6 +448,7 @@ function parseOnlyRamCalculate(server, code, workerScript) {
             if (ref == specialReferenceFOR) ram += CONSTANTS.ScriptForRamCost;
             if (ref == specialReferenceWHILE) ram += CONSTANTS.ScriptWhileRamCost;
             if (ref == "hacknetnodes") ram += CONSTANTS.ScriptHacknetNodesRamCost;
+            if (ref == "document" || ref == "window") ram += CONSTANTS.ScriptCheatRamCost;
 
             // Check if this ident is a function in the workerscript env. If it is, then we need to
             // get its RAM cost. We do this by calling it, which works because the running script

src/Settings.js

@@ -7,6 +7,7 @@ let Settings = {
     MaxPortCapacity:                50,
     SuppressMessages:               false,
     SuppressFactionInvites:         false,
+    SuppressTravelConfirmation:     false,
     AutosaveInterval:               60,
     DisableHotkeys:                 false,
     ThemeHighlightColor:            "#ffffff",
@@ -26,6 +27,7 @@ function initSettings()  {
     Settings.MaxPortCapacity = 50;
     Settings.SuppressMessages = false;
     Settings.SuppressFactionInvites = false;
+    Settings.SuppressTravelConfirmation = false,
     Settings.AutosaveInterval = 60;
     Settings.DisableHotkeys = false;
 }
@@ -36,6 +38,7 @@ function setSettingsLabels() {
     var nsPortLimit = document.getElementById("settingsNSPortRangeValLabel");
     var suppressMsgs = document.getElementById("settingsSuppressMessages");
     var suppressFactionInv = document.getElementById("settingsSuppressFactionInvites")
+    var suppressTravelConfirmation = document.getElementById("settingsSuppressTravelConfirmation");
     var autosaveInterval = document.getElementById("settingsAutosaveIntervalValLabel");
     var disableHotkeys = document.getElementById("settingsDisableHotkeys");
 
@@ -45,6 +48,7 @@ function setSettingsLabels() {
     nsPortLimit.innerHTML = Settings.MaxPortCapacity;
     suppressMsgs.checked = Settings.SuppressMessages;
     suppressFactionInv.checked = Settings.SuppressFactionInvites;
+    suppressTravelConfirmation.checked = Settings.suppressTravelConfirmation;
     autosaveInterval.innerHTML = Settings.AutosaveInterval;
     disableHotkeys.checked = Settings.DisableHotkeys;
 
@@ -91,6 +95,10 @@ function setSettingsLabels() {
         Settings.SuppressFactionInvites = this.checked;
     };
 
+    suppressTravelConfirmation.onclick = function() {
+        Settings.SuppressTravelConfirmation = this.checked;
+    };
+
     disableHotkeys.onclick = function() {
         Settings.DisableHotkeys = this.checked;
     }