(bcb06cc5c) Unstable v0.9.9.0

Barotrauma/BarotraumaClient/ClientSource/Map/Levels/BackgroundCreatures/BackgroundCreaturePrefab.cs

@@ -39,7 +39,7 @@ namespace Barotrauma
 
             foreach (XElement subElement in element.Elements())
             {
-                if (subElement.Name.ToString().ToLowerInvariant() != "sprite") continue;
+                if (!subElement.Name.ToString().Equals("sprite", System.StringComparison.OrdinalIgnoreCase)) { continue; }
 
                 Sprite = new Sprite(subElement, lazyLoad: true);
                 break;

Barotrauma/BarotraumaClient/ClientSource/Map/Levels/Level.cs

@@ -1,7 +1,7 @@
 using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using FarseerPhysics.Dynamics;
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using FarseerPhysics;
@@ -54,7 +54,7 @@ namespace Barotrauma
             if (renderer == null) return;
             renderer.Draw(spriteBatch, cam);
 
-            if (GameMain.DebugDraw)
+            if (GameMain.DebugDraw && Screen.Selected.Cam.Zoom > 0.1f)
             {
                 foreach (InterestingPosition pos in positionsOfInterest)
                 {
@@ -78,6 +78,35 @@ namespace Barotrauma
 
                     GUI.DrawRectangle(spriteBatch, ruinArea, Color.DarkSlateBlue, false, 0, 5);
                 }
+
+                foreach (var positions in wreckPositions.Values)
+                {
+                    for (int i = 0; i < positions.Count; i++)
+                    {
+                        float t = (i + 1) / (float)positions.Count;
+                        float multiplier = MathHelper.Lerp(0, 1, t);
+                        Color color = Color.Red * multiplier;
+                        var pos = positions[i];
+                        pos.Y = -pos.Y;
+                        var size = new Vector2(100);
+                        GUI.DrawRectangle(spriteBatch, pos - size / 2, size, color, thickness: 10);
+                        if (i < positions.Count - 1)
+                        {
+                            var nextPos = positions[i + 1];
+                            nextPos.Y = -nextPos.Y;
+                            GUI.DrawLine(spriteBatch, pos, nextPos, color, width: 10);
+                        }
+                    }
+                }
+                foreach (var rects in blockedRects.Values)
+                {
+                    foreach (var rect in rects)
+                    {
+                        Rectangle newRect = rect;
+                        newRect.Y = -newRect.Y;
+                        GUI.DrawRectangle(spriteBatch, newRect, Color.Red, thickness: 5);
+                    }
+                }
             }
         }
 

Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelObjects/LevelObject.cs

@@ -126,7 +126,7 @@ namespace Barotrauma
             int j = 0;
             foreach (XElement subElement in Prefab.Config.Elements())
             {
-                if (subElement.Name.ToString().ToLowerInvariant() != "deformablesprite") continue;                
+                if (!subElement.Name.ToString().Equals("deformablesprite", StringComparison.OrdinalIgnoreCase)) { continue; }               
                 foreach (XElement animationElement in subElement.Elements())
                 {
                     var newDeformation = SpriteDeformation.Load(animationElement, Prefab.Name);

Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelObjects/LevelObjectPrefab.cs

@@ -4,6 +4,7 @@ using Barotrauma.SpriteDeformations;
 using Microsoft.Xna.Framework;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Xml.Linq;
 
 namespace Barotrauma
@@ -120,7 +121,7 @@ namespace Barotrauma
 
             SerializableProperty.SerializeProperties(this, element);
 
-            foreach (XElement subElement in element.Elements())
+            foreach (XElement subElement in element.Elements().ToList())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
@@ -139,7 +140,7 @@ namespace Barotrauma
                         break;
                 }
             }
-            
+
             foreach (LightSourceParams lightSourceParams in LightSourceParams)
             {
                 var lightElement = new XElement("LightSource");
@@ -160,7 +161,7 @@ namespace Barotrauma
                 bool elementFound = false;
                 foreach (XElement subElement in element.Elements())
                 {
-                    if (subElement.Name.ToString().ToLowerInvariant() == "overridecommonness"
+                    if (subElement.Name.ToString().Equals("overridecommonness", System.StringComparison.OrdinalIgnoreCase)
                         && subElement.GetAttributeString("leveltype", "") == overrideCommonness.Key)
                     {
                         subElement.Attribute("commonness").Value = overrideCommonness.Value.ToString("G", CultureInfo.InvariantCulture);

Barotrauma/BarotraumaClient/ClientSource/Map/Levels/LevelRenderer.cs

@@ -228,7 +228,7 @@ namespace Barotrauma
 
         public void Draw(SpriteBatch spriteBatch, Camera cam)
         {
-            if (GameMain.DebugDraw && cam.Zoom > 0.05f)
+            if (GameMain.DebugDraw && cam.Zoom > 0.1f)
             {
                 var cells = level.GetCells(cam.WorldViewCenter, 2);
                 foreach (VoronoiCell cell in cells)