(6eeea9b7c) v0.9.10.0.0

2020-06-04 16:41:07 +03:00
parent ce4ccd99ac
commit eeac247a8e
366 changed files with 7772 additions and 3692 deletions
@@ -19,11 +19,14 @@ namespace Barotrauma
                var target = _selectedAiTarget ?? _lastAiTarget;
                if (target != null && target.Entity != null)
                {
-                    var memory = GetTargetMemory(target);
-                    Vector2 targetPos = memory.Location;
-                    targetPos.Y = -targetPos.Y;
-                    GUI.DrawLine(spriteBatch, pos, targetPos, Color.White * 0.5f, 0, 4);
-                    GUI.DrawString(spriteBatch, pos - Vector2.UnitY * 60.0f, $"{target.Entity.ToString()} ({memory.Priority.FormatZeroDecimal()})", Color.White, Color.Black);
+                    var memory = GetTargetMemory(target, false);
+                    if (memory != null)
+                    {
+                        Vector2 targetPos = memory.Location;
+                        targetPos.Y = -targetPos.Y;
+                        GUI.DrawLine(spriteBatch, pos, targetPos, Color.White * 0.5f, 0, 4);
+                        GUI.DrawString(spriteBatch, pos - Vector2.UnitY * 60.0f, $"{target.Entity} ({memory.Priority.FormatZeroDecimal()})", Color.White, Color.Black);
+                    }
                }
            }
            else if (SelectedAiTarget?.Entity != null)
@@ -35,7 +38,7 @@ namespace Barotrauma
                }
                targetPos.Y = -targetPos.Y;
                GUI.DrawLine(spriteBatch, pos, targetPos, GUI.Style.Red * 0.5f, 0, 4);
-                if (wallTarget != null)
+                if (wallTarget != null && (State == AIState.Attack || State == AIState.Aggressive || State == AIState.PassiveAggressive))
                {
                    Vector2 wallTargetPos = wallTarget.Position;
                    if (wallTarget.Structure.Submarine != null) { wallTargetPos += wallTarget.Structure.Submarine.Position; }
@@ -43,7 +46,7 @@ namespace Barotrauma
                    GUI.DrawRectangle(spriteBatch, wallTargetPos - new Vector2(10.0f, 10.0f), new Vector2(20.0f, 20.0f), Color.Orange, false);
                    GUI.DrawLine(spriteBatch, pos, wallTargetPos, Color.Orange * 0.5f, 0, 5);
                }
-                GUI.DrawString(spriteBatch, pos - Vector2.UnitY * 60.0f, $"{SelectedAiTarget.Entity.ToString()} ({GetTargetMemory(SelectedAiTarget).Priority.FormatZeroDecimal()})", GUI.Style.Red, Color.Black);
+                GUI.DrawString(spriteBatch, pos - Vector2.UnitY * 60.0f, $"{SelectedAiTarget.Entity} ({GetTargetMemory(SelectedAiTarget, false)?.Priority.FormatZeroDecimal()})", GUI.Style.Red, Color.Black);
                GUI.DrawString(spriteBatch, pos - Vector2.UnitY * 40.0f, $"({targetValue.FormatZeroDecimal()})", GUI.Style.Red, Color.Black);
            }

@@ -44,19 +44,20 @@ namespace Barotrauma
                var currentObjective = ObjectiveManager.CurrentObjective;
                if (currentObjective != null)
                {
-                    if (currentOrder == null)
+                    int offset = currentOrder != null ? 20 : 0;
+                    if (currentOrder == null || currentOrder.Priority <= 0)
                    {
-                        GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 20), $"MAIN OBJECTIVE: {currentObjective.DebugTag} ({currentObjective.Priority.FormatZeroDecimal()})", Color.White, Color.Black);
+                        GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 20 + offset), $"MAIN OBJECTIVE: {currentObjective.DebugTag} ({currentObjective.Priority.FormatZeroDecimal()})", Color.White, Color.Black);
                    }
                    var subObjective = currentObjective.CurrentSubObjective;
                    if (subObjective != null)
                    {
-                        GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 40), $"SUBOBJECTIVE: {subObjective.DebugTag} ({subObjective.Priority.FormatZeroDecimal()})", Color.White, Color.Black);
+                        GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 40 + offset), $"SUBOBJECTIVE: {subObjective.DebugTag} ({subObjective.Priority.FormatZeroDecimal()})", Color.White, Color.Black);
                    }
                    var activeObjective = ObjectiveManager.GetActiveObjective();
                    if (activeObjective != null)
                    {
-                        GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 60), $"ACTIVE OBJECTIVE: {activeObjective.DebugTag} ({activeObjective.Priority.FormatZeroDecimal()})", Color.White, Color.Black);
+                        GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 60 + offset), $"ACTIVE OBJECTIVE: {activeObjective.DebugTag} ({activeObjective.Priority.FormatZeroDecimal()})", Color.White, Color.Black);
                    }
                }
            }
