nice

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

@@ -27,7 +27,7 @@ import com.dungeoncrawler.model.Item;
 import com.dungeoncrawler.model.ItemContainer;
 import com.dungeoncrawler.model.items.Key;
 import com.dungeoncrawler.model.items.Potion;
-import com.dungeoncrawler.model.items.Sword;
+import com.dungeoncrawler.model.items.Amulet;
 import java.util.ArrayList;
 
 public class Controller extends ApplicationAdapter implements InputProcessor{
@@ -65,7 +65,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
     
     @Override
     public void create(){
-        
         volume = 0.01f;
         
         arrows = new Entity[10];
@@ -142,7 +141,8 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                 
                 // Render methode zum rendern der einzelnen Sprites wird aufgerufen
                 m.render(batch, d.getPlayer(), d.getCurrentEntities(), arrows,  tileX, tileY, level, roomPosX, roomPosY);
-                hc.updateInventory(batch, d.getPlayer());
+                hc.updateHud(batch, d.getPlayer());
+                d.getPlayer().updateItems();
             }
         }
     }
@@ -382,6 +382,12 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                         m.music.setVolume(volume);
                     }
                 }
+                
+                if(keycode == Input.Keys.Q){
+                    if(m != null && m.getIsLoading() == false){
+                        d.getPlayer().getInv().dropItem();
+                    }
+                }
                 return true;
     }
 

core/src/com/dungeoncrawler/model/DungeonGenerator.java

@@ -6,7 +6,7 @@
 package com.dungeoncrawler.model;
 
 import com.dungeoncrawler.model.entities.*;
-import com.dungeoncrawler.model.items.Sword;
+import com.dungeoncrawler.model.items.Amulet;
 import java.util.ArrayList;
 
 /**
@@ -206,7 +206,7 @@ public class DungeonGenerator {
             int id = (int) (Math.random() * 2);
             switch(id){
                 case 0:
-                    tempItem = new Sword(lvl);
+                    tempItem = new Amulet(lvl);
                     break;
                     
                 /*case 1:

core/src/com/dungeoncrawler/model/Inventory.java

@@ -58,8 +58,8 @@ public class Inventory {
         selected += i;
     }
     
-    public void dropItem(int x){
+    public void dropItem(){
-        items[x] = null;
+        items[selected] = null;
     }
     
     

core/src/com/dungeoncrawler/model/Item.java

@@ -23,6 +23,12 @@ public abstract class Item {
     public int getId(){
         return this.id;
     }
+    public int getDmg(){
+        return dmg;
+    }
+    public int getHeal(){
+        return heal;
+    }
     /**
      * @return the amount
      */

core/src/com/dungeoncrawler/model/ItemContainer.java

