mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 05:27:38 +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>
188 lines
6.9 KiB
C#
188 lines
6.9 KiB
C#
using Content.Shared.Buckle;
|
|
using Content.Shared.Buckle.Components;
|
|
using Content.Shared.Climbing.Systems;
|
|
using Content.Shared.Climbing.Components;
|
|
using Content.Shared.Hands.Components;
|
|
using Content.Shared.Movement.Systems;
|
|
using Content.Shared.Physics;
|
|
using Content.Shared.Rotation;
|
|
using Robust.Shared.Audio.Systems;
|
|
using Robust.Shared.Physics;
|
|
using Robust.Shared.Physics.Systems;
|
|
using System.Linq;
|
|
|
|
namespace Content.Shared.Standing;
|
|
|
|
public sealed class StandingStateSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
|
|
[Dependency] private readonly SharedAudioSystem _audio = default!;
|
|
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
|
|
[Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
|
|
[Dependency] private readonly SharedBuckleSystem _buckle = default!;
|
|
[Dependency] private readonly EntityLookupSystem _lookup = default!;
|
|
[Dependency] private readonly ClimbSystem _climb = default!;
|
|
|
|
// If StandingCollisionLayer value is ever changed to more than one layer, the logic needs to be edited.
|
|
private const int StandingCollisionLayer = (int) CollisionGroup.MidImpassable;
|
|
|
|
public bool IsDown(EntityUid uid, StandingStateComponent? standingState = null)
|
|
{
|
|
if (!Resolve(uid, ref standingState, false))
|
|
return false;
|
|
|
|
return standingState.CurrentState is StandingState.Lying or StandingState.GettingUp;
|
|
}
|
|
|
|
public bool Down(EntityUid uid, bool playSound = true, bool dropHeldItems = true,
|
|
StandingStateComponent? standingState = null,
|
|
AppearanceComponent? appearance = null,
|
|
HandsComponent? hands = null,
|
|
bool setDrawDepth = false)
|
|
{
|
|
// TODO: This should actually log missing comps...
|
|
if (!Resolve(uid, ref standingState, false))
|
|
return false;
|
|
|
|
// Optional component.
|
|
Resolve(uid, ref appearance, ref hands, false);
|
|
|
|
if (standingState.CurrentState is StandingState.Lying or StandingState.GettingUp)
|
|
return true;
|
|
|
|
// This is just to avoid most callers doing this manually saving boilerplate
|
|
// 99% of the time you'll want to drop items but in some scenarios (e.g. buckling) you don't want to.
|
|
// We do this BEFORE downing because something like buckle may be blocking downing but we want to drop hand items anyway
|
|
// and ultimately this is just to avoid boilerplate in Down callers + keep their behavior consistent.
|
|
if (dropHeldItems && hands != null)
|
|
RaiseLocalEvent(uid, new DropHandItemsEvent(), false);
|
|
|
|
if (TryComp(uid, out BuckleComponent? buckle) && buckle.Buckled && !_buckle.TryUnbuckle(uid, uid, buckle))
|
|
return false;
|
|
|
|
var msg = new DownAttemptEvent();
|
|
RaiseLocalEvent(uid, msg, false);
|
|
|
|
if (msg.Cancelled)
|
|
return false;
|
|
|
|
standingState.CurrentState = StandingState.Lying;
|
|
Dirty(uid, standingState);
|
|
RaiseLocalEvent(uid, new DownedEvent(), false);
|
|
|
|
// Seemed like the best place to put it
|
|
_appearance.SetData(uid, RotationVisuals.RotationState, RotationState.Horizontal, appearance);
|
|
|
|
// Change collision masks to allow going under certain entities like flaps and tables
|
|
if (TryComp(uid, out FixturesComponent? fixtureComponent))
|
|
foreach (var (key, fixture) in fixtureComponent.Fixtures)
|
|
{
|
|
if ((fixture.CollisionMask & StandingCollisionLayer) == 0)
|
|
continue;
|
|
|
|
standingState.ChangedFixtures.Add(key);
|
|
_physics.SetCollisionMask(uid, key, fixture, fixture.CollisionMask & ~StandingCollisionLayer, manager: fixtureComponent);
|
|
}
|
|
|
|
// check if component was just added or streamed to client
|
|
// if true, no need to play sound - mob was down before player could seen that
|
|
if (standingState.LifeStage <= ComponentLifeStage.Starting)
|
|
return true;
|
|
|
|
if (playSound)
|
|
_audio.PlayPredicted(standingState.DownSound, uid, null);
|
|
|
|
_movement.RefreshMovementSpeedModifiers(uid);
|
|
|
|
Climb(uid);
|
|
|
|
return true;
|
|
}
|
|
|
|
public bool Stand(EntityUid uid,
|
|
StandingStateComponent? standingState = null,
|
|
AppearanceComponent? appearance = null,
|
|
bool force = false)
|
|
{
|
|
// TODO: This should actually log missing comps...
|
|
if (!Resolve(uid, ref standingState, false))
|
|
return false;
|
|
|
|
// Optional component.
|
|
Resolve(uid, ref appearance, false);
|
|
|
|
if (standingState.CurrentState is StandingState.Standing
|
|
|| TryComp(uid, out BuckleComponent? buckle)
|
|
&& buckle.Buckled && !_buckle.TryUnbuckle(uid, uid, buckleComp: buckle))
|
|
return true;
|
|
|
|
if (!force)
|
|
{
|
|
var msg = new StandAttemptEvent();
|
|
RaiseLocalEvent(uid, msg, false);
|
|
|
|
if (msg.Cancelled)
|
|
return false;
|
|
}
|
|
|
|
standingState.CurrentState = StandingState.Standing;
|
|
|
|
Dirty(uid, standingState);
|
|
RaiseLocalEvent(uid, new StoodEvent(), false);
|
|
|
|
_appearance.SetData(uid, RotationVisuals.RotationState, RotationState.Vertical, appearance);
|
|
|
|
if (TryComp(uid, out FixturesComponent? fixtureComponent))
|
|
{
|
|
foreach (var key in standingState.ChangedFixtures)
|
|
{
|
|
if (fixtureComponent.Fixtures.TryGetValue(key, out var fixture))
|
|
_physics.SetCollisionMask(uid, key, fixture, fixture.CollisionMask | StandingCollisionLayer, fixtureComponent);
|
|
}
|
|
}
|
|
standingState.ChangedFixtures.Clear();
|
|
_movement.RefreshMovementSpeedModifiers(uid);
|
|
|
|
Climb(uid);
|
|
|
|
return true;
|
|
}
|
|
|
|
private void Climb(EntityUid uid)
|
|
{
|
|
_climb.ForciblyStopClimbing(uid);
|
|
|
|
var entityDistances = new Dictionary<EntityUid, float>();
|
|
|
|
foreach (var entity in _lookup.GetEntitiesInRange(uid, 0.3f))
|
|
if (HasComp<ClimbableComponent>(entity))
|
|
entityDistances[entity] = (Transform(uid).Coordinates.Position - Transform(entity).Coordinates.Position).LengthSquared();
|
|
|
|
if (entityDistances.Count > 0)
|
|
_climb.ForciblySetClimbing(uid, entityDistances.OrderBy(e => e.Value).First().Key);
|
|
}
|
|
}
|
|
|
|
|
|
public sealed class DropHandItemsEvent : EventArgs { }
|
|
|
|
/// <summary>
|
|
/// Subscribe if you can potentially block a down attempt.
|
|
/// </summary>
|
|
public sealed class DownAttemptEvent : CancellableEntityEventArgs { }
|
|
|
|
/// <summary>
|
|
/// Subscribe if you can potentially block a stand attempt.
|
|
/// </summary>
|
|
public sealed class StandAttemptEvent : CancellableEntityEventArgs { }
|
|
|
|
/// <summary>
|
|
/// Raised when an entity becomes standing
|
|
/// </summary>
|
|
public sealed class StoodEvent : EntityEventArgs { }
|
|
|
|
/// <summary>
|
|
/// Raised when an entity is not standing
|
|
/// </summary>
|
|
public sealed class DownedEvent : EntityEventArgs { }
|