(e3f5b70a3) Updated vanilla sub preview images (resolution 1024 x 448-512)

Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs

@@ -60,12 +60,19 @@ namespace Barotrauma
 
         public CrewManager(XElement element, bool isSinglePlayer)
             : this(isSinglePlayer)
+        {
+            return characterListBox.Rect;
+        }
+
+        partial void InitProjectSpecific()
         {
             guiFrame = new GUIFrame(new RectTransform(Vector2.One, GUICanvas.Instance), null, Color.Transparent)
             {
                 CanBeFocused = false
             };
 
+            Point scrollButtonSize = new Point((int)(200 * GUI.Scale), (int)(30 * GUI.Scale));
+
                 var characterInfo = new CharacterInfo(subElement);
                 characterInfos.Add(characterInfo);
                 foreach (XElement invElement in subElement.Elements())
@@ -125,16 +132,6 @@ namespace Barotrauma
             prevUIScale = GUI.Scale;
         }
 
-
-        #endregion
-
-        #region Character list management
-
-        public Rectangle GetCharacterListArea()
-        {
-            return characterListBox.Rect;
-        }
-
         partial void InitProjectSpecific()
         {
             guiFrame = new GUIFrame(new RectTransform(Vector2.One, GUICanvas.Instance), null, Color.Transparent)

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

@@ -234,6 +234,85 @@ namespace Barotrauma.Items.Components
             private set;
         }
 
+        private bool useAlternativeLayout;
+        public bool UseAlternativeLayout
+        {
+            get { return useAlternativeLayout; }
+            set
+            {
+                if (AlternativeLayout != null)
+                {
+                    if (value == useAlternativeLayout) { return; }
+                    useAlternativeLayout = value;
+                    if (useAlternativeLayout)
+                    {
+                        AlternativeLayout?.ApplyTo(GuiFrame.RectTransform);
+                    }
+                    else
+                    {
+                        DefaultLayout?.ApplyTo(GuiFrame.RectTransform);
+                    }
+                }
+            }
+
+            public void ApplyTo(RectTransform target)
+            {
+                if (RelativeOffset.HasValue)
+                {
+                    target.RelativeOffset = RelativeOffset.Value;
+                }
+                else if (AbsoluteOffset.HasValue)
+                {
+                    target.AbsoluteOffset = AbsoluteOffset.Value;
+                }
+                if (RelativeSize.HasValue)
+                {
+                    target.RelativeSize = RelativeSize.Value;
+                }
+                else if (AbsoluteSize.HasValue)
+                {
+                    target.NonScaledSize = AbsoluteSize.Value;
+                }
+                if (Anchor.HasValue)
+                {
+                    target.Anchor = Anchor.Value;
+                }
+                if (Pivot.HasValue)
+                {
+                    target.Pivot = Pivot.Value;
+                }
+                else
+                {
+                    target.Pivot = RectTransform.MatchPivotToAnchor(target.Anchor);
+                }
+                target.RecalculateChildren(true, true);
+            }
+        }
+
+        public GUIFrame GuiFrame { get; protected set; }
+
+        [Serialize(false, false)]
+        public bool AllowUIOverlap
+        {
+            get;
+            set;
+        }
+
+        private ItemComponent linkToUIComponent;
+        [Serialize("", false)]
+        public string LinkUIToComponent
+        {
+            get;
+            set;
+        }
+
+        [Serialize(0, false)]
+        public int HudPriority
+        {
+            get;
+            private set;
+        }
+
         private bool shouldMuffleLooping;
         private float lastMuffleCheckTime;
         private ItemSound loopingSound;

Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs

@@ -1090,9 +1090,6 @@ namespace Barotrauma
                     }
                 };
             }
-            
-            var contentPackagesLabel = new GUITextBlock(new RectTransform(new Vector2(0.45f, 0.0f), horizontalArea.RectTransform, Anchor.TopCenter, Pivot.TopLeft), 
-                TextManager.Get("RequiredContentPackages"), font: GUI.SmallFont);
 
             var contentPackagesLabel = new GUITextBlock(new RectTransform(new Vector2(0.5f, 0.0f), horizontalArea.RectTransform, Anchor.TopRight),
                 TextManager.Get("RequiredContentPackages"), font: GUI.SmallFont);
@@ -1104,10 +1101,21 @@ namespace Barotrauma
             List<string> contentPacks = Submarine.MainSub.RequiredContentPackages.ToList();
             foreach (ContentPackage contentPack in ContentPackage.List)
             {
-                if (!contentPacks.Contains(contentPack.Name)) contentPacks.Add(contentPack.Name);
+                if (nameBox.Text.Contains(illegalChar))
+                {
+                    GUI.AddMessage(TextManager.Get("ItemAssemblyNameIllegalCharsWarning").Replace("[illegalchar]", illegalChar.ToString()), Color.Red);
+                    nameBox.Flash();
+                    return false;
+                }
             }
 
-            foreach (string contentPackageName in contentPacks)
+            var hideInMenusTickBox = nameBox.Parent.GetChildByUserData("hideinmenus") as GUITickBox;
+            bool hideInMenus = hideInMenusTickBox == null ? false : hideInMenusTickBox.Selected;
+            
+            string saveFolder = Path.Combine("Content", "Items", "Assemblies");
+            string filePath = Path.Combine(saveFolder, nameBox.Text + ".xml");
+
+            if (File.Exists(filePath))
             {
                 var cpTickBox = new GUITickBox(new RectTransform(new Vector2(0.2f, 0.2f), contentPackList.Content.RectTransform), contentPackageName, font: GUI.SmallFont)
                 {
@@ -1126,9 +1134,12 @@ namespace Barotrauma
                     }
                     return true;
                 };
