From aadc0d8516d0a0d93ebf3c97a6eb6fd2a13c8c04 Mon Sep 17 00:00:00 2001
From: GammelJAN <jan.ehehalt@gmail.com>
Date: Mon, 4 May 2020 10:28:04 +0200
Subject: [PATCH] faniuw

---
 core/assets/sprites/arrow.png                   | Bin 769 -> 790 bytes
 .../com/dungeoncrawler/control/Controller.java  |   9 +++++----
 .../dungeoncrawler/model/entities/Archer.java   |   4 ++--
 .../src/com/dungeoncrawler/view/GameScreen.java |  16 +++++++++-------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/core/assets/sprites/arrow.png b/core/assets/sprites/arrow.png
index c83789753cca1586a20bf51f36d94eff6cfa7262..33574a775ccc76d08bc93cb3a846b44f65d6c265 100644
GIT binary patch
delta 781
zcmV+o1M>WV29^eYiBL{Q4GJ0x0000DNk~Le0004K0000F2nGNE0Lf!jg8%>lg=s@W
zP)S2WAaHVTW@&6?001bFeUUv#!$2IxU(=R~R2(cK;t-)aSr8R*lqwd%LTM|s>R@u|
zhtQ-UNpW!$Tni3<ELI&{oON|@6$HT#5GO|`MHeaYe@UT#MT`f>{djlparX`o8WpCR
zfpI|9EF+zWi@E%Y7<xqz0faD&eu<fSGP96{=lHsZkFR$zp5=Y+&(Wh4Oa}Nw;#sB}
z7V$dq^roeA-Y1T*vZN576OS2mLE=ZQ%PzlhE;%gl%!rXq&k;w6#Zm{$9n8vxN<2jz
zRaA}gg`CTO3g<1(YNf_n_v9}O7qsOJ*J%zRfkh;df(RKkY@h-QF<LcJOr&W)?%^MF
z{3&wD<k|ou$2_V~Avu2VKlt6PS)813lfrQz_+r~1BS2^uXx44}``EUdCxHJMxYFAG
zY6F=0B)#6&qDMgQHgIv>*5p0lat9cA(j`N3BtK1mp;!do&*+=-K;JFUz3TSX+Q;bw
zkfpAcZh(VBV6;TpYaZ|J>g?^`Gp+u906Tedkrjq6#sB~S24YJ`L;xrN6#xSK5#J2}
z000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm3=2m&2hptSG+000?uMObu0Z*6U5
zZgc>X-2oVX?MXyIRCwC$)-g`QFc?7LXM}`VA}-PmMlO?yF-ye24Qi>%1;}N%5L?rQ
zze5rNw4DkpeczNglKqsy`azN;Ns=T<k|aseMM*s5ASW0C0!Z-rJ_Oud!P_>Sdr;r^
z@pG-N>%)ERvBw^J?3pfTfcqTmro*=ZyBMQ#THb$uDXi<d0H~_!beui**kg}9;{{zx
ziP!b>zm4rrFPoF!nx;wi*kg}9_RJIX<83fZ6ZbsM^Eab?DJ71rw{5%ZZI3<n*kcdZ
ztZv4boZ$Uq3HkaAXU7~1`Sw$0_Sj>OJ@!bFBuSDaNs=T<x<q^H?2&Fe7I3Hl0000<
LMNUKnu0mjfd^cKh

