diff --git a/core/assets/sprites/controlsContainer.PNG b/core/assets/sprites/controlsContainer.PNG new file mode 100644 index 0000000..a618593 Binary files /dev/null and b/core/assets/sprites/controlsContainer.PNG differ diff --git a/core/assets/sprites/female.png b/core/assets/sprites/female.png index cd30f98..75074d8 100644 Binary files a/core/assets/sprites/female.png and b/core/assets/sprites/female.png differ diff --git a/core/assets/sprites/male.png b/core/assets/sprites/male.png index 5bbc348..9764149 100644 Binary files a/core/assets/sprites/male.png and b/core/assets/sprites/male.png differ diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index 5cfb79d..c99f571 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -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 && ps == null){ + if(es == null){ isPaused = true; entityMovement.stop(); gs.end(); @@ -896,9 +896,8 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ } return true; case 11: - ps = null; - end = true; - break; + create(); + return true; } if(gs != null && gs.getIsLoading() == false){ diff --git a/core/src/com/dungeoncrawler/view/ControlsScreen.java b/core/src/com/dungeoncrawler/view/ControlsScreen.java index 194bc86..d5597ef 100644 --- a/core/src/com/dungeoncrawler/view/ControlsScreen.java +++ b/core/src/com/dungeoncrawler/view/ControlsScreen.java @@ -23,10 +23,9 @@ public class ControlsScreen { float h; BitmapFont font; - Texture backButtonTexture; - Sprite backButtonSprite; + Sprite controlsContainerSprite; public ControlsScreen(){ w = Gdx.graphics.getWidth(); @@ -36,6 +35,9 @@ public class ControlsScreen { backButtonSprite = new Sprite(new Texture("sprites/backButton.png")); backButtonSprite.setPosition(0,0); + controlsContainerSprite = new Sprite(new Texture("sprites/controlsContainer.png")); + controlsContainerSprite.setPosition(480,180); + } @@ -44,35 +46,38 @@ public class ControlsScreen { Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); batch.begin(); - 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); + controlsContainerSprite.draw(batch); + + font.draw(batch,"UP:", controlsContainerSprite.getX() + 20, controlsContainerSprite.getY()+380); + font.draw(batch,"W", controlsContainerSprite.getX() + 220, controlsContainerSprite.getY()+380); + font.draw(batch,"LEFT:", controlsContainerSprite.getX() + 20, controlsContainerSprite.getY()+360); + font.draw(batch,"A", controlsContainerSprite.getX() + 220, controlsContainerSprite.getY()+360); + font.draw(batch,"DOWN:", controlsContainerSprite.getX() + 20, controlsContainerSprite.getY()+340); + font.draw(batch,"S", controlsContainerSprite.getX() + 220, controlsContainerSprite.getY()+340); + font.draw(batch,"RIGHT:", controlsContainerSprite.getX() + 20, controlsContainerSprite.getY()+320); + font.draw(batch,"D", controlsContainerSprite.getX() + 220, controlsContainerSprite.getY()+320); + + font.draw(batch,"SHOOT UP:", controlsContainerSprite.getX() + 20, controlsContainerSprite.getY()+280); + font.draw(batch,"ARROW-KEY UP", controlsContainerSprite.getX() + 220, controlsContainerSprite.getY()+280); + font.draw(batch,"SHOOT LEFT:", controlsContainerSprite.getX() + 20, controlsContainerSprite.getY()+260); + font.draw(batch,"ARROW-KEY LEFT", controlsContainerSprite.getX() + 220, controlsContainerSprite.getY()+260); + font.draw(batch,"SHOOT DOWN:", controlsContainerSprite.getX() + 20, controlsContainerSprite.getY()+240); + font.draw(batch,"ARROW-KEY DOWN", controlsContainerSprite.getX() + 220, controlsContainerSprite.getY()+240); + font.draw(batch,"SHOOT RIGHT:", controlsContainerSprite.getX() + 20, controlsContainerSprite.getY()+220); + font.draw(batch,"ARROW-KEY RIGHT", controlsContainerSprite.getX() + 220, controlsContainerSprite.getY()+220); - font.draw(batch,"MELEE ATTACK:", 500, 320); - font.draw(batch,"SPACE", 700, 320); + font.draw(batch,"MELEE ATTACK:", controlsContainerSprite.getX() + 20, controlsContainerSprite.getY()+180); + font.draw(batch,"SPACE", controlsContainerSprite.getX() + 220, controlsContainerSprite.getY()+180); - 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); + font.draw(batch,"EQUIP ITEM:", controlsContainerSprite.getX() + 20, controlsContainerSprite.getY()+140); + font.draw(batch,"R", controlsContainerSprite.getX() + 220, controlsContainerSprite.getY()+140); + font.draw(batch,"DROP ITEM:", controlsContainerSprite.getX() + 20, controlsContainerSprite.getY()+120); + font.draw(batch,"Q", controlsContainerSprite.getX() + 220, controlsContainerSprite.getY()+120); + font.draw(batch,"USE ITEM:", controlsContainerSprite.getX() + 20, controlsContainerSprite.getY()+100); + font.draw(batch,"E", controlsContainerSprite.getX() + 220, controlsContainerSprite.getY()+100); + font.draw(batch,"SELECT ITEM:", controlsContainerSprite.getX() + 20, controlsContainerSprite.getY()+80); + font.draw(batch,"SCROLL WHEEL", controlsContainerSprite.getX() + 220, controlsContainerSprite.getY()+80); backButtonSprite.draw(batch); batch.end(); diff --git a/core/src/com/dungeoncrawler/view/MainMenuScreen.java b/core/src/com/dungeoncrawler/view/MainMenuScreen.java index ae66e60..ebeb92c 100644 --- a/core/src/com/dungeoncrawler/view/MainMenuScreen.java +++ b/core/src/com/dungeoncrawler/view/MainMenuScreen.java @@ -124,8 +124,8 @@ public class MainMenuScreen{ buttonRight.setPosition(skinContainer.getX() + 106, skinContainer.getY()+25); playerSprite.setPosition(skinContainer.getX() + 50, skinContainer.getY() + 15); - maleButton.setPosition(skinContainer.getX()+165, skinContainer.getY()+25); - femaleButton.setPosition(skinContainer.getX()+165, skinContainer.getY()+25); + maleButton.setPosition(skinContainer.getX()+165, skinContainer.getY()); + femaleButton.setPosition(skinContainer.getX()+165, skinContainer.getY()); preview = new Timer(); preview.scheduleTask(new Timer.Task() {