added font, updated ui, fixed some code

Assets/Scripts/Chest.cs

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using System;
+using Assets.Scripts.Player;
 
 namespace Assets.Scripts
 {
@@ -29,7 +30,7 @@ namespace Assets.Scripts
             {
                 gameObject.transform.parent.Find("Lid").GetComponent<Animator>().Play("ChestOpen");
                 Item item;
-                int luck = GameObject.Find("Player").GetComponent<Player>().getStats()[11];
+                int luck = GameObject.Find("Player").GetComponent<PlayerGameObject>().getPlayerStat("Luck").getAmount();
                 int type = new System.Random().Next(3);
                 switch (type)
                 {

Assets/Scripts/Classes/BasicClass.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Assets.Scripts.Player;
 
 namespace Assets.Scripts.Classes
 {
@@ -25,7 +26,7 @@ namespace Assets.Scripts.Classes
             secondaryBonus = 0;
         }
 
-        public void applyBonus(Player player)
+        public void applyBonus(PlayerObject player)
         {
             player.changeStats(strengthBonus, healthBonus, dexterityBonus, intelligenceBonus, secondaryBonus);
         }

Assets/Scripts/Controls.cs

@@ -5,6 +5,7 @@ using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.InputSystem;
 using UnityEngine.UI;
+using Assets.Scripts.Player;
 
 public class Controls : MonoBehaviour
 {
@@ -61,7 +62,7 @@ public class Controls : MonoBehaviour
         if(uihandler.state != UIState.GAME && playerInput.currentActionMap.name != "Menu"){
             playerInput.SwitchCurrentActionMap("Menu");
         }
-        if (!player.GetComponent<Player>().takeDamage(0))
+        if (!player.GetComponent<PlayerGameObject>().takeDamage(0))
         {
             if (!uihandler.isPlayerInFight())
             {
@@ -73,13 +74,13 @@ public class Controls : MonoBehaviour
     }
 
     public void FixedUpdate(){
-        if (!player.GetComponent<Player>().takeDamage(0))
+        if (!player.GetComponent<PlayerGameObject>().takeDamage(0))
         {
             if (!uihandler.isPlayerInFight())
             {
                 if (uihandler.canPlayerMove())
                 {
-                    player.GetComponent<Player>().move(input);
+                    player.GetComponent<PlayerGameObject>().move(input);
                 }
             }
         }
@@ -163,10 +164,6 @@ public class Controls : MonoBehaviour
         }
     }
 
-    public void OnCharsheet(){
-        uihandler.switchCharactersheet();
-    }
-
     public void OnInventory(){
         uihandler.switchInventory();
     }

Assets/Scripts/Enemy.cs

@@ -1,4 +1,5 @@
 using Assets.Scripts;
+using Assets.Scripts.Player;
 using Assets.Scripts.Slimes;
 using Newtonsoft.Json.Linq;
 using System.Collections;
@@ -61,7 +62,7 @@ namespace Assets.Scripts
             }
         }
 
-        public void scaleEnemy(Player player)
+        public void scaleEnemy(PlayerGameObject player)
         {
             if (slime == null)
             {

Assets/Scripts/Fight.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
+using Assets.Scripts.Player;
 
 public class Fight : MonoBehaviour
 {
@@ -18,7 +19,7 @@ public class Fight : MonoBehaviour
         this.tile = tile;
         this.enemy = enemy;
         this.player = player;
-        enemy.GetComponent<Enemy>().scaleEnemy(player.GetComponent<Player>());
+        enemy.GetComponent<Enemy>().scaleEnemy(player.GetComponent<PlayerGameObject>());
         enemy.transform.rotation = Quaternion.Euler(0,GameObject.Find("Main Camera").transform.rotation.y + 180f,0);
 
         uihandler = GameObject.Find("UIHandler").GetComponent<UIHandler>();
@@ -46,7 +47,7 @@ public class Fight : MonoBehaviour
                 //User waits
                 break;
             case 3:
-                playerDamage = player.GetComponent<Player>().calculateDamage();
+                playerDamage = player.GetComponent<PlayerGameObject>().calculateDamage();
                 break;
             case 4:
                 skillnumber = 0;
@@ -60,10 +61,10 @@ public class Fight : MonoBehaviour
         }
         if (skillnumber != -1)
         {
-            playerDamage = player.GetComponent<Player>().castSkill(skillnumber);
+            playerDamage = player.GetComponent<PlayerGameObject>().castSkill(skillnumber);
         }
-        player.GetComponent<Player>().reduceCooldown(skillnumber);
-        player.GetComponent<Player>().regainSecondary();
+        player.GetComponent<PlayerGameObject>().reduceCooldown(skillnumber);
+        player.GetComponent<PlayerGameObject>().regainSecondary();
         bool isDead = enemy.GetComponent<Enemy>().takeDamage(playerDamage);
         if (isDead)
         {
@@ -73,8 +74,8 @@ public class Fight : MonoBehaviour
             }
             endFight();
             tile.GetComponent<Tile>().enemyKilled(enemy);
-            player.GetComponent<Player>().enemyKilled();
-            player.GetComponent<Player>().gainExperience(enemy.GetComponent<Enemy>().getExperience());
+            player.GetComponent<PlayerGameObject>().enemyKilled();
+            player.GetComponent<PlayerGameObject>().gainExperience(enemy.GetComponent<Enemy>().getExperience());
             GameObject.Find("Inventory").GetComponent<Inventory>().addItem(enemy.GetComponent<Enemy>().getItem());
             GameObject.Find("QuestLog").GetComponent<QuestLog>().updateQuests("kill", enemy, 1);
         }
@@ -110,7 +111,7 @@ public class Fight : MonoBehaviour
                 break;
         }
 
-        if (player.GetComponent<Player>().takeDamage(enemyDamage))
+        if (player.GetComponent<PlayerGameObject>().takeDamage(enemyDamage))
         {
             SteamWorksHandler.getStandardAchievement("DeathAchievement");
             uihandler.showDeathScreen();

Assets/Scripts/Handler/ButtonHandler.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using Assets.Scripts.Player;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
@@ -9,7 +10,7 @@ namespace Assets.Scripts
     public class ButtonHandler : MonoBehaviour
     {
         UIHandler uihandler;
-        Player player;
+        PlayerGameObject player;
         AudioHandler audioHandler;
         WorldGenerator worldGenerator;
         GameObject fight;
@@ -17,7 +18,7 @@ namespace Assets.Scripts
         private void Start()
         {
             uihandler = GameObject.Find("UIHandler").GetComponent<UIHandler>();
-            player = GameObject.Find("Player").GetComponent<Player>();
+            player = GameObject.Find("Player").GetComponent<PlayerGameObject>();
             worldGenerator = GameObject.Find("WorldGenerator").GetComponent<WorldGenerator>();
             audioHandler = GameObject.Find("AudioHandler").GetComponent<AudioHandler>();
             fight = GameObject.Find("Fight");
@@ -98,12 +99,6 @@ namespace Assets.Scripts
             uihandler.startGame();
         }
 
-        public void switchCharactersheet()
-        {
-            audioHandler.playButtonClick();
-            uihandler.switchCharactersheet();
-        }
-
         public void switchQuestlog()
         {
             audioHandler.playButtonClick();

Assets/Scripts/Handler/EasterEggHandler.cs

@@ -1,4 +1,5 @@
-using Steamworks;
+using Assets.Scripts.Player;
+using Steamworks;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,7 +11,7 @@ namespace Assets.Scripts
 {
     class EasterEggHandler
     {
-        public static void applyEasterEgg(Player player)
+        public static void applyEasterEgg(PlayerObject player)
         {
             if (player.getPlayerName().ToLower().Length > 0)
             {
@@ -18,10 +19,10 @@ namespace Assets.Scripts
             }
         }
 
-        private static void applyNameEasterEgg(Player player)
+        private static void applyNameEasterEgg(PlayerObject player)
         {
             //maxHealth, maxSecondary, strength, dexterity, intelligence
-            int[] result = new int[5];
+            /*int[] result = new int[5];
             int[] stats = player.getStats();
             switch (player.getPlayerName().ToLower())
             {
@@ -62,10 +63,12 @@ namespace Assets.Scripts
                     result[4] = stats[6];
                     break;
             }
-            player.setStats(result);
+            player.setStats(result);*/
+
+            //TODO FIX whole Easteregg mechanic to go with the new player
         }
 
-        public static bool isGodMode(Player player)
+        public static bool isGodMode(PlayerObject player)
         {
             bool result = false;
             if (player != null)

Assets/Scripts/Handler/FileHandler.cs

@@ -9,6 +9,7 @@ using UnityEngine.UI;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using UnityEngine.Localization.Settings;
+using Assets.Scripts.Player;
 
 namespace Assets.Scripts
 {
@@ -24,7 +25,7 @@ namespace Assets.Scripts
             sw.Close();
         }
 
-        public static void loadGame(Player player, WorldGenerator worldGenerator, Inventory inventory, QuestLog questLog)
+        public static void loadGame(PlayerGameObject player, WorldGenerator worldGenerator, Inventory inventory, QuestLog questLog)
         {
             if (hasSaveFile())
             {

Assets/Scripts/Handler/SteamWorksHandler.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using Steamworks;
 using Assets.Scripts;
+using Assets.Scripts.Player;
 
 public class SteamWorksHandler : MonoBehaviour
 {
@@ -97,7 +98,7 @@ public class SteamWorksHandler : MonoBehaviour
 
     private static bool isGodMode()
     {
-        return EasterEggHandler.isGodMode(GameObject.Find("Player").GetComponent<Player>());
+        return EasterEggHandler.isGodMode(GameObject.Find("Player").GetComponent<PlayerGameObject>().getPlayer());
     }
 
     public static void getItemAchievement(Item item)

Assets/Scripts/Handler/TooltipHandler.cs

@@ -3,19 +3,20 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.EventSystems;
+using Assets.Scripts.Player;
 
 namespace Assets.Scripts
 {
     public class TooltipHandler : MonoBehaviour
     {
         public GameObject tooltip;
-        Player player;
+        PlayerGameObject player;
         UIHandler uihandler;
 
         // Start is called before the first frame update
         void Start()
         {
-            player = GameObject.Find("Player").GetComponent<Player>();
+            player = GameObject.Find("Player").GetComponent<PlayerGameObject>();
             uihandler = GameObject.Find("UIHandler").GetComponent<UIHandler>();
         }
 

Assets/Scripts/Handler/UIHandler.cs

@@ -1,4 +1,5 @@
 using Assets.Scripts.Classes;
+using Assets.Scripts.Player;
 using Assets.Scripts.Races;
 using System.Collections;
 using System.Collections.Generic;
@@ -15,7 +16,6 @@ namespace Assets.Scripts
         public GameObject information;
         public GameObject fight;
         public GameObject message;
-        public GameObject charactersheet;
         public GameObject deathscreen;
         public GameObject options;
         public GameObject pauseMenu;
@@ -33,6 +33,7 @@ namespace Assets.Scripts
         void Start()
         {
             FileHandler.loadOptions(true);
+            GameObject.Find("Player").GetComponent<PlayerGameObject>().getPlayerStat("Killcount").changeAmount(1);
         }
 
         // Update is called once per frame
@@ -75,7 +76,7 @@ namespace Assets.Scripts
 
         private void updatePlayerHUD()
         {
-            updateHUD(GameObject.Find("Player").GetComponent<Player>());
+            updateHUD(GameObject.Find("Player").GetComponent<PlayerGameObject>());
         }
 
         public bool canPlayerMove()
@@ -110,18 +111,6 @@ namespace Assets.Scripts
             EventSystem.current.SetSelectedGameObject(GameObject.Find("btnCloseTutorial"));
         }
 
-        public void switchCharactersheet()
-        {
-            if (state == UIState.CHARACTER)
-            {
-                closeCharactersheet();
-            }
-            else
-            {
-                openCharactersheet();
-            }
-        }
-
         public void openOptions()
         {
             FileHandler.loadOptionDisplay();
@@ -137,22 +126,6 @@ namespace Assets.Scripts
             openPauseMenu();
         }
 
-        public void openCharactersheet()
-        {
-            hideOtherElements(charactersheet);
-            state = UIState.CHARACTER;
-            if(GameObject.Find("btnStrengthIncrease").transform.localScale != new Vector3(0,0,0)){
-                EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStrengthIncrease"));
-            }
-        }
-
-        public void closeCharactersheet()
-        {
-            charactersheet.transform.localScale = new Vector3(0, 0, 0);
-            showHUD();
-            state = UIState.GAME;
-        }
-
         public void switchInventory()
         {
             if (state == UIState.INVENTORY)
@@ -373,38 +346,36 @@ namespace Assets.Scripts
 
         public void updateFightInterface(GameObject enemy, GameObject player)
         {
-            updateFightInterfacePlayer(player);
+            updateFightInterfacePlayer(player.GetComponent<PlayerGameObject>());
             updateFightInterfaceEnemy(enemy);
-            updateFightInterfaceActions(player);
+            updateFightInterfaceActions(player.GetComponent<PlayerGameObject>());
             GameObject.Find("txtRounds").GetComponent<Text>().text = (int.Parse(GameObject.Find("txtRounds").GetComponent<Text>().text) + 1).ToString();
         }
 
-        private void updateFightInterfaceActions(GameObject player)
+        private void updateFightInterfaceActions(PlayerGameObject player)
         {
             GameObject actionFour = GameObject.Find("btnActionFour");
             GameObject actionFive = GameObject.Find("btnActionFive");
             GameObject actionSix = GameObject.Find("btnActionSix");
 
-            player.GetComponent<Player>().displayAction(0, actionFour.transform.Find("imgAction").gameObject, actionFour.transform.Find("descAction").gameObject);
-            player.GetComponent<Player>().displayAction(1, actionFive.transform.Find("imgAction").gameObject, actionFive.transform.Find("descAction").gameObject);
-            player.GetComponent<Player>().displayAction(2, actionSix.transform.Find("imgAction").gameObject, actionSix.transform.Find("descAction").gameObject);
+            player.displayAction(0, actionFour.transform.Find("imgAction").gameObject, actionFour.transform.Find("descAction").gameObject);
+            player.displayAction(1, actionFive.transform.Find("imgAction").gameObject, actionFive.transform.Find("descAction").gameObject);
+            player.displayAction(2, actionSix.transform.Find("imgAction").gameObject, actionSix.transform.Find("descAction").gameObject);
         }
 
-        private void updateFightInterfacePlayer(GameObject player)
+        private void updateFightInterfacePlayer(PlayerGameObject player)
         {
-            // { health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence };
-            int[] playerStats = player.GetComponent<Player>().getStats();
             Dictionary<string, int> equipment = inventory.GetComponent<Inventory>().getEquipmentBonus();
 
             GameObject foreground = GameObject.Find("healthForegroundPlayer");
             GameObject background = GameObject.Find("healthBackgroundPlayer");
             GameObject text = GameObject.Find("healthTextPlayer");
-            updateBar(foreground, background, text, playerStats[1] + equipment["HP"], playerStats[0]);
+            updateBar(foreground, background, text, player.getPlayerStat("MaxHealth").getAmount() + equipment["HP"], player.getPlayerStat("Health").getAmount());
 
             foreground = GameObject.Find("secondaryForegroundPlayer");
             background = GameObject.Find("secondaryBackgroundPlayer");
             text = GameObject.Find("secondaryTextPlayer");
-            updateBar(foreground, background, text, playerStats[3] + equipment["MP"], playerStats[2]);
+            updateBar(foreground, background, text, player.getPlayerStat("MaxSecondary").getAmount() + equipment["MP"], player.getPlayerStat("Secondary").getAmount());
         }
 
         private void updateFightInterfaceEnemy(GameObject enemy)
@@ -423,24 +394,22 @@ namespace Assets.Scripts
             updateBar(foreground, background, text, enemyStats[3], enemyStats[2]);
         }
 
-        public void adjustInformation(Player player)
+        public void adjustInformation(PlayerGameObject player)
         {
-            // { health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence, level, experience, maxExperience, points};
-            int[] playerStats = player.GetComponent<Player>().getStats();
             Dictionary<string, int> equipment = inventory.GetComponent<Inventory>().getEquipmentBonus();
 
-            GameObject.Find("txtStrength").GetComponent<Text>().text = "STR: " + playerStats[4] + " (+" + equipment["STR"] + ")";
-            GameObject.Find("txtDexterity").GetComponent<Text>().text = "DEX: " + playerStats[5] + " (+" + equipment["DEX"] + ")";
-            GameObject.Find("txtIntelligence").GetComponent<Text>().text = "INT: " + playerStats[6] + " (+" + equipment["INT"] + ")";
-            GameObject.Find("txtHealth").GetComponent<Text>().text = TextHandler.getText("health") + " " + playerStats[1] + " (+" + equipment["HP"] + ")";
-            GameObject.Find("txtSecondary").GetComponent<Text>().text = "Mana: " + playerStats[3] + " (+" + equipment["MP"] + ")";
+            GameObject.Find("txtStrength").GetComponent<Text>().text = "STR: " + player.getPlayerStat("Strength").getAmount() + " (+" + equipment["STR"] + ")";
+            GameObject.Find("txtDexterity").GetComponent<Text>().text = "DEX: " + player.getPlayerStat("Dexterity").getAmount() + " (+" + equipment["DEX"] + ")";
+            GameObject.Find("txtIntelligence").GetComponent<Text>().text = "INT: " + player.getPlayerStat("Intelligence").getAmount() + " (+" + equipment["INT"] + ")";
+            GameObject.Find("txtHealth").GetComponent<Text>().text = TextHandler.getText("health") + " " + player.getPlayerStat("Health").getAmount() + " (+" + equipment["HP"] + ")";
+            GameObject.Find("txtSecondary").GetComponent<Text>().text = "Mana: " + player.getPlayerStat("Secondary").getAmount() + " (+" + equipment["MP"] + ")";
 
-            updateHealthUI(playerStats[0], playerStats[1] + equipment["HP"]);
-            updateSecondaryUI(playerStats[2], playerStats[3] + equipment["MP"]);
-            updateExperienceUI(playerStats[8], playerStats[9]);
+            updateHealthUI(player.getPlayerStat("Health").getAmount(), player.getPlayerStat("MaxHealth").getAmount() + equipment["HP"]);
+            updateSecondaryUI(player.getPlayerStat("Secondary").getAmount(), player.getPlayerStat("MaxSecondary").getAmount() + equipment["MP"]);
+            updateExperienceUI(player.getPlayerStat("Experience").getAmount(), player.getPlayerStat("MaxExperience").getAmount());
 
             player.updateName(GameObject.Find("txtName").GetComponent<Text>());
-            updatePoints(playerStats[10]);
+            updatePoints(player.getPlayerStat("Points").getAmount());
             player.displaySkills(GameObject.Find("pnlSkills"));
         }
 
@@ -496,20 +465,18 @@ namespace Assets.Scripts
             updateFill(fill, null, maxExperience, experience);
         }
 
-        public void updateHUD(Player player)
+        public void updateHUD(PlayerGameObject player)
         {
-            // { health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence, level, experience, maxExperience};
-            int[] playerStats = player.GetComponent<Player>().getStats();
             Dictionary<string, int> equipment = inventory.GetComponent<Inventory>().getEquipmentBonus();
 
             GameObject information = GameObject.Find("txtInformationHUD");
             player.updateNameHUD(information.GetComponent<Text>());
 
             GameObject fill = GameObject.Find("HUD_healthFill");
-            updateFill(fill, null, playerStats[1] + equipment["HP"], playerStats[0]);
+            updateFill(fill, null, player.getPlayerStat("MaxHealth").getAmount() + equipment["HP"], player.getPlayerStat("Health").getAmount());
 
             fill = GameObject.Find("HUD_secondaryFill");
-            updateFill(fill, null, playerStats[3] + equipment["MP"], playerStats[2]);
+            updateFill(fill, null, player.getPlayerStat("MaxSecondary").getAmount() + equipment["MP"], player.getPlayerStat("Secondary").getAmount());
         }
 
         public void updateBar(GameObject bar, GameObject barBackground, GameObject textField, int maxValue, int minValue)
@@ -552,15 +519,14 @@ namespace Assets.Scripts
             if (PlayerPrefs.GetInt("isLoad") == 0)
             {
                 GameObject.Find("WorldGenerator").GetComponent<WorldGenerator>().resetGame(PlayerPrefs.GetInt("cityAmount"));
-                GameObject.Find("Player").GetComponent<Player>().generatePlayer();
-                GameObject.Find("Player").GetComponent<Player>().finishPlayerCreation();
+                GameObject.Find("Player").GetComponent<PlayerGameObject>().generatePlayer();
                 hideOtherElements(introduction);
                 state = UIState.INTRODUCTION;
                 EventSystem.current.SetSelectedGameObject(GameObject.Find("btnClose"));
             }
             else
             {
-                FileHandler.loadGame(GameObject.Find("Player").GetComponent<Player>(), GameObject.Find("WorldGenerator").GetComponent<WorldGenerator>(), GameObject.Find("Inventory").GetComponent<Inventory>(), GameObject.Find("QuestLog").GetComponent<QuestLog>());
+                FileHandler.loadGame(GameObject.Find("Player").GetComponent<PlayerGameObject>(), GameObject.Find("WorldGenerator").GetComponent<WorldGenerator>(), GameObject.Find("Inventory").GetComponent<Inventory>(), GameObject.Find("QuestLog").GetComponent<QuestLog>());
                 hideOtherElements(introduction);
                 introduction.transform.localScale = new Vector3(0, 0, 0);
                 tutorial.transform.localScale = new Vector3(0,0,0);

Assets/Scripts/Inventory.cs

@@ -12,7 +12,6 @@ namespace Assets.Scripts
     {
         public GameObject head;
         public GameObject chest;
-        public GameObject shoulders;
         public GameObject feet;
         public GameObject ring;
         public GameObject amulet;
@@ -135,7 +134,7 @@ namespace Assets.Scripts
         {
             GameObject slot = head;
             Item item;
-            for (int i = 0; i < 8; i++)
+            for (int i = 0; i < 7; i++)
             {
                 switch (i)
                 {
@@ -155,12 +154,9 @@ namespace Assets.Scripts
                         slot = feet;
                         break;
                     case 5:
-                        slot = shoulders;
-                        break;
-                    case 6:
                         slot = chest;
                         break;
-                    case 7:
+                    case 6:
                         slot = ring;
                         break;
                 }
@@ -196,7 +192,7 @@ namespace Assets.Scripts
         {
             createStatBoost();
             GameObject equip = head;
-            for (int i = 0; i < 8; i++)
+            for (int i = 0; i < 7; i++)
             {
                 switch (i)
                 {
@@ -216,12 +212,9 @@ namespace Assets.Scripts
                         equip = feet;
                         break;
                     case 5:
-                        equip = shoulders;
-                        break;
-                    case 6:
                         equip = chest;
                         break;
-                    case 7:
+                    case 6:
                         equip = ring;
                         break;
                 }
@@ -240,7 +233,7 @@ namespace Assets.Scripts
             GameObject equip = head;
             string slotname = "";
             result = result + "\"equipment\": {\r\n";
-            for (int i = 0; i < 8; i++)
+            for (int i = 0; i < 7; i++)
             {
                 switch (i)
                 {
@@ -265,14 +258,10 @@ namespace Assets.Scripts
                         slotname = "feet";
                         break;
                     case 5:
-                        equip = shoulders;
-                        slotname = "shoulders";
-                        break;
-                    case 6:
                         equip = chest;
                         slotname = "chest";
                         break;
-                    case 7:
+                    case 6:
                         equip = ring;
                         slotname = "ring";
                         break;
@@ -337,7 +326,7 @@ namespace Assets.Scripts
         {
             GameObject equip = head;
             string slotname = "";
-            for (int i = 0; i < 8; i++)
+            for (int i = 0; i < 7; i++)
             {
                 switch (i)
                 {
@@ -362,14 +351,10 @@ namespace Assets.Scripts
                         slotname = "feet";
                         break;
                     case 5:
-                        equip = shoulders;
-                        slotname = "shoulders";
-                        break;
-                    case 6:
                         equip = chest;
                         slotname = "chest";
                         break;
-                    case 7:
+                    case 6:
                         equip = ring;
                         slotname = "ring";
                         break;
@@ -407,9 +392,6 @@ namespace Assets.Scripts
                     case ItemPlace.HELMET:
                         equipSlot = head.GetComponent<InventorySlot>();
                     break;
-                    case ItemPlace.SHOULDER:
-                        equipSlot = shoulders.GetComponent<InventorySlot>();
-                    break;
                     case ItemPlace.BOOTS:
                         equipSlot = feet.GetComponent<InventorySlot>();
                     break;

Assets/Scripts/InventorySlot.cs

@@ -1,3 +1,4 @@
+using Assets.Scripts.Player;
 using Newtonsoft.Json.Linq;
 using System.Collections;
 using System.Collections.Generic;
@@ -139,10 +140,11 @@ namespace Assets.Scripts
             switch (place)
             {
                 case ItemPlace.LEFTHAND:
-                    image = Resources.Load<Texture>("Equipment/" + GameObject.Find("Player").GetComponent<Player>().getClass().classname + "/Inv_LeftHand");
+                    Debug.Log(GameObject.Find("Player").GetComponent<PlayerGameObject>().getClass().classname);
+                    image = Resources.Load<Texture>("Equipment/" + GameObject.Find("Player").GetComponent<PlayerGameObject>().getClass().classname + "/Inv_LeftHand");
                     break;
                 case ItemPlace.RIGHTHAND:
-                    image = Resources.Load<Texture>("Equipment/" + GameObject.Find("Player").GetComponent<Player>().getClass().classname + "/Inv_RightHand");
+                    image = Resources.Load<Texture>("Equipment/" + GameObject.Find("Player").GetComponent<PlayerGameObject>().getClass().classname + "/Inv_RightHand");
                     break;
                 case ItemPlace.HELMET:
                     image = Resources.Load<Texture>("Equipment/Inv_Helmet");
@@ -150,9 +152,6 @@ namespace Assets.Scripts
                 case ItemPlace.BOOTS:
                     image = Resources.Load<Texture>("Equipment/Inv_Boots");
                     break;
-                case ItemPlace.SHOULDER:
-                    image = Resources.Load<Texture>("Equipment/Inv_Shoulders");
-                    break;
                 case ItemPlace.AMULET:
                     image = Resources.Load<Texture>("Equipment/Inv_Amulet");
                     break;
@@ -195,6 +194,9 @@ namespace Assets.Scripts
             }
             else
             {
+                if(equip == null){
+                    return result;
+                }
                 result = result + equip.saveGame();
             }
             return result;

Assets/Scripts/Items/Equipment.cs

@@ -1,3 +1,4 @@
+using Assets.Scripts.Player;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections;
@@ -82,7 +83,7 @@ namespace Assets.Scripts
             string replacement = "";
             if (place == ItemPlace.LEFTHAND)
             {
-                switch (GameObject.Find("Player").GetComponent<Player>().getClass().classname)
+                switch (GameObject.Find("Player").GetComponent<PlayerGameObject>().getClass().classname)
                 {
                     case "Warrior":
                         replacement = "Greatshield";
@@ -97,7 +98,7 @@ namespace Assets.Scripts
             }
             else if (place == ItemPlace.RIGHTHAND)
             {
-                switch (GameObject.Find("Player").GetComponent<Player>().getClass().classname)
+                switch (GameObject.Find("Player").GetComponent<PlayerGameObject>().getClass().classname)
                 {
                     case "Warrior":
                         replacement = "Sword";
@@ -275,10 +276,10 @@ namespace Assets.Scripts
             switch (place)
             {
                 case ItemPlace.LEFTHAND:
-                    image = Resources.Load<Texture>("Equipment/" + GameObject.Find("Player").GetComponent<Player>().getClass().classname + "/Inv_LeftHand");
+                    image = Resources.Load<Texture>("Equipment/" + GameObject.Find("Player").GetComponent<PlayerGameObject>().getClass().classname + "/Inv_LeftHand");
                     break;
                 case ItemPlace.RIGHTHAND:
-                    image = Resources.Load<Texture>("Equipment/" + GameObject.Find("Player").GetComponent<Player>().getClass().classname + "/Inv_RightHand");
+                    image = Resources.Load<Texture>("Equipment/" + GameObject.Find("Player").GetComponent<PlayerGameObject>().getClass().classname + "/Inv_RightHand");
                     break;
                 case ItemPlace.HELMET:
                     image = Resources.Load<Texture>("Equipment/Inv_Helmet");
@@ -286,9 +287,6 @@ namespace Assets.Scripts
                 case ItemPlace.BOOTS:
                     image = Resources.Load<Texture>("Equipment/Inv_Boots");
                     break;
-                case ItemPlace.SHOULDER:
-                    image = Resources.Load<Texture>("Equipment/Inv_Shoulders");
-                    break;
                 case ItemPlace.AMULET:
                     image = Resources.Load<Texture>("Equipment/Inv_Amulet");
                     break;

Assets/Scripts/Items/ItemPlace.cs

@@ -9,7 +9,6 @@ namespace Assets.Scripts
     public enum ItemPlace
     {
         HELMET,
-        SHOULDER,
         RIGHTHAND,
         LEFTHAND,
         RING,

Assets/Scripts/Menu/UIHandlerMenu.cs

@@ -1,4 +1,5 @@
 using Assets.Scripts.Classes;
+using Assets.Scripts.Player;
 using Assets.Scripts.Races;
 using System.Collections;
 using System.Collections.Generic;
@@ -91,7 +92,7 @@ namespace Assets.Scripts.Menu
                     playerRace = new GiantRace();
                     break;
             }
-            GameObject.Find("Player").GetComponent<Player>().generatePlayer(playerRace, playerClass, name, GameObject.Find("dropDifficulty").GetComponent<Dropdown>().value);
+            GameObject.Find("Player").GetComponent<PlayerGameObject>().generatePlayer(playerRace, playerClass, name, GameObject.Find("dropDifficulty").GetComponent<Dropdown>().value);
         }
 
         public void openCharacterCreation()
@@ -192,13 +193,13 @@ namespace Assets.Scripts.Menu
             setPlayerInformation();
 
             // health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence, level, experience, maxExperience, points
-            int[] playerstats = GameObject.Find("Player").GetComponent<Player>().getStats();
+            PlayerGameObject player = GameObject.Find("Player").GetComponent<PlayerGameObject>();
 
-            GameObject.Find("txtStrength_Creation").GetComponent<Text>().text = TextHandler.getText("strength") + " " + playerstats[4];
-            GameObject.Find("txtDexterity_Creation").GetComponent<Text>().text = TextHandler.getText("dexterity") + " " + playerstats[5];
-            GameObject.Find("txtIntelligence_Creation").GetComponent<Text>().text = TextHandler.getText("intelligence") + " " + playerstats[6];
-            GameObject.Find("txtHealth_Creation").GetComponent<Text>().text = TextHandler.getText("health") + " " + playerstats[1];
-            GameObject.Find("txtSecondary_Creation").GetComponent<Text>().text = "Mana: " + playerstats[3];
+            GameObject.Find("txtStrength_Creation").GetComponent<Text>().text = TextHandler.getText("strength") + " " + player.getPlayerStat("Strength").getAmount();
+            GameObject.Find("txtDexterity_Creation").GetComponent<Text>().text = TextHandler.getText("dexterity") + " " + player.getPlayerStat("Dexterity").getAmount();
+            GameObject.Find("txtIntelligence_Creation").GetComponent<Text>().text = TextHandler.getText("intelligence") + " " + player.getPlayerStat("Intelligence").getAmount();
+            GameObject.Find("txtHealth_Creation").GetComponent<Text>().text = TextHandler.getText("health") + " " + player.getPlayerStat("MaxHealth").getAmount();
+            GameObject.Find("txtSecondary_Creation").GetComponent<Text>().text = "Mana: " + player.getPlayerStat("MaxSecondary").getAmount();
 
         }
 

Assets/Scripts/Player.cs

@@ -1,731 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using UnityEngine.UI;
-using Assets.Scripts.Classes;
-using Assets.Scripts.Races;
-using Newtonsoft.Json.Linq;
-using UnityEngine.InputSystem;
-
-namespace Assets.Scripts
-{
-    public class Player : MonoBehaviour
-    {
-        public float speed = 5f;
-        System.Random rand = new System.Random();
-        DateTime now;
-        UIHandler uihandler;
-        AudioHandler audioHandler;
-        WorldGenerator worldGenerator;
-        int bobbingDirection = -1;
-
-        string playername;
-        int health;
-        int maxHealth;
-        int maxSecondary;
-        int secondary;
-        int strength;
-        int dexterity;
-        int intelligence;
-        int level;
-        int luck;
-        int experience;
-        int maxExperience;
-        int healthRegen;
-        int secondaryRegen;
-        BasicRace race;
-        BasicClass role;
-        BasicSkill[] skills = new BasicSkill[3];
-        int points = 0;
-        bool isDodging = false;
-        DateTime jumpTimer;
-
-        int killcount = -1;
-        int difficulty = 0;
-        Dictionary<string, int> equipment;
-        bool finishedGame = false;
-
-
-
-        private void OnEnable()
-        {
-#if UNITY_EDITOR
-            SceneHandler.switchGameToMenu();
-#endif
-        }
-
-        // Start is called before the first frame update
-        void Start()
-        {
-            uihandler = GameObject.Find("UIHandler").GetComponent<UIHandler>();
-            audioHandler = GameObject.Find("AudioHandler").GetComponent<AudioHandler>();
-
-            if (GameObject.Find("Inventory") != null)
-            {
-                equipment = GameObject.Find("Inventory").GetComponent<Inventory>().getEquipmentBonus();
-            }
-            if (GameObject.Find("WorldGenerator") != null)
-            {
-                worldGenerator = GameObject.Find("WorldGenerator").GetComponent<WorldGenerator>();
-            }
-        }
-
-        public void finishPlayerCreation()
-        {
-            killcount = 0;
-            generateSkills();
-            EasterEggHandler.applyEasterEgg(this);
-        }
-
-        public void generatePlayer(BasicRace race, BasicClass role, string name, int difficulty)
-        {
-            playername = name;
-            health = 100;
-            maxHealth = 100;
-            maxSecondary = 20;
-            secondary = 20;
-            strength = 5;
-            dexterity = 5;
-            intelligence = 5;
-            experience = 0;
-            maxExperience = 10;
-            healthRegen = 30 / (difficulty + 1);
-            secondaryRegen = 5;
-            level = 0;
-            luck = 20 - (difficulty * 5);
-            this.race = race;
-            this.race.applyBonus(this);
-            this.role = role;
-            this.role.applyBonus(this);
-            this.difficulty = difficulty;
-        }
-
-        public void generatePlayer()
-        {
-            switch (PlayerPrefs.GetInt("class"))
-            {
-                case 0:
-                    role = new WarriorClass();
-                    break;
-                case 1:
-                    role = new MageClass();
-                    break;
-                case 2:
-                    role = new ThiefClass();
-                    break;
-            }
-            switch (PlayerPrefs.GetInt("race"))
-            {
-                case 0:
-                    race = new HumanRace();
-                    break;
-                case 1:
-                    race = new ElvenRace();
-                    break;
-                case 2:
-                    race = new DwarvenRace();
-                    break;
-                case 3:
-                    race = new GoblinRace();
-                    break;
-                case 4:
-                    race = new GiantRace();
-                    break;
-            }
-            playername = PlayerPrefs.GetString("playername");
-            health = 100;
-            maxHealth = 100;
-            maxSecondary = 20;
-            secondary = 20;
-            strength = 5;
-            dexterity = 5;
-            intelligence = 5;
-            experience = 0;
-            maxExperience = 10;
-            healthRegen = 30 / (difficulty + 1);
-            secondaryRegen = 5;
-            level = 0;
-            luck = 20 - (difficulty * 5);
-            this.race.applyBonus(this);
-            this.role.applyBonus(this);
-            this.difficulty = PlayerPrefs.GetInt("difficulty");
-        }
-
-        private void generateSkills()
-        {
-            switch (role.classname)
-            {
-                case "Warrior":
-                    skills[0] = new BasicSkill(20, 10, 2, "Slash", "Skills/Warrior/Slash", null);
-                    skills[0].setDescription(TextHandler.getText("slashDesc"));//"");
-                    skills[1] = new BasicSkill(0, 5, 1, "Block", "Skills/Warrior/Block", null);
-                    skills[1].setDescription(TextHandler.getText("blockDesc"));//"");
-                    skills[2] = new BasicSkill(35, 30, 4, "Execution", "Skills/Warrior/Execution", null);
-                    skills[2].setDescription(TextHandler.getText("executionDesc"));//"");
-                    break;
-                case "Thief":
-                    skills[0] = new BasicSkill(20, 10, 2, "Stab", "Skills/Thief/Stab", null);
-                    skills[0].setDescription(TextHandler.getText("stabDesc"));//"");
-                    skills[1] = new BasicSkill(0, 5, 1, "SmokeScreen", "Skills/Thief/SmokeScreen", null);
-                    skills[1].setDescription(TextHandler.getText("smokeScreenDesc"));//"");
-                    skills[2] = new BasicSkill(35, 30, 4, "Heartstop", "Skills/Thief/Heartstop", null);
-                    skills[2].setDescription(TextHandler.getText("heartStopDesc"));//"");
-                    break;
-                case "Mage":
-                    skills[0] = new BasicSkill(20, 10, 2, "Icicle", "Skills/Mage/Icicle", null);
-                    skills[0].setDescription(TextHandler.getText("icicleDesc"));//"");
-                    skills[1] = new BasicSkill(0, 5, 1, "Teleport", "Skills/Mage/Teleport", null);
-                    skills[1].setDescription(TextHandler.getText("teleportDesc"));//"");
-                    skills[2] = new BasicSkill(35, 30, 4, "Fireball", "Skills/Mage/Fireball", null);
-                    skills[2].setDescription(TextHandler.getText("fireballDesc"));//"");
-                    break;
-            }
-        }
-
-        public void changeStats(int strength, int health, int dexterity, int intelligence, int secondary)
-        {
-            this.maxHealth = this.maxHealth + health;
-            this.health = maxHealth;
-            this.maxSecondary = this.maxSecondary + secondary;
-            this.secondary = maxSecondary;
-            this.strength = this.strength + strength;
-            this.dexterity = this.dexterity + dexterity;
-            this.intelligence = this.intelligence + intelligence;
-        }
-
-        // Update is called once per frame
-        void Update()
-        {
-            if (killcount != -1)
-            {
-                getRotation();
-                regeneratePlayer();
-                uihandler.adjustInformation(this);
-                if (!finishedGame)
-                {
-                    gameFinished();
-                }
-            }
-        }
-
-        private void regeneratePlayer()
-        {
-            if (uihandler.state != UIState.FIGHT)
-            {
-                if (now == null)
-                {
-                    now = DateTime.Now;
-                }
-                else
-                {
-                    if (now.AddSeconds(10).CompareTo(DateTime.Now) <= 0)
-                    {
-                        now = DateTime.Now;
-                        regainSecondary();
-                        healPlayer();
-                    }
-                }
-            }
-            else
-            {
-                now = DateTime.Now;
-            }
-        }
-
-        public void regainSecondary()
-        {
-            secondary = secondary + secondaryRegen + equipment["MPR"];
-            if (secondary >= maxSecondary + equipment["MP"])
-            {
-                secondary = maxSecondary + equipment["MP"];
-            }
-        }
-
-        private void healPlayer()
-        {
-            health = health + healthRegen + equipment["HPR"];
-            if (Input.GetKey(KeyCode.W) || Input.GetKey(KeyCode.S))
-            {
-                health = health + 5;
-            }
-            if (health >= maxHealth + equipment["HP"])
-            {
-                health = maxHealth + +equipment["HP"];
-            }
-        }
-
-        public void move(Vector3 input)
-        {
-            GameObject camera = GameObject.Find("Main Camera");
-
-            if (input.y != 0)
-            {
-                if (jumpTimer != null)
-                {
-                    if (jumpTimer.AddSeconds(1).CompareTo(DateTime.Now) <= 0)
-                    {
-                        jumpTimer = DateTime.Now;
-                        gameObject.GetComponent<Rigidbody>().velocity = new Vector3(0, 5, 0);
-                        audioHandler.playJump();
-                    }
-                }
-                else
-                {
-                    jumpTimer = DateTime.Now;
-                    gameObject.GetComponent<Rigidbody>().velocity = new Vector3(0, 5, 0);
-                    audioHandler.playJump();
-                }
-            }
-
-            Vector3 movement = new Vector3(input.x, 0, input.z);
-            movement = camera.transform.TransformDirection(movement);
-            movement.y = 0;
-            gameObject.transform.Translate(movement * speed * Time.deltaTime);
-
-            if (input.z != 0)
-            {
-                if (camera.transform.localPosition.y >= 0.5)
-                {
-                    bobbingDirection = -1;
-                }
-                else if (camera.transform.localPosition.y <= 0.3)
-                {
-                    bobbingDirection = 1;
-                }
-
-                camera.transform.Translate(new Vector3(0, bobbingDirection, 0) * Time.deltaTime / 2);
-            }
-            GameObject.Find("QuestLog").GetComponent<QuestLog>().updateQuests("explore", gameObject, 1);
-        }
-
-        public void getRotation()
-        {
-            GameObject needle = GameObject.Find("imgNeedle");
-            float rotation = GameObject.Find("Main Camera").transform.rotation.eulerAngles.y;
-            if (rotation < 0)
-            {
-                rotation += 360;
-            }
-            if (rotation >= 360)
-            {
-                rotation -= 360;
-            }
-            needle.transform.eulerAngles = new Vector3(0, 0, rotation);
-        }
-
-        public int[] getStats()
-        {
-            int luck = 0;
-            if (equipment != null && equipment.ContainsKey("LCK"))
-            {
-                luck = this.luck + equipment["LCK"];
-            }
-            else
-            {
-                luck = this.luck;
-            }
-            int[] result = { health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence, level, experience, maxExperience, points, luck };
-            return result;
-        }
-
-        public void setStats(int[] stats)
-        {
-            maxHealth = stats[0];
-            health = maxHealth;
-            maxSecondary = stats[1];
-            secondary = maxSecondary;
-            strength = stats[2];
-            dexterity = stats[3];
-            intelligence = stats[4];
-        }
-
-        public void displayAction(int index, GameObject image, GameObject desc)
-        {
-            skills[index].display(image, desc, secondary);
-        }
-
-        public int calculateDamage()
-        {
-            int result;
-            int bonus = 0;
-            if (isCrit())
-            {
-                bonus = (strength + equipment["STR"]) * 2;
-            }
-            result = strength + bonus + 5 + equipment["STR"];
-            switch (difficulty)
-            {
-                case 0:
-                    result = result * 2;
-                    break;
-                case 1:
-                    //Default difficulty
-                    break;
-                case 2:
-                    result = result / 2;
-                    break;
-            }
-            return result;
-        }
-
-        public int castSkill(int index)
-        {
-            int damage = 0;
-            if (skills[index].canPlayerCast(secondary))
-            {
-                if (index == 1)
-                {
-                    isDodging = true;
-                }
-                secondary = secondary - skills[index].getSecondaryConsumption();
-                if (role.classname == "Wizard")
-                {
-                    damage = skills[index].calculateDamage(intelligence + equipment["INT"], isCrit());
-                }
-                else
-                {
-                    damage = skills[index].calculateDamage(strength + equipment["STR"], isCrit());
-                }
-
-                switch (difficulty)
-                {
-                    case 0:
-                        damage = damage * 2;
-                        break;
-                    case 1:
-                        //Default difficulty
-                        break;
-                    case 2:
-                        damage = damage / 2;
-                        break;
-                }
-                skills[index].playSound(audioHandler);
-            }
-            return damage;
-        }
-
-        public void reduceCooldown(int index)
-        {
-            for (int i = 0; i < skills.Length; i++)
-            {
-                if (i != index)
-                {
-                    skills[i].reduceCooldown();
-                }
-            }
-        }
-
-        public bool isCrit()
-        {
-            return rand.Next(1, 101) <= dexterity + equipment["DEX"];
-        }
-
-        public int getKillCount()
-        {
-            return killcount;
-        }
-
-        public bool takeDamage(int amount)
-        {
-            if (amount > 0)
-            {
-                if (!EasterEggHandler.isGodMode(this))
-                {
-                    if (isDodging)
-                    {
-                        isDodging = false;
-                    }
-                    else
-                    {
-                        if (rand.Next(1, 101) > dexterity + equipment["DEX"] + ((intelligence + equipment["INT"]) / 2))
-                        {
-                            health = health - amount;
-                            audioHandler.playDamage();
-                        }
-                    }
-                }
-            }
-            return health <= 0;
-        }
-
-        public void enemyKilled()
-        {
-            uihandler.showMessage("SUCCESS;" + TextHandler.getText("enemyKilled"));
-            killcount++;
-            SteamWorksHandler.getSlimeAchievement(killcount);
-            gameFinished();
-        }
-
-        public void gameFinished()
-        {
-            if (worldGenerator.gameWon())
-            {
-                finishedGame = true;
-                uihandler.showMessage("SUCCESS;" + TextHandler.getText("gameWon"));
-                switch (difficulty)
-                {
-                    case 0:
-                        SteamWorksHandler.getStandardAchievement("EasyAchievement");
-                        break;
-                    case 1:
-                        SteamWorksHandler.getStandardAchievement("NormalAchievement");
-                        break;
-                    case 2:
-                        SteamWorksHandler.getStandardAchievement("HardAchievement");
-                        break;
-                }
-            }
-        }
-
-        public void gainExperience(int amount)
-        {
-            experience = experience + amount;
-            if (experience >= maxExperience)
-            {
-                experience = experience - maxExperience;
-                maxExperience = maxExperience * 2;
-                level++;
-                uihandler.showMessage("SUCCESS;" + TextHandler.getText("levelUp"));
-                points = points + 3;
-                audioHandler.playLevelUp();
-                luck = luck + 2;
-            }
-        }
-
-        public void updateName(Text nameUI)
-        {
-            nameUI.text = playername + " (" + TextHandler.getText(race.racename) + "/" + TextHandler.getText(role.classname) + ", Lvl. " + level + ")";
-        }
-
-        public void updateNameHUD(Text nameUI)
-        {
-            nameUI.text = playername + "\n\r" + TextHandler.getText(race.racename) + "/" + TextHandler.getText(role.classname) + "\r\n Lvl. " + level;
-        }
-
-        public void upgradeStrength()
-        {
-            if (points > 0)
-            {
-                strength++;
-                points--;
-            }
-            else
-            {
-                uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints"));
-            }
-        }
-
-        public void upgradeDexterity()
-        {
-            if (points > 0)
-            {
-                dexterity++;
-                points--;
-            }
-            else
-            {
-                uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints"));
-            }
-        }
-
-        public void upgradeIntelligence()
-        {
-            if (points > 0)
-            {
-                intelligence++;
-                points--;
-            }
-            else
-            {
-                uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints"));
-            }
-        }
-
-        public void upgradeHealth()
-        {
-            if (points > 0)
-            {
-                maxHealth = maxHealth + 5;
-                health = maxHealth + equipment["HP"];
-                points--;
-            }
-            else
-            {
-                uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints"));
-            }
-        }
-
-        public void upgradeSecondary()
-        {
-            if (points > 0)
-            {
-                maxSecondary = maxSecondary + 5;
-                secondary = maxSecondary + equipment["MP"];
-                points--;
-            }
-            else
-            {
-                uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints"));
-            }
-        }
-
-        public void displaySkills(GameObject pnlSkills)
-        {
-            for (int i = 1; i <= 3; i++)
-            {
-                GameObject skill = pnlSkills.transform.Find("skill" + i).gameObject;
-                skills[i - 1].displaySkill(skill.transform.Find("imgAction").gameObject, skill.transform.Find("descAction").gameObject);
-            }
-        }
-
-        public string getPlayerName()
-        {
-            return playername;
-        }
-
-        public int getDifficulty()
-        {
-            return difficulty;
-        }
-
-        public BasicRace getRace()
-        {
-            return race;
-        }
-
-        public BasicClass getClass()
-        {
-            return role;
-        }
-
-        public string saveGame()
-        {
-            string result = "";
-            result = result + FileHandler.generateJSON("playername", "\"" + playername + "\"") + ",\r\n";
-            result = result + FileHandler.generateJSON("maxHealth", maxHealth) + ",\r\n";
-            result = result + FileHandler.generateJSON("maxSecondary", maxSecondary) + ",\r\n";
-            result = result + FileHandler.generateJSON("secondary", secondary) + ",\r\n";
-            result = result + FileHandler.generateJSON("health", health) + ",\r\n";
-            result = result + FileHandler.generateJSON("strength", strength) + ",\r\n";
-            result = result + FileHandler.generateJSON("dexterity", dexterity) + ",\r\n";
-            result = result + FileHandler.generateJSON("intelligence", intelligence) + ",\r\n";
-            result = result + FileHandler.generateJSON("level", level) + ",\r\n";
-            result = result + FileHandler.generateJSON("experience", experience) + ",\r\n";
-            result = result + FileHandler.generateJSON("maxExperience", maxExperience) + ",\r\n";
-            result = result + FileHandler.generateJSON("race", "\"" + race.racename + "\"") + ",\r\n";
-            result = result + FileHandler.generateJSON("role", "\"" + role.classname + "\"") + ",\r\n";
-            result = result + FileHandler.generateJSON("points", points) + ",\r\n";
-            result = result + FileHandler.generateJSON("healthRegen", healthRegen) + ",\r\n";
-            result = result + FileHandler.generateJSON("secondaryRegen", secondaryRegen) + ",\r\n";
-            result = result + FileHandler.generateJSON("isDodging", "\"" + isDodging + "\"") + ",\r\n";
-            result = result + FileHandler.generateJSON("killcount", killcount) + ",\r\n";
-            result = result + FileHandler.generateJSON("luck", luck) + ",\r\n";
-            result = result + FileHandler.generateJSON("difficulty", difficulty);
-            return result;
-        }
-
-        public void loadPlayer(JToken json)
-        {
-            playername = json["playername"].ToString();
-            maxHealth = (int)json["maxHealth"];
-            maxSecondary = (int)json["maxSecondary"];
-            secondary = (int)json["secondary"];
-            health = (int)json["health"];
-            strength = (int)json["strength"];
-            dexterity = (int)json["dexterity"];
-            intelligence = (int)json["intelligence"];
-            level = (int)json["level"];
-            experience = (int)json["experience"];
-            maxExperience = (int)json["maxExperience"];
-            loadRole(json["role"].ToString());
-            loadRace(json["race"].ToString());
-            points = (int)json["points"];
-            luck = (int)json["luck"];
-            healthRegen = (int)json["healthRegen"];
-            secondaryRegen = (int)json["secondaryRegen"];
-            isDodging = bool.Parse(json["isDodging"].ToString());
-            killcount = (int)json["killcount"];
-            difficulty = (int)json["difficulty"];
-            generateSkills();
-        }
-
-        private void loadRole(string name)
-        {
-            switch (name)
-            {
-                case "Warrior":
-                    role = new WarriorClass();
-                    break;
-                case "Mage":
-                    role = new MageClass();
-                    break;
-                case "Thief":
-                    role = new ThiefClass();
-                    break;
-            }
-        }
-
-        private void loadRace(string name)
-        {
-            switch (name)
-            {
-                case "Human":
-                    race = new HumanRace();
-                    break;
-                case "Dwarf":
-                    race = new DwarvenRace();
-                    break;
-                case "Elf":
-                    race = new ElvenRace();
-                    break;
-                case "Giant":
-                    race = new GiantRace();
-                    break;
-                case "Goblin":
-                    race = new GoblinRace();
-                    break;
-            }
-        }
-
-        public int getLuck()
-        {
-            return luck;
-        }
-
-        void OnTriggerEnter(Collider col)
-        {
-            if (col.gameObject.name.Contains("_"))
-            {
-                worldGenerator.changeCurrentTile(col.gameObject);
-            }
-        }
-
-        void OnTriggerStay(Collider col)
-        {
-            if (col.gameObject.name.Contains("border"))
-            {
-                Vector3 newTile = new Vector3();
-                if (col.gameObject.name.ToLower() == "bordernorth")
-                {
-                    newTile = newTile + new Vector3(0, 0, 1);
-                }
-                if (col.gameObject.name.ToLower() == "bordersouth")
-                {
-                    newTile = newTile + new Vector3(0, 0, -1);
-                }
-                if (col.gameObject.name.ToLower() == "bordereast")
-                {
-                    newTile = newTile + new Vector3(1, 0, 0);
-                }
-                if (col.gameObject.name.ToLower() == "borderwest")
-                {
-                    newTile = newTile + new Vector3(-1, 0, 0);
-                }
-                worldGenerator.createTile(newTile);
-            }
-        }
-    }
-}

Assets/Scripts/Player.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f3d401c0fa6bedaed8fd60cec0ed3af7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Player/PlayerCamera.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace Assets.Scripts
+namespace Assets.Scripts.Player
 {
     public class PlayerCamera : MonoBehaviour
     {

Assets/Scripts/Player/PlayerCamera.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0dafbb406c854e141ba4c7f354514063
+guid: ccf47fd0e7044a6f08a0f3353ee62cf5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/Player/PlayerGameObject.cs

@@ -0,0 +1,376 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+using UnityEngine.UI;
+using Assets.Scripts.Classes;
+using Assets.Scripts.Races;
+using Newtonsoft.Json.Linq;
+using UnityEngine.InputSystem;
+
+namespace Assets.Scripts.Player
+{
+    public class PlayerGameObject : MonoBehaviour
+    {
+        UIHandler uihandler;
+        AudioHandler audioHandler;
+        WorldGenerator worldGenerator;
+        Inventory inventory;
+        int difficulty = 0;
+        bool finishedGame = false;
+        PlayerObject player;
+        public float speed = 5f;
+        DateTime jumpTimer;
+        DateTime now;
+        int bobbingDirection = -1;
+
+        private void OnEnable()
+        {
+#if UNITY_EDITOR
+            SceneHandler.switchGameToMenu();
+#endif
+        }
+
+        void Start()
+        {
+            uihandler = GameObject.Find("UIHandler").GetComponent<UIHandler>();
+            audioHandler = GameObject.Find("AudioHandler").GetComponent<AudioHandler>();
+
+            if (GameObject.Find("Inventory") != null)
+            {
+                inventory = GameObject.Find("Inventory").GetComponent<Inventory>(); 
+            }
+            if (GameObject.Find("WorldGenerator") != null)
+            {
+                worldGenerator = GameObject.Find("WorldGenerator").GetComponent<WorldGenerator>();
+            }
+            generatePlayer();
+        }
+
+        // Update is called once per frame
+        void Update()
+        {
+            if (player.getStat("Killcount").getAmount() != -1)
+            {
+                getRotation();
+                regeneratePlayer();
+                uihandler.adjustInformation(this);
+                if (!finishedGame)
+                {
+                    gameFinished();
+                }
+            }
+        }
+
+        private void regeneratePlayer()
+        {
+            if (uihandler.state != UIState.FIGHT)
+            {
+                if (now == null)
+                {
+                    now = DateTime.Now;
+                }
+                else
+                {
+                    if (now.AddSeconds(10).CompareTo(DateTime.Now) <= 0)
+                    {
+                        now = DateTime.Now;
+                        player.regainSecondary(inventory.getEquipmentBonus()["MPR"],inventory.getEquipmentBonus()["MP"]);
+                        player.healPlayer(inventory.getEquipmentBonus()["HPR"],inventory.getEquipmentBonus()["HP"]);
+                    }
+                }
+            }
+            else
+            {
+                now = DateTime.Now;
+            }
+        }
+
+
+        public void generatePlayer()
+        {
+            BasicRace race = new BasicRace();
+            BasicClass role = new BasicClass();
+            switch (PlayerPrefs.GetInt("class"))
+            {
+                case 0:
+                    role = new WarriorClass();
+                    break;
+                case 1:
+                    role = new MageClass();
+                    break;
+                case 2:
+                    role = new ThiefClass();
+                    break;
+            }
+            switch (PlayerPrefs.GetInt("race"))
+            {
+                case 0:
+                    race = new HumanRace();
+                    break;
+                case 1:
+                    race = new ElvenRace();
+                    break;
+                case 2:
+                    race = new DwarvenRace();
+                    break;
+                case 3:
+                    race = new GoblinRace();
+                    break;
+                case 4:
+                    race = new GiantRace();
+                    break;
+            }
+            string playername = PlayerPrefs.GetString("playername");
+            difficulty = PlayerPrefs.GetInt("difficulty");
+            player = new PlayerObject(playername, race, role, difficulty);
+        }
+
+        public void generatePlayer(BasicRace playerRace, BasicClass playerClass, string name, int difficulty){
+            player = new PlayerObject(name, playerRace, playerClass, difficulty);
+        }
+
+        public void move(Vector3 input)
+        {
+            GameObject camera = GameObject.Find("Main Camera");
+
+            if (input.y != 0)
+            {
+                if (jumpTimer != null)
+                {
+                    if (jumpTimer.AddSeconds(1).CompareTo(DateTime.Now) <= 0)
+                    {
+                        jumpTimer = DateTime.Now;
+                        gameObject.GetComponent<Rigidbody>().velocity = new Vector3(0, 5, 0);
+                        audioHandler.playJump();
+                    }
+                }
+                else
+                {
+                    jumpTimer = DateTime.Now;
+                    gameObject.GetComponent<Rigidbody>().velocity = new Vector3(0, 5, 0);
+                    audioHandler.playJump();
+                }
+            }
+
+            Vector3 movement = new Vector3(input.x, 0, input.z);
+            movement = camera.transform.TransformDirection(movement);
+            movement.y = 0;
+            gameObject.transform.Translate(movement * speed * Time.deltaTime);
+
+            if (input.z != 0)
+            {
+                if (camera.transform.localPosition.y >= 0.5)
+                {
+                    bobbingDirection = -1;
+                }
+                else if (camera.transform.localPosition.y <= 0.3)
+                {
+                    bobbingDirection = 1;
+                }
+
+                camera.transform.Translate(new Vector3(0, bobbingDirection, 0) * Time.deltaTime / 2);
+            }
+            GameObject.Find("QuestLog").GetComponent<QuestLog>().updateQuests("explore", gameObject, 1);
+        }
+
+        public void getRotation()
+        {
+            GameObject needle = GameObject.Find("imgNeedle");
+            float rotation = GameObject.Find("Main Camera").transform.rotation.eulerAngles.y;
+            if (rotation < 0)
+            {
+                rotation += 360;
+            }
+            if (rotation >= 360)
+            {
+                rotation -= 360;
+            }
+            needle.transform.eulerAngles = new Vector3(0, 0, rotation);
+        }
+
+        public void gameFinished()
+        {
+            if (worldGenerator.gameWon())
+            {
+                finishedGame = true;
+                uihandler.showMessage("SUCCESS;" + TextHandler.getText("gameWon"));
+                switch (difficulty)
+                {
+                    case 0:
+                        SteamWorksHandler.getStandardAchievement("EasyAchievement");
+                        break;
+                    case 1:
+                        SteamWorksHandler.getStandardAchievement("NormalAchievement");
+                        break;
+                    case 2:
+                        SteamWorksHandler.getStandardAchievement("HardAchievement");
+                        break;
+                }
+            }
+        }
+        void OnTriggerEnter(Collider col)
+        {
+            if (col.gameObject.name.Contains("_"))
+            {
+                worldGenerator.changeCurrentTile(col.gameObject);
+            }
+        }
+
+        void OnTriggerStay(Collider col)
+        {
+            if (col.gameObject.name.Contains("border"))
+            {
+                Vector3 newTile = new Vector3();
+                if (col.gameObject.name.ToLower() == "bordernorth")
+                {
+                    newTile = newTile + new Vector3(0, 0, 1);
+                }
+                if (col.gameObject.name.ToLower() == "bordersouth")
+                {
+                    newTile = newTile + new Vector3(0, 0, -1);
+                }
+                if (col.gameObject.name.ToLower() == "bordereast")
+                {
+                    newTile = newTile + new Vector3(1, 0, 0);
+                }
+                if (col.gameObject.name.ToLower() == "borderwest")
+                {
+                    newTile = newTile + new Vector3(-1, 0, 0);
+                }
+                worldGenerator.createTile(newTile);
+            }
+        }
+
+        public void displayAction(int index, GameObject image, GameObject desc)
+        {
+            player.getSkill(index).display(image, desc, player.getStat("Secondary").getAmount());
+        }
+
+        public void enemyKilled()
+        {
+            uihandler.showMessage("SUCCESS;" + TextHandler.getText("enemyKilled"));
+            player.getStat("Killcount").changeAmount(1);
+            SteamWorksHandler.getSlimeAchievement(player.getStat("Killcount").getAmount());
+            gameFinished();
+        }
+
+        public void gainExperience(int amount)
+        {
+            if (player.gainExperience(amount))
+            {
+                uihandler.showMessage("SUCCESS;" + TextHandler.getText("levelUp"));
+                audioHandler.playLevelUp();
+            }
+        }
+
+        public void updateName(Text nameUI)
+        {
+            nameUI.text = player.getPlayerName() + " (" + TextHandler.getText(player.getRace().racename) + "/" + TextHandler.getText(player.getClass().classname) + ", Lvl. " + player.getStat("Level").getAmount() + ")";
+        }
+
+        public void updateNameHUD(Text nameUI)
+        {
+            nameUI.text = player.getPlayerName() + "\n\r" + TextHandler.getText(player.getRace().racename) + "/" + TextHandler.getText(player.getClass().classname) + "\r\n Lvl. " + player.getStat("Level").getAmount();
+        }
+
+        public void upgradeStrength()
+        {
+            if (!player.upgradeStat("Strength", 1))
+            {
+                uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints"));
+            }
+        }
+
+        public void upgradeDexterity()
+        {
+            if (!player.upgradeStat("Dexterity", 1))
+            {
+                uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints"));
+            }
+        }
+
+        public void upgradeIntelligence()
+        {
+            if (!player.upgradeStat("Intelligence", 1))
+            {
+                uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints"));
+            }
+        }
+
+        public void upgradeHealth()
+        {
+            if (!player.upgradeStat("MaxHealth", 5))
+            {
+                uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints"));
+            }
+        }
+
+        public void upgradeSecondary()
+        {
+            if (!player.upgradeStat("MaxSecondary", 5))
+            {
+                uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints"));
+            }
+        }
+
+        public void displaySkills(GameObject pnlSkills)
+        {
+            for (int i = 1; i <= 3; i++)
+            {
+                GameObject skill = pnlSkills.transform.Find("skill" + i).gameObject;
+                player.getSkill(i - 1).displaySkill(skill.transform.Find("imgAction").gameObject, skill.transform.Find("descAction").gameObject);
+            }
+        }
+
+        public PlayerStat getPlayerStat(string identifier){
+            return player.getStat(identifier);
+        }
+
+        public void loadPlayer(JToken json){
+            player = new PlayerObject();
+            player.loadPlayer(json);
+        }
+
+        public PlayerObject getPlayer(){
+            return player;
+        }
+
+        public string saveGame(){
+            return player.saveGame();
+        }
+
+        public BasicClass getClass(){
+            return player.getClass();
+        }
+
+        public BasicRace getRace(){
+            return player.getRace();
+        }
+
+        public int calculateDamage(){
+            return player.calculateDamage(inventory.getEquipmentBonus()["STR"], inventory.getEquipmentBonus()["DEX"]);
+        }
+
+        public bool takeDamage(int amount){
+            if(player != null){
+                return player.takeDamage(amount,inventory.getEquipmentBonus()["DEX"], inventory.getEquipmentBonus()["INT"]);
+            }
+            return false;
+        }
+
+        public int castSkill(int skillnumber){
+            return player.castSkill(skillnumber,inventory.getEquipmentBonus()["INT"], inventory.getEquipmentBonus()["STR"], inventory.getEquipmentBonus()["DEX"]);
+        }
+
+        public void reduceCooldown(int skillnumber){
+            player.reduceCooldown(skillnumber);
+        }
+
+        public void regainSecondary(){
+            player.regainSecondary(inventory.getEquipmentBonus()["MPR"], inventory.getEquipmentBonus()["MP"]);
+        }
+    }
+}

Assets/Scripts/Player/PlayerGameObject.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6eac15f641a82224c87a6ada5746d64b
+guid: ac07c553f4e010e8299fb870481dcc49
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/Player/PlayerObject.cs

@@ -0,0 +1,381 @@
+using System;
+using System.Collections.Generic;
+using Assets.Scripts.Classes;
+using Assets.Scripts.Races;
+using Newtonsoft.Json.Linq;
+
+namespace Assets.Scripts.Player
+{
+    public class PlayerObject
+    {
+        Random rand = new Random();
+        Dictionary<string, PlayerStat> stats;
+        string playername;
+        BasicRace race;
+        BasicClass role;
+        BasicSkill[] skills = new BasicSkill[3];
+        bool isDodging = false;
+        int difficulty;
+
+        public PlayerObject(string playername, BasicRace race, BasicClass role, int difficulty)
+        {
+            this.playername = playername;
+            this.race = race;
+            this.role = role;
+            this.difficulty = difficulty;
+            generateStats(false);
+            generateSkills();
+            EasterEggHandler.applyEasterEgg(this);
+        }
+
+        public PlayerObject()
+        {
+            generateStats(true);
+        }
+
+        private void generateStats(bool isLoad)
+        {
+            stats = new Dictionary<string, PlayerStat>();
+            stats.Add("Health", new PlayerStat("Health", 100, "The current health of the player"));
+            stats.Add("MaxHealth", new PlayerStat("MaxHealth", 100, "The current max health of the player"));
+            stats.Add("Secondary", new PlayerStat("Secondary", 20, "The current secondary of the player"));
+            stats.Add("MaxSecondary", new PlayerStat("MaxSecondary", 20, "The current max secondary of the player"));
+            stats.Add("Strength", new PlayerStat("Strength", 5, "The current strength of the player"));
+            stats.Add("Dexterity", new PlayerStat("Dexterity", 5, "The current dexterity of the player"));
+            stats.Add("Intelligence", new PlayerStat("Intelligence", 5, "The current intelligence of the player"));
+            stats.Add("Experience", new PlayerStat("Experience", 0, "The current experience of the player"));
+            stats.Add("MaxExperience", new PlayerStat("MaxExperience", 10, "The current max experience of the player"));
+            stats.Add("HealthRegen", new PlayerStat("HealthRegen", 30 / (difficulty + 1), "The current health regen of the player"));
+            stats.Add("SecondaryRegen", new PlayerStat("SecondaryRegen", 5, "The current secondary regen of the player"));
+            stats.Add("Level", new PlayerStat("Level", 0, "The current level of the player"));
+            stats.Add("Luck", new PlayerStat("Luck", 20 - (difficulty * 5), "The current luck of the player"));
+            stats.Add("Killcount", new PlayerStat("Killcount", -1, "The current killcount of the player"));
+            stats.Add("Points", new PlayerStat("Points", 0, "The current skillpoints of the player"));
+
+            if (!isLoad)
+            {
+                race.applyBonus(this);
+                role.applyBonus(this);
+            }
+
+        }
+
+        private void generateSkills()
+        {
+            switch (role.classname)
+            {
+                case "Warrior":
+                    skills[0] = new BasicSkill(20, 10, 2, "Slash", "Skills/Warrior/Slash", null);
+                    skills[0].setDescription(TextHandler.getText("slashDesc"));
+                    skills[1] = new BasicSkill(0, 5, 1, "Block", "Skills/Warrior/Block", null);
+                    skills[1].setDescription(TextHandler.getText("blockDesc"));
+                    skills[2] = new BasicSkill(35, 30, 4, "Execution", "Skills/Warrior/Execution", null);
+                    skills[2].setDescription(TextHandler.getText("executionDesc"));
+                    break;
+                case "Thief":
+                    skills[0] = new BasicSkill(20, 10, 2, "Stab", "Skills/Thief/Stab", null);
+                    skills[0].setDescription(TextHandler.getText("stabDesc"));
+                    skills[1] = new BasicSkill(0, 5, 1, "SmokeScreen", "Skills/Thief/SmokeScreen", null);
+                    skills[1].setDescription(TextHandler.getText("smokeScreenDesc"));
+                    skills[2] = new BasicSkill(35, 30, 4, "Heartstop", "Skills/Thief/Heartstop", null);
+                    skills[2].setDescription(TextHandler.getText("heartStopDesc"));
+                    break;
+                case "Mage":
+                    skills[0] = new BasicSkill(20, 10, 2, "Icicle", "Skills/Mage/Icicle", null);
+                    skills[0].setDescription(TextHandler.getText("icicleDesc"));
+                    skills[1] = new BasicSkill(0, 5, 1, "Teleport", "Skills/Mage/Teleport", null);
+                    skills[1].setDescription(TextHandler.getText("teleportDesc"));
+                    skills[2] = new BasicSkill(35, 30, 4, "Fireball", "Skills/Mage/Fireball", null);
+                    skills[2].setDescription(TextHandler.getText("fireballDesc"));
+                    break;
+            }
+        }
+
+        public void loadPlayer(JToken json)
+        {
+            playername = json["playername"].ToString();
+
+            stats["MaxHealth"].setAmount((int)json["maxHealth"]);
+            stats["MaxSecondary"].setAmount((int)json["maxSecondary"]);
+            stats["Secondary"].setAmount((int)json["secondary"]);
+            stats["Health"].setAmount((int)json["health"]);
+            stats["Strength"].setAmount((int)json["strength"]);
+            stats["Dexterity"].setAmount((int)json["dexterity"]);
+            stats["Intelligence"].setAmount((int)json["intelligence"]);
+            stats["Level"].setAmount((int)json["level"]);
+            stats["Experience"].setAmount((int)json["experience"]);
+            stats["MaxExperience"].setAmount((int)json["maxExperience"]);
+            stats["Points"].setAmount((int)json["points"]);
+            stats["Luck"].setAmount((int)json["luck"]);
+            stats["HealthRegen"].setAmount((int)json["healthRegen"]);
+            stats["SecondaryRegen"].setAmount((int)json["secondaryRegen"]);
+            stats["Killcount"].setAmount((int)json["killcount"]);
+
+            loadRole(json["role"].ToString());
+            loadRace(json["race"].ToString());
+            isDodging = bool.Parse(json["isDodging"].ToString());
+            difficulty = (int)json["difficulty"];
+            generateSkills();
+        }
+
+        private void loadRole(string name)
+        {
+            switch (name)
+            {
+                case "Warrior":
+                    role = new WarriorClass();
+                    break;
+                case "Mage":
+                    role = new MageClass();
+                    break;
+                case "Thief":
+                    role = new ThiefClass();
+                    break;
+            }
+        }
+
+        private void loadRace(string name)
+        {
+            switch (name)
+            {
+                case "Human":
+                    race = new HumanRace();
+                    break;
+                case "Dwarf":
+                    race = new DwarvenRace();
+                    break;
+                case "Elf":
+                    race = new ElvenRace();
+                    break;
+                case "Giant":
+                    race = new GiantRace();
+                    break;
+                case "Goblin":
+                    race = new GoblinRace();
+                    break;
+            }
+        }
+
+        public void changeStats(int strength, int health, int dexterity, int intelligence, int secondary)
+        {
+            stats["MaxHealth"].changeAmount(health);
+            stats["Health"].changeAmount(stats["MaxHealth"].getAmount());
+            stats["MaxSecondary"].changeAmount(secondary);
+            stats["Secondary"].changeAmount(stats["MaxSecondary"].getAmount());
+            stats["Strength"].changeAmount(strength);
+            stats["Dexterity"].changeAmount(dexterity);
+            stats["Intelligence"].changeAmount(intelligence);
+        }
+
+        public void regainSecondary(int equipRegen, int equipStat)
+        {
+            stats["Secondary"].changeAmount(stats["SecondaryRegen"].getAmount() + equipRegen);
+            if (stats["Secondary"].getAmount() >= stats["MaxSecondary"].getAmount() + equipStat)
+            {
+                stats["Secondary"].setAmount(stats["MaxSecondary"].getAmount() + equipStat);
+            }
+        }
+
+        public void healPlayer(int equipRegen, int equipStat)
+        {
+            stats["Health"].changeAmount(stats["HealthRegen"].getAmount() + equipRegen);
+            if (stats["Health"].getAmount() >= stats["MaxHealth"].getAmount() + equipStat)
+            {
+                stats["Health"].setAmount(stats["MaxHealth"].getAmount() + equipStat);
+            }
+        }
+
+        public Dictionary<string, PlayerStat> getStats()
+        {
+            return stats;
+        }
+
+        public void setStats(Dictionary<string, PlayerStat> stats)
+        {
+            this.stats = stats;
+        }
+
+        public PlayerStat getStat(string identifier)
+        {
+            return stats[identifier];
+        }
+
+        public BasicSkill getSkill(int index)
+        {
+            return skills[index];
+        }
+
+        public int calculateDamage(int equipStatStr, int equipStatDex)
+        {
+            int result;
+            int bonus = 0;
+            if (isCrit(equipStatDex))
+            {
+                bonus = (stats["Strength"].getAmount() + equipStatStr) * 2;
+            }
+            result = stats["Strength"].getAmount() + bonus + 5 + equipStatStr;
+            switch (difficulty)
+            {
+                case 0:
+                    result = result * 2;
+                    break;
+                case 1:
+                    //Default difficulty
+                    break;
+                case 2:
+                    result = result / 2;
+                    break;
+            }
+            return result;
+        }
+
+        public int castSkill(int index, int equipStatInt, int equipStatStr, int equipStatDex)
+        {
+            int damage = 0;
+            if (skills[index].canPlayerCast(stats["Secondary"].getAmount()))
+            {
+                if (index == 1)
+                {
+                    isDodging = true;
+                }
+                stats["Secondary"].changeAmount(-skills[index].getSecondaryConsumption());
+                if (role.classname == "Wizard")
+                {
+                    damage = skills[index].calculateDamage(stats["Intelligence"].getAmount() + equipStatInt, isCrit(equipStatDex));
+                }
+                else
+                {
+                    damage = skills[index].calculateDamage(stats["Strength"].getAmount() + equipStatStr, isCrit(equipStatDex));
+                }
+
+                switch (difficulty)
+                {
+                    case 0:
+                        damage = damage * 2;
+                        break;
+                    case 1:
+                        //Default difficulty
+                        break;
+                    case 2:
+                        damage = damage / 2;
+                        break;
+                }
+                //TODO: Let caller of this method handle audio if damage is higher than 0 // skills[index].playSound(audioHandler);
+            }
+            return damage;
+        }
+
+        public void reduceCooldown(int index)
+        {
+            for (int i = 0; i < skills.Length; i++)
+            {
+                if (i != index)
+                {
+                    skills[i].reduceCooldown();
+                }
+            }
+        }
+
+        public bool isCrit(int equipStat)
+        {
+            return rand.Next(1, 101) <= stats["Dexterity"].getAmount() + equipStat;
+        }
+
+        public bool takeDamage(int amount, int equipStatDex, int equipStatInt)
+        {
+
+            if (amount <= 0 || EasterEggHandler.isGodMode(this))
+            {
+                return stats["Health"].getAmount() <= 0;
+            }
+
+            if (isDodging)
+            {
+                isDodging = false;
+            }
+            else
+            {
+                int dodgeChance = stats["Dexterity"].getAmount() + equipStatDex + ((stats["Intelligence"].getAmount() + equipStatInt) / 2);
+                if (rand.Next(1, 101) > dodgeChance)
+                {
+                    stats["Health"].changeAmount(-amount);
+                    //TODO: Let caller of this method handle audio // audioHandler.playDamage();
+                }
+            }
+            return stats["Health"].getAmount() <= 0;
+        }
+
+        public bool gainExperience(int amount)
+        {
+            bool result = false;
+            stats["Experience"].changeAmount(amount);
+            if (stats["Experience"].getAmount() >= stats["MaxExperience"].getAmount())
+            {
+                stats["Experience"].changeAmount(-stats["MaxExperience"].getAmount());
+                stats["MaxExperience"].changeAmount(stats["MaxExperience"].getAmount());
+                stats["Level"].changeAmount(1);
+                stats["Points"].changeAmount(3);
+                stats["Luck"].changeAmount(2);
+                result = true;
+            }
+            return result;
+        }
+
+        public bool upgradeStat(string identifier, int amount)
+        {
+            bool result = false;
+            if (stats["Points"].getAmount() > 0)
+            {
+                result = true;
+                stats[identifier].changeAmount(amount);
+            }
+            return result;
+        }
+
+        public string getPlayerName()
+        {
+            return playername;
+        }
+
+        public int getDifficulty()
+        {
+            return difficulty;
+        }
+
+        public BasicRace getRace()
+        {
+            return race;
+        }
+
+        public BasicClass getClass()
+        {
+            return role;
+        }
+
+        public string saveGame()
+        {
+            string result = "";
+            result = result + FileHandler.generateJSON("playername", "\"" + playername + "\"") + ",\r\n";
+            result = result + FileHandler.generateJSON("maxHealth", stats["MaxHealth"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("maxSecondary", stats["MaxSecondary"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("secondary", stats["Secondary"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("health", stats["Health"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("strength", stats["Strength"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("dexterity", stats["Dexterity"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("intelligence", stats["Intelligence"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("level", stats["Level"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("experience", stats["Experience"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("maxExperience", stats["MaxExperience"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("race", "\"" + race.racename + "\"") + ",\r\n";
+            result = result + FileHandler.generateJSON("role", "\"" + role.classname + "\"") + ",\r\n";
+            result = result + FileHandler.generateJSON("points", stats["Points"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("healthRegen", stats["HealthRegen"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("secondaryRegen", stats["SecondaryRegen"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("isDodging", "\"" + isDodging + "\"") + ",\r\n";
+            result = result + FileHandler.generateJSON("killcount", stats["Killcount"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("luck", stats["Luck"].getAmount()) + ",\r\n";
+            result = result + FileHandler.generateJSON("difficulty", difficulty);
+            return result;
+        }
+    }
+}

Assets/Scripts/Player/PlayerObject.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8f3ccf8e929cf8c32b9a9479e8870bbd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Player/PlayerStat.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+using UnityEngine.UI;
+using Assets.Scripts.Classes;
+using Assets.Scripts.Races;
+using Newtonsoft.Json.Linq;
+using UnityEngine.InputSystem;
+
+namespace Assets.Scripts.Player
+{
+    public class PlayerStat
+    {
+        string text;
+        int amount;
+        string tooltip;
+
+        public PlayerStat(string text, int amount, string tooltip){
+            this.text = text;
+            this.amount = amount;
+            this.tooltip = tooltip;
+        }
+
+        public string getTooltip(){
+            return this.tooltip;
+        }
+
+        public string getText(){
+            return this.text;
+        }
+
+        public int getAmount(){
+            return this.amount;
+        }
+
+        public void changeAmount(int change){
+            this.amount = this.amount + change;
+        }
+
+        public void setAmount(int amount){
+            this.amount = amount;
+        }
+        
+    }
+}

Assets/Scripts/Player/PlayerStat.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3038d55d00ed9d790b3f50d461689251
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/QuestLog.cs

@@ -1,3 +1,4 @@
+using Assets.Scripts.Player;
 using Newtonsoft.Json.Linq;
 using System.Collections;
 using System.Collections.Generic;
@@ -112,7 +113,7 @@ namespace Assets.Scripts
         public void removeQuests()
         {
             Inventory inventory = GameObject.Find("Inventory").GetComponent<Inventory>();
-            int luck = GameObject.Find("Player").GetComponent<Player>().getLuck();
+            int luck = GameObject.Find("Player").GetComponent<PlayerGameObject>().getPlayerStat("Luck").getAmount();
             luck = luck + inventory.getEquipmentBonus()["LCK"];
             Dictionary<string, List<Quest>> toDelete = new Dictionary<string, List<Quest>>();
             foreach (string key in quests.Keys)

Assets/Scripts/Quests/ExploreQuest.cs

@@ -1,3 +1,4 @@
+using Assets.Scripts.Player;
 using Newtonsoft.Json.Linq;
 using System.Collections;
 using System.Collections.Generic;
@@ -9,7 +10,7 @@ namespace Assets.Scripts
     {
         public ExploreQuest(GameObject display) : base(display)
         {
-            Vector3 playerPos = GameObject.Find("Player").GetComponent<Player>().transform.position;
+            Vector3 playerPos = GameObject.Find("Player").GetComponent<PlayerGameObject>().transform.position;
             float coordX = getRandomNumber(1000) - 500;
             float coordZ = getRandomNumber(1000) - 500;
             coordinates = new Vector3(playerPos.x + coordX, 0, playerPos.z + coordZ);

Assets/Scripts/Races/BasicRace.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Assets.Scripts.Player;
 
 namespace Assets.Scripts.Races
 {
@@ -25,7 +26,7 @@ namespace Assets.Scripts.Races
             secondaryBonus = 0;
         }
 
-        public void applyBonus(Player player)
+        public void applyBonus(PlayerObject player)
         {
             player.changeStats(strengthBonus, healthBonus, dexterityBonus, intelligenceBonus, secondaryBonus);
         }

Assets/Scripts/Slimes/BasicSlime.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json.Linq;
+using Assets.Scripts.Player;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -21,20 +22,18 @@ namespace Assets.Scripts.Slimes
         protected Item item;
         protected int luck;
 
-        public BasicSlime(Player player)
+        public BasicSlime(PlayerGameObject player)
         {
-            //health,maxHealth,secondary,maxSecondary,strength,dexterity,intelligence,level,experience,maxExperience,points,luck
-            int[] playerStats = player.getStats();
-            maxHealth = playerStats[1];
+            maxHealth = player.getPlayerStat("MaxHealth").getAmount();
             health = maxHealth;
-            maxSecondary = playerStats[3];
+            maxSecondary = player.getPlayerStat("MaxSecondary").getAmount();
             secondary = maxSecondary;
-            strength = playerStats[4];
-            dexterity = playerStats[5];
-            intelligence = playerStats[6];
-            experience = (int)(10 + playerStats[7] * 2.5f);
-            level = playerStats[7];
-            luck = playerStats[11];
+            strength = player.getPlayerStat("Strength").getAmount();
+            dexterity = player.getPlayerStat("Dexterity").getAmount();
+            intelligence = player.getPlayerStat("Intelligence").getAmount();
+            experience = (int)(10 + player.getPlayerStat("Experience").getAmount() * 2.5f);
+            level = player.getPlayerStat("Level").getAmount();
+            luck = player.getPlayerStat("Luck").getAmount();
         }
 
         public BasicSlime(JToken json)

Assets/Scripts/Slimes/BossSlime.cs

@@ -3,12 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Assets.Scripts.Player;
 
 namespace Assets.Scripts.Slimes
 {
     class BossSlime : BasicSlime
     {
-        public BossSlime(Player player) : base(player)
+        public BossSlime(PlayerGameObject player) : base(player)
         {
             intelligence = intelligence + 5;
             strength = strength + 10;

Assets/Scripts/Slimes/ForestSlime.cs

@@ -3,12 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Assets.Scripts.Player;
 
 namespace Assets.Scripts.Slimes
 {
     class ForestSlime : BasicSlime
     {
-        public ForestSlime(Player player) : base(player)
+        public ForestSlime(PlayerGameObject player) : base(player)
         {
             //intelligence = intelligence;
             //strength = strength;

Assets/Scripts/Slimes/MageSlime.cs

@@ -3,12 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Assets.Scripts.Player;
 
 namespace Assets.Scripts.Slimes
 {
     public class MageSlime : BasicSlime
     {
-        public MageSlime(Player player) : base(player)
+        public MageSlime(PlayerGameObject player) : base(player)
         {
             intelligence = intelligence + 2;
             strength = strength - 2;

Assets/Scripts/Slimes/MetalSlime.cs

@@ -3,12 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Assets.Scripts.Player;
 
 namespace Assets.Scripts.Slimes
 {
     class MetalSlime : BasicSlime
     {
-        public MetalSlime(Player player) : base(player)
+        public MetalSlime(PlayerGameObject player) : base(player)
         {
             //intelligence = intelligence;
             strength = strength + 2;

Assets/Scripts/Slimes/MiniBossSlime.cs

@@ -3,12 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Assets.Scripts.Player;
 
 namespace Assets.Scripts.Slimes
 {
     class MiniBossSlime : BasicSlime
     {
-        public MiniBossSlime(Player player) : base(player)
+        public MiniBossSlime(PlayerGameObject player) : base(player)
         {
             intelligence = intelligence + 3;
             strength = strength + 3;

Assets/Scripts/Slimes/NormalSlime.cs

@@ -3,12 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Assets.Scripts.Player;
 
 namespace Assets.Scripts.Slimes
 {
     class NormalSlime : BasicSlime
     {
-        public NormalSlime(Player player) : base(player)
+        public NormalSlime(PlayerGameObject player) : base(player)
         {
             maxHealth = maxHealth + 10;
             health = maxHealth;

Assets/Scripts/Slimes/SlimeFactory.cs

@@ -3,42 +3,43 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Assets.Scripts.Player;
 
 namespace Assets.Scripts.Slimes
 {
     class SlimeFactory
     {
-        public NormalSlime generateNormalSlime(Player player)
+        public NormalSlime generateNormalSlime(PlayerGameObject player)
         {
             return new NormalSlime(player);
         }
 
-        public MageSlime generateMageSlime(Player player)
+        public MageSlime generateMageSlime(PlayerGameObject player)
         {
             return new MageSlime(player);
         }
 
-        public MetalSlime generateMetalSlime(Player player)
+        public MetalSlime generateMetalSlime(PlayerGameObject player)
         {
             return new MetalSlime(player);
         }
 
-        public MiniBossSlime generateMiniBossSlime(Player player)
+        public MiniBossSlime generateMiniBossSlime(PlayerGameObject player)
         {
             return new MiniBossSlime(player);
         }
 
-        public WarriorSlime generateWarriorSlime(Player player)
+        public WarriorSlime generateWarriorSlime(PlayerGameObject player)
         {
             return new WarriorSlime(player);
         }
 
-        public ForestSlime generateForestSlime(Player player)
+        public ForestSlime generateForestSlime(PlayerGameObject player)
         {
             return new ForestSlime(player);
         }
 
-        public BossSlime generateBossSlime(Player player)
+        public BossSlime generateBossSlime(PlayerGameObject player)
         {
             return new BossSlime(player);
         }

Assets/Scripts/Slimes/WarriorSlime.cs

@@ -3,12 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Assets.Scripts.Player;
 
 namespace Assets.Scripts.Slimes
 {
     class WarriorSlime : BasicSlime
     {
-        public WarriorSlime(Player player) : base(player)
+        public WarriorSlime(PlayerGameObject player) : base(player)
         {
             intelligence = intelligence - 2;
             strength = strength + 2;