Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-19 06:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #359 from kopelli/remove-loading-screen

Browse Source 
[refactor] Pulled 'removeLoadingScreen' out of Engine
This commit is contained in:
danielyxie 2018-07-20 12:26:34 -05:00 committed by GitHub
commit b822a2447d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/engine.js
View File

@ -4,6 +4,7 @@ import {removeChildrenFromElement} from "../utils/uiHelpers/removeC
import {clearEventListeners} from "../utils/uiHelpers/clearEventListeners"; import {clearEventListeners} from "../utils/uiHelpers/clearEventListeners";
import {createElement} from "../utils/uiHelpers/createElement"; import {createElement} from "../utils/uiHelpers/createElement";
import {exceptionAlert} from "../utils/helpers/exceptionAlert"; import {exceptionAlert} from "../utils/helpers/exceptionAlert";
import {removeLoadingScreen} from "../utils/uiHelpers/removeLoadingScreen";
import numeral from "numeral/min/numeral.min"; import numeral from "numeral/min/numeral.min";
import {formatNumber, import {formatNumber,
convertTimeMsToTimeElapsedString, convertTimeMsToTimeElapsedString,
@ -1214,16 +1215,6 @@ let Engine = {
}, 3000); }, 3000);
}, },
removeLoadingScreen: function() {
var loader = document.getElementById("loader");
if (!loader) {return;}
while(loader.firstChild) {
loader.removeChild(loader.firstChild);
}
loader.parentNode.removeChild(loader);
document.getElementById("entire-game-container").style.visibility = "visible";
},
//Used when initializing a game //Used when initializing a game
//elems should be an array of all DOM elements under the header //elems should be an array of all DOM elements under the header
closeMainMenuHeader: function(elems) { closeMainMenuHeader: function(elems) {
@ -1362,7 +1353,7 @@ let Engine = {
Player.lastUpdate = Engine._lastUpdate; Player.lastUpdate = Engine._lastUpdate;
Engine.start(); //Run main game loop and Scripts loop Engine.start(); //Run main game loop and Scripts loop
Engine.removeLoadingScreen(); removeLoadingScreen();
dialogBoxCreate("While you were offline, your scripts generated $" + dialogBoxCreate("While you were offline, your scripts generated $" +
formatNumber(offlineProductionFromScripts, 2) + " and your Hacknet Nodes generated $" + formatNumber(offlineProductionFromScripts, 2) + " and your Hacknet Nodes generated $" +
formatNumber(offlineProductionFromHacknetNodes, 2)); formatNumber(offlineProductionFromHacknetNodes, 2));
@ -1436,7 +1427,7 @@ let Engine = {
//Start interactive tutorial //Start interactive tutorial
iTutorialStart(); iTutorialStart();
Engine.removeLoadingScreen(); removeLoadingScreen();
} }
//Initialize labels on game settings //Initialize labels on game settings
setSettingsLabels(); setSettingsLabels();

11
utils/uiHelpers/removeLoadingScreen.ts Normal file
View File

@ -0,0 +1,11 @@
import { getElementById } from "./getElementById";
import { removeElementById } from "./removeElementById";
/**
* Routes the player from the Loading screen to the main game content.
*/
export function removeLoadingScreen() {
// TODO: Have this manipulate CSS classes instead of direct styles
removeElementById("loader");
getElementById("entire-game-container").style.visibility = "visible";
}