Remove plasma miners from maps (#22358)

* Remove plasma miners from maps

* Revert "Remove gas prices temporarily (#22285)"

This reverts commit 8b2579d56f770e08de55784b548a0c264439cf9e.

diff --git a/Resources/Maps/aspid.yml b/Resources/Maps/aspid.yml
index 26fb5a2dd39edfd3ddf365244a7b36315a2a165a..e92198a48a1fb4ca953beabdfbfbc649f53a047c 100644 (file)
--- a/Resources/Maps/aspid.yml
+++ b/Resources/Maps/aspid.yml
@@ -60381,13 +60381,6 @@ entities:
     - pos: -0.5,-19.5\r
       parent: 1\r
       type: Transform\r
-- proto: GasMinerPlasma\r
-  entities:\r
-  - uid: 3023\r
-    components:\r
-    - pos: -0.5,-27.5\r
-      parent: 1\r
-      type: Transform\r
 - proto: GasMixerFlipped\r
   entities:\r
   - uid: 4699\r

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index c8af15914c93729e20b1a5c0a8dfc42a905c3a40..3def7e08d982a80ff25d4fe6a9eddcb4d1cdabee 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -71580,14 +71580,6 @@ entities:
       type: Transform\r
     - maxExternalPressure: 4500\r
       type: GasMiner\r
-- proto: GasMinerPlasma\r
-  entities:\r
-  - uid: 15207\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: -44.5,40.5\r
-      parent: 60\r
-      type: Transform\r
 - proto: GasMinerWaterVapor\r
   entities:\r
   - uid: 15206\r

diff --git a/Resources/Maps/barratry.yml b/Resources/Maps/barratry.yml
index 38015cc570592e004047e2ca7fb60ae17b15db93..3ab9d29295810b2560f131017d69eed85df80854 100644 (file)
--- a/Resources/Maps/barratry.yml
+++ b/Resources/Maps/barratry.yml
@@ -49248,13 +49248,6 @@ entities:
       type: Transform\r
     - maxExternalPressure: 4000\r
       type: GasMiner\r
-- proto: GasMinerPlasma\r
-  entities:\r
-  - uid: 10842\r
-    components:\r
-    - pos: -89.5,43.5\r
-      parent: 1\r
-      type: Transform\r
 - proto: GasOutletInjector\r
   entities:\r
   - uid: 13633\r

diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml
index c948589eba28c6e6c29e075be730e900a4fcf663..ca591b4bdfb900284ed414c40bb99ec53e9431ab 100644 (file)
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
@@ -85806,14 +85806,6 @@ entities:
       type: Transform\r
     - maxExternalPressure: 4500\r
       type: GasMiner\r
-- proto: GasMinerPlasma\r
-  entities:\r
-  - uid: 15548\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 27.5,-47.5\r
-      parent: 8364\r
-      type: Transform\r
 - proto: GasMinerWaterVapor\r
   entities:\r
   - uid: 16806\r

diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml
index 493e63a6d248883174bea686d3a3ace45f84a15d..c6aa842e70678ef025000a5c025d912f1f792857 100644 (file)
--- a/Resources/Maps/cluster.yml
+++ b/Resources/Maps/cluster.yml
@@ -36196,13 +36196,6 @@ entities:
     - pos: 44.5,-7.5\r
       parent: 1\r
       type: Transform\r
-- proto: GasMinerPlasma\r
-  entities:\r
-  - uid: 6806\r
-    components:\r
-    - pos: 44.5,-15.5\r
-      parent: 1\r
-      type: Transform\r
 - proto: GasMinerWaterVapor\r
   entities:\r
   - uid: 6805\r

diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml
index f6e697cab2fa998a58f64f1db86f815e8d479c9f..f794781be971b969280817390b4c4fdee16095f9 100644 (file)
--- 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 98a2c5807d64c213e2072ae6cfcd0f0046e0e891..04326d5455633617656ed0d5f6fbda590d233267 100644 (file)
--- 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 3c27a889a86831b1403e63f547dfa420f3f188f8..70f157830451f2f54e73f6796a67e228bebab77e 100644 (file)
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -114614,13 +114614,6 @@ entities:
     - pos: 75.5,-41.5\r
       parent: 13329\r
       type: Transform\r
-- proto: GasMinerPlasma\r
-  entities:\r
-  - uid: 23793\r
-    components:\r
-    - pos: 92.5,-34.5\r
-      parent: 13329\r
-      type: Transform\r
 - proto: GasMinerWaterVapor\r
   entities:\r
   - uid: 23798\r

diff --git a/Resources/Maps/gemini.yml b/Resources/Maps/gemini.yml
index 731e9789043bcb2381ed1576a78f31d27979d623..f53d3c55181ee4cbbf2a71de38e17136bfb732c7 100644 (file)
--- 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 acafecdb0805fb51c09e3eba87888ce1b522c9e6..b1d34621dc14be912d49e457066be580a7a404dc 100644 (file)
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -64657,13 +64657,6 @@ entities:
     - pos: 26.5,-24.5\r
       parent: 30\r
       type: Transform\r
-- proto: GasMinerPlasma\r
-  entities:\r
-  - uid: 8774\r
-    components:\r
-    - pos: 26.5,-30.5\r
-      parent: 30\r
-      type: Transform\r
 - proto: GasMinerWaterVapor\r
   entities:\r
   - uid: 8692\r

diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml
index b02f47770143836a8861b4ffccb47dbf21ef0d03..576312a49c0020fa06db5bdc088704005cf837f8 100644 (file)
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
@@ -73770,13 +73770,6 @@ entities:
     - pos: 56.5,-29.5\r
       parent: 5350\r
       type: Transform\r
-- proto: GasMinerPlasma\r
-  entities:\r
-  - uid: 11599\r
-    components:\r
-    - pos: 68.5,-15.5\r
-      parent: 5350\r
-      type: Transform\r
 - proto: GasMixer\r
   entities:\r
   - uid: 11074\r

diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml
index dbf3a872d9683b06787dc0a71f33babe2bf36a29..a3ab111922bba8d2f34a57861a4981cb32b15160 100644 (file)
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
@@ -38029,13 +38029,6 @@ entities:
     - pos: -52.5,3.5\r
       parent: 4812\r
       type: Transform\r
-- proto: GasMinerPlasma\r
-  entities:\r
-  - uid: 9456\r
-    components:\r
-    - pos: -52.5,9.5\r
-      parent: 4812\r
-      type: Transform\r
 - proto: GasMinerWaterVapor\r
   entities:\r
   - uid: 9454\r

diff --git a/Resources/Maps/origin.yml b/Resources/Maps/origin.yml
index c18cb88cb4b91c087f805039b94aea5e0a407ac7..14edeae3957a8982bd513fff27cbcf92b30821a3 100644 (file)
--- 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 fdf72bcf993dde0acf9f7d1c559599e561a919e4..4cbddca9bde2fcb78586ee501b1115b8f159c53e 100644 (file)
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -41718,13 +41718,6 @@ entities:
     - pos: 46.5,-25.5\r
       parent: 2\r
       type: Transform\r
-- proto: GasMinerPlasma\r
-  entities:\r
-  - uid: 2130\r
-    components:\r
-    - pos: 46.5,-31.5\r
-      parent: 2\r
-      type: Transform\r
 - proto: GasMinerWaterVapor\r
   entities:\r
   - uid: 2138\r

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 7f35d42f8df8e2db122b997245a5b53673c11c83..f7498a7729dad5fed57eac25e9954c7905ce66e3 100644 (file)
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -33801,13 +33801,6 @@ entities:
     - pos: 36.5,22.5\r
       parent: 31\r
       type: Transform\r
-- proto: GasMinerPlasma\r
-  entities:\r
-  - uid: 11073\r
-    components:\r
-    - pos: 42.5,22.5\r
-      parent: 31\r
-      type: Transform\r
 - proto: GasMinerWaterVapor\r
   entities:\r
   - uid: 6836\r

diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml
index 2bd395130493de1844033116c36d71110c22f882..8c944332ab66f85d411ce5188300c8d310f47eb8 100644 (file)
--- 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