From dc4b50224873113344dedc11f361e7cd5ebb5601 Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Thu, 29 Oct 2015 00:59:00 +0200
Subject: [PATCH] "Infinite walls", converting old InputTypes in saved subs to
 new ones

---
 Subsurface/Barotrauma.csproj                  |   1 +
 Subsurface/Source/Characters/CharacterInfo.cs |   2 +-
 Subsurface/Source/Characters/Jobs/Job.cs      |   2 +-
 Subsurface/Source/GameMain.cs                 |   2 +-
 .../Source/Items/Components/ItemComponent.cs  |   8 +-
 .../Items/Components/Power/PowerTransfer.cs   |   2 +-
 Subsurface/Source/Map/Levels/Level.cs         | 150 ++++++++----------
 .../Source/Map/Levels/VoronoiElements.cs      |  31 ++++
 Subsurface/Source/Map/Levels/WrappingWall.cs  | 147 +++++++++++++++++
 Subsurface/Source/Map/Map.cs                  |   2 +-
 Subsurface/Source/Networking/GameServer.cs    |   2 +-
 Subsurface/Source/Screens/GameScreen.cs       |   2 +-
 Subsurface/Source/Screens/NetLobbyScreen.cs   |   4 +-
 Subsurface/Source/Screens/NetLobbySettings.cs |   3 +
 Subsurface/Source/Utils/ToolBox.cs            |  10 ++
 Subsurface_Solution.v12.suo                   | Bin 779776 -> 759296 bytes
 16 files changed, 277 insertions(+), 91 deletions(-)
 create mode 100644 Subsurface/Source/Map/Levels/WrappingWall.cs

diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj
index 3fadc6abb..48b0a5c18 100644
--- a/Subsurface/Barotrauma.csproj
+++ b/Subsurface/Barotrauma.csproj
@@ -95,6 +95,7 @@
     <Compile Include="Source\Items\Components\Signal\SignalCheckComponent.cs" />
     <Compile Include="Source\Items\Components\ItemLabel.cs" />
     <Compile Include="Source\Items\FixRequirement.cs" />
+    <Compile Include="Source\Map\Levels\WrappingWall.cs" />
     <Compile Include="Source\Map\Lights\LightSource.cs" />
     <Compile Include="Source\Map\LocationType.cs" />
     <Compile Include="Source\Map\SubmarineHull.cs" />
diff --git a/Subsurface/Source/Characters/CharacterInfo.cs b/Subsurface/Source/Characters/CharacterInfo.cs
index affe2a016..edbd7df7e 100644
--- a/Subsurface/Source/Characters/CharacterInfo.cs
+++ b/Subsurface/Source/Characters/CharacterInfo.cs
@@ -232,7 +232,7 @@ namespace Barotrauma
 
             File            = ToolBox.GetAttributeString(element, "file", "");
             Salary          = ToolBox.GetAttributeInt(element, "salary", 1000);
-            HeadSpriteId    = ToolBox.GetAttributeInt(element, "headspriteid", 1);
+            headSpriteId    = ToolBox.GetAttributeInt(element, "headspriteid", 1);
             StartItemsGiven = ToolBox.GetAttributeBool(element, "startitemsgiven", false);
 
             pickedItems = new List<ushort>();
diff --git a/Subsurface/Source/Characters/Jobs/Job.cs b/Subsurface/Source/Characters/Jobs/Job.cs
index 14b238896..24aad1fd9 100644
--- a/Subsurface/Source/Characters/Jobs/Job.cs
+++ b/Subsurface/Source/Characters/Jobs/Job.cs
@@ -79,7 +79,7 @@ namespace Barotrauma
         
         public static Job Random()
         {
-            JobPrefab prefab = JobPrefab.List[Rand.Int(JobPrefab.List.Count-1, false)];
+            JobPrefab prefab = JobPrefab.List[Rand.Int(JobPrefab.List.Count - 1, false)];
 
             return new Job(prefab);
         }
diff --git a/Subsurface/Source/GameMain.cs b/Subsurface/Source/GameMain.cs
index 73f08e5f7..165acfe56 100644
--- a/Subsurface/Source/GameMain.cs
+++ b/Subsurface/Source/GameMain.cs
@@ -39,7 +39,7 @@ namespace Barotrauma
         public static EditCharacterScreen   EditCharacterScreen;
 
         public static Lights.LightManager LightManager;
