From c1acf815418050f981d747a84e28496fb92a96c6 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 6 Mar 2025 12:01:43 +0300 Subject: [PATCH] NewTrade (#969) * trading portal replace traveling storeship * clean up content * clean up content 2 * seel and buy realization * fixes * Update migration.yml * Update migration.yml * Update dev_map.yml * Update dev_map.yml * thats work correctly now * bugfies and visual * factions * faction restruct + name reduce * unnesting sell cargo positions * unnesting cargo positions * more cargo content * Update buy.yml * improve tradeportal visual * Update migration.yml * Bank ad Commandant removal * merchant objectives * finish * clean up content * Update migration.yml * fix goal calculation * Update comoss.yml * Update dev_map.yml --- .../CP14StoreProductControl.xaml | 10 +- .../CP14StoreProductControl.xaml.cs | 15 +- .../TravelingStoreShip/CP14StoreWindow.xaml | 3 +- .../CP14StoreWindow.xaml.cs | 21 +- .../_CP14/Cargo/CP14CargoSystem.Portals.cs | 55 + .../_CP14/Cargo/CP14CargoSystem.Shuttle.cs | 118 - .../_CP14/Cargo/CP14CargoSystem.UI.cs | 106 +- Content.Server/_CP14/Cargo/CP14CargoSystem.cs | 349 +- .../Cargo/CP14TravelingStoreshipComponent.cs | 8 - ...P14TravelingStoreshipFTLTargetComponent.cs | 10 - .../_CP14/Currency/CP14CurrencySystem.cs | 42 +- .../CP14CurrencyStoredConditionComponent.cs | 20 - .../CP14RichestJobConditionComponent.cs | 25 + .../CP14CurrencyCollectConditionSystem.cs | 99 +- .../Systems/CP14RichestJobCondtionSystem.cs | 74 + .../_CP14/RoleSalary/CP14SalarySystem.cs | 23 +- .../_CP14/Cargo/CP14CargoMoneyBoxComponent.cs | 9 - .../_CP14/Cargo/CP14CargoStoreComponent.cs | 11 - .../_CP14/Cargo/CP14SellingPalettComponent.cs | 11 - Content.Shared/_CP14/Cargo/CP14StoreUI.cs | 15 +- .../Cargo/CP14TradingInfoBoardComponent.cs | 17 + ...onent.cs => CP14TradingPortalComponent.cs} | 43 +- .../BuyServices/CP14BuyItemsService.cs | 45 +- .../BuyServices/CP14UnlockPositionsService.cs | 53 +- .../CP14StoreBuyPositionPrototype.cs | 35 +- .../Prototype/CP14StoreFactionPrototype.cs | 16 + .../CP14StoreSellPositionPrototype.cs | 24 +- .../SellServices/CP14SellProrotypeService.cs | 65 + .../SellServices/CP14SellStackService.cs | 26 +- .../SellServices/CP14SellWhitelistService.cs | 24 +- .../Currency/CP14SharedCurrencySystem.cs | 13 +- .../en-US/_CP14/lockKey/locks-types.ftl | 10 +- .../_CP14/objectives/condition/personal.ftl | 5 +- .../Locale/en-US/_CP14/store/factions.ftl | 11 + .../positions_buy.ftl | 0 .../services.ftl | 0 Resources/Locale/en-US/_CP14/store/ui.ftl | 11 + .../travelingStoreship/positions_sell.ftl | 37 - .../positions_sell_special.ftl | 20 - .../en-US/_CP14/travelingStoreship/ui.ftl | 9 - .../ru-RU/_CP14/lockKey/locks-types.ftl | 10 +- .../_CP14/objectives/condition/personal.ftl | 5 +- .../Locale/ru-RU/_CP14/store/factions.ftl | 11 + .../positions_buy.ftl | 0 .../services.ftl | 0 Resources/Locale/ru-RU/_CP14/store/ui.ftl | 11 + .../position_sell_special.ftl | 20 - .../travelingStoreship/positions_sell.ftl | 37 - .../ru-RU/_CP14/travelingStoreship/ui.ftl | 9 - Resources/Maps/_CP14/comoss.yml | 10692 +++++++--------- Resources/Maps/_CP14/comoss_d.yml | 1297 +- Resources/Maps/_CP14/dev_map.yml | 13 +- .../Catalog/Cargo/Store/BradFamily/buy.yml | 188 + .../Cargo/Store/BradFamily/sell_special.yml | 99 + .../Cargo/Store/General/sell_special.yml | 15 + .../Catalog/Cargo/Store/HelmirWeapon/buy.yml | 99 + .../Catalog/Cargo/Store/Sell/metalls.yml | 95 - .../_CP14/Catalog/Cargo/Store/Sell/misc.yml | 37 - .../Catalog/Cargo/Store/SpiceStream/buy.yml | 221 + .../Catalog/Cargo/Store/SpiceStream/sell.yml | 94 + .../Cargo/Store/SpiceStream/sell_special.yml | 29 + .../Cargo/Store/Sylphoria/sell_special.yml | 19 + .../_CP14/Catalog/Cargo/Store/buy.yml | 184 - .../_CP14/Catalog/Cargo/Store/factions.yml | 19 + .../Catalog/Cargo/Store/sell_special.yml | 100 - .../Prototypes/_CP14/Catalog/Cargo/crates.yml | 157 - .../_CP14/Catalog/Fills/closets.yml | 39 - .../_CP14/Entities/Markers/Spawners/jobs.yml | 44 +- .../_CP14/Entities/Markers/misc.yml | 38 - .../_CP14/Entities/Objects/Keys/bank.yml | 48 - .../_CP14/Entities/Objects/Keys/keyrings.yml | 19 +- .../_CP14/Entities/Objects/Keys/merchant.yml | 31 + .../_CP14/Entities/Objects/Materials/dye.yml | 6 + ...ls_filled.yml => vials_filled_aspects.yml} | 0 .../Specific/Alchemy/vials_filled_potions.yml | 107 + .../_CP14/Entities/Stations/base.yml | 7 - .../Structures/Doors/Locked/alchemist.yml | 18 +- .../Entities/Structures/Doors/Locked/bank.yml | 75 - .../Structures/Doors/Locked/merchant.yml | 52 + .../Structures/Flora/Crystal/shards.yml | 12 +- .../Structures/Furniture/barrel_crane.yml | 1 - .../Structures/Furniture/cabinets.yml | 10 +- .../Entities/Structures/Furniture/closets.yml | 127 +- .../Structures/Furniture/glass_showcase.yml | 103 + .../Entities/Structures/Furniture/pallets.yml | 2 - .../Entities/Structures/Furniture/safe.yml | 70 + .../Specific/Economy/trade_board.yml | 23 + .../Specific/Economy/trade_portal.yml | 113 + .../_CP14/Entities/Structures/test.yml | 24 - .../Prototypes/_CP14/GameRules/roundstart.yml | 4 +- .../_CP14/LockCategories/LockCategory.yml | 5 +- .../_CP14/LockCategories/lockTypes.yml | 45 +- Resources/Prototypes/_CP14/Maps/Factoria.yml | 4 +- Resources/Prototypes/_CP14/Maps/comoss.yml | 8 +- .../_CP14/Objectives/empire_orders.yml | 34 - .../_CP14/Objectives/personal_objectives.yml | 20 +- .../_CP14/Roles/Jobs/Traders/commandant.yml | 26 - .../_CP14/Roles/Jobs/departments.yml | 12 +- Resources/Prototypes/_CP14/StatusIcon/job.yml | 8 - .../Misc/job_icons.rsi/Commandant.png | Bin 204 -> 0 bytes .../Interface/Misc/job_icons.rsi/Merchant.png | Bin 212 -> 188 bytes .../Interface/Misc/job_icons.rsi/meta.json | 3 - .../Economy/trade_portal.rsi/base.png | Bin 0 -> 2578 bytes .../Economy/trade_portal.rsi/base_door.png | Bin 0 -> 104 bytes .../Economy/trade_portal.rsi/base_open.png | Bin 0 -> 1981 bytes .../Economy/trade_portal.rsi/flag_bard.png | Bin 0 -> 1496 bytes .../Economy/trade_portal.rsi/flag_helmir.png | Bin 0 -> 1339 bytes .../Economy/trade_portal.rsi/flag_spice.png | Bin 0 -> 1435 bytes .../trade_portal.rsi/flag_sylphoria.png | Bin 0 -> 1344 bytes .../Economy/trade_portal.rsi/icon.png | Bin 0 -> 3050 bytes .../Economy/trade_portal.rsi/meta.json | 68 + Resources/migration.yml | 108 +- 112 files changed, 7448 insertions(+), 8815 deletions(-) create mode 100644 Content.Server/_CP14/Cargo/CP14CargoSystem.Portals.cs delete mode 100644 Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs delete mode 100644 Content.Server/_CP14/Cargo/CP14TravelingStoreshipComponent.cs delete mode 100644 Content.Server/_CP14/Cargo/CP14TravelingStoreshipFTLTargetComponent.cs delete mode 100644 Content.Server/_CP14/Objectives/Components/CP14CurrencyStoredConditionComponent.cs create mode 100644 Content.Server/_CP14/Objectives/Components/CP14RichestJobConditionComponent.cs create mode 100644 Content.Server/_CP14/Objectives/Systems/CP14RichestJobCondtionSystem.cs delete mode 100644 Content.Shared/_CP14/Cargo/CP14CargoMoneyBoxComponent.cs delete mode 100644 Content.Shared/_CP14/Cargo/CP14CargoStoreComponent.cs delete mode 100644 Content.Shared/_CP14/Cargo/CP14SellingPalettComponent.cs create mode 100644 Content.Shared/_CP14/Cargo/CP14TradingInfoBoardComponent.cs rename Content.Shared/_CP14/Cargo/{CP14StationTravelingStoreShipTargetComponent.cs => CP14TradingPortalComponent.cs} (56%) create mode 100644 Content.Shared/_CP14/Cargo/Prototype/CP14StoreFactionPrototype.cs create mode 100644 Content.Shared/_CP14/Cargo/Prototype/SellServices/CP14SellProrotypeService.cs create mode 100644 Resources/Locale/en-US/_CP14/store/factions.ftl rename Resources/Locale/en-US/_CP14/{travelingStoreship => store}/positions_buy.ftl (100%) rename Resources/Locale/en-US/_CP14/{travelingStoreship => store}/services.ftl (100%) create mode 100644 Resources/Locale/en-US/_CP14/store/ui.ftl delete mode 100644 Resources/Locale/en-US/_CP14/travelingStoreship/positions_sell.ftl delete mode 100644 Resources/Locale/en-US/_CP14/travelingStoreship/positions_sell_special.ftl delete mode 100644 Resources/Locale/en-US/_CP14/travelingStoreship/ui.ftl create mode 100644 Resources/Locale/ru-RU/_CP14/store/factions.ftl rename Resources/Locale/ru-RU/_CP14/{travelingStoreship => store}/positions_buy.ftl (100%) rename Resources/Locale/ru-RU/_CP14/{travelingStoreship => store}/services.ftl (100%) create mode 100644 Resources/Locale/ru-RU/_CP14/store/ui.ftl delete mode 100644 Resources/Locale/ru-RU/_CP14/travelingStoreship/position_sell_special.ftl delete mode 100644 Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_sell.ftl delete mode 100644 Resources/Locale/ru-RU/_CP14/travelingStoreship/ui.ftl create mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/BradFamily/buy.yml create mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/BradFamily/sell_special.yml create mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/General/sell_special.yml create mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/HelmirWeapon/buy.yml delete mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/metalls.yml delete mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/misc.yml create mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/buy.yml create mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/sell.yml create mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/sell_special.yml create mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sylphoria/sell_special.yml delete mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/buy.yml create mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/factions.yml delete mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/sell_special.yml delete mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml delete mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Keys/bank.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Keys/merchant.yml rename Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/{vials_filled.yml => vials_filled_aspects.yml} (100%) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials_filled_potions.yml delete mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/bank.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/merchant.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Furniture/glass_showcase.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Furniture/safe.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_board.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_portal.yml delete mode 100644 Resources/Prototypes/_CP14/Roles/Jobs/Traders/commandant.yml delete mode 100644 Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Commandant.png create mode 100644 Resources/Textures/_CP14/Structures/Specific/Economy/trade_portal.rsi/base.png create mode 100644 Resources/Textures/_CP14/Structures/Specific/Economy/trade_portal.rsi/base_door.png create mode 100644 Resources/Textures/_CP14/Structures/Specific/Economy/trade_portal.rsi/base_open.png create mode 100644 Resources/Textures/_CP14/Structures/Specific/Economy/trade_portal.rsi/flag_bard.png create mode 100644 Resources/Textures/_CP14/Structures/Specific/Economy/trade_portal.rsi/flag_helmir.png create mode 100644 Resources/Textures/_CP14/Structures/Specific/Economy/trade_portal.rsi/flag_spice.png create mode 100644 Resources/Textures/_CP14/Structures/Specific/Economy/trade_portal.rsi/flag_sylphoria.png create mode 100644 Resources/Textures/_CP14/Structures/Specific/Economy/trade_portal.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Structures/Specific/Economy/trade_portal.rsi/meta.json diff --git a/Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml b/Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml index a599bca8f7..1637e572e2 100644 --- a/Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml +++ b/Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml @@ -1,11 +1,19 @@