From d430157c7e5d3c6ed9f0807a6e5b2c8a08ffeb3f Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Mon, 11 Dec 2023 15:21:25 -0800 Subject: [PATCH] Remove plasma miners from maps (#22358) * Remove plasma miners from maps * Revert "Remove gas prices temporarily (#22285)" This reverts commit 8b2579d56f770e08de55784b548a0c264439cf9e. --- Resources/Maps/aspid.yml | 7 ------- Resources/Maps/bagel.yml | 8 -------- Resources/Maps/barratry.yml | 7 ------- Resources/Maps/box.yml | 8 -------- Resources/Maps/cluster.yml | 7 ------- Resources/Maps/core.yml | 8 -------- Resources/Maps/europa.yml | 8 -------- Resources/Maps/fland.yml | 7 ------- Resources/Maps/gemini.yml | 7 ------- Resources/Maps/marathon.yml | 7 ------- Resources/Maps/meta.yml | 7 ------- Resources/Maps/omega.yml | 7 ------- Resources/Maps/origin.yml | 7 ------- Resources/Maps/packed.yml | 7 ------- Resources/Maps/saltern.yml | 7 ------- Resources/Prototypes/Atmospherics/gases.yml | 9 +++++++++ 16 files changed, 9 insertions(+), 109 deletions(-) diff --git a/Resources/Maps/aspid.yml b/Resources/Maps/aspid.yml index 26fb5a2dd3..e92198a48a 100644 --- a/Resources/Maps/aspid.yml +++ b/Resources/Maps/aspid.yml @@ -60381,13 +60381,6 @@ entities: - pos: -0.5,-19.5 parent: 1 type: Transform -- proto: GasMinerPlasma - entities: - - uid: 3023 - components: - - pos: -0.5,-27.5 - parent: 1 - type: Transform - proto: GasMixerFlipped entities: - uid: 4699 diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index c8af15914c..3def7e08d9 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -71580,14 +71580,6 @@ entities: type: Transform - maxExternalPressure: 4500 type: GasMiner -- proto: GasMinerPlasma - entities: - - uid: 15207 - components: - - rot: -1.5707963267948966 rad - pos: -44.5,40.5 - parent: 60 - type: Transform - proto: GasMinerWaterVapor entities: - uid: 15206 diff --git a/Resources/Maps/barratry.yml b/Resources/Maps/barratry.yml index 38015cc570..3ab9d29295 100644 --- a/Resources/Maps/barratry.yml +++ b/Resources/Maps/barratry.yml @@ -49248,13 +49248,6 @@ entities: type: Transform - maxExternalPressure: 4000 type: GasMiner -- proto: GasMinerPlasma - entities: - - uid: 10842 - components: - - pos: -89.5,43.5 - parent: 1 - type: Transform - proto: GasOutletInjector entities: - uid: 13633 diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml index c948589eba..ca591b4bdf 100644 --- a/Resources/Maps/box.yml +++ b/Resources/Maps/box.yml @@ -85806,14 +85806,6 @@ entities: type: Transform - maxExternalPressure: 4500 type: GasMiner -- proto: GasMinerPlasma - entities: - - uid: 15548 - components: - - rot: -1.5707963267948966 rad - pos: 27.5,-47.5 - parent: 8364 - type: Transform - proto: GasMinerWaterVapor entities: - uid: 16806 diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml index 493e63a6d2..c6aa842e70 100644 --- a/Resources/Maps/cluster.yml +++ b/Resources/Maps/cluster.yml @@ -36196,13 +36196,6 @@ entities: - pos: 44.5,-7.5 parent: 1 type: Transform -- proto: GasMinerPlasma - entities: - - uid: 6806 - components: - - pos: 44.5,-15.5 - parent: 1 - type: Transform - proto: GasMinerWaterVapor entities: - uid: 6805 diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml index f6e697cab2..f794781be9 100644 --- a/Resources/Maps/core.yml +++ b/Resources/Maps/core.yml @@ -69581,14 +69581,6 @@ entities: pos: 16.5,-3.5 parent: 2 type: Transform -- proto: GasMinerPlasma - entities: - - uid: 1096 - components: - - rot: -1.5707963267948966 rad - pos: 24.5,-3.5 - parent: 2 - type: Transform - proto: GasMinerWaterVapor entities: - uid: 1097 diff --git a/Resources/Maps/europa.yml b/Resources/Maps/europa.yml index 98a2c5807d..04326d5455 100644 --- a/Resources/Maps/europa.yml +++ b/Resources/Maps/europa.yml @@ -49502,14 +49502,6 @@ entities: pos: -8.5,-19.5 parent: 1 type: Transform -- proto: GasMinerPlasma - entities: - - uid: 3173 - components: - - rot: -1.5707963267948966 rad - pos: -0.5,-19.5 - parent: 1 - type: Transform - proto: GasMixer entities: - uid: 4049 diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index 3c27a889a8..70f1578304 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -114614,13 +114614,6 @@ entities: - pos: 75.5,-41.5 parent: 13329 type: Transform -- proto: GasMinerPlasma - entities: - - uid: 23793 - components: - - pos: 92.5,-34.5 - parent: 13329 - type: Transform - proto: GasMinerWaterVapor entities: - uid: 23798 diff --git a/Resources/Maps/gemini.yml b/Resources/Maps/gemini.yml index 731e978904..f53d3c5518 100644 --- a/Resources/Maps/gemini.yml +++ b/Resources/Maps/gemini.yml @@ -83899,13 +83899,6 @@ entities: pos: -4.5,83.5 parent: 2 type: Transform -- proto: GasMinerPlasma - entities: - - uid: 12264 - components: - - pos: 3.5,83.5 - parent: 2 - type: Transform - proto: GasMinerWaterVapor entities: - uid: 12265 diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index acafecdb08..b1d34621dc 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -64657,13 +64657,6 @@ entities: - pos: 26.5,-24.5 parent: 30 type: Transform -- proto: GasMinerPlasma - entities: - - uid: 8774 - components: - - pos: 26.5,-30.5 - parent: 30 - type: Transform - proto: GasMinerWaterVapor entities: - uid: 8692 diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index b02f477701..576312a49c 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -73770,13 +73770,6 @@ entities: - pos: 56.5,-29.5 parent: 5350 type: Transform -- proto: GasMinerPlasma - entities: - - uid: 11599 - components: - - pos: 68.5,-15.5 - parent: 5350 - type: Transform - proto: GasMixer entities: - uid: 11074 diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml index dbf3a872d9..a3ab111922 100644 --- a/Resources/Maps/omega.yml +++ b/Resources/Maps/omega.yml @@ -38029,13 +38029,6 @@ entities: - pos: -52.5,3.5 parent: 4812 type: Transform -- proto: GasMinerPlasma - entities: - - uid: 9456 - components: - - pos: -52.5,9.5 - parent: 4812 - type: Transform - proto: GasMinerWaterVapor entities: - uid: 9454 diff --git a/Resources/Maps/origin.yml b/Resources/Maps/origin.yml index c18cb88cb4..14edeae395 100644 --- a/Resources/Maps/origin.yml +++ b/Resources/Maps/origin.yml @@ -96710,13 +96710,6 @@ entities: - pos: -49.5,-52.5 parent: 2 type: Transform -- proto: GasMinerPlasma - entities: - - uid: 15367 - components: - - pos: -49.5,-46.5 - parent: 2 - type: Transform - proto: GasMinerWaterVapor entities: - uid: 15368 diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml index fdf72bcf99..4cbddca9bd 100644 --- a/Resources/Maps/packed.yml +++ b/Resources/Maps/packed.yml @@ -41718,13 +41718,6 @@ entities: - pos: 46.5,-25.5 parent: 2 type: Transform -- proto: GasMinerPlasma - entities: - - uid: 2130 - components: - - pos: 46.5,-31.5 - parent: 2 - type: Transform - proto: GasMinerWaterVapor entities: - uid: 2138 diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 7f35d42f8d..f7498a7729 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -33801,13 +33801,6 @@ entities: - pos: 36.5,22.5 parent: 31 type: Transform -- proto: GasMinerPlasma - entities: - - uid: 11073 - components: - - pos: 42.5,22.5 - parent: 31 - type: Transform - proto: GasMinerWaterVapor entities: - uid: 6836 diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml index 2bd3951304..8c944332ab 100644 --- a/Resources/Prototypes/Atmospherics/gases.yml +++ b/Resources/Prototypes/Atmospherics/gases.yml @@ -6,6 +6,7 @@ molarMass: 32 color: 2887E8 reagent: Oxygen + pricePerMole: 0 - type: gas id: 1 @@ -15,6 +16,7 @@ molarMass: 28 color: DA1010 reagent: Nitrogen + pricePerMole: 0 - type: gas id: 2 @@ -24,6 +26,7 @@ molarMass: 44 color: 4e4e4e reagent: CarbonDioxide + pricePerMole: 0 - type: gas id: 3 @@ -35,6 +38,7 @@ gasOverlayState: plasma color: FF3300 reagent: Plasma + pricePerMole: 0 - type: gas id: 4 @@ -46,6 +50,7 @@ gasOverlayState: tritium color: 13FF4B reagent: Tritium + pricePerMole: 5 - type: gas id: 5 @@ -57,6 +62,7 @@ gasOverlayState: water_vapor color: bffffd reagent: Water + pricePerMole: 0 - type: gas id: 6 @@ -70,6 +76,7 @@ gasVisbilityFactor: 3.5 color: 56941E reagent: Miasma + pricePerMole: 0.15 - type: gas id: 7 @@ -79,6 +86,7 @@ molarMass: 44 color: 2887E8 reagent: NitrousOxide + pricePerMole: 2.5 - type: gas id: 8 @@ -91,3 +99,4 @@ gasMolesVisible: 0.6 color: 3a758c reagent: Frezon + pricePerMole: 7.5 -- 2.51.2