-
+        
         public static ContentPackage SelectedPackage
         {
             get { return Config.SelectedContentPackage; }
diff --git a/Subsurface/Source/Items/Components/ItemComponent.cs b/Subsurface/Source/Items/Components/ItemComponent.cs
index 3a7cb8744..618cee02b 100644
--- a/Subsurface/Source/Items/Components/ItemComponent.cs
+++ b/Subsurface/Source/Items/Components/ItemComponent.cs
@@ -182,7 +182,9 @@ namespace Barotrauma.Items.Components
 
             try
             {
-                SelectKey = (InputType)Enum.Parse(typeof(InputType), ToolBox.GetAttributeString(element, "selectkey", "Select"), true);
+                string selectKeyStr = ToolBox.GetAttributeString(element, "selectkey", "Select");
+                selectKeyStr = ToolBox.ConvertInputType(selectKeyStr);
+                SelectKey = (InputType)Enum.Parse(typeof(InputType), selectKeyStr, true);
             }
             catch (Exception e)
             {
@@ -193,7 +195,9 @@ namespace Barotrauma.Items.Components
 
             try
             {
-                PickKey = (InputType)Enum.Parse(typeof(InputType), ToolBox.GetAttributeString(element, "selectkey", "Select"), true);
+                string pickKeyStr = ToolBox.GetAttributeString(element, "selectkey", "Select");
+                pickKeyStr = ToolBox.ConvertInputType(pickKeyStr);
+                PickKey = (InputType)Enum.Parse(typeof(InputType),pickKeyStr, true);
             }
             catch (Exception e)
             {
diff --git a/Subsurface/Source/Items/Components/Power/PowerTransfer.cs b/Subsurface/Source/Items/Components/Power/PowerTransfer.cs
index 9c3ac914b..22fdcfc64 100644
--- a/Subsurface/Source/Items/Components/Power/PowerTransfer.cs
+++ b/Subsurface/Source/Items/Components/Power/PowerTransfer.cs
@@ -68,7 +68,7 @@ namespace Barotrauma.Items.Components
                             var particle = GameMain.ParticleManager.CreateParticle("spark", pt.item.Position,
                                 baseVel + Rand.Vector(100.0f), 0.0f);
 
-                            if (particle != null) particle.Size *= Rand.Range(0.5f,1.0f);
+                            if (particle != null) particle.Size *= Rand.Range(0.5f, 1.0f);
                         }
                     }
                 }
diff --git a/Subsurface/Source/Map/Levels/Level.cs b/Subsurface/Source/Map/Levels/Level.cs
index 0c01bc390..7e8eaeab6 100644
--- a/Subsurface/Source/Map/Levels/Level.cs
+++ b/Subsurface/Source/Map/Levels/Level.cs
@@ -33,6 +33,8 @@ namespace Barotrauma
         public const int GridCellWidth = 2000;
         private List<VoronoiCell>[,] cellGrid;
 
+        private WrappingWall[,] wrappingWalls;
+
         private float shaftHeight;
 
         //List<Body> bodies;
@@ -41,7 +43,7 @@ namespace Barotrauma
         private static BasicEffect basicEffect;
 
         private VertexPositionTexture[] vertices;
-        private VertexBuffer vertexBuffer;
+        //private VertexBuffer vertexBuffer;
 
         private Vector2 startPosition;
         private Vector2 endPosition;
@@ -156,16 +158,14 @@ namespace Barotrauma
 
             bodies = new List<Body>();
 
-            Random rand = new Random(ToolBox.StringToInt(seed));
+            Rand.SetSyncedSeed(ToolBox.StringToInt(seed));
 
