From a58252f45ec55a07e4068b9175a7f8d44f13406a Mon Sep 17 00:00:00 2001 From: Fildrance Date: Thu, 5 Sep 2024 15:12:39 +0300 Subject: [PATCH] feat: #26107 uplink discounts for traitors (no nukies for now) (#26297) * feat: #26107 uplink discounts for traitors and nukies * refactor: #26107 extracted discount label from price of StoreListingControl * refactor: minor renaming * refactor: parametrized adding discounts to uplink store * fix: #26107 prevent exception on empty discountOptions * feat: uplink now have 'Discounted' category which contains all discounted items on this session. * after merge fixups * rename discount categories according to common sense * refactor: DiscountOptions is now optional (nullable) on ListingData * add nullability check ignore for already checked listingData.DiscountOptions * fix after merge store menu ui * remove unused using * final fix after merge conflicts * [refactor]: #26107 fix variables naming in UplinkSystem * fix: #26107 fix after merge * refactor: #26107 now supports discountDownUntil on ListingItem, instead of % of discount * feat: #26107 support multiple currency discount in store on side of discount message label * refactor: #26107 extracted discounts initialization to separate system. StoreDiscountData are spread as array and not list now * refactor: #26107 move more code from storesystem to StoreDiscountComponent * refactor: #26107 separated StoreSystem and StoreDiscountSystem using events * fix: #26107 placed not-nullable variable initialization in ListingData for tests * refactor: #26107 minor renaming, xml-docs * fix: #26107 changed most of discounts to be down to half price for balance purposes * ids used in with discounts are now ProtoIds, dicountCategories are now prototypes, code with weights simplified * decoupled storesystem and store discount system * xml-docs * refactor: #26107 xml-doc for StoreDiscountSystem * is now a thing (tmp) * fix: compilation errors + StoreDiscountData.DiscountCategoryId * refactor: rename ListingDataWithCostModifiers, fix all cost related code, enpittyfy performance, uglify uplink_catalog * refactor: removed unused code, more StoreDiscountSystem docs, simplify code * refactor: moved discount category logic to respective system, now creating ListingData c-tor clones all mutable fields as expected * refactor: rename back (its not prototype) * refactor: move ListingItemsInitializingEvent to file with handling logic * refactor: comments for StoreBuyFinishedEvent handling, more logging * refactor: moved StoreInitializedEvent, xml-doc * refactor: simplify StoreDiscountSystem code (reduce nesting) + xml-doc * refactor: restore old listing data cost field name * refactor: fix linter in uplink_catalog.yml * refactor: xml-doc for ListingDataWithCostModifiers * refactor: limit usage of ListingData in favour of ListingDataWithCostModifiers * refactor: purged linq, removed custom datafield names, minor cleanup * refactor: removed double-allocation on getting available listings * refactor: StoreSystem.OnBuyRequest now uses component.FullListingsCatalog as reference point (as it was in original code) * fix: minor discount categories on uplink items changes following design overview * refactor: StoreBuyListingMessage now uses protoId and not whole object * refactor: store refund and discount integration test, RefreshAllListings now translates previous cost modifiers to refreshed list, if state previous to refresh had any listing items --------- Co-authored-by: pa.pecherskij --- .../Store/Ui/StoreBoundUserInterface.cs | 7 +- .../Store/Ui/StoreListingControl.xaml | 2 + .../Store/Ui/StoreListingControl.xaml.cs | 7 +- Content.Client/Store/Ui/StoreMenu.xaml.cs | 95 +++-- Content.IntegrationTests/Tests/StoreTests.cs | 160 +++++++ .../GameTicking/Rules/TraitorRuleSystem.cs | 2 +- .../Store/Conditions/BuyBeforeCondition.cs | 4 +- .../Store/Systems/StoreSystem.Listings.cs | 70 ++- .../Store/Systems/StoreSystem.Refund.cs | 2 +- .../Store/Systems/StoreSystem.Ui.cs | 38 +- .../Systems/StoreDiscountSystem.cs | 397 ++++++++++++++++++ .../Uplink/Commands/AddUplinkCommand.cs | 15 +- Content.Server/Traitor/Uplink/UplinkSystem.cs | 31 +- .../Store/Components/StoreComponent.cs | 7 +- Content.Shared/Store/ListingPrototype.cs | 319 ++++++++++++-- Content.Shared/Store/StoreUi.cs | 13 +- .../Components/StoreDiscountComponent.cs | 51 +++ .../commands/add-uplink-command.ftl | 1 + Resources/Locale/en-US/store/categories.ftl | 1 + Resources/Locale/en-US/store/store.ftl | 2 + .../Catalog/discount_categories.yml | 13 + .../Prototypes/Catalog/uplink_catalog.yml | 290 ++++++++++++- Resources/Prototypes/Store/categories.yml | 4 + 23 files changed, 1415 insertions(+), 116 deletions(-) create mode 100644 Content.IntegrationTests/Tests/StoreTests.cs create mode 100644 Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs create mode 100644 Content.Shared/StoreDiscount/Components/StoreDiscountComponent.cs create mode 100644 Resources/Prototypes/Catalog/discount_categories.yml diff --git a/Content.Client/Store/Ui/StoreBoundUserInterface.cs b/Content.Client/Store/Ui/StoreBoundUserInterface.cs index 7ed67f7b5d..8c48258de0 100644 --- a/Content.Client/Store/Ui/StoreBoundUserInterface.cs +++ b/Content.Client/Store/Ui/StoreBoundUserInterface.cs @@ -19,7 +19,7 @@ public sealed class StoreBoundUserInterface : BoundUserInterface private string _search = string.Empty; [ViewVariables] - private HashSet _listings = new(); + private HashSet _listings = new(); public StoreBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { @@ -33,7 +33,7 @@ public sealed class StoreBoundUserInterface : BoundUserInterface _menu.OnListingButtonPressed += (_, listing) => { - SendMessage(new StoreBuyListingMessage(listing)); + SendMessage(new StoreBuyListingMessage(listing.ID)); }; _menu.OnCategoryButtonPressed += (_, category) => @@ -68,6 +68,7 @@ public sealed class StoreBoundUserInterface : BoundUserInterface _listings = msg.Listings; _menu?.UpdateBalance(msg.Balance); + UpdateListingsWithSearchFilter(); _menu?.SetFooterVisibility(msg.ShowFooter); _menu?.UpdateRefund(msg.AllowRefund); @@ -80,7 +81,7 @@ public sealed class StoreBoundUserInterface : BoundUserInterface if (_menu == null) return; - var filteredListings = new HashSet(_listings); + var filteredListings = new HashSet(_listings); if (!string.IsNullOrEmpty(_search)) { filteredListings.RemoveWhere(listingData => !ListingLocalisationHelpers.GetLocalisedNameOrEntityName(listingData, _prototypeManager).Trim().ToLowerInvariant().Contains(_search) && diff --git a/Content.Client/Store/Ui/StoreListingControl.xaml b/Content.Client/Store/Ui/StoreListingControl.xaml index 12b4d7b5b3..3142f1cb06 100644 --- a/Content.Client/Store/Ui/StoreListingControl.xaml +++ b/Content.Client/Store/Ui/StoreListingControl.xaml @@ -2,6 +2,8 @@