Merge pull request #139 from danielyxie/bugfixes

FIx PlayerOwnedAugmentation bug
This commit is contained in:
danielyxie 2017-09-25 21:46:33 -05:00 committed by GitHub
commit 5528849a6c
2 changed files with 6 additions and 4 deletions

7
dist/bundle.js vendored

@ -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|" +

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