vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed dedicated servers ignoring armor

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-07-24 19:12:18 +03:00
parent 96c4379f9f
commit 379c65e07d
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Characters/Limb.cs
+9 -8
View File
@@ -361,27 +361,28 @@ namespace Barotrauma
hitArmor = true; hitArmor = true;
totalArmorValue += wearable.WearableComponent.ArmorValue; totalArmorValue += wearable.WearableComponent.ArmorValue;
} }
} }
#if CLIENT
float bloodAmount = hitArmor || bleedingAmount <= 0.0f ? 0 : (int)Math.Min((int)(amount * 2.0f), 20);
DamageSoundType damageSoundType = (damageType == DamageType.Blunt) ? DamageSoundType.LimbBlunt : DamageSoundType.LimbSlash;
if (hitArmor) if (hitArmor)
{ {
totalArmorValue = Math.Max(totalArmorValue, 0.0f); totalArmorValue = Math.Max(totalArmorValue, 0.0f);
damageSoundType = DamageSoundType.LimbArmor;
amount = Math.Max(0.0f, amount - totalArmorValue); amount = Math.Max(0.0f, amount - totalArmorValue);
bleedingAmount = Math.Max(0.0f, bleedingAmount - totalArmorValue); bleedingAmount = Math.Max(0.0f, bleedingAmount - totalArmorValue);
} }
#if CLIENT
if (playSound) if (playSound)
{ {
DamageSoundType damageSoundType = (damageType == DamageType.Blunt) ? DamageSoundType.LimbBlunt : DamageSoundType.LimbSlash;
if (hitArmor)
{
damageSoundType = DamageSoundType.LimbArmor;
}
SoundPlayer.PlayDamageSound(damageSoundType, amount, position); SoundPlayer.PlayDamageSound(damageSoundType, amount, position);
} }
float bloodParticleAmount = hitArmor || bleedingAmount <= 0.0f ? 0 : (int)Math.Min(amount / 5, 10); float bloodParticleAmount = hitArmor || bleedingAmount <= 0.0f ? 0 : (int)Math.Min(amount / 5, 10);
float bloodParticleSize = MathHelper.Clamp(amount / 50.0f, 0.1f, 1.0f); float bloodParticleSize = MathHelper.Clamp(amount / 50.0f, 0.1f, 1.0f);