tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moves ShootProjectile to shared (#24007)

Browse Source
This commit is contained in:
keronshb
2024-01-12 23:52:02 -05:00
committed by GitHub
parent 205c631c06
commit 2375a6cd1d
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,26 +313,6 @@ public sealed partial class GunSystem : SharedGunSystem
ShootProjectile(uid, mapDirection, gunVelocity, gunUid, user, gun.ProjectileSpeed); ShootProjectile(uid, mapDirection, gunVelocity, gunUid, user, gun.ProjectileSpeed);
} }
public void ShootProjectile(EntityUid uid, Vector2 direction, Vector2 gunVelocity, EntityUid gunUid, EntityUid? user = null, float speed = 20f)
{
var physics = EnsureComp<PhysicsComponent>(uid);
Physics.SetBodyStatus(physics, BodyStatus.InAir);
var targetMapVelocity = gunVelocity + direction.Normalized() * speed;
var currentMapVelocity = Physics.GetMapLinearVelocity(uid, physics);
var finalLinear = physics.LinearVelocity + targetMapVelocity - currentMapVelocity;
Physics.SetLinearVelocity(uid, finalLinear, body: physics);
if (user != null)
{
var projectile = EnsureComp<ProjectileComponent>(uid);
Projectiles.SetShooter(uid, projectile, user.Value);
projectile.Weapon = gunUid;
}
TransformSystem.SetWorldRotation(uid, direction.ToWorldAngle());
}
/// <summary> /// <summary>
/// Gets a linear spread of angles between start and end. /// Gets a linear spread of angles between start and end.
/// </summary> /// </summary>

21
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
View File

@@ -1,4 +1,5 @@
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Numerics;
using Content.Shared.ActionBlocker; using Content.Shared.ActionBlocker;
using Content.Shared.Actions; using Content.Shared.Actions;
using Content.Shared.Administration.Logs; using Content.Shared.Administration.Logs;
@@ -374,6 +375,26 @@ public abstract partial class SharedGunSystem : EntitySystem
EntityUid? user = null, EntityUid? user = null,
bool throwItems = false); bool throwItems = false);
public void ShootProjectile(EntityUid uid, Vector2 direction, Vector2 gunVelocity, EntityUid gunUid, EntityUid? user = null, float speed = 20f)
{
var physics = EnsureComp<PhysicsComponent>(uid);
Physics.SetBodyStatus(physics, BodyStatus.InAir);
var targetMapVelocity = gunVelocity + direction.Normalized() * speed;
var currentMapVelocity = Physics.GetMapLinearVelocity(uid, physics);
var finalLinear = physics.LinearVelocity + targetMapVelocity - currentMapVelocity;
Physics.SetLinearVelocity(uid, finalLinear, body: physics);
if (user != null)
{
var projectile = EnsureComp<ProjectileComponent>(uid);
Projectiles.SetShooter(uid, projectile, user.Value);
projectile.Weapon = gunUid;
}
TransformSystem.SetWorldRotation(uid, direction.ToWorldAngle());
}
protected abstract void Popup(string message, EntityUid? uid, EntityUid? user); protected abstract void Popup(string message, EntityUid? uid, EntityUid? user);
/// <summary> /// <summary>