Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-09-19 20:38:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
danielyxie 2017-09-25 22:32:36 -05:00
commit c84417607f
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/bundle.js vendored
View File

@ -1973,7 +1973,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;
}
@ -26151,7 +26151,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);
}
@ -26172,6 +26172,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);
}
}

4
src/Message.js
View File

@ -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);
}
}

3
src/Player.js
View File

@ -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,