master
GammelJAN 6 years ago
parent d87ca33e7f
commit bae9b2c331

@ -62,11 +62,13 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
boolean isPaused; boolean isPaused;
int playerSkin;
@Override @Override
public void create(){ public void create(){
playerSkin = 0;
isPaused = false; isPaused = false;
volume = 0.05f; volume = 0.05f;
@ -792,7 +794,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
return true; return true;
case 6: case 6:
playerSkin = mm.getSkin(); d.getPlayer().setSkin(mm.getSkin());
return true; return true;

@ -18,9 +18,11 @@ public class Player extends Entity {
float standartDmg; float standartDmg;
float standartMaxHp; float standartMaxHp;
int skin;
public Player() { public Player() {
super(200, 200, 1); super(200, 200, 1);
this.skin = 0;
this.maxhp = 100 * lvl; this.maxhp = 100 * lvl;
this.hp = this.maxhp; this.hp = this.maxhp;
this.standartMaxHp = 100 * lvl; this.standartMaxHp = 100 * lvl;
@ -125,4 +127,11 @@ public class Player extends Entity {
inv.deleteKey(); inv.deleteKey();
} }
public void setSkin(int i){
skin = i;
}
public int getSkin(){
return skin;
}
} }

@ -67,10 +67,27 @@ public class GameScreen {
//PLAYER //PLAYER
Texture[] playerTexture = new Texture[4]; Texture[] playerTexture = new Texture[4];
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[0] = new Texture(Gdx.files.internal("sprites/playerblue.png"));
playerTexture[1] = 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[2] = new Texture(Gdx.files.internal("sprites/playerblue.png"));
playerTexture[3] = 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); player = new EntitySprite(playerTexture, 64, 64);

@ -93,7 +93,7 @@ public class MainMenuScreen{
//PLAYER PREVIEW //PLAYER PREVIEW
playerRegion = new TextureRegion[3][][]; playerRegion = new TextureRegion[3][][];
shownPlayer = 2; shownPlayer = 0;
animationState = 0; animationState = 0;
playerRegion[0] = TextureRegion.split(new Texture("sprites/player.png"), 64, 64); 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")); skinContainer = new Sprite(new Texture("sprites/skinContainer.png"));
buttonLeft = new Sprite(new Texture("sprites/right.png")); buttonLeft = new Sprite(new Texture("sprites/left.png"));
buttonRight = new Sprite(new Texture("sprites/left.png")); buttonRight = new Sprite(new Texture("sprites/right.png"));
skinContainer.setPosition(800, 400); skinContainer.setPosition(800, 400);
buttonRight.setPosition(skinContainer.getX() + 8, skinContainer.getY()+8); buttonLeft.setPosition(skinContainer.getX() + 8, skinContainer.getY()+8);
buttonLeft.setPosition(skinContainer.getX() + 110, skinContainer.getY()+8); buttonRight.setPosition(skinContainer.getX() + 110, skinContainer.getY()+8);
playerSprite.setPosition(skinContainer.getX() + 51, skinContainer.getY() + 8); playerSprite.setPosition(skinContainer.getX() + 51, skinContainer.getY() + 8);
preview = new Timer(); preview = new Timer();
@ -170,17 +170,19 @@ public class MainMenuScreen{
return 2; //Settings return 2; //Settings
} }
if(Intersector.overlaps(r, buttonLeft.getBoundingRectangle())){ if(Intersector.overlaps(r, buttonLeft.getBoundingRectangle())){
if(shownPlayer != 0){ if(shownPlayer > 0){
shownPlayer--; //Settings shownPlayer--;
}
return 6; return 6;
} }
if(Intersector.overlaps(r, buttonRight.getBoundingRectangle())){ return -1;
if(shownPlayer != 2){
shownPlayer++; //Settings
} }
if(Intersector.overlaps(r, buttonRight.getBoundingRectangle())){
if(shownPlayer < 2){
shownPlayer++;
return 6; return 6;
} }
return -1;
}
} }
return -1; return -1;

Loading…
Cancel
Save