diff --git a/core/assets/sprites/arrow.png b/core/assets/sprites/arrow.png new file mode 100644 index 0000000..e2ebc18 Binary files /dev/null and b/core/assets/sprites/arrow.png differ diff --git a/core/assets/sprites/player.png b/core/assets/sprites/player.png index 50e353b..9a979f9 100644 Binary files a/core/assets/sprites/player.png and b/core/assets/sprites/player.png differ diff --git a/core/assets/sprites/sword.png b/core/assets/sprites/sword.png deleted file mode 100644 index 8c7b07a..0000000 Binary files a/core/assets/sprites/sword.png and /dev/null differ diff --git a/core/assets/tilesets/tileset_floor_1.png b/core/assets/tilesets/tileset_floor_1.png index 08b6fef..4977497 100644 Binary files a/core/assets/tilesets/tileset_floor_1.png and b/core/assets/tilesets/tileset_floor_1.png differ diff --git a/core/assets/tilesets/tileset_floor_2.png b/core/assets/tilesets/tileset_floor_2.png index 201941f..bac7e37 100644 Binary files a/core/assets/tilesets/tileset_floor_2.png and b/core/assets/tilesets/tileset_floor_2.png differ diff --git a/core/assets/tilesets/tileset_floor_3.png b/core/assets/tilesets/tileset_floor_3.png index 5acff2e..1819278 100644 Binary files a/core/assets/tilesets/tileset_floor_3.png and b/core/assets/tilesets/tileset_floor_3.png differ diff --git a/core/src/com/dungeoncrawler/model/Inventory.java b/core/src/com/dungeoncrawler/model/Inventory.java index cdf2ddc..5f40daa 100644 --- a/core/src/com/dungeoncrawler/model/Inventory.java +++ b/core/src/com/dungeoncrawler/model/Inventory.java @@ -18,6 +18,13 @@ public class Inventory { public void addItem(Item i) { for(int n = 2; n < items.length; n++){ + if(i.getId() == 2){ + if(items[1] == null){ + items[1] = i; + n = items.length + 1; + break; + } + } if(items[n] == null){ items[n] = i; n = items.length + 1; diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index bdd79bb..eab805b 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/core/src/com/dungeoncrawler/view/GameScreen.java @@ -302,17 +302,19 @@ public class GameScreen { entitySprites[i].draw(batch); entitySprites[i].setX(e[i].getxPos()); entitySprites[i].setY(e[i].getyPos()); - if(e[i].getHp() < e[i].getMaxhp() && e[i].getHp() > 0){ - healthBar = new Texture("sprites/halfHealthEntity.png"); - Sprite healthBarSprite = new Sprite(healthBar); - healthBarSprite.setPosition(e[i].getxPos(), e[i].getyPos()); - healthBarSprite.draw(batch); - } - else if(e[i].getHp() == e[i].getMaxhp()){ - healthBar = new Texture("sprites/fullHealthEntity.png"); - Sprite healthBarSprite = new Sprite(healthBar); - healthBarSprite.setPosition(e[i].getxPos(), e[i].getyPos()); - healthBarSprite.draw(batch); + if(e[i].getId() != 2){ + if(e[i].getHp() < e[i].getMaxhp() && e[i].getHp() > 0){ + healthBar = new Texture("sprites/halfHealthEntity.png"); + Sprite healthBarSprite = new Sprite(healthBar); + healthBarSprite.setPosition(e[i].getxPos(), e[i].getyPos()); + healthBarSprite.draw(batch); + } + else if(e[i].getHp() == e[i].getMaxhp()){ + healthBar = new Texture("sprites/fullHealthEntity.png"); + Sprite healthBarSprite = new Sprite(healthBar); + healthBarSprite.setPosition(e[i].getxPos(), e[i].getyPos()); + healthBarSprite.draw(batch); + } } } } @@ -352,7 +354,7 @@ public class GameScreen { entitySprites[i].setY(e[i].getyPos()); } if(e[i].getId() == 2){ - Texture tx = new Texture("sprites/sword.png"); + Texture tx = new Texture("sprites/arrow.png"); //swordsmanRegions = TextureRegion.split(entityTextures[i], 48, 48); entitySprites[i] = new Sprite(tx); entitySprites[i].setX(e[i].getxPos()); diff --git a/core/src/com/dungeoncrawler/view/MenuScreen.java b/core/src/com/dungeoncrawler/view/MenuScreen.java new file mode 100644 index 0000000..f2e43a8 --- /dev/null +++ b/core/src/com/dungeoncrawler/view/MenuScreen.java @@ -0,0 +1,25 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.dungeoncrawler.view; + +import com.badlogic.gdx.Game; +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.Input; +import com.badlogic.gdx.graphics.GL20; + +/** + * + * @author bfz + */ +public class MenuScreen{ + + public MenuScreen() { + } + + + + +}