merge dev

src/ui/GameRoot.tsx

@@ -50,7 +50,7 @@ import { HacknetRoot } from "../Hacknet/ui/HacknetRoot";
 import { GenericLocation } from "../Locations/ui/GenericLocation";
 import { LocationCity } from "../Locations/ui/City";
 import { ProgramsRoot } from "../Programs/ui/ProgramsRoot";
-import { Root as ScriptEditorRoot } from "../ScriptEditor/ui/Root";
+import { Root as ScriptEditorRoot } from "../ScriptEditor/ui/ScriptEditorRoot";
 import { MilestonesRoot } from "../Milestones/ui/MilestonesRoot";
 import { TerminalRoot } from "../Terminal/ui/TerminalRoot";
 import { TutorialRoot } from "../Tutorial/ui/TutorialRoot";
@@ -237,7 +237,7 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme
     toScriptEditor: (fn: string, c: string) => {
       filename = fn;
       code = c;
-      setPage(Page.CreateScript);
+      setPage(Page.ScriptEditor);
     },
     toSleeves: () => setPage(Page.Sleeves),
     toStockMarket: () => setPage(Page.StockMarket),
@@ -313,7 +313,7 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme
                 <CharacterStats />
               ) : page === Page.StaneksGift ? (
                 <StaneksGiftRoot staneksGift={staneksGift} />
-              ) : page === Page.CreateScript ? (
+              ) : page === Page.ScriptEditor ? (
                 <ScriptEditorRoot filename={filename} code={code} player={player} router={Router} />
               ) : page === Page.ActiveScripts ? (
                 <ActiveScriptsRoot workerScripts={workerScripts} />