From b26b6a74188ac851a25f7cdd6f0507f74f6acdaf Mon Sep 17 00:00:00 2001 From: Alex Noir Date: Tue, 5 Dec 2017 23:03:40 +0300 Subject: [PATCH] Fixed ragdolled players suffering less impact damage than non-ragdolled one. Also fixed limb impact sounds on the clientside for ragdolls --- .../BarotraumaClient/Source/Characters/Animation/Ragdoll.cs | 4 ++-- .../BarotraumaShared/Source/Characters/Animation/Ragdoll.cs | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs index 5fa47c8fb..17f75eb98 100644 --- a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs +++ b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs @@ -13,7 +13,7 @@ namespace Barotrauma { float volume = Math.Min(impact - 3.0f, 1.0f); - if (body.UserData is Limb) + if (body.UserData is Limb && character.Stun <= 0f) { Limb limb = (Limb)body.UserData; @@ -23,7 +23,7 @@ namespace Barotrauma limb.HitSound.Play(volume, impact * 100.0f, limb.WorldPosition); } } - else if (body == Collider.FarseerBody) + else if (body.UserData is Limb || body == Collider.FarseerBody) { if (!character.IsRemotePlayer || GameMain.Server != null) { diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs b/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs index 92579ee7c..ef99feccb 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs @@ -504,10 +504,7 @@ namespace Barotrauma ImpactProjSpecific(impact,f1.Body); - if (f1.Body.UserData is Limb) - { - } - else if (f1.Body == Collider.FarseerBody) + if ((f1.Body.UserData is Limb && character.Stun > 0f) || f1.Body == Collider.FarseerBody) { if (!character.IsRemotePlayer || GameMain.Server != null) {