Added getServerMaxRam and getServerUsedRam, deprecated getServerRam

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>

src/Netscript/RamCostGenerator.ts

@@ -23,6 +23,8 @@ export const RamCostConstants: IMap<number> = {
     ScriptGetHackingLevelRamCost: 0.05,
     ScriptGetMultipliersRamCost: 4.0,
     ScriptGetServerRamCost: 0.1,
+    ScriptGetServerMaxRam: 0.05,
+    ScriptGetServerUsedRam: 0.05,
     ScriptFileExistsRamCost: 0.1,
     ScriptIsRunningRamCost: 0.1,
     ScriptHacknetNodesRamCost: 4.0,
@@ -122,6 +124,8 @@ export const RamCosts: IMap<any> = {
     getServerGrowth: () => RamCostConstants.ScriptGetServerRamCost,
     getServerNumPortsRequired: () => RamCostConstants.ScriptGetServerRamCost,
     getServerRam: () => RamCostConstants.ScriptGetServerRamCost,
+    getServerMaxRam: () => RamCostConstants.ScriptGetServerMaxRam,
+    getServerUsedRam: () => RamCostConstants.ScriptGetServerUsedRam,
     serverExists: () => RamCostConstants.ScriptGetServerRamCost,
     fileExists: () => RamCostConstants.ScriptFileExistsRamCost,
     isRunning: () => RamCostConstants.ScriptIsRunningRamCost,

src/NetscriptFunctions.js

@@ -1709,6 +1709,18 @@ function NetscriptFunctions(workerScript) {
             workerScript.log("getServerRam", `returned [${formatNumber(server.maxRam, 2)}GB, ${formatNumber(server.ramUsed, 2)}GB]`);
             return [server.maxRam, server.ramUsed];
         },
+        getServerMaxRam: function(ip) {
+            updateDynamicRam("getServerMaxRam", getRamCost("getServerMaxRam"));
+            const server = safeGetServer(ip, "getServerMaxRam");
+            workerScript.log("getServerMaxRam", `returned ${formatNumber(server.maxRam, 2)}GB`);
+            return server.maxRam;
+        },
+        getServerUsedRam: function(ip) {
+            updateDynamicRam("getServerUsedRam", getRamCost("getServerUsedRam"));
+            const server = safeGetServer(ip, "getServerUsedRam");
+            workerScript.log("getServerUsedRam", `returned ${formatNumber(server.ramUsed, 2)}GB`);
+            return server.ramUsed;
+        },
         serverExists: function(ip) {
             updateDynamicRam("serverExists", getRamCost("serverExists"));
             return (getServer(ip) !== null);

test/Netscript/DynamicRamCalculationTests.js

@@ -394,6 +394,16 @@ describe("Netscript Dynamic RAM Calculation/Generation Tests", function() {
             await testNonzeroDynamicRamCost(f);
         });
 
+        it("getServerMaxRam()", async function() {
+            const f = ["getServerMaxRam"];
+            await testNonzeroDynamicRamCost(f);
+        });
+
+        it("getServerUsedRam()", async function() {
+            const f = ["getServerUsedRam"];
+            await testNonzeroDynamicRamCost(f);
+        });
+
         it("serverExists()", async function() {
             const f = ["serverExists"];
             await testNonzeroDynamicRamCost(f);

test/Netscript/StaticRamCalculationTests.js

@@ -284,6 +284,16 @@ describe("Netscript Static RAM Calculation/Generation Tests", function() {
             await expectNonZeroRamCost(f);
         });
 
+        it("getServerMaxRam()", async function() {
+            const f = ["getServerMaxRam"];
+            await expectNonZeroRamCost(f);
+        });
+
+        it("getServerUsedRam()", async function() {
+            const f = ["getServerUsedRam"];
+            await expectNonZeroRamCost(f);
+        });
+
         it("serverExists()", async function() {
             const f = ["serverExists"];
             await expectNonZeroRamCost(f);