From d66c5a77c259c39d30d427f6297ffe8c2eee352a Mon Sep 17 00:00:00 2001
From: GammelJan <jan.ehehalt@gmail.com>
Date: Tue, 14 Apr 2020 12:20:22 +0200
Subject: [PATCH] ULTRA MERGE INCOMING

---
 core/assets/cursor.png                        | Bin 1059 -> 1468 bytes
 .../dungeoncrawler/control/Controller.java    |  26 ++++++++----------
 core/src/com/dungeoncrawler/model/Entity.java |   2 ++
 .../dungeoncrawler/model/entities/Archer.java |   9 ++++--
 .../model/entities/Swordsman.java             |   6 ++--
 .../src/com/dungeoncrawler/view/MainMenu.java |   5 ++++
 6 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/core/assets/cursor.png b/core/assets/cursor.png
index 92230ec7dba15f248ee0624b49184e7a32b51531..4360bb2abb110927092e88eae5b35c06b4c9ae9e 100644
GIT binary patch
delta 1459
zcmV;k1x)&*2)qk_iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<>glR)V
zP)S2WAaHVTW@&6?001bFeUUv#!$2IxUq7T$s#5GA;*g;_Sr8R*lqwd%LTM|s>R@u|
z7c^-|Qd}Gb*Mfr|i&X~~XI&j!1wrrw#L3Y~(M3x9Us7m)5#zyeKi=JY+`R+5%_>t2
z{{*0@rk+m3g<O7B2)x3NegqLlSY(El%q(W%I==4V;p<(DXStvIbM(mtg8?3ac#dhh
zNxVTkvuSFa_lYB{EXu^^#N#?$kob}7lEZJDOE!CXW<<}X=ZPc4LaB?TE@ow2A)Y3V
z%8E+)-kigKGUqMMO0~|~_v9}O71Wgs*J+L*fh8o7f&dA1R8WP97_BNP2GX=2ckvI~
z{uH?+a#g^{v49#Bh_)a64}N!R6sIPgq);5_d9kdIQ6R7jv>KN6eQa5+6TtTjT&W#@
ztqIJ2lHTZO(Ia4B8@RacXwn{VxdRM6X`(LLl8>e|w^#(;&*+=-z~C(qTyuJB@8k3V
z$Wm9!H^9LmFjk`Mb(eSdcK7!0nRb6aB{Xt~PgTv-ks%y^E+YT{E+YYWr9XB6000Mc
zNliru<OB{15(Fkt6Wag)02y>eSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{
z00WdsL_t(o!@ZWzYa2%t$3Lr@=8!Q3ds`1A(2@>rA;J;KAxmvSp$jeUMNsIWEChOT
zFFENCP_Lzbw;W<9^dxc!1bhlH=+J@+>x)p0ab0yx4Ry;HHhbw<P}iUy;vKxUWc{$x
z0ioI5r+pv2_rC89^j_VQ&nsVrUe2FCenj=bef|%KUI4^#3_!HJ_{t%A0yG*8wAMsX
zbT$&*GwC_Ip9p|gZ|?StM6|rfU%T7x`uEKZw}1YB_|aGpul2cKeQWx4j*gB<)0A%>
ze#bPHG)<YCeS=P?!}VFgHTkC7cRC$@*!UUX>rnu_3!Zhu+wTHUsZ;={)oSOAj4^J1
z5;<=afT=+SQcB`DMr)0f5+MY>@8@iiBmqDv#p;vw?kEr!0eJQ1ZZ}$%Xss!i%LpOR
zTEF~%xAi&zLI|w24sIeU=oR7*KKc}`wJXdp3<<*!Yb{|II*^G2WQy3__z?hWElMdD
z0i_gsdwVV#lTradxBB2d*JlOB7z%{~3kwSzA0M;7zmK(+ot+)hG$l<_W@ctE#<2O@
zA0sK@!XgZU!0olx_`Z+t`y@$%Qp!cdT8lA%CZ~vr$S_)7bdDO022x6bAaGS*EEW+$
z@LusYSFTR;&*9(vy4B>9FTNUDjsyFElrmS4*>w~}Xst<-Bo~3~dF|OxLqQBO=mKOQ
zS%@o@ic>?Do=gEk2nX@)_fH4<C=3DU)tkG{`O?yoYfRa))>0~!h@vR><I0zx4V({u
zg<)%@-rU7ni|_l+dDaobFr?LLQLEL6qR7DtAqI~0!YBnBw+~obTXXf0B#Bc6K&ez>
zb#;}Mm6cr2IGHKk%L2IBkVT-;XgHOGVd%cCwYd~YDf>crBl_<K^K-7_2_asF`II7B
zt(G$uLJ$OjD_E^Har?l#3;;m4eD79&4!~NQYg$=4uDvtQpL=bp)hbFUwASZFc3}*F
zTm-UusMTt0ZEd;vaO373u3Vkw#?3ny4ymbe0j#wMA!xN)ZeYdjb$GH)FhA#NBkKwM
z2Gv*qr(c*k&z-8<2gL1z+`Xlx%ggW_z$oLlUmC^&$X-?~7KgGg-@E0e=Gnq_9|yq8
zG;WMx<@1jRI#)_zj5(K<K?jn)YyZVzH9Lw+DS7{G$<)7={TGKh#~<D;p_F2Kdz)wR
zFFj@NG5&Jn`gARvmZ&kNr}ifW;96_e9Z!Q~IX?-zH|}|0B#?35{~xheya808l==Vw
N002ovPDHLkV1ghMpSJ)2

delta 1048
zcmV+z1n2v_3!?}jiBL{Q4GJ0x0000DNk~Le0000S0000W2nGNE00FfaLX)up9DfeP
z000ie0hKEb8vp<R2XskIMF-vk4i7aD_eD?h0000TX;fHrLvL+uWo~o;00000Lvm$d
zbY)~9cWHEJAV*0}P-HG;2LJ#Ahe<?1R7l6QmceTqM-+!YDW*AOOu^pP0|~UGgIkDj
zL~`g-i%{r7i+d3idMFElp4>}L`hNq|Yw4|r7z#Ow90CEKLJT^zpu+khRAXFM9Z^Ho
zGKS4wIu_J5sE2q5tt`b_7Y_){?99$L@6GSMw~%ea)8D1F;wbF-<A>BA+~+c(qd=l4
z0w7#ly)<YB*lM-VS`&uhxTV7}caQfk1S~Y$y@{5FYpeX#+jHaJceY*s`G4bwxu93Z
z#`QPnU*q`rm?TN~=DY8i$C4xoON*~F7!0_vD7Y@)aQ(qxzz^F$1AILTurT4-Fu3y$
z0JT~TfJUQnW|1+*^-n!hm<2dDZ9+;(6h&yQky0Xr!1KJ!nmCRDP)f1!WNSDJbP}-8
zZ1;xYnnY_&wOU08f!6w^HGj<}073|?weBz%Qt2d@eeltzXsw-)f*>FW0<5(JLEymu
z8<;9~XZuG0thFemoP|m$4h{~SwHH+>z_9+{J~tKx#u$plA}cE^oSdA{@At9RvcJDi
zk|ZQa!otD=#u#>f`(q}hP85yr`>wCG#`8Qp&m)dwlv2)OYc0l@jDKP;6c*vys@u5L
zY9Xb>_kE|zQmKRxf_F=IxO#1#e~$j<*WEUseDT$};W0H1rIZ-~rQ<LR(OMJ7amK=Q
zzVYm*S3;*v3;|Mb>atp`=G2<HJ5{I<!a=`%^mOXp#aA4p&}{b{tWv4CM36RXE#-2V
zFbp#<*S`F0YJM%AcYnvtb`NVUp65AOnsI_4pwsElXfz1J&>c<)F}1`MXAxG^J!Erp
z)7@tr$4<2X<#L&gjSbe<*E2DDnv;ilfiAbE7PeX~r{W+8+`qLp<8mqG8E9cf-q2rO
zav4Pk@zQN0itThdZm|#o-}jxswAMu3!$KY)z_5Dnb_Qsz&3`0`)V<f=Ugpn(F7<jH
zr4(9gSHg-pfEf$Z`)o8C?C$Qm{Ce}&U9Mi6=jN@u6O;N}UZAxWAq1UH$0hivy9H0S
z@Ryg|-KH@)p4f8%M>j}enXkU?AyM}*^Q=<I9~NhTdCJkaTXO-^mrJG6OzW%nZo8_I
z3N#O}kj9uXhHdrFKRy?xl)@O3ar2ct7WQ8p)zeQyDJAc{C7Juz(tmN30e$#>8Ko3^
zdwV>Ke#wMif&9&tuhF|44H;uhCiZ42Pv=4b((E$|PVem0jfGk3VJ>ivI?I1}nY;nA
S`;w0U0000<MNUMnLSTaTK<h{V

diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index ed43d65..a3075bd 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -98,8 +98,8 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
         //PASSIERT IN GAMESCREEN
         if(m != null){
         //ENTITIES
-            d.getPlayer().setxPos(m.getPlayerSpriteX());
-            d.getPlayer().setyPos(m.getPlayerSpriteY());
+            //d.getPlayer().setxPos(m.getPlayerSpriteX());
+            //d.getPlayer().setyPos(m.getPlayerSpriteY());
 
             if(v == null){
                 // Position des Players, etc. werden aktualisiert
@@ -179,13 +179,15 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                 switch(ent.getId()){
                     case 0:
                         e[i] = new Archer(x,y,lvl);
+                        e[i].startT();
                         m.newEntity(i,ent,x,y);
-                        i = 10;
+                        i = 11;
                         break;
                     case 1:
                         e[i] = new Swordsman(x,y,lvl);
+                        e[i].startT();
                         m.newEntity(i,ent,x,y);
-                        i = 10;
+                        i = 11;
                         break;
                 }
             }
@@ -237,17 +239,11 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                     else if(v.click() == 0){
                         v = null;
                         m = new GameScreen(d);
-                        Archer a = new Archer(0,0,0);
-                        newEntity(a,96,96,0);
-                        Archer w = new Archer(0,0,0);
-                        newEntity(w,96,144,0);
-                        Swordsman s = new Swordsman(0,0,0);
-                        newEntity(s,288,96,0);
-                        Swordsman p = new Swordsman(0,0,0);
-                        newEntity(p,288,144,0);
-                        Swordsman q = new Swordsman(0,0,0);
-                        newEntity(q,48,144,0);
-                        System.out.println("NICE");
+                        newEntity(new Archer(0,0,0),96,96,0);
+                        newEntity(new Archer(0,0,0),96,144,0);
+                        newEntity(new Swordsman(0,0,0),288,96,0);
+                        newEntity(new Swordsman(0,0,0),288,144,0);
+                        newEntity(new Swordsman(0,0,0),48,144,0);
                     }
                     }
                 }
diff --git a/core/src/com/dungeoncrawler/model/Entity.java b/core/src/com/dungeoncrawler/model/Entity.java
index e753c0f..36f90cb 100644
--- a/core/src/com/dungeoncrawler/model/Entity.java
+++ b/core/src/com/dungeoncrawler/model/Entity.java
@@ -147,6 +147,8 @@ public abstract class Entity {
     public void setFacing(int facing){
         this.facing = facing;
     }
+    public void startT(){
+    }
     
     
     
diff --git a/core/src/com/dungeoncrawler/model/entities/Archer.java b/core/src/com/dungeoncrawler/model/entities/Archer.java
index 155cd55..1f0636a 100644
--- a/core/src/com/dungeoncrawler/model/entities/Archer.java
+++ b/core/src/com/dungeoncrawler/model/entities/Archer.java
@@ -74,7 +74,7 @@ public class Archer extends Entity{
                             }
                         }
                         else{
-                            facing = 2;
+                            //facing = 2;
                         }
                     }
         },0,1f);
@@ -140,7 +140,7 @@ public class Archer extends Entity{
                     }
         },0,0.02f);
         tleft.stop();
-        t.start();
+        
     }
     
     private void setIsRunning(boolean n){
@@ -157,7 +157,10 @@ public class Archer extends Entity{
     public void setTimerRuns(int n){
         timerRuns = n;
     }
-    
+    @Override
+    public void startT(){
+        t.start();
+    }
     
     
 }
diff --git a/core/src/com/dungeoncrawler/model/entities/Swordsman.java b/core/src/com/dungeoncrawler/model/entities/Swordsman.java
index a0f93be..d7ef489 100644
--- a/core/src/com/dungeoncrawler/model/entities/Swordsman.java
+++ b/core/src/com/dungeoncrawler/model/entities/Swordsman.java
@@ -137,7 +137,6 @@ public class Swordsman extends Entity {
                     }
         },0,0.03f);
         tleft.stop();
-        t.start();
     }
     
     private void setIsRunning(boolean n){
@@ -154,6 +153,9 @@ public class Swordsman extends Entity {
     public void setTimerRuns(int n){
         timerRuns = n;
     }
-    
+    @Override
+    public void startT(){
+        t.start();
+    }
     
 }
diff --git a/core/src/com/dungeoncrawler/view/MainMenu.java b/core/src/com/dungeoncrawler/view/MainMenu.java
index 5f8ea52..39e927b 100644
--- a/core/src/com/dungeoncrawler/view/MainMenu.java
+++ b/core/src/com/dungeoncrawler/view/MainMenu.java
@@ -2,6 +2,7 @@ package com.dungeoncrawler.view;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.Sprite;
@@ -41,6 +42,10 @@ public class MainMenu{
                 button.setX(wc - (button.getWidth()/2));
                 button.setY(400);
                 
+                Pixmap pm = new Pixmap(Gdx.files.internal("cursor.png"));
+                Gdx.graphics.setCursor(Gdx.graphics.newCursor(pm, 0, 0));
+                pm.dispose();
+                
                 //ENTITIES
                 
                 //CURSOR