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

Bullet impact effects (#9530)

Browse Source
This commit is contained in:
metalgearsloth
2022-07-09 13:46:11 +10:00
committed by GitHub
parent 1b5f88e4d0
commit 5107bc3be7
14 changed files with 175 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Client/Projectiles/ProjectileComponent.cs
View File

@@ -1,19 +1,8 @@
using Content.Shared.Projectiles;
using Robust.Shared.GameObjects;
namespace Content.Client.Projectiles
{
[RegisterComponent]
[ComponentReference(typeof(SharedProjectileComponent))]
public sealed class ProjectileComponent : SharedProjectileComponent
{
public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
{
if (curState is ProjectileComponentState compState)
{
Shooter = compState.Shooter;
IgnoreShooter = compState.IgnoreShooter;
}
}
}
public sealed class ProjectileComponent : SharedProjectileComponent {}
}

61
Content.Client/Projectiles/ProjectileSystem.cs Normal file
View File

@@ -0,0 +1,61 @@
using Content.Shared.Projectiles;
using Content.Shared.Spawners.Components;
using Content.Shared.Weapons.Ranged.Systems;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
using Robust.Shared.GameStates;
namespace Content.Client.Projectiles;
public sealed class ProjectileSystem : SharedProjectileSystem
{
[Dependency] private readonly AnimationPlayerSystem _player = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<ProjectileComponent, ComponentHandleState>(OnHandleState);
SubscribeNetworkEvent<ImpactEffectEvent>(OnProjectileImpact);
}
private void OnProjectileImpact(ImpactEffectEvent ev)
{
var ent = Spawn(ev.Prototype, ev.Coordinates);
if (TryComp<SpriteComponent>(ent, out var sprite))
{
sprite[EffectLayers.Unshaded].AutoAnimated = false;
sprite.LayerMapTryGet(EffectLayers.Unshaded, out var layer);
var state = sprite.LayerGetState(layer);
var lifetime = 0.5f;
if (TryComp<TimedDespawnComponent>(ent, out var despawn))
lifetime = despawn.Lifetime;
var anim = new Animation()
{
Length = TimeSpan.FromSeconds(lifetime),
AnimationTracks =
{
new AnimationTrackSpriteFlick()
{
LayerKey = EffectLayers.Unshaded,
KeyFrames =
{
new AnimationTrackSpriteFlick.KeyFrame(state.Name, 0f),
}
}
}
};
_player.Play(ent, anim, "impact-effect");
}
}
private void OnHandleState(EntityUid uid, ProjectileComponent component, ref ComponentHandleState args)
{
if (args.Current is not ProjectileComponentState state) return;
component.Shooter = state.Shooter;
component.IgnoreShooter = state.IgnoreShooter;
}
}

4
Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs
View File

@@ -1,3 +1,4 @@
using Content.Server.Projectiles;
using Content.Server.Projectiles.Components;
using Content.Server.Singularity.Components;
using Content.Shared.Singularity.Components;
@@ -29,7 +30,8 @@ namespace Content.Server.ParticleAccelerator.Components
Logger.Error("ParticleProjectile tried firing, but it was spawned without a ProjectileComponent");
return;
}
projectileComponent.IgnoreEntity(firer);
_entMan.EntitySysManager.GetEntitySystem<ProjectileSystem>().SetShooter(projectileComponent, firer);
if (!_entMan.TryGetComponent<SinguloFoodComponent?>(Owner, out var singuloFoodComponent))
{

17
Content.Server/Projectiles/Components/ProjectileComponent.cs
View File

@@ -22,22 +22,5 @@ namespace Content.Server.Projectiles.Components
public bool ForceSound = false;
public bool DamagedEntity;
public float TimeLeft { get; set; } = 10;
/// <summary>
/// Function that makes the collision of this object ignore a specific entity so we don't collide with ourselves
/// </summary>
/// <param name="shooter"></param>
public void IgnoreEntity(EntityUid shooter)
{
Shooter = shooter;
Dirty();
}
public override ComponentState GetComponentState()
{
return new ProjectileComponentState(Shooter, IgnoreShooter);
}
}
}

34
Content.Server/Projectiles/SharedProjectileSystem.cs
View File

