From ca15e689efbbe0b21e6abc425353d60750c5c539 Mon Sep 17 00:00:00 2001 From: danielyxie Date: Mon, 25 Jun 2018 12:29:51 -0500 Subject: [PATCH] More rebalancing of Infiltration. Updating version to v0.39.0 --- dist/engine.bundle.js | 386 +++++++++++++++++++++--------------------- src/Constants.js | 2 +- src/Location.js | 70 ++++---- 3 files changed, 231 insertions(+), 227 deletions(-) diff --git a/dist/engine.bundle.js b/dist/engine.bundle.js index 1acf45161..e556dca19 100644 --- a/dist/engine.bundle.js +++ b/dist/engine.bundle.js @@ -3000,7 +3000,7 @@ function generateRandomString(n) { __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CONSTANTS", function() { return CONSTANTS; }); let CONSTANTS = { - Version: "0.38.1", + Version: "0.39.0", //Max level for any skill, assuming no multipliers. Determined by max numerical value in javascript for experience //and the skill level formula in Player.js. Note that all this means it that when experience hits MAX_INT, then @@ -3970,7 +3970,7 @@ function displayLocationContent() { purchaseHomeRam.style.display = "block"; purchaseHomeCores.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumECorp, - 5400, 116, 150, 8); + 5400, 116, 150, 6); break; case Locations.AevumBachmanAndAssociates: @@ -3983,7 +3983,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumBachmanAndAssociates, - 1350, 42, 60, 5.25); + 1500, 42, 60, 4.1); break; case Locations.AevumClarkeIncorporated: @@ -3996,7 +3996,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumClarkeIncorporated, - 2160, 34, 75, 5); + 2000, 34, 75, 3.6); break; case Locations.AevumFulcrumTechnologies: @@ -4016,7 +4016,7 @@ function displayLocationContent() { purchaseHomeRam.style.display = "block"; purchaseHomeCores.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumFulcrumTechnologies, - 5400, 96, 100, 8.5); + 4600, 96, 100, 6.2); break; case Locations.AevumAeroCorp: @@ -4028,7 +4028,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumAeroCorp, - 1800, 32, 50, 5.9); + 1500, 32, 50, 4.4); break; case Locations.AevumGalacticCybersystems: @@ -4041,7 +4041,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumGalacticCybersystems, - 1400, 30, 50, 4.9); + 1400, 30, 50, 3.95); break; case Locations.AevumWatchdogSecurity: @@ -4055,7 +4055,7 @@ function displayLocationContent() { securityJob.style.display = "block"; agentJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumWatchdogSecurity, - 765, 16, 30, 4); + 765, 20, 30, 3); break; case Locations.AevumRhoConstruction: @@ -4064,7 +4064,7 @@ function displayLocationContent() { softwareJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumRhoConstruction, - 540, 12, 20, 2.5); + 540, 16, 20, 1.9); break; case Locations.AevumPolice: @@ -4073,7 +4073,7 @@ function displayLocationContent() { softwareJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumPolice, - 630, 14, 25, 2.9); + 630, 18, 25, 2.2); break; case Locations.AevumNetLinkTechnologies: @@ -4092,7 +4092,7 @@ function displayLocationContent() { purchaseHomeRam.style.display = "block"; purchaseHomeCores.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumNetLinkTechnologies, - 144, 10, 15, 1.65); + 144, 10, 15, 1.4); break; case Locations.AevumCrushFitnessGym: @@ -4126,7 +4126,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.ChongqingKuaiGongInternational, - 4950, 48, 100, 8.25); + 4950, 100, 100, 6.1); break; case Locations.ChongqingSolarisSpaceSystems: @@ -4138,7 +4138,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.ChongqingSolarisSpaceSystems, - 3240, 26, 75, 8); + 3240, 52, 75, 6); break; @@ -4167,7 +4167,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12MegaCorp, - 6000, 114, 125, 9); + 5000, 114, 125, 6.75); break; case Locations.Sector12BladeIndustries: @@ -4180,7 +4180,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12BladeIndustries, - 2700, 46, 100, 6.2); + 2400, 46, 100, 4.2); break; case Locations.Sector12FourSigma: @@ -4193,7 +4193,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12FourSigma, - 1500, 58, 100, 9.5); + 1500, 58, 100, 7); break; case Locations.Sector12IcarusMicrosystems: @@ -4206,7 +4206,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12IcarusMicrosystems, - 810, 32, 70, 7.1); + 810, 32, 70, 5.4); break; case Locations.Sector12UniversalEnergy: @@ -4219,7 +4219,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12UniversalEnergy, - 775, 24, 50, 5.8); + 775, 24, 50, 4.3); break; case Locations.Sector12DeltaOne: @@ -4231,7 +4231,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12DeltaOne, - 1080, 38, 75, 5.9); + 1080, 38, 75, 4.5); break; case Locations.Sector12CIA: @@ -4244,7 +4244,7 @@ function displayLocationContent() { securityJob.style.display = "block"; agentJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12CIA, - 1305, 44, 80, 6.9); + 1305, 44, 80, 4.6); break; case Locations.Sector12NSA: @@ -4263,13 +4263,13 @@ function displayLocationContent() { nsaBladeburner.innerText = "Enter Bladeburner Headquarters"; } else { setInfiltrateButton(infiltrate, Locations.Sector12NSA, - 1260, 40, 80, 6.7); + 1260, 40, 80, 5); nsaBladeburner.innerText = "Apply to Bladeburner Division"; } nsaBladeburner.style.display = "block"; } else { setInfiltrateButton(infiltrate, Locations.Sector12NSA, - 1260, 40, 80, 6.7); + 1260, 40, 80, 5); } break; @@ -4285,7 +4285,7 @@ function displayLocationContent() { purchaseHomeRam.style.display = "block"; purchaseHomeCores.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12AlphaEnterprises, - 225, 14, 40, 2.5); + 225, 14, 40, 2.25); break; case Locations.Sector12CarmichaelSecurity: @@ -4315,7 +4315,7 @@ function displayLocationContent() { employeeJob.style.display = "block"; employeePartTimeJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12JoesGuns, - 120, 8, 20, 2.2); + 120, 8, 20, 1.8); break; case Locations.Sector12IronGym: @@ -4357,7 +4357,7 @@ function displayLocationContent() { securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.NewTokyoDefComm, - 1170, 28, 70, 5); + 1170, 28, 70, 4); break; case Locations.NewTokyoVitaLife: @@ -4370,7 +4370,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.NewTokyoVitaLife, - 675, 22, 100, 4.7); + 675, 22, 100, 3.5); break; case Locations.NewTokyoGlobalPharmaceuticals: @@ -4384,7 +4384,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.NewTokyoGlobalPharmaceuticals, - 810, 24, 80, 5.1); + 775, 24, 80, 3.8); break; case Locations.NewTokyoNoodleBar: @@ -4424,7 +4424,7 @@ function displayLocationContent() { purchaseHomeRam.style.display = "block"; purchaseHomeCores.style.display = "block"; setInfiltrateButton(infiltrate, Locations.IshimaStormTechnologies, - 630, 24, 100, 5.5); + 630, 24, 100, 4.1); break; case Locations.IshimaNovaMedical: @@ -4437,7 +4437,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.IshimaNovaMedical, - 540, 20, 50, 4.25); + 540, 20, 50, 3.2); break; case Locations.IshimaOmegaSoftware: @@ -4456,7 +4456,7 @@ function displayLocationContent() { purchaseHomeRam.style.display = "block"; purchaseHomeCores.style.display = "block"; setInfiltrateButton(infiltrate, Locations.IshimaOmegaSoftware, - 180, 10, 40, 2.1); + 130, 10, 40, 1.6); break; case Locations.VolhavenTravelAgency: @@ -4489,7 +4489,7 @@ function displayLocationContent() { purchase512gb.style.display = "block"; purchase1tb.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenOmniTekIncorporated, - 1350, 44, 100, 5.9); + 1350, 44, 100, 4.4); break; case Locations.VolhavenNWO: @@ -4514,7 +4514,7 @@ function displayLocationContent() { securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenHeliosLabs, - 1200, 28, 75, 5); + 1200, 28, 75, 3); break; case Locations.VolhavenOmniaCybersystems: @@ -4526,7 +4526,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenOmniaCybersystems, - 810, 28, 90, 5.3); + 810, 28, 90, 4.9); break; case Locations.VolhavenLexoCorp: @@ -4540,7 +4540,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenLexoCorp, - 500, 14, 40, 2.8); + 375, 14, 60, 2); break; case Locations.VolhavenSysCoreSecurities: @@ -4551,7 +4551,7 @@ function displayLocationContent() { securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenSysCoreSecurities, - 540, 16, 50, 3.2); + 480, 18, 75, 2.4); break; case Locations.VolhavenCompuTek: @@ -4573,7 +4573,7 @@ function displayLocationContent() { purchaseHomeRam.style.display = "block"; purchaseHomeCores.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenCompuTek, - 270, 12, 35, 2.75); + 215, 12, 60, 2.1); break; case Locations.VolhavenMilleniumFitnessGym: @@ -17322,22 +17322,25 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _Message_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./Message.js */ 28); /* harmony import */ var _NetscriptEvaluator_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./NetscriptEvaluator.js */ 6); /* harmony import */ var _NetscriptWorker_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./NetscriptWorker.js */ 19); -/* harmony import */ var _Player_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./Player.js */ 0); -/* harmony import */ var _RedPill_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./RedPill.js */ 37); -/* harmony import */ var _Script_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./Script.js */ 25); -/* harmony import */ var _Server_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./Server.js */ 8); -/* harmony import */ var _Settings_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./Settings.js */ 22); -/* harmony import */ var _SpecialServerIps_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./SpecialServerIps.js */ 18); -/* harmony import */ var _TextFile__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./TextFile */ 43); -/* harmony import */ var _TextFile__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(_TextFile__WEBPACK_IMPORTED_MODULE_18__); -/* harmony import */ var _utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../utils/StringHelperFunctions.js */ 2); -/* harmony import */ var _utils_HelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../utils/HelperFunctions.js */ 1); -/* harmony import */ var _utils_LogBox_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../utils/LogBox.js */ 49); -/* harmony import */ var _utils_YesNoBox_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../utils/YesNoBox.js */ 12); -/* harmony import */ var jszip__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! jszip */ 122); -/* harmony import */ var jszip__WEBPACK_IMPORTED_MODULE_23___default = /*#__PURE__*/__webpack_require__.n(jszip__WEBPACK_IMPORTED_MODULE_23__); -/* harmony import */ var file_saver__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! file-saver */ 121); -/* harmony import */ var file_saver__WEBPACK_IMPORTED_MODULE_24___default = /*#__PURE__*/__webpack_require__.n(file_saver__WEBPACK_IMPORTED_MODULE_24__); +/* harmony import */ var numeral_min_numeral_min__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! numeral/min/numeral.min */ 13); +/* harmony import */ var numeral_min_numeral_min__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(numeral_min_numeral_min__WEBPACK_IMPORTED_MODULE_12__); +/* harmony import */ var _Player_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./Player.js */ 0); +/* harmony import */ var _RedPill_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./RedPill.js */ 37); +/* harmony import */ var _Script_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./Script.js */ 25); +/* harmony import */ var _Server_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./Server.js */ 8); +/* harmony import */ var _Settings_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./Settings.js */ 22); +/* harmony import */ var _SpecialServerIps_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./SpecialServerIps.js */ 18); +/* harmony import */ var _TextFile__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./TextFile */ 43); +/* harmony import */ var _TextFile__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(_TextFile__WEBPACK_IMPORTED_MODULE_19__); +/* harmony import */ var _utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../utils/StringHelperFunctions.js */ 2); +/* harmony import */ var _utils_HelperFunctions_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../utils/HelperFunctions.js */ 1); +/* harmony import */ var _utils_LogBox_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../utils/LogBox.js */ 49); +/* harmony import */ var _utils_YesNoBox_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../utils/YesNoBox.js */ 12); +/* harmony import */ var jszip__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! jszip */ 122); +/* harmony import */ var jszip__WEBPACK_IMPORTED_MODULE_24___default = /*#__PURE__*/__webpack_require__.n(jszip__WEBPACK_IMPORTED_MODULE_24__); +/* harmony import */ var file_saver__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! file-saver */ 121); +/* harmony import */ var file_saver__WEBPACK_IMPORTED_MODULE_25___default = /*#__PURE__*/__webpack_require__.n(file_saver__WEBPACK_IMPORTED_MODULE_25__); + @@ -17436,7 +17439,7 @@ $(document).keydown(function(event) { post( "[" + (_Fconf_js__WEBPACK_IMPORTED_MODULE_5__["FconfSettings"].ENABLE_TIMESTAMPS ? Terminal.getTimestamp() + " " : "") + - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().hostname + + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().hostname + " ~]> " + command ); @@ -17634,7 +17637,7 @@ $(document).keyup(function(e) { // index - index of argument that is being "tab completed". By default is 0, the first argument function tabCompletion(command, arg, allPossibilities, index=0) { if (!(allPossibilities.constructor === Array)) {return;} - if (!Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["containsAllStrings"])(allPossibilities)) {return;} + if (!Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["containsAllStrings"])(allPossibilities)) {return;} if (!command.startsWith("./")) { command = command.toLowerCase(); @@ -17669,7 +17672,7 @@ function tabCompletion(command, arg, allPossibilities, index=0) { document.getElementById("terminal-input-text-box").value = val; document.getElementById("terminal-input-text-box").focus(); } else { - var longestStartSubstr = Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["longestCommonStart"])(allPossibilities); + var longestStartSubstr = Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["longestCommonStart"])(allPossibilities); //If the longest common starting substring of remaining possibilities is the same //as whatevers already in terminal, just list all possible options. Otherwise, //change the input in the terminal to the longest common starting substr @@ -17703,7 +17706,7 @@ function tabCompletion(command, arg, allPossibilities, index=0) { function determineAllPossibilitiesForTabCompletion(input, index=0) { var allPos = []; allPos = allPos.concat(Object.keys(_Alias_js__WEBPACK_IMPORTED_MODULE_0__["GlobalAliases"])); - var currServ = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer(); + var currServ = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer(); input = input.toLowerCase(); //If the command starts with './' and the index == -1, then the user @@ -17716,7 +17719,7 @@ function determineAllPossibilitiesForTabCompletion(input, index=0) { } //Programs are on home computer - var homeComputer = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getHomeComputer(); + var homeComputer = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getHomeComputer(); for(var i = 0; i < homeComputer.programs.length; ++i) { allPos.push("./" + homeComputer.programs[i]); } @@ -17741,10 +17744,10 @@ function determineAllPossibilitiesForTabCompletion(input, index=0) { } if (input.startsWith("scp ") && index == 1) { - for (var iphostname in _Server_js__WEBPACK_IMPORTED_MODULE_15__["AllServers"]) { - if (_Server_js__WEBPACK_IMPORTED_MODULE_15__["AllServers"].hasOwnProperty(iphostname)) { - allPos.push(_Server_js__WEBPACK_IMPORTED_MODULE_15__["AllServers"][iphostname].ip); - allPos.push(_Server_js__WEBPACK_IMPORTED_MODULE_15__["AllServers"][iphostname].hostname); + for (var iphostname in _Server_js__WEBPACK_IMPORTED_MODULE_16__["AllServers"]) { + if (_Server_js__WEBPACK_IMPORTED_MODULE_16__["AllServers"].hasOwnProperty(iphostname)) { + allPos.push(_Server_js__WEBPACK_IMPORTED_MODULE_16__["AllServers"][iphostname].ip); + allPos.push(_Server_js__WEBPACK_IMPORTED_MODULE_16__["AllServers"][iphostname].hostname); } } } @@ -17767,7 +17770,7 @@ function determineAllPossibilitiesForTabCompletion(input, index=0) { if (input.startsWith("connect ") || input.startsWith("telnet ")) { //All network connections for (var i = 0; i < currServ.serversOnNetwork.length; ++i) { - var serv = _Server_js__WEBPACK_IMPORTED_MODULE_15__["AllServers"][currServ.serversOnNetwork[i]]; + var serv = _Server_js__WEBPACK_IMPORTED_MODULE_16__["AllServers"][currServ.serversOnNetwork[i]]; if (serv == null) {continue;} allPos.push(serv.ip); //IP allPos.push(serv.hostname); //Hostname @@ -17804,7 +17807,7 @@ function determineAllPossibilitiesForTabCompletion(input, index=0) { allPos.push(currServ.programs[i]); } for (var i = 0; i < currServ.messages.length; ++i) { - if (!(currServ.messages[i] instanceof _Message_js__WEBPACK_IMPORTED_MODULE_9__["Message"]) && Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["isString"])(currServ.messages[i]) && + if (!(currServ.messages[i] instanceof _Message_js__WEBPACK_IMPORTED_MODULE_9__["Message"]) && Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["isString"])(currServ.messages[i]) && currServ.messages[i].endsWith(".lit")) { allPos.push(currServ.messages[i]); } @@ -17822,7 +17825,7 @@ function determineAllPossibilitiesForTabCompletion(input, index=0) { } //Programs are on home computer - var homeComputer = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getHomeComputer(); + var homeComputer = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getHomeComputer(); for(var i = 0; i < homeComputer.programs.length; ++i) { allPos.push(homeComputer.programs[i]); } @@ -17864,7 +17867,7 @@ let Terminal = { resetTerminalInput: function() { document.getElementById("terminal-input-td").innerHTML = - "
[" + _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().hostname + " ~]" + "$
" + + "
[" + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().hostname + " ~]" + "$
" + ''; var hdr = document.getElementById("terminal-input-header"); hdr.style.display = "inline"; @@ -17979,41 +17982,41 @@ let Terminal = { //Complete the hack/analyze command finishHack: function(cancelled = false) { if (cancelled == false) { - var server = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer(); + var server = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer(); //Calculate whether hack was successful - var hackChance = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].calculateHackingChance(); + var hackChance = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].calculateHackingChance(); var rand = Math.random(); console.log("Hack success chance: " + hackChance + ", rand: " + rand); - var expGainedOnSuccess = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].calculateExpGain(); + var expGainedOnSuccess = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].calculateExpGain(); var expGainedOnFailure = (expGainedOnSuccess / 4); if (rand < hackChance) { //Success! - if (_SpecialServerIps_js__WEBPACK_IMPORTED_MODULE_17__["SpecialServerIps"][_SpecialServerIps_js__WEBPACK_IMPORTED_MODULE_17__["SpecialServerNames"].WorldDaemon] && - _SpecialServerIps_js__WEBPACK_IMPORTED_MODULE_17__["SpecialServerIps"][_SpecialServerIps_js__WEBPACK_IMPORTED_MODULE_17__["SpecialServerNames"].WorldDaemon] == server.ip) { - if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].bitNodeN == null) { - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].bitNodeN = 1; + if (_SpecialServerIps_js__WEBPACK_IMPORTED_MODULE_18__["SpecialServerIps"][_SpecialServerIps_js__WEBPACK_IMPORTED_MODULE_18__["SpecialServerNames"].WorldDaemon] && + _SpecialServerIps_js__WEBPACK_IMPORTED_MODULE_18__["SpecialServerIps"][_SpecialServerIps_js__WEBPACK_IMPORTED_MODULE_18__["SpecialServerNames"].WorldDaemon] == server.ip) { + if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].bitNodeN == null) { + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].bitNodeN = 1; } - Object(_RedPill_js__WEBPACK_IMPORTED_MODULE_13__["hackWorldDaemon"])(_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].bitNodeN); + Object(_RedPill_js__WEBPACK_IMPORTED_MODULE_14__["hackWorldDaemon"])(_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].bitNodeN); return; } server.manuallyHacked = true; - var moneyGained = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].calculatePercentMoneyHacked(); + var moneyGained = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].calculatePercentMoneyHacked(); moneyGained = Math.floor(server.moneyAvailable * moneyGained); if (moneyGained <= 0) {moneyGained = 0;} //Safety check server.moneyAvailable -= moneyGained; - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].gainMoney(moneyGained); - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].gainHackingExp(expGainedOnSuccess) - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].gainIntelligenceExp(expGainedOnSuccess / _Constants_js__WEBPACK_IMPORTED_MODULE_1__["CONSTANTS"].IntelligenceTerminalHackBaseExpGain); + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].gainMoney(moneyGained); + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].gainHackingExp(expGainedOnSuccess) + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].gainIntelligenceExp(expGainedOnSuccess / _Constants_js__WEBPACK_IMPORTED_MODULE_1__["CONSTANTS"].IntelligenceTerminalHackBaseExpGain); server.fortify(_Constants_js__WEBPACK_IMPORTED_MODULE_1__["CONSTANTS"].ServerFortifyAmount); - post("Hack successful! Gained $" + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(moneyGained, 2) + " and " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(expGainedOnSuccess, 4) + " hacking EXP"); + post("Hack successful! Gained $" + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(moneyGained, 2) + " and " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(expGainedOnSuccess, 4) + " hacking EXP"); } else { //Failure //Player only gains 25% exp for failure? TODO Can change this later to balance - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].gainHackingExp(expGainedOnFailure) - post("Failed to hack " + server.hostname + ". Gained " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(expGainedOnFailure, 4) + " hacking EXP"); + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].gainHackingExp(expGainedOnFailure) + post("Failed to hack " + server.hostname + ". Gained " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(expGainedOnFailure, 4) + " hacking EXP"); } } @@ -18028,43 +18031,43 @@ let Terminal = { finishAnalyze: function(cancelled = false) { if (cancelled == false) { - post(_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().hostname + ": "); - post("Organization name: " + _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().organizationName); + post(_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().hostname + ": "); + post("Organization name: " + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().organizationName); var rootAccess = ""; - if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().hasAdminRights) {rootAccess = "YES";} + if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().hasAdminRights) {rootAccess = "YES";} else {rootAccess = "NO";} post("Root Access: " + rootAccess); - post("Required hacking skill: " + _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().requiredHackingSkill); - post("Estimated server security level: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(Object(_utils_HelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["addOffset"])(_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().hackDifficulty, 5), 3)); - post("Estimated chance to hack: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(Object(_utils_HelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["addOffset"])(_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].calculateHackingChance() * 100, 5), 2) + "%"); - post("Estimated time to hack: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(Object(_utils_HelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["addOffset"])(_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].calculateHackingTime(), 5), 3) + " seconds"); - post("Estimated total money available on server: $" + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(Object(_utils_HelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["addOffset"])(_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().moneyAvailable, 5), 2)); - post("Required number of open ports for NUKE: " + _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().numOpenPortsRequired); - if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().sshPortOpen) { + post("Required hacking skill: " + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().requiredHackingSkill); + post("Estimated server security level: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(Object(_utils_HelperFunctions_js__WEBPACK_IMPORTED_MODULE_21__["addOffset"])(_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().hackDifficulty, 5), 3)); + post("Estimated chance to hack: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(Object(_utils_HelperFunctions_js__WEBPACK_IMPORTED_MODULE_21__["addOffset"])(_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].calculateHackingChance() * 100, 5), 2) + "%"); + post("Estimated time to hack: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(Object(_utils_HelperFunctions_js__WEBPACK_IMPORTED_MODULE_21__["addOffset"])(_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].calculateHackingTime(), 5), 3) + " seconds"); + post("Estimated total money available on server: $" + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(Object(_utils_HelperFunctions_js__WEBPACK_IMPORTED_MODULE_21__["addOffset"])(_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().moneyAvailable, 5), 2)); + post("Required number of open ports for NUKE: " + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().numOpenPortsRequired); + if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().sshPortOpen) { post("SSH port: Open") } else { post("SSH port: Closed") } - if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().ftpPortOpen) { + if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().ftpPortOpen) { post("FTP port: Open") } else { post("FTP port: Closed") } - if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().smtpPortOpen) { + if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().smtpPortOpen) { post("SMTP port: Open") } else { post("SMTP port: Closed") } - if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().httpPortOpen) { + if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().httpPortOpen) { post("HTTP port: Open") } else { post("HTTP port: Closed") } - if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().sqlPortOpen) { + if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().sqlPortOpen) { post("SQL port: Open") } else { post("SQL port: Closed") @@ -18111,7 +18114,7 @@ let Terminal = { /****************** Interactive Tutorial Terminal Commands ******************/ if (_InteractiveTutorial_js__WEBPACK_IMPORTED_MODULE_7__["iTutorialIsRunning"]) { - var foodnstuffServ = Object(_Server_js__WEBPACK_IMPORTED_MODULE_15__["GetServerByHostname"])("foodnstuff"); + var foodnstuffServ = Object(_Server_js__WEBPACK_IMPORTED_MODULE_16__["GetServerByHostname"])("foodnstuff"); if (foodnstuffServ == null) {throw new Error("Could not get foodnstuff server"); return;} switch(_InteractiveTutorial_js__WEBPACK_IMPORTED_MODULE_7__["currITutorialStep"]) { @@ -18151,9 +18154,9 @@ let Terminal = { if (commandArray.length == 2) { if ((commandArray[0] == "connect") && (commandArray[1] == "foodnstuff" || commandArray[1] == foodnstuffServ.ip)) { - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().isConnectedTo = false; - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].currentServer = foodnstuffServ.ip; - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().isConnectedTo = true; + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().isConnectedTo = false; + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].currentServer = foodnstuffServ.ip; + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().isConnectedTo = true; post("Connected to foodnstuff"); Object(_InteractiveTutorial_js__WEBPACK_IMPORTED_MODULE_7__["iTutorialNextStep"])(); } else {post("Wrong command! Try again!"); return;} @@ -18169,7 +18172,7 @@ let Terminal = { post("Analyzing system..."); hackProgressPost("Time left:"); hackProgressBarPost("["); - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].analyze(); + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].analyze(); //Disable terminal //Terminal.resetTerminalInput(); @@ -18193,7 +18196,7 @@ let Terminal = { Terminal.hackFlag = true; hackProgressPost("Time left:"); hackProgressBarPost("["); - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].hack(); + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].hack(); //Disable terminal //Terminal.resetTerminalInput(); @@ -18225,12 +18228,12 @@ let Terminal = { if (commandArray.length == 2 && commandArray[0] == "tail" && commandArray[1] == "foodnstuff.script") { //Check that the script exists on this machine - var runningScript = Object(_Script_js__WEBPACK_IMPORTED_MODULE_14__["findRunningScript"])("foodnstuff.script", [], _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer()); + var runningScript = Object(_Script_js__WEBPACK_IMPORTED_MODULE_15__["findRunningScript"])("foodnstuff.script", [], _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer()); if (runningScript == null) { post("Error: No such script exists"); return; } - Object(_utils_LogBox_js__WEBPACK_IMPORTED_MODULE_21__["logBoxCreate"])(runningScript); + Object(_utils_LogBox_js__WEBPACK_IMPORTED_MODULE_22__["logBoxCreate"])(runningScript); Object(_InteractiveTutorial_js__WEBPACK_IMPORTED_MODULE_7__["iTutorialNextStep"])(); } else {post("Bad command. Please follow the tutorial");} break; @@ -18244,7 +18247,7 @@ let Terminal = { /****************** END INTERACTIVE TUTORIAL ******************/ /* Command parser */ - var s = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer(); + var s = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer(); switch (commandArray[0].toLowerCase()) { case "alias": if (commandArray.length == 1) { @@ -18274,7 +18277,7 @@ let Terminal = { post("Analyzing system..."); hackProgressPost("Time left:"); hackProgressBarPost("["); - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].analyze(); + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].analyze(); //Disable terminal //Terminal.resetTerminalInput(); @@ -18282,7 +18285,7 @@ let Terminal = { $('input[class=terminal-input]').prop('disabled', true); break; case "buy": - if (_SpecialServerIps_js__WEBPACK_IMPORTED_MODULE_17__["SpecialServerIps"].hasOwnProperty("Darkweb Server")) { + if (_SpecialServerIps_js__WEBPACK_IMPORTED_MODULE_18__["SpecialServerIps"].hasOwnProperty("Darkweb Server")) { Object(_DarkWeb_js__WEBPACK_IMPORTED_MODULE_3__["executeDarkwebTerminalCommand"])(commandArray); } else { post("You need to be able to connect to the Dark Web to use the buy command. (Maybe there's a TOR router you can buy somewhere)"); @@ -18325,12 +18328,12 @@ let Terminal = { } //Can only tail script files - if (Object(_Script_js__WEBPACK_IMPORTED_MODULE_14__["isScriptFilename"])(scriptName) == false) { + if (Object(_Script_js__WEBPACK_IMPORTED_MODULE_15__["isScriptFilename"])(scriptName) == false) { post("Error: tail can only be called on .script files (filename must end with .script)"); return; } //Check that the script exists on this machine - var runningScript = Object(_Script_js__WEBPACK_IMPORTED_MODULE_14__["findRunningScript"])(scriptName, args, s); + var runningScript = Object(_Script_js__WEBPACK_IMPORTED_MODULE_15__["findRunningScript"])(scriptName, args, s); if (runningScript == null) { post("Error: No such script exists"); return; @@ -18355,8 +18358,8 @@ let Terminal = { var ip = commandArray[1]; - for (var i = 0; i < _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().serversOnNetwork.length; i++) { - if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().getServerOnNetwork(i).ip == ip || _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().getServerOnNetwork(i).hostname == ip) { + for (var i = 0; i < _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().serversOnNetwork.length; i++) { + if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().getServerOnNetwork(i).ip == ip || _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().getServerOnNetwork(i).hostname == ip) { Terminal.connectToServer(ip); return; } @@ -18372,7 +18375,7 @@ let Terminal = { var fn = commandArray[1]; if (fn === "*" || fn === "*.script" || fn === "*.txt") { //Download all scripts as a zip - var zip = new jszip__WEBPACK_IMPORTED_MODULE_23__(); + var zip = new jszip__WEBPACK_IMPORTED_MODULE_24__(); if (fn === "*" || fn === "*.script") { for (var i = 0; i < s.scripts.length; ++i) { var file = new Blob([s.scripts[i].code], {type:"text/plain"}); @@ -18397,10 +18400,10 @@ let Terminal = { } zip.generateAsync({type:"blob"}).then(function(content) { - file_saver__WEBPACK_IMPORTED_MODULE_24__["saveAs"](content, filename); + file_saver__WEBPACK_IMPORTED_MODULE_25__["saveAs"](content, filename); }); return; - } else if (Object(_Script_js__WEBPACK_IMPORTED_MODULE_14__["isScriptFilename"])(fn)) { + } else if (Object(_Script_js__WEBPACK_IMPORTED_MODULE_15__["isScriptFilename"])(fn)) { //Download a single script for (var i = 0; i < s.scripts.length; ++i) { if (s.scripts[i].filename === fn) { @@ -18409,7 +18412,7 @@ let Terminal = { } } else if (fn.endsWith(".txt")) { //Download a single text file - var txtFile = Object(_TextFile__WEBPACK_IMPORTED_MODULE_18__["getTextFile"])(fn, s); + var txtFile = Object(_TextFile__WEBPACK_IMPORTED_MODULE_19__["getTextFile"])(fn, s); if (txtFile !== null) { return txtFile.download(); } @@ -18425,17 +18428,17 @@ let Terminal = { } //Hack the current PC (usually for money) //You can't hack your home pc or servers you purchased - if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().purchasedByPlayer) { + if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().purchasedByPlayer) { post("Cannot hack your own machines! You are currently connected to your home PC or one of your purchased servers"); - } else if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().hasAdminRights == false ) { + } else if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().hasAdminRights == false ) { post("You do not have admin rights for this machine! Cannot hack"); - } else if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().requiredHackingSkill > _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].hacking_skill) { + } else if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().requiredHackingSkill > _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].hacking_skill) { post("Your hacking skill is not high enough to attempt hacking this machine. Try analyzing the machine to determine the required hacking skill"); } else { Terminal.hackFlag = true; hackProgressPost("Time left:"); hackProgressBarPost("["); - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].hack(); + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].hack(); //Disable terminal //Terminal.resetTerminalInput(); @@ -18463,9 +18466,9 @@ let Terminal = { if (commandArray.length != 1) { post("Incorrect usage of home command. Usage: home"); return; } - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().isConnectedTo = false; - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].currentServer = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getHomeComputer().ip; - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().isConnectedTo = true; + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().isConnectedTo = false; + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].currentServer = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getHomeComputer().ip; + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().isConnectedTo = true; post("Connected to home"); Terminal.resetTerminalInput(); break; @@ -18474,14 +18477,14 @@ let Terminal = { post("Incorrect usage of hostname command. Usage: hostname"); return; } //Print the hostname of current system - post(_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().hostname); + post(_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().hostname); break; case "ifconfig": if (commandArray.length != 1) { post("Incorrect usage of ifconfig command. Usage: ifconfig"); return; } //Print the IP address of the current system - post(_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().ip); + post(_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().ip); break; case "kill": if (commandArray.length < 2) { @@ -18493,7 +18496,7 @@ let Terminal = { for (var i = 1; i < results.length; ++i) { args.push(results[i]); } - var runningScript = Object(_Script_js__WEBPACK_IMPORTED_MODULE_14__["findRunningScript"])(scriptName, args, s); + var runningScript = Object(_Script_js__WEBPACK_IMPORTED_MODULE_15__["findRunningScript"])(scriptName, args, s); if (runningScript == null) { post("No such script is running. Nothing to kill"); return; @@ -18511,7 +18514,7 @@ let Terminal = { Terminal.executeListCommand(commandArray); break; case "lscpu": - post(_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().cpuCores + " Core(s)"); + post(_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().cpuCores + " Core(s)"); break; case "mem": if (commandArray.length != 2) { @@ -18533,13 +18536,13 @@ let Terminal = { scriptName = results[0]; } - var currServ = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer(); + var currServ = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer(); for (var i = 0; i < currServ.scripts.length; ++i) { if (scriptName == currServ.scripts[i].filename) { var scriptBaseRamUsage = currServ.scripts[i].ramUsage; var ramUsage = scriptBaseRamUsage * numThreads * Math.pow(_Constants_js__WEBPACK_IMPORTED_MODULE_1__["CONSTANTS"].MultithreadingRAMCost, numThreads-1); - post("This script requires " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(ramUsage, 2) + "GB of RAM to run for " + numThreads + " thread(s)"); + post("This script requires " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(ramUsage, 2) + "GB of RAM to run for " + numThreads + " thread(s)"); return; } } @@ -18555,7 +18558,7 @@ let Terminal = { var text = Object(_Fconf_js__WEBPACK_IMPORTED_MODULE_5__["createFconf"])(); _engine_js__WEBPACK_IMPORTED_MODULE_4__["Engine"].loadScriptEditorContent(filename, text); return; - } else if (Object(_Script_js__WEBPACK_IMPORTED_MODULE_14__["isScriptFilename"])(filename)) { + } else if (Object(_Script_js__WEBPACK_IMPORTED_MODULE_15__["isScriptFilename"])(filename)) { for (var i = 0; i < s.scripts.length; i++) { if (filename == s.scripts[i].filename) { _engine_js__WEBPACK_IMPORTED_MODULE_4__["Engine"].loadScriptEditorContent(filename, s.scripts[i].code); @@ -18602,7 +18605,7 @@ let Terminal = { return; } } - } else if (Object(_Script_js__WEBPACK_IMPORTED_MODULE_14__["isScriptFilename"])(delTarget)) { + } else if (Object(_Script_js__WEBPACK_IMPORTED_MODULE_15__["isScriptFilename"])(delTarget)) { for (var i = 0; i < s.scripts.length; ++i) { if (s.scripts[i].filename == delTarget) { //Check that the script isnt currently running @@ -18619,7 +18622,7 @@ let Terminal = { } else if (delTarget.endsWith(".lit")) { for (var i = 0; i < s.messages.length; ++i) { var f = s.messages[i]; - if (!(f instanceof _Message_js__WEBPACK_IMPORTED_MODULE_9__["Message"]) && Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["isString"])(f) && f === delTarget) { + if (!(f instanceof _Message_js__WEBPACK_IMPORTED_MODULE_9__["Message"]) && Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["isString"])(f) && f === delTarget) { s.messages.splice(i, 1); return; } @@ -18678,11 +18681,11 @@ let Terminal = { post("Incorrect usage of scan-analyze command. depth argument must be positive numeric"); return; } - if (depth > 3 && !_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].hasProgram(_CreateProgram_js__WEBPACK_IMPORTED_MODULE_2__["Programs"].DeepscanV1) && - !_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].hasProgram(_CreateProgram_js__WEBPACK_IMPORTED_MODULE_2__["Programs"].DeepscanV2)) { + if (depth > 3 && !_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].hasProgram(_CreateProgram_js__WEBPACK_IMPORTED_MODULE_2__["Programs"].DeepscanV1) && + !_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].hasProgram(_CreateProgram_js__WEBPACK_IMPORTED_MODULE_2__["Programs"].DeepscanV2)) { post("You cannot scan-analyze with that high of a depth. Maximum depth is 3"); return; - } else if (depth > 5 && !_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].hasProgram(_CreateProgram_js__WEBPACK_IMPORTED_MODULE_2__["Programs"].DeepscanV2)) { + } else if (depth > 5 && !_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].hasProgram(_CreateProgram_js__WEBPACK_IMPORTED_MODULE_2__["Programs"].DeepscanV2)) { post("You cannot scan-analyze with that high of a depth. Maximum depth is 5"); return; } else if (depth > 10) { @@ -18705,18 +18708,18 @@ let Terminal = { return; } var scriptname = args[0]; - if (!scriptname.endsWith(".lit") && !Object(_Script_js__WEBPACK_IMPORTED_MODULE_14__["isScriptFilename"])(scriptname) && + if (!scriptname.endsWith(".lit") && !Object(_Script_js__WEBPACK_IMPORTED_MODULE_15__["isScriptFilename"])(scriptname) && !scriptname.endsWith(".txt")){ post("Error: scp only works for .script, .txt, and .lit files"); return; } - var destServer = Object(_Server_js__WEBPACK_IMPORTED_MODULE_15__["getServer"])(args[1]); + var destServer = Object(_Server_js__WEBPACK_IMPORTED_MODULE_16__["getServer"])(args[1]); if (destServer == null) { post("Invalid destination. " + args[1] + " not found"); return; } var ip = destServer.ip; - var currServ = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer(); + var currServ = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer(); //Scp for lit files if (scriptname.endsWith(".lit")) { @@ -18763,7 +18766,7 @@ let Terminal = { return post(scriptname + " copied over to " + destServer.hostname); } } - var newFile = new _TextFile__WEBPACK_IMPORTED_MODULE_18__["TextFile"](txtFile.fn, txtFile.text); + var newFile = new _TextFile__WEBPACK_IMPORTED_MODULE_19__["TextFile"](txtFile.fn, txtFile.text); destServer.textFiles.push(newFile); return post(scriptname + " copied over to " + destServer.hostname); } @@ -18793,7 +18796,7 @@ let Terminal = { } } - var newScript = new _Script_js__WEBPACK_IMPORTED_MODULE_14__["Script"](); + var newScript = new _Script_js__WEBPACK_IMPORTED_MODULE_15__["Script"](); newScript.filename = scriptname; newScript.code = sourceScript.code; newScript.ramUsage = sourceScript.ramUsage; @@ -18806,7 +18809,7 @@ let Terminal = { post("Incorrect number of arguments. Usage: sudov"); return; } - if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().hasAdminRights) { + if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().hasAdminRights) { post("You have ROOT access to this machine"); } else { post("You do NOT have root access to this machine"); @@ -18824,17 +18827,17 @@ let Terminal = { } //Can only tail script files - if (Object(_Script_js__WEBPACK_IMPORTED_MODULE_14__["isScriptFilename"])(scriptName) == false) { + if (Object(_Script_js__WEBPACK_IMPORTED_MODULE_15__["isScriptFilename"])(scriptName) == false) { post("Error: tail can only be called on .script files (filename must end with .script)"); return; } //Check that the script exists on this machine - var runningScript = Object(_Script_js__WEBPACK_IMPORTED_MODULE_14__["findRunningScript"])(scriptName, args, s); + var runningScript = Object(_Script_js__WEBPACK_IMPORTED_MODULE_15__["findRunningScript"])(scriptName, args, s); if (runningScript == null) { post("Error: No such script exists"); return; } - Object(_utils_LogBox_js__WEBPACK_IMPORTED_MODULE_21__["logBoxCreate"])(runningScript); + Object(_utils_LogBox_js__WEBPACK_IMPORTED_MODULE_22__["logBoxCreate"])(runningScript); } break; case "theme": @@ -18860,9 +18863,9 @@ let Terminal = { } else { return post("Theme not found"); } - _Settings_js__WEBPACK_IMPORTED_MODULE_16__["Settings"].ThemeHighlightColor = document.body.style.getPropertyValue("--my-highlight-color"); - _Settings_js__WEBPACK_IMPORTED_MODULE_16__["Settings"].ThemeFontColor = document.body.style.getPropertyValue("--my-font-color"); - _Settings_js__WEBPACK_IMPORTED_MODULE_16__["Settings"].ThemeBackgroundColor = document.body.style.getPropertyValue("--my-background-color"); + _Settings_js__WEBPACK_IMPORTED_MODULE_17__["Settings"].ThemeHighlightColor = document.body.style.getPropertyValue("--my-highlight-color"); + _Settings_js__WEBPACK_IMPORTED_MODULE_17__["Settings"].ThemeFontColor = document.body.style.getPropertyValue("--my-font-color"); + _Settings_js__WEBPACK_IMPORTED_MODULE_17__["Settings"].ThemeBackgroundColor = document.body.style.getPropertyValue("--my-background-color"); } else { var inputBackgroundHex = args[0]; var inputTextHex = args[1]; @@ -18873,9 +18876,9 @@ let Terminal = { document.body.style.setProperty('--my-highlight-color',inputHighlightHex); document.body.style.setProperty('--my-font-color',inputTextHex); document.body.style.setProperty('--my-background-color',inputBackgroundHex); - _Settings_js__WEBPACK_IMPORTED_MODULE_16__["Settings"].ThemeHighlightColor = document.body.style.getPropertyValue("--my-highlight-color"); - _Settings_js__WEBPACK_IMPORTED_MODULE_16__["Settings"].ThemeFontColor = document.body.style.getPropertyValue("--my-font-color"); - _Settings_js__WEBPACK_IMPORTED_MODULE_16__["Settings"].ThemeBackgroundColor = document.body.style.getPropertyValue("--my-background-color"); + _Settings_js__WEBPACK_IMPORTED_MODULE_17__["Settings"].ThemeHighlightColor = document.body.style.getPropertyValue("--my-highlight-color"); + _Settings_js__WEBPACK_IMPORTED_MODULE_17__["Settings"].ThemeFontColor = document.body.style.getPropertyValue("--my-font-color"); + _Settings_js__WEBPACK_IMPORTED_MODULE_17__["Settings"].ThemeBackgroundColor = document.body.style.getPropertyValue("--my-background-color"); } else { return post("Invalid Hex Input for theme"); } @@ -18888,7 +18891,7 @@ let Terminal = { post("Script Threads RAM Usage"); - var currRunningScripts = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().runningScripts; + var currRunningScripts = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().runningScripts; //Iterate through scripts on current server for(var i = 0; i < currRunningScripts.length; i++) { var script = currRunningScripts[i]; @@ -18903,7 +18906,7 @@ let Terminal = { var spacesThread = Array(numSpacesThread+1).join(" "); //Calculate and transform RAM usage - ramUsage = Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(script.scriptRef.ramUsage * script.threads, 2).toString() + "GB"; + ramUsage = Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(script.scriptRef.ramUsage * script.threads, 2).toString() + "GB"; var entry = [script.filename, spacesScript, script.threads, spacesThread, ramUsage]; post(entry.join("")); @@ -18931,16 +18934,16 @@ let Terminal = { connectToServer: function(ip) { console.log("Connect to server called"); - var serv = Object(_Server_js__WEBPACK_IMPORTED_MODULE_15__["getServer"])(ip); + var serv = Object(_Server_js__WEBPACK_IMPORTED_MODULE_16__["getServer"])(ip); if (serv == null) { post("Invalid server. Connection failed."); return; } - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().isConnectedTo = false; - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].currentServer = serv.ip; - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().isConnectedTo = true; + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().isConnectedTo = false; + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].currentServer = serv.ip; + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().isConnectedTo = true; post("Connected to " + serv.hostname); - if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().hostname == "darkweb") { + if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().hostname == "darkweb") { Object(_DarkWeb_js__WEBPACK_IMPORTED_MODULE_3__["checkIfConnectedToDarkweb"])(); //Posts a 'help' message if connecting to dark web } Terminal.resetTerminalInput(); @@ -18968,7 +18971,7 @@ let Terminal = { var allFiles = []; //Get all of the programs and scripts on the machine into one temporary array - var s = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer(); + var s = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer(); for (var i = 0; i < s.programs.length; i++) { if (filter) { if (s.programs[i].includes(filter)) { @@ -19029,9 +19032,9 @@ let Terminal = { } //Displays available network connections using TCP post("Hostname IP Root Access"); - for (var i = 0; i < _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().serversOnNetwork.length; i++) { + for (var i = 0; i < _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().serversOnNetwork.length; i++) { //Add hostname - var entry = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().getServerOnNetwork(i); + var entry = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().getServerOnNetwork(i); if (entry == null) {continue;} entry = entry.hostname; @@ -19039,16 +19042,16 @@ let Terminal = { var numSpaces = 21 - entry.length; var spaces = Array(numSpaces+1).join(" "); entry += spaces; - entry += _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().getServerOnNetwork(i).ip; + entry += _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().getServerOnNetwork(i).ip; //Calculate padding and add root access info var hasRoot; - if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().getServerOnNetwork(i).hasAdminRights) { + if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().getServerOnNetwork(i).hasAdminRights) { hasRoot = 'Y'; } else { hasRoot = 'N'; } - numSpaces = 21 - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().getServerOnNetwork(i).ip.length; + numSpaces = 21 - _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().getServerOnNetwork(i).ip.length; spaces = Array(numSpaces+1).join(" "); entry += spaces; entry += hasRoot; @@ -19061,11 +19064,11 @@ let Terminal = { //TODO Using array as stack for now, can make more efficient post("~~~~~~~~~~ Beginning scan-analyze ~~~~~~~~~~"); post(" "); - var visited = new _Script_js__WEBPACK_IMPORTED_MODULE_14__["AllServersMap"](); + var visited = new _Script_js__WEBPACK_IMPORTED_MODULE_15__["AllServersMap"](); var stack = []; var depthQueue = [0]; - var currServ = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer(); + var currServ = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer(); stack.push(currServ); while(stack.length != 0) { var s = stack.pop(); @@ -19083,7 +19086,7 @@ let Terminal = { } if (d == 0) {continue;} //Don't print current server var titleDashes = Array((d-1) * 4 + 1).join("-"); - if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].hasProgram(_CreateProgram_js__WEBPACK_IMPORTED_MODULE_2__["Programs"].AutoLink)) { + if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].hasProgram(_CreateProgram_js__WEBPACK_IMPORTED_MODULE_2__["Programs"].AutoLink)) { post("" + titleDashes + "> " + s.hostname + "", false); } else { post("" + titleDashes + ">" + s.hostname + ""); @@ -19116,9 +19119,9 @@ let Terminal = { if (commandArray.length != 1) { post("Incorrect usage of free command. Usage: free"); return; } - post("Total: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().maxRam, 2) + " GB"); - post("Used: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().ramUsed, 2) + " GB"); - post("Available: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().maxRam - _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().ramUsed, 2) + " GB"); + post("Total: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().maxRam, 2) + " GB"); + post("Used: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().ramUsed, 2) + " GB"); + post("Available: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().maxRam - _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().ramUsed, 2) + " GB"); }, //First called when the "run [program]" command is called. Checks to see if you @@ -19133,7 +19136,7 @@ let Terminal = { } else { name = programName; } - if (_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].hasProgram(name)) { + if (_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].hasProgram(name)) { Terminal.executeProgram(programName); return; } @@ -19142,7 +19145,7 @@ let Terminal = { //Contains the implementations of all possible programs executeProgram: function(programName) { - var s = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer(); + var s = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer(); var splitArgs = programName.split(" "); if (splitArgs.length > 1) { programName = splitArgs[0]; @@ -19152,9 +19155,9 @@ let Terminal = { if (s.hasAdminRights) { post("You already have root access to this computer. There is no reason to run NUKE.exe"); } else { - if (s.openPortCount >= _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().numOpenPortsRequired) { + if (s.openPortCount >= _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().numOpenPortsRequired) { s.hasAdminRights = true; - post("NUKE successful! Gained root access to " + _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer().hostname); + post("NUKE successful! Gained root access to " + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer().hostname); //TODO Make this take time rather than be instant } else { post("NUKE unsuccessful. Not enough ports have been opened"); @@ -19211,7 +19214,7 @@ let Terminal = { post("Must pass a server hostname or IP as an argument for ServerProfiler.exe"); return; } - var serv = Object(_Server_js__WEBPACK_IMPORTED_MODULE_15__["getServer"])(splitArgs[1]); + var serv = Object(_Server_js__WEBPACK_IMPORTED_MODULE_16__["getServer"])(splitArgs[1]); if (serv == null) { post("Invalid server IP/hostname"); return; @@ -19220,9 +19223,9 @@ let Terminal = { post("Server base security level: " + serv.baseDifficulty); post("Server current security level: " + serv.hackDifficulty); post("Server growth rate: " + serv.serverGrowth); - post("Netscript hack() execution time: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(Object(_NetscriptEvaluator_js__WEBPACK_IMPORTED_MODULE_10__["scriptCalculateHackingTime"])(serv), 1) + "s"); - post("Netscript grow() execution time: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(Object(_NetscriptEvaluator_js__WEBPACK_IMPORTED_MODULE_10__["scriptCalculateGrowTime"])(serv)/1000, 1) + "s"); - post("Netscript weaken() execution time: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(Object(_NetscriptEvaluator_js__WEBPACK_IMPORTED_MODULE_10__["scriptCalculateWeakenTime"])(serv)/1000, 1) + "s"); + post("Netscript hack() execution time: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(Object(_NetscriptEvaluator_js__WEBPACK_IMPORTED_MODULE_10__["scriptCalculateHackingTime"])(serv), 1) + "s"); + post("Netscript grow() execution time: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(Object(_NetscriptEvaluator_js__WEBPACK_IMPORTED_MODULE_10__["scriptCalculateGrowTime"])(serv)/1000, 1) + "s"); + post("Netscript weaken() execution time: " + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["formatNumber"])(Object(_NetscriptEvaluator_js__WEBPACK_IMPORTED_MODULE_10__["scriptCalculateWeakenTime"])(serv)/1000, 1) + "s"); break; case _CreateProgram_js__WEBPACK_IMPORTED_MODULE_2__["Programs"].AutoLink: post("This executable cannot be run."); @@ -19238,30 +19241,31 @@ let Terminal = { post("DeepscanV2.exe lets you run 'scan-analyze' with a depth up to 10."); break; case _CreateProgram_js__WEBPACK_IMPORTED_MODULE_2__["Programs"].Flight: - post("Augmentations: " + _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].augmentations.length + " / 30"); - post("Money: $" + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].money.toNumber(), 2) + " / $" + Object(_utils_StringHelperFunctions_js__WEBPACK_IMPORTED_MODULE_19__["formatNumber"])(100000000000, 2)); + post("Augmentations: " + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].augmentations.length + " / 30"); + + post("Money: " + numeral_min_numeral_min__WEBPACK_IMPORTED_MODULE_12___default()(_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].money.toNumber()).format('($0.000a)') + " / " + numeral_min_numeral_min__WEBPACK_IMPORTED_MODULE_12___default()(1e11).format('($0.000a)')); post("One path below must be fulfilled..."); post("----------HACKING PATH----------"); - post("Hacking skill: " + _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].hacking_skill + " / 2500"); + post("Hacking skill: " + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].hacking_skill + " / 2500"); post("----------COMBAT PATH----------"); - post("Strength: " + _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].strength + " / 1500"); - post("Defense: " + _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].defense + " / 1500"); - post("Dexterity: " + _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].dexterity + " / 1500"); - post("Agility: " + _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].agility + " / 1500"); + post("Strength: " + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].strength + " / 1500"); + post("Defense: " + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].defense + " / 1500"); + post("Dexterity: " + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].dexterity + " / 1500"); + post("Agility: " + _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].agility + " / 1500"); break; case _CreateProgram_js__WEBPACK_IMPORTED_MODULE_2__["Programs"].BitFlume: - var yesBtn = Object(_utils_YesNoBox_js__WEBPACK_IMPORTED_MODULE_22__["yesNoBoxGetYesButton"])(), - noBtn = Object(_utils_YesNoBox_js__WEBPACK_IMPORTED_MODULE_22__["yesNoBoxGetNoButton"])(); + var yesBtn = Object(_utils_YesNoBox_js__WEBPACK_IMPORTED_MODULE_23__["yesNoBoxGetYesButton"])(), + noBtn = Object(_utils_YesNoBox_js__WEBPACK_IMPORTED_MODULE_23__["yesNoBoxGetNoButton"])(); yesBtn.innerHTML = "Travel to BitNode Nexus"; noBtn.innerHTML = "Cancel"; yesBtn.addEventListener("click", function() { - Object(_RedPill_js__WEBPACK_IMPORTED_MODULE_13__["hackWorldDaemon"])(_Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].bitNodeN, true); - return Object(_utils_YesNoBox_js__WEBPACK_IMPORTED_MODULE_22__["yesNoBoxClose"])(); + Object(_RedPill_js__WEBPACK_IMPORTED_MODULE_14__["hackWorldDaemon"])(_Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].bitNodeN, true); + return Object(_utils_YesNoBox_js__WEBPACK_IMPORTED_MODULE_23__["yesNoBoxClose"])(); }); noBtn.addEventListener("click", function() { - return Object(_utils_YesNoBox_js__WEBPACK_IMPORTED_MODULE_22__["yesNoBoxClose"])(); + return Object(_utils_YesNoBox_js__WEBPACK_IMPORTED_MODULE_23__["yesNoBoxClose"])(); }); - Object(_utils_YesNoBox_js__WEBPACK_IMPORTED_MODULE_22__["yesNoBoxCreate"])("WARNING: USING THIS PROGRAM WILL CAUSE YOU TO LOSE ALL OF YOUR PROGRESS ON THE CURRENT BITNODE.

