Skip to content

Fix: gun recoil unbuckles riders from vehicles #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Grom1halo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: gun recoil unbuckles riders from vehicles #253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public abstract partial class SharedGunSystem : EntitySystem

protected EntityQuery<PhysicsComponent> _physQuery; // Mono
protected EntityQuery<ProjectileComponent> _projQuery; // Mono
protected EntityQuery<BuckleComponent> _buckleQuery; // Mono
private EntityQuery<AutoShootGunComponent> _autoShootGunQuery; // Mono

private const float InteractNextFire = 0.3f;
Expand Down Expand Up @@ -118,6 +119,7 @@ public override void Initialize()

_physQuery = GetEntityQuery<PhysicsComponent>(); // Mono
_projQuery = GetEntityQuery<ProjectileComponent>(); // Mono
_buckleQuery = GetEntityQuery<BuckleComponent>(); // Mono
_autoShootGunQuery = GetEntityQuery<AutoShootGunComponent>();
}

Expand Down Expand Up @@ -727,6 +729,12 @@ public void CauseImpulse(EntityCoordinates toCoordinates, Entity<GunComponent> e
impulseCoord = TransformSystem.WithEntityId(impulseCoord, selfXform.ParentUid);

var toEnt = impulseCoord.EntityId;

// Mono - if the shooter is buckled (e.g. riding a vehicle), apply the recoil to whatever
// they're buckled to instead, so the kick doesn't shove them out of their seat.
if (_buckleQuery.TryComp(toEnt, out var buckle) && buckle.BuckledTo is { } buckledTo)
toEnt = buckledTo;

if (!_physQuery.TryComp(toEnt, out var toBody))
return;

Expand Down
Loading