Stedd
/
GameDev.CoreSystems
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed how weapons count total damage dealt and kills

This commit is contained in:
Stedd 2024-10-15 23:42:05 +02:00
parent cf3cf65b06
commit 6a49fa1812
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Scripts/Damageable.cs
View File

@ -17,6 +17,11 @@ namespace GameDev.CoreSystems
public UnityEvent DeathEvent;
/// <summary>
/// Used to ensure only one damage dealer gets the kill score
/// </summary>
private bool _isAlreadyDead;
private void OnEnable()
{
_activeDamageableRuntimeSet.Add(this);
@ -29,13 +34,30 @@ namespace GameDev.CoreSystems
#region Methods
public void ModifyHealth(int healthChange)
public void ModifyHealth(int healthChange, GameObject source)
{
if (IsInvulnerable) return;
var receivingDamage = healthChange < 0;
var receivingHealing = healthChange > 0;
if (IsInvulnerable && receivingDamage) return;
CurrentHealth += healthChange;
if (CurrentHealth >= 0) return;
source.TryGetComponent(out Weapon weapon);
if (weapon != null && !_isAlreadyDead)
{
weapon.IncrementDamageDealt(-healthChange);
}
if (CurrentHealth > 0 || _isAlreadyDead) return;
_isAlreadyDead = true;
if (weapon != null)
{
weapon.IncrementKillCount();
}
print($"{transform.parent.parent.name} died");
DeathEvent.Invoke();

15
Scripts/Weapon.cs
View File

@ -26,7 +26,8 @@ namespace GameDev.CoreSystems
{
_timeUntilFire -= Time.deltaTime;
if (!(_timeUntilFire <= 0)) return;
var reloading = _timeUntilFire > 0;
if (reloading) return;
var position = BarrelEndPoint.position;
var forward = BarrelEndPoint.forward;
@ -36,12 +37,9 @@ namespace GameDev.CoreSystems
{
if (hitInfo.transform.TryGetComponent(out Targetable target))
{
target.Damageable.DeathEvent.AddListener(IncrementKillCount);
Debug.DrawRay(position, forward * Vector3.Distance(position, target.GetCenterPosition()),
Color.red, 0.1f);
target.Damageable.ModifyHealth(-Damage);
DamageDealt += Damage;
target.Damageable.DeathEvent.RemoveListener(IncrementKillCount);
target.Damageable.ModifyHealth(-Damage, gameObject);
}
}
@ -53,7 +51,12 @@ namespace GameDev.CoreSystems
}
}
private void IncrementKillCount()
public void IncrementDamageDealt(int damage)
{
DamageDealt += damage;
}
public void IncrementKillCount()
{
NumberOfKills += 1;
}