diff --git a/dist/engine.bundle.js b/dist/engine.bundle.js index 9cd486479..fdbcf55b2 100644 --- a/dist/engine.bundle.js +++ b/dist/engine.bundle.js @@ -177,7 +177,7 @@ /* harmony import */ var _Company_GetNextCompanyPosition__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_Company_GetNextCompanyPosition__WEBPACK_IMPORTED_MODULE_5__); /* harmony import */ var _Company_GetJobRequirementText__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./Company/GetJobRequirementText */ 85); /* harmony import */ var _Company_GetJobRequirementText__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_Company_GetJobRequirementText__WEBPACK_IMPORTED_MODULE_6__); -/* harmony import */ var _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./Company/CompanyPositions */ 25); +/* harmony import */ var _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./Company/CompanyPositions */ 26); /* harmony import */ var _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_7__); /* harmony import */ var _Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./Company/data/CompanyPositionNames */ 34); /* harmony import */ var _Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8__); @@ -1316,7 +1316,7 @@ PlayerObject.prototype.getWorkStrExpGain = function() { return 0; } - return this.companyPosition.strengthExpGain * company.expMultiplier * this.strength_exp_mult * _BitNodeMultipliers__WEBPACK_IMPORTED_MODULE_1__["BitNodeMultipliers"].CompanyWorkExpGain; + return companyPosition.strengthExpGain * company.expMultiplier * this.strength_exp_mult * _BitNodeMultipliers__WEBPACK_IMPORTED_MODULE_1__["BitNodeMultipliers"].CompanyWorkExpGain; } //Def exp gained per game cycle @@ -1330,7 +1330,7 @@ PlayerObject.prototype.getWorkDefExpGain = function() { return 0; } - return this.companyPosition.defenseExpGain * company.expMultiplier * this.defense_exp_mult * _BitNodeMultipliers__WEBPACK_IMPORTED_MODULE_1__["BitNodeMultipliers"].CompanyWorkExpGain; + return companyPosition.defenseExpGain * company.expMultiplier * this.defense_exp_mult * _BitNodeMultipliers__WEBPACK_IMPORTED_MODULE_1__["BitNodeMultipliers"].CompanyWorkExpGain; } //Dex exp gained per game cycle @@ -1344,7 +1344,7 @@ PlayerObject.prototype.getWorkDexExpGain = function() { return 0; } - return this.companyPosition.dexterityExpGain * company.expMultiplier * this.dexterity_exp_mult * _BitNodeMultipliers__WEBPACK_IMPORTED_MODULE_1__["BitNodeMultipliers"].CompanyWorkExpGain; + return companyPosition.dexterityExpGain * company.expMultiplier * this.dexterity_exp_mult * _BitNodeMultipliers__WEBPACK_IMPORTED_MODULE_1__["BitNodeMultipliers"].CompanyWorkExpGain; } //Agi exp gained per game cycle @@ -1358,7 +1358,7 @@ PlayerObject.prototype.getWorkAgiExpGain = function() { return 0; } - return this.companyPosition.agilityExpGain * company.expMultiplier * this.agility_exp_mult * _BitNodeMultipliers__WEBPACK_IMPORTED_MODULE_1__["BitNodeMultipliers"].CompanyWorkExpGain; + return companyPosition.agilityExpGain * company.expMultiplier * this.agility_exp_mult * _BitNodeMultipliers__WEBPACK_IMPORTED_MODULE_1__["BitNodeMultipliers"].CompanyWorkExpGain; } //Charisma exp gained per game cycle @@ -1372,7 +1372,7 @@ PlayerObject.prototype.getWorkChaExpGain = function() { return 0; } - return this.companyPosition.charismaExpGain * company.expMultiplier * this.charisma_exp_mult * _BitNodeMultipliers__WEBPACK_IMPORTED_MODULE_1__["BitNodeMultipliers"].CompanyWorkExpGain; + return companyPosition.charismaExpGain * company.expMultiplier * this.charisma_exp_mult * _BitNodeMultipliers__WEBPACK_IMPORTED_MODULE_1__["BitNodeMultipliers"].CompanyWorkExpGain; } //Reputation gained per game cycle @@ -1386,9 +1386,9 @@ PlayerObject.prototype.getWorkRepGain = function() { return 0; } - var jobPerformance = this.companyPosition.calculateJobPerformance(this.hacking_skill, this.strength, - this.defense, this.dexterity, - this.agility, this.charisma); + var jobPerformance = companyPosition.calculateJobPerformance(this.hacking_skill, this.strength, + this.defense, this.dexterity, + this.agility, this.charisma); //Intelligence provides a flat bonus to job performance jobPerformance += (this.intelligence / _Constants__WEBPACK_IMPORTED_MODULE_9__["CONSTANTS"].MaxSkillLevel); @@ -1945,8 +1945,8 @@ PlayerObject.prototype.applyForJob = function(entryPosType, sing=false) { if (currCompany.name != company.name) { leaveCompany = true; oldCompanyName = currCompany.name; - company.playerReputation -= 1000; - if (company.playerReputation < 0) { company.playerReputation = 0; } + currCompany.playerReputation -= 1000; + if (currCompany.playerReputation < 0) { currCompany.playerReputation = 0; } } } @@ -1971,8 +1971,8 @@ PlayerObject.prototype.applyForJob = function(entryPosType, sing=false) { //Returns your next position at a company given the field (software, business, etc.) PlayerObject.prototype.getNextCompanyPosition = function(company, entryPosType) { var currCompany = null; - if (this.name !== "") { - currCompany = _Company_Companies__WEBPACK_IMPORTED_MODULE_4__["Companies"][this.name]; + if (this.companyName !== "") { + currCompany = _Company_Companies__WEBPACK_IMPORTED_MODULE_4__["Companies"][this.companyName]; } //Not employed at this company, so return the entry position @@ -2059,8 +2059,8 @@ PlayerObject.prototype.applyForAgentJob = function(sing=false) { PlayerObject.prototype.applyForEmployeeJob = function(sing=false) { var company = _Company_Companies__WEBPACK_IMPORTED_MODULE_4__["Companies"][this.location]; //Company being applied to if (this.isQualified(company, _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_7__["CompanyPositions"][_Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8__["MiscCompanyPositions"][1]])) { - this.companyName = company.companyName; - this.companyPosition = _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_7__["CompanyPositions"][_Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8__["MiscCompanyPositions"][1]]; + this.companyName = company.name; + this.companyPosition = _Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8__["MiscCompanyPositions"][1]; document.getElementById("world-menu-header").click(); document.getElementById("world-menu-header").click(); if (sing) {return true;} @@ -2075,8 +2075,8 @@ PlayerObject.prototype.applyForEmployeeJob = function(sing=false) { PlayerObject.prototype.applyForPartTimeEmployeeJob = function(sing=false) { var company = _Company_Companies__WEBPACK_IMPORTED_MODULE_4__["Companies"][this.location]; //Company being applied to if (this.isQualified(company, _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_7__["CompanyPositions"][_Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8__["PartTimeCompanyPositions"][1]])) { - this.companyName = company.companyName; - this.companyPosition = _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_7__["CompanyPositions"][_Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8__["PartTimeCompanyPositions"][1]]; + this.companyName = company.name; + this.companyPosition = _Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8__["PartTimeCompanyPositions"][1]; document.getElementById("world-menu-header").click(); document.getElementById("world-menu-header").click(); if (sing) {return true;} @@ -2091,8 +2091,8 @@ PlayerObject.prototype.applyForPartTimeEmployeeJob = function(sing=false) { PlayerObject.prototype.applyForWaiterJob = function(sing=false) { var company = _Company_Companies__WEBPACK_IMPORTED_MODULE_4__["Companies"][this.location]; //Company being applied to if (this.isQualified(company, _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_7__["CompanyPositions"][_Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8__["MiscCompanyPositions"][0]])) { - this.companyName = company.companyName; - this.companyPosition = _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_7__["CompanyPositions"][_Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8__["MiscCompanyPositions"][0]]; + this.companyName = company.name; + this.companyPosition = _Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8__["MiscCompanyPositions"][0]; document.getElementById("world-menu-header").click(); document.getElementById("world-menu-header").click(); if (sing) {return true;} @@ -2107,8 +2107,8 @@ PlayerObject.prototype.applyForWaiterJob = function(sing=false) { PlayerObject.prototype.applyForPartTimeWaiterJob = function(sing=false) { var company = _Company_Companies__WEBPACK_IMPORTED_MODULE_4__["Companies"][this.location]; //Company being applied to if (this.isQualified(company, _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_7__["CompanyPositions"][_Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8__["PartTimeCompanyPositions"][0]])) { - this.companyName = company.companyName; - this.companyPosition = _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_7__["CompanyPositions"][_Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8__["PartTimeCompanyPositions"][0]]; + this.companyName = company.name; + this.companyPosition = _Company_data_CompanyPositionNames__WEBPACK_IMPORTED_MODULE_8__["PartTimeCompanyPositions"][0]; document.getElementById("world-menu-header").click(); document.getElementById("world-menu-header").click(); if (sing) {return true;} @@ -3100,6 +3100,9 @@ exports.CONSTANTS = { * Gang Changes: ** UI now displays your chance to win a clash with other gangs ** Added getChanceToWinClash() function to the Gang API + + * Added the terminal command 'expr', which can be used to evaluate simple mathematical expressions + * Bug Fix: scp() should no longer throw errors when used with 2-arguments and an array of files ` }; @@ -3403,33 +3406,33 @@ exports.generateRandomString = generateRandomString; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return numeralWrapper; }); /* harmony import */ var numeral__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! numeral */ 68); /* harmony import */ var numeral__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(numeral__WEBPACK_IMPORTED_MODULE_0__); -/* harmony import */ var numeral_locales_bg__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! numeral/locales/bg */ 257); +/* harmony import */ var numeral_locales_bg__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! numeral/locales/bg */ 256); /* harmony import */ var numeral_locales_bg__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(numeral_locales_bg__WEBPACK_IMPORTED_MODULE_1__); -/* harmony import */ var numeral_locales_cs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! numeral/locales/cs */ 256); +/* harmony import */ var numeral_locales_cs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! numeral/locales/cs */ 255); /* harmony import */ var numeral_locales_cs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(numeral_locales_cs__WEBPACK_IMPORTED_MODULE_2__); -/* harmony import */ var numeral_locales_da_dk__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! numeral/locales/da-dk */ 255); +/* harmony import */ var numeral_locales_da_dk__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! numeral/locales/da-dk */ 254); /* harmony import */ var numeral_locales_da_dk__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(numeral_locales_da_dk__WEBPACK_IMPORTED_MODULE_3__); -/* harmony import */ var numeral_locales_de__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! numeral/locales/de */ 254); +/* harmony import */ var numeral_locales_de__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! numeral/locales/de */ 253); /* harmony import */ var numeral_locales_de__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(numeral_locales_de__WEBPACK_IMPORTED_MODULE_4__); -/* harmony import */ var numeral_locales_en_au__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! numeral/locales/en-au */ 253); +/* harmony import */ var numeral_locales_en_au__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! numeral/locales/en-au */ 252); /* harmony import */ var numeral_locales_en_au__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(numeral_locales_en_au__WEBPACK_IMPORTED_MODULE_5__); -/* harmony import */ var numeral_locales_en_gb__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! numeral/locales/en-gb */ 252); +/* harmony import */ var numeral_locales_en_gb__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! numeral/locales/en-gb */ 251); /* harmony import */ var numeral_locales_en_gb__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(numeral_locales_en_gb__WEBPACK_IMPORTED_MODULE_6__); -/* harmony import */ var numeral_locales_es__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! numeral/locales/es */ 251); +/* harmony import */ var numeral_locales_es__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! numeral/locales/es */ 250); /* harmony import */ var numeral_locales_es__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(numeral_locales_es__WEBPACK_IMPORTED_MODULE_7__); -/* harmony import */ var numeral_locales_fr__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! numeral/locales/fr */ 250); +/* harmony import */ var numeral_locales_fr__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! numeral/locales/fr */ 249); /* harmony import */ var numeral_locales_fr__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(numeral_locales_fr__WEBPACK_IMPORTED_MODULE_8__); -/* harmony import */ var numeral_locales_hu__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! numeral/locales/hu */ 249); +/* harmony import */ var numeral_locales_hu__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! numeral/locales/hu */ 248); /* harmony import */ var numeral_locales_hu__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(numeral_locales_hu__WEBPACK_IMPORTED_MODULE_9__); -/* harmony import */ var numeral_locales_it__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! numeral/locales/it */ 248); +/* harmony import */ var numeral_locales_it__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! numeral/locales/it */ 247); /* harmony import */ var numeral_locales_it__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(numeral_locales_it__WEBPACK_IMPORTED_MODULE_10__); -/* harmony import */ var numeral_locales_lv__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! numeral/locales/lv */ 247); +/* harmony import */ var numeral_locales_lv__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! numeral/locales/lv */ 246); /* harmony import */ var numeral_locales_lv__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(numeral_locales_lv__WEBPACK_IMPORTED_MODULE_11__); -/* harmony import */ var numeral_locales_no__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! numeral/locales/no */ 246); +/* harmony import */ var numeral_locales_no__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! numeral/locales/no */ 245); /* harmony import */ var numeral_locales_no__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(numeral_locales_no__WEBPACK_IMPORTED_MODULE_12__); -/* harmony import */ var numeral_locales_pl__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! numeral/locales/pl */ 245); +/* harmony import */ var numeral_locales_pl__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! numeral/locales/pl */ 244); /* harmony import */ var numeral_locales_pl__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(numeral_locales_pl__WEBPACK_IMPORTED_MODULE_13__); -/* harmony import */ var numeral_locales_ru__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! numeral/locales/ru */ 244); +/* harmony import */ var numeral_locales_ru__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! numeral/locales/ru */ 243); /* harmony import */ var numeral_locales_ru__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(numeral_locales_ru__WEBPACK_IMPORTED_MODULE_14__); @@ -3617,7 +3620,7 @@ exports.Locations = { -var Promise = __webpack_require__(/*! bluebird */ 228); +var Promise = __webpack_require__(/*! bluebird */ 227); Promise.config({ warnings: false, @@ -4592,7 +4595,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _utils_uiHelpers_clearEventListeners__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_utils_uiHelpers_clearEventListeners__WEBPACK_IMPORTED_MODULE_4__); /* harmony import */ var _utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/uiHelpers/createElement */ 2); /* harmony import */ var _utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_5__); -/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 44); +/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 43); /* harmony import */ var _utils_uiHelpers_removeLoadingScreen__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../utils/uiHelpers/removeLoadingScreen */ 107); /* harmony import */ var _utils_uiHelpers_removeLoadingScreen__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_utils_uiHelpers_removeLoadingScreen__WEBPACK_IMPORTED_MODULE_7__); /* harmony import */ var _ui_numeralFormat__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./ui/numeralFormat */ 4); @@ -4606,7 +4609,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _CharacterOverview__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./CharacterOverview */ 116); /* harmony import */ var _CinematicText__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./CinematicText */ 91); /* harmony import */ var _CodingContractGenerator__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./CodingContractGenerator */ 90); -/* harmony import */ var _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./Company/CompanyPositions */ 25); +/* harmony import */ var _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./Company/CompanyPositions */ 26); /* harmony import */ var _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(_Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_18__); /* harmony import */ var _Company_Companies__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./Company/Companies */ 18); /* harmony import */ var _Company_Companies__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(_Company_Companies__WEBPACK_IMPORTED_MODULE_19__); @@ -4616,7 +4619,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _CreateProgram__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./CreateProgram */ 23); /* harmony import */ var _DevMenu__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ./DevMenu */ 104); /* harmony import */ var _Faction__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ./Faction */ 12); -/* harmony import */ var _Fconf__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./Fconf */ 43); +/* harmony import */ var _Fconf__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./Fconf */ 44); /* harmony import */ var _Location__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ./Location */ 84); /* harmony import */ var _Locations__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ./Locations */ 5); /* harmony import */ var _Locations__WEBPACK_IMPORTED_MODULE_27___default = /*#__PURE__*/__webpack_require__.n(_Locations__WEBPACK_IMPORTED_MODULE_27__); @@ -4644,7 +4647,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _utils_helpers_keyCodes__WEBPACK_IMPORTED_MODULE_47___default = /*#__PURE__*/__webpack_require__.n(_utils_helpers_keyCodes__WEBPACK_IMPORTED_MODULE_47__); /* harmony import */ var _ui_navigationTracking__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(/*! ./ui/navigationTracking */ 13); /* harmony import */ var _ui_navigationTracking__WEBPACK_IMPORTED_MODULE_48___default = /*#__PURE__*/__webpack_require__.n(_ui_navigationTracking__WEBPACK_IMPORTED_MODULE_48__); -/* harmony import */ var normalize_css__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(/*! normalize.css */ 192); +/* harmony import */ var normalize_css__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(/*! normalize.css */ 191); /* harmony import */ var normalize_css__WEBPACK_IMPORTED_MODULE_49___default = /*#__PURE__*/__webpack_require__.n(normalize_css__WEBPACK_IMPORTED_MODULE_49__); /* harmony import */ var _css_styles_scss__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(/*! ../css/styles.scss */ 167); /* harmony import */ var _css_styles_scss__WEBPACK_IMPORTED_MODULE_50___default = /*#__PURE__*/__webpack_require__.n(_css_styles_scss__WEBPACK_IMPORTED_MODULE_50__); @@ -4992,7 +4995,13 @@ const Engine = { loadLocationContent: function() { Engine.hideAllContent(); Engine.Display.locationContent.style.display = "block"; - Object(_Location__WEBPACK_IMPORTED_MODULE_26__[/* displayLocationContent */ "a"])(); + try { + Object(_Location__WEBPACK_IMPORTED_MODULE_26__[/* displayLocationContent */ "a"])(); + } catch(e) { + Object(_utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_6__[/* exceptionAlert */ "a"])(e); + console.error(e); + } + _ui_navigationTracking__WEBPACK_IMPORTED_MODULE_48__["routing"].navigateTo(_ui_navigationTracking__WEBPACK_IMPORTED_MODULE_48__["Page"].Location); }, @@ -8366,7 +8375,7 @@ function yesNoTxtInpBoxCreate(txt) { Object.defineProperty(exports, "__esModule", { value: true }); // Constructs all CompanyPosition objects using the metadata in data/companypositions.ts -const CompaniesMetadata_1 = __webpack_require__(/*! ./data/CompaniesMetadata */ 184); +const CompaniesMetadata_1 = __webpack_require__(/*! ./data/CompaniesMetadata */ 183); const Company_1 = __webpack_require__(/*! ./Company */ 69); const JSONReviver_1 = __webpack_require__(/*! ../../utils/JSONReviver */ 14); exports.Companies = {}; @@ -8379,9 +8388,28 @@ function addCompany(params) { // Used to initialize new Company objects for the Companies map // Called when creating new game or after a prestige/reset function initCompanies() { + // Save Old Company data for 'favor' + const oldCompanies = exports.Companies; + // Re-construct all Companies + exports.Companies = {}; CompaniesMetadata_1.companiesMetadata.forEach((e) => { addCompany(e); }); + // Reset data + for (const companyName in exports.Companies) { + const company = exports.Companies[companyName]; + const oldCompany = oldCompanies[companyName]; + if (!(oldCompany instanceof Company_1.Company)) { + // New game, so no OldCompanies data + company.favor = 0; + } + else { + company.favor = oldCompanies[companyName].favor; + if (isNaN(company.favor)) { + company.favor = 0; + } + } + } } exports.initCompanies = initCompanies; // Used to load Companies map from a save @@ -11230,7 +11258,7 @@ function displaySourceFiles(listElement, sourceFiles) { /* harmony import */ var _NetscriptFunctions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./NetscriptFunctions */ 41); /* harmony import */ var _NetscriptWorker__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./NetscriptWorker */ 24); /* harmony import */ var _Player__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Player */ 0); -/* harmony import */ var _Stock__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./Stock */ 26); +/* harmony import */ var _Stock__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./Stock */ 25); /* harmony import */ var _Stock__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_Stock__WEBPACK_IMPORTED_MODULE_5__); /* harmony import */ var _utils_DialogBox__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils/DialogBox */ 9); /* harmony import */ var _utils_uiHelpers_clearEventListeners__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../utils/uiHelpers/clearEventListeners */ 16); @@ -11239,7 +11267,7 @@ function displaySourceFiles(listElement, sourceFiles) { /* harmony import */ var _ui_navigationTracking__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./ui/navigationTracking */ 13); /* harmony import */ var _ui_navigationTracking__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_ui_navigationTracking__WEBPACK_IMPORTED_MODULE_9__); /* harmony import */ var _ui_numeralFormat__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./ui/numeralFormat */ 4); -/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 44); +/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 43); /* harmony import */ var _utils_helpers_getRandomInt__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../utils/helpers/getRandomInt */ 15); /* harmony import */ var _utils_helpers_getRandomInt__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(_utils_helpers_getRandomInt__WEBPACK_IMPORTED_MODULE_12__); /* harmony import */ var _utils_helpers_keyCodes__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../utils/helpers/keyCodes */ 32); @@ -13585,33 +13613,6 @@ function updateOnlineScriptTimes(numCycles = 1) { /***/ }), /* 25 */ -/*!*****************************************!*\ - !*** ./src/Company/CompanyPositions.ts ***! - \*****************************************/ -/*! no static exports found */ -/*! all exports used */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - -Object.defineProperty(exports, "__esModule", { value: true }); -// Constructs all CompanyPosition objects using the metadata in data/companypositions.ts -const CompanyPositionsMetadata_1 = __webpack_require__(/*! ./data/CompanyPositionsMetadata */ 176); -const CompanyPosition_1 = __webpack_require__(/*! ./CompanyPosition */ 79); -exports.CompanyPositions = {}; -function addCompanyPosition(params) { - if (exports.CompanyPositions[params.name] != null) { - console.warn(`Duplicate Company Position being defined: ${params.name}`); - } - exports.CompanyPositions[params.name] = new CompanyPosition_1.CompanyPosition(params); -} -CompanyPositionsMetadata_1.companyPositionMetadata.forEach((e) => { - addCompanyPosition(e); -}); - - -/***/ }), -/* 26 */ /*!**********************!*\ !*** ./src/Stock.ts ***! \**********************/ @@ -13659,6 +13660,33 @@ exports.Stock = Stock; JSONReviver_1.Reviver.constructors.Stock = Stock; +/***/ }), +/* 26 */ +/*!*****************************************!*\ + !*** ./src/Company/CompanyPositions.ts ***! + \*****************************************/ +/*! no static exports found */ +/*! all exports used */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +// Constructs all CompanyPosition objects using the metadata in data/companypositions.ts +const CompanyPositionsMetadata_1 = __webpack_require__(/*! ./data/CompanyPositionsMetadata */ 176); +const CompanyPosition_1 = __webpack_require__(/*! ./CompanyPosition */ 79); +exports.CompanyPositions = {}; +function addCompanyPosition(params) { + if (exports.CompanyPositions[params.name] != null) { + console.warn(`Duplicate Company Position being defined: ${params.name}`); + } + exports.CompanyPositions[params.name] = new CompanyPosition_1.CompanyPosition(params); +} +CompanyPositionsMetadata_1.companyPositionMetadata.forEach((e) => { + addCompanyPosition(e); +}); + + /***/ }), /* 27 */ /*!******************************************************!*\ @@ -13720,7 +13748,7 @@ exports.removeChildrenFromElement = removeChildrenFromElement; /* harmony import */ var _Constants__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Constants */ 1); /* harmony import */ var _Constants__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_Constants__WEBPACK_IMPORTED_MODULE_0__); /* harmony import */ var _engine__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./engine */ 8); -/* harmony import */ var _Fconf__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./Fconf */ 43); +/* harmony import */ var _Fconf__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./Fconf */ 44); /* harmony import */ var _InteractiveTutorial__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./InteractiveTutorial */ 33); /* harmony import */ var _NetscriptEvaluator__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./NetscriptEvaluator */ 6); /* harmony import */ var _NetscriptFunctions__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./NetscriptFunctions */ 41); @@ -13748,21 +13776,21 @@ exports.removeChildrenFromElement = removeChildrenFromElement; /* harmony import */ var _utils_helpers_getTimestamp__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(_utils_helpers_getTimestamp__WEBPACK_IMPORTED_MODULE_19__); /* harmony import */ var _utils_helpers_roundToTwo__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../utils/helpers/roundToTwo */ 76); /* harmony import */ var _utils_helpers_roundToTwo__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(_utils_helpers_roundToTwo__WEBPACK_IMPORTED_MODULE_20__); -var ace = __webpack_require__(/*! brace */ 242); -var beautify = __webpack_require__(/*! js-beautify */ 241).js_beautify; -__webpack_require__(/*! brace/mode/javascript */ 240); +var ace = __webpack_require__(/*! brace */ 241); +var beautify = __webpack_require__(/*! js-beautify */ 240).js_beautify; +__webpack_require__(/*! brace/mode/javascript */ 239); __webpack_require__(/*! ../netscript */ 177); -__webpack_require__(/*! brace/theme/chaos */ 239); -__webpack_require__(/*! brace/theme/chrome */ 238); -__webpack_require__(/*! brace/theme/monokai */ 237); -__webpack_require__(/*! brace/theme/solarized_dark */ 236); -__webpack_require__(/*! brace/theme/solarized_light */ 235); -__webpack_require__(/*! brace/theme/terminal */ 234); -__webpack_require__(/*! brace/theme/twilight */ 233); -__webpack_require__(/*! brace/theme/xcode */ 232); -__webpack_require__(/*! brace/keybinding/vim */ 231); -__webpack_require__(/*! brace/keybinding/emacs */ 230); -__webpack_require__(/*! brace/ext/language_tools */ 229); +__webpack_require__(/*! brace/theme/chaos */ 238); +__webpack_require__(/*! brace/theme/chrome */ 237); +__webpack_require__(/*! brace/theme/monokai */ 236); +__webpack_require__(/*! brace/theme/solarized_dark */ 235); +__webpack_require__(/*! brace/theme/solarized_light */ 234); +__webpack_require__(/*! brace/theme/terminal */ 233); +__webpack_require__(/*! brace/theme/twilight */ 232); +__webpack_require__(/*! brace/theme/xcode */ 231); +__webpack_require__(/*! brace/keybinding/vim */ 230); +__webpack_require__(/*! brace/keybinding/emacs */ 229); +__webpack_require__(/*! brace/ext/language_tools */ 228); // Importing this doesn't work for some reason. const walk = __webpack_require__(/*! acorn/dist/walk */ 135); @@ -14888,7 +14916,7 @@ _utils_JSONReviver__WEBPACK_IMPORTED_MODULE_16__["Reviver"].constructors.AllServ /* harmony import */ var _utils_uiHelpers_createPopup__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(_utils_uiHelpers_createPopup__WEBPACK_IMPORTED_MODULE_18__); /* harmony import */ var _ui_navigationTracking__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./ui/navigationTracking */ 13); /* harmony import */ var _ui_navigationTracking__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(_ui_navigationTracking__WEBPACK_IMPORTED_MODULE_19__); -/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 44); +/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 43); /* harmony import */ var _utils_StringHelperFunctions__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../utils/StringHelperFunctions */ 3); /* harmony import */ var _utils_StringHelperFunctions__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(_utils_StringHelperFunctions__WEBPACK_IMPORTED_MODULE_21__); /* harmony import */ var _utils_helpers_getRandomInt__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../utils/helpers/getRandomInt */ 15); @@ -20625,7 +20653,7 @@ JSONReviver_1.Reviver.constructors.CodingContract = CodingContract; /* harmony import */ var _Company_Companies__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_Company_Companies__WEBPACK_IMPORTED_MODULE_6__); /* harmony import */ var _Company_CompanyPosition__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./Company/CompanyPosition */ 79); /* harmony import */ var _Company_CompanyPosition__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_Company_CompanyPosition__WEBPACK_IMPORTED_MODULE_7__); -/* harmony import */ var _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./Company/CompanyPositions */ 25); +/* harmony import */ var _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./Company/CompanyPositions */ 26); /* harmony import */ var _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_8__); /* harmony import */ var _Constants__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./Constants */ 1); /* harmony import */ var _Constants__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_Constants__WEBPACK_IMPORTED_MODULE_9__); @@ -20645,7 +20673,7 @@ JSONReviver_1.Reviver.constructors.CodingContract = CodingContract; /* harmony import */ var _Settings__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./Settings */ 19); /* harmony import */ var _Settings__WEBPACK_IMPORTED_MODULE_22___default = /*#__PURE__*/__webpack_require__.n(_Settings__WEBPACK_IMPORTED_MODULE_22__); /* harmony import */ var _SpecialServerIps__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ./SpecialServerIps */ 30); -/* harmony import */ var _Stock__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ./Stock */ 26); +/* harmony import */ var _Stock__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ./Stock */ 25); /* harmony import */ var _Stock__WEBPACK_IMPORTED_MODULE_24___default = /*#__PURE__*/__webpack_require__.n(_Stock__WEBPACK_IMPORTED_MODULE_24__); /* harmony import */ var _StockMarket__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./StockMarket */ 22); /* harmony import */ var _ui_postToTerminal__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ./ui/postToTerminal */ 7); @@ -21573,7 +21601,7 @@ function NetscriptFunctions(workerScript) { var destServer, currServ; - if (arguments.length === 3) { //scriptname, source, destination + if (ip2 != null) { // 3 Argument version: scriptname, source, destination if (scriptname === undefined || ip1 === undefined || ip2 === undefined) { throw Object(_NetscriptEvaluator__WEBPACK_IMPORTED_MODULE_31__[/* makeRuntimeRejectMsg */ "d"])(workerScript, "ERROR: scp() call has incorrect number of arguments. Takes 2 or 3 arguments"); } @@ -21586,7 +21614,7 @@ function NetscriptFunctions(workerScript) { if (currServ == null) { throw Object(_NetscriptEvaluator__WEBPACK_IMPORTED_MODULE_31__[/* makeRuntimeRejectMsg */ "d"])(workerScript, `ERROR: Invalid hostname/ip passed into scp() command: ${ip1}`); } - } else if (arguments.length === 2) { //scriptname, destination + } else if (ip1 != null) { // 2 Argument version: scriptname, destination if (scriptname === undefined || ip1 === undefined) { throw Object(_NetscriptEvaluator__WEBPACK_IMPORTED_MODULE_31__[/* makeRuntimeRejectMsg */ "d"])(workerScript, "ERROR: scp() call has incorrect number of arguments. Takes 2 or 3 arguments"); } @@ -21599,6 +21627,8 @@ function NetscriptFunctions(workerScript) { if (currServ == null) { throw Object(_NetscriptEvaluator__WEBPACK_IMPORTED_MODULE_31__[/* makeRuntimeRejectMsg */ "d"])(workerScript, "Could not find server ip for this script. This is a bug please contact game developer"); } + } else { + throw Object(_NetscriptEvaluator__WEBPACK_IMPORTED_MODULE_31__[/* makeRuntimeRejectMsg */ "d"])(workerScript, "ERROR: scp() call has incorrect number of arguments. Takes 2 or 3 arguments"); } //Scp for lit files @@ -25374,6 +25404,33 @@ function substituteAliases(origCommand) { /***/ }), /* 43 */ +/*!*****************************************!*\ + !*** ./utils/helpers/exceptionAlert.js ***! + \*****************************************/ +/*! exports provided: exceptionAlert */ +/*! exports used: exceptionAlert */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return exceptionAlert; }); +/* harmony import */ var _DialogBox__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../DialogBox */ 9); + + +function exceptionAlert(e) { + Object(_DialogBox__WEBPACK_IMPORTED_MODULE_0__["dialogBoxCreate"])("Caught an exception: " + e + "

