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

Portable flasher tweaks (#6517)

Browse Source
This commit is contained in:
metalgearsloth
2022-02-08 14:08:21 +11:00
committed by GitHub
parent 70c0a502cf
commit 310f6e14f1
9 changed files with 145 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/Entry/IgnoredComponents.cs
View File

@@ -78,7 +78,6 @@ namespace Content.Client.Entry
"BodyScanner",
"Stunbaton",
"Tool",
"TriggerOnProximity",
"TilePrying",
"RandomSpriteColor",
"ConditionalSpawner",

6
Content.Client/Explosion/TriggerOnProximityComponent.cs Normal file
View File

@@ -0,0 +1,6 @@
using Content.Shared.Explosion;
namespace Content.Client.Explosion;
[RegisterComponent, Friend(typeof(TriggerSystem))]
public sealed class TriggerOnProximityComponent : SharedTriggerOnProximityComponent {}

101
Content.Client/Explosion/TriggerSystem.Proximity.cs Normal file
View File

@@ -0,0 +1,101 @@
using Content.Client.Trigger;
using Content.Shared.Trigger;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
using Robust.Shared.Animations;
namespace Content.Client.Explosion;
public sealed partial class TriggerSystem
{
[Dependency] private readonly AnimationPlayerSystem _player = default!;
/*
* Currently all of the appearance stuff is hardcoded for portable flashers
* If you ever add mines it shouldn't be hard to tweak it slightly
*/
private const string AnimKey = "proximity";
private static readonly Animation _flasherAnimation = new Animation
{
Length = TimeSpan.FromSeconds(0.3f),
AnimationTracks = {
new AnimationTrackSpriteFlick
{
LayerKey = ProximityTriggerVisualLayers.Base,
KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame("flashing", 0f)}
},
new AnimationTrackComponentProperty()
{
ComponentType = typeof(PointLightComponent),
InterpolationMode = AnimationInterpolationMode.Nearest,
Property = nameof(PointLightComponent.Radius),
KeyFrames =
{
new AnimationTrackProperty.KeyFrame(0.1f, 0),
new AnimationTrackProperty.KeyFrame(3f, 0.1f),
new AnimationTrackProperty.KeyFrame(0.1f, 0.5f)
}
}
}
};
private void InitializeProximity()
{
SubscribeLocalEvent<TriggerOnProximityComponent, ComponentInit>(OnProximityInit);
SubscribeLocalEvent<TriggerOnProximityComponent, AppearanceChangeEvent>(OnProxAppChange);
SubscribeLocalEvent<TriggerOnProximityComponent, AnimationCompletedEvent>(OnProxAnimation);
}
private void OnProxAnimation(EntityUid uid, TriggerOnProximityComponent component, AnimationCompletedEvent args)
{
if (!TryComp<AppearanceComponent>(uid, out var appearance)) return;
// So animation doesn't get spammed if no server state comes in.
appearance.SetData(ProximityTriggerVisualState.State, ProximityTriggerVisuals.Inactive);
OnChangeData(uid, component, appearance);
}
private void OnProximityInit(EntityUid uid, TriggerOnProximityComponent component, ComponentInit args)
{
EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
}
private void OnProxAppChange(EntityUid uid, TriggerOnProximityComponent component, AppearanceChangeEvent args)
{
OnChangeData(uid, component, args.Component);
}
private void OnChangeData(EntityUid uid, TriggerOnProximityComponent component, AppearanceComponent appearance)
{
if (!TryComp<SpriteComponent>(component.Owner, out var spriteComponent)) return;
TryComp<AnimationPlayerComponent>(component.Owner, out var player);
appearance.TryGetData(ProximityTriggerVisualState.State, out ProximityTriggerVisuals state);
switch (state)
{
case ProximityTriggerVisuals.Inactive:
// Don't interrupt the flash animation
if (_player.HasRunningAnimation(uid, player, AnimKey)) return;
_player.Stop(uid, player, AnimKey);
spriteComponent.LayerSetState(ProximityTriggerVisualLayers.Base, "on");
break;
case ProximityTriggerVisuals.Active:
if (_player.HasRunningAnimation(uid, player, AnimKey)) return;
_player.Play(uid, player, _flasherAnimation, AnimKey);
break;
case ProximityTriggerVisuals.Off:
default:
_player.Stop(uid, player, AnimKey);
spriteComponent.LayerSetState(ProximityTriggerVisualLayers.Base, "off");
break;
}
}
public enum ProximityTriggerVisualLayers : byte
{
Base,
}
}

10
Content.Client/Explosion/TriggerSystem.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace Content.Client.Explosion;
public sealed partial class TriggerSystem : EntitySystem
{
public override void Initialize()
{
base.Initialize();
InitializeProximity();
}
}

96
Content.Client/Trigger/ProximityTriggerVisualizer.cs
View File

@@ -1,96 +0,0 @@
using System;
using Content.Shared.Trigger;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
using Robust.Shared.Animations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Client.Trigger
{
public sealed class ProximityTriggerVisualizer : AppearanceVisualizer
{
[DataField("animationState")]
private string? _animationState;
[DataField("duration")]
private float _animationDuration = 0.3f;
private const string AnimKey = "proximity";
private static Animation _animation = default!;
public override void InitializeEntity(EntityUid entityUid)
{
base.InitializeEntity(entityUid);
if (_animationState == null) return;
IoCManager.Resolve<IEntityManager>().EnsureComponent<AnimationPlayerComponent>(entityUid);
_animation = new Animation
{
Length = TimeSpan.FromSeconds(_animationDuration),
AnimationTracks = {new AnimationTrackSpriteFlick
{
LayerKey = ProximityTriggerVisualLayers.Base,
KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(_animationState, 0f)}
},
new AnimationTrackComponentProperty()
{
ComponentType = typeof(PointLightComponent),
InterpolationMode = AnimationInterpolationMode.Nearest,
Property = nameof(PointLightComponent.Radius),
KeyFrames =
{
new AnimationTrackProperty.KeyFrame(0.1f, 0),
new AnimationTrackProperty.KeyFrame(3f, 0.1f),
new AnimationTrackProperty.KeyFrame(0.1f, 0.5f)
}
}
}
};
}
public override void OnChangeData(AppearanceComponent component)
{
base.OnChangeData(component);
var entityManager = IoCManager.Resolve<IEntityManager>();
if (!entityManager.TryGetComponent(component.Owner, out SpriteComponent spriteComponent)) return;
var animSystem = EntitySystem.Get<AnimationPlayerSystem>();
entityManager.TryGetComponent(component.Owner, out AnimationPlayerComponent? player);
component.TryGetData(ProximityTriggerVisualState.State, out ProximityTriggerVisuals state);
switch (state)
{
case ProximityTriggerVisuals.Inactive:
if (player != null)
animSystem.Stop(player, AnimKey);
spriteComponent.LayerSetState(ProximityTriggerVisualLayers.Base, "on");
break;
case ProximityTriggerVisuals.Active:
/* TODO: Waiting on ECS OnChangeData so we can actually subscribe to the animation finishing properly.
if (_animationState == null || player == null ||
animSystem.HasRunningAnimation(player, AnimKey)) return;
animSystem.Play(player, _animation, AnimKey);
*/
break;
case ProximityTriggerVisuals.Off:
default:
spriteComponent.LayerSetState(ProximityTriggerVisualLayers.Base, "off");
break;
}
}
}
public enum ProximityTriggerVisualLayers : byte
{
Base,
}
}