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

player shouldn't kick themselves

Browse Source
This commit is contained in:
Melbyj1125
2022-03-02 14:17:14 -06:00
parent 9b9e847ba9
commit 48bdf66fc6
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,9 +116,9 @@ public class dOffenseStateManager : NetworkBehaviour
collision.transform.gameObject.GetComponent<BreakableBlock>().damage(pStats.KickPow);
}
if(collision.transform.CompareTag("ArcherTarget") && myCollider == legHitbox.GetComponent<Collider>()){
Vector3 direction = this.transform.forward;
collision.gameObject.GetComponent<dMoveStateManager>().GetHit(this.transform.forward, 10);
}
// if(collision.transform.CompareTag("ArcherTarget") && myCollider == legHitbox.GetComponent<Collider>()){
// Vector3 direction = this.transform.forward;
// collision.gameObject.GetComponent<dMoveStateManager>().GetHit(this.transform.forward, 10);
// }
}
}

2
Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/Incapacitated/MoveRagdollState.cs
View File

@@ -24,7 +24,7 @@ public class MoveRagdollState : MoveBaseState
public override void ExitState(MoveStateManager mSM, MoveBaseState nextState){
mSM.pStats.GravVel = 60; // resets gravVel
mSM.pStats.GravVel = 80; // resets gravVel
mSM.capCol.enabled = false; // disable capsule collider
mSM.moveController.enabled = true; // enable move controller
mSM.rB.isKinematic = true; // enable kinematic

2
Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs
View File

@@ -148,7 +148,7 @@ public class OffenseStateManager : NetworkBehaviour
foreach(GameObject kickedPlayer in players){
//First check if the player is kicked
if(kickedPlayer.transform.root.GetComponent<NetworkObject>() != null && kickedPlayer.transform.root.GetComponent<NetworkObject>().NetworkObjectId == netObjId){
if(kickedPlayer.transform.root.GetComponent<NetworkObject>() != null && kickedPlayer.transform.root.GetComponent<NetworkObject>().NetworkObjectId == netObjId && kickedPlayer.transform.root.GetComponent<NetworkObject>().NetworkObjectId != this.transform.root.GetComponent<NetworkObject>().NetworkObjectId){
kickedPlayer.GetComponent<MoveStateManager>().GetHit(direction, 10);
}