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 8c1cf00..24c397d 100644 --- a/src/LevelManager.java +++ b/src/LevelManager.java @@ -43,20 +43,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