Added new Window Hud with mana, hp, coins and keys.

Author: SEM24

src/main/java/com/khomsi/game/entity/Entity.java

@@ -3,8 +3,8 @@
 import com.khomsi.game.entity.player.Player;
 import com.khomsi.game.main.GameManager;
 import com.khomsi.game.main.tools.Tools;
-import com.khomsi.game.objects.gui.HeartObject;
-import com.khomsi.game.objects.gui.ManaObject;
+import com.khomsi.game.objects.spells.HeartObject;
+import com.khomsi.game.objects.spells.ManaObject;
 import com.khomsi.game.objects.interact.CoinBObject;
 
 import java.awt.*;
@@ -127,8 +127,6 @@ public class Entity extends Tools{
     public Rectangle attackArea = new Rectangle(0, 0, 0, 0);
     public int solidAreaDefaultX, solidAreaDefaultY;
     public GameManager gameManager;
-    //FIXME
-//    public Tools tools = new Tools();
     public ProjectTile projectTile;
     public Entity attacker;
     public String knockBackDirection;

src/main/java/com/khomsi/game/entity/mobs/MobBat.java

@@ -2,8 +2,8 @@
 
 import com.khomsi.game.entity.Entity;
 import com.khomsi.game.main.GameManager;
-import com.khomsi.game.objects.gui.HeartObject;
-import com.khomsi.game.objects.gui.ManaObject;
+import com.khomsi.game.objects.spells.HeartObject;
+import com.khomsi.game.objects.spells.ManaObject;
 import com.khomsi.game.objects.interact.CoinBObject;
 
 import java.util.Random;

src/main/java/com/khomsi/game/entity/mobs/MobDungeonBoss.java

@@ -3,8 +3,8 @@
 import com.khomsi.game.data.GameProgress;
 import com.khomsi.game.entity.Entity;
 import com.khomsi.game.main.GameManager;
-import com.khomsi.game.objects.gui.HeartObject;
-import com.khomsi.game.objects.gui.ManaObject;
+import com.khomsi.game.objects.spells.HeartObject;
+import com.khomsi.game.objects.spells.ManaObject;
 import com.khomsi.game.objects.interact.CoinBObject;
 import com.khomsi.game.objects.outside.DungeonDoorClosedObject;
 

src/main/java/com/khomsi/game/entity/mobs/MobOrc.java

@@ -1,10 +1,10 @@
 package com.khomsi.game.entity.mobs;
 
 import com.khomsi.game.main.GameManager;
-import com.khomsi.game.objects.gui.ManaObject;
+import com.khomsi.game.objects.spells.ManaObject;
 import com.khomsi.game.objects.interact.CoinBObject;
 import com.khomsi.game.entity.Entity;
-import com.khomsi.game.objects.gui.HeartObject;
+import com.khomsi.game.objects.spells.HeartObject;
 
 import java.util.Random;
 

src/main/java/com/khomsi/game/entity/mobs/MobSlime.java

@@ -1,8 +1,8 @@
 package com.khomsi.game.entity.mobs;
 
 import com.khomsi.game.main.GameManager;
-import com.khomsi.game.objects.gui.HeartObject;
-import com.khomsi.game.objects.gui.ManaObject;
+import com.khomsi.game.objects.spells.HeartObject;
+import com.khomsi.game.objects.spells.ManaObject;
 import com.khomsi.game.objects.interact.CoinBObject;
 import com.khomsi.game.entity.Entity;
 import com.khomsi.game.objects.projectTiles.RockObject;

src/main/java/com/khomsi/game/entity/mobs/MobSlimeBlue.java

@@ -1,10 +1,10 @@
 package com.khomsi.game.entity.mobs;
 
 import com.khomsi.game.main.GameManager;
-import com.khomsi.game.objects.gui.ManaObject;
+import com.khomsi.game.objects.spells.ManaObject;
 import com.khomsi.game.objects.interact.CoinBObject;
 import com.khomsi.game.entity.Entity;
-import com.khomsi.game.objects.gui.HeartObject;
+import com.khomsi.game.objects.spells.HeartObject;
 
 import java.util.Random;
 

src/main/java/com/khomsi/game/entity/player/Player.java

@@ -58,7 +58,7 @@ public void setDefaultValues() {
         level = 1;
         maxHp = 6;
         hp = maxHp;
-        maxMana = 4;
+        maxMana = 6;
         mana = maxMana;
         //TODO basic var for arrows, future realisation
 //        ammo = 10;
@@ -508,13 +508,21 @@ private void interactNpc(int npcIndex) {
     }
 
     private void checkLevelUp() {
+        int maxValue = 12;
         if (xp >= nextLevelXp) {
             level++;
             //This will make it so the exp resets but also takes into
             // account any exp collected that is over the nextLevelExp
             xp = xp - nextLevelXp;
             nextLevelXp = nextLevelXp * 2;
-            maxHp += 2;
+            // Increase maxHp by 2 if it is less than maxValue
+            if (maxHp < maxValue) {
+                maxHp += 2;
+            }
+            // Increase maxMana by 1 if it is less than maxValue
+            if (maxMana < maxValue) {
+                maxMana += 1;
+            }
             strength++;
             agility++;
             attack = getAttack();

src/main/java/com/khomsi/game/enviroment/Lightning.java

@@ -129,7 +129,7 @@ public void draw(Graphics2D g2d) {
         }
         g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1F));
         debugDayState(g2d);
-        gameManager.ui.drawClock(g2d, dayState, filterAlfa);
+        gameManager.ui.drawClock(dayState, filterAlfa);
     }
 
     private void debugDayState(Graphics2D g2d) {

src/main/java/com/khomsi/game/main/logic/EntityGenerator.java

@@ -2,14 +2,14 @@
 
 import com.khomsi.game.main.GameManager;
 import com.khomsi.game.objects.equipment.*;
-import com.khomsi.game.objects.gui.ManaObject;
+import com.khomsi.game.objects.spells.ManaObject;
 import com.khomsi.game.objects.interact.ChestObject;
 import com.khomsi.game.objects.interact.CoinBObject;
 import com.khomsi.game.objects.interact.KeyObject;
 import com.khomsi.game.objects.outside.*;
 import com.khomsi.game.objects.projectTiles.FireBallObject;
 import com.khomsi.game.entity.Entity;
-import com.khomsi.game.objects.gui.HeartObject;
+import com.khomsi.game.objects.spells.HeartObject;
 import com.khomsi.game.objects.light.LanternObject;
 import com.khomsi.game.objects.projectTiles.MagicArrowObject;
 import com.khomsi.game.objects.projectTiles.RockObject;