Unstable v0.19.3.0

Barotrauma/BarotraumaClient/ClientSource/Map/Hull.cs

@@ -611,7 +611,7 @@ namespace Barotrauma
                 case DecalEventData decalEventData:
                     var decal = decalEventData.Decal;
                     int decalIndex = decals.IndexOf(decal);
-                    msg.Write((byte)(decalIndex < 0 ? 255 : decalIndex));
+                    msg.WriteByte((byte)(decalIndex < 0 ? 255 : decalIndex));
                     msg.WriteRangedSingle(decal.BaseAlpha, 0.0f, 1.0f, 8);
                     break;
                 default:

Barotrauma/BarotraumaClient/ClientSource/Map/MapEntity.cs

@@ -741,6 +741,15 @@ namespace Barotrauma
         /// </summary>
         public static void DrawSelecting(SpriteBatch spriteBatch, Camera cam)
         {
+            if (Screen.Selected is SubEditorScreen subEditor)
+            {
+                if (subEditor.IsMouseOnEditorGUI()) { return; }
+            }
+            else if (GUI.MouseOn != null) 
+            { 
+                return; 
+            }
+
             Vector2 position = PlayerInput.MousePosition;
             position = cam.ScreenToWorld(position);
 

Barotrauma/BarotraumaClient/ClientSource/Map/Structure.cs

@@ -37,17 +37,6 @@ namespace Barotrauma
             }
         }
 
-#if DEBUG
-        [Editable, Serialize("", IsPropertySaveable.Yes)]
-#else
-        [Serialize("", IsPropertySaveable.Yes)]
-#endif
-        public string SpecialTag
-        {
-            get;
-            set;
-        }
-
         partial void InitProjSpecific()
         {
             Prefab.Sprite?.EnsureLazyLoaded();

Barotrauma/BarotraumaClient/ClientSource/Map/StructurePrefab.cs

@@ -27,9 +27,10 @@ namespace Barotrauma
             
             if (placePosition == Vector2.Zero)
             {
-                if (PlayerInput.PrimaryMouseButtonClicked() && GUI.MouseOn == null)
+                if (PlayerInput.PrimaryMouseButtonHeld() && GUI.MouseOn == null)
+                {
                     placePosition = Submarine.MouseToWorldGrid(cam, Submarine.MainSub);
-
+                }
                 newRect.X = (int)position.X;
                 newRect.Y = (int)position.Y;
             }

Barotrauma/BarotraumaClient/ClientSource/Map/SubmarineInfo.cs

@@ -80,7 +80,8 @@ namespace Barotrauma
             {
                 UserData = "descriptionbox",
                 ScrollBarVisible = true,
-                Spacing = 5
+                Spacing = 5,
+                CurrentSelectMode = GUIListBox.SelectMode.None
             };
             
             GUIFont font = parent.Rect.Width < 350 ? GUIStyle.SmallFont : GUIStyle.Font;
@@ -92,22 +93,32 @@ namespace Barotrauma
         {
             float leftPanelWidth = 0.6f;
             float rightPanelWidth = 0.4f / leftPanelWidth;
-            LocalizedString className = !HasTag(SubmarineTag.Shuttle) ? TextManager.Get($"submarineclass.{SubmarineClass}") : TextManager.Get("shuttle");
+            LocalizedString className = !HasTag(SubmarineTag.Shuttle)
+                ? $"{TextManager.Get($"submarineclass.{SubmarineClass}")} ({TextManager.Get($"submarinetier.{Tier}")})"
+                : TextManager.Get("shuttle");
+
 
             int classHeight = (int)GUIStyle.SubHeadingFont.MeasureString(className).Y;
-            int leftPanelWidthInt = (int)(parent.Rect.Width * leftPanelWidth);
+            int leftPanelWidthInt = (int)(parent.Rect.Width * leftPanelWidth); 
 
             GUITextBlock submarineNameText = null;
             GUITextBlock submarineClassText = null;
             if (includeTitle)
             {
                 int nameHeight = (int)GUIStyle.LargeFont.MeasureString(DisplayName, true).Y;
-                submarineNameText = new GUITextBlock(new RectTransform(new Point(leftPanelWidthInt, nameHeight + HUDLayoutSettings.Padding / 2), parent.Content.RectTransform), DisplayName, textAlignment: Alignment.CenterLeft, font: GUIStyle.LargeFont) { CanBeFocused = false };
+                submarineNameText = new GUITextBlock(new RectTransform(new Point(leftPanelWidthInt, nameHeight + HUDLayoutSettings.Padding / 2), parent.Content.RectTransform), DisplayName, textAlignment: Alignment.CenterLeft, font: GUIStyle.LargeFont)
+                {
+                    CanBeFocused = false
+                };
                 submarineNameText.RectTransform.MinSize = new Point(0, (int)submarineNameText.TextSize.Y);
             }
             if (includeClass)
             {
-                submarineClassText = new GUITextBlock(new RectTransform(new Point(leftPanelWidthInt, classHeight), parent.Content.RectTransform), className, textAlignment: Alignment.CenterLeft, font: GUIStyle.SubHeadingFont) { CanBeFocused = false };
+                submarineClassText = new GUITextBlock(new RectTransform(new Point(leftPanelWidthInt, classHeight), parent.Content.RectTransform), className, textAlignment: Alignment.CenterLeft, font: GUIStyle.SubHeadingFont)
+                {
+                    ToolTip = TextManager.Get("submarinetierandclass.description")+"\n\n"+ TextManager.Get($"submarineclass.{SubmarineClass}.description")
+                };
+                submarineClassText.HoverColor = Color.Transparent;
                 submarineClassText.RectTransform.MinSize = new Point(0, (int)submarineClassText.TextSize.Y);
             }
 

Barotrauma/BarotraumaClient/ClientSource/Map/SubmarinePreview.cs

@@ -144,10 +144,11 @@ namespace Barotrauma
 
             specsContainer = new GUIListBox(new RectTransform(new Vector2(0.4f, 1f), innerPadded.RectTransform, Anchor.TopLeft) { RelativeOffset = new Vector2(0.015f, 0.07f) })
             {
+                CurrentSelectMode = GUIListBox.SelectMode.None,
                 Color = Color.Black * 0.65f,
                 ScrollBarEnabled = false,
                 ScrollBarVisible = false,
-                Spacing = 5
+                Spacing = GUI.IntScale(5)
             };
             subInfo.CreateSpecsWindow(specsContainer, GUIStyle.Font, includeTitle: false, includeDescription: true);
             int width = specsContainer.Rect.Width;