From 47ed4c3ea894f58e17482985dfcb6d79a5e246ec Mon Sep 17 00:00:00 2001
From: GammelJan <jan.ehehalt@gmail.com>
Date: Tue, 14 Apr 2020 14:05:52 +0200
Subject: [PATCH] PRESS E TO ATTACK ENEMIES HAHAHAHAHH

---
 core/assets/controls.png                      | Bin 0 -> 2691 bytes
 .../dungeoncrawler/control/Controller.java    |   7 ++
 .../com/dungeoncrawler/view/GameScreen.java   |  86 ++++++++++++++++--
 3 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 core/assets/controls.png

diff --git a/core/assets/controls.png b/core/assets/controls.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e726891d77ac59616a08664b74bec47b3cf08e1
GIT binary patch
literal 2691
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

literal 0
HcmV?d00001

diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index 23f6662..f53b37c 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -284,6 +284,13 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                     }
                     }
                 }
+                
+                if(keycode == Input.Keys.E){
+                    if(v != null){}
+                    if(m != null){
+                        m.PlayerAttack(e, d.getPlayer());
+                    }
+                }
                 return true;
     }
 
diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java
index 76eb00c..b97cff5 100644
--- a/core/src/com/dungeoncrawler/view/GameScreen.java
+++ b/core/src/com/dungeoncrawler/view/GameScreen.java
@@ -10,21 +10,23 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.maps.tiled.TiledMap;
 import com.badlogic.gdx.maps.tiled.TiledMapRenderer;
 import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer;
+import com.badlogic.gdx.math.Intersector;
+import com.badlogic.gdx.math.Rectangle;
 import com.dungeoncrawler.model.Dungeon;
 import com.dungeoncrawler.model.Entity;
 import com.dungeoncrawler.model.entities.*;
 import com.badlogic.gdx.utils.Timer;
 
 public class GameScreen {
+        //CONTROLS
+        Texture ctr;
+        Sprite controls;
+    
         //PLAYER
         Texture p;
         Sprite player;
         TextureRegion[][] regions;
         
-        Texture verticalAttack;
-        Texture horizontalAttack;
-        Sprite verticalAttackSprite;
-        Sprite horizontalAttackSprite;
         
         //ENTITIES
         Texture[] entityTextures;
@@ -44,6 +46,12 @@ public class GameScreen {
         OrthographicCamera camera;
         
 	public GameScreen(Dungeon d) {
+                //CONTROLS
+                    ctr = new Texture("controls.png");
+                    controls = new Sprite(ctr);
+                    controls.setX(-400f);
+                    controls.setY(0);
+            
             
                 //PLAYER
                 
@@ -53,9 +61,8 @@ public class GameScreen {
                 player.setX(200);
                 player.setY(200);
                 
-                verticalAttack = new Texture("AttackHori.png");
-                horizontalAttack = new Texture("AttackVert.png");
-                verticalAttackSprite = new Sprite(verticalAttack);
+                
+                
                 
                 //ENTITIES
                 entityTextures = new Texture[5];
@@ -103,6 +110,7 @@ public class GameScreen {
                     tmr = new OrthogonalTiledMapRenderer(tm);
                 }
                 
+                
                 // dreht SpielerSprite je nach Bewegungsrichtung 
                 if(p.getMovementX() == 3){ //RECHTS
                     player.setRegion(regions[0][1]);
@@ -131,6 +139,7 @@ public class GameScreen {
             //BATCH
             batch.begin();
                 player.draw(batch);
+                controls.draw(batch);
                     //DRAW'T JEDES ENTITY - prueft vorher ob vorhanden
                 for(int i = 0; i < e.length; i++){
                     if(entitySprites[i] != null){
@@ -210,6 +219,69 @@ public class GameScreen {
                     }
         }
         
+        public void PlayerAttack(Entity e[], Player p){
+            if(p.direction() == 0){
+                Texture verticalAttack = new Texture("AttackHori.png");
+                Sprite verticalAttackSprite = new Sprite(verticalAttack);
+                verticalAttackSprite.setX(p.getxPos());
+                verticalAttackSprite.setY(p.getyPos());
+                for(int i = 0; i<entitySprites.length ; i++){
+                    if(entitySprites[i] != null){
+                        if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), verticalAttackSprite.getBoundingRectangle())){
+                            e[i] = null;
+                            entitySprites[i] = null;
+                            entityTextures[i] = null;
+                        }
+                    }
+                }
+            }
+            else if(p.direction() == 1){
+                Texture horizontalAttack = new Texture("AttackVert.png");
+                Sprite horizontalAttackSprite = new Sprite(horizontalAttack);
+                horizontalAttackSprite.setX(p.getxPos());
+                horizontalAttackSprite.setY(p.getyPos());
+                for(int i = 0; i<entitySprites.length ; i++){
+                    if(entitySprites[i] != null){
+                        if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), horizontalAttackSprite.getBoundingRectangle())){
+                            e[i] = null;
+                            entitySprites[i] = null;
+                            entityTextures[i] = null;
+                        }
+                    }
+                }
+            }
+            else if(p.direction() == 2){
+                Texture verticalAttack = new Texture("AttackHori.png");
+                Sprite verticalAttackSprite = new Sprite(verticalAttack);
+                verticalAttackSprite.setX(p.getxPos());
+                verticalAttackSprite.setY(p.getyPos() - 24f);
+                for(int i = 0; i<entitySprites.length ; i++){
+                    if(entitySprites[i] != null){
+                        if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), verticalAttackSprite.getBoundingRectangle())){
+                            e[i] = null;
+                            entitySprites[i] = null;
+                            entityTextures[i] = null;
+                        }
+                    }
+                }
+            }
+            else if(p.direction() == 3){
+                Texture horizontalAttack = new Texture("AttackVert.png");
+                Sprite horizontalAttackSprite = new Sprite(horizontalAttack);
+                horizontalAttackSprite.setX(p.getxPos() - 24f);
+                horizontalAttackSprite.setY(p.getyPos());
+                for(int i = 0; i<entitySprites.length ; i++){
+                    if(entitySprites[i] != null){
+                        if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), horizontalAttackSprite.getBoundingRectangle())){
+                            e[i] = null;
+                            entitySprites[i] = null;
+                            entityTextures[i] = null;
+                        }
+                    }
+                }
+            }
+        }
+        
         
         //GETTER
         public float getPlayerSpriteX(){