(891ef87c3) Fixed: CrewManager throwing errors if changing resolutions when a crewmember is dead. Added: Scaling of the objective list when changing resolutions

Barotrauma/BarotraumaClient/Source/Characters/AI/EnemyAIController.cs

@@ -51,19 +51,19 @@ namespace Barotrauma
             }
             GUI.DrawString(spriteBatch, pos - Vector2.UnitY * 80.0f, State.ToString(), stateColor, Color.Black);
 
-            if (LatchOntoAI != null)
+            if (latchOntoAI != null)
             {
-                foreach (Joint attachJoint in LatchOntoAI.AttachJoints)
+                foreach (Joint attachJoint in latchOntoAI.AttachJoints)
                 {
                     GUI.DrawLine(spriteBatch,
                         ConvertUnits.ToDisplayUnits(new Vector2(attachJoint.WorldAnchorA.X, -attachJoint.WorldAnchorA.Y)),
                         ConvertUnits.ToDisplayUnits(new Vector2(attachJoint.WorldAnchorB.X, -attachJoint.WorldAnchorB.Y)), Color.Green, 0, 4);
                 }
 
-                if (LatchOntoAI.WallAttachPos.HasValue)
+                if (latchOntoAI.WallAttachPos.HasValue)
                 {
                     GUI.DrawLine(spriteBatch, pos,
-                        ConvertUnits.ToDisplayUnits(new Vector2(LatchOntoAI.WallAttachPos.Value.X, -LatchOntoAI.WallAttachPos.Value.Y)), Color.Green, 0, 3);
+                        ConvertUnits.ToDisplayUnits(new Vector2(latchOntoAI.WallAttachPos.Value.X, -latchOntoAI.WallAttachPos.Value.Y)), Color.Green, 0, 3);
                 }
             }
 

Barotrauma/BarotraumaClient/Source/Characters/Character.cs

@@ -224,13 +224,6 @@ namespace Barotrauma
                     }
                 }
 
-                if (SelectedConstruction != null && SelectedConstruction.ActiveHUDs.Any(ic => ic.GuiFrame != null && HUD.CloseHUD(ic.GuiFrame.Rect)))
-                {
-                    //emulate a Select input to get the character to deselect the item server-side
-                    keys[(int)InputType.Select].Hit = true;
-                    SelectedConstruction = null;
-                }
-
                 DoInteractionUpdate(deltaTime, mouseSimPos);
             }
 

Barotrauma/BarotraumaClient/Source/GUI/GUI.cs

@@ -56,7 +56,7 @@ namespace Barotrauma
         private static List<GUIMessage> messages = new List<GUIMessage>();
         private static Sound[] sounds;
         private static bool pauseMenuOpen, settingsMenuOpen;
-        public static GUIFrame PauseMenu { get; private set; }
+        private static GUIFrame pauseMenu;
         private static Sprite arrow, lockIcon, checkmarkIcon, timerIcon;
 
         public static KeyboardDispatcher KeyboardDispatcher { get; set; }
