Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Add OnDamaged method to IOnDamageBehavior (#685)

Browse Source 
* Add OnDamaged method to IOnDamageBehavior

* Adds Source, SourceMob to OnDamage.
This commit is contained in:
Víctor Aguilera Puerto
2020-02-13 15:57:40 +01:00
committed by GitHub
parent 3292939756
commit 934f6fb7e2
12 changed files with 80 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Content.Server/GameObjects/Components/Damage/DamageThreshold.cs
View File

@@ -1,5 +1,7 @@
using System;
using Content.Shared.GameObjects;
using JetBrains.Annotations;
using Robust.Shared.Interfaces.GameObjects;
namespace Content.Server.GameObjects
{
@@ -60,5 +62,38 @@ namespace Content.Server.GameObjects
ExcessDamage = excess;
}
}
public class DamageEventArgs : EventArgs
{
/// <summary>
/// Type of damage.
/// </summary>
public DamageType Type { get; }
/// <summary>
/// Change in damage.
/// </summary>
public int Damage { get; }
/// <summary>
/// The entity that damaged this one.
/// Could be null.
/// </summary>
public IEntity Source { get; }
/// <summary>
/// The mob entity that damaged this one.
/// Could be null.
/// </summary>
public IEntity SourceMob { get; }
public DamageEventArgs(DamageType type, int damage, IEntity source, IEntity sourceMob)
{
Type = type;
Damage = damage;
Source = source;
SourceMob = sourceMob;
}
}
}

14
Content.Server/GameObjects/Components/Damage/DamageableComponent.cs
View File

@@ -5,6 +5,7 @@ using Content.Server.Interfaces;
using Content.Server.Interfaces.GameObjects;
using Content.Shared.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
@@ -36,6 +37,7 @@ namespace Content.Server.GameObjects
Dictionary<DamageType, List<DamageThreshold>> Thresholds = new Dictionary<DamageType, List<DamageThreshold>>();
public event EventHandler<DamageThresholdPassedEventArgs> DamageThresholdPassed;
public event EventHandler<DamageEventArgs> Damaged;
public override ComponentState GetComponentState()
{
@@ -62,13 +64,14 @@ namespace Content.Server.GameObjects
foreach (var damagebehavior in Owner.GetAllComponents<IOnDamageBehavior>())
{
AddThresholdsFrom(damagebehavior);
Damaged += damagebehavior.OnDamaged;
}
RecalculateComponentThresholds();
}
/// <inheritdoc />
public void TakeDamage(DamageType damageType, int amount)
public void TakeDamage(DamageType damageType, int amount, IEntity source = null, IEntity sourceMob = null)
{
if (damageType == DamageType.Total)
{
@@ -88,6 +91,8 @@ namespace Content.Server.GameObjects
_currentDamage[damageType] = Math.Max(0, _currentDamage[damageType] + amount);
UpdateForDamageType(damageType, oldValue);
Damaged?.Invoke(this, new DamageEventArgs(damageType, amount, source, sourceMob));
if (Resistances.AppliesToTotal(damageType))
{
oldTotalValue = _currentDamage[DamageType.Total];
@@ -97,13 +102,13 @@ namespace Content.Server.GameObjects
}
/// <inheritdoc />
public void TakeHealing(DamageType damageType, int amount)
public void TakeHealing(DamageType damageType, int amount, IEntity source = null, IEntity sourceMob = null)
{
if (damageType == DamageType.Total)
{
throw new ArgumentException("Cannot heal for DamageType.Total");
}
TakeDamage(damageType, -amount);
TakeDamage(damageType, -amount, source, sourceMob);
}
public void HealAllDamage()
@@ -163,6 +168,9 @@ namespace Content.Server.GameObjects
List<DamageThreshold> thresholds = onDamageBehavior.GetAllDamageThresholds();
if (thresholds == null)
return;
foreach (DamageThreshold threshold in thresholds)
{
if (!Thresholds[threshold.DamageType].Contains(threshold))