Unstable 0.1500.6.0 (1984 edition)

2021-10-09 00:22:02 +09:00
parent 08bdfc6cea
commit c8943ef9c4
96 changed files with 1817 additions and 559 deletions
@@ -914,9 +914,11 @@ namespace Barotrauma
                mapEntity.Move(-HiddenSubPosition);
            }

+            var prevBodyType = subBody.Body.BodyType;
            Vector2 pos = new Vector2(subBody.Position.X, subBody.Position.Y);
            subBody.Body.Remove();
            subBody = new SubmarineBody(this);
+            subBody.Body.BodyType = prevBodyType;
            SetPosition(pos, new List<Submarine>(parents.Where(p => p != this)));

            if (entityGrid != null)
@@ -1429,6 +1431,11 @@ namespace Barotrauma
                        }
                    }
                }
+                else if (info.IsRuin)
+                {
+                    ShowSonarMarker = false;
+                    PhysicsBody.FarseerBody.BodyType = BodyType.Static;
+                }
            }

            if (entityGrid != null)