GammelJan 6 years ago
parent c1959c03c2
commit 3a822ef813

@ -303,7 +303,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
if(end == true){
if(es == null){
if(es == null && ps == null){
isPaused = true;
entityMovement.stop();
gs.end();
@ -896,7 +896,8 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
}
return true;
case 11:
create();
ps = null;
end = true;
break;
}

@ -8,6 +8,7 @@ package com.dungeoncrawler.view;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.Sprite;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.math.Intersector;
@ -20,6 +21,7 @@ import com.badlogic.gdx.math.Rectangle;
public class ControlsScreen {
float w;
float h;
BitmapFont font;
Texture backButtonTexture;
@ -30,11 +32,10 @@ public class ControlsScreen {
w = Gdx.graphics.getWidth();
h = Gdx.graphics.getHeight();
float wc = w/2;
font = new BitmapFont();
backButtonTexture = new Texture("sprites/backButton.png");
backButtonSprite = new Sprite(backButtonTexture);
backButtonSprite = new Sprite(new Texture("sprites/backButton.png"));
backButtonSprite.setPosition(0,0);
}
@ -43,7 +44,36 @@ public class ControlsScreen {
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
batch.begin();
//batch.setProjectionMatrix(camera.combined);
font.draw(batch,"UP:", 500, 500);
font.draw(batch,"W", 700, 500);
font.draw(batch,"LEFT:", 500, 480);
font.draw(batch,"A", 700, 480);
font.draw(batch,"DOWN:", 500, 460);
font.draw(batch,"S", 700, 460);
font.draw(batch,"RIGHT:", 500, 440);
font.draw(batch,"D", 700, 440);
font.draw(batch,"SHOOT UP:", 500, 400);
font.draw(batch,"ARROW-KEY UP", 700, 400);
font.draw(batch,"SHOOT LEFT:", 500, 380);
font.draw(batch,"ARROW-KEY LEFT", 700, 380);
font.draw(batch,"SHOOT DOWN:", 500, 360);
font.draw(batch,"ARROW-KEY DOWN", 700, 360);
font.draw(batch,"SHOOT RIGHT:", 500, 340);
font.draw(batch,"ARROW-KEY RIGHT", 700, 340);
font.draw(batch,"MELEE ATTACK:", 500, 320);
font.draw(batch,"SPACE", 700, 320);
font.draw(batch,"EQUIP ITEM:", 500, 280);
font.draw(batch,"R", 700, 280);
font.draw(batch,"DROP ITEM:", 500, 260);
font.draw(batch,"Q", 700, 260);
font.draw(batch,"USE ITEM:", 500, 240);
font.draw(batch,"E", 700, 240);
font.draw(batch,"CHANCE SELECTED ITEM:", 500, 220);
font.draw(batch,"SCROLL WHEEL", 700, 220);
backButtonSprite.draw(batch);
batch.end();
}

@ -84,9 +84,7 @@ public class MainMenuScreen{
startButtonSprite.setY(backgroundSprite.getY() + 350);
quitButtonSprite.setX(backgroundSprite.getX() + 100);
quitButtonSprite.setY(backgroundSprite.getY() + 50);
settingsButtonSprite.setX(backgroundSprite.getX() + 100);
settingsButtonSprite.setY(backgroundSprite.getY() + 250);
settingsButtonSprite.setPosition(backgroundSprite.getX() + 100, backgroundSprite.getX() + 150);
@ -121,7 +119,7 @@ public class MainMenuScreen{
buttonLeft = new Sprite(new Texture("sprites/left.png"));
buttonRight = new Sprite(new Texture("sprites/right.png"));
skinContainer.setPosition(backgroundSprite.getX() + 100, backgroundSprite.getX() + 150);
skinContainer.setPosition(backgroundSprite.getX() + 100,backgroundSprite.getY() + 250);
buttonLeft.setPosition(skinContainer.getX() + 7, skinContainer.getY()+25);
buttonRight.setPosition(skinContainer.getX() + 106, skinContainer.getY()+25);
playerSprite.setPosition(skinContainer.getX() + 50, skinContainer.getY() + 15);

@ -30,12 +30,14 @@ public class PauseScreen{
Texture volumeDownTexture;
Texture volumeTexture;
Texture backButtonTexture;
Texture quitButtonTexture;
Sprite volumeButtonSprite;
Sprite volumeUpSprite;
Sprite volumeDownSprite;
Sprite volumeSprite;
Sprite backButtonSprite;
Sprite quitButtonSprite;
public PauseScreen(){
@ -48,22 +50,25 @@ public class PauseScreen{
volumeDownTexture = new Texture("sprites/volumeDownButton.png");
volumeTexture = new Texture("sprites/volume.png");
backButtonTexture = new Texture("sprites/backButton.png");
quitButtonTexture = new Texture("sprites/quitButton.png");
volumeButtonSprite = new Sprite(volumeButtonTexture);
volumeUpSprite = new Sprite(volumeUpTexture);
volumeDownSprite = new Sprite(volumeDownTexture);
volumeSprite = new Sprite(volumeTexture);
backButtonSprite = new Sprite(backButtonTexture);
quitButtonSprite = new Sprite(quitButtonTexture);
}
public void render (SpriteBatch batch, float volume, OrthographicCamera camera) {
volumeButtonSprite.setPosition(0, 150);
volumeButtonSprite.setPosition(200, 500);
volumeDownSprite.setPosition(volumeButtonSprite.getX() + 230, volumeButtonSprite.getY()+28);
volumeUpSprite.setPosition(volumeButtonSprite.getX() + 340, volumeButtonSprite.getY()+28);
backButtonSprite.setPosition(0, 0);
quitButtonSprite.setPosition(200,300);
float n = 0;
@ -93,6 +98,7 @@ public class PauseScreen{
volumeDownSprite.draw(batch);
volumeSprite.draw(batch);
backButtonSprite.draw(batch);
//quitButtonSprite.draw(batch);
batch.end();
}
@ -103,6 +109,11 @@ public class PauseScreen{
Rectangle r = new Rectangle();
r.set(x, h-y, 1600, 900);
/*
if(Intersector.overlaps(r, quitButtonSprite.getBoundingRectangle())){
return 11; //restart Game
}
*/
if(Intersector.overlaps(r, backButtonSprite.getBoundingRectangle())){
return 5; //proceed Game
}
@ -113,6 +124,7 @@ public class PauseScreen{
return 10; //volume UP
}
return -1;
}

@ -68,7 +68,7 @@ public class SettingsScreen {
volumeButtonSprite.setPosition(200, 500);
volumeDownSprite.setPosition(volumeButtonSprite.getX() + 230, volumeButtonSprite.getY()+28);
volumeUpSprite.setPosition(volumeButtonSprite.getX() + 340, volumeButtonSprite.getY()+28);
backButtonSprite.setPosition(50, 50);
backButtonSprite.setPosition(0, 0);
float n = 0;

Loading…
Cancel
Save