Merge branch 'dev' of https://github.com/danielyxie/bitburner into dev

doc/source/netscriptfunctions.rst

@@ -779,6 +779,12 @@ scriptKill
     Kills all scripts with the specified filename on the target server specified by *hostname/ip*, regardless of arguments. Returns
     true if one or more scripts were successfully killed, and false if none were.
 
+getScriptName
+^^^^^^^^^^^^^
+
+.. js:function:: getScriptName()
+    Returns the current script name
+
 getScriptRam
 ^^^^^^^^^^^^
 

doc/source/netscripthacknetnodeapi.rst

@@ -17,6 +17,22 @@ hacknetnodes
     accessed using *hacknetnodes[0]*. The fourth Hacknet Node you purchase will have the name
     "hacknet-node-3" and can be accessed using *hacknetnodes[3]*.
 
+Purchasing Hacknet Nodes
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following is a list of supported functions for purchasing Hacknet Nodes.
+
+.. js:function:: getNextHacknetNodeCost()
+
+    Returns the cost of purchasing a new Hacknet Node
+
+.. js:function:: purchaseHacknetNode()
+
+    Purchases a new Hacknet Node. Returns a number with the index of the Hacknet Node. This index is equivalent to the number at the
+    end of the Hacknet Node's name (e.g The Hacknet Node named 'hacknet-node-4' will have an index of 4). If the player cannot afford
+    to purchase a new Hacknet Node then the function will return false.
+
+
 Hacknet Node Member Variables
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -25,6 +41,11 @@ a value to these.
 
 Note that these must be called on an element inside the *hacknetnodes* array, not the array itself.
 
+.. js:attribute:: hacknetnodes[i].name
+
+    Returns the name of the corresponding Hacknet Node
+    
+
 .. js:attribute:: hacknetnodes[i].level
 
     Returns the level of the corresponding Hacknet Node

src/Constants.js

@@ -40,6 +40,7 @@ let CONSTANTS = {
 
     /* Netscript Constants */
     //RAM Costs for different commands
+    ScriptBaseRamCost:              1.4,
     ScriptWhileRamCost:             0.2,
     ScriptForRamCost:               0.2,
     ScriptIfRamCost:                0.15,

src/NetscriptFunctions.js

@@ -2002,6 +2002,10 @@ function NetscriptFunctions(workerScript) {
             }
             return suc;
         },
+        getScriptName : function() {
+            if (workerScript.checkingRam) {return 0;}
+            return workerScript.name;
+        },
         getScriptRam : function (scriptname, ip) {
             if (workerScript.checkingRam) {
                 if (workerScript.loadedFns.getScriptRam) {

src/Script.js

@@ -418,7 +418,7 @@ function parseOnlyRamCalculate(server, code, workerScript) {
 
         // Finally, walk the reference map and generate a ram cost. The initial set of keys to scan
         // are those that start with __SPECIAL_INITIAL_MODULE__.
-        let ram = 1.4;
+        let ram = CONSTANTS.ScriptBaseRamCost;
         const unresolvedRefs = Object.keys(dependencyMap).filter(s => s.startsWith(initialModule));
         const resolvedRefs = new Set();
         while (unresolvedRefs.length > 0) {