@@ -86,7 +87,7 @@ namespace Barotrauma
                            new Vector2(path.CurrentNode.DrawPosition.X, -path.CurrentNode.DrawPosition.Y),
                            Color.BlueViolet, 0, 3);

-                        GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 80), "Path cost: " + path.Cost.FormatZeroDecimal(), Color.White, Color.Black * 0.5f);
+                        GUI.DrawString(spriteBatch, pos + textOffset + new Vector2(0, 100), "Path cost: " + path.Cost.FormatZeroDecimal(), Color.White, Color.Black * 0.5f);
                    }
                }
            }
@@ -389,7 +389,7 @@ namespace Barotrauma
        {
            foreach (Limb limb in Limbs)
            {
-                if (limb == null || limb.IsSevered || limb.ActiveSprite == null) continue;
+                if (limb == null || limb.IsSevered || limb.ActiveSprite == null) { continue; }

                Vector2 spriteOrigin = limb.ActiveSprite.Origin;
                spriteOrigin.X = limb.ActiveSprite.SourceRect.Width - spriteOrigin.X;
@@ -404,8 +404,8 @@ namespace Barotrauma
                float gibParticleAmount = MathHelper.Clamp(limb.Mass / character.AnimController.Mass, 0.1f, 1.0f);
                foreach (ParticleEmitter emitter in character.GibEmitters)
                {
-                    if (inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Air) continue;
-                    if (!inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Water) continue;
+                    if (inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Air) { continue; }
+                    if (!inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Water) { continue; }

                    emitter.Emit(1.0f, limb.WorldPosition, character.CurrentHull, amountMultiplier: gibParticleAmount);
                }
@@ -418,7 +418,8 @@ namespace Barotrauma

            if (playSound)
            {
-                SoundPlayer.PlayDamageSound("Gore", 1.0f, limbJoint.LimbA.body);
+                var damageSound = character.GetSound(s => s.Type == CharacterSound.SoundType.Damage);
+                SoundPlayer.PlayDamageSound(limbJoint.Params.BreakSound, 1.0f, limbJoint.LimbA.body.DrawPosition, range: damageSound != null ? damageSound.Range : 800);
            }
        }

@@ -446,9 +447,10 @@ namespace Barotrauma
            float depthOffset = GetDepthOffset();
            for (int i = 0; i < limbs.Length; i++)
            {
-                if (depthOffset != 0.0f) { inversedLimbDrawOrder[i].ActiveSprite.Depth += depthOffset; }
-                inversedLimbDrawOrder[i].Draw(spriteBatch, cam, color);
-                if (depthOffset != 0.0f) { inversedLimbDrawOrder[i].ActiveSprite.Depth -= depthOffset; }
+                var limb = inversedLimbDrawOrder[i];
+                if (depthOffset != 0.0f) { limb.ActiveSprite.Depth += depthOffset; }
+                limb.Draw(spriteBatch, cam, color);
+                if (depthOffset != 0.0f) { limb.ActiveSprite.Depth -= depthOffset; }
            }
            LimbJoints.ForEach(j => j.Draw(spriteBatch));
        }
