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

Merge branch 'main' of https://github.com/Lautha1/TheKingsRace

Browse Source 
Merging in Audio?
This commit is contained in:
Vladdie
2022-04-27 20:04:26 -05:00
parent 94104e2d6d 64ca96553f
commit d7747c64fb
14 changed files with 88628 additions and 6410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/dAerialStateManager.cs
View File

@@ -571,7 +571,7 @@ public class dAerialStateManager : NetworkBehaviour
//Checks if the player can grapple
public bool CheckGrapple(){
if(!pStats.IsPaused){
if ((Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown(KeyCode.JoystickButton2)) && pStats.HasGrapple) //If grapple button is hit
if ((Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown(KeyCode.JoystickButton10)) && pStats.HasGrapple) //If grapple button is hit
{
//Debug.Log("Checking Hooks");
hookPointIndex = FindHookPoint(); //Find the nearest hook point within max distance

2
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugDashState/DebugDash/dDashNoneState.cs
View File

@@ -23,7 +23,7 @@ public class dDashNoneState : dDashBaseState
}
//if R key then Dashing
else if ((Input.GetKeyDown(KeyCode.R) || Input.GetAxis("Dash") != 0) && !dSM.pStats.IsPaused){
else if ((Input.GetKeyDown(KeyCode.R) || Input.GetKeyDown(KeyCode.JoystickButton5) && !dSM.pStats.IsPaused)){
dSM.SwitchState(dSM.DashingState);
}

2
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/DebugNitro/dNitroNoneState.cs
View File

@@ -23,7 +23,7 @@ public class dNitroNoneState : dNitroBaseState
}
//if pressing left shift then nitroing
else if ((Input.GetKeyDown(KeyCode.LeftShift) || Input.GetKeyDown(KeyCode.JoystickButton8)) && !nSM.pStats.IsPaused)
else if ((Input.GetKeyDown(KeyCode.LeftShift) || Input.GetKeyDown(KeyCode.JoystickButton4)) && !nSM.pStats.IsPaused)
{
nSM.SwitchState(nSM.NitroingState);
}

4
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugOffense/dOffenseNoneState.cs
View File

@@ -20,13 +20,13 @@ public class dOffenseNoneState : dOffenseBaseState
}
//if grounded then grounded kick states
else if(oSM.aSM.currentState == oSM.aSM.GroundedState && (Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && !oSM.pStats.IsPaused){
else if(oSM.aSM.currentState == oSM.aSM.GroundedState && (Input.GetKeyDown(KeyCode.F) || Input.GetKeyDown(KeyCode.JoystickButton2)) && !oSM.pStats.IsPaused){
// kick
oSM.SwitchState(oSM.KickState);
}
//if in the air
else if((Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && !oSM.pStats.IsPaused){
else if((Input.GetKeyDown(KeyCode.F) || Input.GetKeyDown(KeyCode.JoystickButton2)) && !oSM.pStats.IsPaused){
//air kick
oSM.SwitchState(oSM.AirKickState);
}

2
Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs
View File

@@ -588,7 +588,7 @@ public class AerialStateManager : NetworkBehaviour
////Grapple Functions
public bool CheckGrapple(){
if(!pStats.IsPaused){
if ((Input.GetKeyDown(GameManager.GM.bindableActions["grappleKey"]) || Input.GetKeyDown(KeyCode.JoystickButton2)) && pStats.HasGrapple) //If grapple button is hit
if ((Input.GetKeyDown(GameManager.GM.bindableActions["grappleKey"]) || Input.GetKeyDown(KeyCode.JoystickButton10)) && pStats.HasGrapple) //If grapple button is hit
{
//Debug.Log("Checking Hooks");
hookPointIndex = FindHookPoint(); //Find the nearest hook point within max distance

2
Assets/Scripts/PlayerScripts/NetworkedStateMachines/DashState/Dash/DashNoneState.cs
View File

@@ -23,7 +23,7 @@ public class DashNoneState : DashBaseState
}
//if R key then Dashing
else if ((Input.GetKeyDown(GameManager.GM.bindableActions["dashKey"]) || Input.GetAxis("Dash") != 0) && !dSM.pStats.IsPaused){
else if ((Input.GetKeyDown(GameManager.GM.bindableActions["dashKey"]) || Input.GetKeyDown(KeyCode.JoystickButton5) && !dSM.pStats.IsPaused)){
dSM.SwitchState(dSM.DashingState);
}

2
Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/Nitro/NitroNoneState.cs
View File

@@ -23,7 +23,7 @@ public class NitroNoneState : NitroBaseState
}
//if pressing left shift then nitroing
else if ((Input.GetKeyDown(GameManager.GM.bindableActions["nitroKey"]) || Input.GetKeyDown(KeyCode.JoystickButton8)) && !nSM.pStats.IsPaused)
else if ((Input.GetKeyDown(GameManager.GM.bindableActions["nitroKey"]) || Input.GetKeyDown(KeyCode.JoystickButton4)) && !nSM.pStats.IsPaused)
{
nSM.SwitchState(nSM.NitroingState);
}

4
Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/Offense/OffenseNoneState.cs
View File

@@ -20,13 +20,13 @@ public class OffenseNoneState : OffenseBaseState
}
//if grounded then grounded kick states
else if(oSM.aSM.currentState == oSM.aSM.GroundedState && (Input.GetKeyDown(GameManager.GM.bindableActions["kickKey"]) || Input.GetAxis("Kick") != 0) && !oSM.pStats.IsPaused){
else if(oSM.aSM.currentState == oSM.aSM.GroundedState && (Input.GetKeyDown(GameManager.GM.bindableActions["kickKey"]) || Input.GetKeyDown(KeyCode.JoystickButton2)) && !oSM.pStats.IsPaused){
//Regular Kick
oSM.SwitchState(oSM.KickState);
}
//if in the air
else if((Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && !oSM.pStats.IsPaused){
else if((Input.GetKeyDown(KeyCode.F) || Input.GetKeyDown(KeyCode.JoystickButton2) && !oSM.pStats.IsPaused)){
oSM.SwitchState(oSM.AirKickState);
}
}

28
Assets/Scripts/UI/Controls/ControlsMenuScript.cs
View File

@@ -32,12 +32,6 @@ public class ControlsMenuScript : MonoBehaviour
keyboardKingControlsMenu.SetActive(false);
gamePadKingControlsMenu.SetActive(true);
}
//if off, turn it on
if(gamePadKingControlsMenu.activeInHierarchy == false)
{
keyboardKingControlsMenu.SetActive(false);
gamePadKingControlsMenu.SetActive(true);
}
}
else{
//if off, turn it on
@@ -46,12 +40,6 @@ public class ControlsMenuScript : MonoBehaviour
keyboardRunnerControlsMenu.SetActive(false);
gamePadRunnerControlsMenu.SetActive(true);
}
//if off, turn it on
if(gamePadRunnerControlsMenu.activeInHierarchy == false)
{
keyboardRunnerControlsMenu.SetActive(false);
gamePadRunnerControlsMenu.SetActive(true);
}
}
}
@@ -59,14 +47,8 @@ public class ControlsMenuScript : MonoBehaviour
if (Input.GetAxis("Mouse X") != 0 || Input.GetAxis("Mouse Y") != 0)
{
if(isKing){
//if off, turn it on
if(gamePadKingControlsMenu.activeInHierarchy == false)
{
keyboardKingControlsMenu.SetActive(true);
gamePadKingControlsMenu.SetActive(false);
}
//if off, turn it on
if(gamePadKingControlsMenu.activeInHierarchy == false)
if(keyboardKingControlsMenu.activeInHierarchy == false)
{
keyboardKingControlsMenu.SetActive(true);
gamePadKingControlsMenu.SetActive(false);
@@ -74,17 +56,11 @@ public class ControlsMenuScript : MonoBehaviour
}
else{
//if off, turn it on
if(gamePadRunnerControlsMenu.activeInHierarchy == false)
if(keyboardRunnerControlsMenu.activeInHierarchy == false)
{
keyboardRunnerControlsMenu.SetActive(true);
gamePadRunnerControlsMenu.SetActive(false);
}
//if off, turn it on
if(gamePadRunnerControlsMenu.activeInHierarchy == false)
{
keyboardRunnerControlsMenu.SetActive(true);
gamePadRunnerControlsMenu.SetActive(false);
}
}
}
}