felixfoertsch/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2026-04-20 16:22:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge jaguilar's changes to incorporate Netscript JS (PR #212)

Browse Source
This commit is contained in:
danielyxie
2018-05-05 17:13:35 -05:00
parent b6e49c1a82
commit 8dba456b65
7 changed files with 4699 additions and 134066 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NetscriptFunctions.js
+4 -3
View File
@@ -32,7 +32,8 @@ import {Locations} from "./Location.js";
import {Message, Messages} from "./Message.js";
import {inMission} from "./Missions.js";
import {Player} from "./Player.js";
import {Script, findRunningScript, RunningScript} from "./Script.js";
import {Script, findRunningScript, RunningScript,
isScriptFilename} from "./Script.js";
import {Server, getServer, AddToAllServers,
AllServers, processSingleServerGrowth,
GetServerByHostname} from "./Server.js";
@@ -741,7 +742,7 @@ function NetscriptFunctions(workerScript) {
});
return res;
}
if (!scriptname.endsWith(".lit") && !scriptname.endsWith(".script") &&
if (!scriptname.endsWith(".lit") && !isScriptFilename(scriptname) &&
!scriptname.endsWith("txt")) {
throw makeRuntimeRejectMsg(workerScript, "Error: scp() does not work with this file type. It only works for .script, .lit, and .txt files");
}
@@ -1917,7 +1918,7 @@ function NetscriptFunctions(workerScript) {
return true;
}
}
} else if (fn.endsWith(".script")) {
} else if (isScriptFilename(fn)) {
for (var i = 0; i < s.scripts.length; ++i) {
if (s.scripts[i].filename === fn) {
//Check that the script isnt currently running