-            float siteVariance = siteInterval * 0.8f;
+            float siteVariance = siteInterval * 0.4f;
             for (int x = siteInterval / 2; x < borders.Width; x += siteInterval)
             {
                 for (int y = siteInterval / 2; y < borders.Height; y += siteInterval)
                 {
-                    Vector2 site = new Vector2(
-                        x + (float)(rand.NextDouble() - 0.5) * siteVariance,
-                        y + (float)(rand.NextDouble() - 0.5) * siteVariance);
+                    Vector2 site = new Vector2(x, y) + Rand.Vector(siteVariance, false);
 
                     if (mirror) site.X = borders.Width - site.X;
 
@@ -232,8 +232,8 @@ namespace Barotrauma
 
             List<Vector2> pathNodes = new List<Vector2>();
 
-            startPosition = new Vector2((int)minWidth * 2, rand.Next((int)minWidth * 2, borders.Height - (int)minWidth * 2));
-            endPosition = new Vector2(borders.Width - (int)minWidth * 2, rand.Next((int)minWidth * 2, borders.Height - (int)minWidth * 2));
+            startPosition = new Vector2((int)minWidth * 2, Rand.Range((int)minWidth * 2, borders.Height - (int)minWidth * 2, false));
+            endPosition = new Vector2(borders.Width - (int)minWidth * 2, Rand.Range((int)minWidth * 2, borders.Height - (int)minWidth * 2, false));
 
             pathNodes.Add(new Vector2(startPosition.X, borders.Height));
             pathNodes.Add(startPosition);            
@@ -245,13 +245,12 @@ namespace Barotrauma
                 pathNodes.Reverse();
             }
 
-            List<VoronoiCell> pathCells = GeneratePath(rand,
-                pathNodes, cells, pathBorders, minWidth, 0.3f, mirror, true);
+            List<VoronoiCell> pathCells = GeneratePath(pathNodes, cells, pathBorders, minWidth, 0.3f, mirror, true);
 
             //place some enemy spawnpoints at random points in the path
             for (int i = 0; i <3 ; i++ )
             {
-                Vector2 position = pathCells[rand.Next((int)(pathCells.Count * 0.5f), pathCells.Count - 2)].Center;
+                Vector2 position = pathCells[Rand.Range((int)(pathCells.Count * 0.5f), pathCells.Count - 2, false)].Center;
                 WayPoint wayPoint = new WayPoint(new Rectangle((int)position.X, (int)position.Y, 10, 10));
                 wayPoint.MoveWithLevel = true;
                 wayPoint.SpawnType = SpawnType.Enemy;
@@ -261,22 +260,22 @@ namespace Barotrauma
             endPosition = pathCells[pathCells.Count - 1].Center;
 
             //generate a couple of random paths
-            for (int i = 0; i <= rand.Next() % 3; i++)
+            for (int i = 0; i <= Rand.Range(1,4,false); i++)
             {
                 //pathBorders = new Rectangle(
                 //borders.X + siteInterval * 2, borders.Y - siteInterval * 2,
                 //borders.Right - siteInterval * 2, borders.Y + borders.Height - siteInterval * 2);
 
-                Vector2 start = pathCells[rand.Next(1, pathCells.Count - 2)].Center;
+                Vector2 start = pathCells[Rand.Range(1, pathCells.Count - 2,false)].Center;
 
-                float x = pathBorders.X + (float)rand.NextDouble() * (pathBorders.Right - pathBorders.X);
-                float y = pathBorders.Y + (float)rand.NextDouble() * (pathBorders.Bottom - pathBorders.Y);
+                float x = pathBorders.X + Rand.Range(0, pathBorders.Right - pathBorders.X, false);
+                float y = pathBorders.Y + Rand.Range(0,pathBorders.Bottom - pathBorders.Y, false);
 
                 if (mirror) x = borders.Width - x;
 
                 Vector2 end = new Vector2(x, y);
 
-                var newPathCells = GeneratePath(rand, new List<Vector2> { start, end }, cells, pathBorders, 0.0f, 0.8f, mirror);
+                var newPathCells = GeneratePath(new List<Vector2> { start, end }, cells, pathBorders, 0.0f, 0.8f, mirror);
 
                 for (int n = 0; n < newPathCells.Count-5; n += 3)
                 {
@@ -321,26 +320,29 @@ namespace Barotrauma
 
             startPosition.Y = borders.Height;
             endPosition.Y = borders.Height;
-            //for (int i = 0; i < 2; i++)
-            //{
-            //    Vector2 tunnelStart = (i == 0) ? startPosition : endPosition;
 
-            //    for (int n = -1; n < 2; n += 2)
-            //    {
-            //        int cellIndex = FindCellIndex(new Vector2(tunnelStart.X + minWidth * 0.5f * n, tunnelStart.Y), 3);
+            vertices = GeneratePolygons(cells, pathCells);
+            
+            wrappingWalls = new WrappingWall[2, 2];
 
-            //        foreach (GraphEdge ge in cells[cellIndex].edges)
-            //        {
-            //            if (ge.point1.Y > cells[cellIndex].Center.Y) ge.point1.Y = borders.Height + shaftHeight;
-            //            if (ge.point2.Y > cells[cellIndex].Center.Y) ge.point2.Y = borders.Height + shaftHeight;
-            //        }
-            //    }
-            //}
+            for (int side = 0; side < 2; side++)
+            {
+                for (int i = 0; i < 2; i++)
+                {
+                    wrappingWalls[side, i] = new WrappingWall(pathCells, cells, borders.Height * 0.7f,
+                        (side == 0 ? -1 : 1) * (i == 0 ? 1 : 2));
 
-            //startPosition.Y += shaftHeight;
-            //endPosition.Y += shaftHeight;
+                    wrappingWalls[side, i].Vertices = GeneratePolygons(wrappingWalls[side, i].Cells, new List<VoronoiCell>());
+                }
 
-            GeneratePolygons(cells, pathCells);
+            }
+            for (int side = 0; side < 2; side++)
+            {
+                for (int i = 0; i < 2; i++)
+                {
+                    cells.AddRange(wrappingWalls[side, i].Cells);
+                }
+            }
 
             foreach (VoronoiCell cell in cells)
             {
@@ -357,8 +359,8 @@ namespace Barotrauma
             Debug.WriteLine("Generatelevel: " + sw2.ElapsedMilliseconds + " ms");
             sw2.Restart();
 
-            vertexBuffer = new VertexBuffer(GameMain.CurrGraphicsDevice, VertexPositionTexture.VertexDeclaration, vertices.Length, BufferUsage.WriteOnly);
-            vertexBuffer.SetData(vertices);
+            //vertexBuffer = new VertexBuffer(GameMain.CurrGraphicsDevice, VertexPositionTexture.VertexDeclaration, vertices.Length, BufferUsage.WriteOnly);
+            //vertexBuffer.SetData(vertices);
 
             if (mirror)
             {
@@ -370,7 +372,7 @@ namespace Barotrauma
             Debug.WriteLine("Generated a map with " + sites.Count + " sites in " + sw.ElapsedMilliseconds + " ms");
         }
 
-        private List<VoronoiCell> GeneratePath(Random rand, List<Vector2> points, List<VoronoiCell> cells, Microsoft.Xna.Framework.Rectangle limits, float minWidth, float wanderAmount = 0.3f, bool mirror=false, bool placeWaypoints=false)
+        private List<VoronoiCell> GeneratePath(List<Vector2> points, List<VoronoiCell> cells, Microsoft.Xna.Framework.Rectangle limits, float minWidth, float wanderAmount = 0.3f, bool mirror=false, bool placeWaypoints=false)
         {
             Stopwatch sw2 = new Stopwatch();
             sw2.Start();
@@ -390,15 +392,14 @@ namespace Barotrauma
             VoronoiCell currentCell = targetCells[0];
             pathCells.Add(currentCell);
 
-int currentTargetIndex = 1;
-            
+            int currentTargetIndex = 1;            
             
             do
             {
                 int edgeIndex = 0;
 
                 //steer towards target
-                if (rand.NextDouble() > wanderAmount)
+                if (Rand.Range(0.0f, 1.0f, false) > wanderAmount)
                 {
                     for (int i = 0; i < currentCell.edges.Count; i++)
                     {
@@ -420,11 +421,11 @@ int currentTargetIndex = 1;
                     }
                     if (allowedEdges.Count==0)
                     {
-                        edgeIndex = rand.Next() % currentCell.edges.Count;
+                        edgeIndex = Rand.Int(currentCell.edges.Count, false);
                     }
                     else
                     {
-                        edgeIndex = rand.Next() % allowedEdges.Count;
+                        edgeIndex = Rand.Int(allowedEdges.Count, false);
                         if (mirror && edgeIndex > 0) edgeIndex = allowedEdges.Count - edgeIndex;
                         edgeIndex = currentCell.edges.IndexOf(allowedEdges[edgeIndex]);
                     }
@@ -534,6 +535,7 @@ int currentTargetIndex = 1;
             return tooCloseCells;
         }
 
+
         /// <summary>
         /// remove all cells except those that are adjacent to the empty cells
         /// </summary>
@@ -579,13 +581,12 @@ int currentTargetIndex = 1;
                     }
                 }
             }
-
-
-
+            
             return cells.IndexOf(closestCell);
         }
 
-        private void GeneratePolygons(List<VoronoiCell> cells, List<VoronoiCell> emptyCells)
+
+        private VertexPositionTexture[] GeneratePolygons(List<VoronoiCell> cells, List<VoronoiCell> emptyCells)
         {
             List<VertexPositionTexture> verticeList = new List<VertexPositionTexture>();
             //bodies = new List<Body>();
@@ -606,7 +607,7 @@ int currentTargetIndex = 1;
                     if (!tempVertices.Contains(ge.point2)) tempVertices.Add(ge.point2);
 
                     VoronoiCell adjacentCell = ge.AdjacentCell(cell);
-                    if (!emptyCells.Contains(adjacentCell)) continue;
+                    if (adjacentCell!=null && !emptyCells.Contains(adjacentCell)) continue;
 
                     ge.isSolid = true;
 
@@ -680,7 +681,7 @@ int currentTargetIndex = 1;
                 bodies.Add(shaftBody);
             }
 
-                vertices = verticeList.ToArray();
+                return verticeList.ToArray();
         }
 
         public void SetPosition(Vector2 pos)
@@ -715,6 +716,8 @@ int currentTargetIndex = 1;
                     item.SetTransform(item.SimPosition+amount, item.body.Rotation);
                 }
             }
