Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-08-21 18:04:27 -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

2
Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dGrapplingHook.cs
View File

@@ -41,7 +41,7 @@ public class dGrapplingHook : NetworkBehaviour
{
//if (!IsLocalPlayer) { return; }
if (Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown(KeyCode.JoystickButton2)) //If grapple button is hit
if ((Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown(KeyCode.JoystickButton2)) && pStats.HasGrapple) //If grapple button is hit
{
if (!isGrappled) //If we are not grappling
{

1
Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dKickController.cs
View File

@@ -28,6 +28,7 @@ public class dKickController : NetworkBehaviour
}
void Kick(){
//if (!IsLocalPlayer) { return; }
//Note: when we merge this into PlayerMovement, we may want to change isgrounded to our
//custom is grounded
//If F is pressed or gamepad right trigger is pulled

6
Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dWallRun.cs
View File

@@ -7,7 +7,7 @@ using UnityEngine.Rendering;
public class dWallRun : NetworkBehaviour
{
public float wallMaxDistance = .8f;
public float wallMaxDistance = 3f;
public float wallSpeedMultiplier = 1.2f;
public float minimumHeight = .1f;
public float maxAngleRoll = 20;
@@ -174,8 +174,8 @@ public class dWallRun : NetworkBehaviour
playerMovementController.SetPlayerVelocity(moveToSet);
isWallRunning = true;
if(playerMovementController.curJumpNum != 0){
playerMovementController.curJumpNum = 0 ;
if(playerMovementController.curJumpNum == playerMovementController.pStats.JumpNum){
playerMovementController.curJumpNum = 0;
}
}

29
Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs
View File

@@ -28,6 +28,7 @@ public class dPlayerMovement : 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
@@ -83,6 +84,7 @@ public class dPlayerMovement : NetworkBehaviour
private RaycastHit ray;
private Vector3 up;
private bool qDown;
private float tempCurVel;
//Blink
private dBlink blink;
@@ -222,6 +224,7 @@ public class dPlayerMovement : 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)
{
@@ -248,7 +251,10 @@ public class dPlayerMovement : 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)
@@ -280,6 +286,7 @@ public class dPlayerMovement : NetworkBehaviour
curJumpNum++;
jumpHeld = true;
jumpPressed = true;
}
//Last time Jumped
@@ -296,12 +303,16 @@ public class dPlayerMovement : 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
@@ -397,6 +408,11 @@ public class dPlayerMovement : 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) {
@@ -414,14 +430,9 @@ public class dPlayerMovement : 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);
}
@@ -460,7 +471,7 @@ public class dPlayerMovement : 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)
@@ -540,6 +551,7 @@ public class dPlayerMovement : NetworkBehaviour
pStats.Traction = 0.01f;
}
tempCurVel = driftVel.magnitude * 50f;
transform.Rotate(Vector3.forward * -sensitivity * Time.deltaTime * Input.GetAxis("Mouse X"));
pStats.Traction += .004f;
}
@@ -553,6 +565,7 @@ public class dPlayerMovement : NetworkBehaviour
{
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)
{