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

cut punch state

Browse Source
This commit is contained in:
Melbyj1125
2022-03-28 13:06:13 -05:00
parent 890ab6479a
commit b50426d4c7
12 changed files with 7 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffenseAirPunchState.cs
View File

@@ -1,52 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class dOffenseAirPunchState : dOffenseBaseState
{
private float legRotation = 0; // angle for leg rotation
bool kicked = false; // whether they have kicked or not
public override void EnterState(dOffenseStateManager oSM, dOffenseBaseState previousState){
oSM.leg.SetActive(true); // activate leg
legRotation = -90;
oSM.leg.transform.eulerAngles = new Vector3(legRotation, oSM.leg.transform.eulerAngles.y, oSM.leg.transform.eulerAngles.z); // rotate leg
kicked = false; // haven't kicked
//start kicking routine
oSM.StartCoroutine(kicking(8f));
}
public override void ExitState(dOffenseStateManager oSM, dOffenseBaseState nextState){
legRotation = 0; // reset leg angle
oSM.leg.transform.eulerAngles = new Vector3(legRotation, oSM.leg.transform.eulerAngles.y, oSM.leg.transform.eulerAngles.z); // rotate leg
oSM.leg.SetActive(false); // reset leg angle
}
public override void UpdateState(dOffenseStateManager oSM){
//if incapacitated then cooldown
if((oSM.mSM.currentState == oSM.mSM.RagdollState || oSM.mSM.currentState == oSM.mSM.SlideState || oSM.mSM.currentState == oSM.mSM.CrouchState || oSM.mSM.currentState == oSM.mSM.CrouchWalkState) || (oSM.aSM.currentState == oSM.aSM.WallRunState || oSM.aSM.currentState == oSM.aSM.WallIdleState || oSM.aSM.currentState == oSM.aSM.GrappleAirState || oSM.aSM.currentState == oSM.aSM.GrappleGroundedState)){
oSM.SwitchState(oSM.CooldownState);
}
//if kicked or grounded then cooldown
if(kicked || (oSM.aSM.currentState == oSM.aSM.GroundedState)){
oSM.SwitchState(oSM.CooldownState);
}
}
public override void FixedUpdateState(dOffenseStateManager oSM){
//jitter player upwards because of a weird issue with collider
oSM.moveController.Move(new Vector3(0,.002f,0));
}
//kicking timer
private IEnumerator kicking(float waitTime){
yield return new WaitForSeconds(waitTime);
kicked = true;
}
}

11
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffenseAirPunchState.cs.meta
View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 639f429564de9864292274ce4630d8b8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

60
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffensePunchState.cs
View File

@@ -1,60 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class dOffensePunchState : dOffenseBaseState
{
float legRotation = 0; // angle for leg rotation
bool kicked = false; // whether they have kicked or not
public override void EnterState(dOffenseStateManager oSM, dOffenseBaseState previousState){
oSM.leg.SetActive(true); // activate leg
kicked = false; // haven't kicked
//start kicking routine
oSM.StartCoroutine(kicking(1f));
}
public override void ExitState(dOffenseStateManager oSM, dOffenseBaseState nextState){
legRotation = 0; // reset leg angle
oSM.leg.transform.eulerAngles = new Vector3(legRotation, oSM.leg.transform.eulerAngles.y, oSM.leg.transform.eulerAngles.z); // rotate leg
oSM.leg.SetActive(false); // deactivate leg
}
public override void UpdateState(dOffenseStateManager oSM){
//if incapacitated then cooldown
if((oSM.mSM.currentState == oSM.mSM.RagdollState || oSM.mSM.currentState == oSM.mSM.SlideState || oSM.mSM.currentState == oSM.mSM.CrouchState || oSM.mSM.currentState == oSM.mSM.CrouchWalkState) || (oSM.aSM.currentState == oSM.aSM.WallRunState || oSM.aSM.currentState == oSM.aSM.WallIdleState || oSM.aSM.currentState == oSM.aSM.GrappleAirState || oSM.aSM.currentState == oSM.aSM.GrappleGroundedState)){
oSM.SwitchState(oSM.CooldownState);
}
//if kicked then cooldown
if(kicked){
oSM.SwitchState(oSM.CooldownState);
}
}
public override void FixedUpdateState(dOffenseStateManager oSM){
//if leg isn't fully extended rotate it
if(legRotation > -90){
oSM.leg.transform.eulerAngles = new Vector3(legRotation, oSM.leg.transform.eulerAngles.y, oSM.leg.transform.eulerAngles.z);
legRotation -= 20;
}
else{
legRotation = -90;
}
//jitter player upwards because of a weird issue with collider
oSM.moveController.Move(new Vector3(0,.002f,0));
}
//kicking timer
private IEnumerator kicking(float waitTime){
yield return new WaitForSeconds(waitTime);
kicked = true;
}
}

11
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffensePunchState.cs.meta
View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 190b69b70a6fd684aabaee22d13b1d41
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

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

@@ -21,31 +21,14 @@ 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){
//if power is above 300 then punch
if(oSM.pStats.KickPow > 300){
oSM.SwitchState(oSM.PunchState);
}
//otherwise kick
else{
oSM.SwitchState(oSM.KickState);
}
// kick
oSM.SwitchState(oSM.KickState);
}
//if in the air
else if((Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && !oSM.pStats.IsPaused){
//if power is above 300 air punch
if(oSM.pStats.KickPow > 300){
oSM.SwitchState(oSM.AirPunchState);
}
//otherwise air kick
else{
oSM.SwitchState(oSM.AirKickState);
}
//air kick
oSM.SwitchState(oSM.AirKickState);
}
}

2
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/dOffenseStateManager.cs
View File

@@ -18,8 +18,6 @@ public class dOffenseStateManager : NetworkBehaviour
//Kick&Punch States
public dOffenseKickState KickState = new dOffenseKickState();
public dOffenseAirKickState AirKickState = new dOffenseAirKickState();
public dOffensePunchState PunchState = new dOffensePunchState();
public dOffenseAirPunchState AirPunchState = new dOffenseAirPunchState();
////
////Objects Sections