diff --git a/src/main/Controller.java b/src/main/Controller.java index d2a64b3..ee54730 100644 --- a/src/main/Controller.java +++ b/src/main/Controller.java @@ -34,6 +34,10 @@ public class Controller { } } + + + + public void createSD(int SDcount){ for(int n = 0; n < SDcount; n++){ addEntity(new StarDestroyer(810, r.nextInt(400), skin, this, game)); diff --git a/src/main/EnemyFighter.java b/src/main/EnemyFighter.java index 99b5846..f2f6f3e 100644 --- a/src/main/EnemyFighter.java +++ b/src/main/EnemyFighter.java @@ -26,6 +26,10 @@ public class EnemyFighter extends GameObject implements EntityTypeB{ return x; } public void shoot(){ + if (x <= -32 ){ + controller.removeEntity(this); + game.setTieKills(game.getTieKills()+1); + } if(is_shooting == 0){ controller.addEntity(new EnemyLaser(x, y, skin, game)); is_shooting++; @@ -47,7 +51,8 @@ public class EnemyFighter extends GameObject implements EntityTypeB{ if(GamePhysics.Collision(this, tempa)){ controller.removeEntity(this); controller.removeEntity(tempa); - game.setKills(game.getKills()+1); + game.setTieKills(game.getTieKills()+1); + game.setScore(game.getScore()+10); } } } diff --git a/src/main/Player.java b/src/main/Player.java index 812c0b9..e635964 100644 --- a/src/main/Player.java +++ b/src/main/Player.java @@ -43,7 +43,9 @@ public class Player extends GameObject implements EntityTypeA{ EntityTypeD tempa = game.ed.get(n); if(GamePhysics.Collision(this, tempa)){ if(health == 1){ - controller.removeEntity(this);} + game.State = game.State.END; + health = 3; + } else{ health--; controller.removeEntity(tempa); @@ -78,5 +80,8 @@ public class Player extends GameObject implements EntityTypeA{ public Rectangle getBounds(){ return new Rectangle((int)x, (int) y, 64, 64); } + public int getHealth(){ + return health; + } } diff --git a/src/main/Player2.java b/src/main/Player2.java index f073735..dc98060 100644 --- a/src/main/Player2.java +++ b/src/main/Player2.java @@ -43,7 +43,10 @@ public class Player2 extends GameObject implements EntityTypeA{ EntityTypeD tempa = game.ed.get(n); if(GamePhysics.Collision(this, tempa)){ if(health == 1){ - controller.removeEntity(this);} + controller.removeEntity(this); + game.State = game.State.END; + health = 4; + } else{ health--; controller.removeEntity(tempa); diff --git a/src/main/StarDestroyer.java b/src/main/StarDestroyer.java index 446baae..32b1919 100644 --- a/src/main/StarDestroyer.java +++ b/src/main/StarDestroyer.java @@ -28,6 +28,10 @@ public class StarDestroyer extends GameObject implements EntityTypeC{ } public void tick(){ + if (x <= -100 ){ + controller.removeEntity(this); + game.setTieKills(game.getTieKills()+1); + } x -= speed; shoot(); for(int n = 0; n < game.ea.size(); n++){ @@ -36,6 +40,8 @@ public class StarDestroyer extends GameObject implements EntityTypeC{ if(GamePhysics.Collision(this, tempa)){ if(health ==1) {controller.removeEntity(this); + game.setSDKills(game.getSDKills()+1); + game.setScore(game.getScore()+100); } else{health--;} controller.removeEntity(tempa);