+                msgBox.Buttons[1].OnClicked = msgBox.Close;
+            }
+            else
+            {
+                Save();
             }
-            
-            var crewSizeArea = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.05f), paddedSaveFrame.RectTransform), isHorizontal: true) { AbsoluteSpacing = 5 };
 
 
             var buttonArea = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.05f), paddedSaveFrame.RectTransform, Anchor.BottomCenter, minSize: new Point(0, 30)), style: null);
@@ -1148,8 +1159,6 @@ namespace Barotrauma
             {
                 OnClicked = SaveSub
             };
-            
-            var crewExpArea = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.05f), paddedSaveFrame.RectTransform), isHorizontal: true) { AbsoluteSpacing = 5 };
 
         }
 
@@ -1170,6 +1179,7 @@ namespace Barotrauma
                 AbsoluteSpacing = 5,
                 Stretch = true
             };
+#endif
 
             new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedSaveFrame.RectTransform),                 
                 TextManager.Get("SaveItemAssemblyDialogHeader"), font: GUI.LargeFont);
@@ -1266,70 +1276,16 @@ namespace Barotrauma
             return false;
         }
 
-
+        private bool SaveAssembly(GUIButton button, object obj)
-        private void CreateSaveAssemblyScreen()
         {
             if (CharacterMode) SetCharacterMode(false);
             if (WiringMode) SetWiringMode(false);
 
-            saveFrame = new GUIButton(new RectTransform(Vector2.One, GUI.Canvas), style: "GUIBackgroundBlocker")
+            loadFrame = new GUIButton(new RectTransform(Vector2.One, GUI.Canvas), style: "GUIBackgroundBlocker")
             {
-                OnClicked = (btn, userdata) => { if (GUI.MouseOn == btn || GUI.MouseOn == btn.TextBlock) saveFrame = null; return true; }
+                OnClicked = (btn, userdata) => { if (GUI.MouseOn == btn || GUI.MouseOn == btn.TextBlock) loadFrame = null; return true; },
             };
 
-            var innerFrame = new GUIFrame(new RectTransform(new Vector2(0.25f, 0.3f), saveFrame.RectTransform, Anchor.Center) { MinSize = new Point(400, 300) });
-            GUILayoutGroup paddedSaveFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.9f), innerFrame.RectTransform, Anchor.Center))
-            {
-                AbsoluteSpacing = 5,
-                Stretch = true
-            };
-
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedSaveFrame.RectTransform),                 
-                TextManager.Get("SaveItemAssemblyDialogHeader"), font: GUI.LargeFont);
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedSaveFrame.RectTransform), 
-                TextManager.Get("SaveItemAssemblyDialogName"));
-            nameBox = new GUITextBox(new RectTransform(new Vector2(0.6f, 0.1f), paddedSaveFrame.RectTransform));
-
-#if DEBUG
-            new GUITickBox(new RectTransform(new Vector2(1.0f, 0.1f), paddedSaveFrame.RectTransform), TextManager.Get("SaveItemAssemblyHideInMenus"))
-            {
-                UserData = "hideinmenus"
-            };
-#endif
-
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedSaveFrame.RectTransform), 
-                TextManager.Get("SaveItemAssemblyDialogDescription"));
-            descriptionBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.3f), paddedSaveFrame.RectTransform))
-            {
-                UserData = "description",
-                Wrap = true,
-                Text = ""
-            };
-            
-            var buttonArea = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.1f), paddedSaveFrame.RectTransform, Anchor.BottomCenter),
-                isHorizontal: true, childAnchor: Anchor.BottomRight);
-            new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), buttonArea.RectTransform),
-                TextManager.Get("Cancel"))
-            {
-                OnClicked = (GUIButton btn, object userdata) =>
-                {
-                    saveFrame = null;
-                    return true;
-                }
-            };
-            new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), buttonArea.RectTransform),
-                TextManager.Get("SaveSubButton"))
-            {
-                OnClicked = SaveAssembly
-            };
-        }
-
-        private bool SaveAssembly(GUIButton button, object obj)
-        {
-            if (string.IsNullOrWhiteSpace(nameBox.Text))
-            {
-                GUI.AddMessage(TextManager.Get("ItemAssemblyNameMissingWarning"), Color.Red);
-
             loadFrame = new GUIButton(new RectTransform(Vector2.One, GUI.Canvas), style: "GUIBackgroundBlocker")
             {
                 OnClicked = (btn, userdata) => { if (GUI.MouseOn == btn || GUI.MouseOn == btn.TextBlock) loadFrame = null; return true; },

Barotrauma/BarotraumaShared/Source/Map/Submarine.cs

@@ -533,34 +533,6 @@ namespace Barotrauma
                 {
                     maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
                 }
-                else
-                {
-                    maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
-                }
-                else
-                {
-                    maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
-                }
-            }
-            
-            if (minX < 0.0f && maxX > Level.Loaded.Size.X)
-            {
-                //no walls found at either side, just use the initial spawnpos and hope for the best
-            }
-            else if (minX < 0)
-            {
-                //no wall found at the left side, spawn to the left from the right-side wall
-                spawnPos.X = maxX - minWidth - 100.0f + subDockingPortOffset;
-            }
-            else if (maxX > Level.Loaded.Size.X)
-            {
-                //no wall found at right side, spawn to the right from the left-side wall
-                spawnPos.X = minX + minWidth + 100.0f + subDockingPortOffset;
-            }
-            
-            if (minX < 0.0f && maxX > Level.Loaded.Size.X)
-            {
-                //no walls found at either side, just use the initial spawnpos and hope for the best
             }
             
             if (minX < 0.0f && maxX > Level.Loaded.Size.X)