Skip to content

Commit

Permalink
Fix: blunt damage will now do stamina damage on wide attacks.
Browse files Browse the repository at this point in the history
  • Loading branch information
Calecute committed Sep 23, 2024
1 parent 60887dd commit 48f9f58
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,12 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU

if (damageResult != null && damageResult.GetTotal() > FixedPoint2.Zero)
{
// If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor
if (damageResult.DamageDict.TryGetValue("Blunt", out var bluntDamage))
{
_stamina.TakeStaminaDamage(entity, (bluntDamage * component.BluntStaminaDamageFactor).Float(), visual: false, source: user, with: meleeUid == user ? null : meleeUid);
}

appliedDamage += damageResult;

if (meleeUid == user)
Expand Down

0 comments on commit 48f9f58

Please sign in to comment.