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

(299a6cc5b) Added an upper limit to impact damage done to ragdolls (10% of the character's max health). Because ragdolled characters can now receive impact damage, getting the sub thrown around by monsters was way too lethal.

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-06-04 15:37:33 +03:00
parent b31fbe23da
commit 62646dfc96
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs
+9 -1
View File
@@ -17,6 +17,12 @@ namespace Barotrauma
{ {
public abstract RagdollParams RagdollParams { get; protected set; } public abstract RagdollParams RagdollParams { get; protected set; }
const float ImpactDamageMultiplayer = 10.0f;
/// <summary>
/// Maximum damage per impact (0.1 = 10% of the character's maximum health)
/// </summary>
const float MaxImpactDamage = 0.1f;
private static List<Ragdoll> list = new List<Ragdoll>(); private static List<Ragdoll> list = new List<Ragdoll>();
protected Hull currentHull; protected Hull currentHull;
@@ -688,8 +694,10 @@ namespace Barotrauma
Vector2 impactPos = ConvertUnits.ToDisplayUnits(points[0]); Vector2 impactPos = ConvertUnits.ToDisplayUnits(points[0]);
if (character.Submarine != null) impactPos += character.Submarine.Position; if (character.Submarine != null) impactPos += character.Submarine.Position;
float impactDamage = Math.Min((impact - ImpactTolerance) * ImpactDamageMultiplayer, character.MaxVitality * MaxImpactDamage);
character.LastDamageSource = null; character.LastDamageSource = null;
character.AddDamage(impactPos, new List<Affliction>() { AfflictionPrefab.InternalDamage.Instantiate((impact - ImpactTolerance) * 10.0f) }, 0.0f, true); character.AddDamage(impactPos, new List<Affliction>() { AfflictionPrefab.InternalDamage.Instantiate(impactDamage) }, 0.0f, true);
strongestImpact = Math.Max(strongestImpact, impact - ImpactTolerance); strongestImpact = Math.Max(strongestImpact, impact - ImpactTolerance);
character.ApplyStatusEffects(ActionType.OnImpact, 1.0f); character.ApplyStatusEffects(ActionType.OnImpact, 1.0f);
//briefly disable impact damage //briefly disable impact damage