@@ -489,8 +491,8 @@ namespace Barotrauma

        public void DebugDraw(SpriteBatch spriteBatch)
        {
-            if (!GameMain.DebugDraw || !character.Enabled) return;
-            if (simplePhysicsEnabled) return;
+            if (!GameMain.DebugDraw || !character.Enabled) { return; }
+            if (simplePhysicsEnabled) { return; }

            foreach (Limb limb in Limbs)
            {
@@ -508,7 +510,7 @@ namespace Barotrauma
            Collider.DebugDraw(spriteBatch, frozen ? GUI.Style.Red : (inWater ? Color.SkyBlue : Color.Gray));
            GUI.Font.DrawString(spriteBatch, Collider.LinearVelocity.X.FormatSingleDecimal(), new Vector2(Collider.DrawPosition.X, -Collider.DrawPosition.Y), Color.Orange);

-            foreach (RevoluteJoint joint in LimbJoints)
+            foreach (var joint in LimbJoints)
            {
                Vector2 pos = ConvertUnits.ToDisplayUnits(joint.WorldAnchorA);
                GUI.DrawRectangle(spriteBatch, new Rectangle((int)pos.X, (int)-pos.Y, 5, 5), Color.White, true);
@@ -522,7 +524,10 @@ namespace Barotrauma
                if (limb.body.TargetPosition != null)
                {
                    Vector2 pos = ConvertUnits.ToDisplayUnits((Vector2)limb.body.TargetPosition);
-                    if (currentHull?.Submarine != null) pos += currentHull.Submarine.DrawPosition;
+                    if (currentHull?.Submarine != null)
+                    {
+                        pos += currentHull.Submarine.DrawPosition;
+                    }
                    pos.Y = -pos.Y;

                    GUI.DrawRectangle(spriteBatch, new Rectangle((int)pos.X - 10, (int)pos.Y - 10, 20, 20), Color.Cyan, false, 0.01f);
@@ -541,13 +546,19 @@ namespace Barotrauma
            if (character.MemState.Count > 1)
            {
                Vector2 prevPos = ConvertUnits.ToDisplayUnits(character.MemState[0].Position);
-                if (currentHull?.Submarine != null) prevPos += currentHull.Submarine.DrawPosition;
+                if (currentHull?.Submarine != null)
+                {
+                    prevPos += currentHull.Submarine.DrawPosition;
+                }
                prevPos.Y = -prevPos.Y;

                for (int i = 1; i < character.MemState.Count; i++)
                {
                    Vector2 currPos = ConvertUnits.ToDisplayUnits(character.MemState[i].Position);
-                    if (currentHull?.Submarine != null) currPos += currentHull.Submarine.DrawPosition;
+                    if (currentHull?.Submarine != null)
+                    {
+                        currPos += currentHull.Submarine.DrawPosition;
+                    }
                    currPos.Y = -currPos.Y;

                    GUI.DrawRectangle(spriteBatch, new Rectangle((int)currPos.X - 3, (int)currPos.Y - 3, 6, 6), Color.Cyan * 0.6f, true, 0.01f);
@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
+using Barotrauma.Extensions;

 namespace Barotrauma
 {
@@ -357,7 +358,16 @@ namespace Barotrauma
        
        partial void OnAttackedProjSpecific(Character attacker, AttackResult attackResult, float stun)
        {
-            if (attackResult.Damage <= 1.0f || IsDead) { return; }
+            if (IsDead) { return; }
+            if (attacker != null)
+            {
+                if (attackResult.Damage <= 0.01f) { return; }
+            }
+            else
+            {
+                if (attackResult.Damage <= 1.0f) { return; }
+            }
+
            if (soundTimer < soundInterval * 0.5f)
            {
                PlaySound(CharacterSound.SoundType.Damage);
@@ -813,20 +823,22 @@ namespace Barotrauma
            return progressBar;
        }

+        private readonly List<CharacterSound> matchingSounds = new List<CharacterSound>();
        private SoundChannel soundChannel;
        public void PlaySound(CharacterSound.SoundType soundType)
        {
            if (sounds == null || sounds.Count == 0) { return; }
            if (soundChannel != null && soundChannel.IsPlaying) { return; }
            if (GameMain.SoundManager?.Disabled ?? true) { return; }
-
-            var matchingSounds = sounds.Where(s => 
-                s.Type == soundType && 
-                (s.Gender == Gender.None || (info != null && info.Gender == s.Gender)));
-            if (!matchingSounds.Any()) { return; }
-
-            var matchingSoundsList = matchingSounds.ToList();
-            var selectedSound = matchingSoundsList[Rand.Int(matchingSoundsList.Count)];
+            matchingSounds.Clear();
+            foreach (var s in sounds)
+            {
+                if (s.Type == soundType && (s.Gender == Gender.None || (info != null && info.Gender == s.Gender)))
+                {
+                    matchingSounds.Add(s);
+                }
+            }
+            var selectedSound = matchingSounds.GetRandom();
            if (selectedSound?.Sound == null) { return; }
            soundChannel = SoundPlayer.PlaySound(selectedSound.Sound, AnimController.WorldPosition, selectedSound.Volume, selectedSound.Range, CurrentHull);
            soundTimer = soundInterval;
@@ -846,6 +858,11 @@ namespace Barotrauma
            activeObjectiveEntities.Remove(found);
        }

+        /// <summary>
+        /// Note that when a predicate is provided, the random option uses Linq.Where() extension method, which creates a new collection.
+        /// </summary>
+        public CharacterSound GetSound(Func<CharacterSound, bool> predicate = null, bool random = false) => random ? sounds.GetRandom(predicate) : sounds.FirstOrDefault(predicate);
+
        partial void ImplodeFX()
        {
            Vector2 centerOfMass = AnimController.GetCenterOfMass();
@@ -29,7 +29,7 @@ namespace Barotrauma
            {
                if (hudFrame == null)
                {
-                    hudFrame = new GUIFrame(new RectTransform(Vector2.One, GUI.Canvas), style: null)
+                    hudFrame = new GUIFrame(new RectTransform(GUI.Canvas.RelativeSize, GUI.Canvas), style: null)
                    {
                        CanBeFocused = false
                    };
@@ -163,7 +163,7 @@ namespace Barotrauma
                foreach (Item item in Item.ItemList)
                {
                    if (item.Submarine == null || item.Submarine.TeamID != character.TeamID || item.Submarine.Info.IsWreck) { continue; }
-                    if (!item.Repairables.Any(r => item.ConditionPercentage <= r.AIRepairThreshold)) { continue; }
+                    if (!item.Repairables.Any(r => item.ConditionPercentage <= r.RepairThreshold)) { continue; }
                    if (Submarine.VisibleEntities != null && !Submarine.VisibleEntities.Contains(item)) { continue; }

                    Vector2 diff = item.WorldPosition - character.WorldPosition;
@@ -202,6 +202,7 @@ 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);
@@ -373,7 +374,7 @@ namespace Barotrauma
            {
                GUIComponent.DrawToolTip(
                    spriteBatch,
-                    character.Info?.Job == null ? character.DisplayName : character.Name + " (" + character.Info.Job.Name + ")",
+                    character.Info?.Job == null ? character.DisplayName : character.DisplayName + " (" + character.Info.Job.Name + ")",
                    HUDLayoutSettings.PortraitArea);
            }
        }
@@ -393,10 +394,6 @@ namespace Barotrauma
            startPos = cam.WorldToScreen(startPos);

            string focusName = character.FocusedCharacter.DisplayName;
-            if (character.FocusedCharacter.Info != null)
-            {
-                focusName = character.FocusedCharacter.Info.DisplayName;
-            }
            Vector2 textPos = startPos;
            Vector2 textSize = GUI.Font.MeasureString(focusName);
            Vector2 largeTextSize = GUI.SubHeadingFont.MeasureString(focusName);
@@ -146,7 +146,8 @@ namespace Barotrauma
                    "+" + ((int)((newLevel - prevLevel) * 100.0f)).ToString() + " XP",
                    GUI.Style.Green,
                    textPopupPos,
-                    Vector2.UnitY * 10.0f);
+                    Vector2.UnitY * 10.0f,
+                    playSound: Character.Controlled?.Info == this);
            }
            else if (prevLevel % 0.1f > 0.05f && newLevel % 0.1f < 0.05f)
            {
@@ -154,7 +155,8 @@ namespace Barotrauma
                    "+10 XP",
                    GUI.Style.Green,
                    textPopupPos,
-                    Vector2.UnitY * 10.0f);
+                    Vector2.UnitY * 10.0f,
+                    playSound: Character.Controlled?.Info == this);
            }

            if ((int)newLevel > (int)prevLevel)
@@ -502,11 +502,9 @@ namespace Barotrauma
                        causeOfDeathAffliction = AfflictionPrefab.Prefabs[afflictionName];
                    }
                }
-
-                byte severedLimbCount = msg.ReadByte();
                if (!IsDead)
                {
-                    if (causeOfDeathType == CauseOfDeathType.Pressure)
+                    if (causeOfDeathType == CauseOfDeathType.Pressure || causeOfDeathAffliction == AfflictionPrefab.Pressure)
                    {
                        Implode(true);
                    }
@@ -515,26 +513,26 @@ namespace Barotrauma
                        Kill(causeOfDeathType, causeOfDeathAffliction?.Instantiate(1.0f), true);
                    }
                }
-
-                for (int i = 0; i < severedLimbCount; i++)
-                {
-                    int severedJointIndex = msg.ReadByte();
-                    if (severedJointIndex < 0 || severedJointIndex >= AnimController.LimbJoints.Length)
-                    {
-                        string errorMsg = $"Error in CharacterNetworking.ReadStatus: severed joint index out of bounds (index: {severedJointIndex}, joint count: {AnimController.LimbJoints.Length})";
-                        GameAnalyticsManager.AddErrorEventOnce("CharacterNetworking.ReadStatus:JointIndexOutOfBounts", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
-                    }
-                    else
-                    {
-                        AnimController.SeverLimbJoint(AnimController.LimbJoints[severedJointIndex]);
-                    }
-                }
            }
            else
            {
                if (IsDead) { Revive(); }
                CharacterHealth.ClientRead(msg);
            }
+            byte severedLimbCount = msg.ReadByte();
+            for (int i = 0; i < severedLimbCount; i++)
+            {
+                int severedJointIndex = msg.ReadByte();
+                if (severedJointIndex < 0 || severedJointIndex >= AnimController.LimbJoints.Length)
+                {
+                    string errorMsg = $"Error in CharacterNetworking.ReadStatus: severed joint index out of bounds (index: {severedJointIndex}, joint count: {AnimController.LimbJoints.Length})";
+                    GameAnalyticsManager.AddErrorEventOnce("CharacterNetworking.ReadStatus:JointIndexOutOfBounts", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
+                }
+                else
+                {
+                    AnimController.SeverLimbJoint(AnimController.LimbJoints[severedJointIndex]);
+                }
+            }
        }
    }
 }
