From 21a6e1e9732c18a63b982f32268ebfcb481d9105 Mon Sep 17 00:00:00 2001
From: GammelJan <jan.ehehalt@gmail.com>
Date: Tue, 14 Apr 2020 11:15:40 +0200
Subject: [PATCH] five moving entities || no collision detection

---
 core/assets/archer.png                        | Bin 1003 -> 2471 bytes
 core/assets/player.png                        | Bin 0 -> 1415 bytes
 core/assets/swordsman.png                     | Bin 0 -> 1404 bytes
 .../dungeoncrawler/control/Controller.java    |   6 +++
 core/src/com/dungeoncrawler/model/Entity.java |   9 ++++
 .../dungeoncrawler/model/entities/Archer.java |  33 ++++++------
 .../model/entities/Swordsman.java             |  26 +++++-----
 .../com/dungeoncrawler/view/GameScreen.java   |  47 ++++++++++++------
 8 files changed, 78 insertions(+), 43 deletions(-)
 create mode 100644 core/assets/player.png
 create mode 100644 core/assets/swordsman.png

diff --git a/core/assets/archer.png b/core/assets/archer.png
index f1c0712b084263fce5ce8a8a55b7b742c01df95e..b35e6e962a75c26d5942571af85cfbe40c2e53b5 100644
GIT binary patch
delta 2393
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
LNkvXXu0mjfWg0K<

