]> git.smokeofanarchy.ru Git - space-station-14.git/commit
feat: #26107 uplink discounts for traitors (no nukies for now) (#26297)
authorFildrance <fildrance@gmail.com>
Thu, 5 Sep 2024 12:12:39 +0000 (15:12 +0300)
committerGitHub <noreply@github.com>
Thu, 5 Sep 2024 12:12:39 +0000 (22:12 +1000)
commita58252f45ec55a07e4068b9175a7f8d44f13406a
tree271abfe7b047591aba2222ecb5417cf4422dd5f4
parent402f518c5e63a24914a63ea09ff4a52e01928faa
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 <pa.pecherskij@interfax.ru>
23 files changed:
Content.Client/Store/Ui/StoreBoundUserInterface.cs
Content.Client/Store/Ui/StoreListingControl.xaml
Content.Client/Store/Ui/StoreListingControl.xaml.cs
Content.Client/Store/Ui/StoreMenu.xaml.cs
Content.IntegrationTests/Tests/StoreTests.cs [new file with mode: 0644]
Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
Content.Server/Store/Conditions/BuyBeforeCondition.cs
Content.Server/Store/Systems/StoreSystem.Listings.cs
Content.Server/Store/Systems/StoreSystem.Refund.cs
Content.Server/Store/Systems/StoreSystem.Ui.cs
Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs [new file with mode: 0644]
Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs
Content.Server/Traitor/Uplink/UplinkSystem.cs
Content.Shared/Store/Components/StoreComponent.cs
Content.Shared/Store/ListingPrototype.cs
Content.Shared/Store/StoreUi.cs
Content.Shared/StoreDiscount/Components/StoreDiscountComponent.cs [new file with mode: 0644]
Resources/Locale/en-US/administration/commands/add-uplink-command.ftl
Resources/Locale/en-US/store/categories.ftl
Resources/Locale/en-US/store/store.ftl
Resources/Prototypes/Catalog/discount_categories.yml [new file with mode: 0644]
Resources/Prototypes/Catalog/uplink_catalog.yml
Resources/Prototypes/Store/categories.yml