Item Offer Bind

Content.Client/Input/ContentContexts.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Input;
+using Content.Shared.SS220.Input;
 using Robust.Shared.Input;
 
 namespace Content.Client.Input
@@ -57,6 +58,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(EngineKeyFunctions.Walk);
             human.AddFunction(ContentKeyFunctions.SwapHands);
             human.AddFunction(ContentKeyFunctions.Drop);
+            human.AddFunction(KeyFunctions220.ItemOffer); // SS220 ItemOffer bind
             human.AddFunction(ContentKeyFunctions.UseItemInHand);
             human.AddFunction(ContentKeyFunctions.AltUseItemInHand);
             human.AddFunction(ContentKeyFunctions.OpenCharacterMenu);

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -2,6 +2,7 @@
 using Content.Client.Stylesheets;
 using Content.Shared.CCVar;
 using Content.Shared.Input;
+using Content.Shared.SS220.Input;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
@@ -179,6 +180,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.ActivateItemInWorld);
             AddButton(ContentKeyFunctions.AltActivateItemInWorld);
             AddButton(ContentKeyFunctions.Drop);
+            AddButton(KeyFunctions220.ItemOffer); // SS220 ItemOffer bind
             AddButton(ContentKeyFunctions.ExamineEntity);
             AddButton(ContentKeyFunctions.SwapHands);
             AddButton(ContentKeyFunctions.MoveStoredItem);

Content.Server/SS220/ItemOfferVerb/Systems/ItemOfferSystem.cs

@@ -12,6 +12,8 @@
 using System.Linq;
 using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.Interaction.Components;
+using Robust.Shared.Input.Binding;
+using Content.Shared.SS220.Input;
 
 namespace Content.Server.SS220.ItemOfferVerb.Systems
 {
@@ -30,6 +32,23 @@ public override void Initialize()
             base.Initialize();
             SubscribeLocalEvent<HandsComponent, GetVerbsEvent<EquipmentVerb>>(AddOfferVerb);
             SubscribeLocalEvent<ItemReceiverComponent, ItemOfferAlertEvent>(OnItemOffserAlertClicked);
+
+            CommandBinds.Builder
+                .Bind(KeyFunctions220.ItemOffer,
+                    new PointerInputCmdHandler(HandleItemOfferKey))
+                .Register<ItemOfferSystem>();
+        }
+
+        private bool HandleItemOfferKey(in PointerInputCmdHandler.PointerInputCmdArgs args)
+        {
+            if (!args.EntityUid.IsValid() || !EntityManager.EntityExists(args.EntityUid))
+                return false;
+
+            if (args.Session?.AttachedEntity == null)
+                return false;
+
+            DoItemOffer(args.Session.AttachedEntity.Value, args.EntityUid);
+            return true;
         }
 
         private void OnItemOffserAlertClicked(Entity<ItemReceiverComponent> ent, ref ItemOfferAlertEvent args)
