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

doc/source/netscript/basicfunctions/getServerMaxRam.rst

@@ -0,0 +1,15 @@
+getServerMaxRam() Netscript Function
+====================================
+
+.. js:function:: getServerMaxRam(hostname)
+
+    :RAM cost: 0.05 GB
+    :param string hostname: Hostname of target server.
+    :returns: Total ram available on that server. In GB.
+
+    Example:
+
+    .. code-block:: javascript
+
+        maxRam = getServerMaxRam("helios"); // returns: 16
+        print("helios has "+maxRam + "GB");

doc/source/netscript/basicfunctions/getServerRam.rst

@@ -3,6 +3,8 @@ getServerRam() Netscript Function
 
 .. js:function:: getServerRam(hostname)
 
+    .. warning:: This function is deprecated.
+
     :RAM cost: 0.1 GB
     :param string hostname: Hostname of target server.
     :returns: An array of 2 number, first number is the total RAM, second the

doc/source/netscript/basicfunctions/getServerUsedRam.rst

@@ -0,0 +1,15 @@
+getServerUsedRam() Netscript Function
+=====================================
+
+.. js:function:: getServerUsedRam(hostname)
+
+    :RAM cost: 0.05 GB
+    :param string hostname: Hostname of target server.
+    :returns: Used ram on that server. In GB.
+
+    Example:
+
+    .. code-block:: javascript
+
+        usedRam = getServerUsedRam("harakiri-sushi"); // returns: 5.6
+        print("harakiri-sushi uses "+usedRam + "GB");

doc/source/netscript/netscriptfunctions.rst

@@ -54,7 +54,8 @@ This includes information such as function signatures, what they do, and their r
     getServerMinSecurityLevel() <basicfunctions/getServerMinSecurityLevel>
     getServerRequiredHackingLevel() <basicfunctions/getServerRequiredHackingLevel>
     getServerNumPortsRequired() <basicfunctions/getServerNumPortsRequired>
-    getServerRam() <basicfunctions/getServerRam>
+    getServerMaxRam() <basicfunctions/getServerMaxRam>
+    getServerUsedRam() <basicfunctions/getServerUsedRam>
     serverExists() <basicfunctions/serverExists>
     fileExists() <basicfunctions/fileExists>
     isRunning() <basicfunctions/isRunning>
@@ -90,3 +91,8 @@ This includes information such as function signatures, what they do, and their r
     wget() <basicfunctions/wget>
     getFavorToDonate() <basicfunctions/getFavorToDonate>
     flags() <basicfunctions/flags>
+
+.. toctree::
+    :caption: Deprecated:
+
+    getServerRam() <basicfunctions/getServerRam>

doc/source/netscript/netscripthacknetnodeapi.rst

@@ -86,7 +86,7 @@ The following is an example of one way a script can be used to automate the
 purchasing and upgrading of Hacknet Nodes.
 
 This script attempts to purchase Hacknet Nodes until the player has a total of 8. Then
-it gradually upgrades those Node's to a minimum of level 140, 64 GB RAM, and 8 cores
+it gradually upgrades those Node's to a minimum of level 80, 16 GB RAM, and 8 cores
 
 .. code:: javascript
 
@@ -129,3 +129,16 @@ it gradually upgrades those Node's to a minimum of level 140, 64 GB RAM, and 8 c
     };
 
     print("All nodes upgraded to 16GB RAM");
+
+    for (var i = 0; i < cnt; i++) {
+        while (hacknet.getNodeStats(i).cores < 8) {
+            var cost = hacknet.getCoreUpgradeCost(i, 1);
+            while (myMoney() < cost) {
+                print("Need $" + cost + " . Have $" + myMoney());
+                sleep(3000);
+            }
+            res = hacknet.upgradeCore(i, 1);
+        };
+    };
+
+    print("All nodes upgraded to 8 cores");