diff --git a/core/assets/sprites/MAINSCREEN.png b/core/assets/sprites/MAINSCREEN.png index 15c20f4..7cf5af8 100644 Binary files a/core/assets/sprites/MAINSCREEN.png and b/core/assets/sprites/MAINSCREEN.png differ diff --git a/core/assets/sprites/firespell.png b/core/assets/sprites/firespell.png index e03a40d..88fd816 100644 Binary files a/core/assets/sprites/firespell.png and b/core/assets/sprites/firespell.png differ diff --git a/core/assets/sprites/restartButton.png b/core/assets/sprites/restartButton.png new file mode 100644 index 0000000..763c305 Binary files /dev/null and b/core/assets/sprites/restartButton.png differ diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index 737e3da..bca4b5f 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -73,7 +73,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ @Override public void create(){ - checkDoor = false; + checkDoor = true; checkDie = true; end = false; @@ -101,7 +101,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ roomAmount = d.getLevel()[0].getRooms().length; - level = 6; + level = 0; roomPosX = roomAmount / 2; roomPosY = roomAmount / 2; @@ -472,7 +472,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ // oben if(tileX == (roomX / 2) && tileY == roomY){ - System.out.println("oben"); roomPosY += 1; d.getPlayer().setxPos((roomX / 2)* 48); @@ -481,7 +480,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ // rechts if(tileX == roomX && tileY == (roomY / 2)){ - System.out.println("rechts"); roomPosX += 1; d.getPlayer().setxPos(48); @@ -490,7 +488,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ // unten if(tileX == (roomX / 2) && tileY == 0){ - System.out.println("unten"); roomPosY -= 1; d.getPlayer().setxPos((roomX / 2)*48); @@ -499,7 +496,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ // links if(tileX == 0 && tileY == (roomY / 2)){ - System.out.println("links"); roomPosX -= 1; d.getPlayer().setxPos((roomX*48) - 48); diff --git a/core/src/com/dungeoncrawler/view/EndScreen.java b/core/src/com/dungeoncrawler/view/EndScreen.java index 7a3e148..61b6e50 100644 --- a/core/src/com/dungeoncrawler/view/EndScreen.java +++ b/core/src/com/dungeoncrawler/view/EndScreen.java @@ -23,7 +23,7 @@ public class EndScreen { float w; float h; - Sprite backButton; + Sprite restartButton; public EndScreen(){ @@ -31,21 +31,21 @@ public class EndScreen { h = Gdx.graphics.getHeight(); float wc = w/2; - backButton = new Sprite(new Texture("sprites/backButton.png")); - backButton.setPosition(0, 0); + restartButton = new Sprite(new Texture("sprites/restartButton.png")); + restartButton.setPosition(w / 2 - restartButton.getWidth() / 2, h / 2 - restartButton.getHeight() / 2); } public void render (SpriteBatch batch, float volume) { batch.begin(); - backButton.draw(batch); + restartButton.draw(batch); batch.end(); } public int click(int x, int y){ Rectangle r = new Rectangle(x,h-y,1,1); - if(Intersector.overlaps(r, backButton.getBoundingRectangle())){ + if(Intersector.overlaps(r, restartButton.getBoundingRectangle())){ return 11; //NEUSTART } return -1; diff --git a/core/src/com/dungeoncrawler/view/MainMenuScreen.java b/core/src/com/dungeoncrawler/view/MainMenuScreen.java index 0a7ce8b..ee5a966 100644 --- a/core/src/com/dungeoncrawler/view/MainMenuScreen.java +++ b/core/src/com/dungeoncrawler/view/MainMenuScreen.java @@ -79,6 +79,7 @@ public class MainMenuScreen{ settingsButtonSprite.setY(backgroundSprite.getY() + 250); + //camera = new OrthographicCamera(1, h/w); //camera.translate(backgroundSprite.getWidth()/2, backgroundSprite.getHeight()/2); //camera.zoom = 1150f; diff --git a/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java b/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java index e32d395..a66a374 100644 --- a/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java +++ b/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java @@ -11,11 +11,11 @@ public class DesktopLauncher { config.width = 1600; config.height = 900; - config.title = "The Restless Caverns - Der beste Dungeon Crawler ALLER ZEITEN"; + config.title = "THE RESTLESS CAVERNS"; config.resizable = true; new LwjglApplication(new Controller(), config); } } -//aaaaaaaa \ No newline at end of file +// \ No newline at end of file