@@ -1,6 +1,6 @@
 using Microsoft.Xna.Framework;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
 using System.Linq;
 using System.Xml.Linq;

@@ -1,4 +1,5 @@
 using Barotrauma.Extensions;
+using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -20,9 +21,9 @@ namespace Barotrauma
        }

        const int MaxFakeFireSources = 10;
-        private float minFakeFireSourceInterval = 10.0f, maxFakeFireSourceInterval = 200.0f;
+        const float MinFakeFireSourceInterval = 30.0f, MaxFakeFireSourceInterval = 240.0f;
        private float createFireSourceTimer;
-        private List<FakeFireSource> fakeFireSources = new List<FakeFireSource>();
+        private readonly List<FakeFireSource> fakeFireSources = new List<FakeFireSource>();

        enum FloodType
        {
@@ -31,26 +32,30 @@ namespace Barotrauma
            HideFlooding
        }

-        private float minSoundInterval = 10.0f, maxSoundInterval = 60.0f;
+        const float MinSoundInterval = 10.0f, MaxSoundInterval = 180.0f;
        private FloodType currentFloodType;
        private float soundTimer;

-        private float minFloodInterval = 30.0f, maxFloodInterval = 180.0f;
+        const float MinFloodInterval = 60.0f, MaxFloodInterval = 240.0f;
        private float createFloodTimer;
        private float currentFloodState;
        private float currentFloodDuration;

