From 0a5928cf3ce89506ca7618c314ae033d3334d43c Mon Sep 17 00:00:00 2001
From: GammelJan <jan.ehehalt@gmail.com>
Date: Sat, 4 Apr 2020 13:20:02 +0200
Subject: [PATCH] Archer added (64x64)

---
 core/assets/Archer-64.png                     | Bin 0 -> 3621 bytes
 core/src/com/dungeoncrawler/model/Entity.java |   5 +-
 .../com/dungeoncrawler/model/Inventory.java   |  10 ++-
 core/src/com/dungeoncrawler/model/Room.java   |  12 ++--
 core/src/com/dungeoncrawler/view/View.java    |  62 +++++++++---------
 5 files changed, 52 insertions(+), 37 deletions(-)
 create mode 100644 core/assets/Archer-64.png

diff --git a/core/assets/Archer-64.png b/core/assets/Archer-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..26ecf0024f6b07cb69aa2110ba3631e718ba9c5a
GIT binary patch
literal 3621
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

literal 0
HcmV?d00001

diff --git a/core/src/com/dungeoncrawler/model/Entity.java b/core/src/com/dungeoncrawler/model/Entity.java
index c50a2a8..175557b 100644
--- a/core/src/com/dungeoncrawler/model/Entity.java
+++ b/core/src/com/dungeoncrawler/model/Entity.java
@@ -1,5 +1,7 @@
 package com.dungeoncrawler.model;
