Esword stuff (#329)
* - fix: Fix black RGB. * - add: Toy sword update. * - add: FlipOnHitSystem. * - tweak: Price reduction.
This commit is contained in:
@@ -207,6 +207,8 @@ namespace Content.Client.Light
|
||||
|
||||
public static Color GetCurrentRgbColor(TimeSpan curTime, TimeSpan offset, Entity<RgbLightControllerComponent> rgb)
|
||||
{
|
||||
offset = TimeSpan.Zero; // WD EDIT, Fix black RGB
|
||||
|
||||
return Color.FromHsv(new Vector4(
|
||||
(float) (((curTime.TotalSeconds - offset.TotalSeconds) * rgb.Comp.CycleRate + Math.Abs(rgb.Owner.Id * 0.1)) % 1),
|
||||
1.0f,
|
||||
|
||||
@@ -14,7 +14,7 @@ public sealed class EmoteAnimationSystem : EntitySystem
|
||||
|
||||
private readonly Dictionary<string, Action<EntityUid>> _emoteList = new();
|
||||
|
||||
private const string AnimationKey = "emoteAnimationKeyId";
|
||||
public const string AnimationKey = "emoteAnimationKeyId";
|
||||
private const string AnimationKeyTurn = "emoteAnimationKeyId_rotate";
|
||||
|
||||
//OnVerbsResponse?.Invoke(msg);
|
||||
|
||||
91
Content.Client/_White/Animations/FlipOnHitSystem.cs
Normal file
91
Content.Client/_White/Animations/FlipOnHitSystem.cs
Normal file
@@ -0,0 +1,91 @@
|
||||
using Content.Shared._White.Animations;
|
||||
using Content.Shared.Item.ItemToggle.Components;
|
||||
using Content.Shared.Weapons.Melee.Events;
|
||||
using Robust.Client.Animations;
|
||||
using Robust.Client.GameObjects;
|
||||
using Robust.Shared.Animations;
|
||||
using Robust.Shared.Timing;
|
||||
|
||||
namespace Content.Client._White.Animations;
|
||||
|
||||
public sealed class FlipOnHitSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly AnimationPlayerSystem _animationSystem = default!;
|
||||
[Dependency] private readonly IGameTiming _timing = default!;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
SubscribeLocalEvent<FlipOnHitComponent, MeleeHitEvent>(OnHit);
|
||||
SubscribeLocalEvent<FlippingComponent, AnimationCompletedEvent>(OnAnimationComplete);
|
||||
}
|
||||
|
||||
private void OnAnimationComplete(Entity<FlippingComponent> ent, ref AnimationCompletedEvent args)
|
||||
{
|
||||
if (args.Key != EmoteAnimationSystem.AnimationKey)
|
||||
return;
|
||||
|
||||
PlayAnimation(ent);
|
||||
}
|
||||
|
||||
private void OnHit(Entity<FlipOnHitComponent> ent, ref MeleeHitEvent args)
|
||||
{
|
||||
if (!_timing.IsFirstTimePredicted)
|
||||
return;
|
||||
|
||||
if (args.HitEntities.Count == 0)
|
||||
return;
|
||||
|
||||
if (TryComp(ent, out ItemToggleComponent? itemToggle) && !itemToggle.Activated)
|
||||
return;
|
||||
|
||||
if (_animationSystem.HasRunningAnimation(args.User, EmoteAnimationSystem.AnimationKey))
|
||||
{
|
||||
EnsureComp<FlippingComponent>(args.User);
|
||||
return;
|
||||
}
|
||||
|
||||
PlayAnimation(args.User);
|
||||
}
|
||||
|
||||
private void PlayAnimation(EntityUid user)
|
||||
{
|
||||
RemComp<FlippingComponent>(user);
|
||||
|
||||
var baseAngle = Angle.Zero;
|
||||
if (EntityManager.TryGetComponent(user, out SpriteComponent? sprite))
|
||||
baseAngle = sprite.Rotation;
|
||||
|
||||
var degrees = baseAngle.Degrees;
|
||||
|
||||
var animation = new Animation
|
||||
{
|
||||
Length = TimeSpan.FromMilliseconds(1600),
|
||||
AnimationTracks =
|
||||
{
|
||||
new AnimationTrackComponentProperty
|
||||
{
|
||||
ComponentType = typeof(SpriteComponent),
|
||||
Property = nameof(SpriteComponent.Rotation),
|
||||
InterpolationMode = AnimationInterpolationMode.Linear,
|
||||
KeyFrames =
|
||||
{
|
||||
new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(degrees - 10), 0f),
|
||||
new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(degrees + 180), 0.2f),
|
||||
new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(degrees + 360), 0.2f),
|
||||
new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(degrees + 540), 0.2f),
|
||||
new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(degrees + 720), 0.2f),
|
||||
new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(degrees + 900), 0.2f),
|
||||
new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(degrees + 1080), 0.2f),
|
||||
new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(degrees + 1260), 0.2f),
|
||||
new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(degrees + 1440), 0.2f),
|
||||
new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(degrees), 0f)
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
_animationSystem.Play(user, animation, EmoteAnimationSystem.AnimationKey);
|
||||
}
|
||||
}
|
||||
6
Content.Client/_White/Animations/FlippingComponent.cs
Normal file
6
Content.Client/_White/Animations/FlippingComponent.cs
Normal file
@@ -0,0 +1,6 @@
|
||||
namespace Content.Client._White.Animations;
|
||||
|
||||
[RegisterComponent]
|
||||
public sealed partial class FlippingComponent : Component
|
||||
{
|
||||
}
|
||||
Reference in New Issue
Block a user