From 3f3199d1dc5726d10370d4a2634c063cff480bf3 Mon Sep 17 00:00:00 2001
From: Vincent Wheat <waffleater7@gmail.com>
Date: Fri, 3 Dec 2021 13:58:58 -0600
Subject: [PATCH] Merge With Main

---
 Assets/Scripts/KingAbilities.meta                         | 8 ++++++++
 Assets/Scripts/KingAbilities/Boulder.cs                   | 2 +-
 Assets/Scripts/KingAbilities/Bumper.cs                    | 2 +-
 Assets/Scripts/KingAbilities/Hail.cs                      | 2 +-
 Assets/Scripts/KingScripts/KingAbilities.meta             | 8 ++++++++
 .../Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs  | 2 +-
 6 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 Assets/Scripts/KingAbilities.meta
 create mode 100644 Assets/Scripts/KingScripts/KingAbilities.meta

diff --git a/Assets/Scripts/KingAbilities.meta b/Assets/Scripts/KingAbilities.meta
new file mode 100644
index 0000000..01b5665
--- /dev/null
+++ b/Assets/Scripts/KingAbilities.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e4d88fa8403c1ff499ee54632066a7ee
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/KingAbilities/Boulder.cs b/Assets/Scripts/KingAbilities/Boulder.cs
index 0540903..dd1545d 100644
--- a/Assets/Scripts/KingAbilities/Boulder.cs
+++ b/Assets/Scripts/KingAbilities/Boulder.cs
@@ -17,7 +17,7 @@ public class Boulder : MonoBehaviour
             Vector3 Dir = boulder.velocity;//Finds the bolder's velocity
             float Power = boulder.velocity.magnitude * 250;//Finds the power of the boulder by using it's velocity and a scaler
             Dir = Vector3.Normalize(Dir);//Normalizes the vector to be used as a knockback direction
-            player.GetComponent<dPlayerMovement>().getHit(Dir, Power); //Ragdolls the player in the direction of the bolder depending on it's speed
+            player.GetComponent<dPlayerMovement>().GetHit(Dir, Power); //Ragdolls the player in the direction of the bolder depending on it's speed
         }
     }
 
diff --git a/Assets/Scripts/KingAbilities/Bumper.cs b/Assets/Scripts/KingAbilities/Bumper.cs
index b60c5e0..4e7002e 100644
--- a/Assets/Scripts/KingAbilities/Bumper.cs
+++ b/Assets/Scripts/KingAbilities/Bumper.cs
@@ -12,7 +12,7 @@ public class Bumper : MonoBehaviour {
             float DirBumpZ = other.GetComponent<dPlayerMovement>().vel.z * -1;//Inverts the Player Velocity y
             Vector3 DirBump = new Vector3(DirBumpX, .01f, DirBumpZ);//Creates a direction to launch the player
             DirBump = Vector3.Normalize(DirBump);//Normalizes the vector to be used as a bump direction
-            other.GetComponent<dPlayerMovement>().getHit(DirBump, 50); //Launches tthe player directly away from the bumper
+            other.GetComponent<dPlayerMovement>().GetHit(DirBump, 50); //Launches tthe player directly away from the bumper
         }
     }
 }
diff --git a/Assets/Scripts/KingAbilities/Hail.cs b/Assets/Scripts/KingAbilities/Hail.cs
index ff043b8..eb955d2 100644
--- a/Assets/Scripts/KingAbilities/Hail.cs
+++ b/Assets/Scripts/KingAbilities/Hail.cs
@@ -38,7 +38,7 @@ public class Hail : MonoBehaviour
             float hz = hail.transform.position.z;
             //Direction pointing away from the center of the Hail
             Vector3 Dir = new Vector3(px - hx, 0, pz - hz);
-            player.GetComponent<dPlayerMovement>().getHit(Dir, Power); //Ragdolls the player in the direction of the bolder depending on it's speed
+            player.GetComponent<dPlayerMovement>().GetHit(Dir, Power); //Ragdolls the player in the direction of the bolder depending on it's speed
         }
     }
 
diff --git a/Assets/Scripts/KingScripts/KingAbilities.meta b/Assets/Scripts/KingScripts/KingAbilities.meta
new file mode 100644
index 0000000..af519db
--- /dev/null
+++ b/Assets/Scripts/KingScripts/KingAbilities.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 14595e0094b28384c8078f76053166e3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs b/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs
index a460449..97cc6b4 100644
--- a/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs
+++ b/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs
@@ -395,7 +395,7 @@ public class dPlayerMovement : NetworkBehaviour
     }
 
     //Ragdoll Functions
-    private void GetHit(Vector3 dir, float force){
+    public void GetHit(Vector3 dir, float force){
         if(firstHit == false){
             EnableRagdoll();
             dir.Normalize();