" + + "Filename: " + (e.fileName || "UNKNOWN FILE NAME") + "

" + + "Line Number: " + (e.lineNumber || "UNKNOWN LINE NUMBER") + "

" + + "This is a bug, please report to game developer with this " + + "message as well as details about how to reproduce the bug.

" + + "If you want to be safe, I suggest refreshing the game WITHOUT saving so that your " + + "safe doesn't get corrupted"); +} + + + + +/***/ }), +/* 44 */ /*!**********************!*\ !*** ./src/Fconf.js ***! \**********************/ @@ -25642,33 +25699,6 @@ function setMainMenuStyle() { -/***/ }), -/* 44 */ -/*!*****************************************!*\ - !*** ./utils/helpers/exceptionAlert.js ***! - \*****************************************/ -/*! exports provided: exceptionAlert */ -/*! exports used: exceptionAlert */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return exceptionAlert; }); -/* harmony import */ var _DialogBox__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../DialogBox */ 9); - - -function exceptionAlert(e) { - Object(_DialogBox__WEBPACK_IMPORTED_MODULE_0__["dialogBoxCreate"])("Caught an exception: " + e + "

" + - "Filename: " + (e.fileName || "UNKNOWN FILE NAME") + "

" + - "Line Number: " + (e.lineNumber || "UNKNOWN LINE NUMBER") + "

" + - "This is a bug, please report to game developer with this " + - "message as well as details about how to reproduce the bug.

