Damage masks (#9402)

2022-07-06 17:58:14 +10:00
parent 0bbdd0c1a3
commit a2a5df1990
55 changed files with 1160 additions and 930 deletions
--- a/Resources/Prototypes/Body/Parts/skeleton.yml
+++ b/Resources/Prototypes/Body/Parts/skeleton.yml
@@ -68,7 +68,7 @@
    - type: Actions
    - type: MobState
      thresholds:
-        0: !type:NormalMobState {}
+        0: Alive
    #    criticalThreshold: 50
    #    deadThreshold: 120

--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -95,9 +95,9 @@
      - FlyingMobLayer
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      5: !type:CriticalMobState {}
-      10: !type:DeadMobState {}
+      0: Alive
+      5: Critical
+      10: Dead
  - type: Appearance
  - type: DamageStateVisuals
    rotate: true
@@ -310,9 +310,9 @@
      - FlyingMobLayer
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      5: !type:CriticalMobState {}
-      10: !type:DeadMobState {}
+      0: Alive
+      5: Critical
+      10: Dead
  - type: RandomSpriteColor
    state: butterfly
    colors:
@@ -763,9 +763,9 @@
      - SmallMobLayer
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      10: !type:CriticalMobState {}
-      20: !type:DeadMobState {}
+      0: Alive
+      10: Critical
+      20: Dead
  - type: MovementSpeedModifier
    baseWalkSpeed : 5
    baseSprintSpeed : 5
--- a/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
@@ -32,8 +32,8 @@
  - type: MovementIgnoreGravity
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      150: !type:DeadMobState {}
+      0: Alive
+      150: Dead
  - type: Appearance
  - type: DamageStateVisuals
    states:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -37,9 +37,9 @@
      - MobLayer
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      50: !type:CriticalMobState {}
-      100: !type:DeadMobState {}
+      0: Alive
+      50: Critical
+      100: Dead
  - type: MovementIgnoreGravity
  - type: Appearance
  - type: DamageStateVisuals
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -37,9 +37,9 @@
      - MobLayer
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      150: !type:CriticalMobState {}
-      200: !type:DeadMobState {}
+      0: Alive
+      150: Critical
+      200: Dead
  - type: MeleeWeapon
    range: 1
    arcwidth: 0
@@ -156,9 +156,9 @@
      - SmallMobLayer
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      30: !type:CriticalMobState {}
-      60: !type:DeadMobState {}
+      0: Alive
+      30: Critical
+      60: Dead
  - type: MeleeWeapon
    range: 1
    arcwidth: 0
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -92,9 +92,9 @@
        Heat : 0.1 #per second, scales with temperature & other constants
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      50: !type:CriticalMobState {}
-      100: !type:DeadMobState {}
+      0: Alive
+      50: Critical
+      100: Dead
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -36,8 +36,8 @@
      - SmallMobLayer
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      15: !type:DeadMobState {}
+      0: Alive
+      15: Dead
  - type: MovementIgnoreGravity
  - type: Appearance
  - type: DamageStateVisuals
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -50,8 +50,8 @@
      - MobLayer
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      200: !type:DeadMobState {}
+      0: Alive
+      200: Dead
  - type: Bloodstream
    bloodReagent: FluorosulfuricAcid
    bloodlossDamage:
@@ -121,8 +121,8 @@
      state: running
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      300: !type:DeadMobState {}
+      0: Alive
+      300: Dead
  - type: SlowOnDamage
    speedModifierThresholds:
      250: 0.7
@@ -151,8 +151,8 @@
      state: running
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      200: !type:DeadMobState {}
+      0: Alive
+      200: Dead
  - type: MovementSpeedModifier
    baseWalkSpeed : 3.0
    baseSprintSpeed : 5.5
@@ -184,8 +184,8 @@
      state: running
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      1500: !type:DeadMobState {}
+      0: Alive
+      1500: Dead
  - type: MovementSpeedModifier
    baseWalkSpeed : 2.8
    baseSprintSpeed : 3.8
@@ -222,8 +222,8 @@
      state: running
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      550: !type:DeadMobState {}
+      0: Alive
+      550: Dead
  - type: MovementSpeedModifier
    baseWalkSpeed : 2.3
    baseSprintSpeed : 4.2
@@ -260,8 +260,8 @@
      state: running
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      250: !type:DeadMobState {}
+      0: Alive
+      250: Dead
  - type: MovementSpeedModifier
    baseWalkSpeed : 2.7
    baseSprintSpeed : 6.0
@@ -308,8 +308,8 @@
      state: running
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      300: !type:DeadMobState {}
+      0: Alive
+      300: Dead
  - type: SlowOnDamage
    speedModifierThresholds:
      250: 0.4
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -55,9 +55,9 @@
      - FlyingMobLayer
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      450: !type:CriticalMobState {}
-      500: !type:DeadMobState {}
+      0: Alive
+      450: Critical
+      500: Dead
  - type: Metabolizer
    solutionOnBody: false
    updateFrequency: 0.25
--- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -56,9 +56,9 @@
    interactFailureString: petting-failure-corrupted-corgi
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      80: !type:CriticalMobState {}
-      160: !type:DeadMobState {}
+      0: Alive
+      80: Critical
+      160: Dead
  - type: Grammar
    attributes:
      gender: male
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -50,7 +50,7 @@
    damageContainer: Biological
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
+      0: Alive
  - type: HeatResistance
  - type: CombatMode
  - type: Internals
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -96,8 +96,8 @@
    baseSprintSpeed : 5
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      60: !type:DeadMobState {}
+      0: Alive
+      60: Dead
  - type: Flashable
  - type: NoSlip
  - type: StatusEffects
@@ -190,8 +190,8 @@
    baseSprintSpeed : 2
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      1000: !type:DeadMobState {}
+      0: Alive
+      1000: Dead
  - type: Sprite
    drawdepth: Mobs
    netsync: false
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -235,9 +235,9 @@
  - type: Internals
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      100: !type:CriticalMobState {}
-      200: !type:DeadMobState {}
+      0: Alive
+      100: Critical
+      200: Dead
  - type: Destructible
    thresholds:
    - trigger:
@@ -442,9 +442,9 @@
      damageContainer: Biological
    - type: MobState
      thresholds:
-        0: !type:NormalMobState {}
-        100: !type:CriticalMobState {}
-        200: !type:DeadMobState {}
+        0: Alive
+        100: Critical
+        200: Dead
    - type: Appearance
      visuals:
      - type: RotationVisualizer
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -185,8 +185,8 @@
  - type: Internals
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
-      100: !type:DeadMobState {}
+      0: Alive
+      100: Dead
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -47,7 +47,7 @@
    # Note that the personal AI never "dies".
  - type: MobState
    thresholds:
-      0: !type:NormalMobState {}
+      0: Alive
  - type: Appearance
    visuals:
      - type: GenericEnumVisualizer