v1.6.17.0 (Unto the Breach update)

2024-10-22 17:29:04 +03:00
parent e74b3cdb17
commit 6e6c17e100
417 changed files with 17166 additions and 5870 deletions
@@ -48,7 +48,7 @@ namespace Barotrauma
                    GUI.DrawLine(spriteBatch, pos, wallTargetPos, Color.Orange * 0.5f, 0, 5);
                }
                GUI.DrawString(spriteBatch, pos - Vector2.UnitY * 60.0f, $"{SelectedAiTarget.Entity}", GUIStyle.Red, Color.Black);
-                GUI.DrawString(spriteBatch, pos - Vector2.UnitY * 40.0f, $"{targetValue.FormatZeroDecimal()} (M: {SelectedTargetMemory?.Priority.FormatZeroDecimal()}, P: {SelectedTargetingParams?.Priority.FormatZeroDecimal()})", GUIStyle.Red, Color.Black);
+                GUI.DrawString(spriteBatch, pos - Vector2.UnitY * 40.0f, $"{targetValue.FormatZeroDecimal()} (M: {CurrentTargetMemory?.Priority.FormatZeroDecimal()}, P: {CurrentTargetingParams?.Priority.FormatZeroDecimal()})", GUIStyle.Red, Color.Black);
            }

            /*GUIStyle.Font.DrawString(spriteBatch, targetValue.ToString(), pos - Vector2.UnitY * 80.0f, GUIStyle.Red);
@@ -73,7 +73,7 @@ namespace Barotrauma
            }
            GUI.DrawString(spriteBatch, pos - Vector2.UnitY * 80.0f, State.ToString(), stateColor, Color.Black);

-            if (State == AIState.Attack && selectedTargetingParams != null && selectedTargetingParams.AttackPattern == AttackPattern.Circle)
+            if (State == AIState.Attack && currentTargetingParams != null && currentTargetingParams.AttackPattern == AttackPattern.Circle)
            {
                GUI.DrawString(spriteBatch, pos - Vector2.UnitY * 100.0f, CirclePhase.ToString(), stateColor, Color.Black);
            }
@@ -134,8 +134,8 @@ namespace Barotrauma
                    //GUI.DrawLine(spriteBatch, pos, ConvertUnits.ToDisplayUnits(steeringManager.AvoidLookAheadPos.X, -steeringManager.AvoidLookAheadPos.Y), Color.Orange, width: 4);
                }
            }
+            GUI.DrawLine(spriteBatch, pos, pos + ConvertUnits.ToDisplayUnits(new Vector2(Steering.X, -Steering.Y)), Color.Blue, width: 4);
            GUI.DrawLine(spriteBatch, pos, pos + ConvertUnits.ToDisplayUnits(new Vector2(Character.AnimController.TargetMovement.X, -Character.AnimController.TargetMovement.Y)), Color.SteelBlue, width: 2);
-            GUI.DrawLine(spriteBatch, pos, pos + ConvertUnits.ToDisplayUnits(new Vector2(Steering.X, -Steering.Y)), Color.Blue, width: 3);
        }
    }
 }
@@ -27,7 +27,8 @@ namespace Barotrauma

        protected float lastRecvPositionUpdateTime;

-        private float hudInfoHeight = 100.0f;
+        private const float DefaultHudInfoHeight = 78.0f;
+        private float hudInfoHeight = DefaultHudInfoHeight;

        private List<CharacterSound> sounds;
        
@@ -471,7 +472,7 @@ namespace Barotrauma
            if (!GUI.InputBlockingMenuOpen)
            {
                if (SelectedItem != null &&
-                    (SelectedItem.ActiveHUDs.Any(ic => ic.GuiFrame != null && HUD.CloseHUD(ic.GuiFrame.Rect)) ||
+                    (SelectedItem.ActiveHUDs.Any(ic => ic.GuiFrame != null && ic.CloseByClickingOutsideGUIFrame && HUD.CloseHUD(ic.GuiFrame.Rect)) ||
                    ((ViewTarget as Item)?.Prefab.FocusOnSelected ?? false) && PlayerInput.KeyHit(Microsoft.Xna.Framework.Input.Keys.Escape)))
                {
                    if (GameMain.Client != null)
@@ -543,7 +544,10 @@ namespace Barotrauma
            {
                if (attackResult.Damage <= 1.0f) { return; }
            }
-            PlaySound(CharacterSound.SoundType.Damage, maxInterval: 2);
+            if (AIState != AIState.PlayDead)
+            {
+                PlaySound(CharacterSound.SoundType.Damage, maxInterval: 2);
+            }
        }

        partial void KillProjSpecific(CauseOfDeathType causeOfDeath, Affliction causeOfDeathAffliction, bool log)
@@ -588,7 +592,6 @@ namespace Barotrauma
                }
            }

-            sounds.ForEach(s => s.Sound?.Dispose());
            sounds.Clear();

            if (GameMain.GameSession?.CrewManager != null &&
@@ -814,9 +817,12 @@ namespace Barotrauma
                                PlaySound(CharacterSound.SoundType.Idle);
                            }
                            break;
+                        case AIState.PlayDead:
+                        case AIState.Freeze:
+                        case AIState.Hiding:
+                            break;
                        default:
-                            var petBehavior = enemyAI.PetBehavior;
-                            if (petBehavior != null && 
+                            if (enemyAI.PetBehavior is PetBehavior petBehavior && 
                                (petBehavior.Happiness < petBehavior.UnhappyThreshold || petBehavior.Hunger > petBehavior.HungryThreshold))
                            {
                                PlaySound(CharacterSound.SoundType.Unhappy);
@@ -948,7 +954,9 @@ namespace Barotrauma
                Controlled != this &&
                Submarine != null &&
                Controlled.Submarine == Submarine &&
-                GameSettings.CurrentConfig.Graphics.LosMode != LosMode.None)
+                GameSettings.CurrentConfig.Graphics.LosMode != LosMode.None &&
+                //less restrictions on name tag visibility in PvP mode (always show them if the character is visible)
+                GameMain.GameSession?.GameMode is not PvPMode)
            {
                float yPos = Controlled.AnimController.FloorY - 1.5f;

@@ -965,15 +973,16 @@ namespace Barotrauma
            Vector2 pos = DrawPosition;
            pos.Y += hudInfoHeight;

-            if (CurrentHull != null && DrawPosition.Y > CurrentHull.WorldRect.Y - 130.0f)
+            float paddingBelowCeiling = 30.0f;
+            if (CurrentHull != null && DrawPosition.Y + DefaultHudInfoHeight > CurrentHull.WorldRect.Y - paddingBelowCeiling)
            {
-                float lowerAmount = DrawPosition.Y - (CurrentHull.WorldRect.Y - 130.0f);
-                hudInfoHeight = MathHelper.Lerp(hudInfoHeight, 100.0f - lowerAmount, 0.1f);
+                float lowerAmount = (DrawPosition.Y + DefaultHudInfoHeight) - (CurrentHull.WorldRect.Y - paddingBelowCeiling);
+                hudInfoHeight = MathHelper.Lerp(hudInfoHeight, DefaultHudInfoHeight - lowerAmount, 0.1f);
                hudInfoHeight = Math.Max(hudInfoHeight, 20.0f);
            }
            else
            {
-                hudInfoHeight = MathHelper.Lerp(hudInfoHeight, 100.0f, 0.1f);
+                hudInfoHeight = MathHelper.Lerp(hudInfoHeight, DefaultHudInfoHeight, 0.1f);
            }

            pos.Y = -pos.Y;
@@ -1013,6 +1022,8 @@ namespace Barotrauma
                    CampaignInteractionType == CampaignMode.InteractionType.None ?
                    MathHelper.Clamp(1.0f - (cursorDist - (hoverRange - fadeOutRange)) / fadeOutRange, 0.2f, 1.0f) :
                    1.0f;
+                //full name tag visibility in PvP mode to make it easier to tell who's an enemy
+                float nameTextAlpha = GameMain.GameSession?.GameMode is PvPMode ? 1.0f : hudInfoAlpha;

                if (!GUI.DisableCharacterNames && hudInfoVisible &&
                    (controlled == null || this != controlled.FocusedCharacter || IsPet) && cam.Zoom > 0.4f)
@@ -1030,7 +1041,7 @@ namespace Barotrauma
                        }

                        Vector2 nameSize = GUIStyle.Font.MeasureString(name);
-                        Vector2 namePos = new Vector2(pos.X, pos.Y - 10.0f - (5.0f / cam.Zoom)) - nameSize * 0.5f / cam.Zoom;
+                        Vector2 namePos = new Vector2(pos.X, pos.Y - 5.0f - (5.0f / cam.Zoom)) - nameSize * 0.5f / cam.Zoom;
                        Color nameColor = GetNameColor();

                        Vector2 screenSize = new Vector2(GameMain.GraphicsWidth, GameMain.GraphicsHeight);
@@ -1057,7 +1068,7 @@ namespace Barotrauma
                        }

                        GUIStyle.Font.DrawString(spriteBatch, name, namePos + new Vector2(1.0f / cam.Zoom, 1.0f / cam.Zoom), Color.Black, 0.0f, Vector2.Zero, 1.0f / cam.Zoom, SpriteEffects.None, 0.001f);
-                        GUIStyle.Font.DrawString(spriteBatch, name, namePos, nameColor * hudInfoAlpha, 0.0f, Vector2.Zero, 1.0f / cam.Zoom, SpriteEffects.None, 0.0f);
+                        GUIStyle.Font.DrawString(spriteBatch, name, namePos, nameColor * nameTextAlpha, 0.0f, Vector2.Zero, 1.0f / cam.Zoom, SpriteEffects.None, 0.0f);
                        if (GameMain.DebugDraw)
                        {
                            GUIStyle.Font.DrawString(spriteBatch, ID.ToString(), namePos - new Vector2(0.0f, 20.0f), Color.White);
@@ -1068,15 +1079,18 @@ namespace Barotrauma
                    if (petBehavior != null && !IsDead && !IsUnconscious)
                    {
                        var petStatus = petBehavior.GetCurrentStatusIndicatorType();
-                        var iconStyle = GUIStyle.GetComponentStyle("PetIcon." + petStatus);
-                        if (iconStyle != null)
+                        if (petStatus != PetBehavior.StatusIndicatorType.None)
                        {
-                            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();
-                            float iconScale = 30.0f / icon.Sprite.size.X / cam.Zoom;
-                            icon.Sprite.Draw(spriteBatch, iconPos + new Vector2(-35.0f, -25.0f), iconStyle.Color * hudInfoAlpha, scale: iconScale);
+                            var iconStyle = GUIStyle.GetComponentStyle("PetIcon." + petStatus);
+                            if (iconStyle != null)
+                            {
+                                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();
+                                float iconScale = 30.0f / icon.Sprite.size.X / cam.Zoom;
+                                icon.Sprite.Draw(spriteBatch, iconPos + new Vector2(-35.0f, -25.0f), iconStyle.Color * hudInfoAlpha, scale: iconScale);
+                            }   
                        }
                    }
                }
@@ -1100,7 +1114,7 @@ namespace Barotrauma
                    }
                }

-                if (Params.ShowHealthBar && CharacterHealth.DisplayedVitality < MaxVitality * 0.98f && hudInfoVisible)
+                if (Params.ShowHealthBar && CharacterHealth.DisplayedVitality < MaxVitality * 0.98f && hudInfoVisible && AIState != AIState.PlayDead && AIState != AIState.Hiding)
                {
                    hudInfoAlpha = Math.Max(hudInfoAlpha, Math.Min(CharacterHealth.DamageOverlayTimer, 1.0f));

@@ -1233,7 +1247,7 @@ namespace Barotrauma
        public Color GetNameColor()
        {
            CharacterTeamType team = teamID;
-            if (Info?.IsDisguisedAsAnother != null)
+            if (Info is { IsDisguisedAsAnother: true })
            {
                var idCard = Inventory.GetItemInLimbSlot(InvSlotType.Card)?.GetComponent<IdCard>();
                if (idCard != null)
@@ -1249,18 +1263,22 @@ namespace Barotrauma
                }
            }

+            CharacterTeamType myTeam = 
+                Controlled?.TeamID ?? 
+                GameMain.Client?.MyClient?.TeamID ??
+                CharacterTeamType.Team1;
+
            Color nameColor = GUIStyle.TextColorNormal;
-            if (Controlled != null && team != Controlled.TeamID)
+            if (TeamID == CharacterTeamType.FriendlyNPC)
            {
-                if (TeamID == CharacterTeamType.FriendlyNPC)
-                {
-                    nameColor = UniqueNameColor ?? Color.SkyBlue;
-                }
-                else
-                {
-                    nameColor = GUIStyle.Red;
-                }
+                nameColor = UniqueNameColor ?? Color.SkyBlue;
            }
+            else if (team != myTeam)
+            {
+                //opposing team is red when controlling a character
+                nameColor = GUIStyle.Red;
+            }
+
            return nameColor;
        }

@@ -752,7 +752,7 @@ namespace Barotrauma
            }
            textPos.X += 10.0f * GUI.Scale;

-            if (!character.FocusedCharacter.IsIncapacitated && character.FocusedCharacter.IsPet)
+            if (!character.FocusedCharacter.IsIncapacitated && character.FocusedCharacter.IsPet && character.IsFriendly(character.FocusedCharacter))
            {
                GUI.DrawString(spriteBatch, textPos, GetCachedHudText("PlayHint", InputType.Use),
                    GUIStyle.Green, Color.Black, 2, GUIStyle.SmallFont);
@@ -17,7 +17,8 @@ namespace Barotrauma
        private static Sprite infoAreaPortraitBG;

        public bool LastControlled;
-        public int CrewListIndex { get; set; } = -1;
+               
+        public int CrewListIndex { get; set; } = int.MaxValue; //default to the bottom of the list

        private Sprite disguisedPortrait;
        private List<WearableSprite> disguisedAttachmentSprites;
@@ -32,6 +33,8 @@ namespace Barotrauma
        private float tintHighlightThreshold;
        private float tintHighlightMultiplier;

+        public bool ShowTalentResetPopupOnOpen = true;
+
        public static void Init()
        {
            infoAreaPortraitBG = GUIStyle.GetComponentStyle("InfoAreaPortraitBG")?.GetDefaultSprite();
@@ -208,7 +211,7 @@ namespace Barotrauma
            return frame;
        }

-        partial void OnSkillChanged(Identifier skillIdentifier, float prevLevel, float newLevel)
+        partial void OnSkillChanged(Identifier skillIdentifier, float prevLevel, float newLevel, bool forceNotification)
        {
            if (TeamID == CharacterTeamType.FriendlyNPC) { return; }
            if (Character.Controlled != null && Character.Controlled.TeamID != TeamID) { return; }
@@ -226,6 +229,18 @@ namespace Barotrauma
                    specialIncrease ? GUIStyle.Orange : GUIStyle.Green, 
                    playSound: Character == Character.Controlled, skillIdentifier, increase);
            }
+            else if (forceNotification)
+            {
+                float change = newLevel - prevLevel;
+                if (Math.Abs(change) > 0.01f)
+                {
+                    string sign = change > 0 ? "+" : "-";
+                    Character?.AddMessage(
+                        $"{sign}{Math.Round(change, 2)} {TextManager.Get("SkillName." + skillIdentifier).Value}",
+                        specialIncrease ? GUIStyle.Orange : GUIStyle.Green,
+                        playSound: Character == Character.Controlled);
+                }
+            }
        }

        partial void OnExperienceChanged(int prevAmount, int newAmount)
@@ -586,6 +601,8 @@ namespace Barotrauma
            ch.ExperiencePoints = inc.ReadInt32();
            ch.AdditionalTalentPoints = inc.ReadRangedInteger(0, MaxAdditionalTalentPoints);
            ch.PermanentlyDead = inc.ReadBoolean();
+            ch.TalentRefundPoints = inc.ReadInt32();
+            ch.TalentResetCount = inc.ReadInt32();
            return ch;
        }

@@ -154,6 +154,9 @@ namespace Barotrauma
                case TreatmentEventData _:
                    msg.WriteBoolean(AnimController.Anim == AnimController.Animation.CPR);
                    break;
+                case ConfirmRefundEventData _:
+                    //do nothing
+                    break;
                case CharacterStatusEventData _:
                    //do nothing
                    break;
@@ -202,12 +205,16 @@ namespace Barotrauma
                keys[(int)InputType.Use].Held = useInput;
                keys[(int)InputType.Use].SetState(false, useInput);

-                bool crouching = msg.ReadBoolean();
                if (AnimController is HumanoidAnimController)
                {
+                    bool crouching = msg.ReadBoolean();
                    keys[(int)InputType.Crouch].Held = crouching;
                    keys[(int)InputType.Crouch].SetState(false, crouching);
                }
+                else if (AnimController is FishAnimController fishAnim)
+                {
+                    fishAnim.Reverse = msg.ReadBoolean();
+                }

                bool attackInput = msg.ReadBoolean();
                keys[(int)InputType.Attack].Held = attackInput;
@@ -395,13 +402,13 @@ namespace Barotrauma
                    ReadStatus(msg);
                    break;
                case EventType.UpdateSkills:
-                    int skillCount = msg.ReadByte();
-                    for (int i = 0; i < skillCount; i++)
+                    Identifier skillIdentifier = msg.ReadIdentifier();
+                    if (!skillIdentifier.IsEmpty)
                    {
-                        Identifier skillIdentifier = msg.ReadIdentifier();
+                        bool forceNotification = msg.ReadBoolean();
                        float skillLevel = msg.ReadSingle();
-                        info?.SetSkillLevel(skillIdentifier, skillLevel);
-                    }
+                        info?.SetSkillLevel(skillIdentifier, skillLevel, forceNotification: forceNotification);
+                    }                  
                    break;
                case EventType.SetAttackTarget:
                case EventType.ExecuteAttack:
@@ -512,7 +519,12 @@ namespace Barotrauma
                    break;
                case EventType.UpdateExperience:
                    int experienceAmount = msg.ReadInt32();
-                    info?.SetExperience(experienceAmount);
+                    int additionalTalentPoints = msg.ReadInt32();
+                    if (info != null)
+                    {
+                        info.SetExperience(experienceAmount);
+                        info.AdditionalTalentPoints = additionalTalentPoints;
+                    }
                    break;
                case EventType.UpdateTalents:
                    ushort talentCount = msg.ReadUInt16();
@@ -527,6 +539,20 @@ namespace Barotrauma
                    int moneyAmount = msg.ReadInt32();
                    SetMoney(moneyAmount);
                    break;
+                case EventType.UpdateTalentRefundPoints:
+                    int refundPoints = msg.ReadInt32();
+                    if (info != null)
+                    {
+                        if (refundPoints > info.TalentRefundPoints)
+                        {
+                            info.ShowTalentResetPopupOnOpen = true;
+                        }
+                        info.TalentRefundPoints = refundPoints;
+                    }
+                    break;
+                case EventType.ConfirmTalentRefund:
+                    Info?.RefundTalents();
+                    break;
                case EventType.UpdatePermanentStats:
                    byte savedStatValueCount = msg.ReadByte();
                    StatTypes statType = (StatTypes)msg.ReadByte();                       
@@ -31,8 +31,7 @@ namespace Barotrauma
        }

        public static Sprite DamageOverlay => DamageOverlayPrefab.Prefabs.ActivePrefab.DamageOverlay;
-
-
+        
        private Point screenResolution;

        private float uiScale, inventoryScale;
@@ -105,6 +104,12 @@ namespace Barotrauma
        private GUILayoutGroup treatmentLayout;
        private GUIListBox recommendedTreatmentContainer;

+        /// <summary>
+        /// Timer for updating visuals (limb tints and overlays) caused by the affliction 
+        /// </summary>
+        private float updateVisualsTimer = Rand.Range(0.0f, UpdateVisualsInterval);
+        const float UpdateVisualsInterval = 0.5f;
+
        private float distortTimer;

        // 0-1
@@ -461,15 +466,17 @@ namespace Barotrauma
        private void OnAttacked(Character attacker, AttackResult attackResult)
        {
            if (Math.Abs(attackResult.Damage) < 0.01f) { return; }
-            DamageOverlayTimer = MathHelper.Clamp(attackResult.Damage / MaxVitality, DamageOverlayTimer, 1.0f);
-            if (healthShadowDelay <= 0.0f) { healthShadowDelay = 1.0f; }

+            if (ShowDamageOverlay)
+            {
+                DamageOverlayTimer = MathHelper.Clamp(attackResult.Damage / MaxVitality, DamageOverlayTimer, 1.0f);
+                float additionalIntensity = MathHelper.Lerp(0, 1, MathUtils.InverseLerp(0, 0.1f, attackResult.Damage / MaxVitality));
+                damageIntensity = MathHelper.Clamp(damageIntensity + additionalIntensity, 0, 1);
+            }
+            
+            if (healthShadowDelay <= 0.0f) { healthShadowDelay = 1.0f; }
            if (healthBarPulsateTimer <= 0.0f) { healthBarPulsatePhase = 0.0f; }
            healthBarPulsateTimer = 1.0f;
-
-            float additionalIntensity = MathHelper.Lerp(0, 1, MathUtils.InverseLerp(0, 0.1f, attackResult.Damage / MaxVitality));
-            damageIntensity = MathHelper.Clamp(damageIntensity + additionalIntensity, 0, 1);
-
            DisplayVitalityDelay = 0.5f;
        }

@@ -1036,6 +1043,12 @@ namespace Barotrauma
                var affliction = kvp.Key;
                affliction.Prefab.AfflictionOverlay?.Draw(spriteBatch, Vector2.Zero, Color.White * affliction.GetAfflictionOverlayMultiplier(), Vector2.Zero, 0.0f,
                    new Vector2(GameMain.GraphicsWidth / DamageOverlay.size.X, GameMain.GraphicsHeight / DamageOverlay.size.Y));
+
+                var activeEffect = affliction.GetActiveEffect();
+                if (activeEffect is { ThermalOverlayRange: > 0.0f })
+                {
+                    StatusHUD.DrawThermalOverlay(spriteBatch, Character, Character, activeEffect.ThermalOverlayColor, activeEffect.ThermalOverlayRange, effectState: (float)Timing.TotalTimeUnpaused, showDeadCharacters: false);
+                }
            }

            float damageOverlayAlpha = DamageOverlayTimer;
@@ -1380,7 +1393,7 @@ namespace Barotrauma

            recommendedTreatmentContainer.Content.ClearChildren();

-            float characterSkillLevel = Character.Controlled == null ? 0.0f : Character.Controlled.GetSkillLevel("medical");
+            float characterSkillLevel = Character.Controlled == null ? 0.0f : Character.Controlled.GetSkillLevel(Tags.MedicalSkill);

            //key = item identifier
            //float = suitability
@@ -1949,7 +1962,6 @@ namespace Barotrauma
            }
        }

-
        private bool ShouldDisplayAfflictionOnLimb(KeyValuePair<Affliction, LimbHealth> kvp, LimbHealth limbHealth)
        {
            if (!kvp.Key.ShouldShowIcon(Character)) { return false; }
@@ -2058,23 +2070,23 @@ namespace Barotrauma
                newAfflictions.Add((limbHealths[limbIndex], afflictionPrefab, afflictionStrength));
            }

-            foreach (KeyValuePair<Affliction, LimbHealth> kvp in afflictions)
+            foreach ((Affliction affliction, LimbHealth limbHealth) in afflictions)
            {
                //deactivate afflictions that weren't included in the network message
-                if (!newAfflictions.Any(a => kvp.Key.Prefab == a.afflictionPrefab && kvp.Value == a.limb))
+                if (newAfflictions.None(a => affliction.Prefab == a.afflictionPrefab && limbHealth == a.limb))
                {
-                    kvp.Key.Strength = 0.0f;
+                    affliction.Strength = 0.0f;
                }
            }

            foreach (var (limb, afflictionPrefab, strength) in newAfflictions)
            {
                Affliction existingAffliction = null;
-                foreach (KeyValuePair<Affliction, LimbHealth> kvp in afflictions)
+                foreach ((Affliction affliction, LimbHealth limbHealth) in afflictions)
                {
-                    if (kvp.Key.Prefab == afflictionPrefab && kvp.Value == limb)
+                    if (affliction.Prefab == afflictionPrefab && limbHealth == limb)
                    {
-                        existingAffliction = kvp.Key;
+                        existingAffliction = affliction;
                        break;
                    }
                }
@@ -2123,9 +2135,8 @@ namespace Barotrauma

            if (!Character.Params.Health.ApplyAfflictionColors) { return; }

-            foreach (KeyValuePair<Affliction, LimbHealth> kvp in afflictions)
+            foreach ((Affliction affliction, LimbHealth _) in afflictions)
            {
-                var affliction = kvp.Key;
                Color faceTint = affliction.GetFaceTint();
                if (faceTint.A > FaceTint.A) { FaceTint = faceTint; }
                Color bodyTint = affliction.GetBodyTint();
@@ -2137,17 +2148,23 @@ namespace Barotrauma
        {
            foreach (Limb limb in Character.AnimController.Limbs)
            {
-                if (limb.HealthIndex < 0 || limb.HealthIndex >= limbHealths.Count) { continue; }
                limb.BurnOverlayStrength = 0.0f;
                limb.DamageOverlayStrength = 0.0f;
-                foreach (KeyValuePair<Affliction, LimbHealth> kvp in afflictions)
+            }
+
+            foreach ((Affliction affliction, LimbHealth limbHealth) in afflictions)
+            {
+                if (affliction.Prefab.BurnOverlayAlpha <= 0.0f && affliction.Prefab.DamageOverlayAlpha <= 0.0f) { continue; }
+
+                float burnStrength = affliction.Strength / Math.Min(affliction.Prefab.MaxStrength, 100) * affliction.Prefab.BurnOverlayAlpha;
+                float damageOverlayStrength = affliction.Strength / Math.Min(affliction.Prefab.MaxStrength, 100) * affliction.Prefab.DamageOverlayAlpha;
+                foreach (Limb limb in Character.AnimController.Limbs)
                {
-                    var affliction = kvp.Key;
-                    float burnStrength = affliction.Strength / Math.Min(affliction.Prefab.MaxStrength, 100) * affliction.Prefab.BurnOverlayAlpha;
-                    if (kvp.Value == limbHealths[limb.HealthIndex] || !affliction.Prefab.LimbSpecific)
+                    if (limb.HealthIndex < 0 || limb.HealthIndex >= limbHealths.Count) { continue; }
+                    if (limbHealth == limbHealths[limb.HealthIndex] || !affliction.Prefab.LimbSpecific)
                    {
                        limb.BurnOverlayStrength += burnStrength;
-                        limb.DamageOverlayStrength += affliction.Strength / Math.Min(affliction.Prefab.MaxStrength, 100) * affliction.Prefab.DamageOverlayAlpha;
+                        limb.DamageOverlayStrength += damageOverlayStrength;
                    }
                    else
                    {
@@ -1,14 +1,13 @@
 using Microsoft.Xna.Framework;
-using System.Linq;
 using System;
-using System.Xml.Linq;
 using System.Collections.Generic;
+using System.Linq;

 namespace Barotrauma
 {
    partial class JobPrefab : PrefabWithUintIdentifier
    {
-        public GUIButton CreateInfoFrame(out GUIComponent buttonContainer)
+        public GUIButton CreateInfoFrame(bool isPvP, out GUIComponent buttonContainer)
        {
            int width = 500, height = 400;

@@ -29,57 +28,28 @@ namespace Barotrauma
                TextManager.Get("Skills"), font: GUIStyle.LargeFont);
            foreach (SkillPrefab skill in Skills)
            {
+                var levelRange = skill.GetLevelRange(isPvP);
+
+                string levelStr = 
+                    levelRange.End > levelRange.Start ? 
+                    (int)levelRange.Start + " - " + (int)levelRange.End : 
+                    ((int)levelRange.Start).ToString();
                new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), skillContainer.RectTransform),
-                    "   - " + TextManager.AddPunctuation(':', TextManager.Get("SkillName." + skill.Identifier), (int)skill.LevelRange.Start + " - " + (int)skill.LevelRange.End), 
+                    "   - " + TextManager.AddPunctuation(':', TextManager.Get("SkillName." + skill.Identifier), levelStr), 
                    font: GUIStyle.SmallFont);
            }

            buttonContainer = paddedFrame;
-
-            /*if (!ItemIdentifiers.TryGetValue(variant, out var itemIdentifiers)) { return backFrame; }
-            var itemContainer = new GUILayoutGroup(new RectTransform(new Vector2(0.45f, 0.5f), paddedFrame.RectTransform, Anchor.TopRight)
-            { RelativeOffset = new Vector2(0.0f, 0.2f + descriptionBlock.RectTransform.RelativeSize.Y) })
-            {
-                Stretch = true
-            };
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), itemContainer.RectTransform),
-                TextManager.Get("Items", "mapentitycategory.equipment"), font: GUIStyle.LargeFont);
-            foreach (string identifier in itemIdentifiers.Distinct())
-            {
-                if (!(MapEntityPrefab.Find(name: null, identifier: identifier) is ItemPrefab itemPrefab)) { continue; }
-                int count = itemIdentifiers.Count(i => i == identifier);
-                new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), itemContainer.RectTransform),
-                    "   - " + (count == 1 ? itemPrefab.Name : itemPrefab.Name + " x" + count),
-                    font: GUIStyle.SmallFont);
-            }*/
-
+            
            return frameHolder;
        }
