diff --git a/src/phases.ts b/src/phases.ts index 5163825147d..c3805d57ead 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -1912,7 +1912,10 @@ export class EncounterPhase extends BattlePhase { } } } - handleTutorial(this.scene, Tutorial.Access_Menu).then(() => super.end()); + handleTutorial(this.scene, Tutorial.Access_Menu).then(() => { + this.scene.arenaFlyout.toggleFlyout(true) + super.end() + }); } tryOverrideForBattleSpec(): boolean { diff --git a/src/ui/arena-flyout.ts b/src/ui/arena-flyout.ts index f3cdb228948..0abf1788b61 100644 --- a/src/ui/arena-flyout.ts +++ b/src/ui/arena-flyout.ts @@ -210,7 +210,47 @@ export class ArenaFlyout extends Phaser.GameObjects.Container { this.flyoutTextPlayer.setFontSize(48); } - public printIVs() { + display1() { + this.flyoutTextPlayer.text = "" + this.flyoutTextField.text = "" + this.flyoutTextEnemy.text = "" + this.flyoutTextHeaderField.text = "" + this.flyoutTextHeaderPlayer.text = "" + this.flyoutTextHeaderEnemy.text = "" + this.flyoutTextHeader.text = "Game Logs" + this.flyoutTextPlayer.setPosition(6, 4) + this.flyoutTextPlayer.setFontSize(30); + var instructions = [] + var drpd = LoggerTools.getDRPD(this.scene as BattleScene); + var doWaveInstructions = true; + for (var i = 0; i < drpd.waves.length && drpd.waves[i] != undefined && doWaveInstructions; i++) { + if (drpd.waves[i].id > (this.scene as BattleScene).currentBattle.waveIndex) { + doWaveInstructions = false; + } else { + instructions.push("") + instructions.push("Wave " + drpd.waves[i].id) + for (var j = 0; j < drpd.waves[i].actions.length; j++) { + instructions.push("- " + drpd.waves[i].actions[j]) + } + if (drpd.waves[i].shop != "") + instructions.push("Reward: " + drpd.waves[i].shop) + } + } + for (var i = instructions.length - 10; i < instructions.length; i++) { + if (i >= 0) { + this.flyoutTextPlayer.text += instructions[i] + } + this.flyoutTextPlayer.text += "\n" + } + if (true) + for (var i = 0; i < LoggerTools.enemyPlan.length; i++) { + if (LoggerTools.enemyPlan[i] != "") { + this.flyoutTextEnemy.text += LoggerTools.enemyPlan[i] + "\n" + } + } + } + + display2() { this.clearText() var poke = (this.scene as BattleScene).getEnemyField() this.flyoutTextPlayer.text = "" @@ -238,6 +278,10 @@ export class ArenaFlyout extends Phaser.GameObjects.Container { } } + public printIVs() { + this.display1() + } + /** Parses through all set Arena Effects and puts them into the proper {@linkcode Phaser.GameObjects.Text} object */ public updateFieldText() { this.clearText(); @@ -279,43 +323,7 @@ export class ArenaFlyout extends Phaser.GameObjects.Container { textObject.text += "\n"; } - this.flyoutTextPlayer.text = "" - this.flyoutTextField.text = "" - this.flyoutTextEnemy.text = "" - this.flyoutTextHeaderField.text = "" - this.flyoutTextHeaderPlayer.text = "" - this.flyoutTextHeaderEnemy.text = "" - this.flyoutTextHeader.text = "Game Logs" - this.flyoutTextPlayer.setPosition(6, 4) - this.flyoutTextPlayer.setFontSize(30); - var instructions = [] - var drpd = LoggerTools.getDRPD(this.scene as BattleScene); - var doWaveInstructions = true; - for (var i = 0; i < drpd.waves.length && drpd.waves[i] != undefined && doWaveInstructions; i++) { - if (drpd.waves[i].id > (this.scene as BattleScene).currentBattle.waveIndex) { - doWaveInstructions = false; - } else { - instructions.push("") - instructions.push("Wave " + drpd.waves[i].id) - for (var j = 0; j < drpd.waves[i].actions.length; j++) { - instructions.push("- " + drpd.waves[i].actions[j]) - } - if (drpd.waves[i].shop != "") - instructions.push("Reward: " + drpd.waves[i].shop) - } - } - for (var i = instructions.length - 10; i < instructions.length; i++) { - if (i >= 0) { - this.flyoutTextPlayer.text += instructions[i] - } - this.flyoutTextPlayer.text += "\n" - } - if (true) - for (var i = 0; i < LoggerTools.enemyPlan.length; i++) { - if (LoggerTools.enemyPlan[i] != "") { - this.flyoutTextEnemy.text += LoggerTools.enemyPlan[i] + "\n" - } - } + this.display2() } /**