diff --git a/saves/Level1-dialogue.txt b/saves/Level1-dialogue.txt index 2810ab3..b49b9cc 100644 --- a/saves/Level1-dialogue.txt +++ b/saves/Level1-dialogue.txt @@ -1,2 +1 @@ -Have you heard of the tragedy of -Darth Charlie the Wise? \ No newline at end of file +$Empty \ No newline at end of file diff --git a/src/LevelManager.java b/src/LevelManager.java index 70a0f5a..18fbfa2 100644 --- a/src/LevelManager.java +++ b/src/LevelManager.java @@ -49,20 +49,20 @@ public class LevelManager implements Serializable { try { MapReader.inputMap(filePath); if (!hasDied) { - GameFrame.game.dialogueArray = new ArrayList(Arrays.asList(MapReader.inputDialogue(filePath))); - if (GameFrame.game.dialogueArray.get(0).contains("$Villain")) { - GameFrame.game.dialogueArray.remove(0); - GameFrame.game.dialogueMenu.isNarrator = false; - // TODO: move img path to GamePanel - GameFrame.game.dialogueMenu.PORTRAIT = new BufferedImageWrapper("img\\dialogue\\Bouncer.png"); + if (!(MapReader.inputDialogue(filePath)[0].equals("$Empty"))) { + GameFrame.game.dialogueArray = new ArrayList(Arrays.asList(MapReader.inputDialogue(filePath))); + if (GameFrame.game.dialogueArray.get(0).contains("$Villain")) { + GameFrame.game.dialogueArray.remove(0); + GameFrame.game.dialogueMenu.isNarrator = false; + // TODO: move img path to GamePanel + GameFrame.game.dialogueMenu.PORTRAIT = new BufferedImageWrapper("img\\dialogue\\Bouncer.png"); + } + GameFrame.game.dialogueMenu.currentFrame = 0; + GameFrame.game.dialogueMenu.frameCounter = 0; + GameFrame.game.isDialogue = true; } - GameFrame.game.dialogueMenu.currentFrame = 0; - GameFrame.game.dialogueMenu.frameCounter = 0; - GameFrame.game.isDialogue = true; } // reset signs - GameFrame.game.tutorialSign = new ArrayList(); - GameFrame.game.loreSign = new ArrayList(); GameFrame.game.tutorialSign.clear(); GameFrame.game.loreSign.clear(); // temporary boolean, so only declared here diff --git a/src/MenuPanel.java b/src/MenuPanel.java index 4e38826..3784875 100644 --- a/src/MenuPanel.java +++ b/src/MenuPanel.java @@ -161,6 +161,8 @@ public class MenuPanel extends JPanel implements Runnable, KeyListener{ if(textBoxArray.get(currentBox).id.contains("game")){ gameStart = true; } + // always unpause game, no matter what screen is navigated to + GameFrame.game.isPaused = false; // logic for different screens starts here if (textBoxArray.get(currentBox).id.equals("game-start")) { try { @@ -170,6 +172,8 @@ public class MenuPanel extends JPanel implements Runnable, KeyListener{ GameFrame.game.player.yVelocity = 0; GameFrame.game.map = new Tile[1000][18]; GameFrame.game = new GamePanel(GameFrame.main); //run GamePanel constructor + GameFrame.game.isContinue = true; + textBoxArray.add(continueGame); GameFrame.game.startThread(); GameFrame.main.add(GameFrame.game, "game", 0); } catch (IOException | SpriteException | UnsupportedAudioFileException | LineUnavailableException ex) {