diff --git a/core/src/com/zombreros/game/model/GameWorld.java b/core/src/com/zombreros/game/model/GameWorld.java index d01933dda22506af0000fd562a51cfb93789ef06..25c1d1ceb03006a7d989a00473ac6423484fbbe1 100644 --- a/core/src/com/zombreros/game/model/GameWorld.java +++ b/core/src/com/zombreros/game/model/GameWorld.java @@ -26,7 +26,7 @@ public class GameWorld{ private Entity player1; private Entity player2; - private Entity zombie; + //private Entity zombie; private Entity wall; private MovementSystem movsys; @@ -60,7 +60,7 @@ public class GameWorld{ private void initEnteies(){ player1 = new Player( ZombrerosGame.WIDTH/2 + 50, ZombrerosGame.HEIGHT/3 + 50, 0, 1); player2 = new Player(ZombrerosGame.WIDTH/2 - 50, ZombrerosGame.HEIGHT/2, 180, 0); - zombie = new Zombie(0, ZombrerosGame.HEIGHT/2, 10, 0); + //zombie = new Zombie(0, ZombrerosGame.HEIGHT/2, 10, 0); wall = new Wall((float) (ZombrerosGame.WIDTH/2.8), (float) ZombrerosGame.HEIGHT/4); diff --git a/core/src/com/zombreros/game/model/Wave.java b/core/src/com/zombreros/game/model/Wave.java index 827033d06f8a00c8f117129b73c49f66bafbe5a5..2cb34b8c95646b5ece59d48529919a904b1c849f 100644 --- a/core/src/com/zombreros/game/model/Wave.java +++ b/core/src/com/zombreros/game/model/Wave.java @@ -51,7 +51,7 @@ public class Wave { private Stack<Zombie> generateEnemies() { - int enemyNumber = 5 + waveNumber; + int enemyNumber = 5 + 3*waveNumber; Stack<Zombie> enemies = new Stack<>(); for (int i = 0; i < enemyNumber; i++) { enemies.push(zf.create()); diff --git a/core/src/com/zombreros/game/model/ZombieFactory.java b/core/src/com/zombreros/game/model/ZombieFactory.java index 001809e8caa0b4f9e9bb4959fe2a504491f0e53b..46a77ff824214c8a6a806f7c1206cb321a358570 100644 --- a/core/src/com/zombreros/game/model/ZombieFactory.java +++ b/core/src/com/zombreros/game/model/ZombieFactory.java @@ -35,10 +35,11 @@ public class ZombieFactory { int zombieSpeed = 10; Vector2 speed = getSpeedCompnent(xpos,ypos,zombieSpeed); + float rotAngle = speed.angleDeg(); - return new Zombie(xpos,ypos , (int) speed.x, (int) speed.y); + return new Zombie(xpos,ypos , (int) speed.x, (int) speed.y, rotAngle); } diff --git a/core/src/com/zombreros/game/model/entity/Zombie.java b/core/src/com/zombreros/game/model/entity/Zombie.java index 4058f5b51ebf91954a36558b060cfd5071c7fc7d..9ac832e64e6ce692b5666265ebbcbb456c133c59 100644 --- a/core/src/com/zombreros/game/model/entity/Zombie.java +++ b/core/src/com/zombreros/game/model/entity/Zombie.java @@ -10,9 +10,9 @@ import com.zombreros.game.model.component.VelocityComponent; public class Zombie extends Entity { - public Zombie(int x, int y, int vx, int vy) { + public Zombie(int x, int y, int vx, int vy, float rotAngle) { add(new PositionComponent(x, y)); - add(new RotationComponent(0.00f)); + add(new RotationComponent(rotAngle)); add(new VelocityComponent(vx, vy)); add(new TextureComponent(new TextureRegion(new Texture("zombie1.png"))));