mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 13:37:47 +03:00
* Mass Bug Fixing (#1256)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Mass bug fixing, for bugs related to #1220.
Feel free to link or send bugs.
Fix list:
- #1242
- #1243
- #1244
- https://github.com/space-wizards/space-station-14/pull/28084
- https://github.com/space-wizards/space-station-14/pull/28282
- Actually fixed PirateRadioSpawnRule heisentest (with a bandaid) (I
cancel if it's 0)
- https://github.com/Simple-Station/Einstein-Engines/issues/1263
---
# Changelog
<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
🆑
- fix: Fixed chair visuals drawing depth wrongly if you sat in a
north-facing chair.
- fix: Fixed buckling doing several buckles each time you did one.
- fix: Fixed the magic mirror.
- fix: Fixed beds re-positioning you every few seconds.
- fix: Fixed E not opening containers that are in another container.
- fix: Fixed disposal systems not flushing or ejecting properly.
---------
Co-authored-by: sleepyyapril <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>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
(cherry picked from commit 41501bd335c5e1e2e65b5d2ad040a3ae6851d4e8)
* Automatic Changelog Update (#1256)
(cherry picked from commit 9798f5363135cbe71479d0a14cf3215d01ed28f0)
* fix
* Fix animation looping bugs. (#29457)
Summary of the problem is in the corresponding engine commit: a4ea5a4620
This commit requires engine master right now.
I think #29144 is probably the most severe one, but I touched Jittering and RotatingLight too since they seemed sus too.
Fixes #29144
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 8d015f5c9ff60107dccdf35fa48e1558728ff269)
* Fix arcade machines (#30376)
(cherry picked from commit e72393df712cb2f5d1b4f6b4e2dc417c5584f07a)
* fix
* fix test
* fix test
* fix test
* fix
---------
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: SimpleStation Changelogs <simplestation14@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
106 lines
4.0 KiB
C#
106 lines
4.0 KiB
C#
using System.Numerics;
|
|
using Content.Shared.Jittering;
|
|
using Robust.Client.Animations;
|
|
using Robust.Client.GameObjects;
|
|
using Robust.Shared.Random;
|
|
|
|
namespace Content.Client.Jittering
|
|
{
|
|
public sealed class JitteringSystem : SharedJitteringSystem
|
|
{
|
|
[Dependency] private readonly IRobustRandom _random = default!;
|
|
[Dependency] private readonly AnimationPlayerSystem _animationPlayer = default!;
|
|
|
|
private readonly float[] _sign = { -1, 1 };
|
|
private readonly string _jitterAnimationKey = "jittering";
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<JitteringComponent, ComponentStartup>(OnStartup);
|
|
SubscribeLocalEvent<JitteringComponent, ComponentShutdown>(OnShutdown);
|
|
SubscribeLocalEvent<JitteringComponent, AnimationCompletedEvent>(OnAnimationCompleted);
|
|
}
|
|
|
|
private void OnStartup(EntityUid uid, JitteringComponent jittering, ComponentStartup args)
|
|
{
|
|
if (!TryComp(uid, out SpriteComponent? sprite))
|
|
return;
|
|
|
|
var animationPlayer = EnsureComp<AnimationPlayerComponent>(uid);
|
|
|
|
jittering.StartOffset = sprite.Offset;
|
|
_animationPlayer.Play(uid, animationPlayer, GetAnimation(jittering, sprite), _jitterAnimationKey);
|
|
}
|
|
|
|
private void OnShutdown(EntityUid uid, JitteringComponent jittering, ComponentShutdown args)
|
|
{
|
|
if (TryComp(uid, out AnimationPlayerComponent? animationPlayer))
|
|
_animationPlayer.Stop(uid, animationPlayer, _jitterAnimationKey);
|
|
|
|
if (TryComp(uid, out SpriteComponent? sprite))
|
|
sprite.Offset = jittering.StartOffset;
|
|
}
|
|
|
|
private void OnAnimationCompleted(EntityUid uid, JitteringComponent jittering, AnimationCompletedEvent args)
|
|
{
|
|
if(args.Key != _jitterAnimationKey)
|
|
return;
|
|
|
|
if (!args.Finished)
|
|
return;
|
|
|
|
if (TryComp(uid, out AnimationPlayerComponent? animationPlayer)
|
|
&& TryComp(uid, out SpriteComponent? sprite))
|
|
_animationPlayer.Play(uid, animationPlayer, GetAnimation(jittering, sprite), _jitterAnimationKey);
|
|
}
|
|
|
|
private Animation GetAnimation(JitteringComponent jittering, SpriteComponent sprite)
|
|
{
|
|
var amplitude = MathF.Min(4f, jittering.Amplitude / 100f + 1f) / 10f;
|
|
var offset = new Vector2(_random.NextFloat(amplitude/4f, amplitude),
|
|
_random.NextFloat(amplitude / 4f, amplitude / 3f));
|
|
|
|
offset.X *= _random.Pick(_sign);
|
|
offset.Y *= _random.Pick(_sign);
|
|
|
|
if (Math.Sign(offset.X) == Math.Sign(jittering.LastJitter.X)
|
|
|| Math.Sign(offset.Y) == Math.Sign(jittering.LastJitter.Y))
|
|
{
|
|
// If the sign is the same as last time on both axis we flip one randomly
|
|
// to avoid jitter staying in one quadrant too much.
|
|
if (_random.Prob(0.5f))
|
|
offset.X *= -1;
|
|
else
|
|
offset.Y *= -1;
|
|
}
|
|
|
|
var length = 0f;
|
|
// avoid dividing by 0 so animations don't try to be infinitely long
|
|
if (jittering.Frequency > 0)
|
|
length = 1f / jittering.Frequency;
|
|
|
|
jittering.LastJitter = offset;
|
|
|
|
return new Animation()
|
|
{
|
|
Length = TimeSpan.FromSeconds(length),
|
|
AnimationTracks =
|
|
{
|
|
new AnimationTrackComponentProperty()
|
|
{
|
|
ComponentType = typeof(SpriteComponent),
|
|
Property = nameof(SpriteComponent.Offset),
|
|
KeyFrames =
|
|
{
|
|
new AnimationTrackProperty.KeyFrame(sprite.Offset, 0f),
|
|
new AnimationTrackProperty.KeyFrame(jittering.StartOffset + offset, length),
|
|
}
|
|
}
|
|
}
|
|
};
|
|
}
|
|
}
|
|
}
|