diff --git a/core/assets/Archer-64.png b/core/assets/Archer-64.png new file mode 100644 index 0000000..26ecf00 Binary files /dev/null and b/core/assets/Archer-64.png differ 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]);} }