Fixed class behaviour, fixed fight mechanic, fixed skill usage

Assets/Input.inputactions

@@ -36,7 +36,7 @@
                     "name": "SkillOne",
                     "type": "Button",
                     "id": "7f5add79-932e-49aa-b2b0-91a7222e844d",
-                    "expectedControlType": "Button",
+                    "expectedControlType": "",
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
@@ -45,7 +45,7 @@
                     "name": "SkillTwo",
                     "type": "Button",
                     "id": "d90ae832-468d-49ee-ac78-3f720aac9d91",
-                    "expectedControlType": "Button",
+                    "expectedControlType": "",
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
@@ -54,7 +54,7 @@
                     "name": "SkillThree",
                     "type": "Button",
                     "id": "3bf27bbc-2553-4c56-90ce-089ec3985f34",
-                    "expectedControlType": "Button",
+                    "expectedControlType": "",
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
@@ -63,7 +63,7 @@
                     "name": "SkillFour",
                     "type": "Button",
                     "id": "e5019b66-a0ae-4778-8afa-6272917330af",
-                    "expectedControlType": "Button",
+                    "expectedControlType": "",
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
@@ -72,7 +72,7 @@
                     "name": "SkillFive",
                     "type": "Button",
                     "id": "c77fc299-2907-414d-9dcd-ce25527fb09a",
-                    "expectedControlType": "Button",
+                    "expectedControlType": "",
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
@@ -81,7 +81,7 @@
                     "name": "SkillSix",
                     "type": "Button",
                     "id": "92be85ab-a708-4a61-8d71-19a0f4e1a3a4",
-                    "expectedControlType": "Button",
+                    "expectedControlType": "",
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false

Assets/Scenes/GameScene.unity

@@ -1689,7 +1689,7 @@ MonoBehaviour:
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
           m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 6
+          m_IntArgument: 3
           m_FloatArgument: 0
           m_StringArgument: 
           m_BoolArgument: 0
@@ -13700,7 +13700,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Fenster
+  m_Text: Window
 --- !u!222 &709576934
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -13917,7 +13917,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Deutsch
+  m_Text: 800x600
 --- !u!222 &722907595
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -39119,7 +39119,7 @@ MonoBehaviour:
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
           m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 4
+          m_IntArgument: 2
           m_FloatArgument: 0
           m_StringArgument: 
           m_BoolArgument: 0

Assets/Scripts/Classes/BasicClass.cs

@@ -8,7 +8,7 @@ using UnityEngine;
 
 namespace Assets.Scripts.Classes
 {
-    public class BasicClass
+    public abstract class BasicClass
     {
         public string classname;
         protected int dexterityBonus;
@@ -45,13 +45,17 @@ namespace Assets.Scripts.Classes
             GameObject leftHandParent = GameObject.Find("leftHand");
             GameObject rightHandParent = GameObject.Find("rightHand");
 
-            if(leftHandPrefab != null){
+            if (leftHandPrefab != null)
+            {
                 GameObject leftHand = GameObject.Instantiate(leftHandPrefab, leftHandParent.transform);
             }
 
-            if(rightHandPrefab != null){
+            if (rightHandPrefab != null)
+            {
                 GameObject rightHand = GameObject.Instantiate(rightHandPrefab, rightHandParent.transform);
             }
         }
+
+        public abstract void GenerateSkills(BasicSkill[] skills);
     }
 }

Assets/Scripts/Classes/DruidClass.cs

@@ -17,5 +17,10 @@ namespace Assets.Scripts.Classes
             leftHandName = "smallShield";
             rightHandName = "wand";
         }
+
+        public override void GenerateSkills(BasicSkill[] skills)
+        {
+            //TODO
+        }
     }
 }

Assets/Scripts/Classes/MageClass.cs

@@ -20,5 +20,15 @@ namespace Assets.Scripts.Classes
             leftHandName = "orb";
             rightHandName = "wand";
         }
+
+        public override void GenerateSkills(BasicSkill[] skills)
+        {
+            skills[0] = new BasicSkill(20, 1, 0, "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"));
+        }
     }
 }

Assets/Scripts/Classes/ThiefClass.cs

@@ -19,5 +19,15 @@ namespace Assets.Scripts.Classes
             leftHandName = "smallShield";
             rightHandName = "dagger";
         }
+
+        public override void GenerateSkills(BasicSkill[] skills)
+        {
+            skills[0] = new BasicSkill(20, 0, 0, "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"));
+        }
     }
 }

