From 46c2924e0bc094ffb746ff7d6f93a91250866f35 Mon Sep 17 00:00:00 2001 From: GammelJAN Date: Tue, 26 May 2020 10:01:00 +0200 Subject: [PATCH] EHRE --- .../player/{player_m.png => player_0_m.png} | Bin .../player/{player_w.png => player_0_w.png} | Bin .../{playerblue_m.png => player_1_m.png} | Bin .../{playerblue_w.png => player_1_w.png} | Bin .../{playerpurple_m.png => player_2_m.png} | Bin .../{playerpurple_w.png => player_2_w.png} | Bin .../{playergreen_m.png => player_3_m.png} | Bin .../{playergreen_w.png => player_3_w.png} | Bin .../{playerorange_m.png => player_4_m.png} | Bin .../{playerorange_w.png => player_4_w.png} | Bin .../{playerblack_m.png => player_5_m.png} | Bin .../{playerblack_w.png => player_5_w.png} | Bin .../{playerred_m.png => player_6_m.png} | Bin .../{playerred_w.png => player_6_w.png} | Bin .../dungeoncrawler/control/Controller.java | 2 +- .../dungeoncrawler/model/entities/Player.java | 10 ++-- .../com/dungeoncrawler/view/GameScreen.java | 51 +++--------------- .../com/dungeoncrawler/view/HudContainer.java | 4 ++ .../dungeoncrawler/view/MainMenuScreen.java | 21 +++----- 19 files changed, 24 insertions(+), 64 deletions(-) rename core/assets/sprites/player/{player_m.png => player_0_m.png} (100%) rename core/assets/sprites/player/{player_w.png => player_0_w.png} (100%) rename core/assets/sprites/player/{playerblue_m.png => player_1_m.png} (100%) rename core/assets/sprites/player/{playerblue_w.png => player_1_w.png} (100%) rename core/assets/sprites/player/{playerpurple_m.png => player_2_m.png} (100%) rename core/assets/sprites/player/{playerpurple_w.png => player_2_w.png} (100%) rename core/assets/sprites/player/{playergreen_m.png => player_3_m.png} (100%) rename core/assets/sprites/player/{playergreen_w.png => player_3_w.png} (100%) rename core/assets/sprites/player/{playerorange_m.png => player_4_m.png} (100%) rename core/assets/sprites/player/{playerorange_w.png => player_4_w.png} (100%) rename core/assets/sprites/player/{playerblack_m.png => player_5_m.png} (100%) rename core/assets/sprites/player/{playerblack_w.png => player_5_w.png} (100%) rename core/assets/sprites/player/{playerred_m.png => player_6_m.png} (100%) rename core/assets/sprites/player/{playerred_w.png => player_6_w.png} (100%) diff --git a/core/assets/sprites/player/player_m.png b/core/assets/sprites/player/player_0_m.png similarity index 100% rename from core/assets/sprites/player/player_m.png rename to core/assets/sprites/player/player_0_m.png diff --git a/core/assets/sprites/player/player_w.png b/core/assets/sprites/player/player_0_w.png similarity index 100% rename from core/assets/sprites/player/player_w.png rename to core/assets/sprites/player/player_0_w.png diff --git a/core/assets/sprites/player/playerblue_m.png b/core/assets/sprites/player/player_1_m.png similarity index 100% rename from core/assets/sprites/player/playerblue_m.png rename to core/assets/sprites/player/player_1_m.png diff --git a/core/assets/sprites/player/playerblue_w.png b/core/assets/sprites/player/player_1_w.png similarity index 100% rename from core/assets/sprites/player/playerblue_w.png rename to core/assets/sprites/player/player_1_w.png diff --git a/core/assets/sprites/player/playerpurple_m.png b/core/assets/sprites/player/player_2_m.png similarity index 100% rename from core/assets/sprites/player/playerpurple_m.png rename to core/assets/sprites/player/player_2_m.png diff --git a/core/assets/sprites/player/playerpurple_w.png b/core/assets/sprites/player/player_2_w.png similarity index 100% rename from core/assets/sprites/player/playerpurple_w.png rename to core/assets/sprites/player/player_2_w.png diff --git a/core/assets/sprites/player/playergreen_m.png b/core/assets/sprites/player/player_3_m.png similarity index 100% rename from core/assets/sprites/player/playergreen_m.png rename to core/assets/sprites/player/player_3_m.png diff --git a/core/assets/sprites/player/playergreen_w.png b/core/assets/sprites/player/player_3_w.png similarity index 100% rename from core/assets/sprites/player/playergreen_w.png rename to core/assets/sprites/player/player_3_w.png diff --git a/core/assets/sprites/player/playerorange_m.png b/core/assets/sprites/player/player_4_m.png similarity index 100% rename from core/assets/sprites/player/playerorange_m.png rename to core/assets/sprites/player/player_4_m.png diff --git a/core/assets/sprites/player/playerorange_w.png b/core/assets/sprites/player/player_4_w.png similarity index 100% rename from core/assets/sprites/player/playerorange_w.png rename to core/assets/sprites/player/player_4_w.png diff --git a/core/assets/sprites/player/playerblack_m.png b/core/assets/sprites/player/player_5_m.png similarity index 100% rename from core/assets/sprites/player/playerblack_m.png rename to core/assets/sprites/player/player_5_m.png diff --git a/core/assets/sprites/player/playerblack_w.png b/core/assets/sprites/player/player_5_w.png similarity index 100% rename from core/assets/sprites/player/playerblack_w.png rename to core/assets/sprites/player/player_5_w.png diff --git a/core/assets/sprites/player/playerred_m.png b/core/assets/sprites/player/player_6_m.png similarity index 100% rename from core/assets/sprites/player/playerred_m.png rename to core/assets/sprites/player/player_6_m.png diff --git a/core/assets/sprites/player/playerred_w.png b/core/assets/sprites/player/player_6_w.png similarity index 100% rename from core/assets/sprites/player/playerred_w.png rename to core/assets/sprites/player/player_6_w.png diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index c99f571..28bd1ce 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/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; diff --git a/core/src/com/dungeoncrawler/model/entities/Player.java b/core/src/com/dungeoncrawler/model/entities/Player.java index c05c483..332553f 100644 --- a/core/src/com/dungeoncrawler/model/entities/Player.java +++ b/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(); } diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index 99cbe6e..dd575bd 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/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); diff --git a/core/src/com/dungeoncrawler/view/HudContainer.java b/core/src/com/dungeoncrawler/view/HudContainer.java index ddeb5fe..9e6c6af 100644 --- a/core/src/com/dungeoncrawler/view/HudContainer.java +++ b/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()); diff --git a/core/src/com/dungeoncrawler/view/MainMenuScreen.java b/core/src/com/dungeoncrawler/view/MainMenuScreen.java index ebeb92c..1178959 100644 --- a/core/src/com/dungeoncrawler/view/MainMenuScreen.java +++ b/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); }