tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix examining and right clicking entities in backpacks (#11867)

Browse Source
This commit is contained in:
DrSmugleaf
2022-10-12 18:35:25 +02:00
committed by GitHub
parent 27c0c4f9b2
commit df94f6b4a4
1 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Content.Client/Storage/StorageBoundUserInterface.cs
View File

@@ -1,7 +1,12 @@
using Content.Client.Examine;
using Content.Client.Storage.UI; using Content.Client.Storage.UI;
using Content.Client.UserInterface.Controls; using Content.Client.UserInterface.Controls;
using Content.Client.Verbs;
using Content.Shared.Input;
using Content.Shared.Interaction;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Shared.Input; using Robust.Shared.Input;
using static Content.Shared.Storage.SharedStorageComponent; using static Content.Shared.Storage.SharedStorageComponent;
@@ -24,7 +29,8 @@ namespace Content.Client.Storage
if (_window == null) if (_window == null)
{ {
var entMan = IoCManager.Resolve<IEntityManager>(); var entMan = IoCManager.Resolve<IEntityManager>();
_window = new StorageWindow(entMan) {Title = entMan.GetComponent<MetaDataComponent>(Owner.Owner).EntityName}; _window = new StorageWindow(entMan)
{Title = entMan.GetComponent<MetaDataComponent>(Owner.Owner).EntityName};
_window.EntityList.GenerateItem += _window.GenerateButton; _window.EntityList.GenerateItem += _window.GenerateButton;
_window.EntityList.ItemPressed += InteractWithItem; _window.EntityList.ItemPressed += InteractWithItem;
@@ -43,10 +49,46 @@ namespace Content.Client.Storage
{ {
if (cData is not EntityListData {Uid: var entity}) if (cData is not EntityListData {Uid: var entity})
return; return;
if (args.Event.Function == EngineKeyFunctions.UIClick) if (args.Event.Function == EngineKeyFunctions.UIClick)
{ {
SendMessage(new StorageInteractWithItemEvent(entity)); SendMessage(new StorageInteractWithItemEvent(entity));
} }
else if (IoCManager.Resolve<IEntityManager>().EntityExists(entity))
{
OnButtonPressed(args.Event, entity);
}
}
private void OnButtonPressed(GUIBoundKeyEventArgs args, EntityUid entity)
{
var entitySys = IoCManager.Resolve<IEntitySystemManager>();
var entities = IoCManager.Resolve<IEntityManager>();
if (args.Function == ContentKeyFunctions.ExamineEntity)
{
entitySys.GetEntitySystem<ExamineSystem>()
.DoExamine(entity);
}
else if (args.Function == EngineKeyFunctions.UseSecondary)
{
entitySys.GetEntitySystem<VerbSystem>().VerbMenu.OpenVerbMenu(entity);
}
else if (args.Function == ContentKeyFunctions.ActivateItemInWorld)
{
entities.EntityNetManager?.SendSystemNetworkMessage(
new InteractInventorySlotEvent(entity, altInteract: false));
}
else if (args.Function == ContentKeyFunctions.AltActivateItemInWorld)
{
entities.RaisePredictiveEvent(new InteractInventorySlotEvent(entity, altInteract: true));
}
else
{
return;
}
args.Handle();
} }
public void TouchedContainerButton(BaseButton.ButtonEventArgs args) public void TouchedContainerButton(BaseButton.ButtonEventArgs args)