Merge pull request #40 from gud-koodi/smallFixes

Small fixes

Assets/Scripts/NetworkInstantiator.cs

@@ -44,8 +44,6 @@ internal GameObject InstantiatePlayer(Player player, bool masterObject = false)
                 PlayerController pc = go.GetComponent<PlayerController>();
                 pc.playerRigidbody = go.GetComponent<Rigidbody>();
                 pc.weapon = go.GetComponentInChildren<Weapon>();
-                pc.hitSpeed = 1.5f;
-                pc.speed = 10f;
 
                 NetworkMaster master = go.AddComponent<NetworkMaster>();
                 master.UpdateEvent = NetworkUpdate;

Assets/Scripts/PlayerController.cs

@@ -6,8 +6,8 @@ public class PlayerController : MonoBehaviour
 {
     // Start is called before the first frame update
     public Rigidbody playerRigidbody;
-    public float speed;
-    public float hitSpeed;
+    public float speed = 15f;
+    public float hitSpeed = 3f;
     public Weapon weapon;
     private Animator animator;
     private bool isAttacking;
@@ -21,26 +21,27 @@ void Start()
     }
 
     // Update is called once per frame
-    void Update()
+    void FixedUpdate()
     {
         ApplyMovement();
-        ApplyRotation();
+        if (!isAttacking)
+        {
+            ApplyRotation();
+        }
+
         HandleWeaponAttack();
     }
 
     private void ApplyMovement()
     {
         float mH = Input.GetAxis("Horizontal");
         float mV = Input.GetAxis("Vertical");
-        if (playerRigidbody.velocity.y < -10 || isAttacking)
+        if (playerRigidbody.velocity.y >= -10)
         {
-            playerRigidbody.velocity = new Vector3(0, playerRigidbody.velocity.y, 0);
+            Vector3 movement = isAttacking ? Vector3.zero : speed * new Vector3(mH, 0, mV).normalized;
+            playerRigidbody.velocity = movement + (Vector3.up * playerRigidbody.velocity.y);
         }
-        else
-        {
-            playerRigidbody.velocity = new Vector3(mH * speed, playerRigidbody.velocity.y, mV * speed);
-        }
-
+
         if (System.Math.Abs(mH) > 0 || System.Math.Abs(mV) > 0)
         {
             animator.SetBool("isWalking", true);
@@ -78,7 +79,7 @@ private void HandleWeaponAttack()
             weapon.Attack();
             animator.SetBool("isAttacking", true);
             isAttacking = true;
-            StartCoroutine(WaitAttack());     
+            StartCoroutine(WaitAttack());
         }
     }