" + - "If you want to be safe, I suggest refreshing the game WITHOUT saving so that your " + - "safe doesn't get corrupted"); -} - - - - /***/ }), /* 45 */ /*!************************!*\ @@ -29458,7 +29488,7 @@ function calculateWeakenTime(server, hack, int) { /* harmony import */ var _ui_navigationTracking__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(_ui_navigationTracking__WEBPACK_IMPORTED_MODULE_11__); /* harmony import */ var _utils_StringHelperFunctions__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../utils/StringHelperFunctions */ 3); /* harmony import */ var _utils_StringHelperFunctions__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(_utils_StringHelperFunctions__WEBPACK_IMPORTED_MODULE_12__); -/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 44); +/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 43); /* harmony import */ var _utils_helpers_getRandomInt__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../utils/helpers/getRandomInt */ 15); /* harmony import */ var _utils_helpers_getRandomInt__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(_utils_helpers_getRandomInt__WEBPACK_IMPORTED_MODULE_14__); /* harmony import */ var _utils_uiHelpers_removeChildrenFromElement__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../utils/uiHelpers/removeChildrenFromElement */ 27); @@ -31369,7 +31399,7 @@ Gang.prototype.clearUI = function() { /* harmony import */ var _CreateProgram__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./CreateProgram */ 23); /* harmony import */ var _DarkWeb__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./DarkWeb */ 74); /* harmony import */ var _engine__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./engine */ 8); -/* harmony import */ var _Fconf__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./Fconf */ 43); +/* harmony import */ var _Fconf__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./Fconf */ 44); /* harmony import */ var _Hacking__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./Hacking */ 46); /* harmony import */ var _HelpText__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./HelpText */ 94); /* harmony import */ var _HelpText__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_HelpText__WEBPACK_IMPORTED_MODULE_8__); @@ -32483,6 +32513,24 @@ let Terminal = { } } Object(_ui_postToTerminal__WEBPACK_IMPORTED_MODULE_30__["post"])("Error: " + fn + " does not exist"); + break; + case "expr": + if (commandArray.length <= 1) { + Object(_ui_postToTerminal__WEBPACK_IMPORTED_MODULE_30__["post"])("Incorrect usage of expr command. Usage: expr [math expression]"); + return; + } + const expr = commandArray.slice(1).join(""); + + // Sanitize the math expression + const sanitizedExpr = expr.replace(/s+/g, '').replace(/[^-()\d/*+.]/g, ''); + let result; + try { + result = eval(sanitizedExpr); + } catch(e) { + Object(_ui_postToTerminal__WEBPACK_IMPORTED_MODULE_30__["post"])(`Could not evaluate expression: ${sanitizedExpr}`); + return; + } + Object(_ui_postToTerminal__WEBPACK_IMPORTED_MODULE_30__["post"])(result); break; case "free": Terminal.executeFreeCommand(commandArray); @@ -33673,7 +33721,7 @@ exports.arrayToString = arrayToString; /* harmony import */ var _utils_helpers_getRandomInt__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_utils_helpers_getRandomInt__WEBPACK_IMPORTED_MODULE_8__); /* harmony import */ var _utils_helpers_isString__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../utils/helpers/isString */ 36); /* harmony import */ var _utils_helpers_isString__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_utils_helpers_isString__WEBPACK_IMPORTED_MODULE_9__); -/* harmony import */ var jsplumb__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! jsplumb */ 243); +/* harmony import */ var jsplumb__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! jsplumb */ 242); /* harmony import */ var jsplumb__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(jsplumb__WEBPACK_IMPORTED_MODULE_10__); @@ -41919,7 +41967,7 @@ function getHacknetNode(name) { /* harmony import */ var _utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_7__); /* harmony import */ var _utils_helpers_createProgressBarText__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../utils/helpers/createProgressBarText */ 77); /* harmony import */ var _utils_helpers_createProgressBarText__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_utils_helpers_createProgressBarText__WEBPACK_IMPORTED_MODULE_8__); -/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 44); +/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 43); /* harmony import */ var _utils_uiHelpers_getElementById__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../utils/uiHelpers/getElementById */ 50); /* harmony import */ var _utils_uiHelpers_getElementById__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(_utils_uiHelpers_getElementById__WEBPACK_IMPORTED_MODULE_10__); /* harmony import */ var _utils_LogBox__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../utils/LogBox */ 73); @@ -42780,7 +42828,7 @@ JSONReviver_1.Reviver.constructors.Company = Company; /* harmony import */ var _Constants__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_Constants__WEBPACK_IMPORTED_MODULE_3__); /* harmony import */ var _engine__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./engine */ 8); /* harmony import */ var _Faction__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./Faction */ 12); -/* harmony import */ var _Fconf__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./Fconf */ 43); +/* harmony import */ var _Fconf__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./Fconf */ 44); /* harmony import */ var _Gang__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./Gang */ 47); /* harmony import */ var _HacknetNode__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./HacknetNode */ 61); /* harmony import */ var _Message__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./Message */ 37); @@ -42923,7 +42971,7 @@ function evaluateVersionCompatibility(ver) { // Player's company position is now a string if (_Player__WEBPACK_IMPORTED_MODULE_10__[/* Player */ "a"].companyPosition != null && typeof _Player__WEBPACK_IMPORTED_MODULE_10__[/* Player */ "a"].companyPosition !== "string") { console.log("Changed Player.companyPosition value to be compatible with v0.41.2"); - _Player__WEBPACK_IMPORTED_MODULE_10__[/* Player */ "a"].companyPosition = _Player__WEBPACK_IMPORTED_MODULE_10__[/* Player */ "a"].companyPosition.positionName; + _Player__WEBPACK_IMPORTED_MODULE_10__[/* Player */ "a"].companyPosition = _Player__WEBPACK_IMPORTED_MODULE_10__[/* Player */ "a"].companyPosition.data.positionName; if (_Player__WEBPACK_IMPORTED_MODULE_10__[/* Player */ "a"].companyPosition == null) { _Player__WEBPACK_IMPORTED_MODULE_10__[/* Player */ "a"].companyPosition = ""; } @@ -42936,6 +42984,16 @@ function evaluateVersionCompatibility(ver) { console.log("Changed company name property to be compatible with v0.41.2"); company.name = company.companyName; } + + if (company.companyPositions instanceof Array) { + console.log("Changed company companyPositions property to be compatible with v0.41.2"); + const pos = {}; + + for (let i = 0; i < company.companyPositions.length; ++i) { + pos[company.companyPositions[i]] = true; + } + company.companyPositions = pos; + } } } } @@ -44457,7 +44515,7 @@ exports.isValidIPAddress = isValidIPAddress; /* harmony import */ var _utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_22___default = /*#__PURE__*/__webpack_require__.n(_utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_22__); /* harmony import */ var _utils_uiHelpers_createPopup__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../utils/uiHelpers/createPopup */ 38); /* harmony import */ var _utils_uiHelpers_createPopup__WEBPACK_IMPORTED_MODULE_23___default = /*#__PURE__*/__webpack_require__.n(_utils_uiHelpers_createPopup__WEBPACK_IMPORTED_MODULE_23__); -/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 44); +/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 43); /* harmony import */ var _utils_YesNoBox__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ../utils/YesNoBox */ 17); @@ -44799,7 +44857,7 @@ function prestigeSourceFile() { /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return displayLocationContent; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return initLocationButtons; }); /* harmony import */ var _Bladeburner__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Bladeburner */ 29); -/* harmony import */ var _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Company/CompanyPositions */ 25); +/* harmony import */ var _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Company/CompanyPositions */ 26); /* harmony import */ var _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_1__); /* harmony import */ var _Company_Companies__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./Company/Companies */ 18); /* harmony import */ var _Company_Companies__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_Company_Companies__WEBPACK_IMPORTED_MODULE_2__); @@ -45062,7 +45120,9 @@ function displayLocationContent() { //Check if the player is employed at this Location. If he is, display the "Work" button, //update the job title, etc. if (loc != "" && loc === _Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"].companyName) { - var company = _Company_Companies__WEBPACK_IMPORTED_MODULE_2__["Companies"][loc]; + let company = _Company_Companies__WEBPACK_IMPORTED_MODULE_2__["Companies"][loc]; + + console.log(company.companyPositions); jobTitle.style.display = "block"; jobReputation.style.display = "inline"; @@ -45071,7 +45131,7 @@ function displayLocationContent() { locationTxtDiv2.style.display = "block"; locationTxtDiv3.style.display = "block"; jobTitle.innerHTML = "Job Title: " + _Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"].companyPosition; - var repGain = company.getFavorGain(); + let repGain = company.getFavorGain(); if (repGain.length != 2) {repGain = 0;} repGain = repGain[0]; jobReputation.innerHTML = "Company reputation: " + Object(_utils_StringHelperFunctions__WEBPACK_IMPORTED_MODULE_21__["formatNumber"])(company.playerReputation, 4) + @@ -45085,7 +45145,10 @@ function displayLocationContent() { "favor you gain depends on how much reputation you have with the company"; work.style.display = "block"; - var currPos = _Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"].companyPosition; + let currPos = _Company_CompanyPositions__WEBPACK_IMPORTED_MODULE_1__["CompanyPositions"][_Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"].companyPosition]; + if (currPos == null) { + throw new Error("Player's companyPosition property has an invalid value"); + } work.addEventListener("click", function() { if (currPos.isPartTimeJob()) { @@ -45864,13 +45927,13 @@ function displayLocationContent() { if (loc == _Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"].companyName) { var currPos = _Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"].companyPosition; - if (currPos.name == "Employee") { + if (currPos == "Employee") { employeeJob.style.display = "none"; - } else if (currPos.name == "Waiter") { + } else if (currPos == "Waiter") { waiterJob.style.display = "none"; - } else if (currPos.name == "Part-time Employee") { + } else if (currPos == "Part-time Employee") { employeePartTimeJob.style.display = "none"; - } else if (currPos.name == "Part-time Waiter") { + } else if (currPos == "Part-time Waiter") { waiterPartTimeJob.style.display = "none"; } } @@ -47002,8 +47065,8 @@ function setJobRequirementTooltip(loc, entryPosType, btn) { var company = _Company_Companies__WEBPACK_IMPORTED_MODULE_2__["Companies"][loc]; if (company == null) {return;} var pos = _Player__WEBPACK_IMPORTED_MODULE_12__[/* Player */ "a"].getNextCompanyPosition(company, entryPosType); - if (pos == null) {return}; - if (!company.hasPosition(pos)) {return;} + if (pos == null) { return }; + if (!company.hasPosition(pos)) { return; } var reqText = Object(_Company_GetJobRequirementText__WEBPACK_IMPORTED_MODULE_3__["getJobRequirementText"])(company, pos, true); btn.innerHTML += "" + reqText + ""; } @@ -47367,7 +47430,7 @@ function getRandomFilename(server, reward) { /* harmony import */ var _utils_uiHelpers_removeChildrenFromElement__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_utils_uiHelpers_removeChildrenFromElement__WEBPACK_IMPORTED_MODULE_1__); /* harmony import */ var _utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/uiHelpers/createElement */ 2); /* harmony import */ var _utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_2__); -/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 44); +/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 43); /* harmony import */ var _utils_helpers_isString__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/helpers/isString */ 36); /* harmony import */ var _utils_helpers_isString__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_utils_helpers_isString__WEBPACK_IMPORTED_MODULE_4__); @@ -47483,7 +47546,7 @@ function cinematicTextEnd() { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const CompanyPositions_1 = __webpack_require__(/*! ./CompanyPositions */ 25); +const CompanyPositions_1 = __webpack_require__(/*! ./CompanyPositions */ 26); function getNextCompanyPosition(currPos) { if (currPos == null) { return null; @@ -47557,6 +47620,7 @@ exports.TerminalHelpText = "Type 'help name' to learn more about the command 'na "cls See 'clear' command
" + "connect [ip/hostname] Connects to a remote server
" + "download [script/text file] Downloads scripts or text files to your computer
" + + "expr [math expression] Evaluate a mathematical expression
" + "free Check the machine's memory (RAM) usage
" + "hack Hack the current machine
" + "help [command] Display this help text, or the help text for a command
" + @@ -47639,6 +47703,12 @@ exports.HelpTexts = { "Download all scripts and text files: download *
" + "Download all scripts: download *.script
" + "Download all text files: download *.txt
", + expr: "expr [mathematical expression]
" + + "Evaluate a simple mathematical expression. Supports native JavaScript operators:
" + + "+, -, /, *, **, %
" + + "Example:
" + + "expr 25 * 2 ** 10
" + + "Note that letters (non-digits) are not allowed and will be removed from the input.", free: "free
" + "Display's the memory usage on the current machine. Print the amount of RAM that is available on the current server as well as " + "how much of it is being used.", @@ -48031,12 +48101,12 @@ function _getScriptUrls(script, scripts, seen) { /* harmony import */ var _Server__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./Server */ 11); /* harmony import */ var _RedPill__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./RedPill */ 53); /* harmony import */ var _StockMarket__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./StockMarket */ 22); -/* harmony import */ var _Stock__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./Stock */ 26); +/* harmony import */ var _Stock__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./Stock */ 25); /* harmony import */ var _Stock__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_Stock__WEBPACK_IMPORTED_MODULE_8__); /* harmony import */ var _Terminal__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./Terminal */ 48); /* harmony import */ var _ui_numeralFormat__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./ui/numeralFormat */ 4); /* harmony import */ var _utils_DialogBox__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../utils/DialogBox */ 9); -/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 44); +/* harmony import */ var _utils_helpers_exceptionAlert__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../utils/helpers/exceptionAlert */ 43); /* harmony import */ var _utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../utils/uiHelpers/createElement */ 2); /* harmony import */ var _utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(_utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_13__); /* harmony import */ var _utils_uiHelpers_removeElementById__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../utils/uiHelpers/removeElementById */ 20); @@ -58087,28 +58157,6 @@ exports.codingContractTypesMetadata = [ /***/ }), /* 183 */ -/*!***********************************!*\ - !*** ./utils/SafeObjectAssign.ts ***! - \***********************************/ -/*! no static exports found */ -/*! all exports used */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - -Object.defineProperty(exports, "__esModule", { value: true }); -// Modified version of Object.assign() that prevents you from -// accidentally modifying the 'target' (first argument) -function SafeObjectAssign(...args) { - const argsCopy = Array.from(arguments); - argsCopy.unshift({}); - Object.assign.apply(null, argsCopy); -} -exports.SafeObjectAssign = SafeObjectAssign; - - -/***/ }), -/* 184 */ /*!***********************************************!*\ !*** ./src/Company/data/CompaniesMetadata.ts ***! \***********************************************/ @@ -58121,7 +58169,6 @@ exports.SafeObjectAssign = SafeObjectAssign; Object.defineProperty(exports, "__esModule", { value: true }); const Locations_1 = __webpack_require__(/*! ../../Locations */ 5); const posNames = __webpack_require__(/*! ./CompanyPositionNames */ 34); -const SafeObjectAssign_1 = __webpack_require__(/*! ../../../utils/SafeObjectAssign */ 183); // Create Objects containing Company Positions by category // Will help in metadata construction later const AllSoftwarePositions = {}; @@ -58340,7 +58387,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.VolhavenOmniaCybersystems, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(CEOOnly, OperationsManagerOnly, AllTechnologyPositions, AllSecurityPositions), + companyPositions: Object.assign({}, CEOOnly, OperationsManagerOnly, AllTechnologyPositions, AllSecurityPositions), expMultiplier: 1.7, salaryMultiplier: 1.7, jobStatReqOffset: 199, @@ -58348,7 +58395,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.ChongqingSolarisSpaceSystems, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(CEOOnly, OperationsManagerOnly, AllTechnologyPositions, AllSecurityPositions), + companyPositions: Object.assign({}, CEOOnly, OperationsManagerOnly, AllTechnologyPositions, AllSecurityPositions), expMultiplier: 1.7, salaryMultiplier: 1.7, jobStatReqOffset: 199, @@ -58356,7 +58403,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.Sector12DeltaOne, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(CEOOnly, OperationsManagerOnly, AllTechnologyPositions, AllSecurityPositions), + companyPositions: Object.assign({}, CEOOnly, OperationsManagerOnly, AllTechnologyPositions, AllSecurityPositions), expMultiplier: 1.6, salaryMultiplier: 1.6, jobStatReqOffset: 199, @@ -58364,7 +58411,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.NewTokyoGlobalPharmaceuticals, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(AllTechnologyPositions, AllBusinessPositions, AllSoftwareConsultantPositions, AllSecurityPositions), + companyPositions: Object.assign({}, AllTechnologyPositions, AllBusinessPositions, AllSoftwareConsultantPositions, AllSecurityPositions), expMultiplier: 1.8, salaryMultiplier: 1.8, jobStatReqOffset: 224, @@ -58372,7 +58419,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.IshimaNovaMedical, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(AllTechnologyPositions, AllBusinessPositions, AllSoftwareConsultantPositions, AllSecurityPositions), + companyPositions: Object.assign({}, AllTechnologyPositions, AllBusinessPositions, AllSoftwareConsultantPositions, AllSecurityPositions), expMultiplier: 1.75, salaryMultiplier: 1.75, jobStatReqOffset: 199, @@ -58380,7 +58427,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.Sector12CIA, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(SoftwarePositionsUpToHeadOfEngineering, AllNetworkEngineerPositions, AllITPositions, AllSecurityPositions, AllAgentPositions), + companyPositions: Object.assign({}, SoftwarePositionsUpToHeadOfEngineering, AllNetworkEngineerPositions, AllITPositions, AllSecurityPositions, AllAgentPositions), expMultiplier: 2, salaryMultiplier: 2, jobStatReqOffset: 149, @@ -58388,7 +58435,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.Sector12NSA, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(SoftwarePositionsUpToHeadOfEngineering, AllNetworkEngineerPositions, AllITPositions, AllSecurityPositions, AllAgentPositions), + companyPositions: Object.assign({}, SoftwarePositionsUpToHeadOfEngineering, AllNetworkEngineerPositions, AllITPositions, AllSecurityPositions, AllAgentPositions), expMultiplier: 2, salaryMultiplier: 2, jobStatReqOffset: 149, @@ -58396,7 +58443,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.AevumWatchdogSecurity, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(SoftwarePositionsUpToHeadOfEngineering, AllNetworkEngineerPositions, AllITPositions, AllSecurityPositions, AllAgentPositions, AllSoftwareConsultantPositions), + companyPositions: Object.assign({}, SoftwarePositionsUpToHeadOfEngineering, AllNetworkEngineerPositions, AllITPositions, AllSecurityPositions, AllAgentPositions, AllSoftwareConsultantPositions), expMultiplier: 1.5, salaryMultiplier: 1.5, jobStatReqOffset: 124, @@ -58404,7 +58451,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.VolhavenLexoCorp, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(AllTechnologyPositions, AllSoftwareConsultantPositions, AllBusinessPositions, AllSecurityPositions), + companyPositions: Object.assign({}, AllTechnologyPositions, AllSoftwareConsultantPositions, AllBusinessPositions, AllSecurityPositions), expMultiplier: 1.4, salaryMultiplier: 1.4, jobStatReqOffset: 99, @@ -58412,7 +58459,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.AevumRhoConstruction, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(SoftwarePositionsUpToLeadDeveloper, BusinessPositionsUpToOperationsManager), + companyPositions: Object.assign({}, SoftwarePositionsUpToLeadDeveloper, BusinessPositionsUpToOperationsManager), expMultiplier: 1.3, salaryMultiplier: 1.3, jobStatReqOffset: 49, @@ -58420,7 +58467,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.Sector12AlphaEnterprises, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(SoftwarePositionsUpToLeadDeveloper, BusinessPositionsUpToOperationsManager, AllSoftwareConsultantPositions), + companyPositions: Object.assign({}, SoftwarePositionsUpToLeadDeveloper, BusinessPositionsUpToOperationsManager, AllSoftwareConsultantPositions), expMultiplier: 1.5, salaryMultiplier: 1.5, jobStatReqOffset: 99, @@ -58428,7 +58475,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.AevumPolice, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(AllSecurityPositions, SoftwarePositionsUpToLeadDeveloper), + companyPositions: Object.assign({}, AllSecurityPositions, SoftwarePositionsUpToLeadDeveloper), expMultiplier: 1.3, salaryMultiplier: 1.3, jobStatReqOffset: 99, @@ -58436,7 +58483,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.VolhavenSysCoreSecurities, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(AllTechnologyPositions), + companyPositions: Object.assign({}, AllTechnologyPositions), expMultiplier: 1.3, salaryMultiplier: 1.3, jobStatReqOffset: 124, @@ -58444,7 +58491,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.VolhavenCompuTek, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(AllTechnologyPositions), + companyPositions: Object.assign({}, AllTechnologyPositions), expMultiplier: 1.2, salaryMultiplier: 1.2, jobStatReqOffset: 74, @@ -58452,7 +58499,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.AevumNetLinkTechnologies, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(AllTechnologyPositions), + companyPositions: Object.assign({}, AllTechnologyPositions), expMultiplier: 1.2, salaryMultiplier: 1.2, jobStatReqOffset: 99, @@ -58460,7 +58507,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.Sector12CarmichaelSecurity, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(AllTechnologyPositions, AllAgentPositions, AllSecurityPositions), + companyPositions: Object.assign({}, AllTechnologyPositions, AllAgentPositions, AllSecurityPositions), expMultiplier: 1.2, salaryMultiplier: 1.2, jobStatReqOffset: 74, @@ -58468,7 +58515,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.Sector12FoodNStuff, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(EmployeeOnly, PartTimeEmployeeOnly), + companyPositions: Object.assign({}, EmployeeOnly, PartTimeEmployeeOnly), expMultiplier: 1, salaryMultiplier: 1, jobStatReqOffset: 0, @@ -58476,7 +58523,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.Sector12JoesGuns, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(EmployeeOnly, PartTimeEmployeeOnly), + companyPositions: Object.assign({}, EmployeeOnly, PartTimeEmployeeOnly), expMultiplier: 1, salaryMultiplier: 1, jobStatReqOffset: 0, @@ -58484,7 +58531,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.IshimaOmegaSoftware, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(AllSoftwarePositions, AllSoftwareConsultantPositions, AllITPositions), + companyPositions: Object.assign({}, AllSoftwarePositions, AllSoftwareConsultantPositions, AllITPositions), expMultiplier: 1.1, salaryMultiplier: 1.1, jobStatReqOffset: 49, @@ -58492,7 +58539,7 @@ exports.companiesMetadata = [ { name: Locations_1.Locations.NewTokyoNoodleBar, info: "", - companyPositions: SafeObjectAssign_1.SafeObjectAssign(WaiterOnly, PartTimeWaiterOnly), + companyPositions: Object.assign({}, WaiterOnly, PartTimeWaiterOnly), expMultiplier: 1, salaryMultiplier: 1, jobStatReqOffset: 0, @@ -58501,6 +58548,7 @@ exports.companiesMetadata = [ /***/ }), +/* 184 */, /* 185 */, /* 186 */, /* 187 */, @@ -58536,8 +58584,7 @@ exports.companiesMetadata = [ /* 217 */, /* 218 */, /* 219 */, -/* 220 */, -/* 221 */ +/* 220 */ /*!**********************!*\ !*** util (ignored) ***! \**********************/ @@ -58548,7 +58595,7 @@ exports.companiesMetadata = [ /* (ignored) */ /***/ }), -/* 222 */ +/* 221 */ /*!**********************!*\ !*** util (ignored) ***! \**********************/ diff --git a/dist/vendor.bundle.js b/dist/vendor.bundle.js index 49f4c378b..aabccd03b 100644 --- a/dist/vendor.bundle.js +++ b/dist/vendor.bundle.js @@ -15211,9 +15211,9 @@ return jQuery; var support = __webpack_require__(/*! ./support */ 96); -var base64 = __webpack_require__(/*! ./base64 */ 217); +var base64 = __webpack_require__(/*! ./base64 */ 216); var nodejsUtils = __webpack_require__(/*! ./nodejsUtils */ 131); -var setImmediate = __webpack_require__(/*! core-js/library/fn/set-immediate */ 334); +var setImmediate = __webpack_require__(/*! core-js/library/fn/set-immediate */ 333); var external = __webpack_require__(/*! ./external */ 111); @@ -17248,7 +17248,7 @@ else { } try { - exports.nodestream = !!__webpack_require__(/*! readable-stream */ 225).Readable; + exports.nodestream = !!__webpack_require__(/*! readable-stream */ 224).Readable; } catch(e) { exports.nodestream = false; } @@ -17330,8 +17330,8 @@ try { FORMAT_MINIFY, FORMAT_DEFAULTS; - estraverse = __webpack_require__(/*! estraverse */ 296); - esutils = __webpack_require__(/*! esutils */ 294); + estraverse = __webpack_require__(/*! estraverse */ 295); + esutils = __webpack_require__(/*! esutils */ 293); Syntax = estraverse.Syntax; @@ -19811,7 +19811,7 @@ try { if (!exports.browser) { // We assume environment is node.js // And prevent from including source-map by browserify - SourceNode = __webpack_require__(/*! source-map */ 291).SourceNode; + SourceNode = __webpack_require__(/*! source-map */ 290).SourceNode; } else { SourceNode = global.sourceMap.SourceNode; } @@ -19858,7 +19858,7 @@ try { FORMAT_DEFAULTS = getDefaultOptions().format; - exports.version = __webpack_require__(/*! ./package.json */ 284).version; + exports.version = __webpack_require__(/*! ./package.json */ 283).version; exports.generate = generate; exports.attachComments = estraverse.attachComments; exports.Precedence = updateDeeply({}, Precedence); @@ -20058,13 +20058,13 @@ exports.version = '4.1.2'; * Assertion Error */ -exports.AssertionError = __webpack_require__(/*! assertion-error */ 191); +exports.AssertionError = __webpack_require__(/*! assertion-error */ 190); /*! * Utils for plugins (not exported) */ -var util = __webpack_require__(/*! ./chai/utils */ 279); +var util = __webpack_require__(/*! ./chai/utils */ 278); /** * # .use(function) @@ -20102,35 +20102,35 @@ exports.config = config; * Primary `Assertion` prototype */ -var assertion = __webpack_require__(/*! ./chai/assertion */ 263); +var assertion = __webpack_require__(/*! ./chai/assertion */ 262); exports.use(assertion); /*! * Core Assertions */ -var core = __webpack_require__(/*! ./chai/core/assertions */ 262); +var core = __webpack_require__(/*! ./chai/core/assertions */ 261); exports.use(core); /*! * Expect interface */ -var expect = __webpack_require__(/*! ./chai/interface/expect */ 261); +var expect = __webpack_require__(/*! ./chai/interface/expect */ 260); exports.use(expect); /*! * Should interface */ -var should = __webpack_require__(/*! ./chai/interface/should */ 260); +var should = __webpack_require__(/*! ./chai/interface/should */ 259); exports.use(should); /*! * Assert interface */ -var assert = __webpack_require__(/*! ./chai/interface/assert */ 259); +var assert = __webpack_require__(/*! ./chai/interface/assert */ 258); exports.use(assert); @@ -20193,7 +20193,7 @@ var util = __webpack_require__(/*! core-util-is */ 112); util.inherits = __webpack_require__(/*! inherits */ 108); /**/ -var Readable = __webpack_require__(/*! ./_stream_readable */ 224); +var Readable = __webpack_require__(/*! ./_stream_readable */ 223); var Writable = __webpack_require__(/*! ./_stream_writable */ 173); util.inherits(Duplex, Readable); @@ -21115,7 +21115,7 @@ var ES6Promise = null; if (typeof Promise !== "undefined") { ES6Promise = Promise; } else { - ES6Promise = __webpack_require__(/*! lie */ 320); + ES6Promise = __webpack_require__(/*! lie */ 319); } /** @@ -21265,9 +21265,9 @@ function objectToString(o) { -var base64 = __webpack_require__(/*! base64-js */ 344) -var ieee754 = __webpack_require__(/*! ieee754 */ 343) -var isArray = __webpack_require__(/*! isarray */ 226) +var base64 = __webpack_require__(/*! base64-js */ 343) +var ieee754 = __webpack_require__(/*! ieee754 */ 342) +var isArray = __webpack_require__(/*! isarray */ 225) exports.Buffer = Buffer exports.SlowBuffer = SlowBuffer @@ -23264,7 +23264,7 @@ process.umask = function() { return 0; }; var config = __webpack_require__(/*! ../config */ 99); var flag = __webpack_require__(/*! ./flag */ 88); -var getProperties = __webpack_require__(/*! ./getProperties */ 188); +var getProperties = __webpack_require__(/*! ./getProperties */ 187); var isProxyEnabled = __webpack_require__(/*! ./isProxyEnabled */ 128); /*! @@ -23509,9 +23509,9 @@ module.exports = function isProxyEnabled() { // This is (almost) directly from Node.js utils // https://github.com/joyent/node/blob/f8c335d0caf47f16d31413f89aa28eda3878e3aa/lib/util.js -var getName = __webpack_require__(/*! get-func-name */ 189); -var getProperties = __webpack_require__(/*! ./getProperties */ 188); -var getEnumerableProperties = __webpack_require__(/*! ./getEnumerableProperties */ 274); +var getName = __webpack_require__(/*! get-func-name */ 188); +var getProperties = __webpack_require__(/*! ./getProperties */ 187); +var getEnumerableProperties = __webpack_require__(/*! ./getEnumerableProperties */ 273); var config = __webpack_require__(/*! ../config */ 99); module.exports = inspect; @@ -24968,7 +24968,7 @@ var saveAs = saveAs || (function(view) { if (typeof module !== "undefined" && module.exports) { module.exports.saveAs = saveAs; -} else if (("function" !== "undefined" && __webpack_require__(/*! !webpack amd define */ 181) !== null) && (__webpack_require__(/*! !webpack amd options */ 297) !== null)) { +} else if (("function" !== "undefined" && __webpack_require__(/*! !webpack amd define */ 181) !== null) && (__webpack_require__(/*! !webpack amd options */ 296) !== null)) { !(__WEBPACK_AMD_DEFINE_RESULT__ = (function() { return saveAs; }).call(exports, __webpack_require__, exports, module), @@ -25023,10 +25023,10 @@ function JSZip() { return newObj; }; } -JSZip.prototype = __webpack_require__(/*! ./object */ 345); -JSZip.prototype.loadAsync = __webpack_require__(/*! ./load */ 302); +JSZip.prototype = __webpack_require__(/*! ./object */ 344); +JSZip.prototype.loadAsync = __webpack_require__(/*! ./load */ 301); JSZip.support = __webpack_require__(/*! ./support */ 96); -JSZip.defaults = __webpack_require__(/*! ./defaults */ 211); +JSZip.defaults = __webpack_require__(/*! ./defaults */ 210); // TODO find a better way to handle this version, // a require('package.json').version doesn't work with webpack, see #327 @@ -25906,10 +25906,10 @@ module.exports = function crc32wrapper(input, crc) { var external = __webpack_require__(/*! ./external */ 111); -var DataWorker = __webpack_require__(/*! ./stream/DataWorker */ 210); -var DataLengthProbe = __webpack_require__(/*! ./stream/DataLengthProbe */ 209); -var Crc32Probe = __webpack_require__(/*! ./stream/Crc32Probe */ 208); -var DataLengthProbe = __webpack_require__(/*! ./stream/DataLengthProbe */ 209); +var DataWorker = __webpack_require__(/*! ./stream/DataWorker */ 209); +var DataLengthProbe = __webpack_require__(/*! ./stream/DataLengthProbe */ 208); +var Crc32Probe = __webpack_require__(/*! ./stream/Crc32Probe */ 207); +var DataLengthProbe = __webpack_require__(/*! ./stream/DataLengthProbe */ 208); /** * Represent a compressed object, with everything needed to decompress it. @@ -25990,7 +25990,7 @@ module.exports = CompressedObject; /***/ (function(module, exports, __webpack_require__) { // Thank's IE8 for his funny defineProperty -module.exports = !__webpack_require__(/*! ./_fails */ 214)(function(){ +module.exports = !__webpack_require__(/*! ./_fails */ 213)(function(){ return Object.defineProperty({}, 'a', {get: function(){ return 7; }}).a != 7; }); @@ -26089,12 +26089,12 @@ util.inherits = __webpack_require__(/*! inherits */ 108); /**/ var internalUtil = { - deprecate: __webpack_require__(/*! util-deprecate */ 340) + deprecate: __webpack_require__(/*! util-deprecate */ 339) }; /**/ /**/ -var Stream = __webpack_require__(/*! ./internal/streams/stream */ 223); +var Stream = __webpack_require__(/*! ./internal/streams/stream */ 222); /**/ /**/ @@ -26110,7 +26110,7 @@ function _isUint8Array(obj) { /**/ -var destroyImpl = __webpack_require__(/*! ./internal/streams/destroy */ 220); +var destroyImpl = __webpack_require__(/*! ./internal/streams/destroy */ 219); util.inherits(Writable, Stream); @@ -26694,7 +26694,7 @@ Writable.prototype._destroy = function (err, cb) { this.end(); cb(err); }; -/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../process/browser.js */ 114), __webpack_require__(/*! ./../../timers-browserify/main.js */ 227).setImmediate, __webpack_require__(/*! ./../../webpack/buildin/global.js */ 89))) +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../process/browser.js */ 114), __webpack_require__(/*! ./../../timers-browserify/main.js */ 226).setImmediate, __webpack_require__(/*! ./../../webpack/buildin/global.js */ 89))) /***/ }), /* 174 */ @@ -26705,13 +26705,13 @@ Writable.prototype._destroy = function (err, cb) { /*! all exports used */ /***/ (function(module, exports, __webpack_require__) { -exports = module.exports = __webpack_require__(/*! ./lib/_stream_readable.js */ 224); +exports = module.exports = __webpack_require__(/*! ./lib/_stream_readable.js */ 223); exports.Stream = exports; exports.Readable = exports; exports.Writable = __webpack_require__(/*! ./lib/_stream_writable.js */ 173); exports.Duplex = __webpack_require__(/*! ./lib/_stream_duplex.js */ 101); -exports.Transform = __webpack_require__(/*! ./lib/_stream_transform.js */ 218); -exports.PassThrough = __webpack_require__(/*! ./lib/_stream_passthrough.js */ 339); +exports.Transform = __webpack_require__(/*! ./lib/_stream_transform.js */ 217); +exports.PassThrough = __webpack_require__(/*! ./lib/_stream_passthrough.js */ 338); /***/ }), @@ -30937,8 +30937,7 @@ module.exports = function() { /***/ }), /* 182 */, /* 183 */, -/* 184 */, -/* 185 */ +/* 184 */ /*!*******************************************!*\ !*** ./node_modules/check-error/index.js ***! \*******************************************/ @@ -31122,7 +31121,7 @@ module.exports = { /***/ }), -/* 186 */ +/* 185 */ /*!*****************************************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/getOwnEnumerablePropertySymbols.js ***! \*****************************************************************************/ @@ -31160,7 +31159,7 @@ module.exports = function getOwnEnumerablePropertySymbols(obj) { /***/ }), -/* 187 */ +/* 186 */ /*!********************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/objDisplay.js ***! \********************************************************/ @@ -31221,7 +31220,7 @@ module.exports = function objDisplay(obj) { /***/ }), -/* 188 */ +/* 187 */ /*!***********************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/getProperties.js ***! \***********************************************************/ @@ -31268,7 +31267,7 @@ module.exports = function getProperties(object) { /***/ }), -/* 189 */ +/* 188 */ /*!*********************************************!*\ !*** ./node_modules/get-func-name/index.js ***! \*********************************************/ @@ -31324,7 +31323,7 @@ module.exports = getFuncName; /***/ }), -/* 190 */ +/* 189 */ /*!*******************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/getActual.js ***! \*******************************************************/ @@ -31355,7 +31354,7 @@ module.exports = function getActual(obj, args) { /***/ }), -/* 191 */ +/* 190 */ /*!***********************************************!*\ !*** ./node_modules/assertion-error/index.js ***! \***********************************************/ @@ -31482,7 +31481,7 @@ AssertionError.prototype.toJSON = function (stack) { /***/ }), -/* 192 */ +/* 191 */ /*!**************************************************!*\ !*** ./node_modules/normalize.css/normalize.css ***! \**************************************************/ @@ -31492,7 +31491,7 @@ AssertionError.prototype.toJSON = function (stack) { // extracted by mini-css-extract-plugin /***/ }), -/* 193 */ +/* 192 */ /*!*************************************************************************!*\ !*** ./node_modules/escodegen/node_modules/source-map/lib/array-set.js ***! \*************************************************************************/ @@ -31624,7 +31623,7 @@ exports.ArraySet = ArraySet; /***/ }), -/* 194 */ +/* 193 */ /*!**************************************************************************!*\ !*** ./node_modules/escodegen/node_modules/source-map/lib/base64-vlq.js ***! \**************************************************************************/ @@ -31669,7 +31668,7 @@ exports.ArraySet = ArraySet; * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -var base64 = __webpack_require__(/*! ./base64 */ 290); +var base64 = __webpack_require__(/*! ./base64 */ 289); // A single base 64 digit can contain 6 bits of data. For the base 64 variable // length quantities we use in the source map spec, the first bit is the sign, @@ -31775,7 +31774,7 @@ exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) { /***/ }), -/* 195 */ +/* 194 */ /*!************************************************************************************!*\ !*** ./node_modules/escodegen/node_modules/source-map/lib/source-map-generator.js ***! \************************************************************************************/ @@ -31790,10 +31789,10 @@ exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) { * http://opensource.org/licenses/BSD-3-Clause */ -var base64VLQ = __webpack_require__(/*! ./base64-vlq */ 194); +var base64VLQ = __webpack_require__(/*! ./base64-vlq */ 193); var util = __webpack_require__(/*! ./util */ 110); -var ArraySet = __webpack_require__(/*! ./array-set */ 193).ArraySet; -var MappingList = __webpack_require__(/*! ./mapping-list */ 289).MappingList; +var ArraySet = __webpack_require__(/*! ./array-set */ 192).ArraySet; +var MappingList = __webpack_require__(/*! ./mapping-list */ 288).MappingList; /** * An instance of the SourceMapGenerator represents a source map which is @@ -32211,7 +32210,7 @@ exports.SourceMapGenerator = SourceMapGenerator; /***/ }), -/* 196 */ +/* 195 */ /*!******************************************!*\ !*** ./node_modules/esutils/lib/code.js ***! \******************************************/ @@ -32357,7 +32356,7 @@ exports.SourceMapGenerator = SourceMapGenerator; /***/ }), -/* 197 */ +/* 196 */ /*!***********************************************************!*\ !*** ./node_modules/jszip/lib/reader/Uint8ArrayReader.js ***! \***********************************************************/ @@ -32367,7 +32366,7 @@ exports.SourceMapGenerator = SourceMapGenerator; "use strict"; -var ArrayReader = __webpack_require__(/*! ./ArrayReader */ 199); +var ArrayReader = __webpack_require__(/*! ./ArrayReader */ 198); var utils = __webpack_require__(/*! ../utils */ 63); function Uint8ArrayReader(data) { @@ -32391,7 +32390,7 @@ module.exports = Uint8ArrayReader; /***/ }), -/* 198 */ +/* 197 */ /*!*****************************************************!*\ !*** ./node_modules/jszip/lib/reader/DataReader.js ***! \*****************************************************/ @@ -32519,7 +32518,7 @@ module.exports = DataReader; /***/ }), -/* 199 */ +/* 198 */ /*!******************************************************!*\ !*** ./node_modules/jszip/lib/reader/ArrayReader.js ***! \******************************************************/ @@ -32529,7 +32528,7 @@ module.exports = DataReader; "use strict"; -var DataReader = __webpack_require__(/*! ./DataReader */ 198); +var DataReader = __webpack_require__(/*! ./DataReader */ 197); var utils = __webpack_require__(/*! ../utils */ 63); function ArrayReader(data) { @@ -32588,7 +32587,7 @@ module.exports = ArrayReader; /***/ }), -/* 200 */ +/* 199 */ /*!****************************************************!*\ !*** ./node_modules/jszip/lib/reader/readerFor.js ***! \****************************************************/ @@ -32601,10 +32600,10 @@ module.exports = ArrayReader; var utils = __webpack_require__(/*! ../utils */ 63); var support = __webpack_require__(/*! ../support */ 96); -var ArrayReader = __webpack_require__(/*! ./ArrayReader */ 199); -var StringReader = __webpack_require__(/*! ./StringReader */ 300); -var NodeBufferReader = __webpack_require__(/*! ./NodeBufferReader */ 299); -var Uint8ArrayReader = __webpack_require__(/*! ./Uint8ArrayReader */ 197); +var ArrayReader = __webpack_require__(/*! ./ArrayReader */ 198); +var StringReader = __webpack_require__(/*! ./StringReader */ 299); +var NodeBufferReader = __webpack_require__(/*! ./NodeBufferReader */ 298); +var Uint8ArrayReader = __webpack_require__(/*! ./Uint8ArrayReader */ 196); /** * Create a reader adapted to the data. @@ -32628,7 +32627,7 @@ module.exports = function (data) { /***/ }), -/* 201 */ +/* 200 */ /*!*********************************************!*\ !*** ./node_modules/jszip/lib/signature.js ***! \*********************************************/ @@ -32647,7 +32646,7 @@ exports.DATA_DESCRIPTOR = "PK\x07\x08"; /***/ }), -/* 202 */ +/* 201 */ /*!*************************************************!*\ !*** ./node_modules/pako/lib/zlib/constants.js ***! \*************************************************/ @@ -32727,7 +32726,7 @@ module.exports = { /***/ }), -/* 203 */ +/* 202 */ /*!***********************************************!*\ !*** ./node_modules/pako/lib/zlib/zstream.js ***! \***********************************************/ @@ -32786,7 +32785,7 @@ module.exports = ZStream; /***/ }), -/* 204 */ +/* 203 */ /*!************************************************!*\ !*** ./node_modules/pako/lib/utils/strings.js ***! \************************************************/ @@ -32983,7 +32982,7 @@ exports.utf8border = function (buf, max) { /***/ }), -/* 205 */ +/* 204 */ /*!*********************************************!*\ !*** ./node_modules/pako/lib/zlib/crc32.js ***! \*********************************************/ @@ -33054,7 +33053,7 @@ module.exports = crc32; /***/ }), -/* 206 */ +/* 205 */ /*!***********************************************!*\ !*** ./node_modules/pako/lib/zlib/adler32.js ***! \***********************************************/ @@ -33117,7 +33116,7 @@ module.exports = adler32; /***/ }), -/* 207 */ +/* 206 */ /*!************************************************!*\ !*** ./node_modules/jszip/lib/compressions.js ***! \************************************************/ @@ -33139,11 +33138,11 @@ exports.STORE = { return new GenericWorker("STORE decompression"); } }; -exports.DEFLATE = __webpack_require__(/*! ./flate */ 314); +exports.DEFLATE = __webpack_require__(/*! ./flate */ 313); /***/ }), -/* 208 */ +/* 207 */ /*!*****************************************************!*\ !*** ./node_modules/jszip/lib/stream/Crc32Probe.js ***! \*****************************************************/ @@ -33179,7 +33178,7 @@ module.exports = Crc32Probe; /***/ }), -/* 209 */ +/* 208 */ /*!**********************************************************!*\ !*** ./node_modules/jszip/lib/stream/DataLengthProbe.js ***! \**********************************************************/ @@ -33220,7 +33219,7 @@ module.exports = DataLengthProbe; /***/ }), -/* 210 */ +/* 209 */ /*!*****************************************************!*\ !*** ./node_modules/jszip/lib/stream/DataWorker.js ***! \*****************************************************/ @@ -33348,7 +33347,7 @@ module.exports = DataWorker; /***/ }), -/* 211 */ +/* 210 */ /*!********************************************!*\ !*** ./node_modules/jszip/lib/defaults.js ***! \********************************************/ @@ -33371,7 +33370,7 @@ exports.dosPermissions = null; /***/ }), -/* 212 */ +/* 211 */ /*!*******************************************************!*\ !*** ./node_modules/jszip/lib/stream/StreamHelper.js ***! \*******************************************************/ @@ -33383,16 +33382,16 @@ exports.dosPermissions = null; /* WEBPACK VAR INJECTION */(function(Buffer) { var utils = __webpack_require__(/*! ../utils */ 63); -var ConvertWorker = __webpack_require__(/*! ./ConvertWorker */ 318); +var ConvertWorker = __webpack_require__(/*! ./ConvertWorker */ 317); var GenericWorker = __webpack_require__(/*! ./GenericWorker */ 83); -var base64 = __webpack_require__(/*! ../base64 */ 217); +var base64 = __webpack_require__(/*! ../base64 */ 216); var support = __webpack_require__(/*! ../support */ 96); var external = __webpack_require__(/*! ../external */ 111); var NodejsStreamOutputAdapter = null; if (support.nodestream) { try { - NodejsStreamOutputAdapter = __webpack_require__(/*! ../nodejs/NodejsStreamOutputAdapter */ 317); + NodejsStreamOutputAdapter = __webpack_require__(/*! ../nodejs/NodejsStreamOutputAdapter */ 316); } catch(e) {} } @@ -33596,7 +33595,7 @@ module.exports = StreamHelper; /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../buffer/index.js */ 113).Buffer)) /***/ }), -/* 213 */ +/* 212 */ /*!********************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_dom-create.js ***! \********************************************************************************/ @@ -33613,7 +33612,7 @@ module.exports = function(it){ }; /***/ }), -/* 214 */ +/* 213 */ /*!***************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_fails.js ***! \***************************************************************************/ @@ -33630,7 +33629,7 @@ module.exports = function(exec){ }; /***/ }), -/* 215 */ +/* 214 */ /*!*************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_ctx.js ***! \*************************************************************************/ @@ -33639,7 +33638,7 @@ module.exports = function(exec){ /***/ (function(module, exports, __webpack_require__) { // optional / simple context binding -var aFunction = __webpack_require__(/*! ./_a-function */ 331); +var aFunction = __webpack_require__(/*! ./_a-function */ 330); module.exports = function(fn, that, length){ aFunction(fn); if(that === undefined)return fn; @@ -33660,7 +33659,7 @@ module.exports = function(fn, that, length){ }; /***/ }), -/* 216 */ +/* 215 */ /*!**************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_core.js ***! \**************************************************************************/ @@ -33672,7 +33671,7 @@ var core = module.exports = {version: '2.3.0'}; if(typeof __e == 'number')__e = core; // eslint-disable-line no-undef /***/ }), -/* 217 */ +/* 216 */ /*!******************************************!*\ !*** ./node_modules/jszip/lib/base64.js ***! \******************************************/ @@ -33790,7 +33789,7 @@ exports.decode = function(input) { /***/ }), -/* 218 */ +/* 217 */ /*!***************************************************************!*\ !*** ./node_modules/readable-stream/lib/_stream_transform.js ***! \***************************************************************/ @@ -34015,7 +34014,7 @@ function done(stream, er, data) { } /***/ }), -/* 219 */ +/* 218 */ /*!***********************************************************!*\ !*** ./node_modules/string_decoder/lib/string_decoder.js ***! \***********************************************************/ @@ -34298,7 +34297,7 @@ function simpleEnd(buf) { } /***/ }), -/* 220 */ +/* 219 */ /*!**********************************************************************!*\ !*** ./node_modules/readable-stream/lib/internal/streams/destroy.js ***! \**********************************************************************/ @@ -34383,9 +34382,9 @@ module.exports = { }; /***/ }), +/* 220 */, /* 221 */, -/* 222 */, -/* 223 */ +/* 222 */ /*!*****************************************************************************!*\ !*** ./node_modules/readable-stream/lib/internal/streams/stream-browser.js ***! \*****************************************************************************/ @@ -34397,7 +34396,7 @@ module.exports = __webpack_require__(/*! events */ 175).EventEmitter; /***/ }), -/* 224 */ +/* 223 */ /*!**************************************************************!*\ !*** ./node_modules/readable-stream/lib/_stream_readable.js ***! \**************************************************************/ @@ -34437,7 +34436,7 @@ var processNextTick = __webpack_require__(/*! process-nextick-args */ 133).nextT module.exports = Readable; /**/ -var isArray = __webpack_require__(/*! isarray */ 226); +var isArray = __webpack_require__(/*! isarray */ 225); /**/ /**/ @@ -34455,7 +34454,7 @@ var EElistenerCount = function (emitter, type) { /**/ /**/ -var Stream = __webpack_require__(/*! ./internal/streams/stream */ 223); +var Stream = __webpack_require__(/*! ./internal/streams/stream */ 222); /**/ /**/ @@ -34477,7 +34476,7 @@ util.inherits = __webpack_require__(/*! inherits */ 108); /**/ /**/ -var debugUtil = __webpack_require__(/*! util */ 222); +var debugUtil = __webpack_require__(/*! util */ 221); var debug = void 0; if (debugUtil && debugUtil.debuglog) { debug = debugUtil.debuglog('stream'); @@ -34486,8 +34485,8 @@ if (debugUtil && debugUtil.debuglog) { } /**/ -var BufferList = __webpack_require__(/*! ./internal/streams/BufferList */ 341); -var destroyImpl = __webpack_require__(/*! ./internal/streams/destroy */ 220); +var BufferList = __webpack_require__(/*! ./internal/streams/BufferList */ 340); +var destroyImpl = __webpack_require__(/*! ./internal/streams/destroy */ 219); var StringDecoder; util.inherits(Readable, Stream); @@ -34577,7 +34576,7 @@ function ReadableState(options, stream) { this.decoder = null; this.encoding = null; if (options.encoding) { - if (!StringDecoder) StringDecoder = __webpack_require__(/*! string_decoder/ */ 219).StringDecoder; + if (!StringDecoder) StringDecoder = __webpack_require__(/*! string_decoder/ */ 218).StringDecoder; this.decoder = new StringDecoder(options.encoding); this.encoding = options.encoding; } @@ -34733,7 +34732,7 @@ Readable.prototype.isPaused = function () { // backwards compatibility. Readable.prototype.setEncoding = function (enc) { - if (!StringDecoder) StringDecoder = __webpack_require__(/*! string_decoder/ */ 219).StringDecoder; + if (!StringDecoder) StringDecoder = __webpack_require__(/*! string_decoder/ */ 218).StringDecoder; this._readableState.decoder = new StringDecoder(enc); this._readableState.encoding = enc; return this; @@ -35424,7 +35423,7 @@ function indexOf(xs, x) { /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../webpack/buildin/global.js */ 89), __webpack_require__(/*! ./../../process/browser.js */ 114))) /***/ }), -/* 225 */ +/* 224 */ /*!***********************************************************!*\ !*** ./node_modules/jszip/lib/readable-stream-browser.js ***! \***********************************************************/ @@ -35440,11 +35439,11 @@ function indexOf(xs, x) { * reduce the final size of the bundle (only one stream implementation, not * two). */ -module.exports = __webpack_require__(/*! stream */ 342); +module.exports = __webpack_require__(/*! stream */ 341); /***/ }), -/* 226 */ +/* 225 */ /*!***************************************!*\ !*** ./node_modules/isarray/index.js ***! \***************************************/ @@ -35460,7 +35459,7 @@ module.exports = Array.isArray || function (arr) { /***/ }), -/* 227 */ +/* 226 */ /*!************************************************!*\ !*** ./node_modules/timers-browserify/main.js ***! \************************************************/ @@ -35521,7 +35520,7 @@ exports._unrefActive = exports.active = function(item) { }; // setimmediate attaches itself to the global object -__webpack_require__(/*! setimmediate */ 346); +__webpack_require__(/*! setimmediate */ 345); // On some exotic environments, it's not clear which object `setimmediate` was // able to install onto. Search each possibility in the same order as the // `setimmediate` library. @@ -35535,7 +35534,7 @@ exports.clearImmediate = (typeof self !== "undefined" && self.clearImmediate) || /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../webpack/buildin/global.js */ 89))) /***/ }), -/* 228 */ +/* 227 */ /*!******************************************************!*\ !*** ./node_modules/bluebird/js/browser/bluebird.js ***! \******************************************************/ @@ -40845,10 +40844,10 @@ module.exports = ret; },{"./es5":13}]},{},[4])(4) }); ;if (typeof window !== 'undefined' && window !== null) { window.P = window.Promise; } else if (typeof self !== 'undefined' && self !== null) { self.P = self.Promise; } -/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../process/browser.js */ 114), __webpack_require__(/*! ./../../../webpack/buildin/global.js */ 89), __webpack_require__(/*! ./../../../timers-browserify/main.js */ 227).setImmediate)) +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../process/browser.js */ 114), __webpack_require__(/*! ./../../../webpack/buildin/global.js */ 89), __webpack_require__(/*! ./../../../timers-browserify/main.js */ 226).setImmediate)) /***/ }), -/* 229 */ +/* 228 */ /*!**************************************************!*\ !*** ./node_modules/brace/ext/language_tools.js ***! \**************************************************/ @@ -42814,7 +42813,7 @@ acequire("../config").defineOptions(Editor.prototype, "editor", { /***/ }), -/* 230 */ +/* 229 */ /*!************************************************!*\ !*** ./node_modules/brace/keybinding/emacs.js ***! \************************************************/ @@ -44006,7 +44005,7 @@ exports.killRing = { /***/ }), -/* 231 */ +/* 230 */ /*!**********************************************!*\ !*** ./node_modules/brace/keybinding/vim.js ***! \**********************************************/ @@ -49615,7 +49614,7 @@ dom.importCssString(".normal-mode .ace_cursor{\ /***/ }), -/* 232 */ +/* 231 */ /*!*******************************************!*\ !*** ./node_modules/brace/theme/xcode.js ***! \*******************************************/ @@ -49714,7 +49713,7 @@ dom.importCssString(exports.cssText, exports.cssClass); /***/ }), -/* 233 */ +/* 232 */ /*!**********************************************!*\ !*** ./node_modules/brace/theme/twilight.js ***! \**********************************************/ @@ -49834,7 +49833,7 @@ dom.importCssString(exports.cssText, exports.cssClass); /***/ }), -/* 234 */ +/* 233 */ /*!**********************************************!*\ !*** ./node_modules/brace/theme/terminal.js ***! \**********************************************/ @@ -49959,7 +49958,7 @@ dom.importCssString(exports.cssText, exports.cssClass); /***/ }), -/* 235 */ +/* 234 */ /*!*****************************************************!*\ !*** ./node_modules/brace/theme/solarized_light.js ***! \*****************************************************/ @@ -50061,7 +50060,7 @@ dom.importCssString(exports.cssText, exports.cssClass); /***/ }), -/* 236 */ +/* 235 */ /*!****************************************************!*\ !*** ./node_modules/brace/theme/solarized_dark.js ***! \****************************************************/ @@ -50160,7 +50159,7 @@ dom.importCssString(exports.cssText, exports.cssClass); /***/ }), -/* 237 */ +/* 236 */ /*!*********************************************!*\ !*** ./node_modules/brace/theme/monokai.js ***! \*********************************************/ @@ -50276,7 +50275,7 @@ dom.importCssString(exports.cssText, exports.cssClass); /***/ }), -/* 238 */ +/* 237 */ /*!********************************************!*\ !*** ./node_modules/brace/theme/chrome.js ***! \********************************************/ @@ -50415,7 +50414,7 @@ dom.importCssString(exports.cssText, exports.cssClass); /***/ }), -/* 239 */ +/* 238 */ /*!*******************************************!*\ !*** ./node_modules/brace/theme/chaos.js ***! \*******************************************/ @@ -50582,7 +50581,7 @@ dom.importCssString(exports.cssText, exports.cssClass); /***/ }), -/* 240 */ +/* 239 */ /*!***********************************************!*\ !*** ./node_modules/brace/mode/javascript.js ***! \***********************************************/ @@ -51382,7 +51381,7 @@ exports.Mode = Mode; /***/ }), -/* 241 */ +/* 240 */ /*!**********************************************!*\ !*** ./node_modules/js-beautify/js/index.js ***! \**********************************************/ @@ -51457,7 +51456,7 @@ if (true) { !(__WEBPACK_AMD_DEFINE_ARRAY__ = [ __webpack_require__(/*! ./lib/beautify */ 180), __webpack_require__(/*! ./lib/beautify-css */ 179), - __webpack_require__(/*! ./lib/beautify-html */ 347) + __webpack_require__(/*! ./lib/beautify-html */ 346) ], __WEBPACK_AMD_DEFINE_RESULT__ = (function(js_beautify, css_beautify, html_beautify) { return get_beautify(js_beautify, css_beautify, html_beautify); }).apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__), @@ -51465,7 +51464,7 @@ if (true) { } else {} /***/ }), -/* 242 */ +/* 241 */ /*!*************************************!*\ !*** ./node_modules/brace/index.js ***! \*************************************/ @@ -71747,7 +71746,7 @@ exports.version = "1.2.9"; module.exports = window.ace.acequire("ace/ace"); /***/ }), -/* 243 */ +/* 242 */ /*!*************************************************!*\ !*** ./node_modules/jsplumb/dist/js/jsplumb.js ***! \*************************************************/ @@ -86444,7 +86443,7 @@ module.exports = window.ace.acequire("ace/ace"); /***/ }), -/* 244 */ +/* 243 */ /*!********************************************!*\ !*** ./node_modules/numeral/locales/ru.js ***! \********************************************/ @@ -86488,7 +86487,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 245 */ +/* 244 */ /*!********************************************!*\ !*** ./node_modules/numeral/locales/pl.js ***! \********************************************/ @@ -86529,7 +86528,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 246 */ +/* 245 */ /*!********************************************!*\ !*** ./node_modules/numeral/locales/no.js ***! \********************************************/ @@ -86570,7 +86569,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 247 */ +/* 246 */ /*!********************************************!*\ !*** ./node_modules/numeral/locales/lv.js ***! \********************************************/ @@ -86611,7 +86610,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 248 */ +/* 247 */ /*!********************************************!*\ !*** ./node_modules/numeral/locales/it.js ***! \********************************************/ @@ -86652,7 +86651,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 249 */ +/* 248 */ /*!********************************************!*\ !*** ./node_modules/numeral/locales/hu.js ***! \********************************************/ @@ -86693,7 +86692,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 250 */ +/* 249 */ /*!********************************************!*\ !*** ./node_modules/numeral/locales/fr.js ***! \********************************************/ @@ -86734,7 +86733,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 251 */ +/* 250 */ /*!********************************************!*\ !*** ./node_modules/numeral/locales/es.js ***! \********************************************/ @@ -86780,7 +86779,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 252 */ +/* 251 */ /*!***********************************************!*\ !*** ./node_modules/numeral/locales/en-gb.js ***! \***********************************************/ @@ -86825,7 +86824,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 253 */ +/* 252 */ /*!***********************************************!*\ !*** ./node_modules/numeral/locales/en-au.js ***! \***********************************************/ @@ -86870,7 +86869,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 254 */ +/* 253 */ /*!********************************************!*\ !*** ./node_modules/numeral/locales/de.js ***! \********************************************/ @@ -86911,7 +86910,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 255 */ +/* 254 */ /*!***********************************************!*\ !*** ./node_modules/numeral/locales/da-dk.js ***! \***********************************************/ @@ -86952,7 +86951,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 256 */ +/* 255 */ /*!********************************************!*\ !*** ./node_modules/numeral/locales/cs.js ***! \********************************************/ @@ -86993,7 +86992,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 257 */ +/* 256 */ /*!********************************************!*\ !*** ./node_modules/numeral/locales/bg.js ***! \********************************************/ @@ -87042,7 +87041,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 258 */ +/* 257 */ /*!***************************************************************!*\ !*** ./node_modules/chai-as-promised/lib/chai-as-promised.js ***! \***************************************************************/ @@ -87053,7 +87052,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ "use strict"; /* eslint-disable no-invalid-this */ -let checkError = __webpack_require__(/*! check-error */ 185); +let checkError = __webpack_require__(/*! check-error */ 184); module.exports = (chai, utils) => { const Assertion = chai.Assertion; @@ -87415,7 +87414,7 @@ module.exports.transformAsserterArgs = values => values; /***/ }), -/* 259 */ +/* 258 */ /*!********************************************************!*\ !*** ./node_modules/chai/lib/chai/interface/assert.js ***! \********************************************************/ @@ -90524,7 +90523,7 @@ module.exports = function (chai, util) { /***/ }), -/* 260 */ +/* 259 */ /*!********************************************************!*\ !*** ./node_modules/chai/lib/chai/interface/should.js ***! \********************************************************/ @@ -90739,7 +90738,7 @@ module.exports = function (chai, util) { /***/ }), -/* 261 */ +/* 260 */ /*!********************************************************!*\ !*** ./node_modules/chai/lib/chai/interface/expect.js ***! \********************************************************/ @@ -90784,7 +90783,7 @@ module.exports = function (chai, util) { /***/ }), -/* 262 */ +/* 261 */ /*!*******************************************************!*\ !*** ./node_modules/chai/lib/chai/core/assertions.js ***! \*******************************************************/ @@ -94524,7 +94523,7 @@ module.exports = function (chai, _) { /***/ }), -/* 263 */ +/* 262 */ /*!*************************************************!*\ !*** ./node_modules/chai/lib/chai/assertion.js ***! \*************************************************/ @@ -94700,7 +94699,7 @@ module.exports = function (_chai, util) { /***/ }), -/* 264 */ +/* 263 */ /*!***************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/isNaN.js ***! \***************************************************/ @@ -94737,7 +94736,7 @@ module.exports = Number.isNaN || isNaN; /***/ }), -/* 265 */ +/* 264 */ /*!************************************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/getOwnEnumerableProperties.js ***! \************************************************************************/ @@ -94755,7 +94754,7 @@ module.exports = Number.isNaN || isNaN; * Module dependancies */ -var getOwnEnumerablePropertySymbols = __webpack_require__(/*! ./getOwnEnumerablePropertySymbols */ 186); +var getOwnEnumerablePropertySymbols = __webpack_require__(/*! ./getOwnEnumerablePropertySymbols */ 185); /** * ### .getOwnEnumerableProperties(object) @@ -94777,7 +94776,7 @@ module.exports = function getOwnEnumerableProperties(obj) { /***/ }), -/* 266 */ +/* 265 */ /*!**************************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/compareByInspect.js ***! \**************************************************************/ @@ -94819,7 +94818,7 @@ module.exports = function compareByInspect(a, b) { /***/ }), -/* 267 */ +/* 266 */ /*!**********************************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/overwriteChainableMethod.js ***! \**********************************************************************/ @@ -94899,7 +94898,7 @@ module.exports = function overwriteChainableMethod(ctx, name, method, chainingBe /***/ }), -/* 268 */ +/* 267 */ /*!****************************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/addChainableMethod.js ***! \****************************************************************/ @@ -95062,7 +95061,7 @@ module.exports = function addChainableMethod(ctx, name, method, chainingBehavior /***/ }), -/* 269 */ +/* 268 */ /*!*************************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/overwriteMethod.js ***! \*************************************************************/ @@ -95165,7 +95164,7 @@ module.exports = function overwriteMethod(ctx, name, method) { /***/ }), -/* 270 */ +/* 269 */ /*!***************************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/overwriteProperty.js ***! \***************************************************************/ @@ -95268,7 +95267,7 @@ module.exports = function overwriteProperty(ctx, name, getter) { /***/ }), -/* 271 */ +/* 270 */ /*!*******************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/addMethod.js ***! \*******************************************************/ @@ -95347,7 +95346,7 @@ module.exports = function addMethod(ctx, name, method) { /***/ }), -/* 272 */ +/* 271 */ /*!*********************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/addProperty.js ***! \*********************************************************/ @@ -95430,7 +95429,7 @@ module.exports = function addProperty(ctx, name, getter) { /***/ }), -/* 273 */ +/* 272 */ /*!****************************************!*\ !*** ./node_modules/deep-eql/index.js ***! \****************************************/ @@ -95897,7 +95896,7 @@ function isPrimitive(value) { /***/ }), -/* 274 */ +/* 273 */ /*!*********************************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/getEnumerableProperties.js ***! \*********************************************************************/ @@ -95934,7 +95933,7 @@ module.exports = function getEnumerableProperties(object) { /***/ }), -/* 275 */ +/* 274 */ /*!********************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/getMessage.js ***! \********************************************************/ @@ -95953,9 +95952,9 @@ module.exports = function getEnumerableProperties(object) { */ var flag = __webpack_require__(/*! ./flag */ 88) - , getActual = __webpack_require__(/*! ./getActual */ 190) + , getActual = __webpack_require__(/*! ./getActual */ 189) , inspect = __webpack_require__(/*! ./inspect */ 129) - , objDisplay = __webpack_require__(/*! ./objDisplay */ 187); + , objDisplay = __webpack_require__(/*! ./objDisplay */ 186); /** * ### .getMessage(object, message, negateMessage) @@ -95996,7 +95995,7 @@ module.exports = function getMessage(obj, args) { /***/ }), -/* 276 */ +/* 275 */ /*!*********************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/expectTypes.js ***! \*********************************************************/ @@ -96024,7 +96023,7 @@ module.exports = function getMessage(obj, args) { * @api public */ -var AssertionError = __webpack_require__(/*! assertion-error */ 191); +var AssertionError = __webpack_require__(/*! assertion-error */ 190); var flag = __webpack_require__(/*! ./flag */ 88); var type = __webpack_require__(/*! type-detect */ 139); @@ -96058,7 +96057,7 @@ module.exports = function expectTypes(obj, types) { /***/ }), -/* 277 */ +/* 276 */ /*!**************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/test.js ***! \**************************************************/ @@ -96097,7 +96096,7 @@ module.exports = function test(obj, args) { /***/ }), -/* 278 */ +/* 277 */ /*!***************************************!*\ !*** ./node_modules/pathval/index.js ***! \***************************************/ @@ -96400,7 +96399,7 @@ module.exports = { /***/ }), -/* 279 */ +/* 278 */ /*!***************************************************!*\ !*** ./node_modules/chai/lib/chai/utils/index.js ***! \***************************************************/ @@ -96418,13 +96417,13 @@ module.exports = { * Dependencies that are used for multiple exports are required here only once */ -var pathval = __webpack_require__(/*! pathval */ 278); +var pathval = __webpack_require__(/*! pathval */ 277); /*! * test utility */ -exports.test = __webpack_require__(/*! ./test */ 277); +exports.test = __webpack_require__(/*! ./test */ 276); /*! * type utility @@ -96435,19 +96434,19 @@ exports.type = __webpack_require__(/*! type-detect */ 139); /*! * expectTypes utility */ -exports.expectTypes = __webpack_require__(/*! ./expectTypes */ 276); +exports.expectTypes = __webpack_require__(/*! ./expectTypes */ 275); /*! * message utility */ -exports.getMessage = __webpack_require__(/*! ./getMessage */ 275); +exports.getMessage = __webpack_require__(/*! ./getMessage */ 274); /*! * actual utility */ -exports.getActual = __webpack_require__(/*! ./getActual */ 190); +exports.getActual = __webpack_require__(/*! ./getActual */ 189); /*! * Inspect util @@ -96459,7 +96458,7 @@ exports.inspect = __webpack_require__(/*! ./inspect */ 129); * Object Display util */ -exports.objDisplay = __webpack_require__(/*! ./objDisplay */ 187); +exports.objDisplay = __webpack_require__(/*! ./objDisplay */ 186); /*! * Flag utility @@ -96477,7 +96476,7 @@ exports.transferFlags = __webpack_require__(/*! ./transferFlags */ 98); * Deep equal utility */ -exports.eql = __webpack_require__(/*! deep-eql */ 273); +exports.eql = __webpack_require__(/*! deep-eql */ 272); /*! * Deep path info @@ -96495,67 +96494,67 @@ exports.hasProperty = pathval.hasProperty; * Function name */ -exports.getName = __webpack_require__(/*! get-func-name */ 189); +exports.getName = __webpack_require__(/*! get-func-name */ 188); /*! * add Property */ -exports.addProperty = __webpack_require__(/*! ./addProperty */ 272); +exports.addProperty = __webpack_require__(/*! ./addProperty */ 271); /*! * add Method */ -exports.addMethod = __webpack_require__(/*! ./addMethod */ 271); +exports.addMethod = __webpack_require__(/*! ./addMethod */ 270); /*! * overwrite Property */ -exports.overwriteProperty = __webpack_require__(/*! ./overwriteProperty */ 270); +exports.overwriteProperty = __webpack_require__(/*! ./overwriteProperty */ 269); /*! * overwrite Method */ -exports.overwriteMethod = __webpack_require__(/*! ./overwriteMethod */ 269); +exports.overwriteMethod = __webpack_require__(/*! ./overwriteMethod */ 268); /*! * Add a chainable method */ -exports.addChainableMethod = __webpack_require__(/*! ./addChainableMethod */ 268); +exports.addChainableMethod = __webpack_require__(/*! ./addChainableMethod */ 267); /*! * Overwrite chainable method */ -exports.overwriteChainableMethod = __webpack_require__(/*! ./overwriteChainableMethod */ 267); +exports.overwriteChainableMethod = __webpack_require__(/*! ./overwriteChainableMethod */ 266); /*! * Compare by inspect method */ -exports.compareByInspect = __webpack_require__(/*! ./compareByInspect */ 266); +exports.compareByInspect = __webpack_require__(/*! ./compareByInspect */ 265); /*! * Get own enumerable property symbols method */ -exports.getOwnEnumerablePropertySymbols = __webpack_require__(/*! ./getOwnEnumerablePropertySymbols */ 186); +exports.getOwnEnumerablePropertySymbols = __webpack_require__(/*! ./getOwnEnumerablePropertySymbols */ 185); /*! * Get own enumerable properties method */ -exports.getOwnEnumerableProperties = __webpack_require__(/*! ./getOwnEnumerableProperties */ 265); +exports.getOwnEnumerableProperties = __webpack_require__(/*! ./getOwnEnumerableProperties */ 264); /*! * Checks error against a given set of criteria */ -exports.checkError = __webpack_require__(/*! check-error */ 185); +exports.checkError = __webpack_require__(/*! check-error */ 184); /*! * Proxify util @@ -96579,11 +96578,11 @@ exports.isProxyEnabled = __webpack_require__(/*! ./isProxyEnabled */ 128); * isNaN method */ -exports.isNaN = __webpack_require__(/*! ./isNaN */ 264); +exports.isNaN = __webpack_require__(/*! ./isNaN */ 263); /***/ }), -/* 280 */ +/* 279 */ /*!************************************!*\ !*** ./node_modules/chai/index.js ***! \************************************/ @@ -96595,10 +96594,10 @@ module.exports = __webpack_require__(/*! ./lib/chai */ 100); /***/ }), +/* 280 */, /* 281 */, /* 282 */, -/* 283 */, -/* 284 */ +/* 283 */ /*!*********************************************!*\ !*** ./node_modules/escodegen/package.json ***! \*********************************************/ @@ -96609,7 +96608,7 @@ module.exports = __webpack_require__(/*! ./lib/chai */ 100); module.exports = {"_args":[["escodegen@1.11.0","C:\\Users\\danie\\Desktop\\bitburner"]],"_from":"escodegen@1.11.0","_id":"escodegen@1.11.0","_inBundle":false,"_integrity":"sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==","_location":"/escodegen","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"escodegen@1.11.0","name":"escodegen","escapedName":"escodegen","rawSpec":"1.11.0","saveSpec":null,"fetchSpec":"1.11.0"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz","_spec":"1.11.0","_where":"C:\\Users\\danie\\Desktop\\bitburner","bin":{"esgenerate":"./bin/esgenerate.js","escodegen":"./bin/escodegen.js"},"bugs":{"url":"https://github.com/estools/escodegen/issues"},"dependencies":{"esprima":"^3.1.3","estraverse":"^4.2.0","esutils":"^2.0.2","optionator":"^0.8.1","source-map":"~0.6.1"},"description":"ECMAScript code generator","devDependencies":{"acorn":"^4.0.4","bluebird":"^3.4.7","bower-registry-client":"^1.0.0","chai":"^3.5.0","commonjs-everywhere":"^0.9.7","gulp":"^3.8.10","gulp-eslint":"^3.0.1","gulp-mocha":"^3.0.1","semver":"^5.1.0"},"engines":{"node":">=4.0"},"files":["LICENSE.BSD","README.md","bin","escodegen.js","package.json"],"homepage":"http://github.com/estools/escodegen","license":"BSD-2-Clause","main":"escodegen.js","maintainers":[{"name":"Yusuke Suzuki","email":"utatane.tea@gmail.com","url":"http://github.com/Constellation"}],"name":"escodegen","optionalDependencies":{"source-map":"~0.6.1"},"repository":{"type":"git","url":"git+ssh://git@github.com/estools/escodegen.git"},"scripts":{"build":"cjsify -a path: tools/entry-point.js > escodegen.browser.js","build-min":"cjsify -ma path: tools/entry-point.js > escodegen.browser.min.js","lint":"gulp lint","release":"node tools/release.js","test":"gulp travis","unit-test":"gulp test"},"version":"1.11.0"}; /***/ }), -/* 285 */ +/* 284 */ /*!***************************************************************************!*\ !*** ./node_modules/escodegen/node_modules/source-map/lib/source-node.js ***! \***************************************************************************/ @@ -96624,7 +96623,7 @@ module.exports = {"_args":[["escodegen@1.11.0","C:\\Users\\danie\\Desktop\\bitbu * http://opensource.org/licenses/BSD-3-Clause */ -var SourceMapGenerator = __webpack_require__(/*! ./source-map-generator */ 195).SourceMapGenerator; +var SourceMapGenerator = __webpack_require__(/*! ./source-map-generator */ 194).SourceMapGenerator; var util = __webpack_require__(/*! ./util */ 110); // Matches a Windows-style `\r\n` newline or a `\n` newline used by all other @@ -97033,7 +97032,7 @@ exports.SourceNode = SourceNode; /***/ }), -/* 286 */ +/* 285 */ /*!**************************************************************************!*\ !*** ./node_modules/escodegen/node_modules/source-map/lib/quick-sort.js ***! \**************************************************************************/ @@ -97158,7 +97157,7 @@ exports.quickSort = function (ary, comparator) { /***/ }), -/* 287 */ +/* 286 */ /*!*****************************************************************************!*\ !*** ./node_modules/escodegen/node_modules/source-map/lib/binary-search.js ***! \*****************************************************************************/ @@ -97280,7 +97279,7 @@ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) { /***/ }), -/* 288 */ +/* 287 */ /*!***********************************************************************************!*\ !*** ./node_modules/escodegen/node_modules/source-map/lib/source-map-consumer.js ***! \***********************************************************************************/ @@ -97296,10 +97295,10 @@ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) { */ var util = __webpack_require__(/*! ./util */ 110); -var binarySearch = __webpack_require__(/*! ./binary-search */ 287); -var ArraySet = __webpack_require__(/*! ./array-set */ 193).ArraySet; -var base64VLQ = __webpack_require__(/*! ./base64-vlq */ 194); -var quickSort = __webpack_require__(/*! ./quick-sort */ 286).quickSort; +var binarySearch = __webpack_require__(/*! ./binary-search */ 286); +var ArraySet = __webpack_require__(/*! ./array-set */ 192).ArraySet; +var base64VLQ = __webpack_require__(/*! ./base64-vlq */ 193); +var quickSort = __webpack_require__(/*! ./quick-sort */ 285).quickSort; function SourceMapConsumer(aSourceMap, aSourceMapURL) { var sourceMap = aSourceMap; @@ -98436,7 +98435,7 @@ exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer; /***/ }), -/* 289 */ +/* 288 */ /*!****************************************************************************!*\ !*** ./node_modules/escodegen/node_modules/source-map/lib/mapping-list.js ***! \****************************************************************************/ @@ -98526,7 +98525,7 @@ exports.MappingList = MappingList; /***/ }), -/* 290 */ +/* 289 */ /*!**********************************************************************!*\ !*** ./node_modules/escodegen/node_modules/source-map/lib/base64.js ***! \**********************************************************************/ @@ -98604,7 +98603,7 @@ exports.decode = function (charCode) { /***/ }), -/* 291 */ +/* 290 */ /*!**********************************************************************!*\ !*** ./node_modules/escodegen/node_modules/source-map/source-map.js ***! \**********************************************************************/ @@ -98617,13 +98616,13 @@ exports.decode = function (charCode) { * Licensed under the New BSD license. See LICENSE.txt or: * http://opensource.org/licenses/BSD-3-Clause */ -exports.SourceMapGenerator = __webpack_require__(/*! ./lib/source-map-generator */ 195).SourceMapGenerator; -exports.SourceMapConsumer = __webpack_require__(/*! ./lib/source-map-consumer */ 288).SourceMapConsumer; -exports.SourceNode = __webpack_require__(/*! ./lib/source-node */ 285).SourceNode; +exports.SourceMapGenerator = __webpack_require__(/*! ./lib/source-map-generator */ 194).SourceMapGenerator; +exports.SourceMapConsumer = __webpack_require__(/*! ./lib/source-map-consumer */ 287).SourceMapConsumer; +exports.SourceNode = __webpack_require__(/*! ./lib/source-node */ 284).SourceNode; /***/ }), -/* 292 */ +/* 291 */ /*!*********************************************!*\ !*** ./node_modules/esutils/lib/keyword.js ***! \*********************************************/ @@ -98658,7 +98657,7 @@ exports.SourceNode = __webpack_require__(/*! ./lib/source-node */ 285).SourceNod (function () { 'use strict'; - var code = __webpack_require__(/*! ./code */ 196); + var code = __webpack_require__(/*! ./code */ 195); function isStrictModeReservedWordES6(id) { switch (id) { @@ -98799,7 +98798,7 @@ exports.SourceNode = __webpack_require__(/*! ./lib/source-node */ 285).SourceNod /***/ }), -/* 293 */ +/* 292 */ /*!*****************************************!*\ !*** ./node_modules/esutils/lib/ast.js ***! \*****************************************/ @@ -98954,7 +98953,7 @@ exports.SourceNode = __webpack_require__(/*! ./lib/source-node */ 285).SourceNod /***/ }), -/* 294 */ +/* 293 */ /*!*******************************************!*\ !*** ./node_modules/esutils/lib/utils.js ***! \*******************************************/ @@ -98990,15 +98989,15 @@ exports.SourceNode = __webpack_require__(/*! ./lib/source-node */ 285).SourceNod (function () { 'use strict'; - exports.ast = __webpack_require__(/*! ./ast */ 293); - exports.code = __webpack_require__(/*! ./code */ 196); - exports.keyword = __webpack_require__(/*! ./keyword */ 292); + exports.ast = __webpack_require__(/*! ./ast */ 292); + exports.code = __webpack_require__(/*! ./code */ 195); + exports.keyword = __webpack_require__(/*! ./keyword */ 291); }()); /* vim: set sw=4 ts=4 et tw=80 : */ /***/ }), -/* 295 */ +/* 294 */ /*!**********************************************!*\ !*** ./node_modules/estraverse/package.json ***! \**********************************************/ @@ -99009,7 +99008,7 @@ exports.SourceNode = __webpack_require__(/*! ./lib/source-node */ 285).SourceNod module.exports = {"_args":[["estraverse@4.2.0","C:\\Users\\danie\\Desktop\\bitburner"]],"_from":"estraverse@4.2.0","_id":"estraverse@4.2.0","_inBundle":false,"_integrity":"sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=","_location":"/estraverse","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"estraverse@4.2.0","name":"estraverse","escapedName":"estraverse","rawSpec":"4.2.0","saveSpec":null,"fetchSpec":"4.2.0"},"_requiredBy":["/escodegen","/escope","/eslint-scope","/esquery","/esrecurse"],"_resolved":"https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz","_spec":"4.2.0","_where":"C:\\Users\\danie\\Desktop\\bitburner","bugs":{"url":"https://github.com/estools/estraverse/issues"},"description":"ECMAScript JS AST traversal functions","devDependencies":{"babel-preset-es2015":"^6.3.13","babel-register":"^6.3.13","chai":"^2.1.1","espree":"^1.11.0","gulp":"^3.8.10","gulp-bump":"^0.2.2","gulp-filter":"^2.0.0","gulp-git":"^1.0.1","gulp-tag-version":"^1.2.1","jshint":"^2.5.6","mocha":"^2.1.0"},"engines":{"node":">=0.10.0"},"homepage":"https://github.com/estools/estraverse","license":"BSD-2-Clause","main":"estraverse.js","maintainers":[{"name":"Yusuke Suzuki","email":"utatane.tea@gmail.com","url":"http://github.com/Constellation"}],"name":"estraverse","repository":{"type":"git","url":"git+ssh://git@github.com/estools/estraverse.git"},"scripts":{"lint":"jshint estraverse.js","test":"npm run-script lint && npm run-script unit-test","unit-test":"mocha --compilers js:babel-register"},"version":"4.2.0"}; /***/ }), -/* 296 */ +/* 295 */ /*!***********************************************!*\ !*** ./node_modules/estraverse/estraverse.js ***! \***********************************************/ @@ -99853,7 +99852,7 @@ module.exports = {"_args":[["estraverse@4.2.0","C:\\Users\\danie\\Desktop\\bitbu return tree; } - exports.version = __webpack_require__(/*! ./package.json */ 295).version; + exports.version = __webpack_require__(/*! ./package.json */ 294).version; exports.Syntax = Syntax; exports.traverse = traverse; exports.replace = replace; @@ -99869,7 +99868,7 @@ module.exports = {"_args":[["estraverse@4.2.0","C:\\Users\\danie\\Desktop\\bitbu /***/ }), -/* 297 */ +/* 296 */ /*!****************************************!*\ !*** (webpack)/buildin/amd-options.js ***! \****************************************/ @@ -99883,7 +99882,7 @@ module.exports = __webpack_amd_options__; /* WEBPACK VAR INJECTION */}.call(this, {})) /***/ }), -/* 298 */ +/* 297 */ /*!********************************************!*\ !*** ./node_modules/jszip/lib/zipEntry.js ***! \********************************************/ @@ -99893,12 +99892,12 @@ module.exports = __webpack_amd_options__; "use strict"; -var readerFor = __webpack_require__(/*! ./reader/readerFor */ 200); +var readerFor = __webpack_require__(/*! ./reader/readerFor */ 199); var utils = __webpack_require__(/*! ./utils */ 63); var CompressedObject = __webpack_require__(/*! ./compressedObject */ 170); var crc32fn = __webpack_require__(/*! ./crc32 */ 169); var utf8 = __webpack_require__(/*! ./utf8 */ 109); -var compressions = __webpack_require__(/*! ./compressions */ 207); +var compressions = __webpack_require__(/*! ./compressions */ 206); var support = __webpack_require__(/*! ./support */ 96); var MADE_BY_DOS = 0x00; @@ -100187,7 +100186,7 @@ module.exports = ZipEntry; /***/ }), -/* 299 */ +/* 298 */ /*!***********************************************************!*\ !*** ./node_modules/jszip/lib/reader/NodeBufferReader.js ***! \***********************************************************/ @@ -100197,7 +100196,7 @@ module.exports = ZipEntry; "use strict"; -var Uint8ArrayReader = __webpack_require__(/*! ./Uint8ArrayReader */ 197); +var Uint8ArrayReader = __webpack_require__(/*! ./Uint8ArrayReader */ 196); var utils = __webpack_require__(/*! ../utils */ 63); function NodeBufferReader(data) { @@ -100218,7 +100217,7 @@ module.exports = NodeBufferReader; /***/ }), -/* 300 */ +/* 299 */ /*!*******************************************************!*\ !*** ./node_modules/jszip/lib/reader/StringReader.js ***! \*******************************************************/ @@ -100228,7 +100227,7 @@ module.exports = NodeBufferReader; "use strict"; -var DataReader = __webpack_require__(/*! ./DataReader */ 198); +var DataReader = __webpack_require__(/*! ./DataReader */ 197); var utils = __webpack_require__(/*! ../utils */ 63); function StringReader(data) { @@ -100268,7 +100267,7 @@ module.exports = StringReader; /***/ }), -/* 301 */ +/* 300 */ /*!**********************************************!*\ !*** ./node_modules/jszip/lib/zipEntries.js ***! \**********************************************/ @@ -100278,10 +100277,10 @@ module.exports = StringReader; "use strict"; -var readerFor = __webpack_require__(/*! ./reader/readerFor */ 200); +var readerFor = __webpack_require__(/*! ./reader/readerFor */ 199); var utils = __webpack_require__(/*! ./utils */ 63); -var sig = __webpack_require__(/*! ./signature */ 201); -var ZipEntry = __webpack_require__(/*! ./zipEntry */ 298); +var sig = __webpack_require__(/*! ./signature */ 200); +var ZipEntry = __webpack_require__(/*! ./zipEntry */ 297); var utf8 = __webpack_require__(/*! ./utf8 */ 109); var support = __webpack_require__(/*! ./support */ 96); // class ZipEntries {{{ @@ -100542,7 +100541,7 @@ module.exports = ZipEntries; /***/ }), -/* 302 */ +/* 301 */ /*!****************************************!*\ !*** ./node_modules/jszip/lib/load.js ***! \****************************************/ @@ -100556,8 +100555,8 @@ var utils = __webpack_require__(/*! ./utils */ 63); var external = __webpack_require__(/*! ./external */ 111); var utf8 = __webpack_require__(/*! ./utf8 */ 109); var utils = __webpack_require__(/*! ./utils */ 63); -var ZipEntries = __webpack_require__(/*! ./zipEntries */ 301); -var Crc32Probe = __webpack_require__(/*! ./stream/Crc32Probe */ 208); +var ZipEntries = __webpack_require__(/*! ./zipEntries */ 300); +var Crc32Probe = __webpack_require__(/*! ./stream/Crc32Probe */ 207); var nodejsUtils = __webpack_require__(/*! ./nodejsUtils */ 131); /** @@ -100636,7 +100635,7 @@ module.exports = function(data, options) { /***/ }), -/* 303 */ +/* 302 */ /*!*******************************************************************!*\ !*** ./node_modules/jszip/lib/nodejs/NodejsStreamInputAdapter.js ***! \*******************************************************************/ @@ -100722,7 +100721,7 @@ module.exports = NodejsStreamInputAdapter; /***/ }), -/* 304 */ +/* 303 */ /*!**********************************************************!*\ !*** ./node_modules/jszip/lib/generate/ZipFileWorker.js ***! \**********************************************************/ @@ -100737,7 +100736,7 @@ var utils = __webpack_require__(/*! ../utils */ 63); var GenericWorker = __webpack_require__(/*! ../stream/GenericWorker */ 83); var utf8 = __webpack_require__(/*! ../utf8 */ 109); var crc32 = __webpack_require__(/*! ../crc32 */ 169); -var signature = __webpack_require__(/*! ../signature */ 201); +var signature = __webpack_require__(/*! ../signature */ 200); /** * Transform an integer into a string in hexadecimal. @@ -101274,7 +101273,7 @@ module.exports = ZipFileWorker; /***/ }), -/* 305 */ +/* 304 */ /*!************************************************!*\ !*** ./node_modules/pako/lib/zlib/gzheader.js ***! \************************************************/ @@ -101344,7 +101343,7 @@ module.exports = GZheader; /***/ }), -/* 306 */ +/* 305 */ /*!************************************************!*\ !*** ./node_modules/pako/lib/zlib/inftrees.js ***! \************************************************/ @@ -101699,7 +101698,7 @@ module.exports = function inflate_table(type, lens, lens_index, codes, table, ta /***/ }), -/* 307 */ +/* 306 */ /*!***********************************************!*\ !*** ./node_modules/pako/lib/zlib/inffast.js ***! \***********************************************/ @@ -102056,7 +102055,7 @@ module.exports = function inflate_fast(strm, start) { /***/ }), -/* 308 */ +/* 307 */ /*!***********************************************!*\ !*** ./node_modules/pako/lib/zlib/inflate.js ***! \***********************************************/ @@ -102087,10 +102086,10 @@ module.exports = function inflate_fast(strm, start) { // 3. This notice may not be removed or altered from any source distribution. var utils = __webpack_require__(/*! ../utils/common */ 95); -var adler32 = __webpack_require__(/*! ./adler32 */ 206); -var crc32 = __webpack_require__(/*! ./crc32 */ 205); -var inflate_fast = __webpack_require__(/*! ./inffast */ 307); -var inflate_table = __webpack_require__(/*! ./inftrees */ 306); +var adler32 = __webpack_require__(/*! ./adler32 */ 205); +var crc32 = __webpack_require__(/*! ./crc32 */ 204); +var inflate_fast = __webpack_require__(/*! ./inffast */ 306); +var inflate_table = __webpack_require__(/*! ./inftrees */ 305); var CODES = 0; var LENS = 1; @@ -103624,7 +103623,7 @@ exports.inflateUndermine = inflateUndermine; /***/ }), -/* 309 */ +/* 308 */ /*!******************************************!*\ !*** ./node_modules/pako/lib/inflate.js ***! \******************************************/ @@ -103636,13 +103635,13 @@ exports.inflateUndermine = inflateUndermine; -var zlib_inflate = __webpack_require__(/*! ./zlib/inflate */ 308); +var zlib_inflate = __webpack_require__(/*! ./zlib/inflate */ 307); var utils = __webpack_require__(/*! ./utils/common */ 95); -var strings = __webpack_require__(/*! ./utils/strings */ 204); -var c = __webpack_require__(/*! ./zlib/constants */ 202); +var strings = __webpack_require__(/*! ./utils/strings */ 203); +var c = __webpack_require__(/*! ./zlib/constants */ 201); var msg = __webpack_require__(/*! ./zlib/messages */ 168); -var ZStream = __webpack_require__(/*! ./zlib/zstream */ 203); -var GZheader = __webpack_require__(/*! ./zlib/gzheader */ 305); +var ZStream = __webpack_require__(/*! ./zlib/zstream */ 202); +var GZheader = __webpack_require__(/*! ./zlib/gzheader */ 304); var toString = Object.prototype.toString; @@ -104054,7 +104053,7 @@ exports.ungzip = inflate; /***/ }), -/* 310 */ +/* 309 */ /*!*********************************************!*\ !*** ./node_modules/pako/lib/zlib/trees.js ***! \*********************************************/ @@ -105286,7 +105285,7 @@ exports._tr_align = _tr_align; /***/ }), -/* 311 */ +/* 310 */ /*!***********************************************!*\ !*** ./node_modules/pako/lib/zlib/deflate.js ***! \***********************************************/ @@ -105317,9 +105316,9 @@ exports._tr_align = _tr_align; // 3. This notice may not be removed or altered from any source distribution. var utils = __webpack_require__(/*! ../utils/common */ 95); -var trees = __webpack_require__(/*! ./trees */ 310); -var adler32 = __webpack_require__(/*! ./adler32 */ 206); -var crc32 = __webpack_require__(/*! ./crc32 */ 205); +var trees = __webpack_require__(/*! ./trees */ 309); +var adler32 = __webpack_require__(/*! ./adler32 */ 205); +var crc32 = __webpack_require__(/*! ./crc32 */ 204); var msg = __webpack_require__(/*! ./messages */ 168); /* Public constants ==========================================================*/ @@ -107172,7 +107171,7 @@ exports.deflateTune = deflateTune; /***/ }), -/* 312 */ +/* 311 */ /*!******************************************!*\ !*** ./node_modules/pako/lib/deflate.js ***! \******************************************/ @@ -107184,11 +107183,11 @@ exports.deflateTune = deflateTune; -var zlib_deflate = __webpack_require__(/*! ./zlib/deflate */ 311); +var zlib_deflate = __webpack_require__(/*! ./zlib/deflate */ 310); var utils = __webpack_require__(/*! ./utils/common */ 95); -var strings = __webpack_require__(/*! ./utils/strings */ 204); +var strings = __webpack_require__(/*! ./utils/strings */ 203); var msg = __webpack_require__(/*! ./zlib/messages */ 168); -var ZStream = __webpack_require__(/*! ./zlib/zstream */ 203); +var ZStream = __webpack_require__(/*! ./zlib/zstream */ 202); var toString = Object.prototype.toString; @@ -107584,7 +107583,7 @@ exports.gzip = gzip; /***/ }), -/* 313 */ +/* 312 */ /*!************************************!*\ !*** ./node_modules/pako/index.js ***! \************************************/ @@ -107598,9 +107597,9 @@ exports.gzip = gzip; var assign = __webpack_require__(/*! ./lib/utils/common */ 95).assign; -var deflate = __webpack_require__(/*! ./lib/deflate */ 312); -var inflate = __webpack_require__(/*! ./lib/inflate */ 309); -var constants = __webpack_require__(/*! ./lib/zlib/constants */ 202); +var deflate = __webpack_require__(/*! ./lib/deflate */ 311); +var inflate = __webpack_require__(/*! ./lib/inflate */ 308); +var constants = __webpack_require__(/*! ./lib/zlib/constants */ 201); var pako = {}; @@ -107610,7 +107609,7 @@ module.exports = pako; /***/ }), -/* 314 */ +/* 313 */ /*!*****************************************!*\ !*** ./node_modules/jszip/lib/flate.js ***! \*****************************************/ @@ -107622,7 +107621,7 @@ module.exports = pako; var USE_TYPEDARRAY = (typeof Uint8Array !== 'undefined') && (typeof Uint16Array !== 'undefined') && (typeof Uint32Array !== 'undefined'); -var pako = __webpack_require__(/*! pako */ 313); +var pako = __webpack_require__(/*! pako */ 312); var utils = __webpack_require__(/*! ./utils */ 63); var GenericWorker = __webpack_require__(/*! ./stream/GenericWorker */ 83); @@ -107707,7 +107706,7 @@ exports.uncompressWorker = function () { /***/ }), -/* 315 */ +/* 314 */ /*!**************************************************!*\ !*** ./node_modules/jszip/lib/generate/index.js ***! \**************************************************/ @@ -107718,8 +107717,8 @@ exports.uncompressWorker = function () { "use strict"; -var compressions = __webpack_require__(/*! ../compressions */ 207); -var ZipFileWorker = __webpack_require__(/*! ./ZipFileWorker */ 304); +var compressions = __webpack_require__(/*! ../compressions */ 206); +var ZipFileWorker = __webpack_require__(/*! ./ZipFileWorker */ 303); /** * Find the compression to use. @@ -107776,7 +107775,7 @@ exports.generateWorker = function (zip, options, comment) { /***/ }), -/* 316 */ +/* 315 */ /*!*********************************************!*\ !*** ./node_modules/jszip/lib/zipObject.js ***! \*********************************************/ @@ -107787,8 +107786,8 @@ exports.generateWorker = function (zip, options, comment) { "use strict"; -var StreamHelper = __webpack_require__(/*! ./stream/StreamHelper */ 212); -var DataWorker = __webpack_require__(/*! ./stream/DataWorker */ 210); +var StreamHelper = __webpack_require__(/*! ./stream/StreamHelper */ 211); +var DataWorker = __webpack_require__(/*! ./stream/DataWorker */ 209); var utf8 = __webpack_require__(/*! ./utf8 */ 109); var CompressedObject = __webpack_require__(/*! ./compressedObject */ 170); var GenericWorker = __webpack_require__(/*! ./stream/GenericWorker */ 83); @@ -107921,7 +107920,7 @@ module.exports = ZipObject; /***/ }), -/* 317 */ +/* 316 */ /*!********************************************************************!*\ !*** ./node_modules/jszip/lib/nodejs/NodejsStreamOutputAdapter.js ***! \********************************************************************/ @@ -107932,7 +107931,7 @@ module.exports = ZipObject; "use strict"; -var Readable = __webpack_require__(/*! readable-stream */ 225).Readable; +var Readable = __webpack_require__(/*! readable-stream */ 224).Readable; var utils = __webpack_require__(/*! ../utils */ 63); utils.inherits(NodejsStreamOutputAdapter, Readable); @@ -107975,7 +107974,7 @@ module.exports = NodejsStreamOutputAdapter; /***/ }), -/* 318 */ +/* 317 */ /*!********************************************************!*\ !*** ./node_modules/jszip/lib/stream/ConvertWorker.js ***! \********************************************************/ @@ -108013,7 +108012,7 @@ module.exports = ConvertWorker; /***/ }), -/* 319 */ +/* 318 */ /*!***********************************************!*\ !*** ./node_modules/immediate/lib/browser.js ***! \***********************************************/ @@ -108095,7 +108094,7 @@ function immediate(task) { /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../webpack/buildin/global.js */ 89))) /***/ }), -/* 320 */ +/* 319 */ /*!*****************************************!*\ !*** ./node_modules/lie/lib/browser.js ***! \*****************************************/ @@ -108105,7 +108104,7 @@ function immediate(task) { "use strict"; -var immediate = __webpack_require__(/*! immediate */ 319); +var immediate = __webpack_require__(/*! immediate */ 318); /* istanbul ignore next */ function INTERNAL() {} @@ -108360,7 +108359,7 @@ function race(iterable) { /***/ }), -/* 321 */ +/* 320 */ /*!*************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_cof.js ***! \*************************************************************************/ @@ -108375,7 +108374,7 @@ module.exports = function(it){ }; /***/ }), -/* 322 */ +/* 321 */ /*!**************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_html.js ***! \**************************************************************************/ @@ -108386,7 +108385,7 @@ module.exports = function(it){ module.exports = __webpack_require__(/*! ./_global */ 130).document && document.documentElement; /***/ }), -/* 323 */ +/* 322 */ /*!****************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_invoke.js ***! \****************************************************************************/ @@ -108412,7 +108411,7 @@ module.exports = function(fn, args, that){ }; /***/ }), -/* 324 */ +/* 323 */ /*!**************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_task.js ***! \**************************************************************************/ @@ -108420,10 +108419,10 @@ module.exports = function(fn, args, that){ /*! all exports used */ /***/ (function(module, exports, __webpack_require__) { -var ctx = __webpack_require__(/*! ./_ctx */ 215) - , invoke = __webpack_require__(/*! ./_invoke */ 323) - , html = __webpack_require__(/*! ./_html */ 322) - , cel = __webpack_require__(/*! ./_dom-create */ 213) +var ctx = __webpack_require__(/*! ./_ctx */ 214) + , invoke = __webpack_require__(/*! ./_invoke */ 322) + , html = __webpack_require__(/*! ./_html */ 321) + , cel = __webpack_require__(/*! ./_dom-create */ 212) , global = __webpack_require__(/*! ./_global */ 130) , process = global.process , setTask = global.setImmediate @@ -108459,7 +108458,7 @@ if(!setTask || !clearTask){ delete queue[id]; }; // Node.js 0.8- - if(__webpack_require__(/*! ./_cof */ 321)(process) == 'process'){ + if(__webpack_require__(/*! ./_cof */ 320)(process) == 'process'){ defer = function(id){ process.nextTick(ctx(run, id, 1)); }; @@ -108497,7 +108496,7 @@ module.exports = { }; /***/ }), -/* 325 */ +/* 324 */ /*!***********************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_property-desc.js ***! \***********************************************************************************/ @@ -108515,7 +108514,7 @@ module.exports = function(bitmap, value){ }; /***/ }), -/* 326 */ +/* 325 */ /*!**********************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_to-primitive.js ***! \**********************************************************************************/ @@ -108537,7 +108536,7 @@ module.exports = function(it, S){ }; /***/ }), -/* 327 */ +/* 326 */ /*!************************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_ie8-dom-define.js ***! \************************************************************************************/ @@ -108545,12 +108544,12 @@ module.exports = function(it, S){ /*! all exports used */ /***/ (function(module, exports, __webpack_require__) { -module.exports = !__webpack_require__(/*! ./_descriptors */ 171) && !__webpack_require__(/*! ./_fails */ 214)(function(){ - return Object.defineProperty(__webpack_require__(/*! ./_dom-create */ 213)('div'), 'a', {get: function(){ return 7; }}).a != 7; +module.exports = !__webpack_require__(/*! ./_descriptors */ 171) && !__webpack_require__(/*! ./_fails */ 213)(function(){ + return Object.defineProperty(__webpack_require__(/*! ./_dom-create */ 212)('div'), 'a', {get: function(){ return 7; }}).a != 7; }); /***/ }), -/* 328 */ +/* 327 */ /*!*******************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_an-object.js ***! \*******************************************************************************/ @@ -108565,7 +108564,7 @@ module.exports = function(it){ }; /***/ }), -/* 329 */ +/* 328 */ /*!*******************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_object-dp.js ***! \*******************************************************************************/ @@ -108573,9 +108572,9 @@ module.exports = function(it){ /*! all exports used */ /***/ (function(module, exports, __webpack_require__) { -var anObject = __webpack_require__(/*! ./_an-object */ 328) - , IE8_DOM_DEFINE = __webpack_require__(/*! ./_ie8-dom-define */ 327) - , toPrimitive = __webpack_require__(/*! ./_to-primitive */ 326) +var anObject = __webpack_require__(/*! ./_an-object */ 327) + , IE8_DOM_DEFINE = __webpack_require__(/*! ./_ie8-dom-define */ 326) + , toPrimitive = __webpack_require__(/*! ./_to-primitive */ 325) , dP = Object.defineProperty; exports.f = __webpack_require__(/*! ./_descriptors */ 171) ? Object.defineProperty : function defineProperty(O, P, Attributes){ @@ -108591,7 +108590,7 @@ exports.f = __webpack_require__(/*! ./_descriptors */ 171) ? Object.defineProper }; /***/ }), -/* 330 */ +/* 329 */ /*!**************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_hide.js ***! \**************************************************************************/ @@ -108599,8 +108598,8 @@ exports.f = __webpack_require__(/*! ./_descriptors */ 171) ? Object.defineProper /*! all exports used */ /***/ (function(module, exports, __webpack_require__) { -var dP = __webpack_require__(/*! ./_object-dp */ 329) - , createDesc = __webpack_require__(/*! ./_property-desc */ 325); +var dP = __webpack_require__(/*! ./_object-dp */ 328) + , createDesc = __webpack_require__(/*! ./_property-desc */ 324); module.exports = __webpack_require__(/*! ./_descriptors */ 171) ? function(object, key, value){ return dP.f(object, key, createDesc(1, value)); } : function(object, key, value){ @@ -108609,7 +108608,7 @@ module.exports = __webpack_require__(/*! ./_descriptors */ 171) ? function(objec }; /***/ }), -/* 331 */ +/* 330 */ /*!********************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_a-function.js ***! \********************************************************************************/ @@ -108623,7 +108622,7 @@ module.exports = function(it){ }; /***/ }), -/* 332 */ +/* 331 */ /*!****************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/_export.js ***! \****************************************************************************/ @@ -108632,9 +108631,9 @@ module.exports = function(it){ /***/ (function(module, exports, __webpack_require__) { var global = __webpack_require__(/*! ./_global */ 130) - , core = __webpack_require__(/*! ./_core */ 216) - , ctx = __webpack_require__(/*! ./_ctx */ 215) - , hide = __webpack_require__(/*! ./_hide */ 330) + , core = __webpack_require__(/*! ./_core */ 215) + , ctx = __webpack_require__(/*! ./_ctx */ 214) + , hide = __webpack_require__(/*! ./_hide */ 329) , PROTOTYPE = 'prototype'; var $export = function(type, name, source){ @@ -108694,7 +108693,7 @@ $export.R = 128; // real proto method for `library` module.exports = $export; /***/ }), -/* 333 */ +/* 332 */ /*!**********************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/modules/web.immediate.js ***! \**********************************************************************************/ @@ -108702,15 +108701,15 @@ module.exports = $export; /*! all exports used */ /***/ (function(module, exports, __webpack_require__) { -var $export = __webpack_require__(/*! ./_export */ 332) - , $task = __webpack_require__(/*! ./_task */ 324); +var $export = __webpack_require__(/*! ./_export */ 331) + , $task = __webpack_require__(/*! ./_task */ 323); $export($export.G + $export.B, { setImmediate: $task.set, clearImmediate: $task.clear }); /***/ }), -/* 334 */ +/* 333 */ /*!*****************************************************************************!*\ !*** ./node_modules/jszip/node_modules/core-js/library/fn/set-immediate.js ***! \*****************************************************************************/ @@ -108718,11 +108717,11 @@ $export($export.G + $export.B, { /*! all exports used */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(/*! ../modules/web.immediate */ 333); -module.exports = __webpack_require__(/*! ../modules/_core */ 216).setImmediate; +__webpack_require__(/*! ../modules/web.immediate */ 332); +module.exports = __webpack_require__(/*! ../modules/_core */ 215).setImmediate; /***/ }), -/* 335 */ +/* 334 */ /*!*****************************************************!*\ !*** ./node_modules/readable-stream/passthrough.js ***! \*****************************************************/ @@ -108734,7 +108733,7 @@ module.exports = __webpack_require__(/*! ./readable */ 174).PassThrough /***/ }), -/* 336 */ +/* 335 */ /*!***************************************************!*\ !*** ./node_modules/readable-stream/transform.js ***! \***************************************************/ @@ -108746,7 +108745,7 @@ module.exports = __webpack_require__(/*! ./readable */ 174).Transform /***/ }), -/* 337 */ +/* 336 */ /*!********************************************************!*\ !*** ./node_modules/readable-stream/duplex-browser.js ***! \********************************************************/ @@ -108758,7 +108757,7 @@ module.exports = __webpack_require__(/*! ./lib/_stream_duplex.js */ 101); /***/ }), -/* 338 */ +/* 337 */ /*!**********************************************************!*\ !*** ./node_modules/readable-stream/writable-browser.js ***! \**********************************************************/ @@ -108770,7 +108769,7 @@ module.exports = __webpack_require__(/*! ./lib/_stream_writable.js */ 173); /***/ }), -/* 339 */ +/* 338 */ /*!*****************************************************************!*\ !*** ./node_modules/readable-stream/lib/_stream_passthrough.js ***! \*****************************************************************/ @@ -108808,7 +108807,7 @@ module.exports = __webpack_require__(/*! ./lib/_stream_writable.js */ 173); module.exports = PassThrough; -var Transform = __webpack_require__(/*! ./_stream_transform */ 218); +var Transform = __webpack_require__(/*! ./_stream_transform */ 217); /**/ var util = __webpack_require__(/*! core-util-is */ 112); @@ -108828,7 +108827,7 @@ PassThrough.prototype._transform = function (chunk, encoding, cb) { }; /***/ }), -/* 340 */ +/* 339 */ /*!************************************************!*\ !*** ./node_modules/util-deprecate/browser.js ***! \************************************************/ @@ -108907,7 +108906,7 @@ function config (name) { /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../webpack/buildin/global.js */ 89))) /***/ }), -/* 341 */ +/* 340 */ /*!*************************************************************************!*\ !*** ./node_modules/readable-stream/lib/internal/streams/BufferList.js ***! \*************************************************************************/ @@ -108921,7 +108920,7 @@ function config (name) { function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } var Buffer = __webpack_require__(/*! safe-buffer */ 132).Buffer; -var util = __webpack_require__(/*! util */ 221); +var util = __webpack_require__(/*! util */ 220); function copyBuffer(src, target, offset) { src.copy(target, offset); @@ -108997,7 +108996,7 @@ if (util && util.inspect && util.inspect.custom) { } /***/ }), -/* 342 */ +/* 341 */ /*!*************************************************!*\ !*** ./node_modules/stream-browserify/index.js ***! \*************************************************/ @@ -109033,10 +109032,10 @@ var inherits = __webpack_require__(/*! inherits */ 108); inherits(Stream, EE); Stream.Readable = __webpack_require__(/*! readable-stream/readable.js */ 174); -Stream.Writable = __webpack_require__(/*! readable-stream/writable.js */ 338); -Stream.Duplex = __webpack_require__(/*! readable-stream/duplex.js */ 337); -Stream.Transform = __webpack_require__(/*! readable-stream/transform.js */ 336); -Stream.PassThrough = __webpack_require__(/*! readable-stream/passthrough.js */ 335); +Stream.Writable = __webpack_require__(/*! readable-stream/writable.js */ 337); +Stream.Duplex = __webpack_require__(/*! readable-stream/duplex.js */ 336); +Stream.Transform = __webpack_require__(/*! readable-stream/transform.js */ 335); +Stream.PassThrough = __webpack_require__(/*! readable-stream/passthrough.js */ 334); // Backwards-compat with node 0.4.x Stream.Stream = Stream; @@ -109135,7 +109134,7 @@ Stream.prototype.pipe = function(dest, options) { /***/ }), -/* 343 */ +/* 342 */ /*!***************************************!*\ !*** ./node_modules/ieee754/index.js ***! \***************************************/ @@ -109230,7 +109229,7 @@ exports.write = function (buffer, value, offset, isLE, mLen, nBytes) { /***/ }), -/* 344 */ +/* 343 */ /*!*****************************************!*\ !*** ./node_modules/base64-js/index.js ***! \*****************************************/ @@ -109393,7 +109392,7 @@ function fromByteArray (uint8) { /***/ }), -/* 345 */ +/* 344 */ /*!******************************************!*\ !*** ./node_modules/jszip/lib/object.js ***! \******************************************/ @@ -109406,13 +109405,13 @@ function fromByteArray (uint8) { var utf8 = __webpack_require__(/*! ./utf8 */ 109); var utils = __webpack_require__(/*! ./utils */ 63); var GenericWorker = __webpack_require__(/*! ./stream/GenericWorker */ 83); -var StreamHelper = __webpack_require__(/*! ./stream/StreamHelper */ 212); -var defaults = __webpack_require__(/*! ./defaults */ 211); +var StreamHelper = __webpack_require__(/*! ./stream/StreamHelper */ 211); +var defaults = __webpack_require__(/*! ./defaults */ 210); var CompressedObject = __webpack_require__(/*! ./compressedObject */ 170); -var ZipObject = __webpack_require__(/*! ./zipObject */ 316); -var generate = __webpack_require__(/*! ./generate */ 315); +var ZipObject = __webpack_require__(/*! ./zipObject */ 315); +var generate = __webpack_require__(/*! ./generate */ 314); var nodejsUtils = __webpack_require__(/*! ./nodejsUtils */ 131); -var NodejsStreamInputAdapter = __webpack_require__(/*! ./nodejs/NodejsStreamInputAdapter */ 303); +var NodejsStreamInputAdapter = __webpack_require__(/*! ./nodejs/NodejsStreamInputAdapter */ 302); /** @@ -109794,7 +109793,7 @@ module.exports = out; /***/ }), -/* 346 */ +/* 345 */ /*!***************************************************!*\ !*** ./node_modules/setimmediate/setImmediate.js ***! \***************************************************/ @@ -109992,7 +109991,7 @@ module.exports = out; /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../webpack/buildin/global.js */ 89), __webpack_require__(/*! ./../process/browser.js */ 114))) /***/ }), -/* 347 */ +/* 346 */ /*!**********************************************************!*\ !*** ./node_modules/js-beautify/js/lib/beautify-html.js ***! \**********************************************************/ diff --git a/src/Company/Companies.ts b/src/Company/Companies.ts index fbbe475ad..60b78c295 100644 --- a/src/Company/Companies.ts +++ b/src/Company/Companies.ts @@ -16,9 +16,27 @@ function addCompany(params: IConstructorParams) { // Used to initialize new Company objects for the Companies map // Called when creating new game or after a prestige/reset export function initCompanies() { + // Save Old Company data for 'favor' + const oldCompanies = Companies; + + // Re-construct all Companies + Companies = {}; companiesMetadata.forEach((e) => { addCompany(e); }); + + // Reset data + for (const companyName in Companies) { + const company = Companies[companyName]; + const oldCompany = oldCompanies[companyName]; + if (!(oldCompany instanceof Company)) { + // New game, so no OldCompanies data + company.favor = 0; + } else { + company.favor = oldCompanies[companyName].favor; + if (isNaN(company.favor)) { company.favor = 0; } + } + } } // Used to load Companies map from a save diff --git a/src/Company/data/CompaniesMetadata.ts b/src/Company/data/CompaniesMetadata.ts index af4717445..ed855e3d3 100644 --- a/src/Company/data/CompaniesMetadata.ts +++ b/src/Company/data/CompaniesMetadata.ts @@ -1,7 +1,6 @@ import { IConstructorParams } from "../Company"; import { Locations } from "../../Locations"; import * as posNames from "./CompanyPositionNames"; -import { SafeObjectAssign } from "../../../utils/SafeObjectAssign"; import { IMap } from "../../types"; // Create Objects containing Company Positions by category @@ -306,7 +305,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.VolhavenOmniaCybersystems, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, CEOOnly, OperationsManagerOnly, AllTechnologyPositions, @@ -319,7 +318,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.ChongqingSolarisSpaceSystems, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, CEOOnly, OperationsManagerOnly, AllTechnologyPositions, @@ -332,7 +331,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.Sector12DeltaOne, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, CEOOnly, OperationsManagerOnly, AllTechnologyPositions, @@ -345,7 +344,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.NewTokyoGlobalPharmaceuticals, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, AllTechnologyPositions, AllBusinessPositions, AllSoftwareConsultantPositions, @@ -358,7 +357,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.IshimaNovaMedical, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, AllTechnologyPositions, AllBusinessPositions, AllSoftwareConsultantPositions, @@ -371,7 +370,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.Sector12CIA, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, SoftwarePositionsUpToHeadOfEngineering, AllNetworkEngineerPositions, AllITPositions, @@ -385,7 +384,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.Sector12NSA, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, SoftwarePositionsUpToHeadOfEngineering, AllNetworkEngineerPositions, AllITPositions, @@ -399,7 +398,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.AevumWatchdogSecurity, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, SoftwarePositionsUpToHeadOfEngineering, AllNetworkEngineerPositions, AllITPositions, @@ -414,7 +413,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.VolhavenLexoCorp, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, AllTechnologyPositions, AllSoftwareConsultantPositions, AllBusinessPositions, @@ -427,7 +426,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.AevumRhoConstruction, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, SoftwarePositionsUpToLeadDeveloper, BusinessPositionsUpToOperationsManager ), @@ -438,7 +437,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.Sector12AlphaEnterprises, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, SoftwarePositionsUpToLeadDeveloper, BusinessPositionsUpToOperationsManager, AllSoftwareConsultantPositions @@ -450,7 +449,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.AevumPolice, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, AllSecurityPositions, SoftwarePositionsUpToLeadDeveloper ), @@ -461,7 +460,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.VolhavenSysCoreSecurities, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, AllTechnologyPositions ), expMultiplier: 1.3, @@ -471,7 +470,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.VolhavenCompuTek, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, AllTechnologyPositions ), expMultiplier: 1.2, @@ -481,7 +480,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.AevumNetLinkTechnologies, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, AllTechnologyPositions ), expMultiplier: 1.2, @@ -491,7 +490,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.Sector12CarmichaelSecurity, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, AllTechnologyPositions, AllAgentPositions, AllSecurityPositions @@ -503,7 +502,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.Sector12FoodNStuff, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, EmployeeOnly, PartTimeEmployeeOnly ), expMultiplier: 1, @@ -513,7 +512,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.Sector12JoesGuns, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, EmployeeOnly, PartTimeEmployeeOnly ), expMultiplier: 1, @@ -523,7 +522,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.IshimaOmegaSoftware, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, AllSoftwarePositions, AllSoftwareConsultantPositions, AllITPositions @@ -535,7 +534,7 @@ export const companiesMetadata: IConstructorParams[] = [ { name: Locations.NewTokyoNoodleBar, info: "", - companyPositions: SafeObjectAssign( + companyPositions: Object.assign({}, WaiterOnly, PartTimeWaiterOnly ), expMultiplier: 1, diff --git a/src/Constants.ts b/src/Constants.ts index 67ed6ab19..ef32c1ff8 100644 --- a/src/Constants.ts +++ b/src/Constants.ts @@ -511,6 +511,9 @@ export let CONSTANTS: IMap = { * Gang Changes: ** UI now displays your chance to win a clash with other gangs ** Added getChanceToWinClash() function to the Gang API + + * Added the terminal command 'expr', which can be used to evaluate simple mathematical expressions + * Bug Fix: scp() should no longer throw errors when used with 2-arguments and an array of files ` } diff --git a/src/HelpText.ts b/src/HelpText.ts index bb7f8406f..e147b3368 100644 --- a/src/HelpText.ts +++ b/src/HelpText.ts @@ -10,6 +10,7 @@ export const TerminalHelpText: string = "cls See 'clear' command
" + "connect [ip/hostname] Connects to a remote server
" + "download [script/text file] Downloads scripts or text files to your computer
" + + "expr [math expression] Evaluate a mathematical expression
" + "free Check the machine's memory (RAM) usage
" + "hack Hack the current machine
" + "help [command] Display this help text, or the help text for a command
" + @@ -96,6 +97,12 @@ export const HelpTexts: IMap = { "Download all scripts and text files: download *
" + "Download all scripts: download *.script
" + "Download all text files: download *.txt
", + expr: "expr [mathematical expression]
" + + "Evaluate a simple mathematical expression. Supports native JavaScript operators:
" + + "+, -, /, *, **, %
" + + "Example:
" + + "expr 25 * 2 ** 10
" + + "Note that letters (non-digits) are not allowed and will be removed from the input.", free: "free
" + "Display's the memory usage on the current machine. Print the amount of RAM that is available on the current server as well as " + "how much of it is being used.", diff --git a/src/Location.js b/src/Location.js index eb07aabbd..742f7b2cd 100644 --- a/src/Location.js +++ b/src/Location.js @@ -235,7 +235,7 @@ function displayLocationContent() { //Check if the player is employed at this Location. If he is, display the "Work" button, //update the job title, etc. if (loc != "" && loc === Player.companyName) { - var company = Companies[loc]; + let company = Companies[loc]; jobTitle.style.display = "block"; jobReputation.style.display = "inline"; @@ -244,7 +244,7 @@ function displayLocationContent() { locationTxtDiv2.style.display = "block"; locationTxtDiv3.style.display = "block"; jobTitle.innerHTML = "Job Title: " + Player.companyPosition; - var repGain = company.getFavorGain(); + let repGain = company.getFavorGain(); if (repGain.length != 2) {repGain = 0;} repGain = repGain[0]; jobReputation.innerHTML = "Company reputation: " + formatNumber(company.playerReputation, 4) + @@ -258,7 +258,10 @@ function displayLocationContent() { "favor you gain depends on how much reputation you have with the company"; work.style.display = "block"; - var currPos = Player.companyPosition; + let currPos = CompanyPositions[Player.companyPosition]; + if (currPos == null) { + throw new Error("Player's companyPosition property has an invalid value"); + } work.addEventListener("click", function() { if (currPos.isPartTimeJob()) { @@ -1037,13 +1040,13 @@ function displayLocationContent() { if (loc == Player.companyName) { var currPos = Player.companyPosition; - if (currPos.name == "Employee") { + if (currPos == "Employee") { employeeJob.style.display = "none"; - } else if (currPos.name == "Waiter") { + } else if (currPos == "Waiter") { waiterJob.style.display = "none"; - } else if (currPos.name == "Part-time Employee") { + } else if (currPos == "Part-time Employee") { employeePartTimeJob.style.display = "none"; - } else if (currPos.name == "Part-time Waiter") { + } else if (currPos == "Part-time Waiter") { waiterPartTimeJob.style.display = "none"; } } @@ -2175,8 +2178,8 @@ function setJobRequirementTooltip(loc, entryPosType, btn) { var company = Companies[loc]; if (company == null) {return;} var pos = Player.getNextCompanyPosition(company, entryPosType); - if (pos == null) {return}; - if (!company.hasPosition(pos)) {return;} + if (pos == null) { return }; + if (!company.hasPosition(pos)) { return; } var reqText = getJobRequirementText(company, pos, true); btn.innerHTML += "" + reqText + ""; } diff --git a/src/NetscriptFunctions.js b/src/NetscriptFunctions.js index dd627178c..44c1ca9c9 100644 --- a/src/NetscriptFunctions.js +++ b/src/NetscriptFunctions.js @@ -921,7 +921,7 @@ function NetscriptFunctions(workerScript) { var destServer, currServ; - if (arguments.length === 3) { //scriptname, source, destination + if (ip2 != null) { // 3 Argument version: scriptname, source, destination if (scriptname === undefined || ip1 === undefined || ip2 === undefined) { throw makeRuntimeRejectMsg(workerScript, "ERROR: scp() call has incorrect number of arguments. Takes 2 or 3 arguments"); } @@ -934,7 +934,7 @@ function NetscriptFunctions(workerScript) { if (currServ == null) { throw makeRuntimeRejectMsg(workerScript, `ERROR: Invalid hostname/ip passed into scp() command: ${ip1}`); } - } else if (arguments.length === 2) { //scriptname, destination + } else if (ip1 != null) { // 2 Argument version: scriptname, destination if (scriptname === undefined || ip1 === undefined) { throw makeRuntimeRejectMsg(workerScript, "ERROR: scp() call has incorrect number of arguments. Takes 2 or 3 arguments"); } @@ -947,6 +947,8 @@ function NetscriptFunctions(workerScript) { if (currServ == null) { throw makeRuntimeRejectMsg(workerScript, "Could not find server ip for this script. This is a bug please contact game developer"); } + } else { + throw makeRuntimeRejectMsg(workerScript, "ERROR: scp() call has incorrect number of arguments. Takes 2 or 3 arguments"); } //Scp for lit files diff --git a/src/Player.js b/src/Player.js index 0af4c2780..a9ca3b34f 100644 --- a/src/Player.js +++ b/src/Player.js @@ -1112,7 +1112,7 @@ PlayerObject.prototype.getWorkStrExpGain = function() { return 0; } - return this.companyPosition.strengthExpGain * company.expMultiplier * this.strength_exp_mult * BitNodeMultipliers.CompanyWorkExpGain; + return companyPosition.strengthExpGain * company.expMultiplier * this.strength_exp_mult * BitNodeMultipliers.CompanyWorkExpGain; } //Def exp gained per game cycle @@ -1126,7 +1126,7 @@ PlayerObject.prototype.getWorkDefExpGain = function() { return 0; } - return this.companyPosition.defenseExpGain * company.expMultiplier * this.defense_exp_mult * BitNodeMultipliers.CompanyWorkExpGain; + return companyPosition.defenseExpGain * company.expMultiplier * this.defense_exp_mult * BitNodeMultipliers.CompanyWorkExpGain; } //Dex exp gained per game cycle @@ -1140,7 +1140,7 @@ PlayerObject.prototype.getWorkDexExpGain = function() { return 0; } - return this.companyPosition.dexterityExpGain * company.expMultiplier * this.dexterity_exp_mult * BitNodeMultipliers.CompanyWorkExpGain; + return companyPosition.dexterityExpGain * company.expMultiplier * this.dexterity_exp_mult * BitNodeMultipliers.CompanyWorkExpGain; } //Agi exp gained per game cycle @@ -1154,7 +1154,7 @@ PlayerObject.prototype.getWorkAgiExpGain = function() { return 0; } - return this.companyPosition.agilityExpGain * company.expMultiplier * this.agility_exp_mult * BitNodeMultipliers.CompanyWorkExpGain; + return companyPosition.agilityExpGain * company.expMultiplier * this.agility_exp_mult * BitNodeMultipliers.CompanyWorkExpGain; } //Charisma exp gained per game cycle @@ -1168,7 +1168,7 @@ PlayerObject.prototype.getWorkChaExpGain = function() { return 0; } - return this.companyPosition.charismaExpGain * company.expMultiplier * this.charisma_exp_mult * BitNodeMultipliers.CompanyWorkExpGain; + return companyPosition.charismaExpGain * company.expMultiplier * this.charisma_exp_mult * BitNodeMultipliers.CompanyWorkExpGain; } //Reputation gained per game cycle @@ -1182,9 +1182,9 @@ PlayerObject.prototype.getWorkRepGain = function() { return 0; } - var jobPerformance = this.companyPosition.calculateJobPerformance(this.hacking_skill, this.strength, - this.defense, this.dexterity, - this.agility, this.charisma); + var jobPerformance = companyPosition.calculateJobPerformance(this.hacking_skill, this.strength, + this.defense, this.dexterity, + this.agility, this.charisma); //Intelligence provides a flat bonus to job performance jobPerformance += (this.intelligence / CONSTANTS.MaxSkillLevel); @@ -1698,7 +1698,6 @@ PlayerObject.prototype.applyForJob = function(entryPosType, sing=false) { } while (true) { - console.log("Determining qualification for next Company Position"); let newPos = getNextCompanyPosition(pos); if (newPos == null) {break;} @@ -1741,8 +1740,8 @@ PlayerObject.prototype.applyForJob = function(entryPosType, sing=false) { if (currCompany.name != company.name) { leaveCompany = true; oldCompanyName = currCompany.name; - company.playerReputation -= 1000; - if (company.playerReputation < 0) { company.playerReputation = 0; } + currCompany.playerReputation -= 1000; + if (currCompany.playerReputation < 0) { currCompany.playerReputation = 0; } } } @@ -1767,8 +1766,8 @@ PlayerObject.prototype.applyForJob = function(entryPosType, sing=false) { //Returns your next position at a company given the field (software, business, etc.) PlayerObject.prototype.getNextCompanyPosition = function(company, entryPosType) { var currCompany = null; - if (this.name !== "") { - currCompany = Companies[this.name]; + if (this.companyName !== "") { + currCompany = Companies[this.companyName]; } //Not employed at this company, so return the entry position @@ -1855,8 +1854,8 @@ PlayerObject.prototype.applyForAgentJob = function(sing=false) { PlayerObject.prototype.applyForEmployeeJob = function(sing=false) { var company = Companies[this.location]; //Company being applied to if (this.isQualified(company, CompanyPositions[posNames.MiscCompanyPositions[1]])) { - this.companyName = company.companyName; - this.companyPosition = CompanyPositions[posNames.MiscCompanyPositions[1]]; + this.companyName = company.name; + this.companyPosition = posNames.MiscCompanyPositions[1]; document.getElementById("world-menu-header").click(); document.getElementById("world-menu-header").click(); if (sing) {return true;} @@ -1871,8 +1870,8 @@ PlayerObject.prototype.applyForEmployeeJob = function(sing=false) { PlayerObject.prototype.applyForPartTimeEmployeeJob = function(sing=false) { var company = Companies[this.location]; //Company being applied to if (this.isQualified(company, CompanyPositions[posNames.PartTimeCompanyPositions[1]])) { - this.companyName = company.companyName; - this.companyPosition = CompanyPositions[posNames.PartTimeCompanyPositions[1]]; + this.companyName = company.name; + this.companyPosition = posNames.PartTimeCompanyPositions[1]; document.getElementById("world-menu-header").click(); document.getElementById("world-menu-header").click(); if (sing) {return true;} @@ -1887,8 +1886,8 @@ PlayerObject.prototype.applyForPartTimeEmployeeJob = function(sing=false) { PlayerObject.prototype.applyForWaiterJob = function(sing=false) { var company = Companies[this.location]; //Company being applied to if (this.isQualified(company, CompanyPositions[posNames.MiscCompanyPositions[0]])) { - this.companyName = company.companyName; - this.companyPosition = CompanyPositions[posNames.MiscCompanyPositions[0]]; + this.companyName = company.name; + this.companyPosition = posNames.MiscCompanyPositions[0]; document.getElementById("world-menu-header").click(); document.getElementById("world-menu-header").click(); if (sing) {return true;} @@ -1903,8 +1902,8 @@ PlayerObject.prototype.applyForWaiterJob = function(sing=false) { PlayerObject.prototype.applyForPartTimeWaiterJob = function(sing=false) { var company = Companies[this.location]; //Company being applied to if (this.isQualified(company, CompanyPositions[posNames.PartTimeCompanyPositions[0]])) { - this.companyName = company.companyName; - this.companyPosition = CompanyPositions[posNames.PartTimeCompanyPositions[0]]; + this.companyName = company.name; + this.companyPosition = posNames.PartTimeCompanyPositions[0]; document.getElementById("world-menu-header").click(); document.getElementById("world-menu-header").click(); if (sing) {return true;} diff --git a/src/SaveObject.js b/src/SaveObject.js index 2f4ca3f79..05d866299 100755 --- a/src/SaveObject.js +++ b/src/SaveObject.js @@ -118,7 +118,7 @@ function evaluateVersionCompatibility(ver) { // Player's company position is now a string if (Player.companyPosition != null && typeof Player.companyPosition !== "string") { console.log("Changed Player.companyPosition value to be compatible with v0.41.2"); - Player.companyPosition = Player.companyPosition.positionName; + Player.companyPosition = Player.companyPosition.data.positionName; if (Player.companyPosition == null) { Player.companyPosition = ""; } @@ -131,6 +131,16 @@ function evaluateVersionCompatibility(ver) { console.log("Changed company name property to be compatible with v0.41.2"); company.name = company.companyName; } + + if (company.companyPositions instanceof Array) { + console.log("Changed company companyPositions property to be compatible with v0.41.2"); + const pos = {}; + + for (let i = 0; i < company.companyPositions.length; ++i) { + pos[company.companyPositions[i]] = true; + } + company.companyPositions = pos; + } } } } diff --git a/src/Terminal.js b/src/Terminal.js index 8c32db86e..ff96bac60 100644 --- a/src/Terminal.js +++ b/src/Terminal.js @@ -1090,6 +1090,24 @@ let Terminal = { } } post("Error: " + fn + " does not exist"); + break; + case "expr": + if (commandArray.length <= 1) { + post("Incorrect usage of expr command. Usage: expr [math expression]"); + return; + } + const expr = commandArray.slice(1).join(""); + + // Sanitize the math expression + const sanitizedExpr = expr.replace(/s+/g, '').replace(/[^-()\d/*+.]/g, ''); + let result; + try { + result = eval(sanitizedExpr); + } catch(e) { + post(`Could not evaluate expression: ${sanitizedExpr}`); + return; + } + post(result); break; case "free": Terminal.executeFreeCommand(commandArray); diff --git a/src/engine.js b/src/engine.js index 96832f04d..ca323d092 100644 --- a/src/engine.js +++ b/src/engine.js @@ -339,7 +339,13 @@ const Engine = { loadLocationContent: function() { Engine.hideAllContent(); Engine.Display.locationContent.style.display = "block"; - displayLocationContent(); + try { + displayLocationContent(); + } catch(e) { + exceptionAlert(e); + console.error(e); + } + routing.navigateTo(Page.Location); }, diff --git a/utils/SafeObjectAssign.ts b/utils/SafeObjectAssign.ts deleted file mode 100644 index 950daa215..000000000 --- a/utils/SafeObjectAssign.ts +++ /dev/null @@ -1,7 +0,0 @@ -// Modified version of Object.assign() that prevents you from -// accidentally modifying the 'target' (first argument) -export function SafeObjectAssign(...args: any[]) { - const argsCopy: any[] = Array.from(arguments); - argsCopy.unshift({}); - Object.assign.apply(null, argsCopy); -}