+
+            //WrappingWall.UpdateWallShift(Position, wrappingWalls);
         }
 
         Vector2 prevVelocity;
@@ -748,6 +751,8 @@ int currentTargetIndex = 1;
             AtEndPosition = Vector2.Distance(endPosition, -Position) < ExitDistance;
             
             prevVelocity = simVelocity;
+
+            WrappingWall.UpdateWallShift(-Position, wrappingWalls);
         }
 
         public static void AfterWorldStep()
@@ -802,38 +807,7 @@ int currentTargetIndex = 1;
 
             System.Diagnostics.Debug.WriteLine("pos: " + Position);
         }
-
-        Vector2 observerPosition;
-        public void SetObserverPosition(Vector2 position)
-        {
-            //observerPosition = position - this.Position;
-            //int gridPosX = (int)Math.Floor(observerPosition.X / GridCellWidth);
-            //int gridPosY = (int)Math.Floor(observerPosition.Y / GridCellWidth);
-            //int searchOffset = 2;
-
-            //int startX = Math.Max(gridPosX - searchOffset, 0);
-            //int endX = Math.Min(gridPosX + searchOffset, cellGrid.GetLength(0) - 1);
-
-            //int startY = Math.Max(gridPosY - searchOffset, 0);
-            //int endY = Math.Min(gridPosY + searchOffset, cellGrid.GetLength(1) - 1);
-
-            //for (int x = 0; x < cellGrid.GetLength(0); x++)
-            //{
-            //    for (int y = 0; y < cellGrid.GetLength(1); y++)
-            //    {
-            //        for (int i = 0; i < cellGrid[x, y].Count; i++)
-            //        {
-            //            //foreach (Body b in cellGrid[x, y][i].bodies)
-            //            //{
-            //            if (cellGrid[x, y][i].body == null) continue;
-            //            cellGrid[x, y][i].body.Enabled = true;// (x >= startX && x <= endX && y >= startY && y <= endY);
-            //            //}
-            //        }
-            //    }
-            //}
-        }
-
-
+        
         public void Draw(SpriteBatch spriteBatch)
         {
             Vector2 pos = endPosition;            
@@ -937,6 +911,22 @@ int currentTargetIndex = 1;
             graphicsDevice.SamplerStates[0] = SamplerState.LinearWrap;
 
             graphicsDevice.DrawUserPrimitives<VertexPositionTexture>(PrimitiveType.TriangleList, vertices, 0, (int)Math.Floor(vertices.Length / 3.0f));
+
+
+            for (int side = 0; side < 2; side++)
+            {
+                for (int i = 0; i < 2; i++)
+                {
+                    basicEffect.World = Matrix.CreateTranslation(new Vector3(Position + wrappingWalls[side, i].Offset, 0.0f)) * cam.ShaderTransform
+    * Matrix.CreateOrthographic(GameMain.GraphicsWidth, GameMain.GraphicsHeight, -1, 1) * 0.5f;
+
+                    basicEffect.CurrentTechnique.Passes[0].Apply();
+
+                    graphicsDevice.DrawUserPrimitives<VertexPositionTexture>(PrimitiveType.TriangleList,
+                        wrappingWalls[side, i].Vertices, 0, (int)Math.Floor(wrappingWalls[side, i].Vertices.Length / 3.0f));
+
+                }
+            }
         }
 
         private void Unload()
