Merge pull request #97 from danielyxie/dev

Dev v0.26.2

index.html

@@ -502,6 +502,11 @@
 		<h1> Factions </h1>
 		<p> Lists all factions you have joined </p>
 		<ul class="factions-list" id="factions-list"></ul>
+        <br><br>
+        <h1> Outstanding Faction Invitations </h1>
+        <p style="width:70%;"> Lists factions you have been invited to, as well as factions you have previously rejected.
+            You can accept these faction invitations at any times </p>
+        <ul class="factions-list" id="outstanding-faction-invitations-list"></ul>
 	</div>
 
 	<!-- Single Faction info (when you select a faction from the Factions menu) -->
@@ -651,19 +656,19 @@
         <p id="location-text-divider-3"> --------------- </p>
 
         <!-- Jobs/Work at a company -->
-        <a id="location-software-job" class="a-link-button"> Apply for Software Job</a>
+        <a id="location-software-job" class="a-link-button tooltip"> Apply for Software Job</a>
-        <a id="location-software-consultant-job" class="a-link-button"> Apply for Software Consultant Job</a>
+        <a id="location-software-consultant-job" class="a-link-button tooltip"> Apply for Software Consultant Job</a>
-        <a id="location-it-job" class="a-link-button"> Apply for IT Job </a>
+        <a id="location-it-job" class="a-link-button tooltip"> Apply for IT Job </a>
-        <a id="location-security-engineer-job" class="a-link-button"> Apply for Security Engineer Job</a>
+        <a id="location-security-engineer-job" class="a-link-button tooltip"> Apply for Security Engineer Job</a>
-        <a id="location-network-engineer-job" class="a-link-button"> Apply for Network Engineer Job</a>
+        <a id="location-network-engineer-job" class="a-link-button tooltip"> Apply for Network Engineer Job</a>
-        <a id="location-business-job" class="a-link-button"> Apply for Business Job</a>
+        <a id="location-business-job" class="a-link-button tooltip"> Apply for Business Job</a>
-        <a id="location-business-consultant-job" class="a-link-button"> Apply for Business Consultant Job </a>
+        <a id="location-business-consultant-job" class="a-link-button tooltip"> Apply for Business Consultant Job </a>
-        <a id="location-security-job" class="a-link-button"> Apply for Security Job</a>
+        <a id="location-security-job" class="a-link-button tooltip"> Apply for Security Job</a>
-        <a id="location-agent-job" class="a-link-button"> Apply to be an Agent</a>
+        <a id="location-agent-job" class="a-link-button tooltip"> Apply to be an Agent</a>
-        <a id="location-employee-job" class="a-link-button"> Apply to be an Employee </a>
+        <a id="location-employee-job" class="a-link-button tooltip"> Apply to be an Employee </a>
-        <a id="location-parttime-employee-job" class="a-link-button"> Apply to be a Part-time Employee </a>
+        <a id="location-parttime-employee-job" class="a-link-button tooltip"> Apply to be a Part-time Employee </a>
-        <a id="location-waiter-job" class="a-link-button"> Apply to be a Waiter</a>
+        <a id="location-waiter-job" class="a-link-button tooltip"> Apply to be a Waiter</a>
-        <a id="location-parttime-waiter-job" class="a-link-button"> Apply to be a Part-time Waiter</a>
+        <a id="location-parttime-waiter-job" class="a-link-button tooltip"> Apply to be a Part-time Waiter</a>
 
         <a id="location-work" class="a-link-button"> Work </a>
 
@@ -928,7 +933,7 @@
                         </span>
                     </label>
 
-                    <input type ="range" max="100" min="20"
+                    <input type="range" max="100" min="20"
                         oninput="document.getElementById('settingsNSLogRangeValLabel').innerHTML = this.value;
                                  Settings.MaxLogCapacity=this.value;"
                         step="1" name="settingsNSLogRangeVal" id="settingsNSLogRangeVal" value="50">
@@ -946,7 +951,7 @@
                         </span>
                     </label>
 
-                    <input type ="range" max="100" min="20"
+                    <input type="range" max="100" min="20"
                         oninput="document.getElementById('settingsNSPortRangeValLabel').innerHTML = this.value;
                                  Settings.MaxPortCapacity=this.value;"
                         step="1" name="settingsNSPortRangeVal" id="settingsNSPortRangeVal" value="50">
@@ -954,6 +959,31 @@
                     <em id="settingsNSPortRangeValLabel" style="font-style: normal;"></em>
                 </fieldset>
 
+                <!-- Suppress messages -->
+                <fieldset>
+                    <label for="settingsSuppressMessages" class="tooltip">Suppress Messages:
+                        <span class="tooltiptext">
+                            If this is set, then any messages you receive will not appear as popups
+                            on the screen. They will still get sent to your home computer as '.msg' files
+                            and can be viewed with the 'cat' Terminal command.
+                        </span>
+                    </label>
+                    <input type="checkbox" name="settingsSuppressMessages" id="settingsSuppressMessages"
+                           onclick="Settings.SuppressMessages = this.checked;">
+                </fieldset>
+
+                <!-- Suppress faction invites -->
+                <fieldset>
+                    <label for="settingsSuppressFactionInvites" class="tooltip">Suppress Faction Invites:
+                        <span class="tooltiptext">
+                            If this is set, then any faction invites you receive will not appear as popups
+                            on the screen. Your outstanding faction invites can be viewed in the 'Factions' page.
+                        </span>
+                    </label>
+                    <input type="checkbox" name="settingsSuppressFactionInvites" id="settingsSuppressFactionInvites"
+                           onclick="Settings.SuppressFactionInvites = this.checked;">
+                </fieldset>
+
                 <!-- Donate button -->
                 <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_blank">
                 <input type="hidden" name="cmd" value="_s-xclick">

src/Company.js

