diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugMoveState/DebugIncapacitated/dMoveRagdollState.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugMoveState/DebugIncapacitated/dMoveRagdollState.cs index 725dcaa..17d3cb1 100644 --- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugMoveState/DebugIncapacitated/dMoveRagdollState.cs +++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugMoveState/DebugIncapacitated/dMoveRagdollState.cs @@ -24,7 +24,7 @@ public class dMoveRagdollState : dMoveBaseState public override void ExitState(dMoveStateManager mSM, dMoveBaseState 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 diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/dOffenseStateManager.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/dOffenseStateManager.cs index f2d9ebb..4ff7fb4 100644 --- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/dOffenseStateManager.cs +++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/dOffenseStateManager.cs @@ -102,7 +102,7 @@ public class dOffenseStateManager : NetworkBehaviour //Collision checker for the leg private void OnCollisionEnter(Collision collision) { - if (!IsLocalPlayer) { return; } + //if (!IsLocalPlayer) { return; } Collider myCollider = collision.contacts[0].thisCollider; if (collision.transform.CompareTag("kickable") && myCollider == legHitbox.GetComponent()){ if(collision.gameObject.GetComponent().isKinematic == true){ @@ -115,5 +115,10 @@ public class dOffenseStateManager : NetworkBehaviour if (collision.transform.CompareTag("destroyable") && myCollider == legHitbox.GetComponent()){ collision.transform.gameObject.GetComponent().damage(pStats.KickPow); } + + if(collision.transform.CompareTag("ArcherTarget") && myCollider == legHitbox.GetComponent()){ + Vector3 direction = this.transform.forward; + collision.gameObject.GetComponent().GetHit(this.transform.forward, 10); + } } }