-
-        public class OutfitPreview
+        
+        public IEnumerable<Sprite> GetJobOutfitSprites(CharacterTeamType team, bool isPvPMode)
        {
-            public readonly List<(Sprite sprite, Vector2 drawOffset)> Sprites;
-
-            public Vector2 Dimensions;
-
-            public OutfitPreview()
-            {
-                Sprites = new List<(Sprite sprite, Vector2 drawOffset)>();
-                Dimensions = Vector2.One;
-            }
-
-            public void AddSprite(Sprite sprite, Vector2 drawOffset)
-            {
-                Sprites.Add((sprite, drawOffset));
-            }
-        }
-
-        public List<OutfitPreview> GetJobOutfitSprites(CharacterInfoPrefab charInfoPrefab, bool useInventoryIcon, out Vector2 maxDimensions)
-        {
-            List<OutfitPreview> outfitPreviews = new List<OutfitPreview>();
-            maxDimensions = Vector2.One;
-
-            var equipIdentifiers = Element.GetChildElements("ItemSet").Elements().Where(e => e.GetAttributeBool("outfit", false)).Select(e => e.GetAttributeIdentifier("identifier", ""));
+            var equipIdentifiers = JobItems
+                .SelectMany(kvp => kvp.Value)
+                .Where(j => j.Outfit)
+                .Select(j => j.GetItemIdentifier(team, isPvPMode));

            List<ItemPrefab> outfitPrefabs = new List<ItemPrefab>();
            foreach (var equipIdentifier in equipIdentifiers)
@@ -88,45 +58,9 @@ namespace Barotrauma
                if (itemPrefab != null) { outfitPrefabs.Add(itemPrefab); }
            }

