forked from Simple-Station/Einstein-Engines
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Merge pull request Simple-Station#13 from Eagle-0/Grabintent"
- Loading branch information
Showing
41 changed files
with
164 additions
and
1,321 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 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
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
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,14 @@ | ||
| namespace Content.Server.Standing; | ||
|
|
||
| [RegisterComponent] | ||
| public sealed partial class LayingDownComponent : Component | ||
| { | ||
| [DataField] | ||
| public float DownedSpeedMultiplier = 0.15f; | ||
|
|
||
| [DataField] | ||
| public TimeSpan Cooldown = TimeSpan.FromSeconds(2.5f); | ||
|
|
||
| [DataField] | ||
| public TimeSpan NextToggleAttempt = TimeSpan.Zero; | ||
| } |
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,28 +1,101 @@ | ||
| using Content.Shared._White; | ||
| using Content.Shared._White.Standing; | ||
| using Robust.Shared.Configuration; | ||
| 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; | ||
|
|
||
| namespace Content.Server.Standing; | ||
|
|
||
| public sealed class LayingDownSystem : SharedLayingDownSystem // WD EDIT | ||
| /// <remarks>Unfortunately cannot be shared because some standing conditions are server-side only</remarks> | ||
| public sealed class LayingDownSystem : EntitySystem | ||
| { | ||
| [Dependency] private readonly INetConfigurationManager _cfg = default!; | ||
| [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!; | ||
|
|
||
|
|
||
| public override void Initialize() | ||
| { | ||
| base.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>(); | ||
| } | ||
|
|
||
| SubscribeNetworkEvent<CheckAutoGetUpEvent>(OnCheckAutoGetUp); | ||
| private void DoRefreshMovementSpeed(EntityUid uid, LayingDownComponent component, object args) | ||
| { | ||
| _movement.RefreshMovementSpeedModifiers(uid); | ||
| } | ||
|
|
||
| private void OnCheckAutoGetUp(CheckAutoGetUpEvent ev, EntitySessionEventArgs args) | ||
| private void OnRefreshMovementSpeed(EntityUid uid, LayingDownComponent component, RefreshMovementSpeedModifiersEvent args) | ||
| { | ||
| var uid = GetEntity(ev.User); | ||
| if (TryComp<StandingStateComponent>(uid, out var standingState) && standingState.Standing) | ||
| return; | ||
|
|
||
| if (!TryComp(uid, out LayingDownComponent? layingDown)) | ||
| 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) | ||
| return; | ||
|
|
||
| layingDown.AutoGetUp = _cfg.GetClientCVar(args.SenderSession.Channel, WhiteCVars.AutoGetUp); | ||
| Dirty(uid, layingDown); | ||
| _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; | ||
| } | ||
| } |
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
Oops, something went wrong.