From b938426bfa564f9a34c2f41b46e5d76a3c10ed38 Mon Sep 17 00:00:00 2001 From: GammelJan Date: Sat, 23 May 2020 12:54:25 +0200 Subject: [PATCH] ehre --- .../dungeoncrawler/control/Controller.java | 35 +++++++++++++------ .../com/dungeoncrawler/view/EndScreen.java | 11 ++---- .../com/dungeoncrawler/view/GameScreen.java | 10 +++--- .../dungeoncrawler/view/MainMenuScreen.java | 3 +- .../com/dungeoncrawler/view/PauseScreen.java | 7 ++-- .../desktop/DesktopLauncher.java | 5 +-- 6 files changed, 39 insertions(+), 32 deletions(-) diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index 61d0d04..729f385 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -9,6 +9,7 @@ import com.badlogic.gdx.ApplicationAdapter; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; import com.badlogic.gdx.InputProcessor; +import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.maps.MapLayers; import com.badlogic.gdx.maps.MapObjects; @@ -67,11 +68,14 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ boolean checkDoor; boolean checkDie; + boolean end; + @Override public void create(){ - checkDoor = true; - checkDie = true; + checkDoor = false; + checkDie = false; + end = false; playerSkin = 0; isPaused = false; @@ -94,7 +98,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ roomAmount = d.getLevel()[0].getRooms().length; - level = 0; + level = 6; roomPosX = roomAmount / 2; roomPosY = roomAmount / 2; @@ -289,10 +293,22 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ @Override public void render(){ + Gdx.gl.glClearColor(0, 0, 0, 1); + Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); - //PASSIERT IN MAINMENU - if(es != null){ - es.render(batch, volume, gs.getCamera()); + if(end == true){ + if(es == null){ + isPaused = true; + entityMovement.stop(); + gs.stop(); + gs.getCamera().update(); + batch.setProjectionMatrix(gs.getCamera().combined); + gs = null; + hc = null; + es = new EndScreen(); + } + es.render(batch, volume); + return; } if(mm != null){ mm.render(batch); @@ -499,9 +515,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ roomPosY = roomAmount / 2; } else{ // Dungeon Exit - gs.stop(); - create(); - + end = true; return; } } @@ -674,7 +688,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ } } - if(keycode == Input.Keys.ESCAPE){ + if(keycode == Input.Keys.ESCAPE && !end){ if(gs != null && gs.getIsLoading() == false && isPaused == false){ stop(); } @@ -873,6 +887,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ } return true; case 11: + //create(); break; } diff --git a/core/src/com/dungeoncrawler/view/EndScreen.java b/core/src/com/dungeoncrawler/view/EndScreen.java index 813db6f..f0f2838 100644 --- a/core/src/com/dungeoncrawler/view/EndScreen.java +++ b/core/src/com/dungeoncrawler/view/EndScreen.java @@ -26,28 +26,23 @@ public class EndScreen { public EndScreen(){ backButton = new Sprite(new Texture("sprites/backButton.png")); - backButton.setPosition(100, 100); + backButton.setPosition(0, 0); } - public void render (SpriteBatch batch, float volume, OrthographicCamera camera) { - Gdx.gl.glClearColor(0, 0, 0, 1); - Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); + public void render (SpriteBatch batch, float volume) { batch.begin(); - camera.update(); - batch.setProjectionMatrix(camera.combined); backButton.draw(batch); batch.end(); } - public int click(int x, int y){ // prueft ob cursor mit button (START) ueberlappt + public int click(int x, int y){ Rectangle r = new Rectangle(x,y,1,1); if(Intersector.overlaps(r, backButton.getBoundingRectangle())){ return 11; //NEUSTART } return -1; - //return -1; } } diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index f9e2ff1..7808a75 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/core/src/com/dungeoncrawler/view/GameScreen.java @@ -217,8 +217,6 @@ public class GameScreen { public void render (SpriteBatch batch, Player p, Entity[] e, int tileX, int tileY, int level, int roomPosX, int roomPosY) { entities = e; - Gdx.gl.glClearColor(0, 0, 0, 1); - Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); this.p = p; @@ -468,15 +466,15 @@ public class GameScreen { } public void stop(){ - cleanUp(); + camera.zoom = 1600; + camera.translate(625f, 241f); animations.stop(); animatePlayer.stop(); - camera.zoom = 1600; - camera.translate(-175f, -215f); + music.dispose(); } public void resume(){ camera.zoom = 700; - camera.translate(175f, 215f); + camera.translate(-625f, -241f); animations.start(); animatePlayer.start(); } diff --git a/core/src/com/dungeoncrawler/view/MainMenuScreen.java b/core/src/com/dungeoncrawler/view/MainMenuScreen.java index 5875b07..750565b 100644 --- a/core/src/com/dungeoncrawler/view/MainMenuScreen.java +++ b/core/src/com/dungeoncrawler/view/MainMenuScreen.java @@ -139,8 +139,7 @@ public class MainMenuScreen{ public void render (SpriteBatch batch) { - Gdx.gl.glClearColor(0, 0, 0, 1); - Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); + batch.begin(); //batch.setProjectionMatrix(camera.combined); diff --git a/core/src/com/dungeoncrawler/view/PauseScreen.java b/core/src/com/dungeoncrawler/view/PauseScreen.java index ba29456..b467ddd 100644 --- a/core/src/com/dungeoncrawler/view/PauseScreen.java +++ b/core/src/com/dungeoncrawler/view/PauseScreen.java @@ -63,10 +63,9 @@ public class PauseScreen{ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); - volumeButtonSprite.setPosition(-140, 150); + volumeButtonSprite.setPosition(0, 150); volumeDownSprite.setPosition(volumeButtonSprite.getX() + 230, volumeButtonSprite.getY()+28); volumeUpSprite.setPosition(volumeButtonSprite.getX() + 340, volumeButtonSprite.getY()+28); - //backButtonSprite.setPosition(-140, 50); backButtonSprite.setPosition(0, 0); @@ -107,12 +106,12 @@ public class PauseScreen{ Rectangle r = new Rectangle(); r.set(x, h-y, 1600, 900); - /*if(Intersector.overlaps(r, backButtonSprite.getBoundingRectangle())){ + if(Intersector.overlaps(r, backButtonSprite.getBoundingRectangle())){ return 5; //proceed Game } if(Intersector.overlaps(r, volumeDownSprite.getBoundingRectangle())){ return 9; //volume DOWN - }*/ + } if(Intersector.overlaps(r, volumeUpSprite.getBoundingRectangle())){ return 10; //volume UP } diff --git a/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java b/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java index 6c5d2a3..2daa934 100644 --- a/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java +++ b/desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java @@ -11,10 +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 fRestless Caverns - Der beste Dungeon Crawler ALLER ZEITEN"; config.resizable = true; new LwjglApplication(new Controller(), config); } -} \ No newline at end of file +} +//aaaaaaaa \ No newline at end of file