delta 886
zcmZ23{F+_0Gr-TCmrII^fq{Y7)59f*fq@aoWN_eM1Cn23SMCD}v`kc0kde9Nctp{;
zbd!SCBaKj<rq)Yg8CMTJxul<QX~L3;iCXn*rGn2MU|EngZK9{zk($I%o_$IU3Qir0
zN`}Gysp7>SWa7Vn`1n=t+~z&!|5~z5S#*+NzK6~6lEX^(6z1LBQgZJ1k-)HtB9Dq6
z6*lX6{5es2^Qrl{)OOZ+lBPv7D<5fWjChy0vpw=?K<Dz#<gQhL`zDk}KHPIOa;<5^
z^Lc+-AJ#A0HtDI=SwWSJEh3i$6c;yYWo-~x9;$rQrR|%r+`q)*^VO#NtkaUP6boqQ
zI{C5r|H1cpXD?k@GF!xtp;mv}UqddI^2V~u+xGY8?yhC}F~3oJ?d$d18*chvnjNcK
z#=?`wEPg%K_a3uedBZ~WSR)npPnSi!R3H59*|(CxC9m<HmFf2F=j{CC8)Qni)-cP+
zFeRs+iu+zszGD0K`tv2felt3=6is>lcYhQxSlN=i-CY<0L9kb;;^E{Yj0zm=9M;kk
zCrK$ze#59<&v@9=#WAGf*4w**lNcR&*b<tREfytPF4ESRC$e-(Qq`9wliydzTW>mf
zKl69Ot&#$ZckA~5JM*(-<|4c3km9UqFaQ4EoEG_dOTSgX`?%%d8a=NH?!;d0SjTw5
zSTeqTdYU-Xwj*Y@r!86&JA>o=g2bzv&aeq=l{kO?>6gu%8wwced!{sfPrv%d;;;02
z2IciP*0HZ+%DOJV5Xq&$(!yXL!)RpIlg;S#xtmwvxAgidsas4xBp9Z?I~{5-Ex`2Z
ziy6b5u7Dcm3E%GNGcm0B&&1%{$G~t<1DKE+F7q)ma4_UBW+{Tw83%&{!-IFH4b*%Y
z%z#V=CI$h91_lO}dIklUG*qnN!>ankHAsS9EB-hxU|^62t8Cc4J_=-3gD%*R<+4l+
zjtk_N8hCv5SaKLRSQP^{h*j6;#Yyi!WbVdoBi(R$?TdmH2M>oRzMXmh#>`*I=K|8_
z^Gi28)Gri@`kBiR!?d7~!|lyfRW|$2Jsb>&=NBnVv-`ODT<3o#iGRzkcbiCDtC42V
z<~=s6_Dc2#<8xgM27eCoo}Q&%yRA}?q0Row2bY-F#%Is)Dpfy^WE5ipI+TII)78&q
Iol`;+0Q<gd9RL6T

diff --git a/core/assets/player.png b/core/assets/player.png
new file mode 100644
index 0000000000000000000000000000000000000000..1554e76bd63b00f3dc555c6caaea62487fa22c7a
GIT binary patch
literal 1415
zcmV;21$g?2P)<h;3K|Lk000e1NJLTq006)M001xu1^@s6M^1Gf0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@Kj}9oj)eFhg~+AS&W0RV;#q(pG5I!Q|2}Xws0h
zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi<J1kq|hS9gX4a@yZ5+z2MEmyQ%&ClplUTE
z6_1J8+^Xn*g%AA*U<4tFnR+6<n1So~x`&6acTt|@e(ulFr{qlrctqkkrW-Zl4dR*2
zn$CHjILu0tLVQj<ZqNmZAGt0&{KmOxv%oXMMkX~+93~cvT`YGoD;X;BG;u^xHOd#V
z4lA6uIIER9Yu}T<Fqqd?(p;xGj5wB%KoTNk)KNwSHAHFENHLM3{g{h?$o416C6lWR
zMvetkp+d6#;D7MDTeC1V=_CbXK+lV1eT)MBU7*#ltnXvXYMlVyXW&Zf_^VA|_LKBR
zM~fT*1KYsGbw`u;fXf|V@JW{p$(Fn{g+c*%KcjET0ij!<cg^Xoy^qreAVXa(-v9@P
zz*v#8*InKn=<e;`GwuF<07xEkmPf&1IRF3v24YJ`L;(K){{a7>y{D4^000SaNLh0L
z04^f{04^f|c%?sf00007bV*G`2jm0}2qh$ry+=s^000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}000ACNkl<Zc-rlq!F9tR42EStpFKk-$|)0cfDY3EGC@wA
zC^N7?dvabM&o&q&A;GT!0!ZTjKtMcwe6B=9^m+v1wx4zVB_g_oFp-c+wjt@8xc^>F
zGPW8%Uo?ZQF({7#f$1myX497VvDHq5xG|~3JW|lw_F}()0)Ey1%)d)Z{DTOvR*9b^
zKn)S3RJleyue2>i#hxf&Sy-<4a<Q}_1QB4`B9cvjTs2H}f;$0AmGh_{DSv<hHbtb=
zcS~u5AOg&D;#U)3PZ=fF<65eD3qfQ*)Efn?2nLs*X08r#O{A6%{eF_`L#a^|pHn2*
z2yiudxRgXnF~9CKfdY2aU&<#7!A>W1Y9hdVCO+#DsATEjrQ-4Zq}`>F<dV<gq|;V^
z?xhY003tx~B?wTnarAfx=06cep@4?^Ybibmz)XZ2fe4;A{4+-q)H=X(2~|?LEKor5
z7O#aBz-%RvK0a5%M6hSvF|p>S;&TA*L!(&ja_j6p*39FWv^t<Gjftl?ncV~6u2CN`
zu};Mz0!S&+*_yZX_NhlA?8QWz0y+DSvx(p(E^ewoAcBvWc-seECV;dO<yJm6r}y}t
z_9!M=6ey`adA&&J_8j1yBu}6H?}Z57Z_v)x28%1nyvl5`4G@6A-s{fQ=h;Codx34j
zconW}0%#8KtgY80xZMbEiC>fak_uh=+pkBc9v29ZtN4x+zqjSXUQD)edMQq1Re@Tb
zM5YqI$2YVsVsb_OdpZa+O#siTpEG%TQ2bm0usRWv1ZcgvNhzo`$8y}C$vvClijC&`
zXKV4odw|9p$k7OFjR>a%uu|GOqd;p%*4~+^Apl2=_WG~6bZZ?y5CDqbbkEhA2vh5O
zC$$vNc3e%ZT!H{KvD(IBX|t{!PY?i#Z_2cZFndt{mWcei)5MYd*8V}l`oWym$ubBq
zkm7qZX(G%X)L)YVT#9d*0v@krND%=9fZ`8LgxQPwOHn{l@hwuImrHqEL>QI;-Bxwh
zb*MPj65)Lg;O#*}>A<Zd{#gm~Dkb9I()>!N_Z7l01V9}hL^vdX*XL}v5T?{XEhqj_
z0&{$+GWN@;9|KI~$I|N~bSOS7hX_+|f9UEh@%NHCCO~Q8<5RF{A}mOJDE`Pq_yb`@
VQi6~Ub^-tZ002ovPDHLkV1gP|e&+xH

literal 0
HcmV?d00001

diff --git a/core/assets/swordsman.png b/core/assets/swordsman.png
new file mode 100644
index 0000000000000000000000000000000000000000..689fb6827a0146b717fe7e62c3ee5090c890db15
GIT binary patch
literal 1404
zcmV-?1%vvDP)<h;3K|Lk000e1NJLTq006)M001xu1^@s6M^1Gf0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@Kj}9oj)eFhg~+AS&W0RV;#q(pG5I!Q|2}Xws0h
zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi<J1kq|hS9gX4a@yZ5+z2MEmyQ%&ClplUTE
z6_1J8+^Xn*g%AA*U<4tFnR+6<n1So~x`&6acTt|@e(ulFr{qlrctqkkrW-Zl4dR*2
zn$CHjILu0tLVQj<ZqNmZAGt0&{KmOxv%oXMMkX~+93~cvT`YGoD;X;BG;u^xHOd#V
z4lA6uIIER9Yu}T<Fqqd?(p;xGj5wB%KoTNk)KNwSHAHFENHLM3{g{h?$o416C6lWR
zMvetkp+d6#;D7MDTeC1V=_CbXK+lV1eT)MBU7*#ltnXvXYMlVyXW&Zf_^VA|_LKBR
zM~fT*1KYsGbw`u;fXf|V@JW{p$(Fn{g+c*%KcjET0ij!<cg^Xoy^qreAVXa(-v9@P
zz*v#8*InKn=<e;`GwuF<07xEkmPf&1IRF3v24YJ`L;(K){{a7>y{D4^000SaNLh0L
z04^f{04^f|c%?sf00007bV*G`2jm0}2qY?S9$OCp000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}000A1Nkl<Zc-rlq(XE3p3`GOtyXpv?p)+&>M(AK~1SaSV
zouMP3F2MVWR7F4_u^r#U{%?WUIVUmDcDLunIp^Hx@9U^z9LL2u=cZ}u98+)}gL7=c
z^G6NN+)9l3Aen55i$Y9@g?!=r=zQUakvkE>gK-t+7D0257mkZr0GIxI<2#hpzZt=z
zRN+SrkYfZcD(BGi%(1zwSd#@bgXPRv4w^QEW&{gqh#WS+Q5wchg1P`x$+>kNvGFhq
z=!8h>*bS)%G$U9b7k;(@*2u`Q9+#r#G)*k~q1r5<1sGK0G*F$;?Rjx-1}Dkv-23`6
zBUDWMFnX#ly3dcL)J0IneSR#lYoW3x%KBQvxsBtvaMaD<EOsZf8KExXvl!qE{ZZDs
zF(YtVK;xv7rau?)%>ZVErio8(fE4<pSzyZutyn;U{!+v@0}vbG<Lo{H67j>xx(|>;
z|B!a6y>%@Xp`_$*PN>FM8~wH9O^pHU&a%$9Jujp=(YEYOHUKr5!Zq*FLD#yE$e9RX
zPD)uIH77`UQo9E*Bh---?TwBk18@;(uk(@m^eLhd)^Z|kfg@e0y@`O57nm-P837|F
zXszwj2H+;q(f+p|^cvr%-O7oS1yb%ol<rnlZ-C7r0eu3s79*e*zK>qp#i9?WHZp5G
zh8ch${1WIsVxE63djUUTs$T+0Uf_LxEL$W(-2_t={`>msN_633F!GOtpzX<E4A6Sv
zqvXV2XH{*`5_<C%u)>$Iz!~}<$qC9tP;CI@;;&)yQshJXM2L2QN^Witd;IU~tMfEP
zd0!y*U7x>iHjJie>NG9`?R@}+1zEF!wHcw;N`Dj!{1SgHv|C{9J1B^cVgxgQ5x?l3
ztF#e%&Ggr3ff(_TEZ{#YL42)7FasFzRfV(>dhPTtZGjZxBUnKDjX5bJm;o9hK4Nei
zp+}&<qy?ymuh{~Kk7aNf!3<!;Z`uew3jMh(z)5_K7O3T+JSrnJYk*q2I;ihQlrln(
zM1KkkNE2Ve0>6FyJu24xcTlNDXvP56$2TKv8UXQiwxbuQf%w!Gh~2qeBVlWQ26)s6
zL#;2N8}TiU7@<S`U7cDAf32uPJLLXyw*3|C_R3+f!Z+f#Y=nP<PLM*7$Bdf*0000<
KMNUMnLSTYm=Ya13

literal 0
HcmV?d00001

diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index 996549f..ed43d65 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -239,8 +239,14 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                         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");
                     }
                     }
diff --git a/core/src/com/dungeoncrawler/model/Entity.java b/core/src/com/dungeoncrawler/model/Entity.java
index 8f00ef1..e753c0f 100644
--- a/core/src/com/dungeoncrawler/model/Entity.java
+++ b/core/src/com/dungeoncrawler/model/Entity.java
@@ -14,6 +14,7 @@ public abstract class Entity {
     protected float movementX;
     protected float movementY;
     protected int id;
+    protected int facing;
     
     
 
@@ -23,6 +24,7 @@ public abstract class Entity {
         this.lvl = lvl;
         this.movementX = 0;
         this.movementY = 0;
+        this.facing = 2;
         
         
         
@@ -139,6 +141,13 @@ public abstract class Entity {
         return this.id;
     }
     
+    public int getFacing(){
+        return facing;
+    }
+    public void setFacing(int facing){
+        this.facing = facing;
+    }
+    
     
     
 }
\ No newline at end of file
diff --git a/core/src/com/dungeoncrawler/model/entities/Archer.java b/core/src/com/dungeoncrawler/model/entities/Archer.java
index 34683a3..155cd55 100644
--- a/core/src/com/dungeoncrawler/model/entities/Archer.java
+++ b/core/src/com/dungeoncrawler/model/entities/Archer.java
@@ -12,14 +12,13 @@ public class Archer extends Entity{
     Timer tleft;
     int timerRuns;
     boolean isRunning;
-    int facing;
     
     public Archer(float xPos, float yPos, int lvl) {
         super(xPos, yPos, lvl);
         
         this.maxhp = 5*lvl;
         this.hp = this.maxhp;
-        
+        this.facing = 2;
         this.dmg = 3*lvl;
         this.id = 0;
         // TODO: Sinnvolle Werte finden
@@ -40,17 +39,25 @@ public class Archer extends Entity{
         
                         if(i <= 0.2){
                             if(isRunning == false){
-                                tup.start();
+                                if(getyPos() == 240){
+                                }
+                                else{
+                                    tup.start();
+                                }
                             }
                         }
                         else if(i > 0.2 && i <= 0.4){
                             if(isRunning == false){
-                                tright.start();
+                                if(getxPos() == 336){
+                                }
+                                else{
+                                    tright.start();
+                                }
                             }
                         }
                         else if(i > 0.4 && i <= 0.6){
                             if(isRunning == false){
-                                if(getyPos() == 0){
+                                if(getyPos() == 48){
                                 }
                                 else{
                                     tdown.start();
@@ -59,7 +66,7 @@ public class Archer extends Entity{
                         }
                         else if(i > 0.6 && i <= 0.8){
                             if(isRunning == false){
-                                if(getxPos() == 0){
+                                if(getxPos() == 48){
                                 }
                                 else{
                                     tleft.start();
@@ -85,7 +92,7 @@ public class Archer extends Entity{
                             tup.stop();
                         }
                     }
-        },0,0.03f);
+        },0,0.02f);
         tup.stop();
         tright.scheduleTask(new Timer.Task() {
                     @Override
@@ -100,7 +107,7 @@ public class Archer extends Entity{
                             tright.stop();
                         }
                     }
-        },0,0.03f);
+        },0,0.02f);
         tright.stop();
         tdown.scheduleTask(new Timer.Task() {
                     @Override
@@ -115,7 +122,7 @@ public class Archer extends Entity{
                             tdown.stop();
                         }
                     }
-        },0,0.03f);
+        },0,0.02f);
         tdown.stop();
         tleft.scheduleTask(new Timer.Task() {
                     @Override
@@ -131,7 +138,7 @@ public class Archer extends Entity{
                             tleft.stop();
                         }
                     }
-        },0,0.03f);
+        },0,0.02f);
         tleft.stop();
         t.start();
     }
@@ -151,12 +158,6 @@ public class Archer extends Entity{
         timerRuns = n;
     }
     
-    public void setFacing(int i){
-        facing = i;
-    }
     
-    public int getFacing(){
-        return facing;
-    }
     
 }
diff --git a/core/src/com/dungeoncrawler/model/entities/Swordsman.java b/core/src/com/dungeoncrawler/model/entities/Swordsman.java
index 91ce978..a0f93be 100644
--- a/core/src/com/dungeoncrawler/model/entities/Swordsman.java
+++ b/core/src/com/dungeoncrawler/model/entities/Swordsman.java
@@ -11,14 +11,13 @@ public class Swordsman extends Entity {
     Timer tleft;
     int timerRuns;
     boolean isRunning;
-    int facing;
     
     public Swordsman(float xPos, float yPos, int lvl) {
         super(xPos, yPos, lvl);
         
         this.maxhp = 5*lvl;
         this.hp = this.maxhp;
-        
+        this.facing = 2;
         this.dmg = 3*lvl;
         this.id = 1;
         // TODO: Sinnvolle Werte finden
@@ -38,17 +37,25 @@ public class Swordsman extends Entity {
         
                         if(i <= 0.2){
                             if(isRunning == false){
-                                tup.start();
+                                if(getyPos() == 240){
+                                }
+                                else{
+                                    tup.start();
+                                }
                             }
                         }
                         else if(i > 0.2 && i <= 0.4){
                             if(isRunning == false){
-                                tright.start();
+                                if(getxPos() == 336){
+                                }
+                                else{
+                                    tright.start();
+                                }
                             }
                         }
                         else if(i > 0.4 && i <= 0.6){
                             if(isRunning == false){
-                                if(getyPos() == 0){
+                                if(getyPos() == 48){
                                 }
                                 else{
                                     tdown.start();
@@ -57,7 +64,7 @@ public class Swordsman extends Entity {
                         }
                         else if(i > 0.6 && i <= 0.8){
                             if(isRunning == false){
-                                if(getxPos() == 0){
+                                if(getxPos() == 48){
                                 }
                                 else{
                                     tleft.start();
@@ -65,7 +72,6 @@ public class Swordsman extends Entity {
                             }
                         }
                         else{
-                            facing = 2;
                         }
                     }
         },0,1f);
@@ -149,11 +155,5 @@ public class Swordsman extends Entity {
         timerRuns = n;
     }
     
-    public void setFacing(int i){
-        facing = i;
-    }
     
-    public int getFacing(){
-        return facing;
-    }
 }
diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java
index 42c0527..a8c50c2 100644
--- a/core/src/com/dungeoncrawler/view/GameScreen.java
+++ b/core/src/com/dungeoncrawler/view/GameScreen.java
@@ -41,8 +41,8 @@ public class GameScreen {
 	public GameScreen(Dungeon d) {
             
                 //PLAYER
-                p = new Texture("Player.png");
-                regions = TextureRegion.split(p, 64, 64);
+                p = new Texture("player.png");
+                regions = TextureRegion.split(p, 48, 48);
                 player = new Sprite(regions[0][2]);
                 player.setX(200);
                 player.setY(200);
@@ -126,20 +126,40 @@ public class GameScreen {
                     if(entitySprites[i] != null){
                         entitySprites[i].setX(e[i].getxPos());
                         entitySprites[i].setY(e[i].getyPos());
-                        switch(e[i].direction()){
+                        switch(e[i].getFacing()){
                             case -1:
                                 break;
                             case 0:
-                                entitySprites[i].setRegion(archerRegions[0][0]);
+                                if(e[i].getId() == 0){
+                                    entitySprites[i].setRegion(archerRegions[0][0]);
+                                }
+                                else if(e[i].getId() == 1){
+                                    entitySprites[i].setRegion(swordsmanRegions[0][0]);
+                                }
                                 break;
                             case 1:
-                                entitySprites[i].setRegion(archerRegions[0][1]);
+                                if(e[i].getId() == 0){
+                                    entitySprites[i].setRegion(archerRegions[0][1]);
+                                }
+                                else if(e[i].getId() == 1){
+                                    entitySprites[i].setRegion(swordsmanRegions[0][1]);
+                                }
                                 break;
                             case 2:
-                                entitySprites[i].setRegion(archerRegions[0][2]);
+                                if(e[i].getId() == 0){
+                                    entitySprites[i].setRegion(archerRegions[0][2]);
+                                }
+                                else if(e[i].getId() == 1){
+                                    entitySprites[i].setRegion(swordsmanRegions[0][2]);
+                                }
                                 break;
                             case 3:
-                                entitySprites[i].setRegion(archerRegions[0][3]);
+                                if(e[i].getId() == 0){
+                                    entitySprites[i].setRegion(archerRegions[0][3]);
+                                }
+                                else if(e[i].getId() == 1){
+                                    entitySprites[i].setRegion(swordsmanRegions[0][3]);
+                                }
                                 break;
                     
                         }
@@ -158,22 +178,21 @@ public class GameScreen {
         
         
         public void newEntity(int i,Entity e, float x, float y){
-                    if(e.getId() == 0){ //nimmt entity ID -> 0 = Archer || 1 = Swordsman
+                    if(e.getId() == 0){ //nimmt entity ID -> 0 = Archer || 1 = Swordsman || 2 = Arrow
                         entityTextures[i] = new Texture("archer.png");
-                        archerRegions = TextureRegion.split(entityTextures[i], 64, 64);
+                        archerRegions = TextureRegion.split(entityTextures[i], 48, 48);
                         entitySprites[i] = new Sprite(archerRegions[0][2]);
                         entitySprites[i].setX(x);
                         entitySprites[i].setY(y);
                     }
-                    else if(e.getId() == 1){
-                        entityTextures[i] = new Texture("Swordsman.png");
-                        swordsmanRegions = TextureRegion.split(entityTextures[i], 64, 64);
+                    if(e.getId() == 1){
+                        entityTextures[i] = new Texture("swordsman.png");
+                        swordsmanRegions = TextureRegion.split(entityTextures[i], 48, 48);
                         entitySprites[i] = new Sprite(swordsmanRegions[0][2]);
-                        entitySprites[i] = new Sprite(entityTextures[i]);
                         entitySprites[i].setX(x);
                         entitySprites[i].setY(y);
                     }
-                    else if(e.getId() == 2){
+                    if(e.getId() == 2){
                         arrowTextures[i] = new Texture("key.png");
                         arrowSprites[i] = new Sprite(arrowTextures[i]);
                         arrowSprites[i].setX(x);