From 6ce53709bd12b4779d87fe3d4312039e7e9c8dfc Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 8 Apr 2024 17:10:58 +0200 Subject: [PATCH] Make clothing cheaper and split clothing restock (#26805) * Make clothing cheaper * bueah * proper price * :trollface: --- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 12 +++++++++++- .../Prototypes/Catalog/Fills/Crates/vending.yml | 11 ++++++++++- .../Entities/Clothing/Belt/base_clothingbelt.yml | 2 +- .../Prototypes/Entities/Clothing/Masks/masks.yml | 2 ++ .../Clothing/OuterClothing/base_clothingouter.yml | 2 +- .../Entities/Clothing/OuterClothing/wintercoats.yml | 2 +- .../Prototypes/Entities/Clothing/base_clothing.yml | 2 +- 7 files changed, 27 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index dda462abec..dd43ec4094 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,7 +33,17 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 6000 + cost: 2400 + category: cargoproduct-category-name-service + group: market + +- type: cargoProduct + id: CrateVendingMachineRestockAutoDrobe + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: CrateVendingMachineRestockAutoDrobeFilled + cost: 1200 category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml index 5a6b5ca089..d54e103a70 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml @@ -22,11 +22,20 @@ id: CrateVendingMachineRestockClothesFilled parent: CratePlastic name: clothing restock crate - description: Contains a pair of restock boxes, one for the ClothesMate and one for the AutoDrobe. + description: Contains a restock box for the clothes vending machines. components: - type: StorageFill contents: - id: VendingMachineRestockClothes + +- type: entity + id: CrateVendingMachineRestockAutoDrobeFilled + parent: CratePlastic + name: AutoDrobe restock crate + description: Contains a restock box for the AutoDrobe. + components: + - type: StorageFill + contents: - id: VendingMachineRestockCostumes - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml index 2f904d3438..76aca4df13 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml @@ -14,7 +14,7 @@ materialComposition: Cloth: 50 - type: StaticPrice - price: 25 + price: 20 - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index ad738792a7..4d7351464f 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -177,6 +177,8 @@ materialComposition: Steel: 50 Plastic: 100 + - type: StaticPrice + price: 12.5 # increases in price after decomposed into raw materials - type: entity parent: ClothingMaskBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 310661f6ca..987d3c2f24 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -41,7 +41,7 @@ - key: enum.StorageUiKey.Key type: StorageBoundUserInterface - type: StaticPrice - price: 80 + price: 70 - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 84b1e2eb48..b792a97627 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -32,7 +32,7 @@ - ClothMade - WhitelistChameleon - type: StaticPrice - price: 70 + price: 50 - type: entity parent: ClothingOuterWinterCoat diff --git a/Resources/Prototypes/Entities/Clothing/base_clothing.yml b/Resources/Prototypes/Entities/Clothing/base_clothing.yml index 92a698dd30..44613e042f 100644 --- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml +++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml @@ -10,7 +10,7 @@ tags: - WhitelistChameleon - type: StaticPrice - price: 15 + price: 10 - type: entity abstract: true -- 2.52.0