delta 744
zcmV<E0vG+327v~DiBL{Q4GJ0x0000DNk~Le0002A000092nGNE0GpWxnE(I*i)lkc
zP)A8kP#|J;X>4>YX>K5MQb$4n04R}tkv&MmKpe$iQ%j3fMC>5qkfAzR5G~>;RV;#q
z(pG5I!Q|2}XktiGTpR`0f`cE6RR<SmT^(EnLGS~_$<axF(M3x9Us7lh<H2!1-ralL
zy#s`1jj3kO1fXh`kx3@Rd|^clz9IlW1`tAAVy2$TF67`jzV6}U>s^dzd7t}p^eIJ?
z0X~s<mg$B?yiPp5Y3ZEzi6g8cDa7Z*;|5)j_>t?f%Ws^^4huXpV&pP&#1Ue#+{JPi
zvx=b-$BCnVimFk*kat<(yv13q)mi(V{DtA7ww&cU%@HKAh!oNgA)}5eYOoNaRU^ej
zhV~O4{$a<TCYMaEDi}HDu>lp5;|KqP-`$#}sYy2}oB#qZw*4^*1b2Z}!?wSVZM$^>
z_@99*t>fQl0yCeaH#%DM2<YDiF0MP8ya!zF07Fkux@1U><fkc=O2GRWeNzD#yajq!
z-QL>!IDG(e)YZ}raBv8Wl_`78<K3a|-u^w)?(YX)KXRV}ZeQ&H000SaNLh0L04^f{
z04^f|c%?sflk5Q~fA>j5K~z|U?bbg^#6T2)@$bzLl}zOcEG)c(osF<JNFyXC@d}>6
z#3B+{Z(!>&wz0Jk#6LL3%(GaGE~HP2_rbsnJbu*-3|N+BS<6gV1tmCm`i9`P>+V&i
zhP$rQ-+fUOyEEpPvj9f`j?RyjTp$NNfE*rgH<MV~w(7kff6xCxbIh6Bk=0420Gns{
z>=jJ|;yjuL4l)_{ad2oF0Jyqd6Jx}Ck8_Tc5;vC@m}Ab|&i3}71tkc)E5roB!~NUj
z%V?TLvn&Ik?|aI!{F^h!oS7ZrbWeFv*cXTjhXM~@lSp0H<KLyKs@)lL%vpkCS(arj
av>%H9#v5n{4)q=Y0000<MNUMnLSTYaM^E+u

diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index d4a89db..967cdcf 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -200,6 +200,8 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                                             for(int k = 5; k < d.getCurrentEntities().length; k++){
                                                 if(d.getCurrentEntities()[k] == null){
                                                     Entity arrow = d.getCurrentEntities()[i].shoot((int) d.getPlayer().getxPos(), (int) d.getPlayer().getyPos());
+                                                    arrow.setxPos(d.getCurrentEntities()[i].getxPos() + 32);
+                                                    arrow.setyPos(d.getCurrentEntities()[i].getyPos() + 32);
                                                     d.getCurrentEntities()[k] = arrow;
                                                     gs.generateNewEntitySprite(arrow, k);
                                                     gs.entitySprites[i].resetAttackState();
@@ -491,12 +493,10 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                     }
                 }
                 if(keycode == Input.Keys.ESCAPE){
-                    if(gs != null && gs.getIsLoading() == false){
+                    if(gs != null && gs.getIsLoading() == false && isPaused == false){
                         stop();
                     }
-                }
-                if(keycode == Input.Keys.TAB){
-                    if(gs != null && gs.getIsLoading() == false){
+                    else if(gs != null && gs.getIsLoading() == false && isPaused == true){
                         resume();
                     }
                 }
@@ -684,6 +684,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
         gs.resume();
         
         ps = null;
+        gs.startLoadingScreen();
     }
     
 }
diff --git a/core/src/com/dungeoncrawler/model/entities/Archer.java b/core/src/com/dungeoncrawler/model/entities/Archer.java
index 808fbb2..6747422 100644
--- a/core/src/com/dungeoncrawler/model/entities/Archer.java
+++ b/core/src/com/dungeoncrawler/model/entities/Archer.java
@@ -110,8 +110,8 @@ public class Archer extends Entity{
             }
         }
         Arrow a = new Arrow(this.xPos, this.yPos, this.lvl, 0);
-        movementX = (int) (5 * Math.cos(alpha));
-        movementY = (int) (5 * Math.sin(alpha));
+        movementX = (int) (7 * Math.cos(alpha));
+        movementY = (int) (7 * Math.sin(alpha));
 
         a.setMovementX(movementX);
         a.setMovementY(movementY);
diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java
index fa46a64..6d7fd9b 100644
--- a/core/src/com/dungeoncrawler/view/GameScreen.java
+++ b/core/src/com/dungeoncrawler/view/GameScreen.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 
 public class GameScreen {
     
+    
         //PLAYER
         Texture p;
         EntitySprite player;
@@ -77,6 +78,7 @@ public class GameScreen {
                 controls.setY(0);
                 */
                 
+                
                 entities = d.getCurrentEntities();
             
                 //PLAYER
@@ -215,8 +217,9 @@ public class GameScreen {
             }
 
             //MAP
-            tmr.setView(camera);
-            tmr.render();
+                tmr.setView(camera);
+            
+                tmr.render();
             
             camera.zoom = 700f; // Standart 700f
 
@@ -224,7 +227,7 @@ public class GameScreen {
             batch.setProjectionMatrix(camera.combined);
             
             updateEntitySprites(e);
-            
+        
             //BATCH
             batch.begin();
 
@@ -291,10 +294,10 @@ public class GameScreen {
                 }
                 if(e.getId() == 2){
                     tx[0] = new Texture("sprites/arrow.png");
-                    entitySprites[i] = new EntitySprite(tx, 18, 9);
+                    entitySprites[i] = new EntitySprite(tx, 36, 15);
                 }
 
-                entitySprites[i].update((int) e.getxPos(), (int) e.getyPos());
+                entitySprites[i].update((int) e.getxPos() + 32, (int) e.getyPos() + 32);
                 
                 if(e.getId() == 2){
                     entitySprites[i].getSprites()[0].setRotation((float) Math.toDegrees(e.getAngle()));
@@ -427,12 +430,11 @@ public class GameScreen {
         public void stop(){
             animations.stop();
             animatePlayer.stop();
-            camera = null;
+            
         }
         public void resume(){
             animations.start();
             animatePlayer.start();
-            
         }
        
 }