Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-08-28 05:14:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

A lot of cleanup and adjustments

Browse Source 
traction resets after a glide
Keep Momentum after sliding
Wallrun adjusted on player prefab
Wallrun added to Player prefab2
A lot of stats adjusted on all prefabs
This commit is contained in:
Melbyj1125
2021-12-17 02:04:15 -06:00
parent bb5ee9d2b2
commit 79626242c0
14 changed files with 160 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Assets/Scripts/PlayerScripts/PlayerMovement.cs
View File

@@ -6,6 +6,7 @@ using UnityEngine.UI;
public class PlayerMovement : NetworkBehaviour
{
//Scripts
public PlayerStats pStats;
@@ -27,6 +28,7 @@ public class PlayerMovement : NetworkBehaviour
//Jump value
public int curJumpNum; // current Jumps used
private bool jumpHeld; // Is jump being held
private bool jumpPressed; // Has Jump been pressed
float coyJumpTimer = 0.1f; // Default Coyote Jump time
float curCoyJumpTimer; // current Coyote Jump time
public float lowJumpMultiplier; // Short jump multiplier
@@ -82,11 +84,13 @@ public class PlayerMovement : NetworkBehaviour
private RaycastHit ray;
private Vector3 up;
private bool qDown;
private float tempCurVel;
//Blink
private Blink blink;
private GrapplingHook grapple;
//Animation controller
Animator animator;
@@ -210,9 +214,9 @@ public class PlayerMovement : NetworkBehaviour
driftVel = Vector3.zero;
if(animator != null) animator.SetBool("isRunning", false);
}
//Move Player
moveController.Move(driftVel + (moveY * Time.deltaTime));
if(grapple.isGrappled) moveController.Move(grapple.forceDirection * Time.deltaTime);
}
@@ -220,6 +224,7 @@ public class PlayerMovement : NetworkBehaviour
//Calculates speed current player needs to be going
public float PlayerSpeed()
{
WallCheck();
//If nothing is pressed speed is 0
if ((Input.GetAxis("Vertical") == 0.0f && Input.GetAxis("Horizontal") == 0.0f) || isSliding)
{
@@ -246,7 +251,10 @@ public class PlayerMovement : NetworkBehaviour
}
}
private void WallCheck(){
//IMPLEMENT A RAYCAST CHECK
}
//Apply Impact for when force needs to be applied without ragdolling
public void AddImpact(Vector3 dir, float force)
@@ -278,6 +286,7 @@ public class PlayerMovement : NetworkBehaviour
curJumpNum++;
jumpHeld = true;
jumpPressed = true;
}
//Last time Jumped
@@ -294,12 +303,16 @@ public class PlayerMovement : NetworkBehaviour
//if jump is being held coyote timer is zero
if(jumpHeld) curCoyJumpTimer = 0;
if(grapple.isGrappled && curJumpNum == 2) curJumpNum = 1;
if(grapple.isGrappled && curJumpNum == pStats.JumpNum) curJumpNum = 0;
//If space/south face gamepad button isn't being pressed then jump is false
if (Input.GetAxis("Jump") == 0){
jumpHeld = false;
}
if(g < 0){
jumpPressed = false;
}
}
//Get and update PlayerValues for other scripts
@@ -395,6 +408,11 @@ public class PlayerMovement : NetworkBehaviour
tempSet = true;
}
}
//if temporary values have been set restore them back to the normal values
else if(pStats.HasGlider && g==0 && tempSet == true){
pStats.Traction = tempTraction;
tempSet = false;
}
//Wallrunning
else if (pStats.HasWallrun) {
@@ -412,14 +430,9 @@ public class PlayerMovement : NetworkBehaviour
}
}
//Default Gravity
else{
//if temporary values have been set restore them back to the normal values
if(tempSet == true){
pStats.Traction = tempTraction;
tempSet = false;
}
//Normal gravity
GravityCalculation(pStats.PlayerGrav);
}
@@ -438,7 +451,7 @@ public class PlayerMovement : NetworkBehaviour
}
//apply gravity if not grounded and coyote timer is less than 0
if(isGrounded == false && curCoyJumpTimer <= 0){
if((isGrounded == false && curCoyJumpTimer <= 0) || grapple.isGrappled){
g -= grav * Time.deltaTime;
}
//else don't apply gravity
@@ -458,7 +471,7 @@ public class PlayerMovement : NetworkBehaviour
isGrounded = false;
groundRay = new Ray(moveController.transform.position, Vector3.down);
if (Physics.Raycast(groundRay, out groundHit, moveController.height + groundCheckDistance) && !jumpHeld ) //&& Time.time >= lastTimeJumped + jumpGroundingPreventionTime) // only try to detect ground if it's been a short amount of time since last jump; otherwise we may snap to the ground instantly after we try jumping
if (Physics.Raycast(groundRay, out groundHit, moveController.height + groundCheckDistance) && !jumpPressed ) //&& Time.time >= lastTimeJumped + jumpGroundingPreventionTime) // only try to detect ground if it's been a short amount of time since last jump; otherwise we may snap to the ground instantly after we try jumping
{
// Only consider this a valid ground hit if the ground normal goes in the same direction as the character up
if (Vector3.Dot(groundHit.normal, transform.up) > 0f)
@@ -517,47 +530,42 @@ public class PlayerMovement : NetworkBehaviour
return ragTime;
}
//Slide Function
private void Slide()
{
private void Slide(){
//if the q button or the east face button on gamepad is held down
if (Input.GetKey(KeyCode.JoystickButton1) || Input.GetKey(KeyCode.Q))
{
if (Input.GetKey(KeyCode.JoystickButton1) || Input.GetKey(KeyCode.Q)) {
qDown = true;
if (isSliding == false)
{
if (isSliding == false){
originalTraction = pStats.Traction;
this.gameObject.transform.eulerAngles = new Vector3(this.transform.eulerAngles.x - 90, this.transform.eulerAngles.y, this.transform.eulerAngles.z);
isSliding = true;
//if it can't find the animator (capsul prefab)
if (GetComponent<Animator>() == null)
{
if (GetComponent<Animator>() == null){
moveController.height = 1.0f;
}
//if the regular model
else
{
else {
moveController.height *= .5f;
}
pStats.Traction = 0.01f;
}
tempCurVel = driftVel.magnitude * 50f;
transform.Rotate(Vector3.forward * -sensitivity * Time.deltaTime * Input.GetAxis("Mouse X"));
pStats.Traction += .004f;
}
else
{
else{
qDown = false;
}
//NOTE: potentialy change this to only allow player back up if there is nothing above them
if (qDown == false && isSliding == true)
{
if (qDown == false && isSliding == true) {
//if nothing is above the object, stop sliding
if (Physics.Raycast(this.gameObject.transform.position, up, out ray, 5f) == false)
{
this.gameObject.transform.localEulerAngles = new Vector3(0, 0, 0);
isSliding = false;
pStats.CurVel = tempCurVel;
//if it can't find the animator (capsul prefab)
if (GetComponent<Animator>() == null)
{
@@ -570,10 +578,9 @@ public class PlayerMovement : NetworkBehaviour
}
pStats.Traction = originalTraction;
}
else
{
else{
Debug.Log("Object above you");
}
}
}