From d3481c1dd66527e6f634baa6733ed54e1f16f063 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon, 15 Apr 2019 12:10:33 +0300
Subject: [PATCH] (eaf02c38d) If the character has no mentionable afflictions,
 automatically select the limb with highest dmg on it (if none selected) to be
 displayed in the health interface.

---
 .../Characters/Health/CharacterHealth.cs      | 14 ++++++++++++--
 .../Characters/Health/CharacterHealth.cs      |  3 ++-
 .../BarotraumaShared/Source/Map/Hull.cs       | 19 +++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs b/Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs
index 777bc7775..84972c138 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs
@@ -584,11 +584,21 @@ namespace Barotrauma
                     var affliction = GetAllAfflictions(a => a.Prefab.IndicatorLimb != LimbType.None)
                         .OrderByDescending(a => a.DamagePerSecond)
                         .ThenByDescending(a => a.Strength).FirstOrDefault();
-                    var limbHealth = GetMathingLimbHealth(affliction);
-                    if (limbHealth != null)
+                    if (affliction.DamagePerSecond > 0 && affliction.Strength > 0)
                     {
+                        var limbHealth = GetMathingLimbHealth(affliction);
+                        if (limbHealth != null)
+                        {
+                            selectedLimbIndex = limbHealths.IndexOf(limbHealth);
+                        }
+                    }
+                    else
+                    {
+                        // If no affliction is critical, select the limb which has most damage.
+                        var limbHealth = limbHealths.OrderByDescending(l => l.TotalDamage).FirstOrDefault();
                         selectedLimbIndex = limbHealths.IndexOf(limbHealth);
                     }
+
                 }
                 LimbHealth selectedLimb = selectedLimbIndex < 0 ? highlightedLimb : limbHealths[selectedLimbIndex];
                 if (selectedLimb != currentDisplayedLimb || forceAfflictionContainerUpdate)
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Health/CharacterHealth.cs b/Barotrauma/BarotraumaShared/Source/Characters/Health/CharacterHealth.cs
index 9a25fcd52..c492667e0 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Health/CharacterHealth.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Health/CharacterHealth.cs
@@ -231,7 +231,8 @@ namespace Barotrauma
                 : afflictions.Concat(limbHealths.SelectMany(lh => lh.Afflictions.Where(limbHealthFilter)));
         }
 
-        private LimbHealth GetMathingLimbHealth(Affliction affliction) => limbHealths[Character.AnimController.GetLimb(affliction.Prefab.IndicatorLimb).HealthIndex];
+        private LimbHealth GetMatchingLimbHealth(Limb limb) => limbHealths[limb.HealthIndex];
+        private LimbHealth GetMathingLimbHealth(Affliction affliction) => GetMatchingLimbHealth(Character.AnimController.GetLimb(affliction.Prefab.IndicatorLimb));
 
         /// <summary>
         /// Returns the limb afflictions and non-limbspecific afflictions that are set to be displayed on this limb.
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs
index e0ce7bb7f..af5ad3847 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs
@@ -356,6 +356,25 @@ namespace Barotrauma
             }
         }
 
+        public string DisplayName
+        {
+            get;
+            private set;
+        }
+
+        private string roomName;
+        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
+        public string RoomName
+        {
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
+        }
+
         public override Rectangle Rect
         {
             get