From d2360cb33820fa1d873e1e015d90938b851bad47 Mon Sep 17 00:00:00 2001
From: GammelJan <jan.ehehalt@gmail.com>
Date: Thu, 2 Apr 2020 13:47:20 +0200
Subject: [PATCH] archer graphic added - no function yet

---
 core/assets/Archer.png                        | Bin 0 -> 756 bytes
 .../dungeoncrawler/control/Controller.java    |  25 +++++++++++-------
 .../dungeoncrawler/model/entities/Archer.java |   2 ++
 .../dungeoncrawler/model/entities/Player.java |   2 ++
 core/src/com/dungeoncrawler/view/View.java    |  10 +++++--
 5 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 core/assets/Archer.png

diff --git a/core/assets/Archer.png b/core/assets/Archer.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2a0506e9540c29d936467a0333aada5432226c7
GIT binary patch
literal 756
zcmV<Q0t@|#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@LdQ9PA+CkfAzR5EXHhDi*;)X)CnqU~=gfG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_$<ayCMN0f%QfLw5!Ery{-Fw`<1B7Oksb*jTP&La)
zC*oo*zbXb_5rBX`gb<dPsV6gwS$K}Gd-(Wz7vovp=l&f1O2K4+Pb8jWx?vG-5YKE{
zI_G`j2rEkp@j3ChK^G)`<htzg8|RY40?&*X+4MYdgjg(fvE0S1Y^cQ3#8E}nC|}6A
ztZ?4qtXAu+eNX<va6wziaGmA|5?DeKDTt6!M+H?_h|#K%Vj@lZaS#8n<4=)GCRYWF
z91EyHh2;3b|KNAGW^roLO$x_>o)_Ex7zKj6K&xTf-^aGyIsyF8z?IhV*P6iWC+Urj
z7Ciz6wt<W5jwbH`mpj1FlP(#OBl&3x#Uk*2M&FbN25*7Tn%i4@AEysMmbzNL0S*p<
zu@Yskd%U~1ySIPOwEO!3>zHzJ-ip@n00006VoOIv0RI600RN!9r;`8x010qNS#tmY
zE+YT{E+YYWr9XB6000McNliru<OBi>3muX#$BX~~02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{007KML_t(o!|j*J5`-WOL|@|n|EvqQA#=eh4x%_q!ojZc
zX8D>X!~mT#m<_UlT|C)f?)|QGfM0;}nX<ri_JW>(Hv{_u4xlBK?N$N?xhI{QGC5d`
zIKi7H#1VdILhC(ufCETf6H*y493_RV)lqZR&XkDN*D2_ouJwl$W^t<g_KAp!|FRW7
z1|9>C0Z#*weZUl00}ZV4Kcjtm4dCZ-29l!W$WOxzrDKid5f>9}6o~$~CX%#SgI-Q6
mhf_H+OK00QU=ffjIKUfGI$l)J|Fqr!0000<MNUMnLSTZXF-BVe

literal 0
HcmV?d00001

diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index 8019303..6652911 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -13,27 +13,31 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.dungeoncrawler.view.View;
 import com.dungeoncrawler.model.Dungeon;
 import com.dungeoncrawler.model.entities.Player;
