Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Add alt click to hands (#12330)

Browse Source
This commit is contained in:
Jacob Tong
2022-11-03 18:36:45 -07:00
committed by GitHub
parent 88a4ee0ce1
commit 74b63e83fd
4 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/Hands/Systems/HandsSystem.cs
View File

@@ -242,6 +242,16 @@ namespace Content.Client.Hands.Systems
_verbs.VerbMenu.OpenVerbMenu(entity);
}
public void UIHandAltActivateItem(string handName)
{
if (!TryGetPlayerHands(out var hands)
|| !hands.Hands.TryGetValue(handName, out var hand)
|| hand.HeldEntity is not { Valid: true } entity)
return;
EntityManager.RaisePredictiveEvent(new RequestHandAltInteractEvent(entity));
}
#region visuals

16
Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
View File

@@ -69,17 +69,25 @@ public sealed class HandsUIController : UIController, IOnStateEntered<GameplaySt
return;
}
if (args.Function == ContentKeyFunctions.ExamineEntity)
if (args.Function == EngineKeyFunctions.UIClick)
{
_handsSystem.UIInventoryExamine(hand.SlotName);
_handsSystem.UIHandClick(_playerHandsComponent, hand.SlotName);
}
else if (args.Function == EngineKeyFunctions.UseSecondary)
{
_handsSystem.UIHandOpenContextMenu(hand.SlotName);
}
else if (args.Function == EngineKeyFunctions.UIClick)
else if (args.Function == ContentKeyFunctions.ActivateItemInWorld)
{
_handsSystem.UIHandClick(_playerHandsComponent, hand.SlotName);
_handsSystem.UIHandActivate(hand.SlotName);
}
else if (args.Function == ContentKeyFunctions.AltActivateItemInWorld)
{
_handsSystem.UIHandAltActivateItem(hand.SlotName);
}
else if (args.Function == ContentKeyFunctions.ExamineEntity)
{
_handsSystem.UIInventoryExamine(hand.SlotName);
}
}