diff --git a/core/assets/Player.png b/core/assets/Player.png deleted file mode 100644 index 543bef7..0000000 Binary files a/core/assets/Player.png and /dev/null differ diff --git a/core/assets/Swordsman.png b/core/assets/Swordsman.png deleted file mode 100644 index cf73c7e..0000000 Binary files a/core/assets/Swordsman.png and /dev/null differ diff --git a/core/assets/controls.png b/core/assets/controls.png deleted file mode 100644 index 4e72689..0000000 Binary files a/core/assets/controls.png and /dev/null differ diff --git a/core/assets/healingPotion.png b/core/assets/healingPotion.png deleted file mode 100644 index de1c734..0000000 Binary files a/core/assets/healingPotion.png and /dev/null differ diff --git a/core/assets/icon.png b/core/assets/icon.png deleted file mode 100644 index cf08d70..0000000 Binary files a/core/assets/icon.png and /dev/null differ diff --git a/core/assets/key.png b/core/assets/key.png deleted file mode 100644 index 2376f7f..0000000 Binary files a/core/assets/key.png and /dev/null differ diff --git a/core/assets/gamemusic.mp3 b/core/assets/music/gamemusic.mp3 similarity index 100% rename from core/assets/gamemusic.mp3 rename to core/assets/music/gamemusic.mp3 diff --git a/core/assets/mainmenu.mp3 b/core/assets/music/mainmenu.mp3 similarity index 100% rename from core/assets/mainmenu.mp3 rename to core/assets/music/mainmenu.mp3 diff --git a/core/assets/player.png b/core/assets/player.png deleted file mode 100644 index 1554e76..0000000 Binary files a/core/assets/player.png and /dev/null differ diff --git a/core/assets/AttackHori.png b/core/assets/sprites/AttackHori.png similarity index 100% rename from core/assets/AttackHori.png rename to core/assets/sprites/AttackHori.png diff --git a/core/assets/AttackVert.png b/core/assets/sprites/AttackVert.png similarity index 100% rename from core/assets/AttackVert.png rename to core/assets/sprites/AttackVert.png diff --git a/core/assets/MAINSCREEN.png b/core/assets/sprites/MAINSCREEN.png similarity index 100% rename from core/assets/MAINSCREEN.png rename to core/assets/sprites/MAINSCREEN.png diff --git a/core/assets/archer.png b/core/assets/sprites/archer.png similarity index 100% rename from core/assets/archer.png rename to core/assets/sprites/archer.png diff --git a/core/assets/cursor.png b/core/assets/sprites/cursor.png similarity index 100% rename from core/assets/cursor.png rename to core/assets/sprites/cursor.png diff --git a/core/assets/fullHealthEntity.png b/core/assets/sprites/fullHealthEntity.png similarity index 100% rename from core/assets/fullHealthEntity.png rename to core/assets/sprites/fullHealthEntity.png diff --git a/core/assets/halfHealthEntity.png b/core/assets/sprites/halfHealthEntity.png similarity index 100% rename from core/assets/halfHealthEntity.png rename to core/assets/sprites/halfHealthEntity.png diff --git a/core/assets/hud.png b/core/assets/sprites/hud.png similarity index 100% rename from core/assets/hud.png rename to core/assets/sprites/hud.png diff --git a/core/assets/logo.png b/core/assets/sprites/logo.png similarity index 100% rename from core/assets/logo.png rename to core/assets/sprites/logo.png diff --git a/core/assets/player2.png b/core/assets/sprites/player.png similarity index 100% rename from core/assets/player2.png rename to core/assets/sprites/player.png diff --git a/core/assets/quitButton.png b/core/assets/sprites/quitButton.png similarity index 100% rename from core/assets/quitButton.png rename to core/assets/sprites/quitButton.png diff --git a/core/assets/startButton.png b/core/assets/sprites/startButton.png similarity index 100% rename from core/assets/startButton.png rename to core/assets/sprites/startButton.png diff --git a/core/assets/sword.png b/core/assets/sprites/sword.png similarity index 100% rename from core/assets/sword.png rename to core/assets/sprites/sword.png diff --git a/core/assets/swordsman.png b/core/assets/sprites/swordsman.png similarity index 100% rename from core/assets/swordsman.png rename to core/assets/sprites/swordsman.png diff --git a/core/assets/tiles.png b/core/assets/tiles.png deleted file mode 100644 index dd573eb..0000000 Binary files a/core/assets/tiles.png and /dev/null differ diff --git a/core/assets/tileset_floor_1.png b/core/assets/tileset_floor_1.png deleted file mode 100644 index 6b62fac..0000000 Binary files a/core/assets/tileset_floor_1.png and /dev/null differ diff --git a/core/assets/tilesets/tileset_floor_1.png b/core/assets/tilesets/tileset_floor_1.png new file mode 100644 index 0000000..ab0fabe Binary files /dev/null and b/core/assets/tilesets/tileset_floor_1.png differ diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index 945e00e..89ef623 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/core/src/com/dungeoncrawler/view/GameScreen.java @@ -59,7 +59,7 @@ public class GameScreen { //PLAYER - p = new Texture("player2.png"); + p = new Texture("sprites/player.png"); regions = TextureRegion.split(p, 32, 32); player = new Sprite(regions[0][2]); player.setX(200); @@ -83,7 +83,7 @@ public class GameScreen { camera = new OrthographicCamera(1, h/w); camera.translate(300f, 200f); - MapGenerator mg = new MapGenerator(new Texture(Gdx.files.internal("tileset_floor_1.png"))); + MapGenerator mg = new MapGenerator(new Texture(Gdx.files.internal("tilesets/tileset_floor_1.png"))); TiledMap[][][] maps = mg.generateMap(d); m.setMaps(maps); @@ -92,7 +92,7 @@ public class GameScreen { tm = new TiledMap(); tmr = new OrthogonalTiledMapRenderer(tm); - music = Gdx.audio.newMusic(Gdx.files.internal("gamemusic.mp3")); + music = Gdx.audio.newMusic(Gdx.files.internal("music/gamemusic.mp3")); music.setVolume(volume); music.play(); @@ -143,14 +143,14 @@ public class GameScreen { for(int i = 0; i < e.length; i++){ if(e[i] != null){ if(e[i].getId() == 0){ //nimmt entity ID -> 0 = Archer || 1 = Swordsman || 2 = Arrow - entityTextures[i] = new Texture("archer.png"); + entityTextures[i] = new Texture("sprites/archer.png"); archerRegions = TextureRegion.split(entityTextures[i], 48, 48); entitySprites[i] = new Sprite(archerRegions[0][2]); entitySprites[i].setX(e[i].getxPos()); entitySprites[i].setY(e[i].getyPos()); } if(e[i].getId() == 1){ - entityTextures[i] = new Texture("swordsman.png"); + entityTextures[i] = new Texture("sprites/swordsman.png"); swordsmanRegions = TextureRegion.split(entityTextures[i], 48, 48); entitySprites[i] = new Sprite(swordsmanRegions[0][2]); entitySprites[i].setX(e[i].getxPos()); @@ -208,13 +208,13 @@ public class GameScreen { 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("halfHealthEntity.png"); + 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("fullHealthEntity.png"); + healthBar = new Texture("sprites/fullHealthEntity.png"); Sprite healthBarSprite = new Sprite(healthBar); healthBarSprite.setPosition(e[i].getxPos(), e[i].getyPos()); healthBarSprite.draw(batch); @@ -236,7 +236,7 @@ public class GameScreen { public Entity[] playerAttack(Entity e[], Player p){ if(p.direction() == 0){ - Texture verticalAttack = new Texture("AttackVert.png"); + Texture verticalAttack = new Texture("sprites/AttackVert.png"); Sprite verticalAttackSprite = new Sprite(verticalAttack); verticalAttackSprite.setX(p.getxPos()-2f); verticalAttackSprite.setY(p.getyPos()-2f); @@ -256,7 +256,7 @@ public class GameScreen { } } else if(p.direction() == 1){ - Texture horizontalAttack = new Texture("AttackHori.png"); + Texture horizontalAttack = new Texture("sprites/AttackHori.png"); Sprite horizontalAttackSprite = new Sprite(horizontalAttack); horizontalAttackSprite.setX(p.getxPos()-2f); horizontalAttackSprite.setY(p.getyPos()-2f); @@ -276,7 +276,7 @@ public class GameScreen { } } else if(p.direction() == 2){ - Texture verticalAttack = new Texture("AttackVert.png"); + Texture verticalAttack = new Texture("sprites/AttackVert.png"); Sprite verticalAttackSprite = new Sprite(verticalAttack); verticalAttackSprite.setX(p.getxPos()-2f); verticalAttackSprite.setY(p.getyPos() - 24f-2f); @@ -296,7 +296,7 @@ public class GameScreen { } } else if(p.direction() == 3){ - Texture horizontalAttack = new Texture("AttackHori.png"); + Texture horizontalAttack = new Texture("sprites/AttackHori.png"); Sprite horizontalAttackSprite = new Sprite(horizontalAttack); horizontalAttackSprite.setX(p.getxPos() - 24f-2f); horizontalAttackSprite.setY(p.getyPos() -2f); diff --git a/core/src/com/dungeoncrawler/view/MainMenu.java b/core/src/com/dungeoncrawler/view/MainMenu.java index cfb45cd..65b1669 100644 --- a/core/src/com/dungeoncrawler/view/MainMenu.java +++ b/core/src/com/dungeoncrawler/view/MainMenu.java @@ -38,9 +38,9 @@ public class MainMenu{ - startButtonTexture = new Texture("startButton.png"); - quitButtonTexture = new Texture("quitButton.png"); - backgroundTexture = new Texture("MAINSCREEN.png"); + startButtonTexture = new Texture("sprites/startButton.png"); + quitButtonTexture = new Texture("sprites/quitButton.png"); + backgroundTexture = new Texture("sprites/MAINSCREEN.png"); startButtonSprite = new Sprite(startButtonTexture); quitButtonSprite = new Sprite(quitButtonTexture); @@ -59,7 +59,7 @@ public class MainMenu{ camera.zoom = 1150f; camera.update(); */ - Pixmap pm = new Pixmap(Gdx.files.internal("cursor.png")); + Pixmap pm = new Pixmap(Gdx.files.internal("sprites/cursor.png")); Gdx.graphics.setCursor(Gdx.graphics.newCursor(pm, 0, 0)); pm.dispose(); @@ -68,7 +68,7 @@ public class MainMenu{ //PLAYER // Sound - music = Gdx.audio.newMusic(Gdx.files.internal("mainmenu.mp3")); + music = Gdx.audio.newMusic(Gdx.files.internal("music/mainmenu.mp3")); music.setVolume(volume); music.play();