From 68c79923655034ed761ff66618ad7a027349b710 Mon Sep 17 00:00:00 2001 From: dustylens Date: Sat, 23 Nov 2024 20:20:34 -0800 Subject: [PATCH 1/8] Reduces chem stock availability to elements that cannot be otherwise sourced. Removes chem crate restocks from the trade station as per directive from people who hide in the shadows. Maintains a restock crate of chemicals that either lack a proper source or can only be sourced in trace amounts by current methods. Re-examine when those sources are more commonly available. --- .../Catalog/Cargo/cargo_medical.yml | 56 ++++++++++--------- .../_NF/Catalog/Cargo/cargo_medical.yml | 10 ++++ .../_NF/Catalog/Fills/Crates/chemistry.yml | 27 +++++++++ 3 files changed, 66 insertions(+), 27 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml index 9475f346ba4..c99587b5087 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml @@ -128,32 +128,34 @@ category: cargoproduct-category-name-medical group: market -- type: cargoProduct - id: ChemistryP - icon: - sprite: Structures/Storage/Crates/chemcrate_secure.rsi - state: icon - product: CrateChemistryP - cost: 850 - category: cargoproduct-category-name-medical - group: market + # Frontier Removes base chemistry crates from cargo sale. -- type: cargoProduct - id: ChemistryS - icon: - sprite: Structures/Storage/Crates/chemcrate_secure.rsi - state: icon - product: CrateChemistryS - cost: 750 - category: cargoproduct-category-name-medical - group: market +- #type: cargoProduct + #id: ChemistryP + #icon: + # sprite: Structures/Storage/Crates/chemcrate_secure.rsi + # state: icon + #product: CrateChemistryP + #cost: 850 + #category: cargoproduct-category-name-medical + #group: market -- type: cargoProduct - id: CrateChemistryD - icon: - sprite: Structures/Storage/Crates/chemcrate_secure.rsi - state: icon - product: CrateChemistryD - cost: 750 - category: cargoproduct-category-name-medical - group: market +- #type: cargoProduct + #id: ChemistryS + #icon: + # sprite: Structures/Storage/Crates/chemcrate_secure.rsi + # state: icon + #product: CrateChemistryS + #cost: 750 + #category: cargoproduct-category-name-medical + #group: market + +- #type: cargoProduct + #id: CrateChemistryD + #icon: + # sprite: Structures/Storage/Crates/chemcrate_secure.rsi + # state: icon + #product: CrateChemistryD + #cost: 750 + #category: cargoproduct-category-name-medical + #group: market diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml index 8b4eb3385d1..44d268b63f1 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml @@ -7,3 +7,13 @@ cost: 3000 category: cargoproduct-category-name-medical group: market + +- type: cargoProduct + id: ChemistryDL + icon: + sprite: Structures/Storage/Crates/chemcrate_secure.rsi + state: icon + product: CrateChemistryDL + cost: 750 + category: cargoproduct-category-name-medical + group: market diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml index 18dee491c22..b661e348ac3 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml @@ -8,3 +8,30 @@ contents: - id: JugSpaceCleaner amount: 5 + +- type: entity + id: CrateChemistryDL + parent: CrateChemistrySecure + name: chemicals crate (DL) + description: Contains chemicals from the bargain bin overstock-block of elements. Requires understanding of hinges to open. + components: + - type: StorageFill + contents: + - id: JugAluminium + amount: 1 + - id: JugCopper + amount: 1 + - id: JugEthanol + amount: 1 + - id: JugFluorine + amount: 1 + - id: JugMercury + amount: 1 + - id: JugLithium + amount: 1 + - id: JugPhosphorus + amount: 1 + - id: JugRadium + amount: 1 + - id: JugZinc + amount: 1 From 882115f97cdaf4dbbb6e612ba4c7f23b4dd26e3a Mon Sep 17 00:00:00 2001 From: dustylens Date: Sat, 23 Nov 2024 21:50:35 -0800 Subject: [PATCH 2/8] abstract reasoning --- .../Catalog/Cargo/cargo_medical.yml | 61 ++++++++++--------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml index c99587b5087..5efb01e4ebb 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml @@ -126,36 +126,37 @@ product: CrateMindShieldImplants cost: 3000 category: cargoproduct-category-name-medical - group: market - - # Frontier Removes base chemistry crates from cargo sale. + group: market -- #type: cargoProduct - #id: ChemistryP - #icon: - # sprite: Structures/Storage/Crates/chemcrate_secure.rsi - # state: icon - #product: CrateChemistryP - #cost: 850 - #category: cargoproduct-category-name-medical - #group: market +- type: cargoProduct + id: ChemistryP + abstract: true # Frontier + icon: + sprite: Structures/Storage/Crates/chemcrate_secure.rsi + state: icon + product: CrateChemistryP + cost: 850 + category: cargoproduct-category-name-medical + group: market -- #type: cargoProduct - #id: ChemistryS - #icon: - # sprite: Structures/Storage/Crates/chemcrate_secure.rsi - # state: icon - #product: CrateChemistryS - #cost: 750 - #category: cargoproduct-category-name-medical - #group: market +- type: cargoProduct + id: ChemistryS + abstract: true # Frontier + icon: + sprite: Structures/Storage/Crates/chemcrate_secure.rsi + state: icon + product: CrateChemistryS + cost: 750 + category: cargoproduct-category-name-medical + group: market -- #type: cargoProduct - #id: CrateChemistryD - #icon: - # sprite: Structures/Storage/Crates/chemcrate_secure.rsi - # state: icon - #product: CrateChemistryD - #cost: 750 - #category: cargoproduct-category-name-medical - #group: market +- type: cargoProduct + id: CrateChemistryD + abstract: true # Frontier + icon: + sprite: Structures/Storage/Crates/chemcrate_secure.rsi + state: icon + product: CrateChemistryD + cost: 750 + category: cargoproduct-category-name-medical + group: market From 2aaf21f60b85cd5b519c994a18cfe1c1316cdf22 Mon Sep 17 00:00:00 2001 From: dustylens Date: Sat, 23 Nov 2024 21:56:12 -0800 Subject: [PATCH 3/8] I Zinc I messed up. --- Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml index b661e348ac3..2a08a2e4cdc 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml @@ -33,5 +33,3 @@ amount: 1 - id: JugRadium amount: 1 - - id: JugZinc - amount: 1 From a664dc61502b5238fc305a0aa0245ce3b57d409c Mon Sep 17 00:00:00 2001 From: dustylens Date: Sun, 24 Nov 2024 07:34:26 -0800 Subject: [PATCH 4/8] Price change and description butchering. --- Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml | 2 +- Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml index 44d268b63f1..3d968a5b6a8 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml @@ -14,6 +14,6 @@ sprite: Structures/Storage/Crates/chemcrate_secure.rsi state: icon product: CrateChemistryDL - cost: 750 + cost: 2500 category: cargoproduct-category-name-medical group: market diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml index 2a08a2e4cdc..28b5fb01e8e 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml @@ -13,7 +13,7 @@ id: CrateChemistryDL parent: CrateChemistrySecure name: chemicals crate (DL) - description: Contains chemicals from the bargain bin overstock-block of elements. Requires understanding of hinges to open. + description: Contains chemicals that rarely occur in nature. Requires understanding of hinges to open. components: - type: StorageFill contents: From e9f20d01f60149e9bdd8500d24796297e4a94aec Mon Sep 17 00:00:00 2001 From: dustylens Date: Sun, 24 Nov 2024 09:51:54 -0800 Subject: [PATCH 5/8] Adds nitrogen. Seems reasonable given the lack of condensers. Might need to be examined later. --- Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml index 28b5fb01e8e..316466b56c0 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml @@ -33,3 +33,5 @@ amount: 1 - id: JugRadium amount: 1 + - id: JugNitrogen + amount: 1 From 527440d3302b4f2bfd0f79302c2db0255b3c3641 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:28:57 +0200 Subject: [PATCH 6/8] Update cargo_medical.yml --- .../Prototypes/_NF/Catalog/Cargo/cargo_medical.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml index 3d968a5b6a8..8b4eb3385d1 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml @@ -7,13 +7,3 @@ cost: 3000 category: cargoproduct-category-name-medical group: market - -- type: cargoProduct - id: ChemistryDL - icon: - sprite: Structures/Storage/Crates/chemcrate_secure.rsi - state: icon - product: CrateChemistryDL - cost: 2500 - category: cargoproduct-category-name-medical - group: market From b7866307c10bf15e810049487422ef8adc5d5b7a Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:29:11 +0200 Subject: [PATCH 7/8] Update chemistry.yml --- .../_NF/Catalog/Fills/Crates/chemistry.yml | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml index 316466b56c0..18dee491c22 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml @@ -8,30 +8,3 @@ contents: - id: JugSpaceCleaner amount: 5 - -- type: entity - id: CrateChemistryDL - parent: CrateChemistrySecure - name: chemicals crate (DL) - description: Contains chemicals that rarely occur in nature. Requires understanding of hinges to open. - components: - - type: StorageFill - contents: - - id: JugAluminium - amount: 1 - - id: JugCopper - amount: 1 - - id: JugEthanol - amount: 1 - - id: JugFluorine - amount: 1 - - id: JugMercury - amount: 1 - - id: JugLithium - amount: 1 - - id: JugPhosphorus - amount: 1 - - id: JugRadium - amount: 1 - - id: JugNitrogen - amount: 1 From 5d73918e999517c70dfdb401f3f8498b1c74e024 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:29:43 +0200 Subject: [PATCH 8/8] Update cargo_medical.yml --- Resources/Prototypes/Catalog/Cargo/cargo_medical.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml index 5efb01e4ebb..bcdb0e417dc 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml @@ -126,7 +126,7 @@ product: CrateMindShieldImplants cost: 3000 category: cargoproduct-category-name-medical - group: market + group: market - type: cargoProduct id: ChemistryP