v0.11.0.9

2020-12-09 16:34:16 +02:00
parent bbf06f0984
commit f433a7ba10
325 changed files with 13947 additions and 3652 deletions
@@ -5,8 +5,6 @@ namespace Barotrauma
 {
    partial class HumanAIController : AIController
    {
-        public static bool debugai;
-
        partial void InitProjSpecific()
        {
            /*if (GameMain.GameSession != null && GameMain.GameSession.CrewManager != null)
@@ -520,7 +520,7 @@ namespace Barotrauma

            foreach (Character c in CharacterList)
            {
-                if (!CanInteractWith(c, checkVisibility: false)) continue;
+                if (!CanInteractWith(c, checkVisibility: false) || (c.AnimController?.SimplePhysicsEnabled ?? true)) { continue; }

                float dist = Vector2.DistanceSquared(mouseSimPos, c.SimPosition);
                if (dist < maxDist * maxDist && (closestCharacter == null || dist < closestDist))
@@ -686,7 +686,7 @@ namespace Barotrauma
        
        public virtual void DrawFront(SpriteBatch spriteBatch, Camera cam)
        {
-            if (!Enabled || InvisibleTimer > 0.0f) { return; }
+            if (!Enabled || InvisibleTimer > 0.0f || (AnimController?.SimplePhysicsEnabled ?? true)) { return; }

            if (GameMain.DebugDraw)
            {
@@ -810,7 +810,7 @@ namespace Barotrauma
                        var iconStyle = GUI.Style.GetComponentStyle("CampaignInteractionBubble." + CampaignInteractionType);
                        if (iconStyle != null)
                        {
-                            Vector2 headPos = AnimController.GetLimb(LimbType.Head)?.WorldPosition ?? WorldPosition + Vector2.UnitY * 100.0f;
+                            Vector2 headPos = AnimController.GetLimb(LimbType.Head)?.body?.DrawPosition ?? DrawPosition + Vector2.UnitY * 100.0f;
                            Vector2 iconPos = headPos;
                            iconPos.Y = -iconPos.Y;
                            nameColor = iconStyle.Color;
@@ -835,7 +835,7 @@ namespace Barotrauma
                    var iconStyle = GUI.Style.GetComponentStyle("PetIcon." + petStatus);
                    if (iconStyle != null)
                    {
-                        Vector2 headPos = AnimController.GetLimb(LimbType.Head)?.WorldPosition ?? WorldPosition + Vector2.UnitY * 100.0f;
+                        Vector2 headPos = AnimController.GetLimb(LimbType.Head)?.body?.DrawPosition ?? DrawPosition + Vector2.UnitY * 100.0f;
                        Vector2 iconPos = headPos;
                        iconPos.Y = -iconPos.Y;
                        var icon = iconStyle.Sprites[GUIComponent.ComponentState.None].First();
@@ -11,15 +11,15 @@ namespace Barotrauma
 {
    class CharacterHUD
    {
-        private static Dictionary<ISpatialEntity, int> orderIndicatorCount = new Dictionary<ISpatialEntity, int>();
+        private static readonly Dictionary<ISpatialEntity, int> orderIndicatorCount = new Dictionary<ISpatialEntity, int>();
        const float ItemOverlayDelay = 1.0f;
        private static Item focusedItem;
        private static float focusedItemOverlayTimer;
        
-        private static List<Item> brokenItems = new List<Item>();
+        private static readonly List<Item> brokenItems = new List<Item>();
        private static float brokenItemsCheckTimer;

-        private static Dictionary<string, string> cachedHudTexts = new Dictionary<string, string>();
+        private static readonly Dictionary<string, string> cachedHudTexts = new Dictionary<string, string>();

        private static GUIFrame hudFrame;
        public static GUIFrame HUDFrame
@@ -126,6 +126,11 @@ namespace Barotrauma
                    {
                        character.Inventory.Update(deltaTime, cam);
                    }
+                    else
+                    {
+                        character.Inventory.ClearSubInventories();
+                    }
+
                    for (int i = 0; i < character.Inventory.Items.Length - 1; i++)
                    {
                        var item = character.Inventory.Items[i];
@@ -199,9 +204,18 @@ namespace Barotrauma
            if (GameMain.GameSession?.CrewManager != null)
            {
                orderIndicatorCount.Clear();
-                foreach (Pair<Order, float> timedOrder in GameMain.GameSession.CrewManager.ActiveOrders)
+                foreach (Pair<Order, float?> activeOrder in GameMain.GameSession.CrewManager.ActiveOrders)
                {
-                    DrawOrderIndicator(spriteBatch, cam, character, timedOrder.First, MathHelper.Clamp(timedOrder.Second / 10.0f, 0.2f, 1.0f));
+                    if (activeOrder.Second.HasValue)
+                    {
+                        DrawOrderIndicator(spriteBatch, cam, character, activeOrder.First, iconAlpha: MathHelper.Clamp(activeOrder.Second.Value / 10.0f, 0.2f, 1.0f));
+                    }
+                    else
+                    {
+                        float iconAlpha = GetDistanceBasedIconAlpha(activeOrder.First.TargetSpatialEntity, maxDistance: 350.0f);
+                        if (iconAlpha <= 0.0f) { continue; }
+                        DrawOrderIndicator(spriteBatch, cam, character, activeOrder.First, iconAlpha: iconAlpha, createOffset: false, scaleMultiplier: 0.5f);
+                    }
                }

                if (character.CurrentOrder != null)
@@ -218,14 +232,18 @@ namespace Barotrauma
            foreach (Item brokenItem in brokenItems)
            {
                if (brokenItem.NonInteractable) { continue; }
-                float dist = Vector2.Distance(character.WorldPosition, brokenItem.WorldPosition);
-                Vector2 drawPos = brokenItem.DrawPosition;
-                float alpha = Math.Min((1000.0f - dist) / 1000.0f * 2.0f, 1.0f);
+                float alpha = GetDistanceBasedIconAlpha(brokenItem);
                if (alpha <= 0.0f) continue;
-                GUI.DrawIndicator(spriteBatch, drawPos, cam, 100.0f, GUI.BrokenIcon, 
+                GUI.DrawIndicator(spriteBatch, brokenItem.DrawPosition, cam, 100.0f, GUI.BrokenIcon, 
                    Color.Lerp(GUI.Style.Red, GUI.Style.Orange * 0.5f, brokenItem.Condition / brokenItem.MaxCondition) * alpha);                
            }

+            float GetDistanceBasedIconAlpha(ISpatialEntity target, float maxDistance = 1000.0f)
+            {
+                float dist = Vector2.Distance(character.WorldPosition, target.WorldPosition);
+                return Math.Min((maxDistance - dist) / maxDistance * 2.0f, 1.0f);
+            }
+
            if (!character.IsIncapacitated && character.Stun <= 0.0f && !IsCampaignInterfaceOpen && (!character.IsKeyDown(InputType.Aim) || character.SelectedItems.Any(it => it?.GetComponent<Sprayer>() == null)))
            {
                if (character.FocusedCharacter != null && character.FocusedCharacter.CanBeSelected)
@@ -362,8 +380,8 @@ namespace Barotrauma
                                (int)(HUDLayoutSettings.BottomRightInfoArea.X + HUDLayoutSettings.BottomRightInfoArea.Width * 0.05f),
                                (int)(HUDLayoutSettings.BottomRightInfoArea.Y + HUDLayoutSettings.BottomRightInfoArea.Height * 0.1f),
                                (int)(HUDLayoutSettings.BottomRightInfoArea.Width / 2),
-                                (int)(HUDLayoutSettings.BottomRightInfoArea.Height * 0.7f)));
-                        character.Info.DrawPortrait(spriteBatch, HUDLayoutSettings.PortraitArea.Location.ToVector2(), new Vector2(-12 * GUI.Scale, 4 * GUI.Scale), targetWidth: HUDLayoutSettings.PortraitArea.Width, true);
+                                (int)(HUDLayoutSettings.BottomRightInfoArea.Height * 0.7f)), character.Info.IsDisguisedAsAnother);
+                        character.Info.DrawPortrait(spriteBatch, HUDLayoutSettings.PortraitArea.Location.ToVector2(), new Vector2(-12 * GUI.Scale, 4 * GUI.Scale), targetWidth: HUDLayoutSettings.PortraitArea.Width, true, character.Info.IsDisguisedAsAnother);
                    }
                    mouseOnPortrait = HUDLayoutSettings.BottomRightInfoArea.Contains(PlayerInput.MousePosition) && !character.ShouldLockHud();
                    if (mouseOnPortrait)
@@ -475,19 +493,12 @@ namespace Barotrauma
            return character.ShouldLockHud();
        }

-        private static void DrawOrderIndicator(SpriteBatch spriteBatch, Camera cam, Character character, Order order, float iconAlpha = 1.0f)
+        private static void DrawOrderIndicator(SpriteBatch spriteBatch, Camera cam, Character character, Order order, float iconAlpha = 1.0f, bool createOffset = true, float scaleMultiplier = 1.0f)
        {
            if (order?.SymbolSprite == null) { return; }
+            if (order.IsReport && order.OrderGiver != character && !order.HasAppropriateJob(character)) { return; }

-            if (order.TargetAllCharacters)
-            {
-                if (order.OrderGiver != character && !order.HasAppropriateJob(character))
-                {
-                    return;
-                }
-            }
-
-            ISpatialEntity target = order.ConnectedController != null ? order.ConnectedController.Item : order.TargetSpatialEntity;
+            ISpatialEntity target = order.ConnectedController?.Item ?? order.TargetSpatialEntity;
            if (target == null) { return; }

            //don't show the indicator if far away and not inside the same sub
@@ -503,7 +514,7 @@ namespace Barotrauma
            Vector2 drawPos = target is Entity ? (target as Entity).DrawPosition :
                target.Submarine == null ? target.Position : target.Position + target.Submarine.DrawPosition;
            drawPos += Vector2.UnitX * order.SymbolSprite.size.X * 1.5f * orderIndicatorCount[target];
-            GUI.DrawIndicator(spriteBatch, drawPos, cam, 100.0f, order.SymbolSprite, order.Color * iconAlpha);
+            GUI.DrawIndicator(spriteBatch, drawPos, cam, 100.0f, order.SymbolSprite, order.Color * iconAlpha, createOffset: createOffset, scaleMultiplier: scaleMultiplier);

            orderIndicatorCount[target] = orderIndicatorCount[target] + 1;
        }        
@@ -6,6 +6,8 @@ using System.Collections.Generic;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System.Xml.Linq;
+using System.IO;
+using Barotrauma.Items.Components;

 namespace Barotrauma
 {
@@ -15,6 +17,12 @@ namespace Barotrauma

        public bool LastControlled;

+        private Sprite disguisedPortrait;
+        private List<WearableSprite> disguisedAttachmentSprites;
+        private Vector2? disguisedSheetIndex;
+        private Sprite disguisedJobIcon;
+        private Color disguisedJobColor;
+
        public static void Init()
        {
            infoAreaPortraitBG = GUI.Style.GetComponentStyle("InfoAreaPortraitBG")?.GetDefaultSprite();
@@ -175,6 +183,195 @@ namespace Barotrauma
            }
        }

+        private void GetDisguisedSprites(IdCard idCard)
+        {
+            if (idCard.StoredJobPrefab == null || idCard.StoredPortrait == null)
+            {
+                string[] readTags = idCard.Item.Tags.Split(',');
+
+                if (idCard.StoredJobPrefab == null)
+                {
+                    string jobIdTag = readTags.First(s => s.StartsWith("jobid:"));
+
+                    if (jobIdTag != string.Empty && jobIdTag.Length > 6)
+                    {
+                        string jobId = jobIdTag.Substring(6);
+                        if (jobId != string.Empty)
+                        {
+                            idCard.StoredJobPrefab = JobPrefab.Get(jobId);
+                        }
+                    }
+                }
+
+                if (idCard.StoredPortrait == null)
+                {
+                    string disguisedGender = string.Empty;
+                    string disguisedRace = string.Empty;
+                    string disguisedHeadSpriteId = string.Empty;
+                    int disguisedHairIndex = -1;
+                    int disguisedBeardIndex = -1;
+                    int disguisedMoustacheIndex = -1;
+                    int disguisedFaceAttachmentIndex = -1;
+
+                    foreach (string tag in readTags)
+                    {
+                        string[] s = tag.Split(':');
+
+                        switch (s[0])
+                        {
+                            case "gender":
+                                disguisedGender = s[1];
+                                break;
+
+                            case "race":
+                                disguisedRace = s[1];
+                                break;
+
+                            case "headspriteid":
+                                disguisedHeadSpriteId = s[1];
+                                break;
+
+                            case "hairindex":
+                                disguisedHairIndex = int.Parse(s[1]);
+                                break;
+
+                            case "beardindex":
+                                disguisedBeardIndex = int.Parse(s[1]);
+                                break;
+
+                            case "moustacheindex":
+                                disguisedMoustacheIndex = int.Parse(s[1]);
+                                break;
+
+                            case "faceattachmentindex":
+                                disguisedFaceAttachmentIndex = int.Parse(s[1]);
+                                break;
+
+                            case "sheetindex":
+                                string[] vectorValues = s[1].Split(";");
+                                idCard.StoredSheetIndex = new Vector2(float.Parse(vectorValues[0]), float.Parse(vectorValues[1]));
+                                break;
+                        }
+                    }
+
+                    if (disguisedGender == string.Empty || disguisedRace == string.Empty || disguisedHeadSpriteId == string.Empty)
+                    {
+                        idCard.StoredPortrait = null;
+                        idCard.StoredAttachments = null;
+                        return;
+                    }
+
+                    foreach (XElement limbElement in Ragdoll.MainElement.Elements())
+                    {
+                        if (!limbElement.GetAttributeString("type", "").Equals("head", StringComparison.OrdinalIgnoreCase)) { continue; }
+
+                        XElement spriteElement = limbElement.Element("sprite");
+                        if (spriteElement == null) { continue; }
+
+                        string spritePath = spriteElement.Attribute("texture").Value;
+
+                        spritePath = spritePath.Replace("[GENDER]", disguisedGender);
+                        spritePath = spritePath.Replace("[RACE]", disguisedRace.ToLowerInvariant());
+                        spritePath = spritePath.Replace("[HEADID]", disguisedHeadSpriteId);
+
+                        string fileName = Path.GetFileNameWithoutExtension(spritePath);
+
+                        //go through the files in the directory to find a matching sprite
+                        foreach (string file in Directory.GetFiles(Path.GetDirectoryName(spritePath)))
+                        {
+                            if (!file.EndsWith(".png", StringComparison.OrdinalIgnoreCase))
+                            {
+                                continue;
+                            }
+                            string fileWithoutTags = Path.GetFileNameWithoutExtension(file);
+                            fileWithoutTags = fileWithoutTags.Split('[', ']').First();
+                            if (fileWithoutTags != fileName) { continue; }
+                            idCard.StoredPortrait = new Sprite(spriteElement, "", file) { RelativeOrigin = Vector2.Zero };
+                            break;
+                        }
+
+                        break;
+                    }
+
+                    if (Wearables != null)
+                    {
+                        XElement disguisedHairElement, disguisedBeardElement, disguisedMoustacheElement, disguisedFaceAttachmentElement;
+                        List<XElement> disguisedHairs, disguisedBeards, disguisedMoustaches, disguisedFaceAttachments;
+
+                        Gender disguisedGenderEnum = disguisedGender == "female" ? Gender.Female : Gender.Male;
+                        Race disguisedRaceEnum = (Race)Enum.Parse(typeof(Race), disguisedRace);
+                        int headSpriteId = int.Parse(disguisedHeadSpriteId);
+
+                        float commonness = disguisedGenderEnum == Gender.Female ? 0.05f : 0.2f;
+                        disguisedHairs = AddEmpty(FilterByTypeAndHeadID(FilterElementsByGenderAndRace(wearables, disguisedGenderEnum, disguisedRaceEnum), WearableType.Hair, headSpriteId), WearableType.Hair, commonness);
+                        disguisedBeards = AddEmpty(FilterByTypeAndHeadID(FilterElementsByGenderAndRace(wearables, disguisedGenderEnum, disguisedRaceEnum), WearableType.Beard, headSpriteId), WearableType.Beard);
+                        disguisedMoustaches = AddEmpty(FilterByTypeAndHeadID(FilterElementsByGenderAndRace(wearables, disguisedGenderEnum, disguisedRaceEnum), WearableType.Moustache, headSpriteId), WearableType.Moustache);
+                        disguisedFaceAttachments = AddEmpty(FilterByTypeAndHeadID(FilterElementsByGenderAndRace(wearables, disguisedGenderEnum, disguisedRaceEnum), WearableType.FaceAttachment, headSpriteId), WearableType.FaceAttachment);
+
+                        if (IsValidIndex(disguisedHairIndex, disguisedHairs))
+                        {
+                            disguisedHairElement = disguisedHairs[disguisedHairIndex];
+                        }
+                        else
+                        {
+                            disguisedHairElement = GetRandomElement(disguisedHairs);
+                        }
+                        if (IsValidIndex(disguisedBeardIndex, disguisedBeards))
+                        {
+                            disguisedBeardElement = disguisedBeards[disguisedBeardIndex];
+                        }
+                        else
+                        {
+                            disguisedBeardElement = GetRandomElement(disguisedBeards);
+                        }
+
+                        if (IsValidIndex(disguisedMoustacheIndex, disguisedMoustaches))
+                        {
+                            disguisedMoustacheElement = disguisedMoustaches[disguisedMoustacheIndex];
+                        }
+                        else
+                        {
+                            disguisedMoustacheElement = GetRandomElement(disguisedMoustaches);
+                        }
+                        if (IsValidIndex(disguisedFaceAttachmentIndex, disguisedFaceAttachments))
+                        {
+                            disguisedFaceAttachmentElement = disguisedFaceAttachments[disguisedFaceAttachmentIndex];
+                        }
+                        else
+                        {
+                            disguisedFaceAttachmentElement = GetRandomElement(disguisedFaceAttachments);
+                        }
+
+                        idCard.StoredAttachments = new List<WearableSprite>();
+
+                        disguisedFaceAttachmentElement?.Elements("sprite").ForEach(s => idCard.StoredAttachments.Add(new WearableSprite(s, WearableType.FaceAttachment)));
+                        disguisedBeardElement?.Elements("sprite").ForEach(s => idCard.StoredAttachments.Add(new WearableSprite(s, WearableType.Beard)));
+                        disguisedMoustacheElement?.Elements("sprite").ForEach(s => idCard.StoredAttachments.Add(new WearableSprite(s, WearableType.Moustache)));
+                        disguisedHairElement?.Elements("sprite").ForEach(s => idCard.StoredAttachments.Add(new WearableSprite(s, WearableType.Hair)));
+
+                        if (OmitJobInPortraitClothing)
+                        {
+                            JobPrefab.NoJobElement?.Element("PortraitClothing")?.Elements("sprite").ForEach(s => idCard.StoredAttachments.Add(new WearableSprite(s, WearableType.JobIndicator)));
+                        }
+                        else
+                        {
+                            idCard.StoredJobPrefab?.ClothingElement?.Elements("sprite").ForEach(s => idCard.StoredAttachments.Add(new WearableSprite(s, WearableType.JobIndicator)));
+                        }
+                    }
+                }
+            }
+
+            if (idCard.StoredJobPrefab != null)
+            {
+                disguisedJobIcon = idCard.StoredJobPrefab.Icon;
+                disguisedJobColor = idCard.StoredJobPrefab.UIColor;
+            }
+
+            disguisedPortrait = idCard.StoredPortrait;
+            disguisedSheetIndex = idCard.StoredSheetIndex;
+            disguisedAttachmentSprites = idCard.StoredAttachments;
+        }
+
        partial void LoadAttachmentSprites(bool omitJob)
        {
            if (attachmentSprites == null)
@@ -219,23 +416,42 @@ namespace Barotrauma
                    HUDLayoutSettings.BottomRightInfoArea.Height / (float)infoAreaPortraitBG.SourceRect.Height));
        }

-        public void DrawPortrait(SpriteBatch spriteBatch, Vector2 screenPos, Vector2 offset, float targetWidth, bool flip = false)
+        public void DrawPortrait(SpriteBatch spriteBatch, Vector2 screenPos, Vector2 offset, float targetWidth, bool flip = false, bool evaluateDisguise = false)
        {
-            if (Portrait != null)
+            if (evaluateDisguise && IsDisguised) return;
+
+            Vector2? sheetIndex;
+            Sprite portraitToDraw;
+            List<WearableSprite> attachmentsToDraw;
+
+            if (!IsDisguisedAsAnother || !evaluateDisguise)
+            {
+                sheetIndex = Head.SheetIndex;
+                portraitToDraw = Portrait;
+                attachmentsToDraw = AttachmentSprites;
+            }
+            else
+            {
+                sheetIndex = disguisedSheetIndex;
+                portraitToDraw = disguisedPortrait;
+                attachmentsToDraw = disguisedAttachmentSprites;
+            }
+
+            if (portraitToDraw != null)
            {
                // Scale down the head sprite 10%
                float scale = targetWidth * 0.9f / Portrait.size.X;
-                if (Head.SheetIndex.HasValue)
+                if (sheetIndex.HasValue)
                {
-                    Portrait.SourceRect = new Rectangle(CalculateOffset(Portrait, Head.SheetIndex.Value.ToPoint()), Portrait.SourceRect.Size);
+                    portraitToDraw.SourceRect = new Rectangle(CalculateOffset(portraitToDraw, sheetIndex.Value.ToPoint()), portraitToDraw.SourceRect.Size);
                }
-                Portrait.Draw(spriteBatch, screenPos + offset, Color.White, Portrait.Origin, scale: scale, spriteEffect: flip ? SpriteEffects.FlipHorizontally : SpriteEffects.None);
-                if (AttachmentSprites != null)
+                portraitToDraw.Draw(spriteBatch, screenPos + offset, Color.White, portraitToDraw.Origin, scale: scale, spriteEffect: flip ? SpriteEffects.FlipHorizontally : SpriteEffects.None);
+                if (attachmentsToDraw != null)
                {
                    float depthStep = 0.000001f;
-                    foreach (var attachment in AttachmentSprites)
+                    foreach (var attachment in attachmentsToDraw)
                    {
-                        DrawAttachmentSprite(spriteBatch, attachment, Portrait, screenPos + offset, scale, depthStep, flip ? SpriteEffects.FlipHorizontally : SpriteEffects.None);
+                        DrawAttachmentSprite(spriteBatch, attachment, portraitToDraw, sheetIndex, screenPos + offset, scale, depthStep, flip ? SpriteEffects.FlipHorizontally : SpriteEffects.None);
                        depthStep += depthStep;
                    }
                }
@@ -258,30 +474,34 @@ namespace Barotrauma
                    float depthStep = 0.000001f;
                    foreach (var attachment in AttachmentSprites)
                    {
-                        DrawAttachmentSprite(spriteBatch, attachment, headSprite, screenPos, scale, depthStep);
+                        DrawAttachmentSprite(spriteBatch, attachment, headSprite, Head.SheetIndex, screenPos, scale, depthStep);
                        depthStep += depthStep;
                    }
                }
            }
        }

-        public void DrawJobIcon(SpriteBatch spriteBatch, Vector2 pos, float scale = 1.0f)
+        public void DrawJobIcon(SpriteBatch spriteBatch, Vector2 pos, float scale = 1.0f, bool evaluateDisguise = false)
        {
-            var icon = Job?.Prefab?.Icon;
+            if (evaluateDisguise && IsDisguised) return;
+            var icon = !IsDisguisedAsAnother || !evaluateDisguise ? Job?.Prefab?.Icon : disguisedJobIcon;
            if (icon == null) { return; }
-            icon.Draw(spriteBatch, pos, Job.Prefab.UIColor, scale: scale);
-        }
-        public void DrawJobIcon(SpriteBatch spriteBatch, Rectangle area)
-        {
-            var icon = Job?.Prefab?.Icon;
-            if (icon == null) { return; }
-            icon.Draw(spriteBatch,
-                area.Center.ToVector2(),
-                Job.Prefab.UIColor,
-                scale: Math.Min(area.Width / (float)icon.SourceRect.Width, area.Height / (float)icon.SourceRect.Height));
+            Color iconColor = !IsDisguisedAsAnother || !evaluateDisguise ? Job.Prefab.UIColor : disguisedJobColor;
+
+            icon.Draw(spriteBatch, pos, iconColor, scale: scale);
        }

-        private void DrawAttachmentSprite(SpriteBatch spriteBatch, WearableSprite attachment, Sprite head, Vector2 drawPos, float scale, float depthStep, SpriteEffects spriteEffects = SpriteEffects.None)
+        public void DrawJobIcon(SpriteBatch spriteBatch, Rectangle area, bool evaluateDisguise = false)
+        {
+            if (evaluateDisguise && IsDisguised) return;
+            var icon = !IsDisguisedAsAnother || !evaluateDisguise ? Job?.Prefab?.Icon : disguisedJobIcon;
+            if (icon == null) { return; }
+            Color iconColor = !IsDisguisedAsAnother || !evaluateDisguise ? Job.Prefab.UIColor : disguisedJobColor;
+
+            icon.Draw(spriteBatch, area.Center.ToVector2(), iconColor, scale: Math.Min(area.Width / (float)icon.SourceRect.Width, area.Height / (float)icon.SourceRect.Height));
+        }
+
+        private void DrawAttachmentSprite(SpriteBatch spriteBatch, WearableSprite attachment, Sprite head, Vector2? sheetIndex, Vector2 drawPos, float scale, float depthStep, SpriteEffects spriteEffects = SpriteEffects.None)
        {
            if (attachment.InheritSourceRect)
            {
@@ -289,9 +509,9 @@ namespace Barotrauma
                {
                    attachment.Sprite.SourceRect = new Rectangle(CalculateOffset(head, attachment.SheetIndex.Value), head.SourceRect.Size);
                }
-                else if (Head.SheetIndex.HasValue)
+                else if (sheetIndex.HasValue)
                {
-                    attachment.Sprite.SourceRect = new Rectangle(CalculateOffset(head, Head.SheetIndex.Value.ToPoint()), head.SourceRect.Size);
+                    attachment.Sprite.SourceRect = new Rectangle(CalculateOffset(head, sheetIndex.Value.ToPoint()), head.SourceRect.Size);
                }
                else
                {
@@ -416,8 +416,7 @@ namespace Barotrauma
            Character character = null;
            if (noInfo)
            {
-                character = Create(speciesName, position, seed, null, false);
-                character.ID = id;
+                character = Create(speciesName, position, seed, characterInfo: null, id: id, isRemotePlayer: false);
                bool containsStatusData = inc.ReadBoolean();
                if (containsStatusData)
                {
@@ -434,8 +433,7 @@ namespace Barotrauma

                CharacterInfo info = CharacterInfo.ClientRead(infoSpeciesName, inc);

-                character = Create(speciesName, position, seed, info, ownerId > 0 && GameMain.Client.ID != ownerId, hasAi);
-                character.ID = id;
+                character = Create(speciesName, position, seed, characterInfo: info, id: id, isRemotePlayer: ownerId > 0 && GameMain.Client.ID != ownerId, hasAi: hasAi);
                character.TeamID = (TeamType)teamID;
                character.CampaignInteractionType = (CampaignMode.InteractionType)inc.ReadByte();
                if (character.CampaignInteractionType != CampaignMode.InteractionType.None)
@@ -53,7 +53,7 @@ namespace Barotrauma

        private GUIFrame healthWindow;

-        private GUIComponent deadIndicator;
+        private GUITextBlock deadIndicator;

        private GUIComponent lowSkillIndicator;

@@ -225,13 +225,14 @@ namespace Barotrauma
                Character.Controlled.ResetInteract = true;
                if (openHealthWindow != null)
                {
-                    if (value.Character.Info == null || Character.Controlled.HasEquippedItem("healthscanner"))
+                    if (value.Character.Info == null || value.Character == Character.Controlled || Character.Controlled.HasEquippedItem("healthscanner"))
                    {
                        openHealthWindow.characterName.Text = value.Character.Name;
                    }
                    else
                    {
                        openHealthWindow.characterName.Text = value.Character.Info.DisplayName;
+                        value.Character.Info.CheckDisguiseStatus(false);
                    }

                    if (Character.Controlled.SelectedConstruction != null && Character.Controlled.SelectedConstruction.GetComponent<Ladder>() == null)
@@ -330,11 +331,19 @@ namespace Barotrauma
                }
            );
            deadIndicator = new GUITextBlock(new RectTransform(new Vector2(0.9f, 0.1f), limbSelection.RectTransform, Anchor.Center),
-                text: TextManager.Get("Deceased"), font: GUI.LargeFont, textAlignment: Alignment.Center, wrap: true, style: "GUIToolTip")
+                text: TextManager.Get("Deceased"), font: GUI.LargeFont, textAlignment: Alignment.Center, style: "GUIToolTip")
            {
                Visible = false,
                CanBeFocused = false
            };
+            if (deadIndicator.Text.Contains(' '))
+            {
+                deadIndicator.Wrap = true;
+            }
+            else
+            {
+                deadIndicator.AutoScaleHorizontal = true;
+            }

            var rightSide = new GUIFrame(new RectTransform(new Vector2(0.4f, 1.0f), paddedHealthWindow.RectTransform), style: null);

@@ -405,15 +414,17 @@ namespace Barotrauma
                CanBeFocused = true
            };

+            textLayout.RectTransform.RelativeOffset = new Vector2(0, 0.025f);
+
            var nameContainer = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.2f), textLayout.RectTransform) { MinSize = new Point(0, 20) }, isHorizontal: true)
            {
                Stretch = true
            };

-            new GUICustomComponent(new RectTransform(new Vector2(0.2f, 1.0f), nameContainer.RectTransform),
+            new GUICustomComponent(new RectTransform(new Vector2(0.2f, 1.0f), nameContainer.RectTransform, Anchor.CenterLeft),
                onDraw: (spriteBatch, component) =>
                {
-                    character.Info.DrawPortrait(spriteBatch, new Vector2(component.Rect.X, component.Rect.Center.Y - component.Rect.Width / 2), Vector2.Zero, component.Rect.Width);
+                    character.Info.DrawPortrait(spriteBatch, new Vector2(component.Rect.X, component.Rect.Center.Y - component.Rect.Width / 2), Vector2.Zero, component.Rect.Width, false, openHealthWindow?.Character != Character.Controlled);
                });
            characterName = new GUITextBlock(new RectTransform(new Vector2(0.6f, 1.0f), nameContainer.RectTransform), "", textAlignment: Alignment.CenterLeft, font: GUI.SubHeadingFont)
            {
@@ -422,7 +433,7 @@ namespace Barotrauma
            new GUICustomComponent(new RectTransform(new Vector2(0.2f, 1.0f), nameContainer.RectTransform),
                onDraw: (spriteBatch, component) =>
                {
-                    character.Info.DrawJobIcon(spriteBatch, component.Rect);
+                    character.Info.DrawJobIcon(spriteBatch, component.Rect, openHealthWindow?.Character != Character.Controlled);
                });


@@ -951,6 +962,28 @@ namespace Barotrauma

            SuicideButton.Visible = Character == Character.Controlled && !Character.IsDead && Character.IsIncapacitated;

+            if (GameMain.GameSession?.Campaign is { } campaign)
+            {
+                RectTransform endRoundButton = campaign?.EndRoundButton?.RectTransform;
+                RectTransform readyCheckButton = campaign?.ReadyCheckButton?.RectTransform;
+                if (endRoundButton != null)
+                {
+                    if (SuicideButton.Visible)
+                    {
+                        Point offset = new Point(0, SuicideButton.Rect.Height);
+                        endRoundButton.ScreenSpaceOffset = offset;
+                    }
+                    else if (endRoundButton.ScreenSpaceOffset != Point.Zero)
+                    {
+                        endRoundButton.ScreenSpaceOffset = Point.Zero;
+                    }
+                    if (readyCheckButton != null)
+                    {
+                        readyCheckButton.ScreenSpaceOffset = endRoundButton.ScreenSpaceOffset;
+                    }
+                }
+            }
+
            cprButton.Visible =
                Character == Character.Controlled?.SelectedCharacter
                && (Character.IsUnconscious || Character.Stun > 0.0f)
@@ -328,8 +328,7 @@ namespace Barotrauma
                            deformation = ragdoll.Limbs
                                .Where(l => l != null)
                                .SelectMany(l => l.Deformations)
-                                .Where(d => d.TypeName == typeName && d.Sync == sync)
-                                .FirstOrDefault();
+                                .FirstOrDefault(d => d.TypeName == typeName && d.Sync == sync);
                        }
                        if (deformation == null)
                        {
@@ -971,11 +970,11 @@ namespace Barotrauma
            XElement element;
            if (random)
            {
-                element = info.FilterByTypeAndHeadID(character.Info.FilterElementsByGenderAndRace(character.Info.Wearables), type)?.GetRandom(Rand.RandSync.ClientOnly);
+                element = info.FilterByTypeAndHeadID(info.FilterElementsByGenderAndRace(info.Wearables, info.Gender, info.Race), type, info.Head.HeadSpriteId)?.GetRandom(Rand.RandSync.ClientOnly);
            }
            else
            {
-                element = info.FilterByTypeAndHeadID(character.Info.FilterElementsByGenderAndRace(character.Info.Wearables), type)?.FirstOrDefault();
+                element = info.FilterByTypeAndHeadID(info.FilterElementsByGenderAndRace(info.Wearables, info.Gender, info.Race), type, info.Head.HeadSpriteId)?.FirstOrDefault();
            }
            if (element != null)
            {