@@ -561,7 +561,7 @@ namespace Barotrauma
 
             if (pauseMenuOpen)
             {
-                PauseMenu.AddToGUIUpdateList();
+                pauseMenu.AddToGUIUpdateList();
             }
             if (settingsMenuOpen)
             {
@@ -1420,9 +1420,9 @@ namespace Barotrauma
 
             if (pauseMenuOpen)
             {
-                PauseMenu = new GUIFrame(new RectTransform(Vector2.One, Canvas), style: null, color: Color.Black * 0.5f);
+                pauseMenu = new GUIFrame(new RectTransform(Vector2.One, Canvas), style: null, color: Color.Black * 0.5f);
                     
-                var pauseMenuInner = new GUIFrame(new RectTransform(new Vector2(0.13f, 0.3f), PauseMenu.RectTransform, Anchor.Center) { MinSize = new Point(200, 300) });
+                var pauseMenuInner = new GUIFrame(new RectTransform(new Vector2(0.13f, 0.3f), pauseMenu.RectTransform, Anchor.Center) { MinSize = new Point(200, 300) });
 
                 var buttonContainer = new GUILayoutGroup(new RectTransform(new Vector2(0.85f, 0.85f), pauseMenuInner.RectTransform, Anchor.Center))
                 {

Barotrauma/BarotraumaClient/Source/GUI/HUDLayoutSettings.cs

@@ -200,9 +200,6 @@ namespace Barotrauma
     {
         public static bool CloseHUD(Rectangle rect)
         {
-            // Always close when hitting escape
-            if (PlayerInput.KeyHit(Microsoft.Xna.Framework.Input.Keys.Escape)) { return true; }
-
             //don't close when the cursor is on a UI element
             if (GUI.MouseOn != null) return false;
 

Barotrauma/BarotraumaClient/Source/GameMain.cs

@@ -601,9 +601,8 @@ namespace Barotrauma
                         {
                             ((GUIMessageBox)GUIMessageBox.VisibleBox).Close();
                         }
-                        else if ((GUI.MouseOn == null || GUI.IsMouseOn(GUI.PauseMenu)) && Inventory.SelectedSlot == null && CharacterHealth.OpenHealthWindow == null)
+                        else // Otherwise toggle pausing.
                         {
-                            // Otherwise toggle pausing, unless another window/interface is open.
                             GUI.TogglePauseMenu();
                         }
                     }

Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs

@@ -976,7 +976,7 @@ namespace Barotrauma
                 foreach (GUIComponent c in prevCharacterListBox.Content.Children)
                 {
                     Character character = c.UserData as Character;
-                    if (character == null) continue;
+                    if (character == null || character.IsDead || character.Removed) continue;
                     AddCharacter(character);
                     DisplayCharacterOrder(character, character.CurrentOrder);
                 }

Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs

@@ -49,6 +49,9 @@ namespace Barotrauma.Tutorials
         private float medicalTutorialTimer = 0.0f;
         private const float medicalTutorialDelay = 2.0f;
 
+        private Point screenResolution;
+        private float prevUIScale;
+
         private class TutorialSegment
         {
             public string Id;
@@ -231,19 +234,34 @@ namespace Barotrauma.Tutorials
         {
             holderFrame = new GUIFrame(new RectTransform(new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight), GUI.Canvas, Anchor.Center));
             objectiveFrame = new GUIFrame(HUDLayoutSettings.ToRectTransform(HUDLayoutSettings.ObjectiveAnchor, holderFrame.RectTransform), style: null);
+
+            for (int i = 0; i < activeObjectives.Count; i++)
+            {
+                CreateObjectiveGUI(activeObjectives[i], i);
+            }
+
+            screenResolution = new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight);
+            prevUIScale = GUI.Scale;
         }
 
         public override void AddToGUIUpdateList()
         {
+            if (videoPlayer != null)
+            {
+                videoPlayer.AddToGUIUpdateList(order: 100);
+            }
+
+            if (GUI.DisableHUD) return;
+            if (GameMain.GraphicsWidth != screenResolution.X || GameMain.GraphicsHeight != screenResolution.Y || prevUIScale != GUI.Scale)
+            {
+                CreateObjectiveFrame();
+            }
+
             if (objectiveFrame != null && activeObjectives.Count > 0)
             {
                 objectiveFrame.AddToGUIUpdateList(order: -1);
             }
             base.AddToGUIUpdateList();
-            if (videoPlayer != null)
-            {
-                videoPlayer.AddToGUIUpdateList(order: 100);
-            }
         }
 
         public override void Update(float deltaTime)
@@ -299,19 +317,25 @@ namespace Barotrauma.Tutorials
         private void AddNewObjective(TutorialSegment segment)
         {
             activeObjectives.Add(segment);
+            CreateObjectiveGUI(segment, activeObjectives.Count - 1);
+        }
 
-            Point replayButtonSize = new Point((int)GUI.ObjectiveNameFont.MeasureString(segment.Objective).X, (int)(GUI.ObjectiveNameFont.MeasureString(segment.Objective).Y * 1.45f));
+        private void CreateObjectiveGUI(TutorialSegment segment, int index)
+        {
+            Point replayButtonSize = new Point((int)(GUI.ObjectiveNameFont.MeasureString(segment.Objective).X * GUI.Scale), (int)(GUI.ObjectiveNameFont.MeasureString(segment.Objective).Y * 1.45f * GUI.Scale));
 
-            segment.ReplayButton = new GUIButton(new RectTransform(replayButtonSize, objectiveFrame.RectTransform, Anchor.TopRight, Pivot.TopRight) { AbsoluteOffset = new Point(/*(int)(-2.5f * toggleButton.Rect.Width)*/0, (replayButtonSize.Y + 20) * (activeObjectives.Count - 1)) }, style: null);
+            segment.ReplayButton = new GUIButton(new RectTransform(replayButtonSize, objectiveFrame.RectTransform, Anchor.TopRight, Pivot.TopRight) { AbsoluteOffset = new Point(0, (replayButtonSize.Y + (int)(20f * GUI.Scale)) * index) }, style: null);
             segment.ReplayButton.OnClicked += (GUIButton btn, object userdata) =>
             {
                 ReplaySegmentVideo(segment);
                 return true;
             };
 
-            int yOffset = (int)(GUI.ObjectiveNameFont.MeasureString(objectiveTranslated).Y / 2f) + 5;
-            segment.LinkedTitle = new GUITextBlock(new RectTransform(new Point(replayButtonSize.X, yOffset), segment.ReplayButton.RectTransform, Anchor.Center, Pivot.BottomCenter) { AbsoluteOffset = new Point(10, 0) }, objectiveTranslated, textColor: Color.White, font: GUI.ObjectiveTitleFont, textAlignment: Alignment.CenterRight);
-            segment.LinkedText = new GUITextBlock(new RectTransform(new Point(replayButtonSize.X, yOffset), segment.ReplayButton.RectTransform, Anchor.Center, Pivot.TopCenter) { AbsoluteOffset = new Point(10, 0) }, segment.Objective, textColor: new Color(4, 180, 108), font: GUI.ObjectiveNameFont, textAlignment: Alignment.CenterRight);
+            int yOffset = (int)((GUI.ObjectiveNameFont.MeasureString(objectiveTranslated).Y / 2f + 5) * GUI.Scale);
+            segment.LinkedTitle = new GUITextBlock(new RectTransform(new Point(replayButtonSize.X, yOffset), segment.ReplayButton.RectTransform, Anchor.Center, Pivot.BottomCenter) { AbsoluteOffset = new Point((int)(10 * GUI.Scale), 0) }, objectiveTranslated, textColor: Color.White, font: GUI.ObjectiveTitleFont, textAlignment: Alignment.CenterRight);
+            segment.LinkedText = new GUITextBlock(new RectTransform(new Point(replayButtonSize.X, yOffset), segment.ReplayButton.RectTransform, Anchor.Center, Pivot.TopCenter) { AbsoluteOffset = new Point((int)(10 * GUI.Scale), 0) }, segment.Objective, textColor: new Color(4, 180, 108), font: GUI.ObjectiveNameFont, textAlignment: Alignment.CenterRight);
+
+            segment.LinkedTitle.TextScale = segment.LinkedText.TextScale = GUI.Scale;
 
             segment.LinkedTitle.Color = segment.LinkedTitle.HoverColor = segment.LinkedTitle.PressedColor = segment.LinkedTitle.SelectedColor = Color.Transparent;
             segment.LinkedText.Color = segment.LinkedText.HoverColor = segment.LinkedText.PressedColor = segment.LinkedText.SelectedColor = Color.Transparent;

Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/Tutorial.cs

@@ -188,17 +188,19 @@ namespace Barotrauma.Tutorials
             Anchor anchor = Anchor.TopRight;
             Enum.TryParse(anchorStr, out anchor);
 
-            var infoBlock = new GUIFrame(new RectTransform(new Point(width, height), GUI.Canvas, anchor) { AbsoluteOffset = new Point(20) });
+            var infoBlock = new GUIFrame(new RectTransform(new Point((int)(width * GUI.Scale), (int)(height * GUI.Scale)), GUI.Canvas, anchor) { AbsoluteOffset = new Point(20) });
             infoBlock.Flash(Color.Green);
 
             if (title.Length > 0)
             {
                 var titleBlock = new GUITextBlock(new RectTransform(new Vector2(1f, .35f), infoBlock.RectTransform, Anchor.TopCenter,
                 Pivot.TopCenter), title, font: GUI.VideoTitleFont, textAlignment: Alignment.Center, textColor: new Color(253, 174, 0));
+                titleBlock.TextScale = GUI.Scale;
             }
 
             var textBlock = new GUITextBlock(new RectTransform(new Vector2(0.9f, 1f), infoBlock.RectTransform, Anchor.BottomCenter),
                 text, wrap: true);
+            textBlock.TextScale = GUI.Scale;
 
             infoBoxClosedCallback = callback;
 

Barotrauma/BarotraumaClient/Source/Items/Components/LevelResource.cs

@@ -7,7 +7,7 @@ namespace Barotrauma.Items.Components
     {
         public void ClientRead(ServerNetObject type, NetBuffer msg, float sendingTime)
         {
-            deattachTimer = msg.ReadSingle();
+            DeattachTimer = msg.ReadSingle();
             if (deattachTimer >= DeattachDuration)
             {
                 holdable.DeattachFromWall();

Barotrauma/BarotraumaClient/Source/Items/Components/RepairTool.cs

@@ -1,7 +1,6 @@
 using Barotrauma.Particles;
 using FarseerPhysics;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,21 +11,12 @@ using System.Xml.Linq;
 namespace Barotrauma.Items.Components
 {
     partial class RepairTool
-#if DEBUG
-        : IDrawableComponent
-#endif
     {
         public ParticleEmitter ParticleEmitter
         {
             get;
             private set;
         }
-#if DEBUG
-        public Vector2 DrawSize
-        {
-            get { return GameMain.DebugDraw ? Vector2.One * Range : Vector2.Zero; }
-        }            
-#endif
 
         private List<ParticleEmitter> ParticleEmitterHitStructure = new List<ParticleEmitter>();
         private List<ParticleEmitter> ParticleEmitterHitCharacter = new List<ParticleEmitter>();
@@ -132,17 +122,5 @@ namespace Barotrauma.Items.Components
                 emitter.Second.Emit(deltaTime, particlePos, item.CurrentHull, particleAngle + MathHelper.Pi, -particleAngle + MathHelper.Pi);
             }            
         }
-#if DEBUG
-        public void Draw(SpriteBatch spriteBatch, bool editing)
-        {
-            if (GameMain.DebugDraw && IsActive)
-            {
-                GUI.DrawLine(spriteBatch, 
-                    new Vector2(debugRayStartPos.X, -debugRayStartPos.Y),
-                    new Vector2(debugRayEndPos.X, -debugRayEndPos.Y),
-                    Color.Yellow);
-            }
-        }
-#endif
     }
 }

Barotrauma/BarotraumaClient/Source/Items/ItemInventory.cs

@@ -10,6 +10,12 @@ namespace Barotrauma
 
         protected override void ControlInput(Camera cam)
         {
+            if (draggingItem == null && HUD.CloseHUD(BackgroundFrame))
+            {
+                // TODO: fix so that works with the server side
+                Character.Controlled.SelectedConstruction = null;
+                return;
+            }
             base.ControlInput(cam);
             if (BackgroundFrame.Contains(PlayerInput.MousePosition))
             {

Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs

@@ -504,12 +504,12 @@ namespace Barotrauma
                 {
                     foreach (MapEntity e in selectedList)
                     {
-                        e.prefab?.DrawPlacing(spriteBatch,
+                        e.prefab.DrawPlacing(spriteBatch,
                             new Rectangle(e.WorldRect.Location + new Point((int)moveAmount.X, (int)-moveAmount.Y), e.WorldRect.Size));
                         GUI.DrawRectangle(spriteBatch,
                             new Vector2(e.WorldRect.X, -e.WorldRect.Y) + moveAmount,
                             new Vector2(e.rect.Width, e.rect.Height),
-                            Color.White, false, 0, (int)Math.Max(3.0f / GameScreen.Selected.Cam.Zoom, 2.0f));
+                            Color.DarkRed, false, 0, (int)Math.Max(1.5f / GameScreen.Selected.Cam.Zoom, 1.0f));
                     }
 
                     //stop dragging the "selection rectangle"

Barotrauma/BarotraumaClient/Source/Map/MapEntityPrefab.cs

@@ -44,7 +44,7 @@ namespace Barotrauma
                 drawRect.Location -= Submarine.MainSub.Position.ToPoint();
             }
             drawRect.Y = -drawRect.Y;
-            GUI.DrawRectangle(spriteBatch, drawRect, Color.White);
+            GUI.DrawRectangle(spriteBatch, drawRect, Color.DarkBlue);
         }
         public void DrawListLine(SpriteBatch spriteBatch, Vector2 pos, Color color)
         {

Barotrauma/BarotraumaClient/Source/Screens/CharacterEditorScreen.cs

@@ -1239,7 +1239,7 @@ namespace Barotrauma
 #if !DEBUG
             if (vanilla != null && contentPackage == vanilla)
             {
-                GUI.AddMessage(GetCharacterEditorTranslation("CannotEditVanillaCharacters"), Color.Red, font: GUI.LargeFont);
+                GUI.AddMessage($"Cannot edit the Vanilla content!", Color.Red, font: GUI.LargeFont);
                 return false;
             }
 #endif
@@ -1879,7 +1879,7 @@ namespace Barotrauma
 #if !DEBUG
                 if (VanillaCharacters != null && VanillaCharacters.Contains(currentCharacterConfig))
                 {
-                    GUI.AddMessage(GetCharacterEditorTranslation("CannotEditVanillaCharacters"), Color.Red, font: GUI.LargeFont);
+                    GUI.AddMessage(GetCharacterEditorTranslation("CantEditVanillaContent"), Color.Red, font: GUI.LargeFont);
                     return false;
                 }
 #endif
@@ -1894,7 +1894,7 @@ namespace Barotrauma
 #if !DEBUG
                 if (VanillaCharacters != null && VanillaCharacters.Contains(currentCharacterConfig))
                 {
-                    GUI.AddMessage(GetCharacterEditorTranslation("CannotEditVanillaCharacters"), Color.Red, font: GUI.LargeFont);
+                    GUI.AddMessage(GetCharacterEditorTranslation("CantEditVanillaContent"), Color.Red, font: GUI.LargeFont);
                     return false;
                 }
 #endif
@@ -1966,7 +1966,7 @@ namespace Barotrauma
 #if !DEBUG
                     if (VanillaCharacters != null && VanillaCharacters.Contains(currentCharacterConfig))
                     {
-                        GUI.AddMessage(GetCharacterEditorTranslation("CannotEditVanillaCharacters"), Color.Red, font: GUI.LargeFont);
+                        GUI.AddMessage(GetCharacterEditorTranslation("CantEditVanillaContent"), Color.Red, font: GUI.LargeFont);
                         box.Close();
                         return false;
                     }
@@ -2099,7 +2099,7 @@ namespace Barotrauma
 #if !DEBUG
                     if (VanillaCharacters != null && VanillaCharacters.Contains(currentCharacterConfig))
                     {
-                        GUI.AddMessage(GetCharacterEditorTranslation("CannotEditVanillaCharacters"), Color.Red, font: GUI.LargeFont);
+                        GUI.AddMessage(GetCharacterEditorTranslation("CantEditVanillaContent"), Color.Red, font: GUI.LargeFont);
                         box.Close();
                         return false;
                     }

Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs

@@ -769,20 +769,6 @@ namespace Barotrauma
                 savePath = Path.Combine(Submarine.SavePath, savePath);
             }
 
-#if !DEBUG
-            var vanilla = GameMain.VanillaContent;
-            if (vanilla != null)
-            {
-                var vanillaSubs = vanilla.GetFilesOfType(ContentType.Submarine);
-                string pathToCompare = savePath.Replace(@"\", @"/").ToLowerInvariant();
-                if (vanillaSubs.Any(sub => sub.Replace(@"\", @"/").ToLowerInvariant() == pathToCompare))
-                {
-                    GUI.AddMessage(TextManager.Get("CannotEditVanillaSubs"), Color.Red, font: GUI.LargeFont);
-                    return false;
-                }
-            }
-#endif
-
             /*foreach (var contentPackage in GameMain.Config.SelectedContentPackages)
             {
                 Submarine.MainSub.RequiredContentPackages.Add(contentPackage.Name);