Merge PRs and fix issues

This commit is contained in:
danielyxie
2018-06-26 09:49:28 -05:00
parent 89ecb15b6f
commit 13dbd9f26c
6 changed files with 25001 additions and 25178 deletions
+3 -4
View File
@@ -2882,7 +2882,6 @@ function NetscriptFunctions(workerScript) {
if (workerScript.checkingRam) {
return updateStaticRam("createProgram", ramCost);
}
if (Player.bitNodeN != 4) {
updateDynamicRam("createProgram", ramCost);
if (Player.bitNodeN != 4) {
if (!(hasSingularitySF && singularitySFLvl >= 3)) {
@@ -2910,17 +2909,17 @@ function NetscriptFunctions(workerScript) {
}
}
if(p == null) {
if (p == null) {
workerScript.scriptRef.log("ERROR: createProgram() failed because the specified program does not exist: " + name);
return false;
}
if(Player.hasProgram(p.name)) {
if (Player.hasProgram(p.name)) {
workerScript.scriptRef.log('ERROR: createProgram() failed because you already have the ' + p.name + ' program');
return false;
}
if(!p.create.req()) {
if (!p.create.req()) {
workerScript.scriptRef.log("ERROR: createProgram() failed because hacking level is too low to create " + p.name + " (level " + p.create.level + " req)");
return false
}