diff --git a/img/backgrounds/cloud4.png b/img/backgrounds/cloud4.png new file mode 100644 index 0000000..f53c0d1 Binary files /dev/null and b/img/backgrounds/cloud4.png differ diff --git a/img/backgrounds/cloud5.png b/img/backgrounds/cloud5.png new file mode 100644 index 0000000..05e3460 Binary files /dev/null and b/img/backgrounds/cloud5.png differ diff --git a/img/backgrounds/cloud6.png b/img/backgrounds/cloud6.png new file mode 100644 index 0000000..a80a459 Binary files /dev/null and b/img/backgrounds/cloud6.png differ diff --git a/img/backgrounds/cloud7.png b/img/backgrounds/cloud7.png new file mode 100644 index 0000000..797d166 Binary files /dev/null and b/img/backgrounds/cloud7.png differ diff --git a/img/backgrounds/cloud8.png b/img/backgrounds/cloud8.png new file mode 100644 index 0000000..8684852 Binary files /dev/null and b/img/backgrounds/cloud8.png differ diff --git a/img/backgrounds/cloud9.png b/img/backgrounds/cloud9.png new file mode 100644 index 0000000..b4e3f82 Binary files /dev/null and b/img/backgrounds/cloud9.png differ diff --git a/src/GamePanel.java b/src/GamePanel.java index 7901a24..d881d4f 100644 --- a/src/GamePanel.java +++ b/src/GamePanel.java @@ -73,7 +73,8 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ public BufferedImageWrapper cloud2 = new BufferedImageWrapper(("img/backgrounds/cloud2.png")); public BufferedImageWrapper cloud3 = new BufferedImageWrapper(("img/backgrounds/cloud3.png")); public BufferedImageWrapper bomb; - public BufferedImageWrapper onePortrait = new BufferedImageWrapper(("img/dialogue/Gunther.png")); + public BufferedImageWrapper narratorPortrait = new BufferedImageWrapper(("img/dialogue/Gunther.png")); + public BufferedImageWrapper villainPortrait = new BufferedImageWrapper(("img/dialogue/Bouncer.png")); public String lastText; @@ -85,9 +86,21 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ cloudTwoBackground = new BackgroundImage(600, 250, cloud2, cloud2.image.getWidth(), cloud3.image.getHeight(), 5, camera); cloudThreeBackground = new BackgroundImage(1000, 200, cloud3, cloud2.image.getWidth(), cloud3.image.getHeight(), 5, camera); pauseMenu = new PauseMenu(GAME_HEIGHT/2, 100, 400, 400, GAME_WIDTH, new Font(Font.MONOSPACED, Font.BOLD, 60), "Paused"); - dialogueMenu = new DialogueMenu(GAME_HEIGHT-100, 200, new Font(Font.MONOSPACED, Font.BOLD, 20), onePortrait, true); - dialogueArray.add("Lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum"); - dialogueArray.add("I told you so"); + dialogueMenu = new DialogueMenu(GAME_HEIGHT-100, 200, new Font(Font.MONOSPACED, Font.BOLD, 20), narratorPortrait, true); + dialogueArray.add("Did you ever hear the tragedy of Darth Plagueis The Wise?"); + dialogueArray.add("I thought not."); + dialogueArray.add("It’s not a story the Jedi would tell you."); + dialogueArray.add("Darth Plagueis was a Dark Lord of the Sith, " + + "so powerful and so wise he could use the Force to influence " + + "the midichlorians to create life… " + + "He had such a knowledge of the dark side that " + + "he could even keep the ones he cared about from dying. " + + "The dark side of the Force is a pathway to many abilities some consider to be unnatural. " + + "He became so powerful… the only thing he was afraid of was losing his power, " + + "which eventually, of course, he did."); + dialogueArray.add("Unfortunately, he taught his apprentice everything he knew, then his apprentice killed him in his sleep."); + dialogueArray.add("Ironic."); + dialogueArray.add("He could save others from death, but not himself."); try { // load player sprites from disk here for (int i = 0; i < 11; i++) { diff --git a/src/GenericSprite.java b/src/GenericSprite.java index eaa40ef..125e15f 100644 --- a/src/GenericSprite.java +++ b/src/GenericSprite.java @@ -19,11 +19,11 @@ public class GenericSprite extends Rectangle implements Serializable { public final double speedCapy = 20; public int WIDTH; //size of ball public int HEIGHT; //size of ball - public boolean rightPressed = false; - public boolean leftPressed = false; - public boolean upPressed= false; - public boolean downPressed = false; - public boolean isGrounded = false; + transient public boolean rightPressed = false; + transient public boolean leftPressed = false; + transient public boolean upPressed= false; + transient public boolean downPressed = false; + transient public boolean isGrounded = false; public boolean isPlayer = false; //constructor creates ball at given location with given dimensions