-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Port] Lying Down System / Система Лежания (#2)
* add: White lay down * fix: rotation * fix * fix: rotation * fix
- Loading branch information
Showing
14 changed files
with
362 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| using Content.Shared._White.Standing; | ||
| using Content.Shared.Buckle; | ||
| using Content.Shared.Rotation; | ||
| using Content.Shared.Standing; | ||
| using Robust.Client.GameObjects; | ||
| using Robust.Client.Graphics; | ||
| using Robust.Shared.Timing; | ||
|
|
||
| namespace Content.Client._White.Standing; | ||
|
|
||
| public sealed class LayingDownSystem : SharedLayingDownSystem | ||
| { | ||
| [Dependency] private readonly IGameTiming _timing = default!; | ||
| [Dependency] private readonly IEyeManager _eyeManager = default!; | ||
| [Dependency] private readonly StandingStateSystem _standing = default!; | ||
| [Dependency] private readonly AnimationPlayerSystem _animation = default!; | ||
| [Dependency] private readonly SharedBuckleSystem _buckle = default!; | ||
|
|
||
| public override void Initialize() | ||
| { | ||
| base.Initialize(); | ||
|
|
||
| SubscribeLocalEvent<LayingDownComponent, MoveEvent>(OnMovementInput); | ||
|
|
||
| SubscribeNetworkEvent<CheckAutoGetUpEvent>(OnCheckAutoGetUp); | ||
| } | ||
|
|
||
| private void OnMovementInput(EntityUid uid, LayingDownComponent component, MoveEvent args) | ||
| { | ||
| if (!_timing.IsFirstTimePredicted) | ||
| return; | ||
|
|
||
| if (!_standing.IsDown(uid)) | ||
| return; | ||
|
|
||
| if (_buckle.IsBuckled(uid)) | ||
| return; | ||
|
|
||
| if (_animation.HasRunningAnimation(uid, "rotate")) | ||
| return; | ||
|
|
||
| if (!TryComp<TransformComponent>(uid, out var transform) | ||
| || !TryComp<SpriteComponent>(uid, out var sprite) | ||
| || !TryComp<RotationVisualsComponent>(uid, out var rotationVisuals)) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| var rotation = transform.LocalRotation + (_eyeManager.CurrentEye.Rotation - (transform.LocalRotation - transform.WorldRotation)); | ||
|
|
||
| if (rotation.GetDir() is Direction.SouthEast or Direction.East or Direction.NorthEast or Direction.North) | ||
| { | ||
| rotationVisuals.HorizontalRotation = Angle.FromDegrees(270); | ||
| sprite.Rotation = Angle.FromDegrees(270); | ||
| return; | ||
| } | ||
|
|
||
| rotationVisuals.HorizontalRotation = Angle.FromDegrees(90); | ||
| sprite.Rotation = Angle.FromDegrees(90); | ||
| } | ||
|
|
||
| private void OnCheckAutoGetUp(CheckAutoGetUpEvent ev, EntitySessionEventArgs args) | ||
| { | ||
| if (!_timing.IsFirstTimePredicted) | ||
| return; | ||
|
|
||
| var uid = GetEntity(ev.User); | ||
|
|
||
| if (!TryComp<TransformComponent>(uid, out var transform) || !TryComp<RotationVisualsComponent>(uid, out var rotationVisuals)) | ||
| return; | ||
|
|
||
| var rotation = transform.LocalRotation + (_eyeManager.CurrentEye.Rotation - (transform.LocalRotation - transform.WorldRotation)); | ||
|
|
||
| if (rotation.GetDir() is Direction.SouthEast or Direction.East or Direction.NorthEast or Direction.North) | ||
| { | ||
| rotationVisuals.HorizontalRotation = Angle.FromDegrees(270); | ||
| return; | ||
| } | ||
|
|
||
| rotationVisuals.HorizontalRotation = Angle.FromDegrees(90); | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,101 +1,28 @@ | ||
| using Content.Shared.ActionBlocker; | ||
| using Content.Shared.Input; | ||
| using Content.Shared.Movement.Systems; | ||
| using Content.Shared.Popups; | ||
| using Content.Shared.Standing; | ||
| using Robust.Shared.Input.Binding; | ||
| using Robust.Shared.Player; | ||
| using Robust.Shared.Timing; | ||
| using Content.Shared._White; | ||
| using Content.Shared._White.Standing; | ||
| using Robust.Shared.Configuration; | ||
|
|
||
| namespace Content.Server.Standing; | ||
|
|
||
| /// <remarks>Unfortunately cannot be shared because some standing conditions are server-side only</remarks> | ||
| public sealed class LayingDownSystem : EntitySystem | ||
| public sealed class LayingDownSystem : SharedLayingDownSystem // WD EDIT | ||
| { | ||
| [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; | ||
| [Dependency] private readonly MovementSpeedModifierSystem _movement = default!; | ||
| [Dependency] private readonly SharedPopupSystem _popups = default!; | ||
| [Dependency] private readonly Shared.Standing.StandingStateSystem _standing = default!; // WHY IS THERE TWO DIFFERENT STANDING SYSTEMS?! | ||
| [Dependency] private readonly IGameTiming _timing = default!; | ||
|
|
||
| [Dependency] private readonly INetConfigurationManager _cfg = default!; | ||
|
|
||
| public override void Initialize() | ||
| { | ||
| CommandBinds.Builder | ||
| .Bind(ContentKeyFunctions.ToggleStanding, InputCmdHandler.FromDelegate(ToggleStanding, handle: false, outsidePrediction: false)) | ||
| .Register<LayingDownSystem>(); | ||
|
|
||
| SubscribeLocalEvent<LayingDownComponent, StoodEvent>(DoRefreshMovementSpeed); | ||
| SubscribeLocalEvent<LayingDownComponent, DownedEvent>(DoRefreshMovementSpeed); | ||
| SubscribeLocalEvent<LayingDownComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeed); | ||
| SubscribeLocalEvent<LayingDownComponent, EntParentChangedMessage>(OnParentChanged); | ||
| } | ||
|
|
||
| public override void Shutdown() | ||
| { | ||
| base.Shutdown(); | ||
|
|
||
| CommandBinds.Unregister<LayingDownSystem>(); | ||
| } | ||
| base.Initialize(); | ||
|
|
||
| private void DoRefreshMovementSpeed(EntityUid uid, LayingDownComponent component, object args) | ||
| { | ||
| _movement.RefreshMovementSpeedModifiers(uid); | ||
| SubscribeNetworkEvent<CheckAutoGetUpEvent>(OnCheckAutoGetUp); | ||
| } | ||
|
|
||
| private void OnRefreshMovementSpeed(EntityUid uid, LayingDownComponent component, RefreshMovementSpeedModifiersEvent args) | ||
| private void OnCheckAutoGetUp(CheckAutoGetUpEvent ev, EntitySessionEventArgs args) | ||
| { | ||
| if (TryComp<StandingStateComponent>(uid, out var standingState) && standingState.Standing) | ||
| return; | ||
| var uid = GetEntity(ev.User); | ||
|
|
||
| args.ModifySpeed(component.DownedSpeedMultiplier, component.DownedSpeedMultiplier, bypassImmunity: true); | ||
| } | ||
|
|
||
| private void OnParentChanged(EntityUid uid, LayingDownComponent component, EntParentChangedMessage args) | ||
| { | ||
| // If the entity is not on a grid, try to make it stand up to avoid issues | ||
| if (!TryComp<StandingStateComponent>(uid, out var standingState) | ||
| || standingState.Standing | ||
| || Transform(uid).GridUid != null) | ||
| if (!TryComp(uid, out LayingDownComponent? layingDown)) | ||
| return; | ||
|
|
||
| _standing.Stand(uid, standingState); | ||
| } | ||
|
|
||
| private void ToggleStanding(ICommonSession? session) | ||
| { | ||
| if (session is not { AttachedEntity: { Valid: true } uid } playerSession | ||
| || !Exists(uid) | ||
| || !TryComp<StandingStateComponent>(uid, out var standingState) | ||
| || !TryComp<LayingDownComponent>(uid, out var layingDown)) | ||
| return; | ||
|
|
||
| // If successful, show popup to self and others. Otherwise, only to self. | ||
| if (ToggleStandingImpl(uid, standingState, layingDown, out var popupBranch)) | ||
| { | ||
| _popups.PopupEntity(Loc.GetString($"laying-comp-{popupBranch}-other", ("entity", uid)), uid, Filter.PvsExcept(uid), true); | ||
| layingDown.NextToggleAttempt = _timing.CurTime + layingDown.Cooldown; | ||
| } | ||
|
|
||
| _popups.PopupEntity(Loc.GetString($"laying-comp-{popupBranch}-self", ("entity", uid)), uid, uid); | ||
| } | ||
|
|
||
| private bool ToggleStandingImpl(EntityUid uid, StandingStateComponent standingState, LayingDownComponent layingDown, out string popupBranch) | ||
| { | ||
| var success = layingDown.NextToggleAttempt <= _timing.CurTime; | ||
|
|
||
| if (_standing.IsDown(uid, standingState)) | ||
| { | ||
| success = success && _standing.Stand(uid, standingState, force: false); | ||
| popupBranch = success ? "stand-success" : "stand-fail"; | ||
| } | ||
| else | ||
| { | ||
| success = success && Transform(uid).GridUid != null; // Do not allow laying down when not on a surface. | ||
| success = success && _standing.Down(uid, standingState: standingState, playSound: true, dropHeldItems: false); | ||
| popupBranch = success ? "lay-success" : "lay-fail"; | ||
| } | ||
|
|
||
| return success; | ||
| layingDown.AutoGetUp = _cfg.GetClientCVar(args.SenderSession.Channel, WhiteCVars.AutoGetUp); | ||
| Dirty(uid, layingDown); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,35 @@ | ||
| using Robust.Shared.Audio; | ||
| using Robust.Shared.GameStates; | ||
|
|
||
| namespace Content.Shared.Standing | ||
| namespace Content.Shared.Standing; | ||
|
|
||
| [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] | ||
| public sealed partial class StandingStateComponent : Component | ||
| { | ||
| [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] | ||
| [Access(typeof(StandingStateSystem))] | ||
| public sealed partial class StandingStateComponent : Component | ||
| { | ||
| [ViewVariables(VVAccess.ReadWrite)] | ||
| [DataField] | ||
| public SoundSpecifier DownSound { get; private set; } = new SoundCollectionSpecifier("BodyFall"); | ||
| [ViewVariables(VVAccess.ReadWrite)] | ||
| [DataField] | ||
| public SoundSpecifier DownSound { get; private set; } = new SoundCollectionSpecifier("BodyFall"); | ||
|
|
||
| // WD EDIT START | ||
| [DataField, AutoNetworkedField] | ||
| public StandingState CurrentState { get; set; } = StandingState.Standing; | ||
| // WD EDIT END | ||
|
|
||
| [DataField, AutoNetworkedField] | ||
| public bool Standing { get; set; } = true; | ||
| [DataField, AutoNetworkedField] | ||
| public bool Standing { get; set; } = true; | ||
|
|
||
| /// <summary> | ||
| /// List of fixtures that had their collision mask changed when the entity was downed. | ||
| /// Required for re-adding the collision mask. | ||
| /// </summary> | ||
| [DataField, AutoNetworkedField] | ||
| public List<string> ChangedFixtures = new(); | ||
| } | ||
| /// <summary> | ||
| /// List of fixtures that had their collision mask changed when the entity was downed. | ||
| /// Required for re-adding the collision mask. | ||
| /// </summary> | ||
| [DataField, AutoNetworkedField] | ||
| public List<string> ChangedFixtures = new(); | ||
| } | ||
| // WD EDIT START | ||
| public enum StandingState | ||
| { | ||
| Lying, | ||
| GettingUp, | ||
| Standing, | ||
| } | ||
| // WD EDIT END |
Oops, something went wrong.