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

Flare gun 1984 (#15807)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-04 12:46:02 +10:00
committed by GitHub
parent 6408e69fe7
commit 06efff2b2d
4 changed files with 82 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,17 +116,9 @@ public sealed partial class GunSystem : SharedGunSystem
foreach (var (ent, shootable) in ammo)
{
// pneumatic cannon doesn't shoot bullets it just throws them, ignore ammo handling
if (throwItems)
if (throwItems && ent != null)
{
if (!HasComp<ProjectileComponent>(ent!.Value))
{
RemComp<AmmoComponent>(ent.Value);
// TODO: Someone can probably yeet this a billion miles so need to pre-validate input somewhere up the call stack.
ThrowingSystem.TryThrow(ent.Value, mapDirection, gun.ProjectileSpeed, user);
continue;
}
ShootProjectile(ent.Value, mapDirection, gunVelocity, user, gun.ProjectileSpeed);
ShootOrThrow(ent.Value, mapDirection, gunVelocity, gun, user);
continue;
}
@@ -144,14 +136,14 @@ public sealed partial class GunSystem : SharedGunSystem
for (var i = 0; i < cartridge.Count; i++)
{
var uid = Spawn(cartridge.Prototype, fromEnt);
ShootProjectile(uid, angles[i].ToVec(), gunVelocity, user, gun.ProjectileSpeed);
ShootOrThrow(uid, angles[i].ToVec(), gunVelocity, gun, user);
shotProjectiles.Add(uid);
}
}
else
{
var uid = Spawn(cartridge.Prototype, fromEnt);
ShootProjectile(uid, mapDirection, gunVelocity, user, gun.ProjectileSpeed);
ShootOrThrow(uid, mapDirection, gunVelocity, gun, user);
shotProjectiles.Add(uid);
}
@@ -183,17 +175,7 @@ public sealed partial class GunSystem : SharedGunSystem
shotProjectiles.Add(ent!.Value);
MuzzleFlash(gunUid, newAmmo, user);
Audio.PlayPredicted(gun.SoundGunshot, gunUid, user);
// Do a throw
if (!HasComp<ProjectileComponent>(ent.Value))
{
RemComp<AmmoComponent>(ent.Value);
// TODO: Someone can probably yeet this a billion miles so need to pre-validate input somewhere up the call stack.
ThrowingSystem.TryThrow(ent.Value, mapDirection, gun.ProjectileSpeed, user);
break;
}
ShootProjectile(ent.Value, mapDirection, gunVelocity, user, gun.ProjectileSpeed);
ShootOrThrow(ent.Value, mapDirection, gunVelocity, gun, user);
break;
case HitscanPrototype hitscan:
@@ -283,6 +265,20 @@ public sealed partial class GunSystem : SharedGunSystem
});
}
private void ShootOrThrow(EntityUid uid, Vector2 mapDirection, Vector2 gunVelocity, GunComponent gun, EntityUid? user)
{
// Do a throw
if (!HasComp<ProjectileComponent>(uid))
{
RemComp<AmmoComponent>(uid);
// TODO: Someone can probably yeet this a billion miles so need to pre-validate input somewhere up the call stack.
ThrowingSystem.TryThrow(uid, mapDirection, gun.ProjectileSpeed, user);
return;
}
ShootProjectile(uid, mapDirection, gunVelocity, user, gun.ProjectileSpeed);
}
public void ShootProjectile(EntityUid uid, Vector2 direction, Vector2 gunVelocity, EntityUid? user = null, float speed = 20f)
{
var physics = EnsureComp<PhysicsComponent>(uid);