From 5c5ccc51884f7c8c52424d860a1193a79a3d7eab Mon Sep 17 00:00:00 2001 From: bob Date: Thu, 9 Jun 2022 13:05:42 -0400 Subject: [PATCH 1/2] Only top lava gives particles --- saves/Level1.txt | 4 ++-- saves/Level2.txt | 6 +++--- src/MapReader.java | 4 +++- src/StickyBomb.java | 8 ++++++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/saves/Level1.txt b/saves/Level1.txt index d4ccded..e83a9d9 100644 --- a/saves/Level1.txt +++ b/saves/Level1.txt @@ -9,8 +9,8 @@ sssssssssssssssssd sssssssssssssssssd qe qe sssssssssssssssssd ad ! ad sssssssssssssssssd qwe qwe atwwwrd qwwwwwwellllqwwwwwwwe -sssssssssssssssssd asd asd zxxxxxc zxxxxxxxwwwwxxxxxxxxc -sssssssssssssssssd 1 zxc zxc vvvvvvvvvvvvvvvvvvvvv +sssssssssssssssssd asd asd zxxxxxc zxxxxxxxllllxxxxxxxxc +sssssssssssssssssd 1 zxc zxc vvvvvvvvwwwwvvvvvvvvv sssssssssssssssssd qe vvvvvvvvvvvvvvvvvvvvv sssssssssssssssssd ad qwwwwwwwwe vvvvvvvvvvvvvvvvvvvvv sssssssssssssssssd ad qrsssssssstwe vvvvvvvvvvvvvvvvvvvvv diff --git a/saves/Level2.txt b/saves/Level2.txt index 278de15..882f198 100644 --- a/saves/Level2.txt +++ b/saves/Level2.txt @@ -6,9 +6,9 @@ sssssssssssssssssd sssssssssssssssssd 1 1 1 1 1 sssssssssssssssssd 1 sssssssssssssssssd -sssssssssssssssssd -sssssssssssssssssd -sssssssssssssssssd qwe qwe +sssssssssssssssssd ll +sssssssssssssssssd llllll +sssssssssssssssssd l qwe qwe sssssssssssssssssd asd asd sssssssssssssssssd bbb 1 zxc zxc sssssssssssssssssdbbbbbbbbbbbbbbbbbbbbbbb diff --git a/src/MapReader.java b/src/MapReader.java index 3935400..67b0ca9 100644 --- a/src/MapReader.java +++ b/src/MapReader.java @@ -91,7 +91,9 @@ public class MapReader { } else if(file.charAt(i)=='l'){ newTile("img/tiles/terrain/lava.png"); GamePanel.map[x][y].kills = true; - GamePanel.particleTiles.add(GamePanel.map[x][y]); + if(y>0&&GamePanel.map[x][y-1]==null) { + GamePanel.particleTiles.add(GamePanel.map[x][y]); + } } x+=1; } diff --git a/src/StickyBomb.java b/src/StickyBomb.java index 0ad8ce6..2320fc0 100644 --- a/src/StickyBomb.java +++ b/src/StickyBomb.java @@ -51,6 +51,14 @@ public class StickyBomb extends GenericSprite{ } GamePanel.player.capSpeed(); alive = false; + for(int i=0; i Date: Thu, 9 Jun 2022 13:40:43 -0400 Subject: [PATCH 2/2] Mer --- src/Player.java | 8 +++++--- src/StickyBomb.java | 7 +++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Player.java b/src/Player.java index 13050f6..f00dc5f 100644 --- a/src/Player.java +++ b/src/Player.java @@ -204,11 +204,13 @@ public class Player extends GenericSprite { y = LevelManager.ySpawn; } - public void mousePressed(MouseEvent e){ + public void mousePressed(MouseEvent e) { int xx = e.getX(); int yy = e.getY(); - GamePanel.bombs.add(new StickyBomb(GamePanel.player.x+GamePanel.camera.x,GamePanel.player.y,35, - (xx-GamePanel.player.x)/20, (yy-GamePanel.player.y)/10, GamePanel.bomb, GamePanel.explosionArray)); + if (GamePanel.bombs.size() < 3) { + GamePanel.bombs.add(new StickyBomb(GamePanel.player.x + GamePanel.camera.x, GamePanel.player.y, 25, + (xx - GamePanel.player.x) / 20, (yy - GamePanel.player.y) / 10, GamePanel.bomb, GamePanel.explosionArray)); + } } public void addParticle(int x) throws IOException { if(GlobalState.randInt(1,3)==3) { diff --git a/src/StickyBomb.java b/src/StickyBomb.java index 2320fc0..72ab1a6 100644 --- a/src/StickyBomb.java +++ b/src/StickyBomb.java @@ -5,6 +5,8 @@ import java.awt.image.BufferedImage; public class StickyBomb extends GenericSprite{ public int length; + + public static final int spriteLength = 35; public int xVelocity; public int yVelocity; public boolean isMove; @@ -60,6 +62,7 @@ public class StickyBomb extends GenericSprite{ } } } + public void move(){ update(); if(fuse>0) { @@ -121,10 +124,10 @@ public class StickyBomb extends GenericSprite{ explosionCounter -= 2; } if(alive) { - g.drawImage(sprite, x - GamePanel.camera.x, y, length, length, null); + g.drawImage(sprite, x - GamePanel.camera.x - (spriteLength-length)/2, y - (spriteLength-length)/2, spriteLength, spriteLength, null); } else if (explosionPixel < explosionSpriteArray.length - 1) { g.drawImage(explosionSpriteArray[explosionPixel], x - GamePanel.camera.x - 10*explosionPixel, - y-10*explosionPixel, length+10*explosionPixel, length+10*explosionPixel, null); + y-10*explosionPixel, spriteLength+10*explosionPixel, spriteLength+10*explosionPixel, null); explosionCounter += 1; } else { erase = true;