Dead enemies dont kill

master
Chara1236 2022-06-11 23:48:57 -04:00
parent deed563819
commit f7b071b624
4 changed files with 16 additions and 9 deletions

View File

@ -7,11 +7,12 @@ public class BombDirectionShow extends StickyBomb{
} }
public void draw(Graphics g){ public void draw(Graphics g){
update();
isMove = true; isMove = true;
int loopCounter = 0; int loopCounter = 0;
while(isMove&&loopCounter<10) { while(isMove&&loopCounter<10) {
super.move(); super.move();
if(isMove) { if(isMove&&canUpdate(0,0)) {
g.drawRect(x - GamePanel.camera.x + Player.PLAYER_WIDTH / 2, y + Player.PLAYER_HEIGHT / 2, 2, 2); g.drawRect(x - GamePanel.camera.x + Player.PLAYER_WIDTH / 2, y + Player.PLAYER_HEIGHT / 2, 2, 2);
} }
loopCounter++; loopCounter++;

View File

@ -241,7 +241,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener{
for (NonPlayer n: enemy) { for (NonPlayer n: enemy) {
n.update(); n.update();
n.isGrounded = false; n.isGrounded = false;
if(n.collidePlayer(player)){ if(n.collidePlayer(player)&&!n.isDead){
player.alive = false; player.alive = false;
} }
} }
@ -295,6 +295,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener{
throw new RuntimeException(e); throw new RuntimeException(e);
} }
checkCollision(); checkCollision();
updateEnemy();
try { try {
updateParticle(); updateParticle();
} catch (IOException e) { } catch (IOException e) {
@ -312,6 +313,16 @@ public class GamePanel extends JPanel implements Runnable, KeyListener{
} }
} }
public void updateEnemy(){
for(int i=0; i<enemy.size(); i++){
if(enemy.get(i).isDead){
enemy.get(i).fadeCounter--;
if(enemy.get(i).fadeCounter<=0){
enemy.remove(i);
}
}
}
}
public void updateParticle() throws IOException { public void updateParticle() throws IOException {
for(Tile t: particleTiles){ for(Tile t: particleTiles){
if(GlobalState.randInt(1,10)==1) { if(GlobalState.randInt(1,10)==1) {

View File

@ -36,7 +36,7 @@ public class NonPlayer extends GenericSprite {
HEIGHT = npcHeight; HEIGHT = npcHeight;
xVelocity = 3; xVelocity = 3;
fadeCounter = GlobalState.second*3;; fadeCounter = 100;;
} }

View File

@ -64,12 +64,7 @@ public class StickyBomb extends GenericSprite{
if(eHypo<200){ if(eHypo<200){
GamePanel.enemy.get(i).isDead = true; GamePanel.enemy.get(i).isDead = true;
} }
if(GamePanel.enemy.get(i).isDead){
GamePanel.enemy.get(i).fadeCounter--;
if(GamePanel.enemy.get(i).fadeCounter<=0){
GamePanel.enemy.remove(i);
}
}
} }
} }