From c396a36de2958b3a30e99ddd83b0953069dd0259 Mon Sep 17 00:00:00 2001 From: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com> Date: Mon, 11 Nov 2024 02:57:37 +0300 Subject: [PATCH] =?UTF-8?q?[Feature]=20=D0=A1=D0=B8=D1=81=D1=82=D0=B5?= =?UTF-8?q?=D0=BC=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87=D0=B8?= =?UTF-8?q?=20=D0=B8=D0=B7=20=D1=80=D1=83=D0=BA=20=D0=B2=20=D1=80=D1=83?= =?UTF-8?q?=D0=BA=D0=B8=20=20(#29)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Feature] Система передачи из рук в руки (#780) * up 1 * refactor * Update alerts.yml * fix popups * Update SharedOfferItemSystem.cs --------- Co-authored-by: Zack Backmen * sledi * fixim govno * Fixes * Last fix * apply suggestionges frome code reviewere * icon locale * rename + remove THE * fix1 * fix 2 * fix linter * Update Resources/Locale/ru-RU/alerts/alerts.ftl * Update Resources/Locale/ru-RU/alerts/alerts.ftl Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com> * Update Resources/Locale/ru-RU/alerts/alerts.ftl Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com> * Apply suggestions from code review * vzyat * Apply suggestions from code review --------- Co-authored-by: Zack Backmen Co-authored-by: FN Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com> --- Content.Client/Input/ContentContexts.cs | 1 + .../Options/UI/Tabs/KeyRebindTab.xaml.cs | 2 +- Content.Client/Options/UI/Tabs/MiscTab.xaml | 1 + .../Options/UI/Tabs/MiscTab.xaml.cs | 3 +- .../OfferItem/OfferItemIndicatorsOverlay.cs | 65 +++++ .../_CorvaxNext/OfferItem/OfferItemSystem.cs | 44 ++++ Content.Server/_CorvaxNext/OfferItemSystem.cs | 48 ++++ Content.Shared/Input/ContentKeyFunctions.cs | 1 + .../_CorvaxNext/Alert/Click/AcceptingOffer.cs | 8 + Content.Shared/_CorvaxNext/NextVars.cs | 17 ++ .../OfferItem/OfferItemComponent.cs | 26 ++ .../SharedOfferItemSystem.Interactions.cs | 74 ++++++ .../OfferItem/SharedOfferItemSystem.cs | 232 ++++++++++++++++++ .../interaction/offer-item-system.ftl | 13 + Resources/Locale/ru-RU/alerts/alerts.ftl | 2 + .../ru-RU/escape-menu/ui/options-menu.ftl | 2 + Resources/Prototypes/Alerts/alerts.yml | 10 + .../Prototypes/Entities/Mobs/Species/base.yml | 1 + .../Alerts/offer_item.rsi/meta.json | 14 ++ .../Alerts/offer_item.rsi/offer_item.png | Bin 0 -> 745 bytes .../Misc/give_item.rsi/give_item.png | Bin 0 -> 7276 bytes .../_CorvaxNext/Misc/give_item.rsi/meta.json | 14 ++ Resources/keybinds.yml | 3 + 23 files changed, 579 insertions(+), 2 deletions(-) create mode 100644 Content.Client/_CorvaxNext/OfferItem/OfferItemIndicatorsOverlay.cs create mode 100644 Content.Client/_CorvaxNext/OfferItem/OfferItemSystem.cs create mode 100644 Content.Server/_CorvaxNext/OfferItemSystem.cs create mode 100644 Content.Shared/_CorvaxNext/Alert/Click/AcceptingOffer.cs create mode 100644 Content.Shared/_CorvaxNext/NextVars.cs create mode 100644 Content.Shared/_CorvaxNext/OfferItem/OfferItemComponent.cs create mode 100644 Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.Interactions.cs create mode 100644 Content.Shared/_CorvaxNext/OfferItem/SharedOfferItemSystem.cs create mode 100644 Resources/Locale/ru-RU/_corvaxnext/interaction/offer-item-system.ftl create mode 100644 Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/meta.json create mode 100644 Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/offer_item.png create mode 100644 Resources/Textures/_CorvaxNext/Misc/give_item.rsi/give_item.png create mode 100644 Resources/Textures/_CorvaxNext/Misc/give_item.rsi/meta.json diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index 639f326f7f4..d90b0b5bda3 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/Content.Client/Input/ContentContexts.cs @@ -84,6 +84,7 @@ public static void SetupContexts(IInputContextContainer contexts) human.AddFunction(ContentKeyFunctions.Arcade1); human.AddFunction(ContentKeyFunctions.Arcade2); human.AddFunction(ContentKeyFunctions.Arcade3); + human.AddFunction(ContentKeyFunctions.OfferItem); // Corvax-Next-Offer // actions should be common (for ghosts, mobs, etc) common.AddFunction(ContentKeyFunctions.OpenActionsMenu); diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs index 24be904e061..fe5a7adafbb 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -184,7 +184,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action +