diff --git a/core/assets/sprites/AttackHori.png b/core/assets/sprites/AttackHori.png index 3361a85..67d5bd9 100644 Binary files a/core/assets/sprites/AttackHori.png and b/core/assets/sprites/AttackHori.png differ diff --git a/core/assets/sprites/AttackVert.png b/core/assets/sprites/AttackVert.png index cc44dc5..e424aab 100644 Binary files a/core/assets/sprites/AttackVert.png and b/core/assets/sprites/AttackVert.png differ diff --git a/core/assets/sprites/torch.png b/core/assets/sprites/torch.png new file mode 100644 index 0000000..4601909 Binary files /dev/null and b/core/assets/sprites/torch.png differ diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index e16157b..2e7af6f 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -309,7 +309,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ if(keycode == Input.Keys.E){ if(v != null){} if(m != null){ - d.setCurrentEntities(m.playerAttack(d.getCurrentEntities(), d.getPlayer())); + d.setCurrentEntities(m.playerAttack(d.getCurrentEntities(), d.getPlayer(), batch)); } } diff --git a/core/src/com/dungeoncrawler/model/Entity.java b/core/src/com/dungeoncrawler/model/Entity.java index f0b5434..a2ffdaf 100644 --- a/core/src/com/dungeoncrawler/model/Entity.java +++ b/core/src/com/dungeoncrawler/model/Entity.java @@ -66,19 +66,19 @@ public abstract class Entity { } public int direction(){ // returns direction the entity is facing depending on its movement - if(movementX < 0f){ // TIS IS SHIT - NEED REWORK - return 3; + if(movementX == -3f){ // TIS IS SHIT - NEED REWORK + facing = 3; } - else if(movementX < 3f){ - return 1; + else if(movementX == 3f){ + facing = 1; } - else if(movementY > 3f){ - return 0; + else if(movementY == 3f){ + facing = 0; } - else if(movementY < -3f){ - return 2; + else if(movementY == -3f){ + facing = 2; } - return -1; + return facing; } diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index 89ef623..0feab51 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/core/src/com/dungeoncrawler/view/GameScreen.java @@ -234,15 +234,16 @@ public class GameScreen { - public Entity[] playerAttack(Entity e[], Player p){ + public Entity[] playerAttack(Entity e[], Player p, SpriteBatch batch){ if(p.direction() == 0){ - Texture verticalAttack = new Texture("sprites/AttackVert.png"); - Sprite verticalAttackSprite = new Sprite(verticalAttack); - verticalAttackSprite.setX(p.getxPos()-2f); - verticalAttackSprite.setY(p.getyPos()-2f); + Texture attackTexture = new Texture("sprites/AttackHori.png"); + Sprite attackSprite = new Sprite(attackTexture); + attackSprite.setX(p.getxPos() - 8f); + attackSprite.setY(p.getyPos() + 32f); + for(int i = 0; i< e.length ; i++){ if(e[i] != null){ - if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), verticalAttackSprite.getBoundingRectangle())){ + if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), attackSprite.getBoundingRectangle())){ if(e[i] != null){ if(e[i].getHp() - p.getDmg() <= 0){ e[i] = null; @@ -256,13 +257,13 @@ public class GameScreen { } } else if(p.direction() == 1){ - Texture horizontalAttack = new Texture("sprites/AttackHori.png"); - Sprite horizontalAttackSprite = new Sprite(horizontalAttack); - horizontalAttackSprite.setX(p.getxPos()-2f); - horizontalAttackSprite.setY(p.getyPos()-2f); + Texture attackTexture = new Texture("sprites/AttackVert.png"); + Sprite attackSprite = new Sprite(attackTexture); + attackSprite.setX(p.getxPos()+ 32f); + attackSprite.setY(p.getyPos()- 2f); for(int i = 0; i< e.length ; i++){ if(entitySprites[i] != null){ - if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), horizontalAttackSprite.getBoundingRectangle())){ + if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), attackSprite.getBoundingRectangle())){ if(e[i] != null){ if(e[i].getHp() - p.getDmg() <= 0){ e[i] = null; @@ -276,13 +277,13 @@ public class GameScreen { } } else if(p.direction() == 2){ - Texture verticalAttack = new Texture("sprites/AttackVert.png"); - Sprite verticalAttackSprite = new Sprite(verticalAttack); - verticalAttackSprite.setX(p.getxPos()-2f); - verticalAttackSprite.setY(p.getyPos() - 24f-2f); + Texture attackTexture = new Texture("sprites/AttackHori.png"); + Sprite attackSprite = new Sprite(attackTexture); + attackSprite.setX(p.getxPos() - 8f); + attackSprite.setY(p.getyPos()); for(int i = 0; i