From a742d33a115d177067df7c093927baae385a3792 Mon Sep 17 00:00:00 2001 From: danielyxie Date: Mon, 25 Sep 2017 07:55:58 -0500 Subject: [PATCH 1/2] Forced Red Pill messages only happen if youve never destroyed a BitNode --- dist/bundle.js | 4 +++- src/Message.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index 08fa91c4e..a9bf27ce8 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -26018,7 +26018,7 @@ function checkForMessagesToSend() { redpillOwned = true; } - if (redpill && redpillOwned) { + if (redpill && redpillOwned && __WEBPACK_IMPORTED_MODULE_2__Player_js__["a" /* Player */].sourceFiles.length === 0) { if (!__WEBPACK_IMPORTED_MODULE_5__utils_DialogBox_js__["b" /* dialogBoxOpened */]) { sendMessage(redpill, true); } @@ -26039,6 +26039,8 @@ function checkForMessagesToSend() { sendMessage(jumper4); } else if (bitrunnersTest && !bitrunnersTest.recvd && __WEBPACK_IMPORTED_MODULE_2__Player_js__["a" /* Player */].hacking_skill >= 500) { sendMessage(bitrunnersTest); + } else if (redpill && redpillOwned) { + sendMessage(redpill); } } diff --git a/src/Message.js b/src/Message.js index 9ed99d3b4..94096bec3 100644 --- a/src/Message.js +++ b/src/Message.js @@ -75,7 +75,7 @@ function checkForMessagesToSend() { redpillOwned = true; } - if (redpill && redpillOwned) { + if (redpill && redpillOwned && Player.sourceFiles.length === 0) { if (!dialogBoxOpened) { sendMessage(redpill, true); } @@ -96,6 +96,8 @@ function checkForMessagesToSend() { sendMessage(jumper4); } else if (bitrunnersTest && !bitrunnersTest.recvd && Player.hacking_skill >= 500) { sendMessage(bitrunnersTest); + } else if (redpill && redpillOwned) { + sendMessage(redpill); } } From ce49eee37f63c6bf399bdb97a1ed5b2e4b3d80ca Mon Sep 17 00:00:00 2001 From: danielyxie Date: Mon, 25 Sep 2017 21:45:46 -0500 Subject: [PATCH 2/2] FIx PlayerOwnedAugmentation bug --- dist/bundle.js | 7 ++++--- src/Player.js | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index a9bf27ce8..994da7d1d 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -1964,7 +1964,7 @@ PlayerObject.prototype.reapplyAllAugmentations = function(resetMultipliers=true) for (let i = 0; i < this.augmentations.length; ++i) { //Compatibility with new version if (typeof this.augmentations[i] === 'string' || this.augmentations[i] instanceof String) { - var newOwnedAug = new PlayerOwnedAugmentation(this.augmentations[i]); + var newOwnedAug = new __WEBPACK_IMPORTED_MODULE_0__Augmentations_js__["d" /* PlayerOwnedAugmentation */](this.augmentations[i]); if (this.augmentations[i] == __WEBPACK_IMPORTED_MODULE_0__Augmentations_js__["b" /* AugmentationNames */].NeuroFluxGovernor) { newOwnedAug.level = __WEBPACK_IMPORTED_MODULE_0__Augmentations_js__["c" /* Augmentations */][__WEBPACK_IMPORTED_MODULE_0__Augmentations_js__["b" /* AugmentationNames */].NeuroFluxGovernor].level; } @@ -60256,11 +60256,12 @@ var NetscriptHighlightRules = function(options) { "SyntaxError|TypeError|URIError|" + "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" + // Non-constructor functions "isNaN|parseFloat|parseInt|" + - "hack|sleep|grow|wewaken|print|tprint|scan|nuke|brutessh|ftpcrack|" + //Netscript functions + "hack|sleep|grow|weaken|print|tprint|scan|nuke|brutessh|ftpcrack|" + //Netscript functions "relaysmtp|httpworm|sqlinject|run|exec|kill|killall|scp|ls|hasRootAccess|" + - "getIp|getHackingMultipliers|getBitNodeMultipliers|" + + "getIp|getHackingMultipliers|getBitNodeMultipliers|" + "getHostname|getHackingLevel|getServerMoneyAvailable|getServerMaxMoney|" + "getServerGrowth|getServerSecurityLevel|getServerBaseSecurityLevel|" + + "getServerMinSecurityLevel|" + "getServerRequiredHackingLevel|getServerNumPortsRequired|getServerRam|" + "serverExists|fileExists|isRunning|getNextHacknetNodeCost|" + "purchaseHacknetNode|" + diff --git a/src/Player.js b/src/Player.js index 99ca2c18f..eb84000df 100644 --- a/src/Player.js +++ b/src/Player.js @@ -1,5 +1,6 @@ import {Augmentations, applyAugmentation, - AugmentationNames} from "./Augmentations.js"; + AugmentationNames, + PlayerOwnedAugmentation} from "./Augmentations.js"; import {BitNodes, BitNode, BitNodeMultipliers} from "./BitNode.js"; import {Company, Companies, getNextCompanyPosition, getJobRequirementText, CompanyPosition,