From d32eb158d4ce6cd077efa939d946bfa787335d97 Mon Sep 17 00:00:00 2001 From: Spatison <137375981+Spatison@users.noreply.github.com> Date: Thu, 18 Jul 2024 01:33:28 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=BC=D0=B5=D1=82=D1=8B=20=D0=BC=D0=BE=D0=B6?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D0=B2=D0=B0?= =?UTF-8?q?=D1=82=D1=8C=20=D0=B8=D0=B7=20=D1=80=D1=83=D0=BA=20=D0=B2=20?= =?UTF-8?q?=D1=80=D1=83=D0=BA=D0=B8=20(#462)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add: Теперь предеты можно передовать из рук в руки * Кудато не туда уехало --- Content.Client/Input/ContentContexts.cs | 1 + .../Options/UI/Tabs/KeyRebindTab.xaml.cs | 1 + Content.Client/Options/UI/Tabs/MiscTab.xaml | 1 + .../Options/UI/Tabs/MiscTab.xaml.cs | 6 + .../OfferItem/OfferItemIndicatorsOverlay.cs | 72 ++++++++ .../_White/OfferItem/OfferItemSystem.cs | 52 ++++++ .../_White/Alert/Click/AcceptOffer.cs | 24 +++ .../_White/OfferItem/OfferItemSystem.cs | 83 +++++++++ Content.Shared/Alert/AlertType.cs | 3 +- Content.Shared/Input/ContentKeyFunctions.cs | 1 + .../_White/OfferItem/OfferItemComponent.cs | 26 +++ .../SharedOfferItemSystem.Interactions.cs | 74 ++++++++ .../_White/OfferItem/SharedOfferItemSystem.cs | 158 ++++++++++++++++++ Content.Shared/_White/WhiteCVars.cs | 7 + Resources/Locale/en-US/alerts/alerts.ftl | 3 + .../en-US/escape-menu/ui/options-menu.ftl | 2 + .../en-US/interaction/offer-item-system.ftl | 9 + Resources/Locale/ru-RU/alerts/alerts.ftl | 3 + .../ru-RU/escape-menu/ui/options-menu.ftl | 2 + .../ru-RU/interaction/offer-item-system.ftl | 9 + Resources/Prototypes/Alerts/alerts.yml | 11 ++ .../Prototypes/Entities/Mobs/Species/base.yml | 1 + .../Interface/Alerts/offer_item.rsi/meta.json | 14 ++ .../Alerts/offer_item.rsi/offer_item.png | Bin 0 -> 556 bytes .../Interface/give_item.rsi/give_item.png | Bin 0 -> 7276 bytes .../White/Interface/give_item.rsi/meta.json | 14 ++ Resources/keybinds.yml | 3 + 27 files changed, 579 insertions(+), 1 deletion(-) create mode 100644 Content.Client/_White/OfferItem/OfferItemIndicatorsOverlay.cs create mode 100644 Content.Client/_White/OfferItem/OfferItemSystem.cs create mode 100644 Content.Server/_White/Alert/Click/AcceptOffer.cs create mode 100644 Content.Server/_White/OfferItem/OfferItemSystem.cs create mode 100644 Content.Shared/_White/OfferItem/OfferItemComponent.cs create mode 100644 Content.Shared/_White/OfferItem/SharedOfferItemSystem.Interactions.cs create mode 100644 Content.Shared/_White/OfferItem/SharedOfferItemSystem.cs create mode 100644 Resources/Locale/en-US/interaction/offer-item-system.ftl create mode 100644 Resources/Locale/ru-RU/interaction/offer-item-system.ftl create mode 100644 Resources/Textures/White/Interface/Alerts/offer_item.rsi/meta.json create mode 100644 Resources/Textures/White/Interface/Alerts/offer_item.rsi/offer_item.png create mode 100644 Resources/Textures/White/Interface/give_item.rsi/give_item.png create mode 100644 Resources/Textures/White/Interface/give_item.rsi/meta.json diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index 8753654fc3..fd6eee0e7b 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/Content.Client/Input/ContentContexts.cs @@ -81,6 +81,7 @@ namespace Content.Client.Input human.AddFunction(ContentKeyFunctions.Arcade2); human.AddFunction(ContentKeyFunctions.Arcade3); human.AddFunction(ContentKeyFunctions.LieDown); // WD EDIT + human.AddFunction(ContentKeyFunctions.OfferItem); // WD EDIT // 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 b5449c99d2..7cd48d338f 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -191,6 +191,7 @@ namespace Content.Client.Options.UI.Tabs AddButton(ContentKeyFunctions.MoveStoredItem); AddButton(ContentKeyFunctions.RotateStoredItem); AddButton(ContentKeyFunctions.SaveItemLocation); + AddButton(ContentKeyFunctions.OfferItem); // WD EDIT AddButton(ContentKeyFunctions.LieDown); // WD EDIT AddCheckBox("ui-options-function-auto-get-up", _cfg.GetCVar(WhiteCVars.AutoGetUp), HandleToggleAutoGetUp); // WD EDIT diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml index 3810cddbb9..815254b788 100644 --- a/Content.Client/Options/UI/Tabs/MiscTab.xaml +++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml @@ -50,6 +50,7 @@ StyleClasses="LabelKeyText"/> +