improved harpoon gun, misc ui stuff & bugfixes

2015-05-29 16:29:32 +03:00
parent 80648ffd46
commit 562164af36
27 changed files with 316 additions and 103 deletions
@@ -137,7 +137,7 @@ namespace Subsurface.Items.Components
        private bool OnProjectileCollision(Fixture f1, Fixture f2, Contact contact)
        {
            //doesn't collide with items
-            if (f2.Body.UserData is Item) return false;
+            //if (f2.Body.UserData is Item) return false;

            if (ignoredBodies.Contains(f2.Body)) return false;

@@ -219,7 +219,7 @@ namespace Subsurface.Items.Components

            stickJoint = new PrismaticJoint(targetBody, item.body.FarseerBody, item.body.Position, axis, true);
            stickJoint.MotorEnabled = true;
-            stickJoint.MaxMotorForce = 15.0f;
+            stickJoint.MaxMotorForce = 30.0f;

            stickJoint.LimitEnabled = true;
            stickJoint.UpperLimit = ConvertUnits.ToSimUnits(item.sprite.size.X*0.7f);