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

Merge branch 'controller' into main

Browse Source
This commit is contained in:
Evan Nydahl
2021-12-03 13:42:41 -06:00
parent 555ca22573 97b727b3db
commit e0cfb655f8
18 changed files with 523 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GrapplingHook.cs
View File

@@ -34,7 +34,7 @@ public class GrapplingHook : NetworkBehaviour
{
//if (!IsLocalPlayer) { return; }
if (Input.GetKeyDown(KeyCode.E)) //If grapple button is hit
if (Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown(KeyCode.JoystickButton2)) //If grapple button is hit
{
if (!isGrappled) //If we are not grappling
{
@@ -59,8 +59,8 @@ public class GrapplingHook : NetworkBehaviour
if (isGrappled)
{
Debug.DrawRay(gameObject.transform.position, (hookPoint.transform.position - gameObject.transform.position)); //Visual of line
if (Input.GetKey(KeyCode.LeftShift)) //Extend hook
if (Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.JoystickButton4)) //Extend hook
{
ropeLength += climbRate * Time.deltaTime;
if (ropeLength > maxGrappleDistance)
@@ -69,7 +69,7 @@ public class GrapplingHook : NetworkBehaviour
}
//Debug.Log(ropeLength.ToString());
}
if (Input.GetKey(KeyCode.RightShift)) // Retract Hook
if (Input.GetKey(KeyCode.RightShift) || Input.GetKey(KeyCode.JoystickButton5)) // Retract Hook
{
ropeLength -= climbRate * Time.deltaTime;
if (ropeLength < 5)