@@ -1,19 +1,13 @@
using Content.Server.Administration.Logs;
using Content.Server.Projectiles.Components;
using Content.Server.Weapon.Melee;
using Content.Server.Weapon.Ranged;
using Content.Shared.Audio;
using Content.Shared.Body.Components;
using Content.Shared.Camera;
using Content.Shared.Damage;
using Content.Shared.Database;
using Content.Shared.Projectiles;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
using Robust.Shared.Physics.Dynamics;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using GunSystem = Content.Server.Weapon.Ranged.Systems.GunSystem;
namespace Content.Server.Projectiles
@@ -29,16 +23,20 @@ namespace Content.Server.Projectiles
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<ProjectileComponent, StartCollideEvent>(HandleCollide);
SubscribeLocalEvent<ProjectileComponent, StartCollideEvent>(OnStartCollide);
SubscribeLocalEvent<ProjectileComponent, ComponentGetState>(OnGetState);
}
private void HandleCollide(EntityUid uid, ProjectileComponent component, StartCollideEvent args)
private void OnGetState(EntityUid uid, ProjectileComponent component, ref ComponentGetState args)
{
args.State = new ProjectileComponentState(component.Shooter, component.IgnoreShooter);
}
private void OnStartCollide(EntityUid uid, ProjectileComponent component, StartCollideEvent args)
{
// This is so entities that shouldn't get a collision are ignored.
if (args.OurFixture.ID != ProjectileFixture || !args.OtherFixture.Hard || component.DamagedEntity)
{
return;
}
var otherEntity = args.OtherFixture.Body.Owner;
@@ -62,20 +60,12 @@ namespace Content.Server.Projectiles
}
if (component.DeleteOnCollide)
{
QueueDel(uid);
}
public override void Update(float frameTime)
if (component.ImpactEffect != null && TryComp<TransformComponent>(uid, out var xform))
{
base.Update(frameTime);
foreach (var component in EntityManager.EntityQuery<ProjectileComponent>())
{
component.TimeLeft -= frameTime;
if (component.TimeLeft <= 0)
{
EntityManager.DeleteEntity(component.Owner);
RaiseNetworkEvent(new ImpactEffectEvent(component.ImpactEffect, xform.Coordinates));
}
}
}

3
Content.Server/Singularity/EntitySystems/EmitterSystem.cs
View File

@@ -2,6 +2,7 @@ using System.Threading;
using Content.Server.Administration.Logs;
using Content.Server.Power.Components;
using Content.Server.Power.EntitySystems;
using Content.Server.Projectiles;
using Content.Server.Projectiles.Components;
using Content.Server.Singularity.Components;
using Content.Server.Storage.Components;
@@ -187,7 +188,7 @@ namespace Content.Server.Singularity.EntitySystems
return;
}
projectileComponent.IgnoreEntity(component.Owner);
Get<ProjectileSystem>().SetShooter(projectileComponent, component.Owner);
physicsComponent
.LinearVelocity = EntityManager.GetComponent<TransformComponent>(component.Owner).WorldRotation.ToWorldVec() * 20f;

3
Content.Server/StationEvents/Events/MeteorSwarm.cs
View File

@@ -1,6 +1,7 @@
using Content.Server.GameTicking;
using Content.Server.Projectiles.Components;
using Content.Shared.Sound;
using Content.Shared.Spawners.Components;
using Robust.Shared.Map;
using Robust.Shared.Random;
@@ -116,7 +117,7 @@ namespace Content.Server.StationEvents.Events
physics.Mass * ((MaxAngularVelocity - MinAngularVelocity) * _robustRandom.NextFloat() +
MinAngularVelocity));
// TODO: God this disgusts me but projectile needs a refactor.
IoCManager.Resolve<IEntityManager>().GetComponent<ProjectileComponent>(meteor).TimeLeft = 120f;
IoCManager.Resolve<IEntityManager>().EnsureComponent<TimedDespawnComponent>(meteor).Lifetime = 120f;
}
}
}

4
Content.Server/Weapon/Ranged/Systems/GunSystem.cs
View File

@@ -7,7 +7,6 @@ using Content.Shared.Audio;
using Content.Shared.Damage;
using Content.Shared.Database;
using Content.Shared.Sound;
using Content.Shared.Throwing;
using Content.Shared.Weapons.Ranged;
using Content.Shared.Weapons.Ranged.Components;
using Content.Shared.Weapons.Ranged.Events;
@@ -16,7 +15,6 @@ using Robust.Shared.Audio;
using Robust.Shared.Map;
using Robust.Shared.Physics;
using Robust.Shared.Player;
using Robust.Shared.Random;
using Robust.Shared.Utility;
using SharedGunSystem = Content.Shared.Weapons.Ranged.Systems.SharedGunSystem;
@@ -168,7 +166,7 @@ public sealed partial class GunSystem : SharedGunSystem
if (user != null)
{
var projectile = EnsureComp<ProjectileComponent>(uid);
projectile.IgnoreEntity(user.Value);
Projectiles.SetShooter(projectile, user.Value);
}
Transform(uid).WorldRotation = direction.ToWorldAngle();

23
Content.Shared/Projectiles/SharedProjectileComponent.cs
View File

