Renamed the CollisionMisc collision category to CollisionItem, teleporting items inside/outside the sub if their physicsbody leaves/enters a hull, powercontainer charge can be changed in editor (i.e. batteries can be set to fully loaded)

2016-05-19 19:47:26 +03:00
parent 6651933c45
commit a477dad1b2
12 changed files with 25 additions and 14 deletions
@@ -155,8 +155,8 @@ namespace Barotrauma.Items.Components
                    item.Move(-submarine.Position);
                    item.Submarine = submarine;
                    item.body.Submarine = submarine;
-                    item.FindHull();
-                    return false;
+                    //item.FindHull();
+                    return true;
                }

                Limb limb;
@@ -177,7 +177,7 @@ namespace Barotrauma.Items.Components
            item.body.FarseerBody.OnCollision -= OnProjectileCollision;

            item.body.FarseerBody.IsBullet = false;
-            item.body.CollisionCategories = Physics.CollisionMisc;
+            item.body.CollisionCategories = Physics.CollisionItem;
            item.body.CollidesWith = Physics.CollisionWall | Physics.CollisionLevel;

            IgnoredBodies.Clear();