Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-12-18 12:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug with Corporaiton healthcare. Fixed bug with new netscript 1.0 JS Interpreter properly throwing errors

Browse Source
This commit is contained in:
danielyxie 2018-07-15 13:03:33 -05:00
parent 2b38a8cd2a
commit c449dee97e
4 changed files with 4299 additions and 4241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8004
dist/engine.bundle.js vendored
View File

File diff suppressed because it is too large Load Diff

517
dist/vendor.bundle.js vendored
View File

File diff suppressed because it is too large Load Diff

5
src/CompanyManagement.js
View File

@ -873,7 +873,7 @@ Industry.prototype.getProductDescriptionText = function() {
case Industries.Software: case Industries.Software:
return "develop computer software"; return "develop computer software";
break; break;
case Industries.HealthCare: case Industries.Healthcare:
return "build and manage hospitals"; return "build and manage hospitals";
break; break;
case Industries.RealEstate: case Industries.RealEstate:
@ -4233,7 +4233,7 @@ Corporation.prototype.displayDivisionContent = function(division, city) {
createProductButtonText = "Develop Software"; createProductButtonText = "Develop Software";
createProductPopupText = "Develop a new piece of software!"; createProductPopupText = "Develop a new piece of software!";
break; break;
case Industries.HealthCare: case Industries.Healthcare:
createProductButtonText = "Build Hospital"; createProductButtonText = "Build Hospital";
createProductPopupText = "Build and manage a new hospital!"; createProductPopupText = "Build and manage a new hospital!";
break; break;
@ -4924,4 +4924,3 @@ Corporation.fromJSON = function(value) {
Reviver.constructors.Corporation = Corporation; Reviver.constructors.Corporation = Corporation;
export {Corporation}; export {Corporation};

14
src/NetscriptWorker.js
View File

@ -228,20 +228,20 @@ function startNetscript1Script(workerScript) {
resolve(workerScript); resolve(workerScript);
} }
} catch(e) { } catch(e) {
if (isString(e)) { e = e.toString();
workerScript.errorMessage = e; if (!isScriptErrorMessage(e)) {
return reject(workerScript); e = makeRuntimeRejectMsg(workerScript, e);
} else if (e instanceof WorkerScript) {
return reject(e);
} else {
return reject(workerScript);
} }
workerScript.errorMessage = e;
return reject(workerScript);
} }
} }
try { try {
runInterpreter(); runInterpreter();
} catch(e) { } catch(e) {
console.log("Caught in original");
console.log(e);
if (isString(e)) { if (isString(e)) {
workerScript.errorMessage = e; workerScript.errorMessage = e;
return reject(workerScript); return reject(workerScript);