" + + Object(_utils_YesNoBox_js__WEBPACK_IMPORTED_MODULE_23__["yesNoBoxCreate"])("WARNING: USING THIS PROGRAM WILL CAUSE YOU TO LOSE ALL OF YOUR PROGRESS ON THE CURRENT BITNODE.

" + "Do you want to travel to the BitNode Nexus? This allows you to reset the current BitNode " + "and select a new one."); @@ -19273,7 +19277,7 @@ let Terminal = { }, runScript: function(scriptName) { - var server = _Player_js__WEBPACK_IMPORTED_MODULE_12__["Player"].getCurrentServer(); + var server = _Player_js__WEBPACK_IMPORTED_MODULE_13__["Player"].getCurrentServer(); var numThreads = 1; var args = []; @@ -19331,7 +19335,7 @@ let Terminal = { //Check if this script is already running - if (Object(_Script_js__WEBPACK_IMPORTED_MODULE_14__["findRunningScript"])(scriptName, args, server) != null) { + if (Object(_Script_js__WEBPACK_IMPORTED_MODULE_15__["findRunningScript"])(scriptName, args, server) != null) { post("ERROR: This script is already running. Cannot run multiple instances"); return; } @@ -19353,9 +19357,9 @@ let Terminal = { return; } else { //Able to run script - post("Running script with " + numThreads + " thread(s) and args: " + Object(_utils_HelperFunctions_js__WEBPACK_IMPORTED_MODULE_20__["printArray"])(args) + "."); + post("Running script with " + numThreads + " thread(s) and args: " + Object(_utils_HelperFunctions_js__WEBPACK_IMPORTED_MODULE_21__["printArray"])(args) + "."); post("May take a few seconds to start up the process..."); - var runningScriptObj = new _Script_js__WEBPACK_IMPORTED_MODULE_14__["RunningScript"](script, args); + var runningScriptObj = new _Script_js__WEBPACK_IMPORTED_MODULE_15__["RunningScript"](script, args); runningScriptObj.threads = numThreads; server.runningScripts.push(runningScriptObj); diff --git a/src/Constants.js b/src/Constants.js index 4a5851040..083900d9f 100644 --- a/src/Constants.js +++ b/src/Constants.js @@ -1,5 +1,5 @@ let CONSTANTS = { - Version: "0.38.1", + Version: "0.39.0", //Max level for any skill, assuming no multipliers. Determined by max numerical value in javascript for experience //and the skill level formula in Player.js. Note that all this means it that when experience hits MAX_INT, then diff --git a/src/Location.js b/src/Location.js index 3a41679b4..194f390c6 100644 --- a/src/Location.js +++ b/src/Location.js @@ -432,7 +432,7 @@ function displayLocationContent() { purchaseHomeRam.style.display = "block"; purchaseHomeCores.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumECorp, - 5400, 116, 150, 8); + 5400, 116, 150, 6); break; case Locations.AevumBachmanAndAssociates: @@ -445,7 +445,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumBachmanAndAssociates, - 1350, 42, 60, 5.25); + 1500, 42, 60, 4.1); break; case Locations.AevumClarkeIncorporated: @@ -458,7 +458,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumClarkeIncorporated, - 2160, 34, 75, 5); + 2000, 34, 75, 3.6); break; case Locations.AevumFulcrumTechnologies: @@ -478,7 +478,7 @@ function displayLocationContent() { purchaseHomeRam.style.display = "block"; purchaseHomeCores.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumFulcrumTechnologies, - 5400, 96, 100, 8.5); + 4600, 96, 100, 6.2); break; case Locations.AevumAeroCorp: @@ -490,7 +490,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumAeroCorp, - 1800, 32, 50, 5.9); + 1500, 32, 50, 4.4); break; case Locations.AevumGalacticCybersystems: @@ -503,7 +503,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumGalacticCybersystems, - 1400, 30, 50, 4.9); + 1400, 30, 50, 3.95); break; case Locations.AevumWatchdogSecurity: @@ -517,7 +517,7 @@ function displayLocationContent() { securityJob.style.display = "block"; agentJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumWatchdogSecurity, - 765, 16, 30, 4); + 765, 20, 30, 3); break; case Locations.AevumRhoConstruction: @@ -526,7 +526,7 @@ function displayLocationContent() { softwareJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumRhoConstruction, - 540, 12, 20, 2.5); + 540, 16, 20, 1.9); break; case Locations.AevumPolice: @@ -535,7 +535,7 @@ function displayLocationContent() { softwareJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumPolice, - 630, 14, 25, 2.9); + 630, 18, 25, 2.2); break; case Locations.AevumNetLinkTechnologies: @@ -554,7 +554,7 @@ function displayLocationContent() { purchaseHomeRam.style.display = "block"; purchaseHomeCores.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumNetLinkTechnologies, - 144, 10, 15, 1.65); + 144, 10, 15, 1.4); break; case Locations.AevumCrushFitnessGym: @@ -588,7 +588,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.ChongqingKuaiGongInternational, - 4950, 48, 100, 8.25); + 4950, 100, 100, 6.1); break; case Locations.ChongqingSolarisSpaceSystems: @@ -600,7 +600,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.ChongqingSolarisSpaceSystems, - 3240, 26, 75, 8); + 3240, 52, 75, 6); break; @@ -629,7 +629,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12MegaCorp, - 6000, 114, 125, 9); + 5000, 114, 125, 6.75); break; case Locations.Sector12BladeIndustries: @@ -642,7 +642,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12BladeIndustries, - 2700, 46, 100, 6.2); + 2400, 46, 100, 4.2); break; case Locations.Sector12FourSigma: @@ -655,7 +655,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12FourSigma, - 1500, 58, 100, 9.5); + 1500, 58, 100, 7); break; case Locations.Sector12IcarusMicrosystems: @@ -668,7 +668,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12IcarusMicrosystems, - 810, 32, 70, 7.1); + 810, 32, 70, 5.4); break; case Locations.Sector12UniversalEnergy: @@ -681,7 +681,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12UniversalEnergy, - 775, 24, 50, 5.8); + 775, 24, 50, 4.3); break; case Locations.Sector12DeltaOne: @@ -693,7 +693,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12DeltaOne, - 1080, 38, 75, 5.9); + 1080, 38, 75, 4.5); break; case Locations.Sector12CIA: @@ -706,7 +706,7 @@ function displayLocationContent() { securityJob.style.display = "block"; agentJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12CIA, - 1305, 44, 80, 6.9); + 1305, 44, 80, 4.6); break; case Locations.Sector12NSA: @@ -725,13 +725,13 @@ function displayLocationContent() { nsaBladeburner.innerText = "Enter Bladeburner Headquarters"; } else { setInfiltrateButton(infiltrate, Locations.Sector12NSA, - 1260, 40, 80, 6.7); + 1260, 40, 80, 5); nsaBladeburner.innerText = "Apply to Bladeburner Division"; } nsaBladeburner.style.display = "block"; } else { setInfiltrateButton(infiltrate, Locations.Sector12NSA, - 1260, 40, 80, 6.7); + 1260, 40, 80, 5); } break; @@ -747,7 +747,7 @@ function displayLocationContent() { purchaseHomeRam.style.display = "block"; purchaseHomeCores.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12AlphaEnterprises, - 225, 14, 40, 2.5); + 225, 14, 40, 2.25); break; case Locations.Sector12CarmichaelSecurity: @@ -777,7 +777,7 @@ function displayLocationContent() { employeeJob.style.display = "block"; employeePartTimeJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12JoesGuns, - 120, 8, 20, 2.2); + 120, 8, 20, 1.8); break; case Locations.Sector12IronGym: @@ -819,7 +819,7 @@ function displayLocationContent() { securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.NewTokyoDefComm, - 1170, 28, 70, 5); + 1170, 28, 70, 4); break; case Locations.NewTokyoVitaLife: @@ -832,7 +832,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.NewTokyoVitaLife, - 675, 22, 100, 4.7); + 675, 22, 100, 3.5); break; case Locations.NewTokyoGlobalPharmaceuticals: @@ -846,7 +846,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.NewTokyoGlobalPharmaceuticals, - 810, 24, 80, 5.1); + 775, 24, 80, 3.8); break; case Locations.NewTokyoNoodleBar: @@ -886,7 +886,7 @@ function displayLocationContent() { purchaseHomeRam.style.display = "block"; purchaseHomeCores.style.display = "block"; setInfiltrateButton(infiltrate, Locations.IshimaStormTechnologies, - 630, 24, 100, 5.5); + 630, 24, 100, 4.1); break; case Locations.IshimaNovaMedical: @@ -899,7 +899,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.IshimaNovaMedical, - 540, 20, 50, 4.25); + 540, 20, 50, 3.2); break; case Locations.IshimaOmegaSoftware: @@ -918,7 +918,7 @@ function displayLocationContent() { purchaseHomeRam.style.display = "block"; purchaseHomeCores.style.display = "block"; setInfiltrateButton(infiltrate, Locations.IshimaOmegaSoftware, - 180, 10, 40, 2.1); + 130, 10, 40, 1.6); break; case Locations.VolhavenTravelAgency: @@ -951,7 +951,7 @@ function displayLocationContent() { purchase512gb.style.display = "block"; purchase1tb.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenOmniTekIncorporated, - 1350, 44, 100, 5.9); + 1350, 44, 100, 4.4); break; case Locations.VolhavenNWO: @@ -976,7 +976,7 @@ function displayLocationContent() { securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenHeliosLabs, - 1200, 28, 75, 5); + 1200, 28, 75, 3); break; case Locations.VolhavenOmniaCybersystems: @@ -988,7 +988,7 @@ function displayLocationContent() { networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenOmniaCybersystems, - 810, 28, 90, 5.3); + 810, 28, 90, 4.9); break; case Locations.VolhavenLexoCorp: @@ -1002,7 +1002,7 @@ function displayLocationContent() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenLexoCorp, - 500, 14, 40, 2.8); + 375, 14, 60, 2); break; case Locations.VolhavenSysCoreSecurities: @@ -1013,7 +1013,7 @@ function displayLocationContent() { securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenSysCoreSecurities, - 540, 16, 50, 3.2); + 480, 18, 75, 2.4); break; case Locations.VolhavenCompuTek: @@ -1035,7 +1035,7 @@ function displayLocationContent() { purchaseHomeRam.style.display = "block"; purchaseHomeCores.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenCompuTek, - 270, 12, 35, 2.75); + 215, 12, 60, 2.1); break; case Locations.VolhavenMilleniumFitnessGym: