From e66a5f391edcc6bd5cb24d0ed956468b1a7f6643 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 4 Nov 2023 17:43:00 +0200 Subject: [PATCH] Parts Crates Fix --- .../Catalog/Fills/Crates/salvage.yml | 179 ++++++++++++++++-- .../Markers/Spawners/Random/salvage.yml | 2 +- 2 files changed, 162 insertions(+), 19 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 961ccf7ed63..4e4c5a6b75f 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -345,33 +345,176 @@ id: CratePartsT3 name: tier 3 parts crate description: Contains 5 random tier 3 parts for upgrading machines. - # TODO add contents. - #components: - #- type: StorageFill - # contents: - # - id: SalvagePartsT3Spawner - # amount: 5 + components: # Frontier - Fixed the crates spawn in the most stupid way, but its fully working as it need to. + - type: StorageFill + contents: + - id: SuperCapacitorStockPart + orGroup: Part1 + - id: PicoManipulatorStockPart + orGroup: Part1 + - id: SuperMatterBinStockPart + orGroup: Part1 + - id: SuperCapacitorStockPart + orGroup: Part2 + - id: PicoManipulatorStockPart + orGroup: Part2 + - id: SuperMatterBinStockPart + orGroup: Part2 + - id: SuperCapacitorStockPart + orGroup: Part3 + - id: PicoManipulatorStockPart + orGroup: Part3 + - id: SuperMatterBinStockPart + orGroup: Part3 + - id: SuperCapacitorStockPart + orGroup: Part4 + - id: PicoManipulatorStockPart + orGroup: Part4 + - id: SuperMatterBinStockPart + orGroup: Part4 + - id: SuperCapacitorStockPart + orGroup: Part5 + - id: PicoManipulatorStockPart + orGroup: Part5 + - id: SuperMatterBinStockPart + orGroup: Part5 - type: entity parent: CrateGenericSteel id: CratePartsT3T4 name: tier 3/4 parts crate description: Contains 5 random tier 3 or 4 parts for upgrading machines. - # TODO add contents. - #components: - # type: StorageFill - # contents: - # - id: SalvagePartsT3T4Spawner - # amount: 5 + components: # Frontier - Fixed the crates spawn in the most stupid way, but its fully working as it need to. + - type: StorageFill + contents: + #tier 3 + - id: SuperCapacitorStockPart + orGroup: Part1 + prob: 0.2 + - id: PicoManipulatorStockPart + orGroup: Part1 + prob: 0.2 + - id: SuperMatterBinStockPart + orGroup: Part1 + prob: 0.2 + - id: SuperCapacitorStockPart + orGroup: Part2 + prob: 0.2 + - id: PicoManipulatorStockPart + orGroup: Part2 + prob: 0.2 + - id: SuperMatterBinStockPart + orGroup: Part2 + prob: 0.2 + - id: SuperCapacitorStockPart + orGroup: Part3 + prob: 0.2 + - id: PicoManipulatorStockPart + orGroup: Part3 + prob: 0.2 + - id: SuperMatterBinStockPart + orGroup: Part3 + prob: 0.2 + - id: SuperCapacitorStockPart + orGroup: Part4 + prob: 0.2 + - id: PicoManipulatorStockPart + orGroup: Part4 + prob: 0.2 + - id: SuperMatterBinStockPart + orGroup: Part4 + prob: 0.2 + - id: SuperCapacitorStockPart + orGroup: Part5 + prob: 0.2 + - id: PicoManipulatorStockPart + orGroup: Part5 + prob: 0.2 + - id: SuperMatterBinStockPart + orGroup: Part5 + prob: 0.2 + #tier 4 + - id: QuadraticCapacitorStockPart + orGroup: Part1 + prob: 0.1 + - id: FemtoManipulatorStockPart + orGroup: Part1 + prob: 0.1 + - id: BluespaceMatterBinStockPart + orGroup: Part1 + prob: 0.1 + - id: QuadraticCapacitorStockPart + orGroup: Part2 + prob: 0.1 + - id: FemtoManipulatorStockPart + orGroup: Part2 + prob: 0.1 + - id: BluespaceMatterBinStockPart + orGroup: Part2 + prob: 0.1 + - id: QuadraticCapacitorStockPart + orGroup: Part3 + prob: 0.1 + - id: FemtoManipulatorStockPart + orGroup: Part3 + prob: 0.1 + - id: BluespaceMatterBinStockPart + orGroup: Part3 + prob: 0.1 + - id: QuadraticCapacitorStockPart + orGroup: Part4 + prob: 0.1 + - id: FemtoManipulatorStockPart + orGroup: Part4 + prob: 0.1 + - id: BluespaceMatterBinStockPart + orGroup: Part4 + prob: 0.1 + - id: QuadraticCapacitorStockPart + orGroup: Part5 + prob: 0.1 + - id: FemtoManipulatorStockPart + orGroup: Part5 + prob: 0.1 + - id: BluespaceMatterBinStockPart + orGroup: Part5 + prob: 0.1 - type: entity parent: CrateGenericSteel id: CratePartsT4 name: tier 4 parts crate description: Contains 5 random tier 4 parts for upgrading machines. - # TODO add contents. - #components: - #- type: StorageFill - # contents: - # - id: SalvagePartsT4Spawner - # amount: 5 + components: # Frontier - Fixed the crates spawn in the most stupid way, but its fully working as it need to. + - type: StorageFill + contents: + - id: QuadraticCapacitorStockPart + orGroup: Part1 + - id: FemtoManipulatorStockPart + orGroup: Part1 + - id: BluespaceMatterBinStockPart + orGroup: Part1 + - id: QuadraticCapacitorStockPart + orGroup: Part2 + - id: FemtoManipulatorStockPart + orGroup: Part2 + - id: BluespaceMatterBinStockPart + orGroup: Part2 + - id: QuadraticCapacitorStockPart + orGroup: Part3 + - id: FemtoManipulatorStockPart + orGroup: Part3 + - id: BluespaceMatterBinStockPart + orGroup: Part3 + - id: QuadraticCapacitorStockPart + orGroup: Part4 + - id: FemtoManipulatorStockPart + orGroup: Part4 + - id: BluespaceMatterBinStockPart + orGroup: Part4 + - id: QuadraticCapacitorStockPart + orGroup: Part5 + - id: FemtoManipulatorStockPart + orGroup: Part5 + - id: BluespaceMatterBinStockPart + orGroup: Part5 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml index d1726325808..1b2e5e79361 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml @@ -131,7 +131,7 @@ - type: RandomSpawner prototypes: - QuadraticCapacitorStockPart - - PicoManipulatorStockPart + - FemtoManipulatorStockPart #Frontier - Fixed this from tier 3 part to tier 4 - BluespaceMatterBinStockPart offset: 0.0