@@ -1,13 +1,17 @@
using Robust.Shared.GameStates;
using Robust.Shared.Serialization;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
namespace Content.Shared.Projectiles
{
[NetworkedComponent()]
[NetworkedComponent, Access(typeof(SharedProjectileSystem))]
public abstract class SharedProjectileComponent : Component
{
[ViewVariables(VVAccess.ReadWrite), DataField("impactEffect", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
public string? ImpactEffect;
private bool _ignoreShooter = true;
public EntityUid Shooter { get; protected set; }
public EntityUid Shooter { get; set; }
public bool IgnoreShooter
{
@@ -20,18 +24,5 @@ namespace Content.Shared.Projectiles
Dirty();
}
}
[NetSerializable, Serializable]
protected sealed class ProjectileComponentState : ComponentState
{
public ProjectileComponentState(EntityUid shooter, bool ignoreShooter)
{
Shooter = shooter;
IgnoreShooter = ignoreShooter;
}
public EntityUid Shooter { get; }
public bool IgnoreShooter { get; }
}
}
}

36
Content.Shared/Projectiles/SharedProjectileSystem.cs
View File

@@ -1,4 +1,6 @@
using Robust.Shared.Map;
using Robust.Shared.Physics.Dynamics;
using Robust.Shared.Serialization;
namespace Content.Shared.Projectiles
{
@@ -20,5 +22,39 @@ namespace Content.Shared.Projectiles
return;
}
}
public void SetShooter(SharedProjectileComponent component, EntityUid uid)
{
if (component.Shooter == uid) return;
component.Shooter = uid;
Dirty(component);
}
[NetSerializable, Serializable]
protected sealed class ProjectileComponentState : ComponentState
{
public ProjectileComponentState(EntityUid shooter, bool ignoreShooter)
{
Shooter = shooter;
IgnoreShooter = ignoreShooter;
}
public EntityUid Shooter { get; }
public bool IgnoreShooter { get; }
}
[Serializable, NetSerializable]
protected sealed class ImpactEffectEvent : EntityEventArgs
{
public string Prototype;
public EntityCoordinates Coordinates;
public ImpactEffectEvent(string prototype, EntityCoordinates coordinates)
{
Prototype = prototype;
Coordinates = coordinates;
}
}
}
}

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

@@ -8,6 +8,7 @@ using Content.Shared.Examine;
using Content.Shared.Hands.Components;
using Content.Shared.Interaction.Events;
using Content.Shared.Popups;
using Content.Shared.Projectiles;
using Content.Shared.Throwing;
using Content.Shared.Verbs;
using Content.Shared.Weapons.Ranged.Components;
@@ -43,7 +44,8 @@ public abstract partial class SharedGunSystem : EntitySystem
[Dependency] protected readonly SharedPhysicsSystem Physics = default!;
[Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
[Dependency] protected readonly ThrowingSystem ThrowingSystem = default!;
[Dependency] protected readonly TagSystem _tagSystem = default!;
[Dependency] protected readonly TagSystem TagSystem = default!;
[Dependency] protected readonly SharedProjectileSystem Projectiles = default!;
protected ISawmill Sawmill = default!;
@@ -88,7 +90,7 @@ public abstract partial class SharedGunSystem : EntitySystem
private void OnGunMeleeAttempt(EntityUid uid, GunComponent component, ref MeleeAttackAttemptEvent args)
{
if (_tagSystem.HasTag(args.User, "GunsDisabled"))
if (TagSystem.HasTag(args.User, "GunsDisabled"))
return;
args.Cancelled = true;
@@ -186,7 +188,7 @@ public abstract partial class SharedGunSystem : EntitySystem
if (toCoordinates == null) return;
if (_tagSystem.HasTag(user, "GunsDisabled"))
if (TagSystem.HasTag(user, "GunsDisabled"))
{
Popup(Loc.GetString("gun-disabled"), user, user);
return;

32
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml Normal file
View File

@@ -0,0 +1,32 @@
- type: entity
id: BulletImpactEffect
noSpawn: true
components:
- type: TimedDespawn
lifetime: 0.25
- type: Sprite
netsync: false
drawdepth: Effects
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
state: impact_bullet
- type: EffectVisuals
- type: entity
id: BulletImpactEffectDisabler
noSpawn: true
components:
- type: TimedDespawn
lifetime: 0.2
- type: Sprite
netsync: false
drawdepth: Effects
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
state: impact_laser_blue
- type: EffectVisuals

4
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
View File

@@ -29,11 +29,14 @@
- Impassable
- BulletImpassable
- type: Projectile
impactEffect: BulletImpactEffect
damage:
types:
Piercing: 14
soundHit:
path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg
- type: TimedDespawn
lifetime: 10
- type: entity
id: BaseBulletTrigger # Trigger-on-collide bullets
@@ -126,6 +129,7 @@
- type: StaminaDamageOnCollide
damage: 30
- type: Projectile
impactEffect: BulletImpactEffectDisabler
damage:
types:
Heat: 5

18
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json
View File

@@ -14,11 +14,11 @@
"name": "impact_bullet",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1
0.05,
0.05,
0.05,
0.05,
0.05
]
]
},
@@ -26,10 +26,10 @@
"name": "impact_laser_blue",
"delays": [
[
0.1,
0.1,
0.1,
0.1
0.05,
0.05,
0.05,
0.05
]
]
}