+        private float fakeBrokenInterval = 30.0f;
+        private float fakeBrokenTimer = 0.0f;
+
        partial void UpdateProjSpecific(CharacterHealth characterHealth, Limb targetLimb, float deltaTime)
        {
            if (Character.Controlled != characterHealth.Character) return;
            UpdateFloods(deltaTime);
            UpdateSounds(characterHealth.Character, deltaTime);
-            UpdateFires(characterHealth.Character, deltaTime);            
+            UpdateFires(characterHealth.Character, deltaTime);
+            UpdateFakeBroken(deltaTime);
        }

        private void UpdateSounds(Character character, float deltaTime)
        {
-            if (soundTimer < MathHelper.Lerp(maxSoundInterval, minSoundInterval, Strength / 100.0f))
+            if (soundTimer < MathHelper.Lerp(MaxSoundInterval, MinSoundInterval, Strength / 100.0f))
            {
                soundTimer += deltaTime;
                return;
@@ -97,7 +102,7 @@ namespace Barotrauma
                return;
            }

-            if (createFloodTimer < MathHelper.Lerp(maxFloodInterval, minFloodInterval, Strength / 100.0f))
+            if (createFloodTimer < MathHelper.Lerp(MaxFloodInterval, MinFloodInterval, Strength / 100.0f))
            {
                createFloodTimer += deltaTime;
                return;
@@ -124,7 +129,7 @@ namespace Barotrauma
            createFireSourceTimer += deltaTime;
            if (fakeFireSources.Count < MaxFakeFireSources &&
                character.Submarine != null &&
-                createFireSourceTimer > MathHelper.Lerp(maxFakeFireSourceInterval, minFakeFireSourceInterval, Strength / 100.0f))
+                createFireSourceTimer > MathHelper.Lerp(MaxFakeFireSourceInterval, MinFakeFireSourceInterval, Strength / 100.0f))
            {
                Hull fireHull = Hull.hullList.GetRandom(h => h.Submarine == character.Submarine);

@@ -140,9 +145,9 @@ namespace Barotrauma

            foreach (FakeFireSource fakeFireSource in fakeFireSources)
            {
-                if (fakeFireSource.Hull.Surface > fakeFireSource.Hull.Rect.Y - fakeFireSource.Hull.Rect.Height + fakeFireSource.Position.Y)
+                if (fakeFireSource.Hull.DrawSurface > fakeFireSource.Hull.Rect.Y - fakeFireSource.Hull.Rect.Height + fakeFireSource.Position.Y)
                {
-                    fakeFireSource.LifeTime -= deltaTime * 10.0f;
+                    fakeFireSource.LifeTime -= deltaTime * 100.0f;
                }

                fakeFireSource.LifeTime -= deltaTime;
@@ -162,5 +167,28 @@ namespace Barotrauma

            fakeFireSources.RemoveAll(fs => fs.LifeTime <= 0.0f);
        }
+
+        private void UpdateFakeBroken(float deltaTime)
+        {
+            fakeBrokenTimer -= deltaTime;
+            if (fakeBrokenTimer > 0.0f) { return; }
+
+            foreach (Item item in Item.ItemList)
+            {
+                var repairable = item.GetComponent<Repairable>();
+                if (repairable == null) { continue; }
+                if (ShouldFakeBrokenItem(item))
+                {
+                    repairable.FakeBrokenTimer = 60.0f;
+                }
+            }
+
+            fakeBrokenTimer = fakeBrokenInterval;
+        }
+
+        private bool ShouldFakeBrokenItem(Item item)
+        {
+            return Rand.Range(0.0f, 1000.0f) < Strength;
+        }
    }
 }
@@ -251,8 +251,7 @@ namespace Barotrauma
        {
            get
            {
-                // 0.38775510204f = percentage of offset before reaching the healthbar portion of the graphic going from bottom upwards
-                return new Point(2, (int)(HUDLayoutSettings.HealthBarArea.Size.Y * 0.38775510204f));
+                return new Point(Math.Max(2, GUI.IntScaleCeiling(1.5f)), Math.Min(GUI.IntScaleFloor(18f), 19));
            }
        }

@@ -260,7 +259,7 @@ namespace Barotrauma
        {
            get
            {
-                return new Point((int)Math.Ceiling(HUDLayoutSettings.HealthBarArea.Size.X - 45 * GUI.Scale), (int)(healthBarHolder.Rect.Height - Math.Min(23 * GUI.Scale, 25)) / 2);
+                return new Point(healthBarHolder.Rect.Width - Math.Min(GUI.IntScale(45f), 47), GUI.IntScale(15f));
            }
        }

