(4b33eda28) Merge branch 'dev' into enemy-ai

2019-03-25 19:49:34 +02:00
parent 7d74b5bd52
commit 26594e2c6c
31 changed files with 207 additions and 148 deletions
@@ -231,7 +231,7 @@ namespace Barotrauma

        public static Level CreateRandom(LocationConnection locationConnection)
        {
-            string seed = locationConnection.Locations[0].Name + locationConnection.Locations[1].Name;
+            string seed = locationConnection.Locations[0].BaseName + locationConnection.Locations[1].BaseName;

            float sizeFactor = MathUtils.InverseLerp(
                MapGenerationParams.Instance.SmallLevelConnectionLength,