EHRE

core/src/com/dungeoncrawler/control/Controller.java

@@ -73,7 +73,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
     @Override
     public void create(){
         
-        checkDoor = true;
+        checkDoor = false;
         checkDie = true;
         
         

core/src/com/dungeoncrawler/model/entities/Player.java

@@ -24,6 +24,7 @@ public class Player extends Entity {
     public Player() {
         super(200, 200, 1);
         this.skin = 0;
+        this.lvl = 1;
         this.gender = "m";
         this.maxhp = 100 * lvl;
         this.hp = this.maxhp;
@@ -40,11 +41,10 @@ public class Player extends Entity {
     }
     
     public void updateStats(int ey){
-        lvl = ey;
-        //hp = 100*ey * (hp/(100*(ey-1)));
-        //maxhp = 100 * ey;
-        standartMaxHp = 100 * ey;
-        standartDmg = 20 * ey;
+        this.lvl = ey+1;
+        this.maxhp = 100 * this.lvl;
+        this.standartMaxHp = 100 * this.lvl;
+        this.standartDmg = 20 * this.lvl;
         updateItems();
     }
     

core/src/com/dungeoncrawler/view/GameScreen.java

@@ -76,51 +76,14 @@ public class GameScreen {
                 //PLAYER
                 Texture[] playerTexture = new Texture[4];
                 String gender = d.getPlayer().getGender();
-                switch(d.getPlayer().getSkin()){
-                    case 0:
-                        playerTexture[0] = new Texture(Gdx.files.internal("sprites/player/player_"+gender+".png"));
-                        playerTexture[1] = new Texture(Gdx.files.internal("sprites/player/player_"+gender+".png"));
-                        playerTexture[2] = new Texture(Gdx.files.internal("sprites/player/player_"+gender+".png"));
-                        playerTexture[3] = new Texture(Gdx.files.internal("sprites/player/player_"+gender+".png"));
-                        break;
-                    case 1:
-                        playerTexture[0] = new Texture(Gdx.files.internal("sprites/player/playerblue_"+gender+".png"));
-                        playerTexture[1] = new Texture(Gdx.files.internal("sprites/player/playerblue_"+gender+".png"));
-                        playerTexture[2] = new Texture(Gdx.files.internal("sprites/player/playerblue_"+gender+".png"));
-                        playerTexture[3] = new Texture(Gdx.files.internal("sprites/player/playerblue_"+gender+".png"));
-                        break;
-                    case 2:
-                        playerTexture[0] = new Texture(Gdx.files.internal("sprites/player/playerpurple_"+gender+".png"));
-                        playerTexture[1] = new Texture(Gdx.files.internal("sprites/player/playerpurple_"+gender+".png"));
-                        playerTexture[2] = new Texture(Gdx.files.internal("sprites/player/playerpurple_"+gender+".png"));
-                        playerTexture[3] = new Texture(Gdx.files.internal("sprites/player/playerpurple_"+gender+".png"));
-                        break;
-                    case 3:
-                        playerTexture[0] = new Texture(Gdx.files.internal("sprites/player/playergreen_"+gender+".png"));
-                        playerTexture[1] = new Texture(Gdx.files.internal("sprites/player/playergreen_"+gender+".png"));
-                        playerTexture[2] = new Texture(Gdx.files.internal("sprites/player/playergreen_"+gender+".png"));
-                        playerTexture[3] = new Texture(Gdx.files.internal("sprites/player/playergreen_"+gender+".png"));
-                        break;
-                    case 4:
-                        playerTexture[0] = new Texture(Gdx.files.internal("sprites/player/playerorange_"+gender+".png"));
-                        playerTexture[1] = new Texture(Gdx.files.internal("sprites/player/playerorange_"+gender+".png"));
-                        playerTexture[2] = new Texture(Gdx.files.internal("sprites/player/playerorange_"+gender+".png"));
-                        playerTexture[3] = new Texture(Gdx.files.internal("sprites/player/playerorange_"+gender+".png"));
-                        break;
-                    case 5:
-                        playerTexture[0] = new Texture(Gdx.files.internal("sprites/player/playerblack_"+gender+".png"));
-                        playerTexture[1] = new Texture(Gdx.files.internal("sprites/player/playerblack_"+gender+".png"));
-                        playerTexture[2] = new Texture(Gdx.files.internal("sprites/player/playerblack_"+gender+".png"));
-                        playerTexture[3] = new Texture(Gdx.files.internal("sprites/player/playerblack_"+gender+".png"));
-                        break;
-                    case 6:
-                        playerTexture[0] = new Texture(Gdx.files.internal("sprites/player/playerred_"+gender+".png"));
-                        playerTexture[1] = new Texture(Gdx.files.internal("sprites/player/playerred_"+gender+".png"));
-                        playerTexture[2] = new Texture(Gdx.files.internal("sprites/player/playerred_"+gender+".png"));
-                        playerTexture[3] = new Texture(Gdx.files.internal("sprites/player/playerred_"+gender+".png"));
-                        break;
-                }
                 
+                
+                playerTexture[0] = new Texture(Gdx.files.internal("sprites/player/player_"+d.getPlayer().getSkin()+"_"+gender+".png"));
+                playerTexture[1] = new Texture(Gdx.files.internal("sprites/player/player_"+d.getPlayer().getSkin()+"_"+gender+".png"));
+                playerTexture[2] = new Texture(Gdx.files.internal("sprites/player/player_"+d.getPlayer().getSkin()+"_"+gender+".png"));
+                playerTexture[3] = new Texture(Gdx.files.internal("sprites/player/player_"+d.getPlayer().getSkin()+"_"+gender+".png"));
+                        
+                                
                 //DMG visualization
                 font = new BitmapFont();
                 font.setColor(1, 0, 0, 1);

core/src/com/dungeoncrawler/view/HudContainer.java

@@ -122,6 +122,10 @@ public class HudContainer {
             else{
                 n = 0.01f;
             }
+            
+            if(n > 1){
+                n = 1;
+            }
             Texture playerHealthTexture = new Texture("sprites/playerHealthBar.png");
             int newWidth = (int) (n * playerHealthTexture.getWidth());
             TextureRegion[][] playerHealthRegion = TextureRegion.split(playerHealthTexture,newWidth, playerHealthTexture.getHeight());

core/src/com/dungeoncrawler/view/MainMenuScreen.java

@@ -105,13 +105,10 @@ public class MainMenuScreen{
                 shownPlayer = 0;
                 animationState = 0;
                 
-                playerRegion[0] = TextureRegion.split(new Texture("sprites/player/player_"+gender+".png"), 64, 64);
-                playerRegion[1] = TextureRegion.split(new Texture("sprites/player/playerblue_"+gender+".png"), 64, 64);
-                playerRegion[2] = TextureRegion.split(new Texture("sprites/player/playerpurple_"+gender+".png"), 64, 64);
-                playerRegion[3] = TextureRegion.split(new Texture("sprites/player/playergreen_"+gender+".png"), 64, 64);
-                playerRegion[4] = TextureRegion.split(new Texture("sprites/player/playerorange_"+gender+".png"), 64, 64);
-                playerRegion[5] = TextureRegion.split(new Texture("sprites/player/playerblack_"+gender+".png"), 64, 64);
-                playerRegion[6] = TextureRegion.split(new Texture("sprites/player/playerred_"+gender+".png"), 64, 64);
+                for(int i = 0; i < playerRegion.length; i++){
+                    playerRegion[i] = TextureRegion.split(new Texture("sprites/player/player_"+i+"_"+gender+".png"), 64, 64);
+                }
+                
                 playerSprite = new Sprite(playerRegion[shownPlayer][0][animationState]);
                 
                 
@@ -234,13 +231,9 @@ public class MainMenuScreen{
         }
         
         public void updateGender(){
-            playerRegion[0] = TextureRegion.split(new Texture("sprites/player/player_"+gender+".png"), 64, 64);
-            playerRegion[1] = TextureRegion.split(new Texture("sprites/player/playerblue_"+gender+".png"), 64, 64);
-            playerRegion[2] = TextureRegion.split(new Texture("sprites/player/playerpurple_"+gender+".png"), 64, 64);
-            playerRegion[3] = TextureRegion.split(new Texture("sprites/player/playergreen_"+gender+".png"), 64, 64);
-            playerRegion[4] = TextureRegion.split(new Texture("sprites/player/playerorange_"+gender+".png"), 64, 64);
-            playerRegion[5] = TextureRegion.split(new Texture("sprites/player/playerblack_"+gender+".png"), 64, 64);
-            playerRegion[6] = TextureRegion.split(new Texture("sprites/player/playerred_"+gender+".png"), 64, 64);
+            for(int i = 0; i < playerRegion.length; i++){
+                    playerRegion[i] = TextureRegion.split(new Texture("sprites/player/player_"+i+"_"+gender+".png"), 64, 64);
+            }
             playerSprite = new Sprite(playerRegion[shownPlayer][0][animationState]);
             playerSprite.setPosition(skinContainer.getX() + 50, skinContainer.getY() + 15);
         }