+import com.dungeoncrawler.model.entities.Archer;
 
 public class Controller extends ApplicationAdapter implements InputProcessor{
     SpriteBatch batch;
     Dungeon d;
     View v;
-    Player p;
+    Player p; 
+    Archer a;
     float movementX = 0f;
     float movementY = 0f;
     
+    
     @Override
     public void create(){
         batch = new SpriteBatch();
         v = new View();
-        p = new Player(0,0,0);
+        p = new Player(0,0,1);
         d = new Dungeon(p);
+        a = new Archer(500, 200, 1);
         Gdx.input.setInputProcessor(this);
     }
     
     @Override
     public void render(){
-        v.render(batch, movementX ,movementY);
+        v.render(batch, movementX ,movementY, a.getxPos(), a.getyPos());
     }
     
     @Override
@@ -45,23 +49,26 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
     public boolean keyDown(int keycode) {
                 if(keycode == Input.Keys.LEFT){
                     movementX = -3f;
-                    v.render(batch, movementX, movementY);
+                    v.render(batch, movementX, movementY, a.getxPos(), a.getyPos());
                 }
                 
                 if(keycode == Input.Keys.RIGHT){
                     movementX = 3f;
-                    v.render(batch, movementX, movementY);
+                    v.render(batch, movementX, movementY, a.getxPos(), a.getyPos());
                 }
                 
                 if(keycode == Input.Keys.UP){
-                    movementY = 3f;
-                    v.render(batch, movementX, movementY);
+                    movementY = 2f;
+                    v.render(batch, movementX, movementY, a.getxPos(), a.getyPos());
                 }
                 
                 if(keycode == Input.Keys.DOWN){
-                    movementY = -3f;
-                    v.render(batch, movementX, movementY);
+                    movementY = -2f;
+                    v.render(batch, movementX, movementY, a.getxPos(), a.getyPos());
                 } 
+                if(keycode == Input.Keys.W){
+                    
+                }
                 return true;
     }
 
diff --git a/core/src/com/dungeoncrawler/model/entities/Archer.java b/core/src/com/dungeoncrawler/model/entities/Archer.java
index df0fa20..bc0498e 100644
--- a/core/src/com/dungeoncrawler/model/entities/Archer.java
+++ b/core/src/com/dungeoncrawler/model/entities/Archer.java
@@ -14,4 +14,6 @@ public class Archer extends Entity{
         // TODO: Sinnvolle Werte finden
     }
     
+    
+    
 }
diff --git a/core/src/com/dungeoncrawler/model/entities/Player.java b/core/src/com/dungeoncrawler/model/entities/Player.java
index 0d3c5b8..66c0c66 100644
--- a/core/src/com/dungeoncrawler/model/entities/Player.java
+++ b/core/src/com/dungeoncrawler/model/entities/Player.java
@@ -24,4 +24,6 @@ public class Player extends Entity {
         // TODO: Sinnvolle Werte finden
     }
     
+    
+    
 }
diff --git a/core/src/com/dungeoncrawler/view/View.java b/core/src/com/dungeoncrawler/view/View.java
index 57b4be9..044ceb1 100644
--- a/core/src/com/dungeoncrawler/view/View.java
+++ b/core/src/com/dungeoncrawler/view/View.java
@@ -12,9 +12,11 @@ public class View {
 	Texture b;
         Texture t;
         Texture p;
+        Texture a;
         Sprite button;
         Sprite title;
         Sprite player;
+        Sprite archer;
         int frame = 0;
         int zeile = 0;
         TextureRegion[][] regions;
@@ -27,8 +29,10 @@ public class View {
                 b = new Texture("Button.png");
                 t = new Texture("Title.png");
                 p = new Texture("animplay.png");
+                a = new Texture("Archer.png");
                 button = new Sprite(b);
                 title = new Sprite(t);
+                archer = new Sprite(a);
                 
                 float w = Gdx.graphics.getWidth();
                 float h = Gdx.graphics.getHeight();
@@ -129,12 +133,13 @@ public class View {
 	}
 
         
-	public void render (SpriteBatch batch, float x, float y) {
+	public void render (SpriteBatch batch, float x, float y, int archerX, int archerY) {
 		Gdx.gl.glClearColor(0, 0, 0, 1);
 		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
                 player.setX(player.getX()+x);
                 player.setY(player.getY()+y);
-                
+                archer.setX(archerX);
+                archer.setY(archerY);
                 if(x == 3f){
                     trechts.start();
                     if(player.isFlipX() == true){
@@ -161,6 +166,7 @@ public class View {
                 title.draw(batch);
                 button.draw(batch);
                 player.draw(batch);
+                archer.draw(batch);
                 batch.end();
 	}