From a8b45c35bafbc5259ed0ef270129789a7a2146a5 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 20 Jun 2022 14:48:56 -0400 Subject: [PATCH] Minor changes --- src/GamePanel.java | 5 ++++- src/LevelManager.java | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/GamePanel.java b/src/GamePanel.java index a90d9a9..2f3dc54 100644 --- a/src/GamePanel.java +++ b/src/GamePanel.java @@ -66,7 +66,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ public BufferedImageWrapper[][][] slimeSpriteArray = new BufferedImageWrapper[2][2][3]; public BufferedImageWrapper[] explosionArray = new BufferedImageWrapper[9]; - public Tile[][]map = new Tile[1000][18]; + public Tile[][]map; public ArrayList middlewareArray = new ArrayList<>(); public ArrayListparticleTiles = new ArrayList<>(); @@ -87,6 +87,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ public BufferedImageWrapper cloud3 = new BufferedImageWrapper(("img/backgrounds/cloud3.png")); public BufferedImageWrapper bomb; public BufferedImageWrapper narratorPortrait = new BufferedImageWrapper(("img/dialogue/Gunther.png")); + public BufferedImageWrapper villainPortrait = new BufferedImageWrapper("img/dialogue/Bouncer.png"); public boolean isContinue; public boolean isRunning; public ArrayList tutorialSign = new ArrayList(); @@ -98,6 +99,8 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ // set gameFrame to enable switching between different panels (in the gameFrame) this.gameFrame = gameFrame; camera = new Camera(0); + // initialize map + map = new Tile[1000][18]; // create background mountains and images background = new BackgroundImage(0, 0, backgroundImage, GAME_WIDTH, GAME_HEIGHT, 10, camera); cloudOneBackground = new BackgroundImage(200, 200, cloud1, cloud1.image.getWidth(), cloud1.image.getHeight(), 5, camera); diff --git a/src/LevelManager.java b/src/LevelManager.java index a653f57..ab8946d 100644 --- a/src/LevelManager.java +++ b/src/LevelManager.java @@ -51,8 +51,7 @@ public class LevelManager implements Serializable { 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.PORTRAIT = GameFrame.game.villainPortrait; } GameFrame.game.dialogueMenu.currentFrame = 0; GameFrame.game.dialogueMenu.frameCounter = 0;