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

Re-implement itemmeleedamage (#11595)

Browse Source
This commit is contained in:
metalgearsloth
2022-09-29 17:41:43 +10:00
committed by GitHub
parent 27e325b94b
commit d5c0093db1
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
View File

@@ -129,6 +129,7 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
return; return;
var damage = component.Damage * GetModifier(component, true); var damage = component.Damage * GetModifier(component, true);
// Sawmill.Debug($"Melee damage is {damage.Total} out of {component.Damage.Total}"); // Sawmill.Debug($"Melee damage is {damage.Total} out of {component.Damage.Total}");
// Raise event before doing damage so we can cancel damage if the event is handled // Raise event before doing damage so we can cancel damage if the event is handled
@@ -138,6 +139,11 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
if (hitEvent.Handled) if (hitEvent.Handled)
return; return;
var itemDamage = new ItemMeleeDamageEvent(damage);
RaiseLocalEvent(component.Owner, itemDamage);
var modifiers = itemDamage.ModifiersList;
modifiers.AddRange(hitEvent.ModifiersList);
var targets = new List<EntityUid>(1) var targets = new List<EntityUid>(1)
{ {
ev.Target.Value ev.Target.Value
@@ -146,7 +152,7 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
// For stuff that cares about it being attacked. // For stuff that cares about it being attacked.
RaiseLocalEvent(ev.Target.Value, new AttackedEvent(component.Owner, user, targetXform.Coordinates)); RaiseLocalEvent(ev.Target.Value, new AttackedEvent(component.Owner, user, targetXform.Coordinates));
var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage, hitEvent.ModifiersList); var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + itemDamage.BonusDamage, hitEvent.ModifiersList);
var damageResult = _damageable.TryChangeDamage(ev.Target, modifiedDamage); var damageResult = _damageable.TryChangeDamage(ev.Target, modifiedDamage);
if (damageResult != null && damageResult.Total > FixedPoint2.Zero) if (damageResult != null && damageResult.Total > FixedPoint2.Zero)
@@ -237,13 +243,18 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
if (hitEvent.Handled) if (hitEvent.Handled)
return; return;
var itemDamage = new ItemMeleeDamageEvent(damage);
RaiseLocalEvent(component.Owner, itemDamage);
var modifiers = itemDamage.ModifiersList;
modifiers.AddRange(hitEvent.ModifiersList);
// For stuff that cares about it being attacked. // For stuff that cares about it being attacked.
foreach (var target in targets) foreach (var target in targets)
{ {
RaiseLocalEvent(target, new AttackedEvent(component.Owner, user, Transform(target).Coordinates)); RaiseLocalEvent(target, new AttackedEvent(component.Owner, user, Transform(target).Coordinates));
} }
var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage, hitEvent.ModifiersList); var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + itemDamage.BonusDamage, hitEvent.ModifiersList);
var appliedDamage = new DamageSpecifier(); var appliedDamage = new DamageSpecifier();
foreach (var entity in targets) foreach (var entity in targets)