Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix projectiles not inheriting velocities from the shooter/gun. (#12854)

Browse Source 
Fixes https://github.com/space-wizards/space-station-14/issues/12852
This commit is contained in:
Leon Friedrich
2022-12-10 16:45:18 +13:00
committed by GitHub
parent e6083a5c48
commit 7ee2f15a14
3 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Server/Weapons/Ranged/Systems/GunSystem.cs
View File

@@ -92,10 +92,15 @@ public sealed partial class GunSystem : SharedGunSystem
var mapAngle = mapDirection.ToAngle();
var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle());
// If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
EntityCoordinates fromEnt = MapManager.TryFindGridAt(fromMap, out var grid)
? fromCoordinates.WithEntityId(grid.Owner, EntityManager)
: new(MapManager.GetMapEntityId(fromMap.MapId), fromMap.Position);
// Update shot based on the recoil
toMap = fromMap.Position + angle.ToVec() * mapDirection.Length;
mapDirection = toMap - fromMap.Position;
var entityDirection = Transform(fromCoordinates.EntityId).InvWorldMatrix.Transform(toMap) - fromCoordinates.Position;
var gunVelocity = Physics.GetMapLinearVelocity(gun.Owner);
// I must be high because this was getting tripped even when true.
// DebugTools.Assert(direction != Vector2.Zero);
@@ -116,15 +121,15 @@ public sealed partial class GunSystem : SharedGunSystem
for (var i = 0; i < cartridge.Count; i++)
{
var uid = Spawn(cartridge.Prototype, fromMap);
ShootProjectile(uid, angles[i].ToVec(), user, gun.ProjectileSpeed);
var uid = Spawn(cartridge.Prototype, fromEnt);
ShootProjectile(uid, angles[i].ToVec(), gunVelocity, user, gun.ProjectileSpeed);
shotProjectiles.Add(uid);
}
}
else
{
var uid = Spawn(cartridge.Prototype, fromMap);
ShootProjectile(uid, mapDirection, user, gun.ProjectileSpeed);
var uid = Spawn(cartridge.Prototype, fromEnt);
ShootProjectile(uid, mapDirection, gunVelocity, user, gun.ProjectileSpeed);
shotProjectiles.Add(uid);
}
@@ -167,7 +172,7 @@ public sealed partial class GunSystem : SharedGunSystem
break;
}
ShootProjectile(newAmmo.Owner, mapDirection, user, gun.ProjectileSpeed);
ShootProjectile(newAmmo.Owner, mapDirection, gunVelocity, user, gun.ProjectileSpeed);
break;
case HitscanPrototype hitscan:
var ray = new CollisionRay(fromMap.Position, mapDirection.Normalized, hitscan.CollisionMask);
@@ -229,11 +234,15 @@ public sealed partial class GunSystem : SharedGunSystem
}, false);
}
public void ShootProjectile(EntityUid uid, Vector2 direction, EntityUid? user = null, float speed = 20f)
public void ShootProjectile(EntityUid uid, Vector2 direction, Vector2 gunVelocity, EntityUid? user = null, float speed = 20f)
{
var physics = EnsureComp<PhysicsComponent>(uid);
physics.BodyStatus = BodyStatus.InAir;
Physics.SetLinearVelocity(physics, direction.Normalized * speed);
var targetMapVelocity = gunVelocity + direction.Normalized * speed;
var currentMapVelocity = Physics.GetMapLinearVelocity(uid, physics);
var finalLinear = physics.LinearVelocity + targetMapVelocity - currentMapVelocity;
Physics.SetLinearVelocity(physics, finalLinear);
if (user != null)
{