Assets/Scripts/Classes/WarriorClass.cs

@@ -19,5 +19,15 @@ namespace Assets.Scripts.Classes
             leftHandName = "shield";
             rightHandName = "sword";
         }
+
+        public override void GenerateSkills(BasicSkill[] skills)
+        {
+            skills[0] = new BasicSkill(20, 0, 0, "Slash", "Skills/Warrior/Slash", null);
+            skills[0].setDescription(TextHandler.getText("slashDesc"));
+            skills[1] = new BasicSkill(0, 10, 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"));
+        }
     }
 }

Assets/Scripts/Controls.cs

@@ -237,22 +237,6 @@ public class Controls : MonoBehaviour
         }
     }
 
-    public void OnSkillFive()
-    {
-        if (uihandler.isPlayerInFight())
-        {
-            fight.GetComponent<Fight>().playerAction(5);
-        }
-    }
-
-    public void OnSkillSix()
-    {
-        if (uihandler.isPlayerInFight())
-        {
-            fight.GetComponent<Fight>().playerAction(6);
-        }
-    }
-
     public void OnDisarm()
     {
         if (player.GetComponent<PlayerGameObject>().isArmed)

Assets/Scripts/Fight.cs

@@ -54,18 +54,12 @@ public class Fight : MonoBehaviour
                 }
                 break;
             case 2:
-                //User waits
-                break;
-            case 3:
-                playerDamage = player.GetComponent<PlayerGameObject>().calculateDamage();
-                break;
-            case 4:
                 skillnumber = 0;
                 break;
-            case 5:
+            case 3:
                 skillnumber = 1;
                 break;
-            case 6:
+            case 4:
                 skillnumber = 2;
                 break;
         }

Assets/Scripts/Menu/UIHandlerMenu.cs

@@ -61,7 +61,7 @@ namespace Assets.Scripts.Menu
             int role = GameObject.Find("dropClass").GetComponent<Dropdown>().value;
             int race = GameObject.Find("dropRace").GetComponent<Dropdown>().value;
             BasicRace playerRace = new BasicRace();
-            BasicClass playerClass = new BasicClass();
+            BasicClass playerClass = new DruidClass();
             switch (role)
             {
                 case 0:

Assets/Scripts/Player/PlayerGameObject.cs

@@ -107,7 +107,7 @@ namespace Assets.Scripts.Player
         public void generatePlayer()
         {
             BasicRace race = new BasicRace();
-            BasicClass role = new BasicClass();
+            BasicClass role = new DruidClass();
             switch (PlayerPrefs.GetInt("class"))
             {
                 case 0:
@@ -183,7 +183,8 @@ namespace Assets.Scripts.Player
         }
 
         public void rotate(Vector2 input, Vector2 speed){
-            transform.Rotate(Vector3.up, input.x * speed.x);// * Time.deltaTime);
+            Debug.Log(input.x * speed.x);
+            transform.Rotate(Vector3.up, input.x * speed.x * 5);// * Time.deltaTime);
         }
 
         public void getRotation()

Assets/Scripts/Player/PlayerObject.cs

@@ -65,41 +65,7 @@ namespace Assets.Scripts.Player
 
         private void generateSkills()
         {
-            switch (role.classname)
+            role.GenerateSkills(skills);
-            {
-                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;
-                case "Druid":
-                    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;
-            }
         }
 
         public void loadPlayer(JToken json)

Assets/Scripts/WorldGenerator.cs

@@ -112,7 +112,7 @@ public class WorldGenerator : MonoBehaviour
     {
         string result = "";
         int counter = 0;
-        string savePath = "";
+        string savePath;
         result = result + FileHandler.generateJSON("cityAmount", cityAmount) + ",\r\n";
         result = result + FileHandler.generateJSON("maxCityAmount", maxCityAmount) + ",\r\n";
         result = result + "\"currentTile\": " + currentTile.GetComponent<Tile>().saveCurrent() + ",\r\n";

UserSettings/EditorUserSettings.asset

@@ -18,10 +18,10 @@ EditorUserSettings:
       value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
+      value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a
+      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
       flags: 0
     RecentlyUsedScenePath-0:
       value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d

settings.txt

@@ -4,4 +4,4 @@ Language:en
 Music:0
 Effects:0
 SensitivityController:1/1
-SensitivityMouse:59.292/3.892872
+SensitivityMouse:34.76152/9.194521