epic Respiration Rework (#6022)

2022-02-06 21:48:15 -07:00
parent ee4c5559a3
commit 4ae1c4e332
32 changed files with 596 additions and 586 deletions
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -25,7 +25,16 @@
    sprite: /Textures/Interface/Alerts/breathing.rsi
    state: not_enough_oxy
  name: "[color=red]Low Oxygen[/color]"
-  description: "There is not [color=red]not enough oxygen[/color] in the air you are breathing. Put on [color=green]internals[/color]."
+  description: "There is [color=red]not enough oxygen[/color] in the air you are breathing. Put on [color=green]internals[/color]."
+
+- type: alert
+  alertType: Toxins
+  category: Toxins
+  icon:
+    sprite: /Textures/Interface/Alerts/breathing.rsi
+    state: too_much_tox
+  name: "[color=red]High Toxin Level[/color]"
+  description: "There are [color=red]too many toxins[/color] in the air you are breathing. Put on [color=green]internals[/color] or get away."

 - type: alert
  alertType: LowPressure
--- a/Resources/Prototypes/Atmospherics/gases.yml
+++ b/Resources/Prototypes/Atmospherics/gases.yml
@@ -5,6 +5,7 @@
  heatCapacityRatio: 1.4
  molarMass: 32
  color: 2887E8
+  reagent: Oxygen

 - type: gas
  id: 1
@@ -13,6 +14,7 @@
  heatCapacityRatio: 1.4
  molarMass: 28
  color: DA1010
+  reagent: Nitrogen

 - type: gas
  id: 2
@@ -21,6 +23,7 @@
  heatCapacityRatio: 1.3
  molarMass: 44
  color: 4e4e4e
+  reagent: CarbonDioxide

 - type: gas
  id: 3
@@ -31,6 +34,7 @@
  gasOverlaySprite: /Textures/Effects/atmospherics.rsi
  gasOverlayState: plasma
  color: FF3300
+  reagent: Plasma

 - type: gas
  id: 4
@@ -41,6 +45,7 @@
  gasOverlaySprite: /Textures/Effects/atmospherics.rsi
  gasOverlayState: tritium
  color: 13FF4B
+  reagent: Tritium

 - type: gas
  id: 5
@@ -51,3 +56,4 @@
  gasOverlaySprite: /Textures/Effects/atmospherics.rsi
  gasOverlayState: water_vapor
  color: bffffd
+  reagent: Water
--- a/Resources/Prototypes/Body/Mechanisms/human.yml
+++ b/Resources/Prototypes/Body/Mechanisms/human.yml
@@ -100,6 +100,19 @@
    size: 1
    compatibility: Biological
  - type: Lung
+    validReagentGases:
+    - Oxygen
+    - Plasma
+    - Tritium
+    - CarbonDioxide
+  - type: Metabolizer
+    removeEmpty: true
+    solutionOnBody: false
+    solution: "Lung"
+    metabolizerTypes: [ Human ]
+    groups:
+    - id: Gas
+      rateModifier: 100.0

 - type: entity
  id: OrganHumanHeart
--- a/Resources/Prototypes/Body/Mechanisms/slime.yml
+++ b/Resources/Prototypes/Body/Mechanisms/slime.yml
@@ -11,7 +11,6 @@
    - type: Mechanism
      size: 5
      compatibility: Slime
-    - type: Lung
    - type: Brain
    - type: Stomach
      maxVolume: 250
--- a/Resources/Prototypes/Body/Parts/animal.yml
+++ b/Resources/Prototypes/Body/Parts/animal.yml
@@ -82,6 +82,19 @@
    size: 1
    compatibility: Biological
  - type: Lung
+    validReagentGases:
+    - Oxygen
+    - Plasma
+    - Tritium
+    - CarbonDioxide
+  - type: Metabolizer
+    removeEmpty: true
+    solutionOnBody: false
+    solution: "Lung"
+    metabolizerTypes: [ Animal ]
+    groups:
+    - id: Gas
+      rateModifier: 100.0

 - type: entity
  id: OrganAnimalStomach
--- a/Resources/Prototypes/Chemistry/metabolism_groups.yml
+++ b/Resources/Prototypes/Chemistry/metabolism_groups.yml
@@ -16,3 +16,7 @@

 - type: metabolismGroup
  id: Drink
+
+# Used for gases that have effects on being inhaled
+- type: metabolismGroup
+  id: Gas
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -152,17 +152,12 @@
    normalBodyTemperature: 310.15
    thermalRegulationTemperatureThreshold: 25
  - type: Respirator
-    needsGases:
-      Oxygen: 0.00060763888
-    producesGases:
-      Oxygen: 0.00045572916
-      CarbonDioxide: 0.00015190972
    damage:
      types:
-        Asphyxiation: 1
+        Asphyxiation: 3
    damageRecovery:
      types:
-        Asphyxiation: -1
+        Asphyxiation: -1.5
  - type: Temperature
    heatDamageThreshold: 360
    coldDamageThreshold: 260
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -42,10 +42,10 @@
  - type: Respirator
    damage:
      types:
-        Asphyxiation: 1
+        Asphyxiation: 3
    damageRecovery:
      types:
-        Asphyxiation: -1
+        Asphyxiation: -1.5
  - type: UnarmedCombat
    range: 1.5
    arcwidth: 0
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -11,6 +11,13 @@
    context: "human"
  - type: PlayerMobMover
  - type: PlayerInputMover
+  - type: Respirator
+    damage:
+      types:
+        Asphyxiation: 3
+    damageRecovery:
+      types:
+        Asphyxiation: -1.5
  - type: Alerts
  - type: Actions
    innateActions:
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -9,6 +9,13 @@
  - type: Icon
    sprite: Mobs/Species/Slime/parts.rsi
    state: full
+  - type: Respirator
+    damage:
+      types:
+        Asphyxiation: 3
+    damageRecovery:
+      types:
+        Asphyxiation: -1.5
  - type: Sprite
    netsync: false
    noRot: true
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -199,18 +199,6 @@
    shiveringHeatRegulation: 2000
    normalBodyTemperature: 310.15
    thermalRegulationTemperatureThreshold: 25
-  - type: Respirator
-    needsGases:
-      Oxygen: 0.00060763888
-    producesGases:
-      Oxygen: 0.00045572916
-      CarbonDioxide: 0.00015190972
-    damage:
-      types:
-        Asphyxiation: 1
-    damageRecovery:
-      types:
-        Asphyxiation: -1
  - type: Internals
  - type: MobState
    thresholds:
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -83,18 +83,14 @@
  - type: Body
    template: HumanoidTemplate
    preset: VoxPreset
+  # TODO Vox nitrogen
  - type: Respirator
-    needsGases:
-      Nitrogen: 0.00060763888
-    producesGases:
-      Nitrogen: 0.00045572916
-      CarbonDioxide: 0.00015190972
    damage:
      types:
-        Asphyxiation: 1
+        Asphyxiation: 3
    damageRecovery:
      types:
-        Asphyxiation: -1
+        Asphyxiation: -1.5
 #  - type: Appearance
 #    visuals:
 #      - type: RotationVisualizer
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -134,26 +134,6 @@
          types:
            Poison: 2

- type: reagent
-  id: Nitrogen
-  name: nitrogen
-  group: Elements
-  desc: A colorless, odorless unreactive gas. Highly stable.
-  physicalDesc: gaseous
-  color: "#808080"
-  boilingPoint: -195.8
-  meltingPoint: -210.0
-
- type: reagent
-  id: Oxygen
-  name: oxygen
-  group: Elements
-  desc: An oxidizing, colorless gas.
-  physicalDesc: gaseous
-  color: "#808080"
-  boilingPoint: -183.0
-  meltingPoint: -218.4
-
 - type: reagent
  id: Potassium
  name: potassium
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -0,0 +1,121 @@
+- type: reagent
+  id: Oxygen
+  name: oxygen
+  desc: An oxidizing, colorless gas.
+  physicalDesc: gaseous
+  color: "#808080"
+  boilingPoint: -183.0
+  meltingPoint: -218.4
+  metabolisms:
+    Gas:
+      effects:
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Human
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Animal
+      # Convert Oxygen into CO2.
+      - !type:ModifyLungGas
+        ratios:
+          CarbonDioxide: 1.0
+          Oxygen: -1.0
+
+- type: reagent
+  id: Plasma
+  name: plasma
+  desc: Funky, space-magic pixie dust. You probably shouldn't eat this, but we both know you will anyways.
+  physicalDesc: gaseous
+  color: "#7e009e"
+  boilingPoint: -127.3 # Random values picked between the actual values for CO2 and O2
+  meltingPoint: -186.4
+  tileReactions:
+  - !type:FlammableTileReaction
+    temperatureMultiplier: 1.5
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Poison: 3
+      - !type:AdjustReagent
+        reagent: Inaprovaline
+        amount: -2.0
+    Gas:
+      effects:
+      - !type:HealthChange
+        scaleByQuantity: true
+        ignoreResistances: true
+        damage:
+          types:
+            Poison:
+              1
+      # Cant be added until I add metabolism effects on reagent removal
+      #- !type:AdjustAlert
+      #  alertType: Toxins
+  reactiveEffects:
+    Flammable:
+      methods: [ Touch ]
+      effects:
+      - !type:FlammableReaction
+
+- type: reagent
+  id: Tritium
+  name: tritium
+  desc: Radioactive space-magic pixie dust.
+  physicalDesc: ionizing
+  color: "#66ff33"
+  tileReactions:
+  - !type:FlammableTileReaction
+    temperatureMultiplier: 2.0
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Radiation: 3
+    Gas:
+      effects:
+      - !type:HealthChange
+        scaleByQuantity: true
+        ignoreResistances: true
+        damage:
+          types:
+            Radiation:
+              1
+      # Cant be added until I add metabolism effects on reagent removal
+      #- !type:AdjustAlert
+      #  alertType: Toxins
+
+- type: reagent
+  id: CarbonDioxide
+  name: carbon dioxide
+  desc: You have genuinely no idea what this is.
+  physicalDesc: odorless
+  color: "#66ff33"
+  metabolisms:
+    Gas:
+      effects:
+      - !type:HealthChange
+        scaleByQuantity: true
+        ignoreResistances: true
+        damage:
+          types:
+            Poison:
+              0.2
+      # Cant be added until I add metabolism effects on reagent removal
+      #- !type:AdjustAlert
+      #  alertType: CarbonDioxide
+
+- type: reagent
+  id: Nitrogen
+  name: nitrogen
+  desc: A colorless, odorless unreactive gas. Highly stable.
+  physicalDesc: gaseous
+  color: "#808080"
+  boilingPoint: -195.8
+  meltingPoint: -210.0
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -133,35 +133,6 @@
        type: Local
        messages: [ "generic-reagent-effect-burning-insides" ]
        probability: 0.33
-  # TODO MIRROR acid!
-
- type: reagent
-  id: Plasma
-  name: plasma
-  group: Toxins
-  desc: Funky, space-magic pixie dust. You probably shouldn't eat this, but we both know you will anyways.
-  physicalDesc: gaseous
-  color: "#7e009e"
-  boilingPoint: -127.3 # Random values picked between the actual values for CO2 and O2
-  meltingPoint: -186.4
-  tileReactions:
-  - !type:FlammableTileReaction
-    temperatureMultiplier: 1.5
-  metabolisms:
-    Poison:
-      effects:
-      - !type:HealthChange
-        damage:
-          types:
-            Poison: 3
-      - !type:AdjustReagent
-        reagent: Inaprovaline
-        amount: -2.0
-  reactiveEffects:
-    Flammable:
-      methods: [ Touch ]
-      effects:
-      - !type:FlammableReaction

 - type: reagent
  id: UnstableMutagen