tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix shield absorbing asphyxiation damage (#25972)

Browse Source 
* Fix shield absorbing asphyxiation damage

Shields will no longer reduce damage on their user that they themselves
can't absorb.

* Update Content.Shared/Blocking/BlockingSystem.User.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
nikthechampiongr
2024-03-11 03:55:19 +02:00
committed by GitHub
parent deac5a6842
commit b0ffed1607
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Shared/Blocking/BlockingSystem.User.cs
View File

@@ -47,13 +47,23 @@ public sealed partial class BlockingSystem
if (args.Damage.GetTotal() <= 0) if (args.Damage.GetTotal() <= 0)
return; return;
// A shield should only block damage it can itself absorb. To determine that we need the Damageable component on it.
if (!TryComp<DamageableComponent>(component.BlockingItem, out var dmgComp))
return;
var blockFraction = blocking.IsBlocking ? blocking.ActiveBlockFraction : blocking.PassiveBlockFraction; var blockFraction = blocking.IsBlocking ? blocking.ActiveBlockFraction : blocking.PassiveBlockFraction;
blockFraction = Math.Clamp(blockFraction, 0, 1); blockFraction = Math.Clamp(blockFraction, 0, 1);
_damageable.TryChangeDamage(component.BlockingItem, blockFraction * args.OriginalDamage); _damageable.TryChangeDamage(component.BlockingItem, blockFraction * args.OriginalDamage);
args.Damage *= (1 - blockFraction); var modify = new DamageModifierSet();
foreach (var key in dmgComp.Damage.DamageDict.Keys)
{
modify.Coefficients.TryAdd(key, 1 - blockFraction);
}
if (blocking.IsBlocking) args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, modify);
if (blocking.IsBlocking && !args.Damage.Equals(args.OriginalDamage))
{ {
_audio.PlayPvs(blocking.BlockSound, uid); _audio.PlayPvs(blocking.BlockSound, uid);
} }