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

Merge branch 'GrappleBroad'

Browse Source
This commit is contained in:
Melbyj1125
2022-03-02 14:17:49 -06:00
parent 4724c80146 48bdf66fc6
commit 141c2f3d32
6 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugMoveState/DebugIncapacitated/dMoveRagdollState.cs
View File

@@ -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

1
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugMoveState/dMoveStateManager.cs
View File

@@ -119,7 +119,6 @@ public class dMoveStateManager : NetworkBehaviour
pStats.CurTraction = pStats.Traction;
pStats.CurAcc = pStats.Acc;
pStats.SetWeather(PlayerStats.Weather.Wind, new Vector3(1,0,0));
}
// Update is called once per frame

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

@@ -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<Collider>()){
if(collision.gameObject.GetComponent<Rigidbody>().isKinematic == true){
@@ -115,5 +115,10 @@ public class dOffenseStateManager : NetworkBehaviour
if (collision.transform.CompareTag("destroyable") && myCollider == legHitbox.GetComponent<Collider>()){
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);
// }
}
}

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

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

@@ -114,6 +114,12 @@ public class OffenseStateManager : NetworkBehaviour
ApplyKickServerRPC(direction, netObjID);
}
if(collision.transform.CompareTag("ArcherTarget") && myCollider == legHitbox.GetComponent<Collider>()){
Vector3 direction = this.transform.forward;
ulong netObjID = collision.gameObject.GetComponent<NetworkObject>().NetworkObjectId;
ApplyKickServerRPC(direction, netObjID);
}
if (collision.transform.CompareTag("destroyable") && myCollider == legHitbox.GetComponent<Collider>()){
collision.transform.gameObject.GetComponent<BreakableBlock>().damage(pStats.KickPow);
}
@@ -122,6 +128,7 @@ public class OffenseStateManager : NetworkBehaviour
[ServerRpc(RequireOwnership = false)]
private void ApplyKickServerRPC(Vector3 direction, ulong netObjId) {
GameObject[] kickables = GameObject.FindGameObjectsWithTag("kickable");
GameObject[] players = GameObject.FindGameObjectsWithTag("ArcherTarget");
foreach (GameObject kickedItem in kickables) {
// First check to make sure this is the item we kicked
@@ -138,5 +145,14 @@ public class OffenseStateManager : NetworkBehaviour
return;
}
}
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 && kickedPlayer.transform.root.GetComponent<NetworkObject>().NetworkObjectId != this.transform.root.GetComponent<NetworkObject>().NetworkObjectId){
kickedPlayer.GetComponent<MoveStateManager>().GetHit(direction, 10);
}
return;
}
}
}