diff --git a/core/assets/sprites/player.png b/core/assets/sprites/player.png index 2f0a88f..6ec6cbb 100644 Binary files a/core/assets/sprites/player.png and b/core/assets/sprites/player.png differ diff --git a/core/assets/sprites/playerblue.png b/core/assets/sprites/playerblue.png new file mode 100644 index 0000000..4fe5d8f Binary files /dev/null and b/core/assets/sprites/playerblue.png differ diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index 55d5fd9..305f545 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -598,6 +598,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ if(mm != null){} if(gs != null && gs.getIsLoading() == false){ d.getPlayer().getInv().equipItem(); + d.getPlayer().updateItems(); } } @@ -609,6 +610,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ d.getCurrentRoom().spawnItem((int)d.getPlayer().getxPos(), (int)d.getPlayer().getyPos(), d.getPlayer().getInv().getItem(d.getPlayer().getInv().getSelected())); gs.getM().getMaps()[level][roomPosX][roomPosY].addItem(48, 48,(int)d.getPlayer().getxPos(), (int)d.getPlayer().getyPos(), d.getPlayer().getInv().getItem(d.getPlayer().getInv().getSelected())); d.getPlayer().getInv().dropItem(); + d.getPlayer().updateItems(); } } } diff --git a/core/src/com/dungeoncrawler/model/DungeonGenerator.java b/core/src/com/dungeoncrawler/model/DungeonGenerator.java index a33f343..26a342e 100644 --- a/core/src/com/dungeoncrawler/model/DungeonGenerator.java +++ b/core/src/com/dungeoncrawler/model/DungeonGenerator.java @@ -163,7 +163,7 @@ public class DungeonGenerator { private Room generateRoom(int sizeX, int sizeY, int tileSize, int lvl){ int itemAmount = (int) (Math.random() * 2); - int enemyAmount = (int) (Math.random() * 6); + int enemyAmount = (int) (Math.random() * 5); Room tempRoom = new Room(new ArrayList(itemAmount), new Entity[15]); diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index 8a3fd61..a64f721 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/core/src/com/dungeoncrawler/view/GameScreen.java @@ -67,10 +67,10 @@ public class GameScreen { //PLAYER Texture[] playerTexture = new Texture[4]; - playerTexture[0] = new Texture(Gdx.files.internal("sprites/player.png")); - playerTexture[1] = new Texture(Gdx.files.internal("sprites/player.png")); - playerTexture[2] = new Texture(Gdx.files.internal("sprites/player.png")); - playerTexture[3] = new Texture(Gdx.files.internal("sprites/player.png")); + playerTexture[0] = new Texture(Gdx.files.internal("sprites/playerblue.png")); + playerTexture[1] = new Texture(Gdx.files.internal("sprites/playerblue.png")); + playerTexture[2] = new Texture(Gdx.files.internal("sprites/playerblue.png")); + playerTexture[3] = new Texture(Gdx.files.internal("sprites/playerblue.png")); player = new EntitySprite(playerTexture, 64, 64); diff --git a/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java b/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java index 9a956a0..05fa781 100644 --- a/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java +++ b/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java @@ -9,8 +9,8 @@ public class DesktopLauncher { public static void main (String[] arg) { LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); - config.width = 1600; - config.height = 900; + config.width = 1280; + config.height = 720; config.title = "The Restless Caverns - Der beste Dungeon Crawler ALLER ZEITEN"; config.resizable = true;