(c1468d39d) Overhauled docking interface (WIP)

Barotrauma/BarotraumaShared/Source/Map/Explosion.cs

@@ -40,7 +40,7 @@ namespace Barotrauma
             flames = true;
             underwaterBubble = true;
         }
-        
+
         public Explosion(XElement element, string parentDebugName)
         {
             attack = new Attack(element, parentDebugName + ", Explosion");
@@ -62,16 +62,6 @@ namespace Barotrauma
             CameraShake = element.GetAttributeFloat("camerashake", attack.Range * 0.1f);
         }
 
-        public void DisableParticles()
-        {
-            sparks = false;
-            shockwave = false;
-            smoke = false;
-            flash = false;
-            flames = false;
-            underwaterBubble = false;
-        }
-
         public List<Triplet<Explosion, Vector2, float>> GetRecentExplosions(float maxSecondsAgo)
         {
             return prevExplosions.FindAll(e => e.Third >= Timing.TotalTime - maxSecondsAgo);

Barotrauma/BarotraumaShared/Source/Map/FireSource.cs

@@ -14,15 +14,15 @@ namespace Barotrauma
     {
         const float OxygenConsumption = 50.0f;
         const float GrowSpeed = 5.0f;
+        
+        private Hull hull;
 
-        protected Hull hull;
-
-        protected Vector2 position;
-        protected Vector2 size;
+        private Vector2 position;
+        private Vector2 size;
 
         private Entity Submarine;
 
-        protected bool removed;
+        private bool removed;
 
 #if CLIENT
         private List<Decal> burnDecals = new List<Decal>();
@@ -182,16 +182,6 @@ namespace Barotrauma
             }
         }
 
-        protected virtual void ReduceOxygen(float deltaTime)
-        {
-            hull.Oxygen -= size.X * deltaTime * OxygenConsumption;
-        }
-
-        protected virtual void AdjustXPos(float growModifier, float deltaTime)
-        {
-            position.X -= GrowSpeed * growModifier * 0.5f * deltaTime;
-        }
-
         partial void UpdateProjSpecific(float growModifier);
 
         private void OnChangeHull(Vector2 pos, Hull particleHull)

Barotrauma/BarotraumaShared/Source/Map/Levels/Level.cs

@@ -138,9 +138,6 @@ namespace Barotrauma
         public Submarine StartOutpost { get; private set; }
         public Submarine EndOutpost { get; private set; }
 
-        private Submarine preSelectedStartOutpost;
-        private Submarine preSelectedEndOutpost;
-
         public string Seed
         {
             get { return seed; }
@@ -212,7 +209,7 @@ namespace Barotrauma
         /// </summary>
         /// <param name="difficulty">A scalar between 0-100</param>
         /// <param name="sizeFactor">A scalar between 0-1 (0 = the minimum width defined in the generation params is used, 1 = the max width is used)</param>
-        public Level(string seed, float difficulty, float sizeFactor, LevelGenerationParams generationParams, Biome biome, Submarine startOutpost = null, Submarine endOutPost = null)
+        public Level(string seed, float difficulty, float sizeFactor, LevelGenerationParams generationParams, Biome biome)
             : base(null)
         {
 
@@ -228,9 +225,6 @@ namespace Barotrauma
                 (width / GridCellSize) * GridCellSize,
                 (generationParams.Height / GridCellSize) * GridCellSize);
 
-            preSelectedStartOutpost = startOutpost;
-            preSelectedEndOutpost = endOutPost;
-
             //remove from entity dictionary
             base.Remove();
         }
@@ -1516,24 +1510,14 @@ namespace Barotrauma
                     continue;
                 }
 
-                //only create a starting outpost in campaign and tutorial modes
-                if (!IsModeStartOutpostCompatible() && ((i == 0) == !Mirrored))
+                //only create a starting outpost in campaign mode
+                if (GameMain.GameSession?.GameMode as CampaignMode == null && ((i == 0) == !Mirrored))
                 {
                     continue;
                 }