@@ -597,12 +596,14 @@ namespace Barotrauma
            switch (alignment)
            {
                case Alignment.Left:
-                    healthInterfaceFrame.RectTransform.SetPosition(Anchor.CenterLeft);
+                    healthInterfaceFrame.RectTransform.SetPosition(Anchor.BottomLeft);
                    break;
                case Alignment.Right:
-                    healthInterfaceFrame.RectTransform.SetPosition(Anchor.CenterRight);
+                    healthInterfaceFrame.RectTransform.SetPosition(Anchor.BottomRight);
                    break;
            }
+
+            healthInterfaceFrame.RectTransform.AbsoluteOffset = new Point(HUDLayoutSettings.Padding, screenResolution.Y - HUDLayoutSettings.ChatBoxArea.Y + HUDLayoutSettings.Padding);
            healthInterfaceFrame.RectTransform.RecalculateChildren(false);
        }

@@ -1107,7 +1108,7 @@ namespace Barotrauma
                    float currHealth = healthBar.BarSize;
                    Color prevColor = healthBar.Color;
                    healthBarShadow.BarSize = healthShadowSize;
-                    healthBarShadow.Color = GUI.Style.Red;
+                    healthBarShadow.Color = Color.Lerp(GUI.Style.Red, Color.Black, 0.5f);
                    healthBarShadow.Visible = true;
                    healthBar.BarSize = currHealth;
                    healthBar.Color = prevColor;
@@ -1822,7 +1823,7 @@ namespace Barotrauma
                Vector2 iconPos = highlightArea.Center.ToVector2();

                //Affliction mostSevereAffliction = thisAfflictions.FirstOrDefault(a => !a.Prefab.IsBuff && !thisAfflictions.Any(a2 => !a2.Prefab.IsBuff && a2.Strength > a.Strength)) ?? thisAfflictions.FirstOrDefault();
-                Affliction mostSevereAffliction = SortAfflictionsBySeverity(thisAfflictions).FirstOrDefault();
+                Affliction mostSevereAffliction = SortAfflictionsBySeverity(thisAfflictions, excludeBuffs: false).FirstOrDefault();
                if (mostSevereAffliction != null) { DrawLimbAfflictionIcon(spriteBatch, mostSevereAffliction, iconScale, ref iconPos); }

                if (thisAfflictions.Count() > 1)
@@ -8,12 +8,14 @@ namespace Barotrauma
 {
    partial class JobPrefab : IPrefab, IDisposable
    {
-        public GUIButton CreateInfoFrame(int variant)
+        public GUIButton CreateInfoFrame(out GUIComponent buttonContainer)
        {
            int width = 500, height = 400;

-            GUIButton backFrame = new GUIButton(new RectTransform(Vector2.One, GUI.Canvas), style: "GUIBackgroundBlocker");
-            GUIFrame frame = new GUIFrame(new RectTransform(new Point(width, height), backFrame.RectTransform, Anchor.Center));
+            GUIButton frameHolder = new GUIButton(new RectTransform(Vector2.One, GUI.Canvas, Anchor.Center), style: null);
+            new GUIFrame(new RectTransform(GUI.Canvas.RelativeSize, frameHolder.RectTransform, Anchor.Center), style: "GUIBackgroundBlocker");
+
+            GUIFrame frame = new GUIFrame(new RectTransform(new Point(width, height), frameHolder.RectTransform, Anchor.Center));
            GUIFrame paddedFrame = new GUIFrame(new RectTransform(new Vector2(0.9f, 0.9f), frame.RectTransform, Anchor.Center), style: null);

            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.1f), paddedFrame.RectTransform), Name, font: GUI.LargeFont);
@@ -32,6 +34,8 @@ namespace Barotrauma
                    font: GUI.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) })
@@ -49,7 +53,7 @@ namespace Barotrauma
                    font: GUI.SmallFont);
            }*/

-            return backFrame;
+            return frameHolder;
        }


@@ -3,25 +3,24 @@ using Barotrauma.Particles;
 using Barotrauma.SpriteDeformations;
 using Barotrauma.Extensions;
 using FarseerPhysics;
-using FarseerPhysics.Dynamics.Joints;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
 using System.Linq;
 using System.Xml.Linq;
 using SpriteParams = Barotrauma.RagdollParams.SpriteParams;

 namespace Barotrauma
 {
-    partial class LimbJoint : RevoluteJoint
+    partial class LimbJoint
    {
        public void UpdateDeformations(float deltaTime)
        {
            float diff = Math.Abs(UpperLimit - LowerLimit);
            float strength = MathHelper.Lerp(0, 1, MathUtils.InverseLerp(0, MathHelper.Pi, diff));
-            float jointAngle = this.JointAngle * strength;
+            float jointAngle = JointAngle * strength;

            JointBendDeformation limbADeformation = LimbA.Deformations.Find(d => d is JointBendDeformation) as JointBendDeformation;
            JointBendDeformation limbBDeformation = LimbB.Deformations.Find(d => d is JointBendDeformation) as JointBendDeformation;
@@ -70,7 +69,6 @@ namespace Barotrauma
                    }
                }
            }