@@ -961,8 +951,8 @@ int currentTargetIndex = 1;
             bodies.Clear();
             bodies = null;
 
-            vertexBuffer.Dispose();
-            vertexBuffer = null;
+            //vertexBuffer.Dispose();
+            //vertexBuffer = null;
         }
 
     }
diff --git a/Subsurface/Source/Map/Levels/VoronoiElements.cs b/Subsurface/Source/Map/Levels/VoronoiElements.cs
index 5b96a33fe..af7980910 100644
--- a/Subsurface/Source/Map/Levels/VoronoiElements.cs
+++ b/Subsurface/Source/Map/Levels/VoronoiElements.cs
@@ -78,6 +78,11 @@ namespace Voronoi2
 	{
 		public Point coord;
 		public int sitenbr;
+
+        public void SetPoint(Vector2 point)
+        {
+            coord.setPoint(point.X, point.Y);
+        }
 		
 		public Site ()
 		{
@@ -130,6 +135,32 @@ namespace Voronoi2
             get { return new Vector2((float)site.coord.x, (float)site.coord.y); }
         }
 
+        public VoronoiCell(Vector2[] vertices)
+        {
+            edges = new List<GraphEdge>();
+            bodyVertices = new List<Vector2>();
+
+            Vector2 midPoint = Vector2.Zero;
+            foreach (Vector2 vertex in vertices)
+            {
+                midPoint += vertex;
+            }
+            midPoint /= vertices.Length;
+
+
+            for (int i = 1; i < vertices.Length; i++ )
+            {
+                GraphEdge ge = new GraphEdge();
+                ge.point1 = vertices[i-1];
+                ge.point2 = vertices[i];
+
+                edges.Add(ge);
+            }
+
+            site = new Site();
+            site.SetPoint(midPoint);
+        }
+
         public VoronoiCell(Site site)
         {
             edges = new List<GraphEdge>();
diff --git a/Subsurface/Source/Map/Levels/WrappingWall.cs b/Subsurface/Source/Map/Levels/WrappingWall.cs
new file mode 100644
index 000000000..d7050abc5
--- /dev/null
+++ b/Subsurface/Source/Map/Levels/WrappingWall.cs
@@ -0,0 +1,147 @@
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using Voronoi2;
+
+namespace Barotrauma
+{
+    class WrappingWall
+    {
+
+        const float wallWidth = 10000.0f;
+
+        public VertexPositionTexture[] Vertices;
+
+        private Vector2 midPos;
+        private int slot;
+
+        private Vector2 offset;
+
+        private List<VoronoiCell> cells;
+
+        public Vector2 Offset
+        {
+            get { return offset; }
+        }
+        
+        public List<VoronoiCell> Cells
+        {
+            get { return cells; }
+        }
+
+        public WrappingWall(List<VoronoiCell> pathCells, List<VoronoiCell> mapCells, float maxY, int dir = -1)
+        {
+            cells = new List<VoronoiCell>();
+
+            VoronoiCell lowestPathCell = null;
+            foreach (VoronoiCell pathCell in pathCells)
+            {
+                if (lowestPathCell == null || pathCell.Center.Y < lowestPathCell.Center.Y)
+                {
+                    lowestPathCell = pathCell;
+                }
+            }
+
+            float bottomY = Math.Max(lowestPathCell.Center.Y, maxY);
+
+            VoronoiCell edgeCell = null;
+            foreach (VoronoiCell cell in mapCells)
+            {
+                if (cell.Center.Y > bottomY) continue;
+                if (edgeCell == null
+                    || (dir < 0 && cell.Center.X < edgeCell.Center.X)
+                    || (dir > 0 && cell.Center.X > edgeCell.Center.X))
+                {
+                    edgeCell = cell;
+                }
+            }
+
+            Vector2 wallSectionSize = new Vector2(2000.0f, 2000.0f);
+            Vector2 startPos = (dir < 0) ?
+                edgeCell.Center + Vector2.UnitX * wallWidth * dir :
+                edgeCell.Center + wallWidth * Vector2.UnitX * (dir - 1);
+
+            midPos = startPos + Vector2.UnitX * wallWidth/2;
+
+            List<Vector2> bottomVertices = new List<Vector2>();
+
+            for (float x = 0; x <= wallWidth; x += wallSectionSize.X)
+            {
+                Vector2 center = new Vector2(startPos.X + x, edgeCell.Center.Y);
+                float distFromCenter = Math.Abs(x - wallWidth / 2);
+                float distFromEdge = wallWidth / 2 - distFromCenter;
+                float normalizedDist = distFromEdge / (wallWidth / 2);
+
+                float variance = 1000.0f * normalizedDist;
+                bottomVertices.Add(center + new Vector2(Rand.Range(-variance, variance, false), Rand.Range(-variance, variance, false)*5.0f));
+            }
+
+            for (int i = 1; i < bottomVertices.Count; i++)
+            {
+                Vector2[] vertices = new Vector2[4];
+                vertices[0] = bottomVertices[i];
+                vertices[1] = bottomVertices[i - 1];
+                vertices[2] = vertices[1] + Vector2.UnitY * wallSectionSize.Y;
+                vertices[3] = vertices[0] + Vector2.UnitY * wallSectionSize.Y;
+
+                VoronoiCell wallCell = new VoronoiCell(vertices);
+                cells.Add(wallCell);
+            }
+
+            //for (float x = 0; x<=wallWidth; x+=wallSectionSize.X)
+            //{
+            //    Vector2 center = new Vector2(startPos.X+x, edgeCell.Center.Y);
+
+            //    Vector2[] vertices = new Vector2[4];
+            //    vertices[0] = center - wallSectionSize / 2;
+            //    vertices[2] = center + wallSectionSize / 2;
+            //    vertices[1] = new Vector2(vertices[2].X, vertices[0].Y);
+            //    vertices[3] = new Vector2(vertices[0].X, vertices[2].Y);
+
+            //    VoronoiCell wallCell = new VoronoiCell(vertices);
+            //    wallCells.Add(wallCell);
+            //}
+
+        }
+
+
+        public static void UpdateWallShift(Vector2 pos, WrappingWall[,] walls)
+        {
+            if (pos.X < walls[0, 1].midPos.X && walls[0,0].midPos.X > pos.X)
+            {
+                walls[0, 0].Shift(-2);
+
+                var temp = walls[0, 0];
+                walls[0, 0] = walls[0, 1];
+                walls[0, 1] = temp;
+            }
+            else if (pos.X > walls[0, 0].midPos.X && walls[0,1].midPos.X < pos.X && walls[0,1].slot<0)
+            {
+                walls[0, 1].Shift(2);
+
+                var temp = walls[0, 0];
+                walls[0, 0] = walls[0, 1];
+                walls[0, 1] = temp;
+            }
+        }
+
+        public void Shift(int amount)
+        {
+            slot += amount;
+
+            Vector2 moveAmount = Vector2.UnitX * wallWidth * amount;
+            foreach (VoronoiCell cell in cells)
+            {
+                cell.body.SetTransform(cell.body.Position + moveAmount, 0.0f);
+            }
+
+            midPos += moveAmount;
+            offset += moveAmount;
+
+        }
+    }
+}
diff --git a/Subsurface/Source/Map/Map.cs b/Subsurface/Source/Map/Map.cs
index f23ab45c2..1871beac9 100644
--- a/Subsurface/Source/Map/Map.cs
+++ b/Subsurface/Source/Map/Map.cs
@@ -118,7 +118,7 @@ namespace Barotrauma
 
                     Vector2[] points = new Vector2[] { edge.point1, edge.point2 };
 
-                    int positionIndex = Rand.Int(1,false);
+                    int positionIndex = Rand.Int(1, false);
 
                     Vector2 position = points[positionIndex];
                     if (newLocations[1 - i] != null && newLocations[1 - i].MapPosition == position) position = points[1 - positionIndex];
diff --git a/Subsurface/Source/Networking/GameServer.cs b/Subsurface/Source/Networking/GameServer.cs
index a93011746..4f5918815 100644
--- a/Subsurface/Source/Networking/GameServer.cs
+++ b/Subsurface/Source/Networking/GameServer.cs
@@ -223,8 +223,8 @@ namespace Barotrauma.Networking
                     connectedClients.Find(c => c.character != null && !c.character.IsDead)==null &&
                    (myCharacter == null || myCharacter.IsDead))
                 {
-                    EndButtonHit(null, null);
                     AutoRestartTimer = 20.0f;
+                    EndButtonHit(null, null);                    
                     UpdateNetLobby(null,null);
                     return;
                 }
diff --git a/Subsurface/Source/Screens/GameScreen.cs b/Subsurface/Source/Screens/GameScreen.cs
index 102f35380..fb6c3acf0 100644
--- a/Subsurface/Source/Screens/GameScreen.cs
+++ b/Subsurface/Source/Screens/GameScreen.cs
@@ -292,7 +292,7 @@ namespace Barotrauma
             if (GameMain.GameSession != null && GameMain.GameSession.Level != null)
             {
                 GameMain.GameSession.Level.Render(graphics, cam);
-                GameMain.GameSession.Level.SetObserverPosition(cam.WorldViewCenter);
+                //GameMain.GameSession.Level.SetObserverPosition(cam.WorldViewCenter);
             }
 
             //----------------------------------------------------------------------------------------
diff --git a/Subsurface/Source/Screens/NetLobbyScreen.cs b/Subsurface/Source/Screens/NetLobbyScreen.cs
index aa7ac5d7a..c20f4216b 100644
--- a/Subsurface/Source/Screens/NetLobbyScreen.cs
+++ b/Subsurface/Source/Screens/NetLobbyScreen.cs
@@ -339,10 +339,10 @@ namespace Barotrauma
                 playerName.Text = characterInfo.Name;
                 playerName.OnEnterPressed += ChangeCharacterName;
 
-                GUIButton toggleHead = new GUIButton(new Rectangle(00, 50, 20, 20), "<", GUI.Style, myPlayerFrame);
+                GUIButton toggleHead = new GUIButton(new Rectangle(0, 50, 20, 20), "<", GUI.Style, myPlayerFrame);
                 toggleHead.UserData = -1;
                 toggleHead.OnClicked = ToggleHead;
-                toggleHead = new GUIButton(new Rectangle(40, 50, 20, 20), ">", GUI.Style, myPlayerFrame);
+                toggleHead = new GUIButton(new Rectangle(60, 50, 20, 20), ">", GUI.Style, myPlayerFrame);
                 toggleHead.UserData = 1;
                 toggleHead.OnClicked = ToggleHead;
 
diff --git a/Subsurface/Source/Screens/NetLobbySettings.cs b/Subsurface/Source/Screens/NetLobbySettings.cs
index 85b954910..91b21bff6 100644
--- a/Subsurface/Source/Screens/NetLobbySettings.cs
+++ b/Subsurface/Source/Screens/NetLobbySettings.cs
@@ -93,6 +93,9 @@ namespace Barotrauma.Networking
                 selectionTick.OnSelected = SwitchModeSelection;
                 selectionTick.UserData = (SelectionMode)i;
             }