-
-                Submarine outpost = null;
-
-                if (i == 0 && preSelectedStartOutpost == null || i == 1 && preSelectedEndOutpost == null)
-                {
-                    string outpostFile = outpostFiles.GetRandom(Rand.RandSync.Server);
-                    outpost = new Submarine(outpostFile, tryLoad: false);
-                }
-                else
-                {
-                    outpost = (i == 0) ? preSelectedStartOutpost : preSelectedEndOutpost;
-                }
-
+                
+                string outpostFile = outpostFiles.GetRandom(Rand.RandSync.Server);
+                var outpost = new Submarine(outpostFile, tryLoad: false);
                 outpost.Load(unloadPrevious: false);
                 outpost.MakeOutpost();
 
@@ -1585,15 +1569,6 @@ namespace Barotrauma
             }            
         }
 
-        private bool IsModeStartOutpostCompatible()
-        {
-#if CLIENT
-            return GameMain.GameSession?.GameMode as CampaignMode != null || GameMain.GameSession?.GameMode as TutorialMode != null;
-#else
-            return GameMain.GameSession?.GameMode as CampaignMode != null;
-#endif
-        }
-
         public override void Remove()
         {
             base.Remove();

Barotrauma/BarotraumaShared/Source/Map/Structure.cs

@@ -635,6 +635,24 @@ namespace Barotrauma
                 var character = ((Limb)f2.Body.UserData).character;
                 if (character.DisableImpactDamageTimer > 0.0f || ((Limb)f2.Body.UserData).Mass < 100.0f) return true;
             }
+            
+            if (!Prefab.Platform && Prefab.StairDirection == Direction.None)
+            {
+                Vector2 pos = ConvertUnits.ToDisplayUnits(f2.Body.Position);
+
+                int section = FindSectionIndex(pos);
+                if (section > -1)
+                {
+                    Vector2 normal = contact.Manifold.LocalNormal;
+
+                    float impact = Vector2.Dot(f2.Body.LinearVelocity, -normal) * f2.Body.Mass * 0.1f;
+                    if (impact < 10.0f) return true;
+#if CLIENT
+                    SoundPlayer.PlayDamageSound("StructureBlunt", impact, SectionPosition(section, true), tags: Tags);                    
+#endif
+                    AddDamage(section, impact);                 
+                }
+            }
 
             OnImpactProjSpecific(f1, f2, contact);
 

Barotrauma/BarotraumaShared/Source/Map/Submarine.cs

@@ -431,12 +431,6 @@ namespace Barotrauma
                         else if (ic is Pickable pickable)
                         {
                             //prevent picking up (or deattaching) items
-#if CLIENT
-                            if (GameMain.GameSession?.GameMode is TutorialMode)
-                            {
-                                continue;
-                            }
-#endif
                             pickable.CanBePicked = false;
                             pickable.CanBeSelected = false;
                         }
@@ -542,6 +536,20 @@ namespace Barotrauma
                 {
                     maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
                 }
+                else
+                {
+                    maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
+                }
+            }
+            
+            if (minX < 0.0f && maxX > Level.Loaded.Size.X)
+            {
+                //no walls found at either side, just use the initial spawnpos and hope for the best
+            }
+            else if (minX < 0)
+            {
+                //no wall found at the left side, spawn to the left from the right-side wall
+                spawnPos.X = maxX - minWidth - 100.0f + subDockingPortOffset;
             }
             
             if (minX < 0.0f && maxX > Level.Loaded.Size.X)

Barotrauma/BarotraumaShared/Source/Map/SubmarineBody.cs

@@ -468,7 +468,7 @@ namespace Barotrauma
 
             var gaps = newHull?.ConnectedGaps ?? Gap.GapList.Where(g => g.Submarine == submarine);
             targetPos = character.WorldPosition;
-            Gap adjacentGap = Gap.FindAdjacent(gaps, targetPos, 500.0f);
+            Gap adjacentGap = Gap.FindAdjacent(gaps, targetPos, 200.0f);
             if (adjacentGap == null) return true;
 
             if (newHull != null)