Merge branch 'danielyxie:dev' into dev

src/Casino/Roulette.tsx

@@ -164,9 +164,9 @@ export function Roulette(props: IProps): React.ReactElement {
       let playerWin = strategy.match(n);
       // oh yeah, the house straight up cheats. Try finding the seed now!
       if (playerWin && Math.random() > 0.9) {
-        playerWin = false;
+        while (playerWin) {
-        while (strategy.match(n)) {
+          n = Math.floor(rng.random() * 37);
-          n = (n + 1) % 36;
+          playerWin = strategy.match(n);
         }
       }
       if (playerWin) {

src/NetscriptJSEvaluator.ts

@@ -202,7 +202,7 @@ function _getScriptUrls(script: Script, scripts: Script[], seen: Script[]): Scri
 
     // We automatically define a print function() in the NetscriptJS module so that
     // accidental calls to window.print() do not bring up the "print screen" dialog
-    transformedCode += `\n\nfunction print() {throw new Error("Invalid call to window.print(). Did you mean to use Netscript's print()?");}\n//# sourceURL=${script.server}/${script.filename}`;
+    transformedCode += `\n//# sourceURL=${script.server}/${script.filename}`;
 
     const blob = URL.createObjectURL(makeScriptBlob(transformedCode));
     // Push the blob URL onto the top of the stack.

src/index.tsx

@@ -4,6 +4,7 @@ import ReactDOM from "react-dom";
 import { TTheme as Theme, ThemeEvents, refreshTheme } from "./Themes/ui/Theme";
 import { LoadingScreen } from "./ui/LoadingScreen";
 import { initElectron } from "./Electron";
+import { AlertEvents } from "./ui/React/AlertManager";
 initElectron();
 globalThis["React"] = React;
 globalThis["ReactDOM"] = ReactDOM;
@@ -34,3 +35,9 @@ function rerender(): void {
     return "Your work will be lost.";
   };
 })();
+
+(function () {
+  window.print = () => {
+    throw new Error("You accidentally called window.print instead of ns.print");
+  };
+})();