Level:
" - }); - - var nodeRamContainer = Object(_utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_8__["createElement"])("div", { - class: "hacknet-node-ram-container row", - innerHTML: "RAM:
" - }); - - var nodeCoresContainer = Object(_utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_8__["createElement"])("div", { - class: "hacknet-node-cores-container row", - innerHTML: "Cores:
" - }) - var containingDiv = Object(_utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_8__["createElement"])("div", { - class: "hacknet-node-container", - innerHTML: "Node name:
" + - "" + - "Production:
" + - "" + - "" + - "Level:
" + }); + + var nodeRamContainer = Object(_utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_8__["createElement"])("div", { + class: "hacknet-node-ram-container row", + innerHTML: "RAM:
" + }); + + var nodeCoresContainer = Object(_utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_8__["createElement"])("div", { + class: "hacknet-node-cores-container row", + innerHTML: "Cores:
" + }) + var containingDiv = Object(_utils_uiHelpers_createElement__WEBPACK_IMPORTED_MODULE_8__["createElement"])("div", { + class: "hacknet-node-container", + innerHTML: "Node name:
" + + "" + + "Production:
" + + "" + + "" + + "Node name:
" + "" + - "Production:
" + "" + @@ -461,7 +497,7 @@ function createHacknetNodeDomElement(nodeObj) { id: "hacknet-node-upgrade-level-" + nodeName, class: "a-link-button-inactive", clickListener: function() { - var numUpgrades = hacknetNodePurchaseMultiplier; + let numUpgrades = hacknetNodePurchaseMultiplier; if (hacknetNodePurchaseMultiplier == 0) { numUpgrades = getMaxNumberLevelUpgrades(nodeObj); } @@ -475,7 +511,11 @@ function createHacknetNodeDomElement(nodeObj) { id: "hacknet-node-upgrade-ram-" + nodeName, class: "a-link-button-inactive", clickListener: function() { - nodeObj.purchaseRamUpgrade(); + let numUpgrades = hacknetNodePurchaseMultiplier; + if (hacknetNodePurchaseMultiplier == 0) { + numUpgrades = getMaxNumberRamUpgrades(nodeObj); + } + nodeObj.purchaseRamUpgrade(numUpgrades); updateHacknetNodesContent(); return false; } @@ -485,7 +525,11 @@ function createHacknetNodeDomElement(nodeObj) { id: "hacknet-node-upgrade-core-" + nodeName, class: "a-link-button-inactive", clickListener: function() { - nodeObj.purchaseCoreUpgrade(); + let numUpgrades = hacknetNodePurchaseMultiplier; + if (hacknetNodePurchaseMultiplier == 0) { + numUpgrades = getMaxNumberCoreUpgrades(nodeObj); + } + nodeObj.purchaseCoreUpgrade(numUpgrades); updateHacknetNodesContent(); return false; } @@ -515,7 +559,7 @@ function updateHacknetNodeDomElement(nodeObj) { updateText("hacknet-node-upgrade-level-" + nodeName, "MAX LEVEL"); upgradeLevelButton.setAttribute("class", "a-link-button-inactive"); } else { - var multiplier = 0; + let multiplier = 0; if (hacknetNodePurchaseMultiplier == 0) { //Max multiplier = getMaxNumberLevelUpgrades(nodeObj); @@ -540,8 +584,16 @@ function updateHacknetNodeDomElement(nodeObj) { updateText("hacknet-node-upgrade-ram-" + nodeName, "MAX RAM"); upgradeRamButton.setAttribute("class", "a-link-button-inactive"); } else { - var upgradeRamCost = nodeObj.calculateRamUpgradeCost(); - updateText("hacknet-node-upgrade-ram-" + nodeName, "Upgrade - $" + formatNumber(upgradeRamCost, 2)); + let multiplier = 0; + if (hacknetNodePurchaseMultiplier == 0) { + multiplier = getMaxNumberRamUpgrades(nodeObj); + } else { + var levelsToMax = Math.round(Math.log2(CONSTANTS.HacknetNodeMaxRam / nodeObj.ram)); + multiplier = Math.min(levelsToMax, hacknetNodePurchaseMultiplier); + } + + var upgradeRamCost = nodeObj.calculateRamUpgradeCost(multiplier); + updateText("hacknet-node-upgrade-ram-" + nodeName, "Upgrade x" + multiplier + " - $" + formatNumber(upgradeRamCost, 2)); if (Player.money.lt(upgradeRamCost)) { upgradeRamButton.setAttribute("class", "a-link-button-inactive"); } else { @@ -556,8 +608,15 @@ function updateHacknetNodeDomElement(nodeObj) { updateText("hacknet-node-upgrade-core-" + nodeName, "MAX CORES"); upgradeCoreButton.setAttribute("class", "a-link-button-inactive"); } else { - var upgradeCoreCost = nodeObj.calculateCoreUpgradeCost(); - updateText("hacknet-node-upgrade-core-" + nodeName, "Upgrade - $" + formatNumber(upgradeCoreCost, 2)); + let multiplier = 0; + if (hacknetNodePurchaseMultiplier == 0) { + multiplier = getMaxNumberCoreUpgrades(nodeObj); + } else { + var levelsToMax = CONSTANTS.HacknetNodeMaxCores - nodeObj.cores; + multiplier = Math.min(levelsToMax, hacknetNodePurchaseMultiplier); + } + var upgradeCoreCost = nodeObj.calculateCoreUpgradeCost(multiplier); + updateText("hacknet-node-upgrade-core-" + nodeName, "Upgrade x" + multiplier + " - $" + formatNumber(upgradeCoreCost, 2)); if (Player.money.lt(upgradeCoreCost)) { upgradeCoreButton.setAttribute("class", "a-link-button-inactive"); } else { @@ -566,35 +625,9 @@ function updateHacknetNodeDomElement(nodeObj) { } } -function createPlayerHacknetNodeWrappers() { - Player.hacknetNodeWrappers.length = Player.hacknetNodes.length; - for (var i = 0; i < Player.hacknetNodes.length; ++i) { - Player.hacknetNodeWrappers[i] = new HacknetNodeWrapper(Player.hacknetNodes[i]); - } -} - -function updatePlayerHacknetNodeWrappers() { - if (Player.hacknetNodeWrappers.length !== Player.hacknetNodes.length) { - return createPlayerHacknetNodeWrappers(); - } - - for (var i = 0; i < Player.hacknetNodeWrappers.length; ++i) { - if (!(Player.hacknetNodeWrappers[i] instanceof HacknetNodeWrapper)) { - return createPlayerHacknetNodeWrappers(); - } - - Player.hacknetNodeWrappers[i].level = Player.hacknetNodes[i].level; - Player.hacknetNodeWrappers[i].ram = Player.hacknetNodes[i].ram; - Player.hacknetNodeWrappers[i].cores = Player.hacknetNodes[i].cores; - Player.hacknetNodeWrappers[i].totalMoneyGenerated = Player.hacknetNodes[i].totalMoneyGenerated; - Player.hacknetNodeWrappers[i].onlineTimeSeconds = Player.hacknetNodes[i].onlineTimeSeconds; - Player.hacknetNodeWrappers[i].moneyGainRatePerSecond = Player.hacknetNodes[i].moneyGainRatePerSecond; - } -} function processAllHacknetNodeEarnings(numCycles) { var total = 0; - updatePlayerHacknetNodeWrappers(); for (var i = 0; i < Player.hacknetNodes.length; ++i) { total += processSingleHacknetNodeEarnings(numCycles, Player.hacknetNodes[i]); } @@ -629,7 +662,6 @@ function getHacknetNode(name) { export { HacknetNode, - createPlayerHacknetNodeWrappers, displayHacknetNodesContent, getCostOfNextHacknetNode, getHacknetNode, diff --git a/src/NetscriptFunctions.js b/src/NetscriptFunctions.js index 8f909be67..bab4f2a7a 100644 --- a/src/NetscriptFunctions.js +++ b/src/NetscriptFunctions.js @@ -166,9 +166,64 @@ function NetscriptFunctions(workerScript) { } }; + //Utility function to get Hacknet Node object + var getHacknetNode = function(i) { + if (isNaN(i)) { + throw makeRuntimeRejectMsg(workerScript, "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); + } + return Player.hacknetNodes[i]; + } + return { - hacknetnodes : function() { - return Player.hacknetNodeWrappers; + hacknet : { + numNodes : function() { + return Player.hacknetNodes.length; + }, + purchaseNode : function() { + return purchaseHacknet(); + }, + getPurchaseNodeCost : function() { + return getCostOfNextHacknetNode(); + }, + getNodeStats : function(i) { + var node = getHacknetNode(i); + return { + name: node.name, + level: node.level, + ram: node.ram, + cores: node.cores, + production: node.moneyGainRatePerSecond, + timeOnline: node.onlineTimeSeconds, + totalProduction: node.totalMoneyGenerated, + }; + }, + upgradeLevel : function(i, n) { + var node = getHacknetNode(i); + return node.purchaseLevelUpgrade(n); + }, + upgradeRam : function(i, n) { + var node = getHacknetNode(i); + return node.purchaseRamUpgrade(n); + }, + upgradeCore : function(i, n) { + var node = getHacknetNode(i); + return node.purchaseCoreUpgrade(n); + }, + getLevelUpgradeCost : function(i, n) { + var node = getHacknetNode(i); + return node.calculateLevelUpgradeCost(n); + }, + getRamUpgradeCost : function(i, n) { + var node = getHacknetNode(i); + return node.calculateRamUpgradeCost(n); + }, + getCoreUpgradeCost : function(i, n) { + var node = getHacknetNode(i); + return node.calculateCoreUpgradeCost(n); + } }, sprintf : sprintf, vsprintf: vsprintf, @@ -1273,21 +1328,6 @@ function NetscriptFunctions(workerScript) { } return (findRunningScript(filename, argsForTargetScript, server) != null); }, - getNextHacknetNodeCost : function() { - if (workerScript.checkingRam) { - return updateStaticRam("getNextHacknetNodeCost", CONSTANTS.ScriptPurchaseHacknetRamCost); - } - updateDynamicRam("getNextHacknetNodeCost", CONSTANTS.ScriptPurchaseHacknetRamCost); - return getCostOfNextHacknetNode(); - }, - - purchaseHacknetNode : function() { - if (workerScript.checkingRam) { - return updateStaticRam("purchaseHacknetNode", CONSTANTS.ScriptPurchaseHacknetRamCost); - } - updateDynamicRam("purchaseHacknetNode", CONSTANTS.ScriptPurchaseHacknetRamCost); - return purchaseHacknet(); - }, getStockPrice : function(symbol) { if (workerScript.checkingRam) { return updateStaticRam("getStockPrice", CONSTANTS.ScriptGetStockRamCost); @@ -3259,9 +3299,9 @@ function NetscriptFunctions(workerScript) { if (workerScript.checkingRam) { return updateStaticRam("getCurrentAction", CONSTANTS.ScriptBladeburnerApiBaseRamCost / 4); } - updateDynamicRam("getCurrentAction", CONSTANTS.ScriptBladeburnerApiBaseRamCost / 2); + updateDynamicRam("getCurrentAction", CONSTANTS.ScriptBladeburnerApiBaseRamCost / 4); if (Player.bladeburner instanceof Bladeburner && (Player.bitNodeN === 7 || hasBladeburner2079SF)) { - return Player.bladeburner.resetAction(); + return Player.bladeburner.getTypeAndNameFromActionId(Player.bladeburner.action); } throw makeRuntimeRejectMsg(workerScript, "getCurrentAction() failed because you do not currently have access to the Bladeburner API. This is either because you are not currently employed " + "at the Bladeburner division or because you do not have Source-File 7"); diff --git a/src/Player.js b/src/Player.js index f8cbf97d8..72e12a385 100644 --- a/src/Player.js +++ b/src/Player.js @@ -99,7 +99,6 @@ function PlayerObject() { this.currentServer = ""; //IP address of Server currently being accessed through terminal this.purchasedServers = []; //IP Addresses of purchased servers this.hacknetNodes = []; - this.hacknetNodeWrappers = []; this.totalHacknetNodeProduction = 0; //Factions diff --git a/src/SaveObject.js b/src/SaveObject.js index 43593dc46..1ad53d656 100644 --- a/src/SaveObject.js +++ b/src/SaveObject.js @@ -8,8 +8,7 @@ import {loadFactions, Factions, processPassiveFactionRepGain} from "./Faction"; import {FconfSettings, loadFconf} from "./Fconf"; import {loadAllGangs, AllGangs} from "./Gang"; -import {processAllHacknetNodeEarnings, - createPlayerHacknetNodeWrappers} from "./HacknetNode"; +import {processAllHacknetNodeEarnings} from "./HacknetNode"; import {loadMessages, initMessages, Messages} from "./Message"; import {Player, loadPlayer} from "./Player"; import {loadAllRunningScripts} from "./Script"; @@ -230,8 +229,6 @@ function loadGame(saveString) { } } - //Re-initialize Hacknet Node Wrappers - createPlayerHacknetNodeWrappers(); return true; } @@ -448,9 +445,6 @@ function loadImportedGame(saveObj, saveString) { } } - //Re-initialize Hacknet Node Wrappers - createPlayerHacknetNodeWrappers(); - var popupId = "import-game-restart-game-notice"; var txt = createElement("p", { innerText:"Imported game! I would suggest saving the game and then reloading the page " + diff --git a/src/Script.js b/src/Script.js index 55a6abba7..61f24cc4c 100644 --- a/src/Script.js +++ b/src/Script.js @@ -211,12 +211,25 @@ function scriptEditorInit() { if (prefix.length === 0) {callback(null, []); return;} var words = []; var fns = NetscriptFunctions(null); - for (var name in fns) { + for (let name in fns) { if (fns.hasOwnProperty(name)) { words.push({ - name: name, - value: name, - }); + name: name, + value: name, + }); + + //Get functions from namespaces + if (name === "bladeburner" || name === "hacknet") { + let namespace = fns[name]; + if (typeof namespace !== "object") {continue;} + let namespaceFns = Object.keys(namespace); + for (let i = 0; i < namespaceFns.length; ++i) { + words.push({ + name: namespaceFns[i], + value: namespaceFns[i], + }); + } + } } } callback(null, words); @@ -465,11 +478,11 @@ function parseOnlyRamCalculate(server, code, workerScript) { } // Check if this is one of the special keys, and add the appropriate ram cost if so. - if (ref == specialReferenceIF) ram += CONSTANTS.ScriptIfRamCost; - if (ref == specialReferenceFOR) ram += CONSTANTS.ScriptForRamCost; - if (ref == specialReferenceWHILE) ram += CONSTANTS.ScriptWhileRamCost; - if (ref == "hacknetnodes") ram += CONSTANTS.ScriptHacknetNodesRamCost; - if (ref == "document" || ref == "window") ram += CONSTANTS.ScriptDomRamCost; + if (ref == specialReferenceIF) ram += CONSTANTS.ScriptIfRamCost; + if (ref == specialReferenceFOR) ram += CONSTANTS.ScriptForRamCost; + if (ref == specialReferenceWHILE) ram += CONSTANTS.ScriptWhileRamCost; + if (ref == "hacknet") ram += CONSTANTS.ScriptHacknetNodesRamCost; + if (ref == "document" || ref == "window") ram += CONSTANTS.ScriptDomRamCost; // Check if this ident is a function in the workerscript env. If it is, then we need to // get its RAM cost. We do this by calling it, which works because the running script @@ -739,7 +752,7 @@ function calculateRamUsage(codeCopy) { } //Special case: hacknetnodes array - if (codeCopy.includes("hacknetnodes")) { + if (codeCopy.includes("hacknet")) { ramUsage += CONSTANTS.ScriptHacknetNodesRamCost; } return ramUsage;