Merging changes from pull requests. Re-adding package lock.json

This commit is contained in:
danielyxie
2018-05-09 02:21:47 -05:00
parent b0a825e0bc
commit dfb5cbf02d
16 changed files with 18519 additions and 11 deletions

View File

@@ -422,7 +422,7 @@ getHackingMultipliers
.. js:function:: getHackingMultipliers()
Returns an object containing the Player's hacking related multipliers. These multipliers are
returned in integer forms, not percentages (e.g. 1.5 instead of 150%). The object has the following structure::
returned in fractional forms, not percentages (e.g. 1.5 instead of 150%). The object has the following structure::
{
chance: Player's hacking chance multiplier,
@@ -437,6 +437,30 @@ getHackingMultipliers
print(mults.chance);
print(mults.growth);
getHacknetMultipliers
^^^^^^^^^^^^^^^^^^^^^
.. js:function:: getHacknetMultipliers()
Returns an object containing the Player's hacknet related multipliers. These multipliers are
returned in fractional forms, not percentages (e.g. 1.5 instead of 150%). The object has the following structure::
{
production: Player's hacknet production multiplier,
purchaseCost: Player's hacknet purchase cost multiplier,
ramCost: Player's hacknet ram cost multiplier,
coreCost: Player's hacknet core cost multiplier,
levelCost: Player's hacknet level cost multiplier
}
Example of how this can be used::
mults = getHacknetMultipliers();
print(mults.production);
print(mults.purchaseCost);
getServerMoneyAvailable
^^^^^^^^^^^^^^^^^^^^^^^
@@ -789,10 +813,10 @@ getScriptName
getScriptRam
^^^^^^^^^^^^
.. js:function:: getScriptRam(scriptname, hostname/ip)
.. js:function:: getScriptRam(scriptname[, hostname/ip])
:param string scriptname: Filename of script. This is case-sensitive.
:param string hostname/ip: Hostname or IP of target server
:param string hostname/ip: Hostname or IP of target server the script is located on. This is optional, If it is not specified then the function will se the current server as the target server.
Returns the amount of RAM required to run the specified script on the target server