diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index b7ff80b..adbe839 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -62,11 +62,13 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ boolean isPaused; + int playerSkin; + @Override public void create(){ - + playerSkin = 0; isPaused = false; volume = 0.05f; @@ -792,7 +794,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ return true; case 6: - playerSkin = mm.getSkin(); + d.getPlayer().setSkin(mm.getSkin()); return true; diff --git a/core/src/com/dungeoncrawler/model/entities/Player.java b/core/src/com/dungeoncrawler/model/entities/Player.java index 0e170e0..aceb7a7 100644 --- a/core/src/com/dungeoncrawler/model/entities/Player.java +++ b/core/src/com/dungeoncrawler/model/entities/Player.java @@ -18,9 +18,11 @@ public class Player extends Entity { float standartDmg; float standartMaxHp; + int skin; + public Player() { super(200, 200, 1); - + this.skin = 0; this.maxhp = 100 * lvl; this.hp = this.maxhp; this.standartMaxHp = 100 * lvl; @@ -125,4 +127,11 @@ public class Player extends Entity { inv.deleteKey(); } + public void setSkin(int i){ + skin = i; + } + public int getSkin(){ + return skin; + } + } diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index a64f721..1ad39f1 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/core/src/com/dungeoncrawler/view/GameScreen.java @@ -67,10 +67,27 @@ public class GameScreen { //PLAYER Texture[] playerTexture = new Texture[4]; - playerTexture[0] = new Texture(Gdx.files.internal("sprites/playerblue.png")); - playerTexture[1] = new Texture(Gdx.files.internal("sprites/playerblue.png")); - playerTexture[2] = new Texture(Gdx.files.internal("sprites/playerblue.png")); - playerTexture[3] = new Texture(Gdx.files.internal("sprites/playerblue.png")); + switch(d.getPlayer().getSkin()){ + case 0: + playerTexture[0] = new Texture(Gdx.files.internal("sprites/player.png")); + playerTexture[1] = new Texture(Gdx.files.internal("sprites/player.png")); + playerTexture[2] = new Texture(Gdx.files.internal("sprites/player.png")); + playerTexture[3] = new Texture(Gdx.files.internal("sprites/player.png")); + break; + case 1: + playerTexture[0] = new Texture(Gdx.files.internal("sprites/playerblue.png")); + playerTexture[1] = new Texture(Gdx.files.internal("sprites/playerblue.png")); + playerTexture[2] = new Texture(Gdx.files.internal("sprites/playerblue.png")); + playerTexture[3] = new Texture(Gdx.files.internal("sprites/playerblue.png")); + break; + case 2: + playerTexture[0] = new Texture(Gdx.files.internal("sprites/playerpurple.png")); + playerTexture[1] = new Texture(Gdx.files.internal("sprites/playerpurple.png")); + playerTexture[2] = new Texture(Gdx.files.internal("sprites/playerpurple.png")); + playerTexture[3] = new Texture(Gdx.files.internal("sprites/playerpurple.png")); + break; + } + player = new EntitySprite(playerTexture, 64, 64); diff --git a/core/src/com/dungeoncrawler/view/MainMenuScreen.java b/core/src/com/dungeoncrawler/view/MainMenuScreen.java index 0c1cecc..c5ad846 100644 --- a/core/src/com/dungeoncrawler/view/MainMenuScreen.java +++ b/core/src/com/dungeoncrawler/view/MainMenuScreen.java @@ -93,7 +93,7 @@ public class MainMenuScreen{ //PLAYER PREVIEW playerRegion = new TextureRegion[3][][]; - shownPlayer = 2; + shownPlayer = 0; animationState = 0; playerRegion[0] = TextureRegion.split(new Texture("sprites/player.png"), 64, 64); @@ -103,12 +103,12 @@ public class MainMenuScreen{ skinContainer = new Sprite(new Texture("sprites/skinContainer.png")); - buttonLeft = new Sprite(new Texture("sprites/right.png")); - buttonRight = new Sprite(new Texture("sprites/left.png")); + buttonLeft = new Sprite(new Texture("sprites/left.png")); + buttonRight = new Sprite(new Texture("sprites/right.png")); skinContainer.setPosition(800, 400); - buttonRight.setPosition(skinContainer.getX() + 8, skinContainer.getY()+8); - buttonLeft.setPosition(skinContainer.getX() + 110, skinContainer.getY()+8); + buttonLeft.setPosition(skinContainer.getX() + 8, skinContainer.getY()+8); + buttonRight.setPosition(skinContainer.getX() + 110, skinContainer.getY()+8); playerSprite.setPosition(skinContainer.getX() + 51, skinContainer.getY() + 8); preview = new Timer(); @@ -170,16 +170,18 @@ public class MainMenuScreen{ return 2; //Settings } if(Intersector.overlaps(r, buttonLeft.getBoundingRectangle())){ - if(shownPlayer != 0){ - shownPlayer--; //Settings + if(shownPlayer > 0){ + shownPlayer--; + return 6; } - return 6; + return -1; } if(Intersector.overlaps(r, buttonRight.getBoundingRectangle())){ - if(shownPlayer != 2){ - shownPlayer++; //Settings + if(shownPlayer < 2){ + shownPlayer++; + return 6; } - return 6; + return -1; } } return -1;