Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-12-26 16:07:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1072 from danielyxie/dev

Browse Source 
hotfix the tutorial
This commit is contained in:
hydroflame 2021-08-21 00:58:58 -04:00 committed by GitHub
commit 7db3716256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
css/popupboxes.scss
View File

@ -99,7 +99,6 @@
}
.log-box-log-container {
max-width: 400px;
overflow-y: auto;
}

4
dist/engine.bundle.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/engineStyle.css vendored
View File

@ -2433,7 +2433,6 @@ input[type="checkbox"] {
justify-content: space-between; }
.log-box-log-container {
max-width: 400px;
overflow-y: auto; }
.log-box-button {

3
src/InteractiveTutorial.d.ts vendored Normal file
View File

@ -0,0 +1,3 @@
export declare function iTutorialNextStep(): void;
export declare const ITutorial: {isRunning: boolean, currStep: number};
export declare const iTutorialSteps: {[key: string]: number};

56
src/ScriptEditor/ui/Root.tsx
View File

@ -23,6 +23,11 @@ import { libSource } from "../NetscriptDefinitions";
import { NetscriptFunctions } from "../../NetscriptFunctions";
import { WorkerScript } from "../../Netscript/WorkerScript";
import { Settings } from "../../Settings/Settings";
import {
iTutorialNextStep,
ITutorial,
iTutorialSteps,
} from "../../InteractiveTutorial";
let symbols: string[] = [];
(function() {
@ -81,35 +86,34 @@ export function Root(props: IProps): React.ReactElement {
}
// TODO(hydroflame): re-enable the tutorial.
// if (ITutorial.isRunning && ITutorial.currStep === iTutorialSteps.TerminalTypeScript) {
// //Make sure filename + code properly follow tutorial
// if (filename !== "n00dles.script") {
// dialogBoxCreate("Leave the script name as 'n00dles'!");
// return;
// }
// code = code.replace(/\s/g, "");
// if (code.indexOf("while(true){hack('n00dles');}") == -1) {
// dialogBoxCreate("Please copy and paste the code from the tutorial!");
// return;
// }
if (ITutorial.isRunning && ITutorial.currStep === iTutorialSteps.TerminalTypeScript) {
//Make sure filename + code properly follow tutorial
if (filename !== "n00dles.script") {
dialogBoxCreate("Leave the script name as 'n00dles'!");
return;
}
if (code.replace(/\s/g, "").indexOf("while(true){hack('n00dles');}") == -1) {
dialogBoxCreate("Please copy and paste the code from the tutorial!");
return;
}
// //Save the script
// let s = Player.getCurrentServer();
// for (var i = 0; i < s.scripts.length; i++) {
// if (filename == s.scripts[i].filename) {
// s.scripts[i].saveScript(getCurrentEditor().getCode(), Player.currentServer, Player.getCurrentServer().scripts);
// Engine.loadTerminalContent();
// return iTutorialNextStep();
// }
// }
//Save the script
const s = props.player.getCurrentServer();
for (let i = 0; i < s.scripts.length; i++) {
if (filename == s.scripts[i].filename) {
s.scripts[i].saveScript(code, props.player.currentServer, props.player.getCurrentServer().scripts);
props.engine.loadTerminalContent();
return iTutorialNextStep();
}
}
// // If the current script does NOT exist, create a new one
// let script = new Script();
// script.saveScript(getCurrentEditor().getCode(), Player.currentServer, Player.getCurrentServer().scripts);
// s.scripts.push(script);
// If the current script does NOT exist, create a new one
let script = new Script();
script.saveScript(code, props.player.currentServer, props.player.getCurrentServer().scripts);
s.scripts.push(script);
// return iTutorialNextStep();
// }
return iTutorialNextStep();
}
if (filename == "") {
dialogBoxCreate("You must specify a filename!");