Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-29 19:13:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

convert more netscript functions to use common error message

Browse Source
This commit is contained in:
Olivier Gagnon 2021-03-16 06:01:15 -04:00
parent c9fe8d9b65
commit 4c30f107e3
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/NetscriptFunctions.js
View File

@ -329,10 +329,10 @@ function NetscriptFunctions(workerScript) {
*/
const checkTixApiAccess = function(callingFn="") {
if (!Player.hasWseAccount) {
throw makeRuntimeRejectMsg(workerScript, `You don't have WSE Access! Cannot use ${callingFn}()`);
throw makeRuntimeErrorMsg(callingFn, `You don't have WSE Access! Cannot use ${callingFn}()`);
}
if (!Player.hasTixApiAccess) {
throw makeRuntimeRejectMsg(workerScript, `You don't have TIX API Access! Cannot use ${callingFn}()`);
throw makeRuntimeErrorMsg(callingFn, `You don't have TIX API Access! Cannot use ${callingFn}()`);
}
}
@ -344,7 +344,7 @@ function NetscriptFunctions(workerScript) {
const getStockFromSymbol = function(symbol, callingFn="") {
const stock = SymbolToStockMap[symbol];
if (stock == null) {
throw makeRuntimeRejectMsg(workerScript, `Invalid stock symbol passed into ${callingFn}()`);
throw makeRuntimeErrorMsg(callingFn, `Invalid stock symbol: '${symbol}'`);
}
return stock;
@ -367,18 +367,18 @@ function NetscriptFunctions(workerScript) {
}
// Utility function to get Hacknet Node object
const getHacknetNode = function(i) {
const getHacknetNode = function(i, callingFn="") {
if (isNaN(i)) {
throw makeRuntimeRejectMsg(workerScript, "Invalid index specified for Hacknet Node: " + i);
throw makeRuntimeErrorMsg(callingFn, "Invalid index specified for Hacknet Node: " + i);
}
if (i < 0 || i >= Player.hacknetNodes.length) {
throw makeRuntimeRejectMsg(workerScript, "Index specified for Hacknet Node is out-of-bounds: " + i);
throw makeRuntimeErrorMsg(callingFn, "Index specified for Hacknet Node is out-of-bounds: " + i);
}
if (hasHacknetServers()) {
const hserver = AllServers[Player.hacknetNodes[i]];
if (hserver == null) {
throw makeRuntimeRejectMsg(workerScript, `Could not get Hacknet Server for index ${i}. This is probably a bug, please report to game dev`);
throw makeRuntimeErrorMsg(callingFn, `Could not get Hacknet Server for index ${i}. This is probably a bug, please report to game dev`);
}
return hserver;
@ -579,7 +579,7 @@ function NetscriptFunctions(workerScript) {
}
},
getNodeStats : function(i) {
const node = getHacknetNode(i);
const node = getHacknetNode(i, "getNodeStats");
const hasUpgraded = hasHacknetServers();
const res = {
name: hasUpgraded ? node.hostname : node.name,
@ -599,20 +599,20 @@ function NetscriptFunctions(workerScript) {
return res;
},
upgradeLevel : function(i, n) {
const node = getHacknetNode(i);
const node = getHacknetNode(i, "upgradeLevel");
return purchaseLevelUpgrade(node, n);
},
upgradeRam : function(i, n) {
const node = getHacknetNode(i);
const node = getHacknetNode(i, "upgradeRam");
return purchaseRamUpgrade(node, n);
},
upgradeCore : function(i, n) {
const node = getHacknetNode(i);
const node = getHacknetNode(i, "upgradeCore");
return purchaseCoreUpgrade(node, n);
},
upgradeCache : function(i, n) {
if (!hasHacknetServers()) { return false; }
const node = getHacknetNode(i);
const node = getHacknetNode(i, "upgradeCache");
const res = purchaseCacheUpgrade(node, n);
if (res) {
updateHashManagerCapacity();
@ -620,20 +620,20 @@ function NetscriptFunctions(workerScript) {
return res;
},
getLevelUpgradeCost : function(i, n) {
const node = getHacknetNode(i);
const node = getHacknetNode(i, "upgradeLevel");
return node.calculateLevelUpgradeCost(n, Player.hacknet_node_level_cost_mult);
},
getRamUpgradeCost : function(i, n) {
const node = getHacknetNode(i);
const node = getHacknetNode(i, "upgradeRam");
return node.calculateRamUpgradeCost(n, Player.hacknet_node_ram_cost_mult);
},
getCoreUpgradeCost : function(i, n) {
const node = getHacknetNode(i);
const node = getHacknetNode(i, "upgradeCore");
return node.calculateCoreUpgradeCost(n, Player.hacknet_node_core_cost_mult);
},
getCacheUpgradeCost : function(i, n) {
if (!hasHacknetServers()) { return Infinity; }
const node = getHacknetNode(i);
const node = getHacknetNode(i, "upgradeCache");
return node.calculateCacheUpgradeCost(n);
},
numHashes : function() {

9
src/engine.jsx
View File

@ -1149,10 +1149,11 @@ const Engine = {
Engine.start(); // Run main game loop and Scripts loop
removeLoadingScreen();
const timeOfflineString = convertTimeMsToTimeElapsedString(time);
dialogBoxCreate(`Offline for ${timeOfflineString}. While you were offline, your scripts ` +
"generated <span class='money-gold'>" +
numeralWrapper.formatMoney(offlineProductionFromScripts) + "</span> " +
"and your Hacknet Nodes generated <span class='money-gold'>" + hacknetProdInfo + "</span>");
dialogBoxCreate(<>
Offline for {timeOfflineString}. While you were offline, your scripts generated
<span class='money-gold'> {numeralWrapper.formatMoney(offlineProductionFromScripts)} </span>
and your Hacknet Nodes generated <span class='money-gold'>{hacknetProdInfo}</span>.
</>);
// Close main menu accordions for loaded game
var visibleMenuTabs = [terminal, createScript, activeScripts, stats,
hacknetnodes, city, tutorial, options, dev];