-            if (!outfitPrefabs.Any()) { return null; }
+            if (!outfitPrefabs.Any()) { return Enumerable.Empty<Sprite>(); }

-            for (int i = 0; i < outfitPrefabs.Count; i++)
-            {
-                var outfitPreview = new OutfitPreview();
-
-                if (!ItemSets.TryGetValue(i, out var itemSetElement)) { continue; }
-                var previewElement = itemSetElement.GetChildElement("PreviewSprites");
-                if (previewElement == null || useInventoryIcon)
-                {
-                    if (outfitPrefabs[i] is ItemPrefab prefab && prefab.InventoryIcon != null)
-                    {
-                        outfitPreview.AddSprite(prefab.InventoryIcon, Vector2.Zero);
-                        outfitPreview.Dimensions = prefab.InventoryIcon.SourceRect.Size.ToVector2();
-                        maxDimensions.X = MathHelper.Max(maxDimensions.X, outfitPreview.Dimensions.X);
-                        maxDimensions.Y = MathHelper.Max(maxDimensions.Y, outfitPreview.Dimensions.Y);
-                    }
-                    outfitPreviews.Add(outfitPreview);
-                    continue;
-                }
-
-                var children = previewElement.Elements().ToList();
-                for (int n = 0; n < children.Count; n++)
-                {
-                    var spriteElement = children[n];
-                    string spriteTexture = charInfoPrefab.ReplaceVars(spriteElement.GetAttributeString("texture", ""), charInfoPrefab.Heads.First());
-                    var sprite = new Sprite(spriteElement, file: spriteTexture);
-                    sprite.size = new Vector2(sprite.SourceRect.Width, sprite.SourceRect.Height);
-                    outfitPreview.AddSprite(sprite, children[n].GetAttributeVector2("offset", Vector2.Zero));
-                }
-
-                outfitPreview.Dimensions = previewElement.GetAttributeVector2("dims", Vector2.One);
-                maxDimensions.X = MathHelper.Max(maxDimensions.X, outfitPreview.Dimensions.X);
-                maxDimensions.Y = MathHelper.Max(maxDimensions.Y, outfitPreview.Dimensions.Y);
-
-                outfitPreviews.Add(outfitPreview);
-            }
-
-            return outfitPreviews;
+            return outfitPrefabs.Select(p => p.InventoryIcon ?? p.Sprite);
        }
    }
 }
