(3dc4135ce) v0.9.5.1

Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/BTRoom.cs

@@ -40,12 +40,24 @@ namespace Barotrauma.RuinGeneration
             this.rect = rect;
         }
 
-        public void Split(float minDivRatio, float verticalProbability = 0.5f, int minWidth = 200)
+        public void Split(float minDivRatio, float verticalProbability = 0.5f, int minWidth = 200, int minHeight = 200)
         {
-            subRooms = new BTRoom[2];
+            bool verticalSplit = Rand.Range(0.0f, rect.Height / (float)rect.Width, Rand.RandSync.Server) < verticalProbability;
+            if (rect.Width * minDivRatio < minWidth && rect.Height * minDivRatio < minHeight)
+            {
+                minDivRatio = 0.5f;
+            }
+            else if (rect.Width * minDivRatio < minWidth)
+            {
+                verticalSplit = false;
+            }
+            else if (rect.Height * minDivRatio < minHeight)
+            {
+                verticalSplit = true;
+            }
 
-            if (Rand.Range(0.0f, rect.Height / (float)rect.Width, Rand.RandSync.Server) < verticalProbability && 
-                rect.Width * minDivRatio >= minWidth)
+            subRooms = new BTRoom[2];
+            if (verticalSplit)
             {
                 SplitVertical(minDivRatio);
             }

Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerationParams.cs

@@ -69,12 +69,18 @@ namespace Barotrauma.RuinGeneration
             set;
         }
 
-        [Serialize(400, false, description: "The splitting algorithm attempts to keep the dimensions the split areas larger than this. For example, if the width of the split areas would be smaller than this after a vertical split, the algorithm will do a horizontal split."), Editable]
+        [Serialize(400, false, description: "The splitting algorithm attempts to keep the width of the split areas larger than this. If the width of the split areas would be smaller than this after a vertical split, the algorithm would do a horizontal split."), Editable]
         public int MinSplitWidth
         {
             get;
             set;
         }
+        [Serialize(400, false, description: "The splitting algorithm attempts to keep the height of the split areas larger than this. If the height of the split areas would be smaller than this after a vertical split, the algorithm would do a horizontal split."), Editable]
+        public int MinSplitHeight
+        {
+            get;
+            set;
+        }
 
         [Serialize("0.5,0.9", false, description: "The minimum and maximum width of a room relative to the areas created by the split algorithm."), Editable]
         public Vector2 RoomWidthRange

Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerator.cs

@@ -239,7 +239,7 @@ namespace Barotrauma.RuinGeneration
 
             for (int i = 0; i < iterations; i++)
             {
-                rooms.ForEach(l => l.Split(0.3f, verticalProbability, generationParams.MinSplitWidth));
+                rooms.ForEach(l => l.Split(0.3f, verticalProbability, generationParams.MinSplitWidth, generationParams.MinSplitHeight));
                 rooms = baseRoom.GetLeaves();
             }
 
@@ -559,6 +559,11 @@ namespace Barotrauma.RuinGeneration
                                     foreach (MapEntity e in entities)
                                     {
                                         e.Move(doorOffset);
+                                        Door doorComponent = (e as Item)?.GetComponent<Door>();
+                                        if (doorComponent != null && !entities.Contains(doorComponent.LinkedGap))
+                                        {
+                                            doorComponent.LinkedGap.Move(doorOffset);
+                                        }
                                     }
                                 }
                             }