From d6729e3481d782b1d16abc0e7ba534e0a38810e0 Mon Sep 17 00:00:00 2001 From: bob Date: Mon, 20 Jun 2022 10:11:35 -0400 Subject: [PATCH] Level 3 --- saves/Level2-dialogue.txt | 6 ++++-- saves/Level2.txt | 32 ++++++++++++++++---------------- saves/Level3-dialogue.txt | 18 ------------------ saves/Level3.txt | 36 ++++++++++++++++++------------------ src/BombDirectionShow.java | 2 +- src/GamePanel.java | 6 +++--- src/LevelManager.java | 11 ++++++----- 7 files changed, 48 insertions(+), 63 deletions(-) diff --git a/saves/Level2-dialogue.txt b/saves/Level2-dialogue.txt index 2810ab3..06f15d3 100644 --- a/saves/Level2-dialogue.txt +++ b/saves/Level2-dialogue.txt @@ -1,2 +1,4 @@ -Have you heard of the tragedy of -Darth Charlie the Wise? \ No newline at end of file +Well you just finished the tutorial +It only gets harder from here +You ready for some real platformering? +Platformering hmmm.. is that a word? \ No newline at end of file diff --git a/saves/Level2.txt b/saves/Level2.txt index 7ee8757..ec92285 100644 --- a/saves/Level2.txt +++ b/saves/Level2.txt @@ -1,18 +1,18 @@ -wwwwwwwwwwwwwwwwwe assd -sssssssssssssssssd qwwwwwwwwwwwwwwwwwwe assd -sssssssssssssssssd agxxxxxxxxxxxxxxxxxc assd -sssssssssssssssssd ad assd -sssssssssssssssssd qwe ak assd -sssssssssssssssssd asd ak assd -sssssssssssssssssd zxc ak zxxc -sssssssssssssssssd ad bbbb qe qe -sssssssssssssssssd qsd bbbb ad ad -sssssssssssssssssd ask bbbb ad ! ! ad -sssssssssssssssssd zxc qwwwwwwwwwwwwwwwwwwwwwwwwwwe qrtwwwwwwwwwwwwrd -sssssssssssssssssd agxxxxxxxxxxxxxxxxxxxxxxxxxfllllllllllgxxxxxxxxxxxxxxxc -sssssssssssssssssd qwwwwwwwwwe o ad zxxxxxxxxxxc -sssssssssssssssssd zxxxxxxxxxc qwe ad -sssssssssssssssssd asd zc + -ssssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwe zxc qe !!!!!!!!!!!!!!!!!!!!!!! qe +wwwwwwwwwwwwwwwwwe assd + +sssssssssssssssssd qwwwwwwwwwwwwwwwwwwe assd + +sssssssssssssssssd agxxxxxxxxxxxxxxxxxc assd + +sssssssssssssssssd ad assd + +sssssssssssssssssd qwe ak assd + +sssssssssssssssssd asd ak assd + +sssssssssssssssssd zxc ak zxxc + +sssssssssssssssssd ad bbbb qe qe + +sssssssssssssssssd qsd bbbb ad ad + +sssssssssssssssssd ask bbbb ad ! ! ad + +sssssssssssssssssd zxc qwwwwwwwwwwwwwwwwwwwwwwwwwwe qrtwwwwwwwwwwwwrd + +sssssssssssssssssd agxxxxxxxxxxxxxxxxxxxxxxxxxfllllllllllgxxxxxxxxxxxxxxxc + +sssssssssssssssssd qwwwwwwwwwe o ad zxxxxxxxxxxc + +sssssssssssssssssd zxxxxxxxxxc qwe ad + +sssssssssssssssssd+ asd zc + +ssssssssssssssssstwwwwwwwwwwwwwwwwwwwwwwwwwwe zxc qe ! ! ! ! qe ssssssssssssssssssssssssssssssssssssssssssssdllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllatwwwwwwwwwwwwwwwwwwwwwwwwwrd ssssssssssssssssssssssssssssssssssssssssssssdllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllssssssssssssssssssssssssssssd \ No newline at end of file diff --git a/saves/Level3-dialogue.txt b/saves/Level3-dialogue.txt index b273a69..2761dfe 100644 --- a/saves/Level3-dialogue.txt +++ b/saves/Level3-dialogue.txt @@ -1,20 +1,2 @@ $Villain I am having a seizure. - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb -wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww \ No newline at end of file diff --git a/saves/Level3.txt b/saves/Level3.txt index b00855e..d39adf5 100644 --- a/saves/Level3.txt +++ b/saves/Level3.txt @@ -1,18 +1,18 @@ - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb -wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww \ No newline at end of file +wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwe asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd +assssssgxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxfd asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd +assssssd ad asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd +assssssd ad asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd +assssssd ad asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd +assssssd+ ad asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd +asssssstwwwwww wwwww ww w wwe ad asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd +assssssssssssslllsssssllllssllslllssd zc asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd +asssssgxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc qe asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd +asssssd b ad asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd +asssssd b zc asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd +asssssd b asssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssd +asssssd !!!!!!!!!!!!!!!!!!!!!!!! b zxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxd +asssssdbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb d +asssssdbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb qe qe d +asssssd ak hk d +asssssdo ad ! ! ad xd +assssstwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrtwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwrtwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwc \ No newline at end of file diff --git a/src/BombDirectionShow.java b/src/BombDirectionShow.java index 83dd2a3..e99856a 100644 --- a/src/BombDirectionShow.java +++ b/src/BombDirectionShow.java @@ -19,7 +19,7 @@ public class BombDirectionShow extends StickyBomb implements Serializable { while(isMove&&loopCounter<10) { super.move(); if(isMove&&canUpdate(0,0)) { - g.drawRect(x - GameFrame.game.camera.x + Player.PLAYER_WIDTH / 2, y + Player.PLAYER_HEIGHT / 2, 2, 2); + g.drawRect(x - GameFrame.game.camera.x, y, 2, 2); } loopCounter++; } diff --git a/src/GamePanel.java b/src/GamePanel.java index 8f0d83a..c8bc46d 100644 --- a/src/GamePanel.java +++ b/src/GamePanel.java @@ -31,7 +31,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ public static final int GAME_WIDTH = 1225; public static final int GAME_HEIGHT = 630; - public static final int fireballSpeed = 5; + public static final int fireballSpeed = 6; public static Font tutorialFont = new Font(Font.MONOSPACED, Font.BOLD, 36); public static Font loreFont = new Font(Font.MONOSPACED, Font.ITALIC + Font.BOLD, 36); @@ -293,7 +293,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ if(fireballs.get(i)!=null) { fireballs.get(i).draw(g); } - if(fireballs.get(i).dead){ + if(i0&&!player.holdingSteel){ - bombDir = new BombDirectionShow(this.player.x + this.camera.x + WIDTH/2, this.player.y+HEIGHT/2, + bombDir = new BombDirectionShow(this.player.x + this.camera.x + player.WIDTH/2, this.player.y+player.HEIGHT/2, (player.mouseX - this.player.x) / 20, (player.mouseY - this.player.y) / 10); bombDir.draw(g); } diff --git a/src/LevelManager.java b/src/LevelManager.java index 020963c..8c1cf00 100644 --- a/src/LevelManager.java +++ b/src/LevelManager.java @@ -29,13 +29,14 @@ public class LevelManager implements Serializable { bombs = 8; } else if(level == 2){ //-400/400 - xSpawn = 700; - ySpawn = 0; + xSpawn = -400; + ySpawn = 400; filePath = "saves/Level2.txt"; - bombs = 5; + bombs = 3; } else if(level == 3){ - xSpawn = 200; - ySpawn = 0; + //-800/100 + xSpawn = -800; + ySpawn = 100; filePath = "saves/Level3.txt"; bombs = 99329; }