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

more fixes

Browse Source
This commit is contained in:
Olivier Gagnon 2021-05-17 17:49:39 -04:00
parent 3f63d91448
commit 4ec14460b6
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Constants.ts
View File

@ -247,5 +247,11 @@ export const CONSTANTS: IMap<any> = {
Misc. Misc.
* ls now correctly lists all files. * ls now correctly lists all files.
* importing auto save+reloads (@Dawe) * importing auto save+reloads (@Dawe)
* Fix a bug where .fconf could not be created
* Fix formatting inconsistencies for some logs of netscript functions.
* Fix a bug where Cashroot starter kit would appear as [object Object] in
confirmation dialog.
* Fix some ram not displayed as 0.00GB
* Fix error message throw undefined variable error
`, `,
} }

6
src/Faction/FactionHelpers.jsx
View File

@ -114,9 +114,13 @@ export function purchaseAugmentationBoxCreate(aug, fac) {
yesNoBoxClose(); yesNoBoxClose();
}); });
let content = (<div dangerouslySetInnerHTML={{__html: aug.info}}></div>);
if(typeof aug.info !== 'string') {
content = <div>{aug.info}</div>
}
yesNoBoxCreate(<> yesNoBoxCreate(<>
<h2>{aug.name}</h2><br /> <h2>{aug.name}</h2><br />
<div dangerouslySetInnerHTML={{__html: aug.info}}></div><br /><br /> {content}<br /><br />
<br />Would you like to purchase the {aug.name} Augmentation for&nbsp; <br />Would you like to purchase the {aug.name} Augmentation for&nbsp;
{Money(aug.baseCost * factionInfo.augmentationPriceMult)}? {Money(aug.baseCost * factionInfo.augmentationPriceMult)}?
</>); </>);

6
src/NetscriptFunctions.js
View File

@ -226,8 +226,8 @@ function NetscriptFunctions(workerScript) {
"Dynamic RAM usage calculated to be greater than initial RAM usage on fn: " + fnName + "Dynamic RAM usage calculated to be greater than initial RAM usage on fn: " + fnName +
". This is probably because you somehow circumvented the static RAM " + ". This is probably because you somehow circumvented the static RAM " +
"calculation.<br><br>Please don't do that :(<br><br>" + "calculation.<br><br>Please don't do that :(<br><br>" +
"Dynamic RAM Usage: " + workerScript.dynamicRamUsage + "<br>" + "Dynamic RAM Usage: " + numeralWrapper.formatRAM(workerScript.dynamicRamUsage) + "<br>" +
"Static RAM Usage: " + workerScript.ramUsage); "Static RAM Usage: " + numeralWrapper.formatRAM(workerScript.ramUsage));
} }
}; };
@ -1120,7 +1120,7 @@ function NetscriptFunctions(workerScript) {
throw makeRuntimeErrorMsg("run", "Usage: run(scriptname, [numThreads], [arg1], [arg2]...)"); throw makeRuntimeErrorMsg("run", "Usage: run(scriptname, [numThreads], [arg1], [arg2]...)");
} }
if (isNaN(threads) || threads <= 0) { if (isNaN(threads) || threads <= 0) {
throw makeRuntimeErrorMsg("run", `Invalid thread count. Must be numeric and > 0, is ${thread}`); throw makeRuntimeErrorMsg("run", `Invalid thread count. Must be numeric and > 0, is ${threads}`);
} }
var argsForNewScript = []; var argsForNewScript = [];
for (var i = 2; i < arguments.length; ++i) { for (var i = 2; i < arguments.length; ++i) {