Merge branch 'master' of https://github.com/Danjb1/hovership

Danjb1 · Jan 7, 2020 · 2017324 · 2017324
2 parents b34df8b + 8ead6d9
commit 2017324
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/hovership/Assets/Prefabs/Enemies/Turret.prefab b/hovership/Assets/Prefabs/Enemies/Turret.prefab
@@ -115,11 +115,11 @@ MonoBehaviour:
   target: {fileID: 0}
   projectilePrefab: {fileID: 8938948655591110475, guid: c03f88bd4474f054bb58528001baeafa,
     type: 3}
-  fireRate: 2
-  muzzleVelocity: 25
+  fireRate: 1
+  muzzleVelocity: 18
   inaccuracySize: 0.05
-  maximumRange: 50
-  leadRatio: 0.2
+  maximumRange: 30
+  leadRatio: 0.1
 --- !u!1001 &4830632861983034690
 PrefabInstance:
   m_ObjectHideFlags: 0

diff --git a/hovership/Assets/Scripts/PlayerController.cs b/hovership/Assets/Scripts/PlayerController.cs
@@ -765,6 +765,7 @@ private void Respawn() {
 
         // Reset velocity
         rigidbodyComponent.velocity = Vector3.zero;
+        previousVelocity = Vector3.zero;
 
         // Inform listeners of the new position
         foreach (ICharacterListener listener in characterListeners) {