@@ -184,12 +184,6 @@ namespace Barotrauma

        public Sprite DamagedSprite { get; private set; }

-        public bool Hide
-        {
-            get => Params.Hide;
-            set => Params.Hide = value;
-        }
-
        public List<ConditionalSprite> ConditionalSprites { get; private set; } = new List<ConditionalSprite>();
        private Dictionary<DecorativeSprite, SpriteState> spriteAnimState = new Dictionary<DecorativeSprite, SpriteState>();
        private Dictionary<int, List<DecorativeSprite>> DecorativeSpriteGroups = new Dictionary<int, List<DecorativeSprite>>();
@@ -198,6 +192,7 @@ namespace Barotrauma
        {
            public float RotationState;
            public float OffsetState;
+            public float ScaleState;
            public Vector2 RandomOffsetMultiplier = new Vector2(Rand.Range(-1.0f, 1.0f), Rand.Range(-1.0f, 1.0f));
            public float RandomRotationFactor = Rand.Range(0.0f, 1.0f);
            public float RandomScaleFactor = Rand.Range(0.0f, 1.0f);
@@ -301,7 +296,16 @@ namespace Barotrauma
                        DamagedSprite = new Sprite(subElement, file: GetSpritePath(subElement, Params.damagedSpriteParams, ref _damagedTexturePath), sourceRectScale: sourceRectScale);
                        break;
                    case "conditionalsprite":
-                        var conditionalSprite = new ConditionalSprite(subElement, GetConditionalTarget(), file: GetSpritePath(subElement, null, ref _texturePath), sourceRectScale: sourceRectScale);
+                        string conditionalSpritePath = string.Empty;
+                        GetSpritePath(subElement.GetChildElement("sprite") ?? subElement.GetChildElement("deformablesprite") ?? subElement, null, ref conditionalSpritePath);
+                        if  (conditionalSpritePath.IsNullOrEmpty())
+                        {
+                            DebugConsole.ThrowError($"Failed to find a sprite path in the conditional sprite defined in {character.SpeciesName}, limb {type}.", 
+                                contentPackage: subElement.ContentPackage);
+                        }
+                        var conditionalSprite = new ConditionalSprite(subElement, GetConditionalTarget(), 
+                            file: conditionalSpritePath, 
+                            sourceRectScale: sourceRectScale);
                        ConditionalSprites.Add(conditionalSprite);
                        if (conditionalSprite.DeformableSprite != null)
                        {
@@ -475,7 +479,7 @@ namespace Barotrauma
        private string _damagedTexturePath;
        private string GetSpritePath(ContentXElement element, SpriteParams spriteParams, ref string path)
        {
-            if (path == null)
+            if (path.IsNullOrEmpty())
            {
                if (spriteParams != null)
                {
@@ -952,8 +956,8 @@ namespace Barotrauma
                    var ca = (float)Math.Cos(-body.Rotation);
                    var sa = (float)Math.Sin(-body.Rotation);
                    Vector2 transformedOffset = new Vector2(ca * offset.X + sa * offset.Y, -sa * offset.X + ca * offset.Y);
-                    decorativeSprite.Sprite.Draw(spriteBatch, new Vector2(body.DrawPosition.X + transformedOffset.X, -(body.DrawPosition.Y + transformedOffset.Y)), c,
-                        -body.Rotation + rotation, decorativeSprite.GetScale(spriteAnimState[decorativeSprite].RandomScaleFactor) * Scale, spriteEffect,
+                    decorativeSprite.Sprite.Draw(spriteBatch, new Vector2(body.DrawPosition.X + transformedOffset.X, -(body.DrawPosition.Y + transformedOffset.Y)), c, decorativeSprite.Sprite.Origin,
+                        -body.Rotation + rotation, decorativeSprite.GetScale(ref spriteAnimState[decorativeSprite].ScaleState, spriteAnimState[decorativeSprite].RandomScaleFactor) * Scale, spriteEffect,
                        depth: activeSprite.Depth - depthStep);
                    depthStep += step;
                }