From 250bc6c89dacab309b1124ed74f0b0243b0677d7 Mon Sep 17 00:00:00 2001
From: GammelJAN <jan.ehehalt@gmail.com>
Date: Fri, 1 May 2020 18:45:00 +0200
Subject: [PATCH] ja

---
 .../com/dungeoncrawler/model/entities/Player.java    | 12 ++++++------
 core/src/com/dungeoncrawler/model/items/Amulet.java  |  4 ++--
 core/src/com/dungeoncrawler/view/HudContainer.java   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/src/com/dungeoncrawler/model/entities/Player.java b/core/src/com/dungeoncrawler/model/entities/Player.java
index 27ea550..6c417d8 100644
--- a/core/src/com/dungeoncrawler/model/entities/Player.java
+++ b/core/src/com/dungeoncrawler/model/entities/Player.java
@@ -22,10 +22,10 @@ public class Player extends Entity {
         
         this.maxhp = 5 * (lvl + 1);
         this.hp = this.maxhp;
-        standartMaxHp = this.maxhp;
+        this.standartMaxHp = 5 * (lvl + 1);
         
         this.dmg = 3*lvl;
-        standartDmg = this.dmg;
+        this.standartDmg = dmg = 3*lvl;
         id = -1;
         inv = new Inventory(3,2);
         // TODO: Sinnvolle Werte finden
@@ -41,12 +41,12 @@ public class Player extends Entity {
 
     public void updateItems(){
         if(inv.getItem(1) != null){
-            dmg = standartDmg + inv.getItem(1).getDmg();
-            maxhp = standartMaxHp + inv.getItem(1).getHeal();
+            this.dmg = this.standartDmg + inv.getItem(1).getDmg();
+            //this.maxhp = this.standartMaxHp + inv.getItem(1).getHeal();
         }
         else{
-            dmg = standartDmg;
-            maxhp = standartMaxHp;
+            this.dmg = this.standartDmg;
+            //this.maxhp = this.standartMaxHp;
         }
     }
 
diff --git a/core/src/com/dungeoncrawler/model/items/Amulet.java b/core/src/com/dungeoncrawler/model/items/Amulet.java
index 06f5290..17b7316 100644
--- a/core/src/com/dungeoncrawler/model/items/Amulet.java
+++ b/core/src/com/dungeoncrawler/model/items/Amulet.java
@@ -15,8 +15,8 @@ public class Amulet extends Item {
     
     public Amulet(int lvl) {
         super(lvl);
-        this.dmg = lvl * 4;
-        this.heal = lvl * 4;
+        this.dmg = 4 * (lvl + 1);
+        this.heal = 4 * (lvl + 1);
         this.id = 2;
     }
     
diff --git a/core/src/com/dungeoncrawler/view/HudContainer.java b/core/src/com/dungeoncrawler/view/HudContainer.java
index 9b785cd..c878af1 100644
--- a/core/src/com/dungeoncrawler/view/HudContainer.java
+++ b/core/src/com/dungeoncrawler/view/HudContainer.java
@@ -95,7 +95,7 @@ public class HudContainer {
             selectedSprite.setY(invYPos[selected] - 2f);
             
             float n = p.getHp() / p.getMaxhp();
-            int newWidth = (int) (n * 122);
+            int newWidth = (int) (n * playerHealthTexture.getWidth());
             TextureRegion[][] playerHealthRegion = TextureRegion.split(playerHealthTexture,newWidth, playerHealthTexture.getHeight());
             playerHealthSprite = new Sprite(playerHealthRegion[0][0]);
             playerHealthSprite.setPosition(playerHealthX, playerHealthY);