Fixed RangedWeapon launching projectiles in an incorrect rotation

2017-08-27 18:45:14 +03:00
parent e7f4d1474e
commit 736de25e6c
1 changed files with 6 additions and 3 deletions
@@ -89,17 +89,20 @@ namespace Barotrauma.Items.Components
                    //so that the player can't shoot himself
                    Projectile projectileComponent= projectile.GetComponent<Projectile>();
                    if (projectileComponent == null) continue;
+
+                    float rotation = ((item.body.Dir == 1.0f) ? item.body.Rotation : item.body.Rotation - MathHelper.Pi) + Rand.Range(-degreeOfFailure, degreeOfFailure);
                
                    projectile.body.ResetDynamics();
-                    projectile.SetTransform(TransformedBarrelPos, 
-                        ((item.body.Dir == 1.0f) ? item.body.Rotation : item.body.Rotation - MathHelper.Pi)
-                        + Rand.Range(-degreeOfFailure, degreeOfFailure));
+                    projectile.SetTransform(TransformedBarrelPos, rotation);

                    projectile.Use(deltaTime);
                    projectileComponent.User = character;

                    projectile.body.ApplyTorque(projectile.body.Mass * degreeOfFailure * Rand.Range(-10.0f, 10.0f));

+                    //set the rotation of the projectile again because dropping the projectile resets the rotation
+                    projectile.SetTransform(projectile.SimPosition, rotation);
+
                    //recoil
                    item.body.ApplyLinearImpulse(
                        new Vector2((float)Math.Cos(projectile.body.Rotation), (float)Math.Sin(projectile.body.Rotation)) * item.body.Mass * -50.0f);