playerAttack refactored

master
Jonathan Hager 6 years ago
parent b0572501a4
commit 7af64d1eef

@ -455,42 +455,23 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
} }
else if(player.getAttackState() == 2){ else if(player.getAttackState() == 2){
if(attackDirection== 0){ Rectangle collision = new Rectangle(0, 0, gs.player.getCollisionSprite().getWidth(), gs.player.getFullCollisionSprite().getHeight());
Texture attackTexture = new Texture("sprites/AttackVert.png");
Sprite attackSprite = new Sprite(attackTexture); if(attackDirection == 0){
attackSprite.setX(p.getxPos() - 32f); collision.setPosition(p.getxPos() - 32f, p.getyPos());
attackSprite.setY(p.getyPos() - 8f);
for(int i = 0; i < e.length ; i++){
if(entitySprites[i] != null){
if(Intersector.overlaps(entitySprites[i].getCollisionSprite(), attackSprite.getBoundingRectangle())){
if(e[i] != null){
if(e[i].getHp() - p.getDmg() <= 0){
e[i].setToDelete(true);
}
else{
e[i].setHp(e[i].getHp() - p.getDmg());
}
}
}
}
}
} }
else if(attackDirection== 1){ else if(attackDirection== 1){
Texture attackTexture = new Texture("sprites/AttackVert.png"); collision.setPosition(p.getxPos() + 32f, p.getyPos());
Sprite attackSprite = new Sprite(attackTexture); }
attackSprite.setX(p.getxPos()+ 32f);
attackSprite.setY(p.getyPos()- 2f); for(int i = 0; i < e.length ; i++){
for(int i = 0; i< e.length ; i++){ if(entitySprites[i] != null && e[i] != null){
if(entitySprites[i] != null){ if(Intersector.overlaps(entitySprites[i].getCollisionSprite(), collision)){
if(Intersector.overlaps(entitySprites[i].getCollisionSprite(), attackSprite.getBoundingRectangle())){ if(e[i].getHp() - p.getDmg() <= 0){
if(e[i] != null){ e[i].setToDelete(true);
if(e[i].getHp() - p.getDmg() <= 0){ }
e[i].setToDelete(true); else{
} e[i].setHp(e[i].getHp() - p.getDmg());
else{
e[i].setHp(e[i].getHp() - p.getDmg());
}
}
} }
} }
} }

Loading…
Cancel
Save