+
+            var closeButton = new GUIButton(new Rectangle(0, 0, 100, 20), "Close", Alignment.BottomRight, GUI.Style, innerFrame);
+            closeButton.OnClicked = ToggleSettingsFrame;
         }
 
         private bool SwitchSubSelection(GUITickBox tickBox)
diff --git a/Subsurface/Source/Utils/ToolBox.cs b/Subsurface/Source/Utils/ToolBox.cs
index fffb718f4..ea76459eb 100644
--- a/Subsurface/Source/Utils/ToolBox.cs
+++ b/Subsurface/Source/Utils/ToolBox.cs
@@ -312,6 +312,16 @@ namespace Barotrauma
 
             return BitConverter.ToInt32(asciiBytes, 0);
         }
+        /// <summary>
+        /// a method for changing inputtypes with old names to the new ones to ensure backwards compatibility with older subs
+        /// </summary>
+        public static string ConvertInputType(string inputType)
+        {
+            if (inputType == "ActionHit" || inputType == "Action") return "Use";
+            if (inputType == "SecondarHit" || inputType == "Secondary") return "Aim";
+
+            return inputType;
+        }
         
         public static string WrapText(string text, float lineLength, SpriteFont font)
         {
diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo
index 5dd7e7f11fe3dcb46a7f41ee92b1afd0602ce7d0..90718df328817d612e3d26a759198da25cfd1401 100644
GIT binary patch
delta 5101
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
CFXX)d

delta 6880
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
CCLl=w