@@ -28874,69 +28874,95 @@ Prodigy.ForestBoss = function(e, t) {
2887428874 var t;
2887528875 t = e === Prodigy.Menu.Social.ARENA ? "Arena" : e === Prodigy.Menu.Social.ARENA_LEADERBOARD ? "ArenaLeaderboard" : e === Prodigy.Menu.Social.BATTLE_REQUESTS ? "BattleRequests" : e === Prodigy.Menu.Social.BOUNTIES ? "Bounties" : e === Prodigy.Menu.Social.ACHIEVEMENTS ? "Achievements" : "Leaderboard", this.content = new Prodigy.Container[t](this.game, this, 80, 200), this.page = e
2887628876 }
28877- }), Prodigy.Menu.SystemMenu = function(e, t, i ) {
28878- Prodigy.RenderMenu.call(this, e, t, 0, 0, e.prodigy.textureMenu), this.onClose = i, this. create()
28877+ }), Prodigy.Menu.SystemMenu = function(e, t) {
28878+ Prodigy.RenderMenu.call(this, e, t, 0, 0, e.prodigy.textureMenu), this.create()
2887928879}, Prodigy.extends(Prodigy.Menu.SystemMenu, Prodigy.RenderMenu, {
2888028880 constructor: Prodigy.Menu.SystemMenu,
2888128881 create: function() {
28882- this.addTransparent();
28883- var e = [{
28884- icon: "settings",
28885- bot: this.game.prodigy.localization.getString("SETTINGS_SOUND")
28886- }, {
28887- icon: "settings",
28888- bot: this.game.prodigy.localization.getString("SETTINGS_GRAPHICS")
28889- }, {
28890- icon: "settings",
28891- bot: this.game.prodigy.localization.getString("SETTINGS_NETWORK")
28892- }, {
28893- icon: "settings",
28894- bot: this.game.prodigy.localization.getString("SETTINGS_OTHER")
28895- }],
28896- t = this.game.prodigy.player;
28897- !t.hasValidatedParentEmail() && t.hasCompletedTutorial() && e.push({
28898- atlas: "icons-menu",
28899- icon: "parent-link-hud-badge",
28900- top: this.game.prodigy.localization.getString("SETTINGS_PARENT"),
28901- bot: this.game.prodigy.localization.getString("SETTINGS_ACCOUNT"),
28902- hasIndicator: !0
28903- }), this.content = this.game.prodigy.create.element(this, 280, 260, 15, 8), this.createBaseSetup(20, 13, "stat", this.game.prodigy.localization.getString("SETTINGS_TITLE"), e), Prodigy.RenderMenu.prototype.create.call(this), this.setMode(0);
28904- for (var i = 0; i < e.length; i++) {
28905- var a = e[i];
28906- if (a.hasIndicator) {
28907- var s = this.game.prodigy.create.indicator(0, 0),
28908- r = this.buttons[i].sprite;
28909- r.addChild(s), this.buttons[i].indicator = s, s.visible = !1;
28910- var n = Util.getCenteredXY(s.width, 0, r.x, 0, r.width, 0);
28911- s.x = n.x, s.y = r.y - s.height, s.addTween(), s.visible = !0
28912- }
28913- }
28914- this.game.prodigy.create.advButton(this, 900, 480, {
28882+ this.addTransparent(), this.createBaseSetup(26, 16, "stat", "Settings", [{
28883+ icon: "settings",
28884+ bot: "Sound"
28885+ }, {
28886+ icon: "settings",
28887+ bot: "Graphics"
28888+ }, {
2891528889 icon: "settings",
28916- bot: this.game.prodigy.localization.getString("SETTINGS_LOGOUT")
28917- }, this.exitGame.bind(this)), this.game.prodigy.create.advButton(this, 900, 380, {
28890+ bot: "Other"
28891+ }, {
28892+ icon: "player",
28893+ top: "Name &",
28894+ bot: "Gender"
28895+ }, {
28896+ icon: "leaderboard",
28897+ top: "Game",
28898+ bot: "Credits"
28899+ }, {
28900+ icon: "player",
28901+ top: "Skin",
28902+ bot: "Tones"
28903+ }]), Prodigy.RenderMenu.prototype.create.call(this), this.setMode(0), this.game.prodigy.create.advButton(this, 930, 180, {
28904+ icon: "map",
28905+ top: "Join",
28906+ bot: "World"
28907+ }, this.openWorld.bind(this)), this.game.prodigy.create.advButton(this, 930, 280, {
28908+ icon: "map",
28909+ bot: "Intro"
28910+ }, this.openIntro.bind(this)), this.game.prodigy.create.advButton(this, 930, 380, {
28911+ icon: "member",
28912+ bot: "Member"
28913+ }, this.toggleMember.bind(this)), this.game.prodigy.create.advButton(this, 930, 480, {
2891828914 icon: "settings",
28919- bot: this.game.prodigy.localization.getString("SETTINGS_WIZARD_TITLE")
28920- }, this.wizardName.bind(this))
28915+ bot: "Log Out"
28916+ }, this.exitGame.bind(this)), this.game.prodigy.create.advButton(this, 930, 580, {
28917+ icon: "settings",
28918+ bot: "Math On"
28919+ }, this.MathOn.bind(this)), this.game.prodigy.create.advButton(this, 830, 580, {
28920+ icon: "settings",
28921+ bot: "Math Off"
28922+ }, this.MathOff.bind(this))
2892128923 },
2892228924 clearContents: function() {
28923- Util.isDefined(this.content) && this.content.destroy(), Util.isDefined(this.panel) && this.panel.destroy(), Util.isDefined(this.soundVolumeBar) && (this.soundVolumeBar.destroy(), this.soundVolumeBar = null), Util.isDefined(this.voiceVolumeBar) && (this.voiceVolumeBar.destroy(), this.voiceVolumeBar = null), Util.isDefined(this.bgmVolumeBar) && (this.bgmVolumeBar.destroy(), this.bgmVolumeBar = null), this.panel = this.game.prodigy.create.panel(this, 280, 260, 15, 8, "white"), this. content = this.game.prodigy.create.element(this, 280, 260, 15, 8)
28925+ Util.isDefined(this.content) && this.content.destroy(), Util.isDefined(this.panel) && this.panel.destroy(), Util.isDefined(this.soundVolumeBar) && (this.soundVolumeBar.destroy(), this.soundVolumeBar = null), Util.isDefined(this.voiceVolumeBar) && (this.voiceVolumeBar.destroy(), this.voiceVolumeBar = null), Util.isDefined(this.bgmVolumeBar) && (this.bgmVolumeBar.destroy(), this.bgmVolumeBar = null), this.content = this.game.prodigy.create.element(this, 280, 260, 15, 8)
2892428926 },
2892528927 setMode: function(e) {
2892628928 switch (Prodigy.RenderMenu.prototype.setMode.call(this, e), this.clearContents(), e) {
2892728929 case 1:
2892828930 this.openGraphics();
2892928931 break;
2893028932 case 2:
28931- this.openNetwork ();
28933+ this.openOther ();
2893228934 break;
2893328935 case 3:
28934- this.openOther();
28936+ this.openGender();
28937+ break;
28938+ case 4:
28939+ this.openCredits();
28940+ break;
28941+ case 5:
28942+ this.openTones();
2893528943 break;
2893628944 default:
2893728945 this.openSound()
2893828946 }
2893928947 },
28948+ openIntro: function() {
28949+ this.game.prodigy.start("Intro")
28950+ },
28951+ openWorld: function() {
28952+ this.game.prodigy.open.server()
28953+ },
28954+ setSound: function(e) {
28955+ switch (e) {
28956+ case 0:
28957+ this.game.prodigy.audio.setSFXVolume(this.soundVolumeBar.page / 100);
28958+ break;
28959+ case 1:
28960+ this.game.prodigy.audio.setBGMVolume(this.bgmVolumeBar.page / 100);
28961+ break;
28962+ case 2:
28963+ this.game.prodigy.audio.setVoiceVolume(this.voiceVolumeBar.page / 100)
28964+ }
28965+ },
2894028966 setSound: function(e) {
2894128967 switch (e) {
2894228968 case 0:
@@ -40799,7 +40825,9 @@ var Screen = function() {
4079940825 this.game.prodigy.debug.setup(this.game);
4080040826 this.game.prodigy.old.getCurrentSession(this.onGoogleSignIn.bind(this));
4080140827 try {
40802- $("#first-loading-screen").remove()
40828+ setTimeout(()=>{
40829+ $("#first-loading-screen").remove()
40830+ }, 300)
4080340831 } catch (e) {}
4080440832 try {
4080540833 Util.getUrlVariable("iosApp") && webkit.messageHandlers.setGameVisible.postMessage(0)
@@ -67030,10 +67058,14 @@ class OldProdigy {
6703067058 let game = this.game;
6703167059 firebase.utils.db.get(firebase.utils.db.ref(firebase.database, `users/${userID}`)).then((save) => {
6703267060 if (save.exists()) {
67061+ let wizard = save.val();
67062+ if (typeof wizard === "string") {
67063+ wizard = JSON.parse(wizard);
67064+ };
6703367065 Util.isDefined(callback) && callback({
6703467066 success: true,
6703567067 // Save data from database:
67036- wizard: save.val()
67068+ wizard: wizard
6703767069 });
6703867070 } else {
6703967071 Util.isDefined(callback) && callback({
@@ -67054,7 +67086,7 @@ class OldProdigy {
6705467086 if (!Util.isDefined(userID) || !this.game.prodigy.player.saveEnabled) {
6705567087 return;
6705667088 };
67057- const save = this.game.prodigy.old.getSave();
67089+ const save = JSON.stringify( this.game.prodigy.old.getSave() );
6705867090 firebase.utils.db.set(firebase.utils.db.ref(firebase.database, "users/" + userID), save).then(() => {
6705967091 Util.isDefined(callback) && callback({
6706067092 success: true,
0 commit comments