More background sprites again, sprite commonness can vary between different level types

Subsurface/Source/Characters/BackgroundSprite/BackgroundSpriteManager.cs

@@ -84,7 +84,7 @@ namespace Barotrauma
 
             for (int i = 0 ; i < amount; i++)
             {
-                BackgroundSpritePrefab prefab = GetRandomPrefab();
+                BackgroundSpritePrefab prefab = GetRandomPrefab(level.GenerationParams.Name);
                 GraphEdge selectedEdge = null;
                 Vector2? pos = FindSpritePosition(level, prefab, out selectedEdge);
 
@@ -131,14 +131,14 @@ namespace Barotrauma
             {
                 if (!edge.isSolid || edge.OutsideLevel) continue;
                 
-                if (prefab.Alignment.HasFlag(Alignment.Bottom))
+                if (prefab.Alignment.HasFlag(Alignment.Bottom) &&
+                    Math.Abs(edge.point1.X - edge.point2.X) < Math.Abs(edge.point1.Y - edge.point2.Y))
                 {
-                    if (Math.Abs(edge.point1.X - edge.point2.X) < Math.Abs(edge.point1.Y - edge.point2.Y)) continue;
                     if (edge.Center.Y < cell.Center.Y) edges.Add(edge);
                 }
-                else if (prefab.Alignment.HasFlag(Alignment.Top))
+                else if (prefab.Alignment.HasFlag(Alignment.Top) &&
+                    Math.Abs(edge.point1.X - edge.point2.X) < Math.Abs(edge.point1.Y - edge.point2.Y))
                 {
-                    if (Math.Abs(edge.point1.X - edge.point2.X) < Math.Abs(edge.point1.Y - edge.point2.Y)) continue;
                     if (edge.Center.Y > cell.Center.Y) edges.Add(edge);
                 }
                 else if (prefab.Alignment.HasFlag(Alignment.Left))
@@ -210,7 +210,10 @@ namespace Barotrauma
                             SpriteEffects.None, 
                             z);
 
-                        GUI.DrawRectangle(spriteBatch, new Vector2(sprite.Position.X, -sprite.Position.Y), new Vector2(10.0f, 10.0f), Color.Red, true);
+                        if (GameMain.DebugDraw)
+                        {
+                            GUI.DrawRectangle(spriteBatch, new Vector2(sprite.Position.X, -sprite.Position.Y), new Vector2(10.0f, 10.0f), Color.Red, true);
+                        }
 
                         z += 0.0001f;
                     }
@@ -218,24 +221,24 @@ namespace Barotrauma
             }
         }
 
-        private BackgroundSpritePrefab GetRandomPrefab()
+        private BackgroundSpritePrefab GetRandomPrefab(string levelType)
         {
             int totalCommonness = 0;
             foreach (BackgroundSpritePrefab prefab in prefabs)
             {
-                totalCommonness += prefab.Commonness;
+                totalCommonness += prefab.GetCommonness(levelType);
             }
 
             float randomNumber = Rand.Int(totalCommonness+1, false);
 
             foreach (BackgroundSpritePrefab prefab in prefabs)
             {
-                if (randomNumber <= prefab.Commonness)
+                if (randomNumber <= prefab.GetCommonness(levelType))
                 {
                     return prefab;
                 }
 
-                randomNumber -= prefab.Commonness;
+                randomNumber -= prefab.GetCommonness(levelType);
             }
 
             return null;

Subsurface/Source/Characters/BackgroundSprite/BackgroundSpritePrefab.cs

@@ -1,5 +1,6 @@
 using Microsoft.Xna.Framework;
 using System;
+using System.Collections.Generic;
 using System.Xml.Linq;
 
 namespace Barotrauma
@@ -20,11 +21,16 @@ namespace Barotrauma
 
         public readonly int Commonness;
 
+        public Dictionary<string, int> OverrideCommonness;
+
         public BackgroundSpritePrefab(XElement element)
         {
-            string alignmentStr = ToolBox.GetAttributeString(element, "alignment", "BottomCenter");
+            string alignmentStr = ToolBox.GetAttributeString(element, "alignment", "");
 
-            if (!Enum.TryParse(alignmentStr, out Alignment)) Alignment = Alignment.BottomCenter;
+            if (string.IsNullOrEmpty(alignmentStr) || !Enum.TryParse(alignmentStr, out Alignment))
+            {
+                Alignment = Alignment.Top | Alignment.Bottom | Alignment.Left | Alignment.Right;
+            }
 
             Commonness = ToolBox.GetAttributeInt(element, "commonness", 1);
 
@@ -39,14 +45,37 @@ namespace Barotrauma
 
             SwingAmount = MathHelper.ToRadians(ToolBox.GetAttributeFloat(element, "swingamount", 0.0f));
 
+            OverrideCommonness = new Dictionary<string, int>();
+
             foreach (XElement subElement in element.Elements())
             {
-                if (subElement.Name.ToString().ToLowerInvariant() != "sprite") continue;
+                switch(subElement.Name.ToString().ToLowerInvariant())
+                {
+                    case "sprite":
+                        Sprite = new Sprite(subElement);
+                        break;
+                    case "overridecommonness":
+                        string levelType = ToolBox.GetAttributeString(subElement, "leveltype", "");
+                        if (!OverrideCommonness.ContainsKey(levelType))
+                        {
+                            OverrideCommonness.Add(levelType, ToolBox.GetAttributeInt(subElement, "commonness", 1));
+                        }
+                        break;
 
-                Sprite = new Sprite(subElement);
-                break;
+                }
             }
         }
 
+        public int GetCommonness(string levelType)
+        {
+            int commonness = 0;
+            if (!OverrideCommonness.TryGetValue(levelType, out commonness))
+            {
+                return Commonness;
+            }
+
+            return commonness;
+        }
+
     }
 }

Subsurface/Source/Map/Levels/Level.cs

@@ -119,6 +119,11 @@ namespace Barotrauma
             private set;
         }
 
+        public LevelGenerationParams GenerationParams
+        {
+            get { return generationParams; }
+        }
+
         public Color BackgroundColor
         {
             get { return backgroundColor; }