v0.18.15.0

2022-07-14 16:54:36 +03:00
parent 497045de7e
commit 4a03ee5ab2
36 changed files with 240 additions and 151 deletions
@@ -91,6 +91,8 @@ namespace Barotrauma.MapCreatures.Behavior
        {  
            foreach (BallastFloraBranch branch in Branches)
            {
+                if (branch.IsRoot && isDead) { continue; }
+                
                if (branch.AccumulatedDamage > 0)
                {
                    CreateDamageParticle(branch, branch.AccumulatedDamage);
@@ -101,8 +103,7 @@ namespace Barotrauma.MapCreatures.Behavior
                        GUI.AddMessage($"{(int)branch.AccumulatedDamage}", GUIStyle.Red, pos, Vector2.UnitY * 10.0f, 3f, playSound: false, subId: Parent?.Submarine?.ID ?? -1);
                    }
                }
-                if (Character.Controlled != null && Character.Controlled.CurrentHull == branch.CurrentHull &&
-                    branch.IsRoot && 
+                if (Character.Controlled != null && Character.Controlled.CurrentHull == branch.CurrentHull && branch.IsRoot &&
                    (branch.AccumulatedDamage > 0.0f || branch.AccumulatedDamage < -0.1f))
                {
                    Character.Controlled.UpdateHUDProgressBar(this,