janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-29 12:52:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Grenades damage at player

Browse Source 
Grenades now remove the correct damage
This commit is contained in:
Noah4ever
2021-12-08 20:53:40 +01:00
parent 1e432ad802
commit 3a1a279530
5 changed files with 279 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Scripts/Player/Player.cs
View File

@@ -109,8 +109,6 @@ public class Player : NetworkBehaviour
}
public void RemoveHealth(int value)
{
if (isAlive)
{
ShowHit();
@@ -121,7 +119,6 @@ public class Player : NetworkBehaviour
Die();
}
}
}
[ClientRpc]

4
Assets/Scripts/Weapons/Grenade.cs
View File

@@ -37,8 +37,8 @@ public class Grenade : MonoBehaviour
Collider[] colliders = Physics.OverlapSphere(transform.position, weapon.GrenadeRadius);
// Iterate over all colliders found in radius
foreach(Collider nearbyObject in colliders) {
// Check if nearby object is a Player
if (nearbyObject.transform.gameObject.GetComponent<Player>()) {
// Check if nearby object is a Player and if Collider is not a CharacterController (can be changed to CapsuleCollider)
if (nearbyObject.transform.gameObject.GetComponent<Player>() && nearbyObject.GetType() != typeof(UnityEngine.CharacterController)) {
// Remove health from player
nearbyObject.transform.gameObject.GetComponent<Player>().RemoveHealth(weapon.Damage);
} else {