-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'EE/master' into Upstream-Merge-04/06/2024
- Loading branch information
Showing
146 changed files
with
4,315 additions
and
1,423 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| using System.Numerics; | ||
| using Robust.Client.GameObjects; | ||
| using Robust.Client.Graphics; | ||
| using Robust.Client.Input; | ||
| using Robust.Client.UserInterface; | ||
| using Robust.Shared.Enums; | ||
| using Robust.Shared.Utility; | ||
|
|
||
| namespace Content.Client.OfferItem; | ||
|
|
||
| public sealed class OfferItemIndicatorsOverlay : Overlay | ||
| { | ||
| private readonly IInputManager _inputManager; | ||
| private readonly IEntityManager _entMan; | ||
| private readonly IEyeManager _eye; | ||
| private readonly OfferItemSystem _offer; | ||
|
|
||
| private readonly Texture _sight; | ||
|
|
||
| public override OverlaySpace Space => OverlaySpace.ScreenSpace; | ||
|
|
||
| private readonly Color _mainColor = Color.White.WithAlpha(0.3f); | ||
| private readonly Color _strokeColor = Color.Black.WithAlpha(0.5f); | ||
| private readonly float _scale = 0.6f; // 1 is a little big | ||
|
|
||
| public OfferItemIndicatorsOverlay(IInputManager input, IEntityManager entMan, | ||
| IEyeManager eye, OfferItemSystem offerSys) | ||
| { | ||
| _inputManager = input; | ||
| _entMan = entMan; | ||
| _eye = eye; | ||
| _offer = offerSys; | ||
|
|
||
| var spriteSys = _entMan.EntitySysManager.GetEntitySystem<SpriteSystem>(); | ||
| _sight = spriteSys.Frame0(new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Misc/give_item.rsi"), | ||
| "give_item")); | ||
| } | ||
|
|
||
| protected override bool BeforeDraw(in OverlayDrawArgs args) | ||
| { | ||
| if (!_offer.IsInOfferMode()) | ||
| return false; | ||
|
|
||
| return base.BeforeDraw(in args); | ||
| } | ||
|
|
||
| protected override void Draw(in OverlayDrawArgs args) | ||
| { | ||
| var mouseScreenPosition = _inputManager.MouseScreenPosition; | ||
| var mousePosMap = _eye.PixelToMap(mouseScreenPosition); | ||
| if (mousePosMap.MapId != args.MapId) | ||
| return; | ||
|
|
||
|
|
||
| var mousePos = mouseScreenPosition.Position; | ||
| var uiScale = (args.ViewportControl as Control)?.UIScale ?? 1f; | ||
| var limitedScale = uiScale > 1.25f ? 1.25f : uiScale; | ||
|
|
||
| DrawSight(_sight, args.ScreenHandle, mousePos, limitedScale * _scale); | ||
| } | ||
|
|
||
| private void DrawSight(Texture sight, DrawingHandleScreen screen, Vector2 centerPos, float scale) | ||
| { | ||
| var sightSize = sight.Size * scale; | ||
| var expandedSize = sightSize + new Vector2(7f, 7f); | ||
|
|
||
| screen.DrawTextureRect(sight, | ||
| UIBox2.FromDimensions(centerPos - sightSize * 0.5f, sightSize), _strokeColor); | ||
| screen.DrawTextureRect(sight, | ||
| UIBox2.FromDimensions(centerPos - expandedSize * 0.5f, expandedSize), _mainColor); | ||
| } | ||
| } |
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,51 @@ | ||
| using Content.Shared.CCVar; | ||
| using Content.Shared.OfferItem; | ||
| using Robust.Client.Graphics; | ||
| using Robust.Client.Input; | ||
| using Robust.Client.Player; | ||
| using Robust.Shared.Configuration; | ||
|
|
||
| namespace Content.Client.OfferItem; | ||
|
|
||
| public sealed class OfferItemSystem : SharedOfferItemSystem | ||
| { | ||
| [Dependency] private readonly IOverlayManager _overlayManager = default!; | ||
| [Dependency] private readonly IPlayerManager _playerManager = default!; | ||
| [Dependency] private readonly IConfigurationManager _cfg = default!; | ||
| [Dependency] private readonly IInputManager _inputManager = default!; | ||
| [Dependency] private readonly IEyeManager _eye = default!; | ||
|
|
||
| public override void Initialize() | ||
| { | ||
| Subs.CVar(_cfg, CCVars.OfferModeIndicatorsPointShow, OnShowOfferIndicatorsChanged, true); | ||
| } | ||
| public override void Shutdown() | ||
| { | ||
| _overlayManager.RemoveOverlay<OfferItemIndicatorsOverlay>(); | ||
|
|
||
| base.Shutdown(); | ||
| } | ||
|
|
||
| public bool IsInOfferMode() | ||
| { | ||
| var entity = _playerManager.LocalEntity; | ||
|
|
||
| if (entity == null) | ||
| return false; | ||
|
|
||
| return IsInOfferMode(entity.Value); | ||
| } | ||
| private void OnShowOfferIndicatorsChanged(bool isShow) | ||
| { | ||
| if (isShow) | ||
| { | ||
| _overlayManager.AddOverlay(new OfferItemIndicatorsOverlay( | ||
| _inputManager, | ||
| EntityManager, | ||
| _eye, | ||
| this)); | ||
| } | ||
| else | ||
| _overlayManager.RemoveOverlay<OfferItemIndicatorsOverlay>(); | ||
| } | ||
| } |
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,24 @@ | ||
| using Content.Shared.OfferItem; | ||
| using Content.Server.OfferItem; | ||
| using Content.Shared.Alert; | ||
| using JetBrains.Annotations; | ||
|
|
||
| namespace Content.Server.Alert.Click; | ||
|
|
||
| /// <summary> | ||
| /// Accepting the offer and receive item | ||
| /// </summary> | ||
| [UsedImplicitly] | ||
| [DataDefinition] | ||
| public sealed partial class AcceptOffer : IAlertClick | ||
| { | ||
| public void AlertClicked(EntityUid player) | ||
| { | ||
| var entManager = IoCManager.Resolve<IEntityManager>(); | ||
|
|
||
| if (entManager.TryGetComponent(player, out OfferItemComponent? offerItem)) | ||
| { | ||
| entManager.System<OfferItemSystem>().Receive(player, offerItem); | ||
| } | ||
| } | ||
| } |
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,8 @@ | ||
| namespace Content.Server.DeltaV.Paper; | ||
|
|
||
| /// <summary> | ||
| /// Raised on the pen when trying to sign a paper. | ||
| /// If it's cancelled the signature wasn't made. | ||
| /// </summary> | ||
| [ByRefEvent] | ||
| public record struct SignAttemptEvent(EntityUid Paper, EntityUid User, bool Cancelled = false); |
Oops, something went wrong.