diff --git a/core/assets/sprites/firewizard.png b/core/assets/sprites/firewizard.png new file mode 100644 index 0000000..b908b57 Binary files /dev/null and b/core/assets/sprites/firewizard.png differ diff --git a/core/assets/sprites/potion.png b/core/assets/sprites/potion.png index d7f9da1..f5a0c27 100644 Binary files a/core/assets/sprites/potion.png and b/core/assets/sprites/potion.png differ diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index 7c349d9..045f288 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -87,7 +87,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ roomAmount = d.getLevel()[0].getRooms().length; - level = 6; + level = 0; roomPosX = roomAmount / 2; roomPosY = roomAmount / 2; @@ -602,7 +602,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ } } - if(keycode == Input.Keys.Q){ + if(keycode == Input.Keys.E){ if(gs != null && gs.getIsLoading() == false){ d.getPlayer().useItem(d.getPlayer().getInv().getSelected()); } diff --git a/core/src/com/dungeoncrawler/model/DungeonGenerator.java b/core/src/com/dungeoncrawler/model/DungeonGenerator.java index ec55557..84b2bb6 100644 --- a/core/src/com/dungeoncrawler/model/DungeonGenerator.java +++ b/core/src/com/dungeoncrawler/model/DungeonGenerator.java @@ -7,6 +7,7 @@ package com.dungeoncrawler.model; import com.dungeoncrawler.model.entities.*; import com.dungeoncrawler.model.items.Amulet; +import com.dungeoncrawler.model.items.Potion; import com.dungeoncrawler.model.items.Key; import java.util.ArrayList; @@ -229,10 +230,10 @@ public class DungeonGenerator { tempItem = new Amulet(lvl); break; - /*case 1: - temp = new Swordsman(xPos, yPos, lvl); + case 1: + tempItem = new Potion(lvl); break; - */ + default: tempItem = null; } diff --git a/core/src/com/dungeoncrawler/view/EntitySprite.java b/core/src/com/dungeoncrawler/view/EntitySprite.java index 38b23ee..4db0c3d 100644 --- a/core/src/com/dungeoncrawler/view/EntitySprite.java +++ b/core/src/com/dungeoncrawler/view/EntitySprite.java @@ -153,6 +153,8 @@ public class EntitySprite implements Comparable { frames[1]++; } + System.out.println(die); + sprites[0].setRegion(regions[0][0][frames[1]]); updateFlip(); } diff --git a/core/src/com/dungeoncrawler/view/MapGenerator.java b/core/src/com/dungeoncrawler/view/MapGenerator.java index c6d0669..cb84458 100644 --- a/core/src/com/dungeoncrawler/view/MapGenerator.java +++ b/core/src/com/dungeoncrawler/view/MapGenerator.java @@ -27,8 +27,9 @@ public class MapGenerator { TextureRegion[][][] allTiles; TextureRegion[][] splitTiles; Texture torchT; - Texture sword; + Texture amulet; Texture key; + Texture potion; public MapGenerator(Texture[] tiles){ allTiles = new TextureRegion[7][][]; @@ -37,8 +38,9 @@ public class MapGenerator { allTiles[i] = TextureRegion.split(tiles[i], 48, 48); } torchT = new Texture("sprites/torch.png"); - sword = new Texture("sprites/amulet.png"); + amulet = new Texture("sprites/amulet.png"); key = new Texture("sprites/key.png"); + potion = new Texture("sprites/potion.png"); } public Map generateMap(Dungeon d){ @@ -333,9 +335,13 @@ public class MapGenerator { case 0: itemSprite = new AnimatedObject(key, 48, 48); break; - + + case 1: + itemSprite = new AnimatedObject(potion, 48, 48); + break; + case 2: - itemSprite = new AnimatedObject(sword, 48, 48); + itemSprite = new AnimatedObject(amulet, 48, 48); break; } diff --git a/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java b/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java index a4ee41e..9a956a0 100644 --- a/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java +++ b/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java @@ -17,4 +17,4 @@ public class DesktopLauncher { //config.addIcon("logo.png", Files.FileType.Internale); new LwjglApplication(new Controller(), config); } -} +} \ No newline at end of file