Unstable 0.1500.2.0 (Rokvach's dog edition)

Barotrauma/BarotraumaClient/ClientSource/Characters/AI/AITarget.cs

@@ -48,8 +48,13 @@ namespace Barotrauma
                 {
                     color = Color.CornflowerBlue;
                 }
-                else if (Entity is Item)
+                else if (Entity is Item i)
                 {
+                    if (i.Submarine != null && i.GetComponent<Items.Components.Door>() == null)
+                    {
+                        // Don't show items that are inside the submarine, because monsters shouldn't target them when they are inside and the monsters are outside.
+                        return;
+                    }
                     color = Color.CadetBlue;
                 }
                 else

Barotrauma/BarotraumaClient/ClientSource/Characters/CharacterInfo.cs

@@ -1,12 +1,12 @@
 using Barotrauma.Extensions;
 using Barotrauma.Networking;
-using System;
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System.Xml.Linq;
-using System.IO;
+using Barotrauma.IO;
 using Barotrauma.Items.Components;
 
 namespace Barotrauma
@@ -624,7 +624,7 @@ namespace Barotrauma
                 ch.ChangeSavedStatValue((StatTypes)statType, statValue, statIdentifier, removeOnDeath);
             }
             ch.ExperiencePoints = inc.ReadUInt16();
-
+            ch.AdditionalTalentPoints = inc.ReadUInt16();
             return ch;
         }
     }

Barotrauma/BarotraumaClient/ClientSource/Characters/Health/CharacterHealth.cs

@@ -422,6 +422,8 @@ namespace Barotrauma
                     }
                 }
             }
+
+            healthWindowVerticalLayout.Recalculate();
         }
 
         private void OnAttacked(Character attacker, AttackResult attackResult)
@@ -950,6 +952,16 @@ namespace Barotrauma
                 UpdateAlignment();
             }
 
+            foreach (Affliction affliction in afflictions)
+            {
+                if (affliction.Prefab.AfflictionOverlay != null)
+                {
+                    Sprite ScreenAfflictionOverlay = affliction.Prefab.AfflictionOverlay;
+                    ScreenAfflictionOverlay?.Draw(spriteBatch, Vector2.Zero, Color.White * (affliction.GetAfflictionOverlayMultiplier()), Vector2.Zero, 0.0f,
+                        new Vector2(GameMain.GraphicsWidth / DamageOverlay.size.X, GameMain.GraphicsHeight / DamageOverlay.size.Y));
+                }
+            }
+
             float damageOverlayAlpha = DamageOverlayTimer;
             if (Vitality < MaxVitality * 0.1f)
             {