(ac9d10462) Take entity scale and flipping into account when dragging

Barotrauma/BarotraumaClient/Source/Items/ItemPrefab.cs

@@ -233,7 +233,7 @@ namespace Barotrauma
             }
         }
 
-        public override void DrawPlacing(SpriteBatch spriteBatch, Rectangle placeRect, float scale = 1.0f)
+        public override void DrawPlacing(SpriteBatch spriteBatch, Rectangle placeRect, float scale = 1.0f, SpriteEffects spriteEffects = SpriteEffects.None)
         {
             if (!ResizeHorizontal && !ResizeVertical)
             {

Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs

@@ -504,8 +504,19 @@ namespace Barotrauma
                 {
                     foreach (MapEntity e in selectedList)
                     {
+                        SpriteEffects spriteEffects = SpriteEffects.None;
+                        if (e is Item item)
+                        {
+                            if (item.FlippedX && item.Prefab.CanSpriteFlipX) spriteEffects ^= SpriteEffects.FlipHorizontally;
+                            if (item.flippedY && item.Prefab.CanSpriteFlipY) spriteEffects ^= SpriteEffects.FlipVertically;
+                        }
+                        else if (e is Structure structure)
+                        {
+                            if (structure.FlippedX && structure.Prefab.CanSpriteFlipX) spriteEffects ^= SpriteEffects.FlipHorizontally;
+                            if (structure.flippedY && structure.Prefab.CanSpriteFlipY) spriteEffects ^= SpriteEffects.FlipVertically;
+                        }
                         e.prefab?.DrawPlacing(spriteBatch,
-                            new Rectangle(e.WorldRect.Location + new Point((int)moveAmount.X, (int)-moveAmount.Y), e.WorldRect.Size), e.Scale);
+                            new Rectangle(e.WorldRect.Location + new Point((int)moveAmount.X, (int)-moveAmount.Y), e.WorldRect.Size), e.Scale, spriteEffects);
                         GUI.DrawRectangle(spriteBatch,
                             new Vector2(e.WorldRect.X, -e.WorldRect.Y) + moveAmount,
                             new Vector2(e.rect.Width, e.rect.Height),

Barotrauma/BarotraumaClient/Source/Map/MapEntityPrefab.cs

@@ -37,7 +37,7 @@ namespace Barotrauma
             }
         }
 
-        public virtual void DrawPlacing(SpriteBatch spriteBatch, Rectangle drawRect, float scale = 1.0f)
+        public virtual void DrawPlacing(SpriteBatch spriteBatch, Rectangle drawRect, float scale = 1.0f, SpriteEffects spriteEffects = SpriteEffects.None)
         {
             if (Submarine.MainSub != null)
             {

Barotrauma/BarotraumaClient/Source/Map/StructurePrefab.cs

@@ -32,10 +32,19 @@ namespace Barotrauma
             GUI.DrawRectangle(spriteBatch, new Rectangle(newRect.X, -newRect.Y - GameMain.GraphicsHeight, newRect.Width, newRect.Height + GameMain.GraphicsHeight * 2), Color.White);
         }
 
-        public override void DrawPlacing(SpriteBatch spriteBatch, Rectangle placeRect, float scale = 1.0f)
+        public override void DrawPlacing(SpriteBatch spriteBatch, Rectangle placeRect, float scale = 1.0f, SpriteEffects spriteEffects = SpriteEffects.None)
         {
-            // TODO: the scale property is not used
+            SpriteEffects oldEffects = sprite.effects;
-            sprite.DrawTiled(spriteBatch, new Vector2(placeRect.X, -placeRect.Y), new Vector2(placeRect.Width, placeRect.Height), color: Color.White * 0.8f, textureScale: TextureScale * Scale);
+            sprite.effects ^= spriteEffects;
+
+            sprite.DrawTiled(
+                spriteBatch, 
+                new Vector2(placeRect.X, -placeRect.Y), 
+                new Vector2(placeRect.Width, placeRect.Height), 
+                color: Color.White * 0.8f, 
+                textureScale: TextureScale * scale);
+
+            sprite.effects = oldEffects;
         }
     }
 }

Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs

@@ -95,6 +95,19 @@ namespace Barotrauma
             filterIncompatible = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.27f), tickBoxHolder.RectTransform), TextManager.Get("FilterIncompatibleServers"));
             filterIncompatible.OnSelected += (tickBox) => { FilterServers(); return true; };
 