-
        }

        public void Draw(SpriteBatch spriteBatch)
@@ -126,7 +124,7 @@ namespace Barotrauma
        {
            get
            {
-                var conditionalSprite = ConditionalSprites.FirstOrDefault(c => c.IsActive && c.DeformableSprite != null);
+                var conditionalSprite = ConditionalSprites.FirstOrDefault(c => c.Exclusive && c.IsActive && c.DeformableSprite != null);
                if (conditionalSprite != null)
                {
                    return conditionalSprite.DeformableSprite;
@@ -144,7 +142,7 @@ namespace Barotrauma
        {
            get
            {
-                var conditionalSprite = ConditionalSprites.FirstOrDefault(c => c.IsActive && c.ActiveSprite != null);
+                var conditionalSprite = ConditionalSprites.FirstOrDefault(c => c.Exclusive && c.IsActive && c.ActiveSprite != null);
                if (conditionalSprite != null)
                {
                    return conditionalSprite.ActiveSprite;
@@ -166,6 +164,12 @@ 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>>();
@@ -274,7 +278,17 @@ namespace Barotrauma
                        DamagedSprite = new Sprite(subElement, file: GetSpritePath(subElement, Params.damagedSpriteParams));
                        break;
                    case "conditionalsprite":
-                        var conditionalSprite = new ConditionalSprite(subElement, character, file: GetSpritePath(subElement, null));
+                        ISerializableEntity targetEntity;
+                        string target = subElement.GetAttributeString("target", null);
+                        if (string.Equals(target, "character", StringComparison.OrdinalIgnoreCase))
+                        {
+                            targetEntity = character;
+                        }
+                        else
+                        {
+                            targetEntity = this;
+                        }
+                        var conditionalSprite = new ConditionalSprite(subElement, targetEntity, file: GetSpritePath(subElement, null));
                        ConditionalSprites.Add(conditionalSprite);
                        if (conditionalSprite.DeformableSprite != null)
                        {
@@ -373,12 +387,16 @@ namespace Barotrauma

        private string GetSpritePath(XElement element, SpriteParams spriteParams)
        {
-            string texturePath = element.GetAttributeString("texture", null);
-            if (string.IsNullOrWhiteSpace(texturePath) && spriteParams != null)
+            if (spriteParams != null)
            {
-                texturePath = spriteParams.Ragdoll.Texture;
+                return GetSpritePath(spriteParams.GetTexturePath());
+            }
+            else
+            {
+                string texturePath = element.GetAttributeString("texture", null);
+                texturePath = string.IsNullOrWhiteSpace(texturePath) ? ragdoll.RagdollParams.Texture : texturePath;
+                return GetSpritePath(texturePath);
            }
-            return GetSpritePath(texturePath);
        }

        /// <summary>
@@ -419,12 +437,29 @@ namespace Barotrauma
            }
        }

-        partial void AddDamageProjSpecific(IEnumerable<Affliction> afflictions, bool playSound, IEnumerable<DamageModifier> appliedDamageModifiers)
+        partial void AddDamageProjSpecific(bool playSound, AttackResult result)
        {
-            float bleedingDamage = character.CharacterHealth.DoesBleed ? afflictions.Where(a => a is AfflictionBleeding).Sum(a => a.GetVitalityDecrease(character.CharacterHealth)) : 0;
-            float damage = afflictions.Where(a => a.Prefab.AfflictionType == "damage").Sum(a => a.GetVitalityDecrease(character.CharacterHealth));
+            float bleedingDamage = 0;
+            if (character.CharacterHealth.DoesBleed)
+            {
+                foreach (var affliction in result.Afflictions)
+                {
+                    if (affliction is AfflictionBleeding)
+                    {
+                        bleedingDamage += affliction.GetVitalityDecrease(character.CharacterHealth);
+                    }
+                }
+            }
+            float damage = 0;
+            foreach (var affliction in result.Afflictions)
+            {
+                if (affliction.Prefab.AfflictionType == "damage")
+                {
+                    damage += affliction.GetVitalityDecrease(character.CharacterHealth);
+                }
+            }
            float damageMultiplier = 1;
-            foreach (DamageModifier damageModifier in appliedDamageModifiers)
+            foreach (DamageModifier damageModifier in result.AppliedDamageModifiers)
            {
                foreach (var afflictionPrefab in AfflictionPrefab.List)
                {
@@ -433,6 +468,7 @@ namespace Barotrauma
                        if (afflictionPrefab.Effects.Any(e => e.MaxVitalityDecrease > 0))
                        {
                            damageMultiplier *= damageModifier.DamageMultiplier;
+                            break;
                        }
                    }
                }
@@ -440,7 +476,7 @@ namespace Barotrauma
            if (playSound)
            {
                string damageSoundType = (bleedingDamage > damage) ? "LimbSlash" : "LimbBlunt";
-                foreach (DamageModifier damageModifier in appliedDamageModifiers)
+                foreach (DamageModifier damageModifier in result.AppliedDamageModifiers)
                {
                    if (!string.IsNullOrWhiteSpace(damageModifier.DamageSound))
                    {
@@ -457,9 +493,8 @@ namespace Barotrauma
            {
                foreach (ParticleEmitter emitter in character.DamageEmitters)
                {
-                    if (inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Air) continue;
-                    if (!inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Water) continue;
-
+                    if (inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Air) { continue; }
+                    if (!inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Water) { continue; }
                    emitter.Emit(1.0f, WorldPosition, character.CurrentHull, amountMultiplier: damageParticleAmount);
                }
            }
@@ -471,9 +506,8 @@ namespace Barotrauma

                foreach (ParticleEmitter emitter in character.BloodEmitters)
                {
-                    if (inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Air) continue;
-                    if (!inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Water) continue;
-
+                    if (inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Air) { continue; }
+                    if (!inWater && emitter.Prefab.ParticlePrefab.DrawTarget == ParticlePrefab.DrawTargetType.Water) { continue; }
                    emitter.Emit(1.0f, WorldPosition, character.CurrentHull, sizeMultiplier: bloodParticleSize, amountMultiplier: bloodParticleAmount);
                }

@@ -481,15 +515,14 @@ namespace Barotrauma
                {
                    character.CurrentHull.AddDecal(character.BloodDecalName, WorldPosition, MathHelper.Clamp(bloodParticleSize, 0.5f, 1.0f));
                }
-            }
-           
+            }   
        }

        partial void UpdateProjSpecific(float deltaTime)
        {
            if (!body.Enabled) { return; }

-            if (!character.IsDead)
+            if (!IsDead)
            {
                DamageOverlayStrength -= deltaTime;
                BurnOverlayStrength -= deltaTime;
@@ -534,6 +567,10 @@ namespace Barotrauma
                {
                    LightSource.LightSprite.Depth = ActiveSprite.Depth;
                }
+                if (LightSource.DeformableLightSprite != null)
+                {
+                    LightSource.DeformableLightSprite.Sprite.Depth = ActiveSprite.Depth;
+                }
            }

            UpdateSpriteStates(deltaTime);
@@ -543,6 +580,8 @@ namespace Barotrauma
        {
            float brightness = 1.0f - (burnOverLayStrength / 100.0f) * 0.5f;
            var spriteParams = Params.GetSprite();
+            if (spriteParams == null) { return; }
+
            Color color = new Color(spriteParams.Color.R / 255f * brightness, spriteParams.Color.G / 255f * brightness, spriteParams.Color.B / 255f * brightness, spriteParams.Color.A / 255f);
            if (deadTimer > 0)
            {
@@ -568,7 +607,7 @@ namespace Barotrauma

            float herpesStrength = character.CharacterHealth.GetAfflictionStrength("spaceherpes");

-            bool hideLimb = Params.Hide || 
+            bool hideLimb = Hide || 
                OtherWearables.Any(w => w.HideLimb) || 
                wearingItems.Any(w => w != null && w.HideLimb);

@@ -589,6 +628,11 @@ namespace Barotrauma
                    {
                        var deformation = SpriteDeformation.GetDeformation(Deformations, deformSprite.Size);
                        deformSprite.Deform(deformation);
+                        if (LightSource != null && LightSource.DeformableLightSprite != null)
+                        {
+                            deformation = SpriteDeformation.GetDeformation(Deformations, deformSprite.Size, dir == Direction.Left);
+                            LightSource.DeformableLightSprite.Deform(deformation);
+                        }
                    }
                    else
                    {
@@ -600,6 +644,31 @@ namespace Barotrauma
                {
                    body.Draw(spriteBatch, activeSprite, color, null, Scale * TextureScale, Params.MirrorHorizontally, Params.MirrorVertically);
                }
+                // Handle non-exlusive, i.e. additional conditional sprites
+                foreach (var conditionalSprite in ConditionalSprites)
+                {
+                    // Exclusive conditional sprites are handled in the Properties
+                    if (conditionalSprite.Exclusive) { continue; }
+                    if (!conditionalSprite.IsActive) { continue; }
+                    if (conditionalSprite.DeformableSprite != null)
+                    {
+                        var defSprite = conditionalSprite.DeformableSprite;
+                        if (Deformations != null && Deformations.Any())
+                        {
+                            var deformation = SpriteDeformation.GetDeformation(Deformations, defSprite.Size);
+                            defSprite.Deform(deformation);
+                        }
+                        else
+                        {
+                            defSprite.Reset();
+                        }
+                        body.Draw(defSprite, cam, Vector2.One * Scale * TextureScale, color, Params.MirrorHorizontally);
+                    }
+                    else
+                    {
+                        body.Draw(spriteBatch, conditionalSprite.Sprite, color, null, Scale * TextureScale, Params.MirrorHorizontally, Params.MirrorVertically);
+                    }
+                }
            }
            SpriteEffects spriteEffect = (dir == Direction.Right) ? SpriteEffects.None : SpriteEffects.FlipHorizontally;
            if (LightSource != null)