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

Merge branch 'sprintActual2Melby'

Browse Source
This commit is contained in:
Melbyj1125
2022-02-16 13:13:21 -06:00
parent f808e1e63a ab3598eee4
commit 87594614d5
118 changed files with 8842 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,7 +172,7 @@ public class dGrapplingHook : NetworkBehaviour
//WILL NEED ADJUSTMENT OR REMOVAL IN THE FUTURE
//ungrapple on jump
if(playerMovement.GetJumpPressed() && !playerMovement.isGrounded && isGrappled){
if(playerMovement.jumpHeld && !playerMovement.isGrounded && isGrappled){
release = true;
isGrappled = false;
}

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

@@ -40,6 +40,7 @@ public class dKickController : NetworkBehaviour
isKicking = true;
isDiveKicking = true;
leg.SetActive(true);
legRotation = -90;
}
//otherwise do ground kick for .3 seconds
else if ((Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && isKicking == false && pMove.isSliding==false){
@@ -70,7 +71,6 @@ public class dKickController : NetworkBehaviour
isKicking = false;
legRotation = 0;
leg.transform.eulerAngles = new Vector3(legRotation, leg.transform.eulerAngles.y, leg.transform.eulerAngles.z);
legHitbox.GetComponent<Collider>().isTrigger = false;
leg.SetActive(false);
}

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

@@ -45,14 +45,12 @@ public class dWallRun : NetworkBehaviour
return !isPlayergrounded() && verticalAxis > 0 && VerticalCheck();
}
bool VerticalCheck()
{
bool VerticalCheck(){
return !Physics.Raycast(transform.position, Vector3.down, minimumHeight);
}
void Start()
{
void Start(){
playerMovementController = GetComponent<dPlayerMovement>();
directions = new Vector3[]{
@@ -65,15 +63,14 @@ public class dWallRun : NetworkBehaviour
}
public void WallRunRoutine()
{
public void WallRunRoutine(){
//if (!IsLocalPlayer) { return; }
isWallRunning = false;
hits = new RaycastHit[directions.Length];
if(playerMovementController.GetJumpPressed())
if(playerMovementController.jumpHeld)
{
jumping = true;
}
@@ -173,7 +170,7 @@ public class dWallRun : NetworkBehaviour
moveToSet.y = 0;
//
playerMovementController.SetPlayerVelocity(moveToSet);
playerMovementController.vel = moveToSet;
if(!isWallRunning){
firstAttach = true;
isWallRunning = true;