@@ -28,6 +28,7 @@ public class ItemContainer {
 
     /**
      * @param xPos the xPos to set
+     * 
      */
     public void setxPos(int xPos) {
         this.xPos = xPos;

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

@@ -16,16 +16,22 @@ import com.dungeoncrawler.model.ItemContainer;
  */
 public class Player extends Entity {
     
+    int standartDmg;
+    int standartMaxHp;
+    
     public Player() {
         super(200, 200, 1);
         
-        this.maxhp = 5*lvl;
+        this.maxhp = 5 * lvl;
         this.hp = this.maxhp;
+        standartMaxHp = this.maxhp;
         
         this.dmg = 3*lvl;
+        standartDmg = this.dmg;
         id = -1;
         inv = new Inventory(3,2);
         // TODO: Sinnvolle Werte finden
+        
     }
     
     public void pickUp(Item item){
@@ -34,5 +40,15 @@ public class Player extends Entity {
     public Inventory getInv(){
         return inv;
     }
+    public void updateItems(){
+        if(inv.getItem(1) != null){
+            dmg = standartDmg + inv.getItem(1).getDmg();
+            maxhp = standartMaxHp + inv.getItem(1).getHeal();
+        }
+        else{
+            dmg = standartDmg;
+            maxhp = standartMaxHp;
+        }
+    }
     
 }

core/src/com/dungeoncrawler/model/items/Amulet.java

@@ -11,11 +11,12 @@ import com.dungeoncrawler.model.Item;
  *
  * @author jonathan
  */
-public class Sword extends Item {
+public class Amulet extends Item {
     
-    public Sword(int lvl) {
+    public Amulet(int lvl) {
         super(lvl);
         this.dmg = lvl * 4;
+        this.heal = lvl * 4;
         this.id = 2;
     }
     

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

@@ -172,7 +172,7 @@ public class GameScreen {
                            roomChangeRow++;
                        }
                     }
-                },0, 0.02f);
+                },0, 0.01f);
                 
 	}
 
@@ -226,7 +226,7 @@ public class GameScreen {
                 tmr.setView(camera);
                 tmr.render();
 
-                camera.zoom = 700f;
+                camera.zoom = 700f; // Standart 700f
                 
                 camera.update();
                 batch.setProjectionMatrix(camera.combined);

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

@@ -8,6 +8,7 @@ package com.dungeoncrawler.view;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.dungeoncrawler.model.Item;
 import com.dungeoncrawler.model.entities.Player;
 
@@ -26,7 +27,12 @@ public class HudContainer {
     Texture selectedTexture;
     Sprite selectedSprite;
     
+    Texture playerHealthTexture;
+    Sprite playerHealthSprite;
+    
     public HudContainer(){
+        playerHealthTexture = new Texture("sprites/playerHealthBar.png");
+        playerHealthSprite = new Sprite();
         selectedTexture = new Texture("sprites/selected.png");
         selectedSprite = new Sprite(selectedTexture);
         HudTexture = new Texture("sprites/hud.png");
@@ -62,10 +68,9 @@ public class HudContainer {
         selected = 2;
         selectedSprite.setX(invXPos[selected] - 2f);
         selectedSprite.setY(invYPos[selected] - 2f);
-    
     }
     
-    public void updateInventory(SpriteBatch batch, Player p){
+    public void updateHud(SpriteBatch batch, Player p){
         InventoryItemSprites = new Sprite[8];
                 
             Item[] items = p.getInv().getItem();
@@ -77,6 +82,15 @@ public class HudContainer {
             }
             selectedSprite.setX(invXPos[selected] - 2f);
             selectedSprite.setY(invYPos[selected] - 2f);
+            
+            p.setHp(3);
+            float n = p.getHp() / p.getMaxhp();
+            int newWidth = (int) (n * 122);
+            TextureRegion[][] playerHealthRegion = TextureRegion.split(playerHealthTexture,newWidth, playerHealthTexture.getHeight());
+            
+            playerHealthSprite = new Sprite(playerHealthRegion[0][0]);
+            playerHealthSprite.setPosition(200f, 200f);
+            
             batch.begin();
             HudSprite.draw(batch);
             for(int i = 0; i < InventoryItemSprites.length ;i++){
@@ -85,8 +99,10 @@ public class HudContainer {
                     }
                 }
             selectedSprite.draw(batch);
+            playerHealthSprite.draw(batch);
             batch.end();
             
+            
     }
     
     public void addItem(Item item, int x){

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

@@ -58,10 +58,10 @@ public class MainMenu{
                 backgroundSprite.setY(0);
                 
                 
-                camera = new OrthographicCamera(1, h/w);
+                //camera = new OrthographicCamera(1, h/w);
-                camera.translate(backgroundSprite.getWidth()/2, backgroundSprite.getHeight()/2);
+                //camera.translate(backgroundSprite.getWidth()/2, backgroundSprite.getHeight()/2);
-                camera.zoom = 1150f;
+                //camera.zoom = 1150f;
-                camera.update();
+                //camera.update();
                 
                 Pixmap pm = new Pixmap(Gdx.files.internal("sprites/cursor.png"));
                 Gdx.graphics.setCursor(Gdx.graphics.newCursor(pm, 0, 0));
@@ -86,7 +86,7 @@ public class MainMenu{
 		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
                 
                 batch.begin();
-                batch.setProjectionMatrix(camera.combined);
+                //batch.setProjectionMatrix(camera.combined);
                 backgroundSprite.draw(batch);
                 startButtonSprite.draw(batch);
                 quitButtonSprite.draw(batch);

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

@@ -312,7 +312,7 @@ public class MapGenerator {
                 Item item = container.getItem();
                 
                 if(item.getId() == 2){
-                    AnimatedObject swordSprite = new AnimatedObject(sword, 24, 24);
+                    AnimatedObject swordSprite = new AnimatedObject(sword, 48, 48);
                     swordSprite.getSprite().setPosition(container.getxPos(), container.getyPos());
                     temp.getMapItems().add(swordSprite);
                 }