+            var filterHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), leftColumn.RectTransform)) { RelativeSpacing = 0.05f };
+
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), filterHolder.RectTransform), TextManager.Get("FilterServers"));
+            searchBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.13f), filterHolder.RectTransform), "");
+
+            var tickBoxHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), filterHolder.RectTransform));
+
+            searchBox.OnTextChanged += (txtBox, txt) => { FilterServers(); return true; };
+            filterPassword = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.27f), tickBoxHolder.RectTransform), TextManager.Get("FilterPassword"));
+            filterPassword.OnSelected += (tickBox) => { FilterServers(); return true; };
+            filterIncompatible = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.27f), tickBoxHolder.RectTransform), TextManager.Get("FilterIncompatibleServers"));
+            filterIncompatible.OnSelected += (tickBox) => { FilterServers(); return true; };
+
             filterFull = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.27f), tickBoxHolder.RectTransform), TextManager.Get("FilterFullServers"));
             filterFull.OnSelected += (tickBox) => { FilterServers(); return true; };
             filterEmpty = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.27f), tickBoxHolder.RectTransform), TextManager.Get("FilterEmptyServers"));
@@ -152,58 +165,6 @@ namespace Barotrauma
                 Enabled = false
             };
 
-            //-------------------------------------------------------------------------------------
-            //right column
-            //-------------------------------------------------------------------------------------
-
-            var rightColumn = new GUILayoutGroup(new RectTransform(new Vector2(1.0f - leftColumn.RectTransform.RelativeSize.X - 0.017f, 1.0f),
-                paddedFrame.RectTransform, Anchor.CenterRight))
-            {
-                RelativeSpacing = 0.02f,
-                Stretch = true
-            };
-
-            var serverListHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 1.0f), rightColumn.RectTransform)) { Stretch = true, RelativeSpacing = 0.02f };
-
-            serverList = new GUIListBox(new RectTransform(new Vector2(1.0f, 1.0f), serverListHolder.RectTransform, Anchor.Center))
-            {
-                OnSelected = (btn, obj) => {
-                    ServerInfo serverInfo = (ServerInfo)obj;
-
-                    serverInfo.CreatePreviewWindow(serverPreview);
-
-                    return true;
-                }
-            };
-
-            serverList.OnSelected += SelectServer;
-
-            serverPreview = new GUIListBox(new RectTransform(new Vector2(1.0f, 1.0f), serverListHolder.RectTransform, Anchor.Center));
-
-            columnRelativeWidth = new float[] { 0.04f, 0.02f, 0.044f, 0.77f, 0.02f, 0.075f, 0.06f };
-
-            var buttonContainer = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.075f), rightColumn.RectTransform), style: null);
-
-            GUIButton button = new GUIButton(new RectTransform(new Vector2(0.25f, 0.9f), buttonContainer.RectTransform, Anchor.TopLeft),
-                TextManager.Get("Back"), style: "GUIButtonLarge")
-            {
-                OnClicked = GameMain.MainMenuScreen.ReturnToMainMenu
-            };
-
-			var refreshButton = new GUIButton(new RectTransform(new Vector2(buttonContainer.Rect.Height / (float)buttonContainer.Rect.Width, 0.9f), buttonContainer.RectTransform, Anchor.Center),
-				"", style: "GUIButtonRefresh") {
-
-				ToolTip = TextManager.Get("ServerListRefresh"),
-				OnClicked = RefreshServers
-			};
-
-            joinButton = new GUIButton(new RectTransform(new Vector2(0.25f, 0.9f), buttonContainer.RectTransform, Anchor.TopRight),
-                TextManager.Get("ServerListJoin"), style: "GUIButtonLarge")
-            {
-                OnClicked = JoinServer,
-                Enabled = false
-            };
-
             //--------------------------------------------------------
 
             button.SelectedColor = button.Color;
@@ -246,18 +207,6 @@ namespace Barotrauma
                     UserData = "noresults"
                 };
             }
-
-            return true;
-        }
-
-        private bool RefreshJoinButtonState(GUIComponent component, object obj)
-        {
-            if (obj == null || waitingForRefresh) return false;
-
-            if (!string.IsNullOrWhiteSpace(clientNameBox.Text) && !string.IsNullOrWhiteSpace(ipBox.Text))
-            {
-                joinButton.Enabled = true;
-            }
             else
             {
                 joinButton.Enabled = false;

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -185,6 +185,25 @@ namespace Barotrauma
             }
         }
 
+        public string DisplayName
+        {
+            get;
+            private set;
+        }
+
+        private string roomName;
+        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
+        public string RoomName
+        {
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
+        }
+
         public override Rectangle Rect
         {
             get