diff --git a/src/main/Controller.java b/src/main/Controller.java index ee54730..081e081 100644 --- a/src/main/Controller.java +++ b/src/main/Controller.java @@ -37,7 +37,6 @@ 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 f2f6f3e..f80a317 100644 --- a/src/main/EnemyFighter.java +++ b/src/main/EnemyFighter.java @@ -55,6 +55,7 @@ public class EnemyFighter extends GameObject implements EntityTypeB{ game.setScore(game.getScore()+10); } } + } public void render(Graphics g){ g.drawImage(skin.enemy1, (int)x, (int)y, null); diff --git a/src/main/MouseInput.java b/src/main/MouseInput.java index 45db040..9a314d0 100644 --- a/src/main/MouseInput.java +++ b/src/main/MouseInput.java @@ -50,6 +50,12 @@ public class MouseInput implements MouseListener{ Game.padraicmode = true; Game.State = Game.STATE.GAME; } + else if(mx >= 0 && mx <= 40 && my >= 0 && my <= 40) + { + Game.numberOfPlayers = 2; + Game.padraicmode = true; + Game.State = Game.STATE.GAME; + } } } diff --git a/src/main/Player.java b/src/main/Player.java index e635964..4ae2c7f 100644 --- a/src/main/Player.java +++ b/src/main/Player.java @@ -44,7 +44,7 @@ public class Player extends GameObject implements EntityTypeA{ if(GamePhysics.Collision(this, tempa)){ if(health == 1){ game.State = game.State.END; - health = 3; + health = 4; } else{ health--; diff --git a/src/main/Player2.java b/src/main/Player2.java index dc98060..7ab53d6 100644 --- a/src/main/Player2.java +++ b/src/main/Player2.java @@ -45,7 +45,7 @@ public class Player2 extends GameObject implements EntityTypeA{ if(health == 1){ controller.removeEntity(this); game.State = game.State.END; - health = 4; + health = 5; } else{ health--; diff --git a/src/main/StarDestroyer.java b/src/main/StarDestroyer.java index 32b1919..c86eed3 100644 --- a/src/main/StarDestroyer.java +++ b/src/main/StarDestroyer.java @@ -48,6 +48,7 @@ public class StarDestroyer extends GameObject implements EntityTypeC{ } } + } public void shoot(){ if(is_shooting == 0){