@@ -378,6 +378,7 @@ CompanyPositions = {
 //Returns the next highest position in the company for the relevant career/field
 //I.E returns what your next job would be if you qualify for a promotion
 getNextCompanyPosition = function(currPos) {
+    if (currPos == null) {return null;}
     //Software
     if (currPos.positionName == CompanyPositions.SoftwareIntern.positionName) {
         return CompanyPositions.JuniorDev;

src/CompanyJobApplication.js

@@ -87,7 +87,7 @@ PlayerObject.prototype.applyForJob = function(entryPosType) {
     Engine.loadLocationContent();
 }
 
-function getJobRequirementText(company, pos) {
+function getJobRequirementText(company, pos, tooltiptext=false) {
     var reqText = "";
     var offset = company.jobStatReqOffset;
     var reqHacking = pos.requiredHacking > 0       ? pos.requiredHacking+offset   : 0;
@@ -97,19 +97,61 @@ function getJobRequirementText(company, pos) {
     var reqAgility = pos.requiredDexterity > 0     ? pos.requiredDexterity+offset : 0;
     var reqCharisma = pos.requiredCharisma > 0     ? pos.requiredCharisma+offset  : 0;
     var reqRep = pos.requiredReputation;
-    var reqText = "(Requires ";
+    if (tooltiptext) {
-    if (reqHacking > 0)     {reqText += (reqHacking +       " hacking, ");}
+        reqText = "Requires:<br>";
-    if (reqStrength > 0)    {reqText += (reqStrength +      " strength, ");}
+        reqText += (reqHacking.toString() +       " hacking<br>");
-    if (reqDefense > 0)     {reqText += (reqDefense +       " defense, ");}
+        reqText += (reqStrength.toString() +      " strength<br>");
-    if (reqDexterity > 0)   {reqText += (reqDexterity +     " dexterity, ");}
+        reqText += (reqDefense.toString() +       " defense<br>");
-    if (reqAgility > 0)     {reqText += (reqAgility +       " agility, ");}
+        reqText += (reqDexterity.toString() +     " dexterity<br>");
-    if (reqCharisma > 0)    {reqText += (reqCharisma +      " charisma, ");}
+        reqText += (reqAgility.toString() +       " agility<br>");
-    if (reqRep > 1)         {reqText += (reqRep +           " reputation, ");}
+        reqText += (reqCharisma.toString() +      " charisma<br>");
-    reqText = reqText.substring(0, reqText.length - 2);
+        reqText += (reqRep.toString() +           " and reputation");
-    reqText += ")";
+    } else {
+        reqText = "(Requires ";
+        if (reqHacking > 0)     {reqText += (reqHacking +       " hacking, ");}
+        if (reqStrength > 0)    {reqText += (reqStrength +      " strength, ");}
+        if (reqDefense > 0)     {reqText += (reqDefense +       " defense, ");}
+        if (reqDexterity > 0)   {reqText += (reqDexterity +     " dexterity, ");}
+        if (reqAgility > 0)     {reqText += (reqAgility +       " agility, ");}
+        if (reqCharisma > 0)    {reqText += (reqCharisma +      " charisma, ");}
+        if (reqRep > 1)         {reqText += (reqRep +           " reputation, ");}
+        reqText = reqText.substring(0, reqText.length - 2);
+        reqText += ")";
+    }
     return reqText;
 }
 
+//Returns your next position at a company given the field (software, business, etc.)
+PlayerObject.prototype.getNextCompanyPosition = function(company, entryPosType) {
+    var currCompany = null;
+    if (this.companyName != "") {
+        currCompany = Companies[this.companyName];
+    }
+
+    //Not employed at this company, so return the entry position
+    if (currCompany == null || (currCompany.companyName != company.companyName)) {
+        return entryPosType;
+    }
+
+    //If the entry pos type and the player's current position have the same type,
+    //return the player's "nextCompanyPosition". Otherwise return the entryposType
+    //Employed at this company, so just return the next position if it exists.
+    if ((this.companyPosition.isSoftwareJob() && entryPosType.isSoftwareJob()) ||
+        (this.companyPosition.isITJob() && entryPosType.isITJob()) ||
+        (this.companyPosition.isSecurityEngineerJob() && entryPosType.isSecurityEngineerJob()) ||
+        (this.companyPosition.isNetworkEngineerJob() && entryPosType.isNetworkEngineerJob()) ||
+        (this.companyPosition.isSecurityJob() && entryPosType.isSecurityJob()) ||
+        (this.companyPosition.isAgentJob() && entryPosTypeisAgentJob()) ||
+        (this.companyPosition.isSoftwareConsultantJob() && entryPosType.isSoftwareConsultantJob()) ||
+        (this.companyPosition.isBusinessConsultantJob() && entryPosType.isBusinessConsultantJob()) ||
+        (this.companyPosition.isPartTimeJob() && entryPosType.isPartTimeJob())) {
+        return getNextCompanyPosition(this.companyPosition);
+    }
+
+
+    return entryPosType;
+}
+
 PlayerObject.prototype.applyForSoftwareJob = function() {
     this.applyForJob(CompanyPositions.SoftwareIntern);
 }

src/Constants.js

@@ -1,5 +1,5 @@
 CONSTANTS = {
-    Version:                "0.26.1",
+    Version:                "0.26.2",
 
 	//Max level for any skill, assuming no multipliers. Determined by max numerical value in javascript for experience
     //and the skill level formula in Player.js. Note that all this means it that when experience hits MAX_INT, then
@@ -61,9 +61,7 @@ CONSTANTS = {
     ScriptHasRootAccessRamCost:     0.05,
     ScriptGetHostnameRamCost:       0.05,
     ScriptGetHackingLevelRamCost:   0.05,
-    ScriptGetServerMoneyRamCost:    0.1,
+    ScriptGetServerCost:            0.1,
-    ScriptGetServerSecurityRamCost: 0.1,
-    ScriptGetServerReqdHackRamCost: 0.1,
     ScriptFileExistsRamCost:        0.1,
     ScriptIsRunningRamCost:         0.1,
     ScriptOperatorRamCost:          0.01,
@@ -86,6 +84,8 @@ CONSTANTS = {
     ServerFortifyAmount: 0.002,     //Amount by which server's security increases when its hacked/grown
     ServerWeakenAmount: 0.05,        //Amount by which server's security decreases when weakened
 
+    PurchasedServerLimit: 25,
+
     //Augmentation Constants
     AugmentationCostMultiplier: 5,  //Used for balancing costs without having to readjust every Augmentation cost
     AugmentationRepMultiplier:  2.5, //Used for balancing rep cost without having to readjust every value
@@ -678,7 +678,20 @@ CONSTANTS = {
                                "World Stock Exchange account and TIX API Access<br>",
 
     LatestUpdate:
-    "V0.26.1<br>" +
+    "v0.26.2<br>" +
+    "-Major rebalancing and randomization of the amount of money that servers start with<br>" +
+    "-Significantly lowered hacking exp gain from hacking servers. The exp gain for higher-level servers was lowered more than " +
+    "that of low level servers. (~16% for lower level servers, up to ~25% for higher-level servers)<br>" +
+    "-Added deleteServer() Netscript function<br>" +
+    "-You can now purchase a maximum of 25 servers each run (Deleting a server will allow you to purchase a new one)<br>" +
+    "-Added autocompletion for './' Terminal command<br>" +
+    "-Darkweb prices now displayed properly using toLocaleString()<br>" +
+    "-Added NOT operator (!) and negation operator(-), so negative numbers should be functional now<br>" +
+    "-Rejected faction invitations will now show up as 'Outstanding Faction Invites' in the Factions page. These " +
+    "can be accepted at any point in the future<br>" +
+    "-Added a few more configurable game settings for suppressing messages and faction invitations<br>" +
+    "-Added tooltips for company job requirements<br><br>" +
+    "v0.26.1<br>" +
     "-Added autocompletion for aliases<br>" +
     "-Added getServerRam() Netscript function()<br>" +
     "-Added getLevelUpgradeCost(n), getRamUpgradeCost(), getCoreUpgradeCost() functions for Netscript Hacknet Node API<br>" +

src/DarkWeb.js

@@ -41,9 +41,39 @@ executeDarkwebTerminalCommand = function(commandArray) {
 listAllDarkwebItems = function() {
     for (var item in DarkWebItems) {
 		if (DarkWebItems.hasOwnProperty(item)) {
-            post(DarkWebItems[item]);
+            var item = DarkWebItems[item];
+            //Convert string using toLocaleString
+            var split = item.split(" - ");
+            if (split.length == 3 && split[1].charAt(0) == '$') {
+                split[1] = split[1].slice(1);
+                split[1] = split[1].replace(/,/g, '');
+                var price = parseFloat(split[1]);
+                if (isNaN(price)) {
+                    post(item);
+                    return;
+                }
+                price = formatNumber(price, 0);
+                split[1] = "$" + price.toString();
+                post(split.join(" - "));
+            } else {
+                post(item);
+            }
 		}
 	}
+
+    var priceString = split[1];
+    //Check for errors
+    if (priceString.length == 0 || priceString.charAt(0) != '$') {
+        return -1;
+    }
+    //Remove dollar sign and commas
+    priceString = priceString.slice(1);
+    priceString = priceString.replace(/,/g, '');
+
+    //Convert string to numeric
+    var price = parseFloat(priceString);
+    if (isNaN(price)) {return -1;}
+    else {return price;}
 }
 
 buyDarkwebItem = function(itemName) {

src/Faction.js

@@ -630,7 +630,12 @@ PlayerObject.prototype.checkForFactionInvitations = function() {
 }
 
 inviteToFaction = function(faction) {
-    factionInvitationBoxCreate(faction);
+    if (Settings.SuppressFactionInvites) {
+        faction.alreadyInvited = true;
+        Player.factionInvitations.push(faction.name);
+    } else {
+        factionInvitationBoxCreate(faction);
+    }
 }
 
 joinFaction = function(faction) {

src/Location.js

@@ -336,6 +336,21 @@ displayLocationContent = function() {
     if (Player.hp < 0) {Player.hp = 0;}
     var hospitalTreatmentCost = (Player.max_hp - Player.hp) * CONSTANTS.HospitalCostPerHp;
 
+    //Set tooltip for job requirements
+    setJobRequirementTooltip(loc, CompanyPositions.SoftwareIntern, softwareJob);
+    setJobRequirementTooltip(loc, CompanyPositions.SoftwareConsultant, softwareConsultantJob);
+    setJobRequirementTooltip(loc, CompanyPositions.ITIntern, itJob);
+    setJobRequirementTooltip(loc, CompanyPositions.SecurityEngineer, securityEngineerJob);
+    setJobRequirementTooltip(loc, CompanyPositions.NetworkEngineer, networkEngineerJob);
+    setJobRequirementTooltip(loc, CompanyPositions.BusinessIntern, businessJob);
+    setJobRequirementTooltip(loc, CompanyPositions.BusinessConsultant, businessConsultantJob);
+    setJobRequirementTooltip(loc, CompanyPositions.SecurityGuard, securityJob);
+    setJobRequirementTooltip(loc, CompanyPositions.FieldAgent, agentJob);
+    setJobRequirementTooltip(loc, CompanyPositions.Employee, employeeJob);
+    setJobRequirementTooltip(loc, CompanyPositions.PartTimeEmployee, employeePartTimeJob);
+    setJobRequirementTooltip(loc, CompanyPositions.Waiter, waiterJob);
+    setJobRequirementTooltip(loc, CompanyPositions.PartTimeWaiter, waiterPartTimeJob);
+
     switch (loc) {
         case Locations.AevumTravelAgency:
             travelAgencyText.style.display = "block";
@@ -1900,3 +1915,14 @@ setInfiltrateButton = function(btn, companyName, startLevel, val, maxClearance,
         return false;
     });
 }
+
+//Finds the next target job for the player at the given company (loc) and
+//adds the tooltiptext to the Application button, given by 'button'
+function setJobRequirementTooltip(loc, entryPosType, btn) {
+    var company = Companies[loc];
+    if (company == null) {return;}
+    var pos = Player.getNextCompanyPosition(company, entryPosType);
+    if (pos == null) {return};
+    var reqText = getJobRequirementText(company, pos, true);
+    btn.innerHTML += "<span class='tooltiptext'>" + reqText + "</span>";
+}

src/Message.js

@@ -20,7 +20,9 @@ Reviver.constructors.Message = Message;
 function sendMessage(msg) {
     console.log("sending message: " + msg.filename);
     msg.recvd = true;
-    showMessage(msg);
+    if (!Settings.SuppressMessages) {
+        showMessage(msg);
+    }
     addMessageToServer(msg, "home");
 }
 

src/NetscriptEvaluator.js

@@ -131,6 +131,14 @@ function evaluate(exp, workerScript) {
                     reject(e);
                 });
                 break;
+            case "UnaryExpression":
+                var p = evalUnary(exp, workerScript, resolve, reject);
+                p.then(function(res) {
+                    resolve(res);
+                }).catch(function(e) {
+                    reject(e);
+                });
+                break;
             case "AssignmentExpression":
                 var p = evalAssignment(exp, workerScript);
                 p.then(function(res) {
@@ -210,58 +218,6 @@ function evaluate(exp, workerScript) {
     }); // End Promise
 }
 
-/*
-function evalFunction(exp, workerScript){
-    return new Promise(function(resolve, reject) {
-        if (exp.callee.type!="Identifier"){
-            reject(makeRuntimeRejectMsg(workerScript, "callee must be an Identifier"));
-            return;
-        }
-        switch(exp.callee.name){
-            case "print":
-                if (exp.arguments.length != 1) {
-                    return reject(makeRuntimeRejectMsg(workerScript, "print() call has incorrect number of arguments. Takes 1 argument"));
-                }
-                var evaluatePromise = evaluate(exp.arguments[0], workerScript);
-                evaluatePromise.then(function(res) {
-                    workerScript.scriptRef.log(res.toString());
-                    resolve(true);
-                }).catch(function(e) {
-                    reject(e);
-                });
-                break;
-            case "scan":
-                if (exp.arguments.length != 1) {
-                    exp.arguments = [{value:Player.getCurrentServer().hostname,type:"Literal"}];
-                }
-                var ipPromise = evaluate(exp.arguments[0], workerScript);
-                ipPromise.then(function (ip) {
-                    var server = getServer(ip);
-                    if (server == null) {
-                        workerScript.scriptRef.log('getServerOpenPortsCount() failed. Invalid IP or hostname passed in: ' + ip);
-                        return reject(makeRuntimeRejectMsg(workerScript, 'Invalid IP or hostname passed into getServerOpenPortsCount() command'));
-                    }
-                    var out = [];
-                    for (var i = 0; i < server.serversOnNetwork.length; i++) {
-                        var entry = server.getServerOnNetwork(i).hostname;
-                        if (entry == null) {
-                            continue;
-                        }
-                        out.push(entry);
-                    }
-                    workerScript.scriptRef.log('scan() returned ' + server.serversOnNetwork.length + ' connections for ' + server.hostname);
-                    resolve(out);
-                }).catch(function(e) {
-                        reject(e);
-                    });
-                break;
-            default:
-                reject(makeRuntimeRejectMsg(workerScript, "Invalid function: " + exp.callee));
-        }
-    });
-}
-*/
-
 function evalBinary(exp, workerScript){
     return new Promise(function(resolve, reject) {
         var expLeftPromise = evaluate(exp.left, workerScript);
@@ -329,17 +285,24 @@ function evalBinary(exp, workerScript){
 }
 
 function evalUnary(exp, workerScript){
+    var env = workerScript.env;
     return new Promise(function(resolve, reject) {
-        var expLeftPromise = evaluate(exp.left, workerScript);
+        if (env.stopFlag) {return reject(workerScript);}
-        expLeftPromise.then(function(expLeft) {
+        var p = evaluate(exp.argument, workerScript);
-            switch(exp.operator){
+        p.then(function(res) {
-                case "++":
+            if (exp.operator == "!") {
-                    break
+                resolve(!res);
-                case "--":
+            } else if (exp.operator == "-") {
-                    break;
+                if (isNaN(res)) {
+                    resolve(res);
+                } else {
+                    resolve(-1 * res);
+                }
+            } else {
+                reject(makeRuntimeRejectMsg(workerScript, "Unimplemented unary operator: " + exp.operator));
             }
-        }, function(e) {
+        }).catch(function(e) {
-                reject(e);
+            reject(e);
         });
     });
 }
@@ -534,113 +497,6 @@ function evaluateWhile(exp, workerScript) {
 	});
 }
 
-/*
-function evaluateHacknetNode(exp, workerScript) {
-    console.log("here");
-    var env = workerScript.env;
-    return new Promise(function(resolve, reject) {
-        setTimeout(function() {
-            if (exp.index == null) {
-                if ((exp.op.type == "call" && exp.op.func.value == "length") ||
-                    (exp.op.type == "var" && exp.op.value == "length")) {
-                    resolve(Player.hacknetNodes.length);
-                    workerScript.scriptRef.log("hacknetnodes.length returned " + Player.hacknetNodes.length);
-                    return;
-                } else {
-                    workerScript.scriptRef.log("Invalid/null index for hacknetnodes");
-                    reject(makeRuntimeRejectMsg(workerScript, "Invalid/null index. hacknetnodes array must be accessed with an index"));
-                    return;
-                }
-
-            }
-            var indexPromise = evaluate(exp.index.value, workerScript);
-            indexPromise.then(function(index) {
-                if (isNaN(index) || index >= Player.hacknetNodes.length || index < 0) {
-                    workerScript.scriptRef.log("Invalid index value for hacknetnodes[]");
-                    reject(makeRuntimeRejectMsg(workerScript, "Invalid index value for hacknetnodes[]."));
-                    return;
-                }
-                var nodeObj = Player.hacknetNodes[index];
-                if (exp.op == null) {
-                    reject(makeRuntimeRejectMsg(workerScript, "No operator or property called for hacknetnodes. Usage: hacknetnodes[i].property/operator"));
-                    return;
-                } else if (exp.op.type == "var") {
-                    //Get properties: level, ram, cores
-                    switch(exp.op.value) {
-                        case "level":
-                            resolve(nodeObj.level);
-                            break;
-                        case "ram":
-                            resolve(nodeObj.ram);
-                            break;
-                        case "cores":
-                            resolve(nodeObj.numCores);
-                            break;
-                        default:
-                            reject(makeRuntimeRejectMsg(workerScript, "Unrecognized property for Hacknet Node. Valid properties: ram, cores, level"));
-                            break;
-                    }
-
-                } else if (exp.op.type == "call") {
-                    switch(exp.op.func.value) {
-                        case "upgradeLevel":
-                            if (exp.op.args.length == 1) {
-                                var argPromise = evaluate(exp.op.args[0], workerScript);
-                                argPromise.then(function(arg) {
-                                    if (isNaN(arg) || arg < 0) {
-                                        reject(makeRuntimeRejectMsg(workerScript, "Invalid argument passed into upgradeLevel()"));
-                                        return;
-                                    }
-                                    arg = Math.round(arg);
-                                    var res = nodeObj.purchaseLevelUpgrade(arg);
-                                    if (res) {
-                                        workerScript.scriptRef.log("Upgraded " + nodeObj.name + " " + arg + " times to level " + nodeObj.level);
-                                    }
-                                    resolve(res);
-                                }, function(e) {
-                                    reject(e);
-                                });
-                            } else {
-                                var res = nodeObj.purchaseLevelUpgrade(1);
-                                if (res) {
-                                    workerScript.scriptRef.log("Upgraded " + nodeObj.name + " once to level " + nodeObj.level);
-                                }
-                                resolve(res);
-                            }
-                            break;
-                        case "upgradeRam":
-                            var res = nodeObj.purchaseRamUpgrade();
-                            if (res) {
-                                workerScript.scriptRef.log("Upgraded " + nodeObj.name + "'s RAM to " + nodeObj.ram + "GB");
-                            }
-                            resolve(res);
-                            break;
-                        case "upgradeCore":
-                            var res = nodeObj.purchaseCoreUpgrade();
-                            if (res) {
-                                workerScript.scriptRef.log("Upgraded " + nodeObj.name + "'s number of cores to " + nodeObj.numCores);
-                            }
-                            resolve(res);
-                            break;
-                        default:
-                            reject(makeRuntimeRejectMsg(workerScript, "Unrecognized function/operator for hacknet node. Valid functions: upgradeLevel(n), upgradeRam(), upgradeCore()"));
-                            break;
-                    }
-                } else {
-                    reject(makeRuntimeRejectMsg(workerScript, "Unrecognized operation for hacknet node"));
-                    return;
-                }
-            }, function(e) {
-                reject(e);
-            });
-
-        }, CONSTANTS.CodeInstructionRunTime);
-    }, function(e) {
-        reject(e);
-    });
-}
-*/
-
 function evaluateProg(exp, workerScript, index) {
 	var env = workerScript.env;
 
@@ -791,7 +647,7 @@ function scriptCalculateExpGain(server) {
     if (server.baseDifficulty == null) {
         server.baseDifficulty = server.hackDifficulty;
     }
-	return (server.baseDifficulty * Player.hacking_exp_mult * 0.4 + 2);
+    return (server.baseDifficulty * Player.hacking_exp_mult * 0.3 + 2);
 }
 
 //The same as Player's calculatePercentMoneyHacked() function but takes in the server as an argument

src/NetscriptFunctions.js

@@ -654,6 +654,12 @@ function NetscriptFunctions(workerScript) {
                 return "";
             }
 
+            if (Player.purchasedServers.length >= CONSTANTS.PurchasedServerLimit) {
+                workerScript.scriptRef.log("Error: You have reached the maximum limit of " + CONSTANTS.PurchasedServerLimit +
+                                           " servers. You cannot purchase any more.");
+                return "";
+            }
+
             ram = Math.round(ram);
             if (isNaN(ram) || !powerOfTwo(ram)) {
                 workerScript.scriptRef.log("Error: Invalid ram argument passed to purchaseServer(). Must be numeric and a power of 2");
@@ -677,6 +683,56 @@ function NetscriptFunctions(workerScript) {
             workerScript.scriptRef.log("Purchased new server with hostname " + newServ.hostname + " for $" + formatNumber(cost, 2));
             return newServ.hostname;
         },
+        deleteServer : function(hostname) {
+            var hostnameStr = String(hostname);
+            hostnameStr = hostnameStr.replace(/\s\s+/g, '');
+            var server = GetServerByHostname(hostnameStr);
+            if (server == null) {
+                workerScript.scriptRef.log("Error: Could not find server with hostname " + hostnameStr + ". deleteServer() failed");
+                return false;
+            }
+
+            if (!server.purchasedByPlayer) {
+                workerScript.scriptRef.log("Error: Server " + server.hostname + " is not a purchased server. " +
+                                           "Cannot be deleted. deleteSErver failed");
+                return false;
+            }
+            var ip = server.ip;
+
+            //Delete from all servers
+            delete AllServers[ip];
+
+            //Delete from player's purchasedServers array
+            var found = false;
+            for (var i = 0; i < Player.purchasedServers.length; ++i) {
+                if (ip == Player.purchasedServers[i]) {
+                    found = true;
+                    Player.purchasedServers.splice(i, 1);
+                    break;
+                }
+            }
+
+            if (!found) {
+                workerScript.scriptRef.log("Error: Could not identify server " + server.hostname +
+                                           "as a purchased server. This is likely a bug please contact game dev");
+                return false;
+            }
+
+            //Delete from home computer
+            found = false;
+            var homeComputer = Player.getHomeComputer();
+            for (var i = 0; i < homeComputer.serversOnNetwork.length; ++i) {
+                if (ip == homeComputer.serversOnNetwork[i]) {
+                    homeComputer.serversOnNetwork.splice(i, 1);
+                    workerScript.scriptRef.log("Deleted server " + hostnameStr);
+                    return true;
+                }
+            }
+            //Wasn't found on home computer
+            workerScript.scriptRef.log("Error: Could not find server " + server.hostname +
+                                       "as a purchased server. This is likely a bug please contact game dev");
+            return false;
+        },
         round : function(n) {
             if (isNaN(n)) {return 0;}
             return Math.round(n);

src/Player.js

@@ -85,7 +85,8 @@ function PlayerObject() {
     this.totalHacknetNodeProduction = 0;
 
     //Factions
-    this.factions = []; //Names of all factions player has joined
+    this.factions = [];             //Names of all factions player has joined
+    this.factionInvitations = [];   //Outstanding faction invitations
 
     //Augmentations
     this.queuedAugmentations = []; //Purchased but not installed, names only
@@ -268,7 +269,7 @@ PlayerObject.prototype.calculateExpGain = function() {
     if (s.baseDifficulty == null) {
         s.baseDifficulty = s.hackDifficulty;
     }
-    return (s.baseDifficulty * this.hacking_exp_mult * 0.4 + 2);
+    return (s.baseDifficulty * this.hacking_exp_mult * 0.3 + 2);
 }
 
 //Hack/Analyze a server. Return the amount of time the hack will take. This lets the Terminal object know how long to disable itself for
@@ -1243,6 +1244,3 @@ PlayerObject.fromJSON = function(value) {
 Reviver.constructors.PlayerObject = PlayerObject;
 
 Player = new PlayerObject();
-
-    
-    

src/Prestige.js

@@ -74,6 +74,7 @@ function prestigeAugmentation() {
     Player.purchasedServers = [];
 
     Player.factions = [];
+    Player.factionInvitations = [];
 
     Player.queuedAugmentations = [];
 

src/Script.js

@@ -173,6 +173,8 @@ function calculateRamUsage(codeCopy) {
     var getServerSecurityCount = numOccurrences(codeCopy, "getServerSecurityLevel(");
     var getServerBaseSecurityCount = numOccurrences(codeCopy, "getServerBaseSecurityLevel(");
     var getServerReqdHackingCount = numOccurrences(codeCopy, "getServerRequiredHackingLevel(");
+    var getServerNumPortsReqdCount = numOccurrences(codeCopy, "getServerNumPortsRequired(");
+    var getServerRamCount = numOccurrences(codeCopy, "getServerRam(");
     var fileExistsCount = numOccurrences(codeCopy, "fileExists(");
     var isRunningCount = numOccurrences(codeCopy, "isRunning(");
     var numOperators = numNetscriptOperators(codeCopy);
@@ -185,7 +187,8 @@ function calculateRamUsage(codeCopy) {
                               numOccurrences(codeCopy, "getStockPosition(");
     var scriptBuySellStockCount = numOccurrences(codeCopy, "buyStock(") +
                                   numOccurrences(codeCopy, "sellStock(");
-    var scriptPurchaseServerCount = numOccurrences(codeCopy, "purchaseServer(");
+    var scriptPurchaseServerCount = numOccurrences(codeCopy, "purchaseServer(") + 
+                                    numOccurrences(codeCopy, "deleteServer(");
     var scriptRoundCount = numOccurrences(codeCopy, "round(");
     var scriptWriteCount = numOccurrences(codeCopy, "write(");
     var scriptReadCount = numOccurrences(codeCopy, "read(");
@@ -210,11 +213,13 @@ function calculateRamUsage(codeCopy) {
         (hasRootAccessCount * CONSTANTS.ScriptHasRootAccessRamCost) +
         (getHostnameCount * CONSTANTS.ScriptGetHostnameRamCost) +
         (getHackingLevelCount * CONSTANTS.ScriptGetHackingLevelRamCost) +
-        (getServerMoneyAvailableCount * CONSTANTS.ScriptGetServerMoneyRamCost) +
+        (getServerMoneyAvailableCount * CONSTANTS.ScriptGetServerCost) +
-        (getServerMaxMoneyCount * CONSTANTS.ScriptGetServerMoneyRamCost) +
+        (getServerMaxMoneyCount * CONSTANTS.ScriptGetServerCost) +
-        (getServerSecurityCount * CONSTANTS.ScriptGetServerSecurityRamCost) +
+        (getServerSecurityCount * CONSTANTS.ScriptGetServerCost) +
-        (getServerBaseSecurityCount * CONSTANTS.ScriptGetServerSecurityRamCost) +
+        (getServerBaseSecurityCount * CONSTANTS.ScriptGetServerCost) +
-        (getServerReqdHackingCount * CONSTANTS.ScriptGetServerReqdHackRamCost) +
+        (getServerReqdHackingCount * CONSTANTS.ScriptGetServerCost) +
+        (getServerNumPortsReqdCount * CONSTANTS.ScriptGetServerCost) +
+        (getServerRamCount * CONSTANTS.ScriptGetServerCost) +
         (fileExistsCount * CONSTANTS.ScriptFileExistsRamCost) +
         (isRunningCount * CONSTANTS.ScriptIsRunningRamCost) +
         (numOperators * CONSTANTS.ScriptOperatorRamCost) +

src/Server.js

@@ -79,7 +79,11 @@ Server.prototype.init = function(ip, hostname, organizationName, onlineStatus, i
 //Set the hacking properties of a server
 Server.prototype.setHackingParameters = function(requiredHackingSkill, moneyAvailable, hackDifficulty, serverGrowth) {
 	this.requiredHackingSkill = requiredHackingSkill;
-	this.moneyAvailable = moneyAvailable;
+    if (isNaN(moneyAvailable)) {
+        this.moneyAvailable = 1000000;
+    } else {
+        this.moneyAvailable = moneyAvailable;
+    }
     this.moneyMax = 50 * moneyAvailable;
 	this.hackDifficulty = hackDifficulty;
     this.baseDifficulty = hackDifficulty;
@@ -141,62 +145,62 @@ initForeignServers = function() {
     //MegaCorporations
     var ECorpServer = new Server();
     ECorpServer.init(createRandomIp(), "ecorp", "ECorp", true, false, false, false, 0);
-    ECorpServer.setHackingParameters(getRandomInt(1150, 1300), 90000000000, 99, 99);
+    ECorpServer.setHackingParameters(getRandomInt(1150, 1300), getRandomInt(30000000000, 70000000000), 99, 99);
     ECorpServer.setPortProperties(5);
     AddToAllServers(ECorpServer);
 
     var MegaCorpServer = new Server();
     MegaCorpServer.init(createRandomIp(), "megacorp", "MegaCorp", true, false, false, false, 0);
-    MegaCorpServer.setHackingParameters(getRandomInt(1150, 1300), 75000000000, 99, 99);
+    MegaCorpServer.setHackingParameters(getRandomInt(1150, 1300), getRandomInt(40000000000, 60000000000), 99, 99);
     MegaCorpServer.setPortProperties(5);
     AddToAllServers(MegaCorpServer);
 
     var BachmanAndAssociatesServer = new Server();
     BachmanAndAssociatesServer.init(createRandomIp(), "b-and-a", "Bachman & Associates", true, false, false, false, 0);
-    BachmanAndAssociatesServer.setHackingParameters(getRandomInt(1000, 1050), 30000000000, getRandomInt(75, 85), getRandomInt(65, 75));
+    BachmanAndAssociatesServer.setHackingParameters(getRandomInt(1000, 1050), getRandomInt(20000000000, 25000000000), getRandomInt(75, 85), getRandomInt(65, 75));
     BachmanAndAssociatesServer.setPortProperties(5);
     AddToAllServers(BachmanAndAssociatesServer);
 
     var BladeIndustriesServer = new Server();
     BladeIndustriesServer.init(createRandomIp(), "blade", "Blade Industries", true, false, false, false, 0);
-    BladeIndustriesServer.setHackingParameters(getRandomInt(1000, 1100), 18000000000, getRandomInt(90, 95), getRandomInt(60, 75));
+    BladeIndustriesServer.setHackingParameters(getRandomInt(1000, 1100), getRandomInt(12000000000, 20000000000), getRandomInt(90, 95), getRandomInt(60, 75));
     BladeIndustriesServer.setPortProperties(5);
     AddToAllServers(BladeIndustriesServer);
 
     var NWOServer = new Server();
     NWOServer.init(createRandomIp(), "nwo", "New World Order", true, false, false, false, 0);
-    NWOServer.setHackingParameters(getRandomInt(1000, 1200), 36000000000, 99, getRandomInt(75, 85));
+    NWOServer.setHackingParameters(getRandomInt(1000, 1200), getRandomInt(25000000000, 35000000000), 99, getRandomInt(75, 85));
     NWOServer.setPortProperties(5);
     AddToAllServers(NWOServer);
 
     var ClarkeIncorporatedServer = new Server();
     ClarkeIncorporatedServer.init(createRandomIp(), "clarkeinc", "Clarke Incorporated", true, false, false, false, 0);
-    ClarkeIncorporatedServer.setHackingParameters(getRandomInt(1000, 1200), 13000000000, getRandomInt(50, 60), getRandomInt(50, 70));
+    ClarkeIncorporatedServer.setHackingParameters(getRandomInt(1000, 1200), getRandomInt(15000000000, 25000000000), getRandomInt(50, 60), getRandomInt(50, 70));
     ClarkeIncorporatedServer.setPortProperties(5);
     AddToAllServers(ClarkeIncorporatedServer);
 
     var OmniTekIncorporatedServer = new Server();
     OmniTekIncorporatedServer.init(createRandomIp(), "omnitek", "OmniTek Incorporated", true, false, false, false, 0);
-    OmniTekIncorporatedServer.setHackingParameters(getRandomInt(900, 1100), 45000000000, getRandomInt(90, 99), getRandomInt(95, 99));
+    OmniTekIncorporatedServer.setHackingParameters(getRandomInt(900, 1100), getRandomInt(15000000000, 20000000000), getRandomInt(90, 99), getRandomInt(95, 99));
     OmniTekIncorporatedServer.setPortProperties(5);
     AddToAllServers(OmniTekIncorporatedServer);
 
     var FourSigmaServer = new Server();
     FourSigmaServer.init(createRandomIp(), "4sigma", "FourSigma", true, false, false, false, 0);
-    FourSigmaServer.setHackingParameters(getRandomInt(950, 1200), 24000000000, getRandomInt(60, 70), getRandomInt(75, 99));
+    FourSigmaServer.setHackingParameters(getRandomInt(950, 1200), getRandomInt(15000000000, 25000000000), getRandomInt(60, 70), getRandomInt(75, 99));
     FourSigmaServer.setPortProperties(5);
     AddToAllServers(FourSigmaServer);
 
     var KuaiGongInternationalServer = new Server();
     KuaiGongInternationalServer.init(createRandomIp(), "kuai-gong", "KuaiGong International", true, false, false, false, 0);
-    KuaiGongInternationalServer.setHackingParameters(getRandomInt(1000, 1250), 70000000000, getRandomInt(95, 99), getRandomInt(90, 99));
+    KuaiGongInternationalServer.setHackingParameters(getRandomInt(1000, 1250), getRandomInt(20000000000, 30000000000), getRandomInt(95, 99), getRandomInt(90, 99));
     KuaiGongInternationalServer.setPortProperties(5);
     AddToAllServers(KuaiGongInternationalServer);
 
     //Technology and communications companies (large targets)
     var FulcrumTechnologiesServer = new Server();
     FulcrumTechnologiesServer.init(createRandomIp(), "fulcrumtech", "Fulcrum Technologies", true, false, false, false, 64);
-    FulcrumTechnologiesServer.setHackingParameters(getRandomInt(1000, 1200), 1500000000, getRandomInt(85, 95), getRandomInt(80, 99));
+    FulcrumTechnologiesServer.setHackingParameters(getRandomInt(1000, 1200), getRandomInt(1400000000, 1800000000), getRandomInt(85, 95), getRandomInt(80, 99));
     FulcrumTechnologiesServer.setPortProperties(5);
     AddToAllServers(FulcrumTechnologiesServer);
 
@@ -209,209 +213,209 @@ initForeignServers = function() {
 
     var StormTechnologiesServer = new Server();
     StormTechnologiesServer.init(createRandomIp(), "stormtech", "Storm Technologies", true, false, false, false, 0);
-    StormTechnologiesServer.setHackingParameters(getRandomInt(900, 1050), 1300000000, getRandomInt(80, 90), getRandomInt(70, 90));
+    StormTechnologiesServer.setHackingParameters(getRandomInt(900, 1050), getRandomInt(1000000000, 1200000000), getRandomInt(80, 90), getRandomInt(70, 90));
     StormTechnologiesServer.setPortProperties(5);
     AddToAllServers(StormTechnologiesServer);
 
     var DefCommServer = new Server();
     DefCommServer.init(createRandomIp(), "defcomm", "DefComm", true, false, false, false, 0);
-    DefCommServer.setHackingParameters(getRandomInt(900, 1000), 850000000, getRandomInt(85, 95), getRandomInt(50, 70));
+    DefCommServer.setHackingParameters(getRandomInt(900, 1000), getRandomInt(800000000, 950000000), getRandomInt(85, 95), getRandomInt(50, 70));
     DefCommServer.setPortProperties(5);
     AddToAllServers(DefCommServer);
 
     var InfoCommServer = new Server();
     InfoCommServer.init(createRandomIp(), "infocomm", "InfoComm", true, false, false, false, 0);
-    InfoCommServer.setHackingParameters(getRandomInt(875, 950), 700000000, getRandomInt(70, 90), getRandomInt(35, 75));
+    InfoCommServer.setHackingParameters(getRandomInt(875, 950), getRandomInt(600000000, 900000000), getRandomInt(70, 90), getRandomInt(35, 75));
     InfoCommServer.setPortProperties(5);
     AddToAllServers(InfoCommServer);
 
     var HeliosLabsServer = new Server();
     HeliosLabsServer.init(createRandomIp(), "helios", "Helios Labs", true, false, false, false, 0);
-    HeliosLabsServer.setHackingParameters(getRandomInt(800, 900), 450000000, getRandomInt(85, 95), getRandomInt(70, 80));
+    HeliosLabsServer.setHackingParameters(getRandomInt(800, 900), getRandomInt(550000000, 750000000), getRandomInt(85, 95), getRandomInt(70, 80));
     HeliosLabsServer.setPortProperties(5);
     AddToAllServers(HeliosLabsServer);
 
     var VitaLifeServer = new Server();
     VitaLifeServer.init(createRandomIp(), "vitalife", "VitaLife", true, false, false, false, 32);
-    VitaLifeServer.setHackingParameters(getRandomInt(775, 900), 720000000, getRandomInt(80, 90), getRandomInt(60, 80));
+    VitaLifeServer.setHackingParameters(getRandomInt(775, 900), getRandomInt(700000000, 800000000), getRandomInt(80, 90), getRandomInt(60, 80));
     VitaLifeServer.setPortProperties(5);
     AddToAllServers(VitaLifeServer);
 
     var IcarusMicrosystemsServer = new Server();
     IcarusMicrosystemsServer.init(createRandomIp(), "icarus", "Icarus Microsystems", true, false, false, false, 0);
-    IcarusMicrosystemsServer.setHackingParameters(getRandomInt(850, 925), 1000000000, getRandomInt(85, 95), getRandomInt(85, 95));
+    IcarusMicrosystemsServer.setHackingParameters(getRandomInt(850, 925), getRandomInt(900000000, 1000000000), getRandomInt(85, 95), getRandomInt(85, 95));
     IcarusMicrosystemsServer.setPortProperties(5);
     AddToAllServers(IcarusMicrosystemsServer);
 
     var UniversalEnergyServer = new Server();
     UniversalEnergyServer.init(createRandomIp(), "univ-energy", "Universal Energy", true, false, false, false, 32);
-    UniversalEnergyServer.setHackingParameters(getRandomInt(800, 900), 1300000000, getRandomInt(80, 90), getRandomInt(80, 90));
+    UniversalEnergyServer.setHackingParameters(getRandomInt(800, 900), getRandomInt(1100000000, 1200000000), getRandomInt(80, 90), getRandomInt(80, 90));
     UniversalEnergyServer.setPortProperties(4);
     AddToAllServers(UniversalEnergyServer);
 
     var TitanLabsServer = new Server();
     TitanLabsServer.init(createRandomIp(), "titan-labs", "Titan Laboratories", true, false, false, false, 32);
-    TitanLabsServer.setHackingParameters(getRandomInt(800, 875), 900000000, getRandomInt(70, 80), getRandomInt(60, 80));
+    TitanLabsServer.setHackingParameters(getRandomInt(800, 875), getRandomInt(750000000, 900000000), getRandomInt(70, 80), getRandomInt(60, 80));
     TitanLabsServer.setPortProperties(5);
     AddToAllServers(TitanLabsServer);
 
     var MicrodyneTechnologiesServer = new Server();
     MicrodyneTechnologiesServer.init(createRandomIp(), "microdyne", "Microdyne Technologies", true, false, false, false, 16);
-    MicrodyneTechnologiesServer.setHackingParameters(getRandomInt(800, 875), 750000000, getRandomInt(65, 75), getRandomInt(70, 90));
+    MicrodyneTechnologiesServer.setHackingParameters(getRandomInt(800, 875), getRandomInt(500000000, 700000000), getRandomInt(65, 75), getRandomInt(70, 90));
     MicrodyneTechnologiesServer.setPortProperties(5);
     AddToAllServers(MicrodyneTechnologiesServer);
 
     var TaiYangDigitalServer = new Server();
     TaiYangDigitalServer.init(createRandomIp(), "taiyang-digital", "Taiyang Digital", true, false, false, false, 0);
-    TaiYangDigitalServer.setHackingParameters(getRandomInt(850, 950), 1000000000, getRandomInt(70, 80), getRandomInt(70, 80));
+    TaiYangDigitalServer.setHackingParameters(getRandomInt(850, 950), getRandomInt(800000000, 900000000), getRandomInt(70, 80), getRandomInt(70, 80));
     TaiYangDigitalServer.setPortProperties(5);
     AddToAllServers(TaiYangDigitalServer);
 
     var GalacticCyberSystemsServer = new Server();
     GalacticCyberSystemsServer.init(createRandomIp(), "galactic-cyber", "Galactic Cybersystems", true, false, false, false, 0);
-    GalacticCyberSystemsServer.setHackingParameters(getRandomInt(825, 875), 450000000, getRandomInt(55, 65), getRandomInt(70, 90));
+    GalacticCyberSystemsServer.setHackingParameters(getRandomInt(825, 875), getRandomInt(750000000, 850000000), getRandomInt(55, 65), getRandomInt(70, 90));
     GalacticCyberSystemsServer.setPortProperties(5);
     AddToAllServers(GalacticCyberSystemsServer);
 
     //Defense Companies ("Large" Companies)
     var AeroCorpServer = new Server();
     AeroCorpServer.init(createRandomIp(), "aerocorp", "AeroCorp", true, false, false, false, 0);
-    AeroCorpServer.setHackingParameters(getRandomInt(850, 925), 1300000000, getRandomInt(80, 90), getRandomInt(55, 65));
+    AeroCorpServer.setHackingParameters(getRandomInt(850, 925), getRandomInt(1000000000, 1200000000), getRandomInt(80, 90), getRandomInt(55, 65));
     AeroCorpServer.setPortProperties(5);
     AddToAllServers(AeroCorpServer);
 
     var OmniaCybersystemsServer = new Server();
     OmniaCybersystemsServer.init(createRandomIp(), "omnia", "Omnia Cybersystems", true, false, false, false, 0);
-    OmniaCybersystemsServer.setHackingParameters(getRandomInt(850, 950), 1100000000, getRandomInt(85, 95), getRandomInt(60, 70));
+    OmniaCybersystemsServer.setHackingParameters(getRandomInt(850, 950), getRandomInt(900000000, 1000000000), getRandomInt(85, 95), getRandomInt(60, 70));
     OmniaCybersystemsServer.setPortProperties(5);
     AddToAllServers(OmniaCybersystemsServer);
 
     var ZBDefenseServer = new Server();
     ZBDefenseServer.init(createRandomIp(), "zb-def", "ZB Defense Industries", true, false, false, false, 0);
-    ZBDefenseServer.setHackingParameters(getRandomInt(775, 825), 900000000, getRandomInt(55, 65), getRandomInt(65, 75));
+    ZBDefenseServer.setHackingParameters(getRandomInt(775, 825), getRandomInt(900000000, 1100000000), getRandomInt(55, 65), getRandomInt(65, 75));
     ZBDefenseServer.setPortProperties(4);
     AddToAllServers(ZBDefenseServer);
 
     var AppliedEnergeticsServer = new Server();
     AppliedEnergeticsServer.init(createRandomIp(), "applied-energetics", "Applied Energetics", true, false, false, false, 0);
-    AppliedEnergeticsServer.setHackingParameters(getRandomInt(775, 850), 1100000000, getRandomInt(60, 80), getRandomInt(70, 75));
+    AppliedEnergeticsServer.setHackingParameters(getRandomInt(775, 850), getRandomInt(700000000, 1000000000), getRandomInt(60, 80), getRandomInt(70, 75));
     AppliedEnergeticsServer.setPortProperties(4);
     AddToAllServers(AppliedEnergeticsServer);
 
     var SolarisSpaceSystemsServer = new Server();
     SolarisSpaceSystemsServer.init(createRandomIp(), "solaris", "Solaris Space Systems", true, false, false, false, 0);
-    SolarisSpaceSystemsServer.setHackingParameters(getRandomInt(750, 850), 800000000, getRandomInt(70, 80), getRandomInt(70, 80));
+    SolarisSpaceSystemsServer.setHackingParameters(getRandomInt(750, 850), getRandomInt(700000000, 900000000), getRandomInt(70, 80), getRandomInt(70, 80));
     SolarisSpaceSystemsServer.setPortProperties(5);
     AddToAllServers(SolarisSpaceSystemsServer);
 
     var DeltaOneServer = new Server();
     DeltaOneServer.init(createRandomIp(), "deltaone", "Delta One", true, false, false, false, 0);
-    DeltaOneServer.setHackingParameters(getRandomInt(800, 900), 1400000000, getRandomInt(75, 85), getRandomInt(50, 70));
+    DeltaOneServer.setHackingParameters(getRandomInt(800, 900), getRandomInt(1300000000, 1700000000), getRandomInt(75, 85), getRandomInt(50, 70));
     DeltaOneServer.setPortProperties(5);
     AddToAllServers(DeltaOneServer);
 
     //Health, medicine, pharmaceutical companies ("Large" targets)
     var GlobalPharmaceuticalsServer = new Server();
     GlobalPharmaceuticalsServer.init(createRandomIp(), "global-pharm", "Global Pharmaceuticals", true, false, false, false, 16);
-    GlobalPharmaceuticalsServer.setHackingParameters(getRandomInt(750, 850), 1800000000, getRandomInt(75, 85), getRandomInt(80, 90));
+    GlobalPharmaceuticalsServer.setHackingParameters(getRandomInt(750, 850), getRandomInt(1500000000, 1750000000), getRandomInt(75, 85), getRandomInt(80, 90));
     GlobalPharmaceuticalsServer.setPortProperties(4);
     AddToAllServers(GlobalPharmaceuticalsServer);
 
     var NovaMedicalServer = new Server();
     NovaMedicalServer.init(createRandomIp(), "nova-med", "Nova Medical", true, false, false, false, 0);
-    NovaMedicalServer.setHackingParameters(getRandomInt(775, 850), 1350000000, getRandomInt(60, 80), getRandomInt(65, 85));
+    NovaMedicalServer.setHackingParameters(getRandomInt(775, 850), getRandomInt(1100000000, 1250000000), getRandomInt(60, 80), getRandomInt(65, 85));
     NovaMedicalServer.setPortProperties(4);
     AddToAllServers(NovaMedicalServer);
 
     var ZeusMedicalServer = new Server();
     ZeusMedicalServer.init(createRandomIp(), "zeus-med", "Zeus Medical", true, false, false, false, 0);
-    ZeusMedicalServer.setHackingParameters(getRandomInt(800, 850), 1600000000, getRandomInt(70, 90), getRandomInt(70, 80));
+    ZeusMedicalServer.setHackingParameters(getRandomInt(800, 850), getRandomInt(1300000000, 1500000000), getRandomInt(70, 90), getRandomInt(70, 80));
     ZeusMedicalServer.setPortProperties(5);
     AddToAllServers(ZeusMedicalServer);
 
     var UnitaLifeGroupServer = new Server();
     UnitaLifeGroupServer.init(createRandomIp(), "unitalife", "UnitaLife Group", true, false, false, false, 32);
-    UnitaLifeGroupServer.setHackingParameters(getRandomInt(775, 825), 1200000000, getRandomInt(70, 80), getRandomInt(70, 80));
+    UnitaLifeGroupServer.setHackingParameters(getRandomInt(775, 825), getRandomInt(1000000000, 1100000000), getRandomInt(70, 80), getRandomInt(70, 80));
     UnitaLifeGroupServer.setPortProperties(4);
     AddToAllServers(UnitaLifeGroupServer);
 
     //"Medium level" targets
     var LexoCorpServer = new Server();
     LexoCorpServer.init(createRandomIp(), "lexo-corp", "Lexo Corporation", true, false, false, false, 16);
-    LexoCorpServer.setHackingParameters(getRandomInt(650, 750), 800000000, getRandomInt(60, 80), getRandomInt(55, 65));
+    LexoCorpServer.setHackingParameters(getRandomInt(650, 750), getRandomInt(700000000, 800000000), getRandomInt(60, 80), getRandomInt(55, 65));
     LexoCorpServer.setPortProperties(4);
     AddToAllServers(LexoCorpServer);
 
     var RhoConstructionServer = new Server();
     RhoConstructionServer.init(createRandomIp(), "rho-construction", "Rho Construction", true, false, false, false, 0);
-    RhoConstructionServer.setHackingParameters(getRandomInt(475, 525), 700000000, getRandomInt(40, 60), getRandomInt(40, 60));
+    RhoConstructionServer.setHackingParameters(getRandomInt(475, 525), getRandomInt(500000000, 700000000), getRandomInt(40, 60), getRandomInt(40, 60));
     RhoConstructionServer.setPortProperties(3);
     AddToAllServers(RhoConstructionServer);
 
     var AlphaEnterprisesServer = new Server();
     AlphaEnterprisesServer.init(createRandomIp(), "alpha-ent", "Alpha Enterprises", true, false, false, false, 0);
-    AlphaEnterprisesServer.setHackingParameters(getRandomInt(500, 600), 750000000, getRandomInt(50, 70), getRandomInt(50, 60));
+    AlphaEnterprisesServer.setHackingParameters(getRandomInt(500, 600), getRandomInt(600000000, 750000000), getRandomInt(50, 70), getRandomInt(50, 60));
     AlphaEnterprisesServer.setPortProperties(4);
     AddToAllServers(AlphaEnterprisesServer);
 
 
     var AevumPoliceServer = new Server();
     AevumPoliceServer.init(createRandomIp(), "aevum-police", "Aevum Police Network", true, false, false, false, 0);
-    AevumPoliceServer.setHackingParameters(getRandomInt(400, 450), 100000000, getRandomInt(70, 80), getRandomInt(30, 50));
+    AevumPoliceServer.setHackingParameters(getRandomInt(400, 450), getRandomInt(200000000, 400000000), getRandomInt(70, 80), getRandomInt(30, 50));
     AevumPoliceServer.setPortProperties(4);
     AddToAllServers(AevumPoliceServer);
 
     var RothmanUniversityServer = new Server();
     RothmanUniversityServer.init(createRandomIp(), "rothman-uni", "Rothman University Network", true, false, false, false, 4);
-    RothmanUniversityServer.setHackingParameters(getRandomInt(370, 430), 200000000, getRandomInt(45, 55), getRandomInt(35, 45));
+    RothmanUniversityServer.setHackingParameters(getRandomInt(370, 430), getRandomInt(175000000, 250000000), getRandomInt(45, 55), getRandomInt(35, 45));
     RothmanUniversityServer.setPortProperties(3);
     AddToAllServers(RothmanUniversityServer);
 
     var ZBInstituteOfTechnologyServer = new Server();
     ZBInstituteOfTechnologyServer.init(createRandomIp(), "zb-institute", "ZB Institute of Technology Network", true, false, false, false, 4);
-    ZBInstituteOfTechnologyServer.setHackingParameters(getRandomInt(725, 775), 1000000000, getRandomInt(65, 85), getRandomInt(75, 85));
+    ZBInstituteOfTechnologyServer.setHackingParameters(getRandomInt(725, 775), getRandomInt(800000000, 1100000000), getRandomInt(65, 85), getRandomInt(75, 85));
     ZBInstituteOfTechnologyServer.setPortProperties(5);
     AddToAllServers(ZBInstituteOfTechnologyServer);
 
     var SummitUniversityServer = new Server();
     SummitUniversityServer.init(createRandomIp(), "summit-uni", "Summit University Network", true, false, false, false, 4);
-    SummitUniversityServer.setHackingParameters(getRandomInt(425, 475), 160000000, getRandomInt(45, 65), getRandomInt(40, 60));
+    SummitUniversityServer.setHackingParameters(getRandomInt(425, 475), getRandomInt(200000000, 350000000), getRandomInt(45, 65), getRandomInt(40, 60));
     SummitUniversityServer.setPortProperties(3);
     AddToAllServers(SummitUniversityServer);
 
     var SysCoreSecuritiesServer = new Server();
     SysCoreSecuritiesServer.init(createRandomIp(), "syscore", "SysCore Securities", true, false, false, false, 0);
-    SysCoreSecuritiesServer.setHackingParameters(getRandomInt(550, 650), 500000000, getRandomInt(60, 80), getRandomInt(60, 70));
+    SysCoreSecuritiesServer.setHackingParameters(getRandomInt(550, 650), getRandomInt(400000000, 600000000), getRandomInt(60, 80), getRandomInt(60, 70));
     SysCoreSecuritiesServer.setPortProperties(4);
     AddToAllServers(SysCoreSecuritiesServer);
 
     var CatalystVenturesServer = new Server();
     CatalystVenturesServer.init(createRandomIp(), "catalyst", "Catalyst Ventures", true, false, false, false, 0);
-    CatalystVenturesServer.setHackingParameters(getRandomInt(400, 450), 750000000, getRandomInt(60, 70), getRandomInt(25, 55));
+    CatalystVenturesServer.setHackingParameters(getRandomInt(400, 450), getRandomInt(300000000, 550000000), getRandomInt(60, 70), getRandomInt(25, 55));
     CatalystVenturesServer.setPortProperties(3);
     AddToAllServers(CatalystVenturesServer);
 
     var TheHubServer = new Server();
     TheHubServer.init(createRandomIp(), "the-hub", "The Hub", true, false, false, false, 0);
-    TheHubServer.setHackingParameters(getRandomInt(275, 325), 225000000, getRandomInt(35, 45), getRandomInt(45, 55));
+    TheHubServer.setHackingParameters(getRandomInt(275, 325), getRandomInt(150000000, 200000000), getRandomInt(35, 45), getRandomInt(45, 55));
     TheHubServer.setPortProperties(2);
     AddToAllServers(TheHubServer);
 
     var CompuTekServer = new Server();
     CompuTekServer.init(createRandomIp(), "comptek", "CompuTek", true, false, false, false, 8);
-    CompuTekServer.setHackingParameters(getRandomInt(300, 400), 275000000, getRandomInt(55, 65), getRandomInt(45, 65));
+    CompuTekServer.setHackingParameters(getRandomInt(300, 400), getRandomInt(220000000, 250000000), getRandomInt(55, 65), getRandomInt(45, 65));
     CompuTekServer.setPortProperties(3);
     AddToAllServers(CompuTekServer);
 
     var NetLinkTechnologiesServer = new Server();
     NetLinkTechnologiesServer.init(createRandomIp(), "netlink", "NetLink Technologies", true, false, false, false, 0);
-    NetLinkTechnologiesServer.setHackingParameters(getRandomInt(375, 425), 320000000, getRandomInt(60, 80), getRandomInt(45, 75));
+    NetLinkTechnologiesServer.setHackingParameters(getRandomInt(375, 425), 275000000, getRandomInt(60, 80), getRandomInt(45, 75));
     NetLinkTechnologiesServer.setPortProperties(3);
     AddToAllServers(NetLinkTechnologiesServer);
 
     var JohnsonOrthopedicsServer = new Server();
     JohnsonOrthopedicsServer.init(createRandomIp(), "johnson-ortho", "Johnson Orthopedics", true, false, false, false, 4);
-    JohnsonOrthopedicsServer.setHackingParameters(getRandomInt(250, 300), 80000000, getRandomInt(35, 65), getRandomInt(35, 65));
+    JohnsonOrthopedicsServer.setHackingParameters(getRandomInt(250, 300), getRandomInt(70000000, 85000000), getRandomInt(35, 65), getRandomInt(35, 65));
     JohnsonOrthopedicsServer.setPortProperties(2);
     AddToAllServers(JohnsonOrthopedicsServer);
 
@@ -454,7 +458,7 @@ initForeignServers = function() {
 
     var SilverHelixServer = new Server();
     SilverHelixServer.init(createRandomIp(), "silver-helix", "Silver Helix", true, false, false, false, 2);
-    SilverHelixServer.setHackingParameters(150, 50000000, 30, 30);
+    SilverHelixServer.setHackingParameters(150, 45000000, 30, 30);
     SilverHelixServer.setPortProperties(2);
     AddToAllServers(SilverHelixServer);
 
@@ -472,26 +476,26 @@ initForeignServers = function() {
 
     var PhantasyServer = new Server();
     PhantasyServer.init(createRandomIp(), "phantasy", "Phantasy Club", true, false, false, false, 0);
-    PhantasyServer.setHackingParameters(100, 27500000, 20, 35);
+    PhantasyServer.setHackingParameters(100, 24000000, 20, 35);
     PhantasyServer.setPortProperties(2);
     AddToAllServers(PhantasyServer);
 
     var MaxHardwareServer = new Server();
     MaxHardwareServer.init(createRandomIp(), "max-hardware", "Max Hardware Store", true, false, false, false, 4);
-    MaxHardwareServer.setHackingParameters(80, 11000000, 15, 25);
+    MaxHardwareServer.setHackingParameters(80, 10000000, 15, 25);
     MaxHardwareServer.setPortProperties(1);
     AddToAllServers(MaxHardwareServer);
 
     var OmegaSoftwareServer = new Server();
     OmegaSoftwareServer.init(createRandomIp(), "omega-net", "Omega Software", true, false, false, false, 8);
-    OmegaSoftwareServer.setHackingParameters(getRandomInt(180, 220), 75000000, getRandomInt(25, 35), getRandomInt(30, 40));
+    OmegaSoftwareServer.setHackingParameters(getRandomInt(180, 220), getRandomInt(60000000, 70000000), getRandomInt(25, 35), getRandomInt(30, 40));
     OmegaSoftwareServer.setPortProperties(2);
     AddToAllServers(OmegaSoftwareServer);
 
     //Gyms
     var CrushFitnessGymServer = new Server();
     CrushFitnessGymServer.init(createRandomIp(), "crush-fitness", "Crush Fitness", true, false, false, false, 0);
-    CrushFitnessGymServer.setHackingParameters(getRandomInt(225, 275), 40000000, getRandomInt(35, 45), getRandomInt(27, 33));
+    CrushFitnessGymServer.setHackingParameters(getRandomInt(225, 275), getRandomInt(40000000, 60000000), getRandomInt(35, 45), getRandomInt(27, 33));
     CrushFitnessGymServer.setPortProperties(2);
     AddToAllServers(CrushFitnessGymServer);
 
@@ -503,19 +507,19 @@ initForeignServers = function() {
 
     var MilleniumFitnessGymServer = new Server();
     MilleniumFitnessGymServer.init(createRandomIp(), "millenium-fitness", "Millenium Fitness Network", true, false, false, false, 0);
-    MilleniumFitnessGymServer.setHackingParameters(getRandomInt(475, 525), 100000000, getRandomInt(45, 55), getRandomInt(25, 45));
+    MilleniumFitnessGymServer.setHackingParameters(getRandomInt(475, 525), 250000000, getRandomInt(45, 55), getRandomInt(25, 45));
     MilleniumFitnessGymServer.setPortProperties(3);
     AddToAllServers(MilleniumFitnessGymServer);
 
     var PowerhouseGymServer = new Server();
     PowerhouseGymServer.init(createRandomIp(), "powerhouse-fitness", "Powerhouse Fitness", true, false, false, false, 0);
-    PowerhouseGymServer.setHackingParameters(getRandomInt(950, 1100), 300000000, getRandomInt(55, 65), getRandomInt(50, 60));
+    PowerhouseGymServer.setHackingParameters(getRandomInt(950, 1100), 900000000, getRandomInt(55, 65), getRandomInt(50, 60));
     PowerhouseGymServer.setPortProperties(5);
     AddToAllServers(PowerhouseGymServer);
 
     var SnapFitnessGymServer = new Server();
     SnapFitnessGymServer.init(createRandomIp(), "snap-fitness", "Snap Fitness", true, false, false, false, 0);
-    SnapFitnessGymServer.setHackingParameters(getRandomInt(675, 800), 150000000, getRandomInt(40, 60), getRandomInt(40, 60));
+    SnapFitnessGymServer.setHackingParameters(getRandomInt(675, 800), 450000000, getRandomInt(40, 60), getRandomInt(40, 60));
     SnapFitnessGymServer.setPortProperties(4);
     AddToAllServers(SnapFitnessGymServer);
 

src/ServerPurchases.js

@@ -9,6 +9,14 @@ purchaseServer = function(ram, cost) {
         return;
     }
 
+    //Maximum of 30 servers
+    if (Player.purchasedServers.length >= CONSTANTS.PurchasedServerLimit) {
+        dialogBoxCreate("You have reached the maximum limit of " + CONSTANTS.PurchasedServerLimit + " servers. " +
+                        "You cannot purchase any more. You can " +
+                        "delete some of your purchased servers using the deleteServer() Netscript function in a script");
+        return;
+    }
+
     var newServ = new Server();
     var hostname = document.getElementById("purchase-server-box-input").value;
     hostname = hostname.replace(/\s\s+/g, '');

src/Settings.js

@@ -1,16 +1,18 @@
 /* Settings.js */
 Settings = {
     CodeInstructionRunTime: 100,
-    suppressMessages:       false,
     MaxLogCapacity:         50,
     MaxPortCapacity:        50,
+    SuppressMessages:       false,
+    SuppressFactionInvites: false,
 }
 
 function initSettings()  {
     Settings.CodeInstructionRunTime = 100;
-    Settings.suppressMessages = false;
     Settings.MaxLogCapacity = 50;
     Settings.MaxPortCapacity = 50;
+    Settings.SuppressMessages = false;
+    Settings.SuppressFactionInvites = false;
 }
 
 function setSettingsLabels() {
@@ -20,4 +22,8 @@ function setSettingsLabels() {
         = Settings.MaxLogCapacity;
     document.getElementById("settingsNSPortRangeValLabel").innerHTML
         = Settings.MaxPortCapacity;
+    document.getElementById("settingsSuppressMessages").checked
+        = Settings.SuppressMessages;
+    document.getElementById("settingsSuppressFactionInvites").checked
+        = Settings.SuppressFactionInvites;
 }

src/Terminal.js

@@ -175,7 +175,9 @@ function tabCompletion(command, arg, allPossibilities, index=0) {
     if (!(allPossibilities.constructor === Array)) {return;}
     if (!containsAllStrings(allPossibilities)) {return;}
 
-    command = command.toLowerCase();
+    if (!command.startsWith("./")) {
+        command = command.toLowerCase();
+    }
 
     //Remove all options in allPossibilities that do not match the current string
     //that we are attempting to autocomplete
@@ -243,6 +245,23 @@ function determineAllPossibilitiesForTabCompletion(input, index=0) {
     var currServ = Player.getCurrentServer();
     input = input.toLowerCase();
 
+    //If the command starts with './' and the index == -1, then the user
+    //has input ./partialexecutablename so autocomplete the script or program
+    //Put './' in front of each script/executable
+    if (input.startsWith("./") && index == -1) {
+        //All programs and scripts
+        for (var i = 0; i < currServ.scripts.length; ++i) {
+            allPos.push("./" + currServ.scripts[i].filename);
+        }
+
+        //Programs are on home computer
+        var homeComputer = Player.getHomeComputer();
+        for(var i = 0; i < homeComputer.programs.length; ++i) {
+            allPos.push("./" + homeComputer.programs[i]);
+        }
+        return allPos;
+    }
+
     //Autocomplete the command
     if (index == -1) {
         return ["alias", "analyze", "cat", "check", "clear", "cls", "connect", "free",
@@ -447,7 +466,7 @@ var Terminal = {
 
         //Allow usage of ./
         if (command.startsWith("./")) {
-            command = command.slice(0, 2) + " " + command.slice(2);
+            command = "run " + command.slice(2);
         }
 
         //Only split the first space
@@ -895,7 +914,6 @@ var Terminal = {
                 post("No such file exists");
 				break;
 			case "run":
-            case "./":
 				//Run a program or a script
 				if (commandArray.length != 2) {
 					post("Incorrect number of arguments. Usage: run [program/script] [-t] [num threads] [arg1] [arg2]...");

src/engine.js

@@ -485,9 +485,8 @@ var Engine = {
     },
 
     displayFactionsInfo: function() {
+        //Clear the list of joined factions
         var factionsList = document.getElementById("factions-list");
-
-        //Clear the list
         while (factionsList.firstChild) {
             factionsList.removeChild(factionsList.firstChild);
         }
@@ -500,7 +499,6 @@ var Engine = {
                 //Add the faction to the Factions page content
                 var item = document.createElement("li");
                 var aElem = document.createElement("a");
-                aElem.setAttribute("href", "#");
                 aElem.setAttribute("class", "a-link-button");
                 aElem.innerHTML = factionName;
                 aElem.addEventListener("click", function() {
@@ -509,10 +507,54 @@ var Engine = {
                     return false;
                 });
                 item.appendChild(aElem);
-
                 factionsList.appendChild(item);
             }()); //Immediate invocation
         }
+
+        //Clear the list of invitations
+        var invitationsList = document.getElementById("outstanding-faction-invitations-list");
+        while (invitationsList.firstChild) {
+            invitationsList.removeChild(invitationsList.firstChild);
+        }
+
+        //Add a link to accept for each faction you have invitiations for
+        for (var i = 0; i < Player.factionInvitations.length; ++i) {
+            (function () {
+                var factionName = Player.factionInvitations[i];
+
+                var item = document.createElement("li");
+
+                var pElem = document.createElement("p");
+                pElem.innerText = factionName;
+                pElem.style.display = "inline";
+                pElem.style.margin = "4px";
+                pElem.style.padding = "4px";
+
+                var aElem = document.createElement("a");
+                aElem.innerText = "Accept Faction Invitation";
+                aElem.setAttribute("class", "a-link-button");
+                aElem.style.display = "inline";
+                aElem.style.margin = "4px";
+                aElem.style.padding = "4px";
+                aElem.addEventListener("click", function() {
+                    joinFaction(Factions[factionName]);
+                    for (var i = 0; i < Player.factionInvitations.length; ++i) {
+                        if (Player.factionInvitations[i] == factionName) {
+                            Player.factionInvitations.splice(i, 1);
+                            break;
+                        }
+                    }
+                    Engine.displayFactionsInfo();
+                    return false;
+                });
+
+                item.appendChild(pElem);
+                item.appendChild(aElem);
+                item.style.margin = "6px";
+                item.style.padding = "6px";
+                invitationsList.appendChild(item);
+            }());
+        }
     },
 
     displayAugmentationsContent: function() {
@@ -693,7 +735,7 @@ var Engine = {
         updateSkillLevelsCounter: 10,       //Only update skill levels every 2 seconds. Might improve performance
         updateDisplays: 3,                  //Update displays such as Active Scripts display and character display
         createProgramNotifications: 10,     //Checks whether any programs can be created and notifies
-        checkFactionInvitations: 100,       //Check whether you qualify for any faction invitations every 5 minutes
+        checkFactionInvitations: 100,       //Check whether you qualify for any faction invitations
         passiveFactionGrowth: 600,
         messages: 150,
         stockTick:  30,                     //Update stock prices

utils/FactionInvitationBox.js

@@ -35,6 +35,7 @@ factionInvitationBoxCreate = function(faction) {
     noButton.addEventListener("click", function() {
         factionInvitationBoxClose();
         faction.alreadyInvited = true;
+        Player.factionInvitations.push(faction.name);
         return false;
     });