@@ -80,24 +99,15 @@ then when we checked the first hand we didn't find it and deleted the transfer r
 
         private void AddOfferVerb(EntityUid uid, HandsComponent component, GetVerbsEvent<EquipmentVerb> args)
         {
-            if (!args.CanInteract || !args.CanAccess || args.Hands == null || args.Hands.ActiveHandEntity == null
-                || HasComp<UnremoveableComponent>(args.Hands.ActiveHandEntity) || args.Target == args.User || !FindFreeHand(component, out var freeHand))
-                return;
-
-            // (fix https://github.com/SerbiaStrong-220/space-station-14/issues/2054)
-            if (HasComp<BorgChassisComponent>(args.User))
+            if (!args.CanInteract || !args.CanAccess || args.Hands == null || args.Hands.ActiveHandEntity == null)
                 return;
 
             EquipmentVerb verb = new EquipmentVerb()
             {
                 Text = "Передать предмет",
                 Act = () =>
                 {
-                    var itemReceiver = EnsureComp<ItemReceiverComponent>(uid);
-                    itemReceiver.Giver = args.User;
-                    itemReceiver.Item = args.Hands.ActiveHandEntity;
-                    _alerts.ShowAlert(uid, ItemOfferAlert);
-                    _popupSystem.PopupEntity($"{Name(args.User)} протягивает {Name(args.Hands.ActiveHandEntity!.Value)} {Name(uid)}", args.User, PopupType.Small);
+                   DoItemOffer(args.User, uid);
                 },
             };
 
@@ -110,7 +120,11 @@ public void TransferItemInHands(EntityUid receiver, ItemReceiverComponent? itemR
             _hands.PickupOrDrop(itemReceiver.Giver, itemReceiver.Item!.Value);
             if (_hands.TryPickupAnyHand(receiver, itemReceiver.Item!.Value))
             {
-                _popupSystem.PopupEntity($"{Name(itemReceiver.Giver)} передал {Name(itemReceiver.Item!.Value)} {Name(receiver)}!", itemReceiver.Giver, PopupType.Medium);
+                var loc = Loc.GetString("loc-item-offer-transfer",
+                    ("user", itemReceiver.Giver),
+                    ("item", itemReceiver.Item),
+                    ("target", receiver));
+                _popupSystem.PopupEntity(loc, itemReceiver.Giver, PopupType.Medium);
                 _alerts.ClearAlert(receiver, ItemOfferAlert);
                 _entMan.RemoveComponent<ItemReceiverComponent>(receiver);
             };
@@ -119,5 +133,32 @@ private bool FindFreeHand(HandsComponent component, [NotNullWhen(true)] out stri
         {
             return (freeHand = component.GetFreeHandNames().Any() ? component.GetFreeHandNames().First() : null) != null;
         }
+
+        private void DoItemOffer(EntityUid user, EntityUid target)
+        {
+            if (!TryComp<HandsComponent>(target, out var handsComponent))
+                return;
+
+            // (fix https://github.com/SerbiaStrong-220/space-station-14/issues/2054)
+            if (HasComp<BorgChassisComponent>(user) || !FindFreeHand(handsComponent, out _) || target == user )
+                return;
+
+            if (!_hands.TryGetActiveItem(user, out var item))
+                return;
+
+            if (HasComp<UnremoveableComponent>(item))
+                return;
+
+            var itemReceiver = EnsureComp<ItemReceiverComponent>(target);
+            itemReceiver.Giver = user;
+            itemReceiver.Item = item;
+            _alerts.ShowAlert(target, ItemOfferAlert);
+
+            var loc = Loc.GetString("loc-item-offer-attempt",
+                ("user", user),
+                ("item", item),
+                ("target", target));
+            _popupSystem.PopupEntity(loc, user);
+          }
     }
 }

Content.Shared/SS220/Input/KeyFunctions220.cs

@@ -23,6 +23,7 @@ public static class KeyFunctions220
     public static readonly BoundKeyFunction CalculatorTypeDivide = "CalculatorTypeDivide";
     public static readonly BoundKeyFunction CalculatorEnter = "CalculatorEnter";
     public static readonly BoundKeyFunction CalculatorClear = "CalculatorClear";
+    public static readonly BoundKeyFunction ItemOffer = "ItemOffer";
 
     public static void AddCalculatorKeys(IInputCmdContext context)
     {

Resources/Locale/ru-RU/ss220/escape-menu/ui/options-menu.ftl

@@ -1 +1,2 @@
 ui-options-function-smart-equip-neck = Умная экипировка на шею
+ui-options-function-item-offer = Передать предмет

Resources/Locale/ru-RU/ss220/itemoffer/itemoffer.ftl

@@ -0,0 +1,2 @@
+loc-item-offer-attempt = { $user } протягивает { $item } { $target }
+loc-item-offer-transfer = { $user } передал { $item } { $target }

Resources/keybinds.yml

@@ -640,4 +640,10 @@ binds:
 - function: CalculatorClear
   type: State
   key: Delete
-# SS220 Calculator end
+# SS220 Calculator end
+# SS220 ItemOffer bind begin
+- function: ItemOffer
+  type: State
+  key: R
+  mod1: Shift
+# SS220 ItemOffer bind end