ultra AAA GAme

master
Jonathan Hager 6 years ago
parent bde01700b7
commit 275f38a4d7

@ -118,6 +118,9 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
int y = (int) temp.getyPos(); int y = (int) temp.getyPos();
Entity arrow = d.getCurrentEntities()[i].move((int) d.getPlayer().getxPos(), (int) d.getPlayer().getyPos()); Entity arrow = d.getCurrentEntities()[i].move((int) d.getPlayer().getxPos(), (int) d.getPlayer().getyPos());
if(arrow != null && gs.entitySprites[i].getAttackState() == 0){
gs.entitySprites[i].startAttack();
}
EntitySprite tempObject = gs.entitySprites[i]; EntitySprite tempObject = gs.entitySprites[i];
tempObject.update((int) temp.getxPos(), (int) temp.getyPos()); tempObject.update((int) temp.getxPos(), (int) temp.getyPos());
@ -132,17 +135,19 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
d.getCurrentEntities()[i].attack(d.getPlayer()); d.getCurrentEntities()[i].attack(d.getPlayer());
} }
else{ else{
switch(gs.entitySprites[i].getAttackState()){ if(d.getCurrentEntities()[i].getId() != 0){
case 0: switch(gs.entitySprites[i].getAttackState()){
gs.entitySprites[i].startAttack(); case 0:
break; gs.entitySprites[i].startAttack();
case 1: break;
break; case 1:
case 2: break;
d.getCurrentEntities()[i].attack(d.getPlayer()); case 2:
gs.entitySprites[i].resetAttackState(); d.getCurrentEntities()[i].attack(d.getPlayer());
break; gs.entitySprites[i].resetAttackState();
default: break;
default:
}
} }
} }
@ -183,11 +188,12 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
gs.entitySprites[i] = tempObject; gs.entitySprites[i] = tempObject;
if(arrow != null){ if(arrow != null && gs.entitySprites[i].getAttackState() == 2){
for(int k = 5; k < d.getCurrentEntities().length; k++){ for(int k = 5; k < d.getCurrentEntities().length; k++){
if(d.getCurrentEntities()[k] == null){ if(d.getCurrentEntities()[k] == null){
d.getCurrentEntities()[k] = arrow; d.getCurrentEntities()[k] = arrow;
gs.generateNewEntitySprite(arrow, k); gs.generateNewEntitySprite(arrow, k);
gs.entitySprites[i].resetAttackState();
break; break;
} }
} }

@ -61,7 +61,7 @@ public class EntitySprite {
frames[0] = 0; frames[0] = 0;
frames[1] = 0; frames[1] = 0;
if(frames[2] >= 9){ if(frames[2] >= 6){
frames[2] = 0; frames[2] = 0;
attackState = 2; attackState = 2;
} }

Loading…
Cancel
Save