JonathanHager
/
dungeoncrawler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ehre

Browse Source
master
GammelJan 6 years ago
parent fbd4ed68cf
commit b938426bfa
6 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File

35
core/src/com/dungeoncrawler/control/Controller.java
Unescape View File

@ -9,6 +9,7 @@ import com.badlogic.gdx.ApplicationAdapter;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import com.badlogic.gdx.InputProcessor; import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.maps.MapLayers; import com.badlogic.gdx.maps.MapLayers;
import com.badlogic.gdx.maps.MapObjects; import com.badlogic.gdx.maps.MapObjects;
@ -67,11 +68,14 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
boolean checkDoor; boolean checkDoor;
boolean checkDie; boolean checkDie;
boolean end;
@Override @Override
public void create(){ public void create(){
checkDoor = true; checkDoor = false;
checkDie = true; checkDie = false;
end = false;
playerSkin = 0; playerSkin = 0;
isPaused = false; isPaused = false;
@ -94,7 +98,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
roomAmount = d.getLevel()[0].getRooms().length; roomAmount = d.getLevel()[0].getRooms().length;
level = 0; level = 6;
roomPosX = roomAmount / 2; roomPosX = roomAmount / 2;
roomPosY = roomAmount / 2; roomPosY = roomAmount / 2;
@ -289,10 +293,22 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
@Override @Override
public void render(){ public void render(){
Gdx.gl.glClearColor(0, 0, 0, 1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
//PASSIERT IN MAINMENU if(end == true){
if(es != null){ if(es == null){
es.render(batch, volume, gs.getCamera()); 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){ if(mm != null){
mm.render(batch); mm.render(batch);
@ -499,9 +515,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
roomPosY = roomAmount / 2; roomPosY = roomAmount / 2;
} }
else{ // Dungeon Exit else{ // Dungeon Exit
gs.stop(); end = true;
create();
return; 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){ if(gs != null && gs.getIsLoading() == false && isPaused == false){
stop(); stop();
} }
@ -873,6 +887,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
} }
return true; return true;
case 11: case 11:
//create();
break; break;
} }

11
core/src/com/dungeoncrawler/view/EndScreen.java
Unescape View File

@ -26,28 +26,23 @@ public class EndScreen {
public EndScreen(){ public EndScreen(){
backButton = new Sprite(new Texture("sprites/backButton.png")); 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) { public void render (SpriteBatch batch, float volume) {
Gdx.gl.glClearColor(0, 0, 0, 1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
batch.begin(); batch.begin();
camera.update();
batch.setProjectionMatrix(camera.combined);
backButton.draw(batch); backButton.draw(batch);
batch.end(); 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); Rectangle r = new Rectangle(x,y,1,1);
if(Intersector.overlaps(r, backButton.getBoundingRectangle())){ if(Intersector.overlaps(r, backButton.getBoundingRectangle())){
return 11; //NEUSTART return 11; //NEUSTART
} }
return -1; return -1;
//return -1;
} }
} }

10
core/src/com/dungeoncrawler/view/GameScreen.java
Unescape View File

@ -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) { public void render (SpriteBatch batch, Player p, Entity[] e, int tileX, int tileY, int level, int roomPosX, int roomPosY) {
entities = e; entities = e;
Gdx.gl.glClearColor(0, 0, 0, 1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
this.p = p; this.p = p;
@ -468,15 +466,15 @@ public class GameScreen {
} }
public void stop(){ public void stop(){
cleanUp(); camera.zoom = 1600;
camera.translate(625f, 241f);
animations.stop(); animations.stop();
animatePlayer.stop(); animatePlayer.stop();
camera.zoom = 1600; music.dispose();
camera.translate(-175f, -215f);
} }
public void resume(){ public void resume(){
camera.zoom = 700; camera.zoom = 700;
camera.translate(175f, 215f); camera.translate(-625f, -241f);
animations.start(); animations.start();
animatePlayer.start(); animatePlayer.start();
} }

3
core/src/com/dungeoncrawler/view/MainMenuScreen.java
Unescape View File

@ -139,8 +139,7 @@ public class MainMenuScreen{
public void render (SpriteBatch batch) { public void render (SpriteBatch batch) {
Gdx.gl.glClearColor(0, 0, 0, 1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
batch.begin(); batch.begin();
//batch.setProjectionMatrix(camera.combined); //batch.setProjectionMatrix(camera.combined);

7
core/src/com/dungeoncrawler/view/PauseScreen.java
Unescape View File

@ -63,10 +63,9 @@ public class PauseScreen{
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
volumeButtonSprite.setPosition(-140, 150); volumeButtonSprite.setPosition(0, 150);
volumeDownSprite.setPosition(volumeButtonSprite.getX() + 230, volumeButtonSprite.getY()+28); volumeDownSprite.setPosition(volumeButtonSprite.getX() + 230, volumeButtonSprite.getY()+28);
volumeUpSprite.setPosition(volumeButtonSprite.getX() + 340, volumeButtonSprite.getY()+28); volumeUpSprite.setPosition(volumeButtonSprite.getX() + 340, volumeButtonSprite.getY()+28);
//backButtonSprite.setPosition(-140, 50);
backButtonSprite.setPosition(0, 0); backButtonSprite.setPosition(0, 0);
@ -107,12 +106,12 @@ public class PauseScreen{
Rectangle r = new Rectangle(); Rectangle r = new Rectangle();
r.set(x, h-y, 1600, 900); r.set(x, h-y, 1600, 900);
/*if(Intersector.overlaps(r, backButtonSprite.getBoundingRectangle())){ if(Intersector.overlaps(r, backButtonSprite.getBoundingRectangle())){
return 5; //proceed Game return 5; //proceed Game
} }
if(Intersector.overlaps(r, volumeDownSprite.getBoundingRectangle())){ if(Intersector.overlaps(r, volumeDownSprite.getBoundingRectangle())){
return 9; //volume DOWN return 9; //volume DOWN
}*/ }
if(Intersector.overlaps(r, volumeUpSprite.getBoundingRectangle())){ if(Intersector.overlaps(r, volumeUpSprite.getBoundingRectangle())){
return 10; //volume UP return 10; //volume UP
} }

3
desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java
Unescape View File

@ -11,10 +11,11 @@ public class DesktopLauncher {
config.width = 1600; config.width = 1600;
config.height = 900; 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; config.resizable = true;
new LwjglApplication(new Controller(), config); new LwjglApplication(new Controller(), config);
} }
} }
//aaaaaaaa
Write Preview
Loading…
Cancel
Save