Merge branch 'dev' of github.com:danielyxie/bitburner into dev

markdown/bitburner.ns.ps.md

@@ -48,7 +48,7 @@ for (let i = 0; i < scripts.length; ++i) {
 ```ts
 // NS2:
 const ps = ns.ps("home");
-for (script of ps) {
+for (let script of ps) {
     ns.tprint(`${script.filename} ${ps[i].threads}`);
     ns.tprint(script.args);
 }

src/Literature/Literatures.ts

@@ -19,7 +19,7 @@ export const Literatures: IMap<Literature> = {};
     "money on a server, and grow() increases the amount of money on a server by some percentage (multiplicatively)<br><br>" +
     "-Because hack() and grow() work by percentages, they are more effective if the target server has a high amount of money. " +
     "Therefore, you should try to increase the amount of money on a server (using grow()) to a certain amount before hacking it. Two " +
-    "import Netscript functions for this are getServerMoneyAvailable() and getServerMaxMoney()<br><br>" +
+    "important Netscript functions for this are getServerMoneyAvailable() and getServerMaxMoney()<br><br>" +
     "-Keep security level low. Security level affects everything when hacking. Two important Netscript functions " +
     "for this are getServerSecurityLevel() and getServerMinSecurityLevel()<br><br>" +
     "-Purchase additional servers by visiting 'Alpha Enterprises' in the city. They are relatively cheap " +

src/NetworkShare/Share.tsx

@@ -8,6 +8,5 @@ export function StartSharing(threads: number): () => void {
 }
 
 export function CalculateShareMult(): number {
-  console.log(`${sharePower} => ${CSM(sharePower)}`);
   return CSM(sharePower);
 }

src/ui/LoadingScreen.tsx

@@ -30,6 +30,13 @@ export function LoadingScreen(): React.ReactElement {
   const [show, setShow] = useState(false);
   const [loaded, setLoaded] = useState(false);
 
+  const version = `v${CONSTANTS.VersionString} (${hash()})`;
+  if (process.env.NODE_ENV === "development") {
+    document.title = `[dev] Bitburner ${version}`;
+  } else {
+    document.title = `Bitburner ${version}`;
+  }
+
   useEffect(() => {
     const id = setTimeout(() => {
       if (!loaded) setShow(true);
@@ -70,9 +77,7 @@ export function LoadingScreen(): React.ReactElement {
             <CircularProgress size={150} color="primary" />
           </Grid>
           <Grid item>
-            <Typography variant="h3">
+            <Typography variant="h3">Loading Bitburner {version}</Typography>
-              Loading Bitburner v{CONSTANTS.VersionString} ({hash()})
-            </Typography>
           </Grid>
           {show && (
             <Grid item>