Skip to content

Interaction particle finetuning #5933

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

Merged
sowelipililimute merged 1 commit into from
Jun 5, 2026
+17 −7
Merged

Interaction particle finetuning #5933

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions Content.Client/_ST/Interaction/StellarInteractionParticleSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ private void OnInteractionParticle(StellarInteractionParticleEvent ev)

private Animation GetAnimation(Vector2 endOffset, Color color)
{
var startRotation = _random.NextAngle(Angle.FromDegrees(-80), Angle.FromDegrees(80));
var startRotation = _random.NextAngle(Angle.FromDegrees(-40), Angle.FromDegrees(40));
var endRotation = Angle.Zero;
var startScale = new Vector2(0.3f, 0.3f);
var endScale = new Vector2(1f, 1f);
var rotationLength = TimeSpan.FromMilliseconds(600);

var startOffset = new Vector2();
var offsetLength = TimeSpan.FromMilliseconds(200);
var offsetLength = TimeSpan.FromMilliseconds(250);

var startColor = color.WithAlpha(color.A * 0.9f);
var startColor = color.WithAlpha(color.A * 0.7f);
var endColor = color.WithAlpha(0f);
var colorLength = rotationLength + offsetLength;

Expand All @@ -89,7 +89,7 @@ private Animation GetAnimation(Vector2 endOffset, Color color)
KeyFrames =
{
new AnimationTrackProperty.KeyFrame(startRotation, 0f),
new AnimationTrackProperty.KeyFrame(endRotation, (float)rotationLength.TotalSeconds, Easings.OutBounce),
new AnimationTrackProperty.KeyFrame(endRotation, (float)rotationLength.TotalSeconds, Easings.OutBack),
},
},
new AnimationTrackComponentProperty()
Expand All @@ -99,7 +99,7 @@ private Animation GetAnimation(Vector2 endOffset, Color color)
KeyFrames =
{
new AnimationTrackProperty.KeyFrame(startScale, 0f),
new AnimationTrackProperty.KeyFrame(endScale, (float)rotationLength.TotalSeconds, Easings.OutBounce),
new AnimationTrackProperty.KeyFrame(endScale, (float)rotationLength.TotalSeconds, Easings.OutBack),
},
},
new AnimationTrackComponentProperty()
Expand All @@ -109,7 +109,7 @@ private Animation GetAnimation(Vector2 endOffset, Color color)
KeyFrames =
{
new AnimationTrackProperty.KeyFrame(startOffset, 0f),
new AnimationTrackProperty.KeyFrame(endOffset, (float)offsetLength.TotalSeconds, Easings.OutBounce),
new AnimationTrackProperty.KeyFrame(endOffset, (float)offsetLength.TotalSeconds, Easings.OutBack),
},
},
new AnimationTrackComponentProperty()
Expand Down
5 changes: 5 additions & 0 deletions Content.Shared/Interaction/ActivateInWorldEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ public sealed class ActivateInWorldEvent : HandledEntityEventArgs, ITargetedInte
/// </summary>
public bool WasLogged { get; set; }

/// <summary>
/// Stellar - set to false if this interaction shouldn't have an interaction particle
/// </summary>
public bool InteractionParticle = true;

public ActivateInWorldEvent(EntityUid user, EntityUid target, bool complex)
{
User = user;
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Interaction/SharedInteractionSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@ public bool InteractionActivate(
RaiseLocalEvent(used, activateMsg, true);
if (activateMsg.Handled)
{
DoContactInteraction(user, used, null, true); // Interaction particles
DoContactInteraction(user, used, null, true, interactionParticles: activateMsg.InteractionParticle); // Stellar - Interaction particles
if (!activateMsg.WasLogged)
_adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(user):user} activated {ToPrettyString(used):used}");

Expand Down
5 changes: 5 additions & 0 deletions Content.Shared/Strip/SharedStrippableSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,8 +718,13 @@ private void OnActivateInWorld(EntityUid uid, StrippableComponent component, Act
if (args.Handled || !args.Complex || args.Target == args.User)
return;

// Begin Stellar Changes - don't play an interact particle for examining the strip UI
if (TryOpenStrippingUi(args.User, (uid, component)))
{
args.Handled = true;
args.InteractionParticle = false;
}
// End Stellar Changes - don't play an interact particle for examining the strip UI
}

/// <summary>
Expand Down
Loading