From 275f38a4d710f82988945834dc54b0101abc3855 Mon Sep 17 00:00:00 2001
From: Jonathan Hager <jonathan.hager@protonmail.com>
Date: Sun, 3 May 2020 14:41:32 +0200
Subject: [PATCH] ultra AAA GAme

---
 .../dungeoncrawler/control/Controller.java    | 30 +++++++++++--------
 .../com/dungeoncrawler/view/EntitySprite.java |  2 +-
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index 548b8b5..f733a5e 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -118,6 +118,9 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                                         int y = (int) temp.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];
                                         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());
                                             }
                                             else{
-                                                switch(gs.entitySprites[i].getAttackState()){
-                                                    case 0:
-                                                        gs.entitySprites[i].startAttack();
-                                                        break;
-                                                    case 1:
-                                                        break;
-                                                    case 2:
-                                                        d.getCurrentEntities()[i].attack(d.getPlayer());
-                                                        gs.entitySprites[i].resetAttackState();
-                                                        break;
-                                                    default:
+                                                if(d.getCurrentEntities()[i].getId() != 0){
+                                                    switch(gs.entitySprites[i].getAttackState()){
+                                                        case 0:
+                                                            gs.entitySprites[i].startAttack();
+                                                            break;
+                                                        case 1:
+                                                            break;
+                                                        case 2:
+                                                            d.getCurrentEntities()[i].attack(d.getPlayer());
+                                                            gs.entitySprites[i].resetAttackState();
+                                                            break;
+                                                        default:
+                                                    }
                                                 }
                                             }
                                             
@@ -183,11 +188,12 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
 
                                         gs.entitySprites[i] = tempObject;
 
-                                        if(arrow != null){
+                                        if(arrow != null && gs.entitySprites[i].getAttackState() == 2){
                                             for(int k = 5; k < d.getCurrentEntities().length; k++){
                                                 if(d.getCurrentEntities()[k] == null){
                                                     d.getCurrentEntities()[k] = arrow;
                                                     gs.generateNewEntitySprite(arrow, k);
+                                                    gs.entitySprites[i].resetAttackState();
                                                     break;
                                                 }
                                             }
diff --git a/core/src/com/dungeoncrawler/view/EntitySprite.java b/core/src/com/dungeoncrawler/view/EntitySprite.java
index fe848dc..234a7a2 100644
--- a/core/src/com/dungeoncrawler/view/EntitySprite.java
+++ b/core/src/com/dungeoncrawler/view/EntitySprite.java
@@ -61,7 +61,7 @@ public class EntitySprite {
         frames[0] = 0;
         frames[1] = 0;
         
-        if(frames[2] >= 9){
+        if(frames[2] >= 6){
             frames[2] = 0;
             attackState = 2;
         }