-
+import com.dungeoncrawler.model.entities.Archer;
+import com.dungeoncrawler.model.entities.Player;
+import com.dungeoncrawler.model.entities.Swordsman;
 
 public abstract class Entity {
     
@@ -31,6 +33,7 @@ public abstract class Entity {
     }
     
     
+    
     public int getxPos() {
         return xPos;
     }
diff --git a/core/src/com/dungeoncrawler/model/Inventory.java b/core/src/com/dungeoncrawler/model/Inventory.java
index 10f3d50..15a9362 100644
--- a/core/src/com/dungeoncrawler/model/Inventory.java
+++ b/core/src/com/dungeoncrawler/model/Inventory.java
@@ -4,7 +4,7 @@ package com.dungeoncrawler.model;
 public class Inventory {
     
     Item items[][];
-    
+    Item equip;
     
     Inventory(int width, int height){
         items = new Item[width][height];
@@ -24,6 +24,14 @@ public class Inventory {
         }
     }
     
+    public void equipItem(int x, int y){
+        if(equip == null){
+            equip = items[x][y];
+            dropItem(x,y);
+        }
+    }
+    
+    
     public void dropItem(int x, int y){
         items[x][y] = null;
     }
diff --git a/core/src/com/dungeoncrawler/model/Room.java b/core/src/com/dungeoncrawler/model/Room.java
index 69d1dfe..3984272 100644
--- a/core/src/com/dungeoncrawler/model/Room.java
+++ b/core/src/com/dungeoncrawler/model/Room.java
@@ -5,8 +5,6 @@
  */
 package com.dungeoncrawler.model;
 
-import com.dungeoncrawler.model.Entity;
-
 /**
  *
  * @author jonathan
@@ -14,14 +12,18 @@ import com.dungeoncrawler.model.Entity;
 public class Room {
     private ItemContainer item;
     private Entity[] enemies;
+    int lvl;
     
     public Room(ItemContainer item, Entity[] enemies){
         this.item = item;
         this.enemies = enemies;
+        
     }
     
-    public void spawnEnemies(int xPos, int yPos){
-        // TODO: Zu Implementieren
+    
+    public void spawnEnemies(int xPos, int yPos, Entity enemy){
+        enemy.setxPos(xPos);
+        enemy.setyPos(yPos);
     }
     
     public void spawnItem(int xPos, int yPos){
@@ -57,4 +59,6 @@ public class Room {
     }
     
     
+    
+    
 }
diff --git a/core/src/com/dungeoncrawler/view/View.java b/core/src/com/dungeoncrawler/view/View.java
index 044ceb1..dcc2216 100644
--- a/core/src/com/dungeoncrawler/view/View.java
+++ b/core/src/com/dungeoncrawler/view/View.java
@@ -17,8 +17,8 @@ public class View {
         Sprite title;
         Sprite player;
         Sprite archer;
-        int frame = 0;
-        int zeile = 0;
+        int PlayerFrame = 0;
+        int PlayerZeile = 0;
         TextureRegion[][] regions;
         Timer tunten;
         Timer toben;
@@ -29,7 +29,7 @@ public class View {
                 b = new Texture("Button.png");
                 t = new Texture("Title.png");
                 p = new Texture("animplay.png");
-                a = new Texture("Archer.png");
+                a = new Texture("Archer-64.png");
                 button = new Sprite(b);
                 title = new Sprite(t);
                 archer = new Sprite(a);
@@ -53,16 +53,16 @@ public class View {
         tunten.scheduleTask(new Timer.Task() {
                     @Override
                     public void run() {
-                        zeile = 2;
+                        PlayerZeile = 2;
                         
-                        if(frame == 9){
-                            frame = 0;
+                        if(PlayerFrame == 9){
+                            PlayerFrame = 0;
                         }
                         else{
-                            frame++;
+                            PlayerFrame++;
                         }
                         
-                        player.setRegion(regions[zeile][frame]);
+                        player.setRegion(regions[PlayerZeile][PlayerFrame]);
                         
                      }
                 },0,1/5f);
@@ -71,16 +71,16 @@ public class View {
                 toben.scheduleTask(new Timer.Task() {
                     @Override
                     public void run() {
-                        zeile = 2;
+                        PlayerZeile = 2;
                         
-                        if(frame == 9){
-                            frame = 0;
+                        if(PlayerFrame == 9){
+                            PlayerFrame = 0;
                         }
                         else{
-                            frame++;
+                            PlayerFrame++;
                         }
                  
-                        player.setRegion(regions[zeile][frame]);
+                        player.setRegion(regions[PlayerZeile][PlayerFrame]);
                         
                      }
                 }, 0,1/5f);
@@ -89,21 +89,21 @@ public class View {
                 tlinks.scheduleTask(new Timer.Task() {
                     @Override
                     public void run() {
-                        zeile = 2;
+                        PlayerZeile = 2;
                         if(player.isFlipX() == true){
                         
                         }
                         else{
                             player.flip(true, false);
                         }
-                        if(frame == 9){
-                            frame = 0;
+                        if(PlayerFrame == 9){
+                            PlayerFrame = 0;
                         }
                         else{
-                            frame++;
+                            PlayerFrame++;
                         }
                         
-                        player.setRegion(regions[zeile][frame]);
+                        player.setRegion(regions[PlayerZeile][PlayerFrame]);
                         
                      }
                 }, 0,1/5f);
@@ -112,19 +112,19 @@ public class View {
                 trechts.scheduleTask(new Timer.Task() {
                     @Override
                     public void run() {
-                        zeile = 2;
+                        PlayerZeile = 2;
                         if(player.isFlipX() == true){
                             player.flip(false, false);
                         }
-                        if(frame == 9){
-                            frame = 0;
+                        if(PlayerFrame == 9){
+                            PlayerFrame = 0;
                         }
                         else{
-                            frame++;
+                            PlayerFrame++;
                         }
                         
                  
-                        player.setRegion(regions[zeile][frame]);
+                        player.setRegion(regions[PlayerZeile][PlayerFrame]);
                         
                      }
                 }, 0,1/5f);
@@ -174,20 +174,20 @@ public class View {
         
         public void tuntenstop(){
             tunten.stop();
-            frame = 0;
-            player.setRegion(regions[zeile][frame]);}
+            PlayerFrame = 0;
+            player.setRegion(regions[PlayerZeile][PlayerFrame]);}
         public void tobenstop(){    
             toben.stop();
-            frame = 0;
-            player.setRegion(regions[zeile][frame]);}
+            PlayerFrame = 0;
+            player.setRegion(regions[PlayerZeile][PlayerFrame]);}
         public void tlinksstop(){    
             tlinks.stop();
-            frame = 0;
-            player.setRegion(regions[zeile][frame]);
+            PlayerFrame = 0;
+            player.setRegion(regions[PlayerZeile][PlayerFrame]);
             player.flip(true, false);}
         public void trechtsstop(){    
             trechts.stop();
-            frame = 0;
-            player.setRegion(regions[zeile][frame]);}
+            PlayerFrame = 0;
+            player.setRegion(regions[PlayerZeile][PlayerFrame]);}
             
         }