diff --git a/data/monsters/adult brine dragon.yaml b/data/monsters/adult brine dragon.yaml
index e576e92..7a11bc7 100644
--- a/data/monsters/adult brine dragon.yaml
+++ b/data/monsters/adult brine dragon.yaml
@@ -193,8 +193,8 @@ hp: 222
hp_misc: null
immunities:
- acid
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Aquan
- Common
diff --git a/data/monsters/adult cloud dragon.yaml b/data/monsters/adult cloud dragon.yaml
index a3c39cf..deede63 100644
--- a/data/monsters/adult cloud dragon.yaml
+++ b/data/monsters/adult cloud dragon.yaml
@@ -224,8 +224,8 @@ hp: 254
hp_misc: null
immunities:
- electricity
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Auran
- Common
diff --git a/data/monsters/adult crystal dragon.yaml b/data/monsters/adult crystal dragon.yaml
index 1068cb3..4628101 100644
--- a/data/monsters/adult crystal dragon.yaml
+++ b/data/monsters/adult crystal dragon.yaml
@@ -219,8 +219,8 @@ description: 'Good-natured but vain, crystal dragons are beautiful creatures wit
hp: 185
hp_misc: null
immunities:
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Common
- Draconic
diff --git a/data/monsters/adult magma dragon.yaml b/data/monsters/adult magma dragon.yaml
index 1084993..5a139fb 100644
--- a/data/monsters/adult magma dragon.yaml
+++ b/data/monsters/adult magma dragon.yaml
@@ -201,8 +201,8 @@ hp: 270
hp_misc: null
immunities:
- fire
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Common
- Draconic
diff --git a/data/monsters/adult umbral dragon.yaml b/data/monsters/adult umbral dragon.yaml
index 6bd9c70..00d8567 100644
--- a/data/monsters/adult umbral dragon.yaml
+++ b/data/monsters/adult umbral dragon.yaml
@@ -200,8 +200,8 @@ hp: 275
hp_misc: null
immunities:
- negative
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Common
- Draconic
diff --git a/data/monsters/amoeba swarm.yaml b/data/monsters/amoeba swarm.yaml
index 2e06638..337d825 100644
--- a/data/monsters/amoeba swarm.yaml
+++ b/data/monsters/amoeba swarm.yaml
@@ -63,10 +63,10 @@ hp_misc: null
immunities:
- acid
- critical hits
-- mental
+- __mental__
- precision
-- unconscious
-- visual
+- __unconscious__
+- __visual__
level: 1
melee_attacks: null
name: Amoeba Swarm
diff --git a/data/monsters/ancient brine dragon.yaml b/data/monsters/ancient brine dragon.yaml
index 823d0a3..4cd1462 100644
--- a/data/monsters/ancient brine dragon.yaml
+++ b/data/monsters/ancient brine dragon.yaml
@@ -241,8 +241,8 @@ hp: 330
hp_misc: null
immunities:
- acid
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Aquan
- Common
diff --git a/data/monsters/ancient cloud dragon.yaml b/data/monsters/ancient cloud dragon.yaml
index 1993f6e..351d41a 100644
--- a/data/monsters/ancient cloud dragon.yaml
+++ b/data/monsters/ancient cloud dragon.yaml
@@ -251,8 +251,8 @@ hp: 355
hp_misc: null
immunities:
- electricity
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Auran
- Common
diff --git a/data/monsters/ancient crystal dragon.yaml b/data/monsters/ancient crystal dragon.yaml
index 0fe1339..b5a22ab 100644
--- a/data/monsters/ancient crystal dragon.yaml
+++ b/data/monsters/ancient crystal dragon.yaml
@@ -299,8 +299,8 @@ description: 'Good-natured but vain, crystal dragons are beautiful creatures wit
hp: 275
hp_misc: null
immunities:
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Celestial
- Common
diff --git a/data/monsters/ancient magma dragon.yaml b/data/monsters/ancient magma dragon.yaml
index fbe7759..00a2d47 100644
--- a/data/monsters/ancient magma dragon.yaml
+++ b/data/monsters/ancient magma dragon.yaml
@@ -227,8 +227,8 @@ hp: 390
hp_misc: null
immunities:
- fire
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Common
- Draconic
diff --git a/data/monsters/ancient umbral dragon.yaml b/data/monsters/ancient umbral dragon.yaml
index 8b26b81..1fa26b4 100644
--- a/data/monsters/ancient umbral dragon.yaml
+++ b/data/monsters/ancient umbral dragon.yaml
@@ -228,8 +228,8 @@ hp: 375
hp_misc: null
immunities:
- negative
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Common
- Daemonic
diff --git a/data/monsters/aolaz.yaml b/data/monsters/aolaz.yaml
index 5cd6f94..9b663a5 100644
--- a/data/monsters/aolaz.yaml
+++ b/data/monsters/aolaz.yaml
@@ -117,19 +117,19 @@ hp: 255
hp_misc: null
immunities:
- bleed
-- death effects
-- disease
-- doomed
-- drained
-- fatigued
-- healing
-- necromancy
-- nonlethal attacks
-- paralyzed
-- poison
-- sickened
+- __death__ effects
+- __disease__
+- __doomed__
+- __drained__
+- __fatigued__
+- __healing__
+- __necromancy__
+- __nonlethal__ attacks
+- __paralyzed__
+- __poison__
+- __sickened__
- sonic
-- unconscious
+- __unconscious__
level: 18
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/ararda.yaml b/data/monsters/ararda.yaml
index 2ae708f..7367f15 100644
--- a/data/monsters/ararda.yaml
+++ b/data/monsters/ararda.yaml
@@ -128,7 +128,7 @@ description: '__Shaitans__ corrupted by the Black Desert''s blightburn become sc
hp: 280
hp_misc: null
immunities:
-- disease
+- __disease__
items:
- +2 greater striking maul
languages:
diff --git a/data/monsters/army ant swarm.yaml b/data/monsters/army ant swarm.yaml
index d93dd60..7eea13e 100644
--- a/data/monsters/army ant swarm.yaml
+++ b/data/monsters/army ant swarm.yaml
@@ -71,7 +71,7 @@ hp: 55
hp_misc: null
immunities:
- precision
-- swarm mind
+- __swarm mind__
level: 5
melee_attacks: null
name: Army Ant Swarm
diff --git a/data/monsters/attic whisperer.yaml b/data/monsters/attic whisperer.yaml
index 335b1b3..f9ee7f4 100644
--- a/data/monsters/attic whisperer.yaml
+++ b/data/monsters/attic whisperer.yaml
@@ -184,11 +184,11 @@ description: 'Beware the haunting sobs of the attic whisperer, for they carry th
hp: 60
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
-- unconscious
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
+- __unconscious__
languages:
- Common
- Necril
diff --git a/data/monsters/augnagar.yaml b/data/monsters/augnagar.yaml
index ef8b63f..0b8ff69 100644
--- a/data/monsters/augnagar.yaml
+++ b/data/monsters/augnagar.yaml
@@ -138,8 +138,8 @@ description: 'The brutish and gluttonous augnagar live to feast— preferably on
hp: 225
hp_misc: null
immunities:
-- controlled
-- fear
+- __controlled__
+- __fear__
languages:
- Abyssal
- telepathy 100 feet
diff --git a/data/monsters/basidirond.yaml b/data/monsters/basidirond.yaml
index e247449..2d991ba 100644
--- a/data/monsters/basidirond.yaml
+++ b/data/monsters/basidirond.yaml
@@ -217,7 +217,7 @@ hp: 80
hp_misc: null
immunities:
- cold
-- mental
+- __mental__
level: 5
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/belker.yaml b/data/monsters/belker.yaml
index 8196213..e1d692d 100644
--- a/data/monsters/belker.yaml
+++ b/data/monsters/belker.yaml
@@ -93,10 +93,10 @@ hp: 78
hp_misc: null
immunities:
- bleed
-- paralyzed
-- poison
+- __paralyzed__
+- __poison__
- precision
-- sleep
+- __sleep__
languages:
- Auran
level: 6
diff --git a/data/monsters/binumir.yaml b/data/monsters/binumir.yaml
index 01a86a4..261364f 100644
--- a/data/monsters/binumir.yaml
+++ b/data/monsters/binumir.yaml
@@ -124,12 +124,12 @@ description: 'Whenever two individuals who share a strong emotional bond perish
hp: 25
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
- precision
-- unconscious
+- __unconscious__
languages:
- Common
level: 3
diff --git a/data/monsters/blindheim.yaml b/data/monsters/blindheim.yaml
index 8aa9f9c..b04a825 100644
--- a/data/monsters/blindheim.yaml
+++ b/data/monsters/blindheim.yaml
@@ -93,8 +93,8 @@ description: 'Inhabitants of damp, subterranean caves, blindheims resemble stubb
hp: 27
hp_misc: null
immunities:
-- blinded
-- light
+- __blinded__
+- __light__
level: 2
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/blizzardborn.yaml b/data/monsters/blizzardborn.yaml
index c36dd6e..27cf233 100644
--- a/data/monsters/blizzardborn.yaml
+++ b/data/monsters/blizzardborn.yaml
@@ -71,9 +71,9 @@ hp_misc: null
immunities:
- bleed
- cold
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Aquan
level: 6
diff --git a/data/monsters/bodak.yaml b/data/monsters/bodak.yaml
index 6d15e59..6bfa323 100644
--- a/data/monsters/bodak.yaml
+++ b/data/monsters/bodak.yaml
@@ -164,11 +164,11 @@ description: 'When a living, sentient humanoid is exposed to an extreme expressi
hp: 160
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
-- unconscious
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
+- __unconscious__
languages:
- Abyssal
- Common
diff --git a/data/monsters/bog mummy.yaml b/data/monsters/bog mummy.yaml
index d237aee..f442712 100644
--- a/data/monsters/bog mummy.yaml
+++ b/data/monsters/bog mummy.yaml
@@ -128,11 +128,11 @@ description: 'The cultural practice of mummifying the dead is not the only way a
hp: 85
hp_misc: "negative healing\r\n"
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
-- unconscious
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
+- __unconscious__
languages:
- Common
- Necril
diff --git a/data/monsters/bone skipper swarm.yaml b/data/monsters/bone skipper swarm.yaml
index ed5184a..3d8d01d 100644
--- a/data/monsters/bone skipper swarm.yaml
+++ b/data/monsters/bone skipper swarm.yaml
@@ -64,7 +64,7 @@ hp: 120
hp_misc: null
immunities:
- precision
-- swarm mind
+- __swarm mind__
level: 6
melee_attacks: null
name: Bone Skipper Swarm
diff --git a/data/monsters/brood leech swarm.yaml b/data/monsters/brood leech swarm.yaml
index caa7efa..56c31b4 100644
--- a/data/monsters/brood leech swarm.yaml
+++ b/data/monsters/brood leech swarm.yaml
@@ -66,7 +66,7 @@ hp: 40
hp_misc: null
immunities:
- precision
-- swarm mind
+- __swarm mind__
level: 4
melee_attacks: null
name: Brood Leech Swarm
diff --git a/data/monsters/bugul noz.yaml b/data/monsters/bugul noz.yaml
index dfc347b..ef8fac3 100644
--- a/data/monsters/bugul noz.yaml
+++ b/data/monsters/bugul noz.yaml
@@ -190,7 +190,7 @@ description: 'This gangly fey humanoid wanders the overgrown paths of dark, mist
hp: 200
hp_misc: null
immunities:
-- emotion
+- __emotion__
languages:
- Common
- Sylvan
diff --git a/data/monsters/cairn linnorm.yaml b/data/monsters/cairn linnorm.yaml
index d8d1c82..765391c 100644
--- a/data/monsters/cairn linnorm.yaml
+++ b/data/monsters/cairn linnorm.yaml
@@ -142,9 +142,9 @@ hp: 360
hp_misc: regeneration 15 (deactivated by cold iron)
immunities:
- acid
-- curse
-- paralyzed
-- sleep
+- __curse__
+- __paralyzed__
+- __sleep__
languages:
- Aklo
- Draconic
diff --git a/data/monsters/cairn wight.yaml b/data/monsters/cairn wight.yaml
index 1e7ff2a..d81ab41 100644
--- a/data/monsters/cairn wight.yaml
+++ b/data/monsters/cairn wight.yaml
@@ -156,11 +156,11 @@ description: 'Jealous guardians of tombs, barrows, and sepulchers, cairn wights
hp: 67
hp_misc: null
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
-- unconscious
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
+- __unconscious__
items:
- longsword
- studded leather armor
diff --git a/data/monsters/carnivorous blob.yaml b/data/monsters/carnivorous blob.yaml
index 4199a22..6e47c7d 100644
--- a/data/monsters/carnivorous blob.yaml
+++ b/data/monsters/carnivorous blob.yaml
@@ -142,13 +142,13 @@ hp_misc: null
immunities:
- acid
- critical hits
-- mental
+- __mental__
- piercing
- precision
- slashing
- sonic
-- unconscious
-- visual
+- __unconscious__
+- __visual__
level: 13
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/carrion golem.yaml b/data/monsters/carrion golem.yaml
index f7d667d..731494b 100644
--- a/data/monsters/carrion golem.yaml
+++ b/data/monsters/carrion golem.yaml
@@ -129,21 +129,21 @@ hp: 60
hp_misc: null
immunities:
- bleed
-- death effects
-- disease
-- doomed
-- drained
+- __death__ effects
+- __disease__
+- __doomed__
+- __drained__
- electricity
-- fatigued
-- healing
+- __fatigued__
+- __healing__
- magic (see Golem Antimagic below)
-- mental
-- necromancy
+- __mental__
+- __necromancy__
- nonlethal attacks
-- paralyzed
-- poison
-- sickened
-- unconscious
+- __paralyzed__
+- __poison__
+- __sickened__
+- __unconscious__
level: 4
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/cat sith.yaml b/data/monsters/cat sith.yaml
index faa1882..da95529 100644
--- a/data/monsters/cat sith.yaml
+++ b/data/monsters/cat sith.yaml
@@ -126,7 +126,7 @@ description: 'Cat siths can easily pass for common black house cats, noteworthy
hp: 110
hp_misc: null
immunities:
-- misfortune effects
+- __misfortune__ effects
languages:
- Sylvan
- speak with animals
diff --git a/data/monsters/catoblepas.yaml b/data/monsters/catoblepas.yaml
index 10969ef..391b74c 100644
--- a/data/monsters/catoblepas.yaml
+++ b/data/monsters/catoblepas.yaml
@@ -92,9 +92,9 @@ description: 'The catoblepas is an aggressive beast at the best of times. Though
hp: 215
hp_misc: null
immunities:
-- disease
-- poison
-- olfactory
+- __disease__
+- __poison__
+- __olfactory__
languages:
- Aklo
level: 12
diff --git a/data/monsters/catrina.yaml b/data/monsters/catrina.yaml
index 05a022f..81a1a95 100644
--- a/data/monsters/catrina.yaml
+++ b/data/monsters/catrina.yaml
@@ -179,8 +179,8 @@ description: 'Not all spirits who enter the __Boneyard__ realize they have died.
hp: 75
hp_misc: null
immunities:
-- death effects
-- disease
+- __death__ effects
+- __disease__
languages:
- Abyssal
- Celestial
diff --git a/data/monsters/chernobue.yaml b/data/monsters/chernobue.yaml
index 2849100..cad7f57 100644
--- a/data/monsters/chernobue.yaml
+++ b/data/monsters/chernobue.yaml
@@ -181,8 +181,8 @@ description: 'The chernobue infects all creatures it encounters with itself, spr
hp: 220
hp_misc: null
immunities:
-- controlled
-- fear
+- __controlled__
+- __fear__
languages:
- Abyssal
- telepathy 100 feet
diff --git a/data/monsters/children of mhar.yaml b/data/monsters/children of mhar.yaml
index e5ebe80..3d3d9c3 100644
--- a/data/monsters/children of mhar.yaml
+++ b/data/monsters/children of mhar.yaml
@@ -119,7 +119,7 @@ hp: 420
hp_misc: null
immunities:
- fire
-- poison
+- __poison__
languages:
- Aklo
- telepathy 100 feet
diff --git a/data/monsters/cobbleswarm.yaml b/data/monsters/cobbleswarm.yaml
index fa98d71..78d6ff3 100644
--- a/data/monsters/cobbleswarm.yaml
+++ b/data/monsters/cobbleswarm.yaml
@@ -100,7 +100,7 @@ hp: 20
hp_misc: null
immunities:
- precision
-- swarm mind
+- __swarm mind__
level: 2
melee_attacks: null
name: Cobbleswarm
diff --git a/data/monsters/cockroach swarm.yaml b/data/monsters/cockroach swarm.yaml
index c14f1ab..d4004af 100644
--- a/data/monsters/cockroach swarm.yaml
+++ b/data/monsters/cockroach swarm.yaml
@@ -46,7 +46,7 @@ hp: 20
hp_misc: null
immunities:
- precision
-- swarm mind
+- __swarm mind__
level: 2
melee_attacks: null
name: Cockroach Swarm
diff --git a/data/monsters/counteflora.yaml b/data/monsters/counteflora.yaml
index 83403a9..da26151 100644
--- a/data/monsters/counteflora.yaml
+++ b/data/monsters/counteflora.yaml
@@ -156,7 +156,7 @@ description: 'The counteflora resembles an oversized dandelion with black flower
hp: 220
hp_misc: null
immunities:
-- poison
+- __poison__
level: 10
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/crawling hand.yaml b/data/monsters/crawling hand.yaml
index f0f6ee3..fa04440 100644
--- a/data/monsters/crawling hand.yaml
+++ b/data/monsters/crawling hand.yaml
@@ -67,12 +67,12 @@ description: 'A crawling hand formed from the appendage of a Medium creature is
hp: 8
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
-- unconscious
-- visual
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
+- __unconscious__
+- __visual__
languages:
- Common
- can't speak any language
diff --git a/data/monsters/cu sith.yaml b/data/monsters/cu sith.yaml
index 652afe8..04f88fb 100644
--- a/data/monsters/cu sith.yaml
+++ b/data/monsters/cu sith.yaml
@@ -116,7 +116,7 @@ description: 'Cu siths are hound-like doorkeepers of remote portals to other pla
hp: 140
hp_misc: null
immunities:
-- fear
+- __fear__
languages:
- Sylvan
- can't speak any language
diff --git a/data/monsters/cythnigot.yaml b/data/monsters/cythnigot.yaml
index 6fd80e7..e38f57c 100644
--- a/data/monsters/cythnigot.yaml
+++ b/data/monsters/cythnigot.yaml
@@ -106,8 +106,8 @@ description: 'The cythnigot is a foul fungal parasite that grows and thrives in
hp: 14
hp_misc: null
immunities:
-- controlled
-- fear
+- __controlled__
+- __fear__
languages:
- Abyssal
- telepathy (touch only)
diff --git a/data/monsters/derghodaemon.yaml b/data/monsters/derghodaemon.yaml
index 9c41db9..abc37a7 100644
--- a/data/monsters/derghodaemon.yaml
+++ b/data/monsters/derghodaemon.yaml
@@ -157,9 +157,9 @@ description: 'Derghodaemons represent death through unfathomable violence and be
hp: 240
hp_misc: null
immunities:
-- confusion
-- death effects
-- swarm attacks
+- __confusion__
+- __death__ effects
+- __swarm__ attacks
languages:
- Common
- Daemonic
diff --git a/data/monsters/destrachan.yaml b/data/monsters/destrachan.yaml
index 8c594cb..68d78a0 100644
--- a/data/monsters/destrachan.yaml
+++ b/data/monsters/destrachan.yaml
@@ -132,8 +132,8 @@ description: 'This underground reptilian horror walks on two powerful hind legs.
hp: 135
hp_misc: null
immunities:
-- blinded
-- visual
+- __blinded__
+- __visual__
languages:
- Destrachan
- Undercommon
diff --git a/data/monsters/devourer.yaml b/data/monsters/devourer.yaml
index 9a513ec..0aca6df 100644
--- a/data/monsters/devourer.yaml
+++ b/data/monsters/devourer.yaml
@@ -148,12 +148,12 @@ description: 'When fiends and powerful evil spellcasters are lost beyond the far
hp: 175
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
- spell deflection
-- unconscious
+- __unconscious__
languages:
- Abyssal
- Celestial
diff --git a/data/monsters/dig-widget.yaml b/data/monsters/dig-widget.yaml
index 91d58c9..a79b3c6 100644
--- a/data/monsters/dig-widget.yaml
+++ b/data/monsters/dig-widget.yaml
@@ -106,19 +106,19 @@ hp: 65
hp_misc: null
immunities:
- bleed
-- death effects
-- disease
-- doomed
-- drained
-- fatigued
-- healing
-- mental
-- necromancy
+- __death__ effects
+- __disease__
+- __doomed__
+- __drained__
+- __fatigued__
+- __healing__
+- __mental__
+- __necromancy__
- nonlethal attacks
-- paralyzed
-- poison
-- sickened
-- unconscious
+- __paralyzed__
+- __poison__
+- __sickened__
+- __unconscious__
level: 5
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/doprillu.yaml b/data/monsters/doprillu.yaml
index 6dc3f58..dc42ca7 100644
--- a/data/monsters/doprillu.yaml
+++ b/data/monsters/doprillu.yaml
@@ -146,10 +146,8 @@ description: 'The aberrations known as doprillus are hulks with banded muscles w
hp: 260
hp_misc: regeneration 20 (deactivated by cold)
immunities:
-- enfeebled
- (while wearing its mask)
-- slowed (while
- wearing its mask)
+- __enfeebled__ (while wearing its mask)
+- __slowed__ (while wearing its mask)
languages:
- Aklo
- Common
diff --git a/data/monsters/dracolisk.yaml b/data/monsters/dracolisk.yaml
index 5e0a447..3a27471 100644
--- a/data/monsters/dracolisk.yaml
+++ b/data/monsters/dracolisk.yaml
@@ -256,8 +256,8 @@ description: 'Dracolisks are rare magical crossbreeds of chromatic dragons and _
hp: 155
hp_misc: null
immunities:
-- paralyzed
-- petrified
+- __paralyzed__
+- __petrified__
- sleep
level: 9
melee_attacks:
diff --git a/data/monsters/draugr.yaml b/data/monsters/draugr.yaml
index 3e9c962..6432ef5 100644
--- a/data/monsters/draugr.yaml
+++ b/data/monsters/draugr.yaml
@@ -127,11 +127,11 @@ description: 'Risen corpses of sailors who died at sea, draugr reek of the rot a
hp: 35
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
-- unconscious
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
+- __unconscious__
items:
- greataxe
- leather armor
diff --git a/data/monsters/dread wraith.yaml b/data/monsters/dread wraith.yaml
index 50f69d9..f3ddc3d 100644
--- a/data/monsters/dread wraith.yaml
+++ b/data/monsters/dread wraith.yaml
@@ -188,12 +188,12 @@ description: 'These menacing spiritual remnants of wicked warlords or bloodthirs
hp: 130
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
- precision
-- unconscious
+- __unconscious__
languages:
- Common
- Necril
diff --git a/data/monsters/dreadsong dancer.yaml b/data/monsters/dreadsong dancer.yaml
index f6743bf..bf5c967 100644
--- a/data/monsters/dreadsong dancer.yaml
+++ b/data/monsters/dreadsong dancer.yaml
@@ -141,8 +141,8 @@ description: 'Dreadsong dancers are shaped from the souls of bards, dancers, and
hp: 160
hp_misc: null
immunities:
-- disease
-- poison
+- __disease__
+- __poison__
languages:
- Common
- Infernal
diff --git a/data/monsters/dust mephit.yaml b/data/monsters/dust mephit.yaml
index a3130eb..f6be24d 100644
--- a/data/monsters/dust mephit.yaml
+++ b/data/monsters/dust mephit.yaml
@@ -49,9 +49,9 @@ hp: 16
hp_misc: fast healing 2 (in dust or sand)
immunities:
- bleed
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Auran
- Terran
diff --git a/data/monsters/earthen destrier.yaml b/data/monsters/earthen destrier.yaml
index b3f6e8e..ed191d8 100644
--- a/data/monsters/earthen destrier.yaml
+++ b/data/monsters/earthen destrier.yaml
@@ -98,9 +98,9 @@ hp: 72
hp_misc: null
immunities:
- bleed
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Terran
level: 4
diff --git a/data/monsters/elysian titan.yaml b/data/monsters/elysian titan.yaml
index 33e3d54..8ac428c 100644
--- a/data/monsters/elysian titan.yaml
+++ b/data/monsters/elysian titan.yaml
@@ -110,8 +110,8 @@ description: 'Those titans who remained true to their creators earned their free
hp: 400
hp_misc: null
immunities:
-- death effects
-- disease
+- __death__ effects
+- __disease__
items:
- +3 greater striking greatpick
- +2 greater resilient breastplate
diff --git a/data/monsters/ember fox.yaml b/data/monsters/ember fox.yaml
index 6291e54..19f079c 100644
--- a/data/monsters/ember fox.yaml
+++ b/data/monsters/ember fox.yaml
@@ -43,9 +43,9 @@ hp_misc: null
immunities:
- bleed
- fire
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Ignan
- can't speak any language
diff --git a/data/monsters/eremite.yaml b/data/monsters/eremite.yaml
index 1887c84..3711377 100644
--- a/data/monsters/eremite.yaml
+++ b/data/monsters/eremite.yaml
@@ -198,7 +198,7 @@ hp: 375
hp_misc: regeneration 25 (deactivated by good or silver)
immunities:
- cold
-- fear
+- __fear__
- nonlethal
languages:
- Common
diff --git a/data/monsters/esobok.yaml b/data/monsters/esobok.yaml
index b0cead5..94ce49b 100644
--- a/data/monsters/esobok.yaml
+++ b/data/monsters/esobok.yaml
@@ -121,8 +121,8 @@ description: 'Esoboks are brute hunters and pugnacious sentinels that serve as t
hp: 55
hp_misc: null
immunities:
-- death effects
-- disease
+- __death__ effects
+- __disease__
languages:
- Abyssal
- Celestial
diff --git a/data/monsters/excorion.yaml b/data/monsters/excorion.yaml
index 80bdb37..6ee2f07 100644
--- a/data/monsters/excorion.yaml
+++ b/data/monsters/excorion.yaml
@@ -139,12 +139,12 @@ description: 'These hideous undead creatures result from an exquisitely painful
hp: 160
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- mental
-- paralyzed
-- poison
-- unconscious
+- __death__ effects
+- __disease__
+- __mental__
+- __paralyzed__
+- __poison__
+- __unconscious__
level: 7
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/fen mosquito swarm.yaml b/data/monsters/fen mosquito swarm.yaml
index 21654fd..ea7a00e 100644
--- a/data/monsters/fen mosquito swarm.yaml
+++ b/data/monsters/fen mosquito swarm.yaml
@@ -72,7 +72,7 @@ hp: 25
hp_misc: null
immunities:
- precision
-- swarm mind
+- __swarm mind__
level: 3
melee_attacks: null
name: Fen Mosquito Swarm
diff --git a/data/monsters/filth fire.yaml b/data/monsters/filth fire.yaml
index 4516748..99dafc9 100644
--- a/data/monsters/filth fire.yaml
+++ b/data/monsters/filth fire.yaml
@@ -59,9 +59,9 @@ hp_misc: null
immunities:
- bleed
- fire
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Ignan
- can't speak any language
diff --git a/data/monsters/fire jellyfish swarm.yaml b/data/monsters/fire jellyfish swarm.yaml
index 0c58a06..5493098 100644
--- a/data/monsters/fire jellyfish swarm.yaml
+++ b/data/monsters/fire jellyfish swarm.yaml
@@ -85,9 +85,9 @@ description: 'While individually one of these fist-sized jellyfish is merely a n
hp: 155
hp_misc: null
immunities:
-- mental
+- __mental__
- precision
-- swarm mind
+- __swarm mind__
level: 6
melee_attacks: null
name: Fire Jellyfish Swarm
diff --git a/data/monsters/fjord linnorm.yaml b/data/monsters/fjord linnorm.yaml
index c9c1227..9b4df71 100644
--- a/data/monsters/fjord linnorm.yaml
+++ b/data/monsters/fjord linnorm.yaml
@@ -135,9 +135,9 @@ hp: 315
hp_misc: regeneration 10 (deactivated by cold iron)
immunities:
- cold
-- curse
-- paralyzed
-- sleep
+- __curse__
+- __paralyzed__
+- __sleep__
languages:
- Aklo
- Draconic
diff --git a/data/monsters/fuming sludge.yaml b/data/monsters/fuming sludge.yaml
index 59e2d8f..2ae85b2 100644
--- a/data/monsters/fuming sludge.yaml
+++ b/data/monsters/fuming sludge.yaml
@@ -109,8 +109,8 @@ immunities:
- piercing
- precision
- slashing
-- unconscious
-- visual
+- __unconscious__
+- __visual__
level: 7
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/ghonhatine.yaml b/data/monsters/ghonhatine.yaml
index 90c3d21..16fb5c6 100644
--- a/data/monsters/ghonhatine.yaml
+++ b/data/monsters/ghonhatine.yaml
@@ -108,7 +108,7 @@ description: 'In transforming __xulgaths__, __drow__ fleshwarpers sought not to
hp: 175
hp_misc: null
immunities:
-- disease
+- __disease__
languages:
- Undercommon
level: 10
diff --git a/data/monsters/giant amoeba.yaml b/data/monsters/giant amoeba.yaml
index 70a9eb0..83ce851 100644
--- a/data/monsters/giant amoeba.yaml
+++ b/data/monsters/giant amoeba.yaml
@@ -91,10 +91,10 @@ hp_misc: null
immunities:
- acid
- critical hits
-- mental
+- __mental__
- precision
-- unconscious
-- visual
+- __unconscious__
+- __visual__
level: 1
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/giant crawling hand.yaml b/data/monsters/giant crawling hand.yaml
index c8e6e92..c96917c 100644
--- a/data/monsters/giant crawling hand.yaml
+++ b/data/monsters/giant crawling hand.yaml
@@ -80,12 +80,12 @@ description: 'A giant crawling hand is the appendage of a very large creature, s
hp: 75
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
-- unconscious
-- visual
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
+- __unconscious__
+- __visual__
languages:
- Common
- can't speak any language
diff --git a/data/monsters/giant jellyfish.yaml b/data/monsters/giant jellyfish.yaml
index 121234f..94ef65f 100644
--- a/data/monsters/giant jellyfish.yaml
+++ b/data/monsters/giant jellyfish.yaml
@@ -65,7 +65,7 @@ description: 'Unlike its smaller cousins, the giant jellyfish is an active preda
hp: 165
hp_misc: null
immunities:
-- mental
+- __mental__
- precision
level: 7
melee_attacks:
diff --git a/data/monsters/giant maggot.yaml b/data/monsters/giant maggot.yaml
index 51dbd88..4520027 100644
--- a/data/monsters/giant maggot.yaml
+++ b/data/monsters/giant maggot.yaml
@@ -67,7 +67,7 @@ description: 'Giant flies lay their eggs on the bodies of larger monsters or liv
hp: 18
hp_misc: null
immunities:
-- visual
+- __visual__
level: 0
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/glass golem.yaml b/data/monsters/glass golem.yaml
index 242e13c..5e8367a 100644
--- a/data/monsters/glass golem.yaml
+++ b/data/monsters/glass golem.yaml
@@ -139,20 +139,20 @@ hp: 135
hp_misc: null
immunities:
- bleed
-- death effects
-- disease
-- doomed
-- drained
-- fatigued
-- healing
+- __death__ effects
+- __disease__
+- __doomed__
+- __drained__
+- __fatigued__
+- __healing__
- magic (see Golem Antimagic below)
-- mental
-- necromancy
+- __mental__
+- __necromancy__
- nonlethal attacks
-- paralyzed
-- poison
-- sickened
-- unconscious
+- __paralyzed__
+- __poison__
+- __sickened__
+- __unconscious__
level: 8
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/gorgon.yaml b/data/monsters/gorgon.yaml
index 4276ab4..afcaf0c 100644
--- a/data/monsters/gorgon.yaml
+++ b/data/monsters/gorgon.yaml
@@ -127,7 +127,7 @@ description: 'Though they may resemble constructs to the untrained eye due to th
hp: 135
hp_misc: null
immunities:
-- petrification
+- __petrification__
level: 8
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/gosreg.yaml b/data/monsters/gosreg.yaml
index 267781e..a7329f9 100644
--- a/data/monsters/gosreg.yaml
+++ b/data/monsters/gosreg.yaml
@@ -111,7 +111,7 @@ description: 'Gosregs are agents of the Dominion of the Black that insinuate the
hp: 195
hp_misc: null
immunities:
-- confused
+- __confused__
languages:
- Aklo
- Common
diff --git a/data/monsters/granite glyptodont.yaml b/data/monsters/granite glyptodont.yaml
index ed71465..fbc639d 100644
--- a/data/monsters/granite glyptodont.yaml
+++ b/data/monsters/granite glyptodont.yaml
@@ -98,9 +98,9 @@ hp: 145
hp_misc: null
immunities:
- bleed
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
level: 8
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/gray ooze.yaml b/data/monsters/gray ooze.yaml
index 7b860ba..bf6e804 100644
--- a/data/monsters/gray ooze.yaml
+++ b/data/monsters/gray ooze.yaml
@@ -61,10 +61,10 @@ hp_misc: null
immunities:
- acid
- critical hits
-- mental
+- __mental__
- precision
-- unconscious
-- visual
+- __unconscious__
+- __visual__
level: 4
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/hound of tindalos.yaml b/data/monsters/hound of tindalos.yaml
index 896a188..9d17318 100644
--- a/data/monsters/hound of tindalos.yaml
+++ b/data/monsters/hound of tindalos.yaml
@@ -157,8 +157,8 @@ description: 'Lean and athirst, the hounds of Tindalos are drawn to those who ta
hp: 90
hp_misc: null
immunities:
-- controlled
-- emotion
+- __controlled__
+- __emotion__
languages:
- Aklo
level: 7
diff --git a/data/monsters/ice golem.yaml b/data/monsters/ice golem.yaml
index 920bb2a..1c42b08 100644
--- a/data/monsters/ice golem.yaml
+++ b/data/monsters/ice golem.yaml
@@ -152,21 +152,21 @@ hp_misc: null
immunities:
- bleed
- cold
-- death effects
-- disease
-- doomed
-- drained
+- __death__ effects
+- __disease__
+- __doomed__
+- __drained__
- electricity
-- fatigued
-- healing
+- __fatigued__
+- __healing__
- magic (see Golem Antimagic below)
-- mental
-- necromancy
+- __mental__
+- __necromancy__
- nonlethal attacks
-- paralyzed
-- poison
-- sickened
-- unconscious
+- __paralyzed__
+- __poison__
+- __sickened__
+- __unconscious__
level: 5
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/ice mephit.yaml b/data/monsters/ice mephit.yaml
index 56991c0..697cce2 100644
--- a/data/monsters/ice mephit.yaml
+++ b/data/monsters/ice mephit.yaml
@@ -50,9 +50,9 @@ hp_misc: fast healing 2 (when touching ice or snow)
immunities:
- bleed
- cold
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Aquan
- Auran
diff --git a/data/monsters/icewyrm.yaml b/data/monsters/icewyrm.yaml
index bd3ca2e..7d17f5e 100644
--- a/data/monsters/icewyrm.yaml
+++ b/data/monsters/icewyrm.yaml
@@ -91,9 +91,9 @@ hp_misc: null
immunities:
- bleed
- cold
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Aquan
level: 10
diff --git a/data/monsters/icicle snake.yaml b/data/monsters/icicle snake.yaml
index c9c6b60..9ee312b 100644
--- a/data/monsters/icicle snake.yaml
+++ b/data/monsters/icicle snake.yaml
@@ -45,9 +45,9 @@ hp_misc: null
immunities:
- bleed
- cold
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
level: 2
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/iffdahsil.yaml b/data/monsters/iffdahsil.yaml
index d703b09..05f8596 100644
--- a/data/monsters/iffdahsil.yaml
+++ b/data/monsters/iffdahsil.yaml
@@ -161,17 +161,17 @@ description: 'The slithering horror known as Iffdahsil is an undead __shoggoth__
hp: 380
hp_misc: fast healing 30, negative healing
immunities:
-- blinded
-- controlled
+- __blinded__
+- __controlled__
- critical hits
-- deafened
-- death effects
-- disease
-- paralyze
-- poison
+- __deafened__
+- __death__ effects
+- __disease__
+- __paralyze__
+- __poison__
- precision
-- sleep
-- unconscious
+- __sleep__
+- __unconscious__
languages:
- Aklo
- Necril
diff --git a/data/monsters/intellect devourer.yaml b/data/monsters/intellect devourer.yaml
index 361a474..7684dd3 100644
--- a/data/monsters/intellect devourer.yaml
+++ b/data/monsters/intellect devourer.yaml
@@ -139,10 +139,10 @@ description: 'Intellect devourers serve as advance scouts and infiltrators for t
hp: 130
hp_misc: null
immunities:
-- blinded
-- controlled
-- emotion
-- possession
+- __blinded__
+- __controlled__
+- __emotion__
+- __possession__
languages:
- Aklo
- Common
diff --git a/data/monsters/invidiak.yaml b/data/monsters/invidiak.yaml
index c66a957..a1a1f6a 100644
--- a/data/monsters/invidiak.yaml
+++ b/data/monsters/invidiak.yaml
@@ -115,8 +115,8 @@ description: 'For most demons, possessing a creature requires a ritual, magic it
hp: 90
hp_misc: null
immunities:
-- disease
-- poison
+- __disease__
+- __poison__
- precision
languages:
- Abyssal
diff --git a/data/monsters/isqulug.yaml b/data/monsters/isqulug.yaml
index eb50a25..6ce15cb 100644
--- a/data/monsters/isqulug.yaml
+++ b/data/monsters/isqulug.yaml
@@ -130,7 +130,7 @@ description: 'The isqulug''s appearance, though unsettling, might be its least a
hp: 230
hp_misc: regeneration 10 (deactivated by cold)
immunities:
-- swarm mind
+- __swarm mind__
languages:
- Aklo
level: 11
diff --git a/data/monsters/jabberwock.yaml b/data/monsters/jabberwock.yaml
index 5855c98..f78f04f 100644
--- a/data/monsters/jabberwock.yaml
+++ b/data/monsters/jabberwock.yaml
@@ -222,8 +222,8 @@ description: 'Few beasts have inspired as many legends, poems, songs, and myths
hp: 500
hp_misc: regeneration 25 (deactivated by vorpal weapons)
immunities:
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Aklo
- Common
diff --git a/data/monsters/jyoti.yaml b/data/monsters/jyoti.yaml
index e482562..55ad60d 100644
--- a/data/monsters/jyoti.yaml
+++ b/data/monsters/jyoti.yaml
@@ -106,9 +106,9 @@ description: 'Jyotis are sometimes called “false phoenixes” (a term they fin
hp: 155
hp_misc: null
immunities:
-- death effects
-- disease
-- poison
+- __death__ effects
+- __disease__
+- __poison__
items:
- +1 striking longspear
languages:
diff --git a/data/monsters/leng spider.yaml b/data/monsters/leng spider.yaml
index 030f403..68247c6 100644
--- a/data/monsters/leng spider.yaml
+++ b/data/monsters/leng spider.yaml
@@ -144,7 +144,7 @@ hp: 235
hp_misc: fast healing 10
immunities:
- cold
-- confused
+- __confused__
languages:
- Aklo
- tongues
diff --git a/data/monsters/lerritan.yaml b/data/monsters/lerritan.yaml
index 797a14a..66f225d 100644
--- a/data/monsters/lerritan.yaml
+++ b/data/monsters/lerritan.yaml
@@ -131,9 +131,9 @@ hp: 490
hp_misc: null
immunities:
- fire
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
items:
- +3 greater striking warhammer
languages:
diff --git a/data/monsters/living boulder.yaml b/data/monsters/living boulder.yaml
index c9c9dd6..a554c44 100644
--- a/data/monsters/living boulder.yaml
+++ b/data/monsters/living boulder.yaml
@@ -64,9 +64,9 @@ hp: 36
hp_misc: null
immunities:
- bleed
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
level: 2
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/living thunderclap.yaml b/data/monsters/living thunderclap.yaml
index eff1199..45d7435 100644
--- a/data/monsters/living thunderclap.yaml
+++ b/data/monsters/living thunderclap.yaml
@@ -71,9 +71,9 @@ hp: 50
hp_misc: null
immunities:
- bleed
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
- sonic
languages:
- Auran
diff --git a/data/monsters/lurker in light.yaml b/data/monsters/lurker in light.yaml
index 23b47e3..132e554 100644
--- a/data/monsters/lurker in light.yaml
+++ b/data/monsters/lurker in light.yaml
@@ -146,7 +146,7 @@ description: 'These malicious and strange fey appear as fairies about 2 feet tal
hp: 72
hp_misc: null
immunities:
-- blinded
+- __blinded__
languages:
- Aklo
- Common
diff --git a/data/monsters/magma scorpion.yaml b/data/monsters/magma scorpion.yaml
index b52cd17..f9d78fb 100644
--- a/data/monsters/magma scorpion.yaml
+++ b/data/monsters/magma scorpion.yaml
@@ -48,9 +48,9 @@ hp_misc: null
immunities:
- bleed
- fire
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
level: 8
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/meladaemon.yaml b/data/monsters/meladaemon.yaml
index b71b01c..d4a3938 100644
--- a/data/monsters/meladaemon.yaml
+++ b/data/monsters/meladaemon.yaml
@@ -126,7 +126,7 @@ description: 'Meladaemons personify death by starvation and thirst, and revel in
hp: 225
hp_misc: null
immunities:
-- death effects
+- __death__ effects
languages:
- Common
- Daemonic
diff --git a/data/monsters/melody on the wind.yaml b/data/monsters/melody on the wind.yaml
index 364de16..7b5e918 100644
--- a/data/monsters/melody on the wind.yaml
+++ b/data/monsters/melody on the wind.yaml
@@ -126,9 +126,9 @@ hp: 170
hp_misc: null
immunities:
- bleed
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Auran
level: 10
diff --git a/data/monsters/mist stalker.yaml b/data/monsters/mist stalker.yaml
index cba08ef..32ae727 100644
--- a/data/monsters/mist stalker.yaml
+++ b/data/monsters/mist stalker.yaml
@@ -70,9 +70,9 @@ hp: 58
hp_misc: null
immunities:
- bleed
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Aquan
level: 4
diff --git a/data/monsters/mohrg.yaml b/data/monsters/mohrg.yaml
index d9a19ca..07267d6 100644
--- a/data/monsters/mohrg.yaml
+++ b/data/monsters/mohrg.yaml
@@ -114,10 +114,10 @@ description: 'The weight of murder wears heavy on the soul. With souls marked by
hp: 120
hp_misc: "negative healing\r\n"
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
languages:
- Common
- Necril
diff --git a/data/monsters/mudwretch.yaml b/data/monsters/mudwretch.yaml
index d3a701b..ad0bd27 100644
--- a/data/monsters/mudwretch.yaml
+++ b/data/monsters/mudwretch.yaml
@@ -154,9 +154,9 @@ hp_misc: null
immunities:
- bleed
- critical hits
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Terran
level: 2
diff --git a/data/monsters/najra lizard.yaml b/data/monsters/najra lizard.yaml
index 19d1eba..14b69c4 100644
--- a/data/monsters/najra lizard.yaml
+++ b/data/monsters/najra lizard.yaml
@@ -110,8 +110,8 @@ description: 'Among the smallest breeds of dragon on Golarion, these savage, cun
hp: 60
hp_misc: null
immunities:
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Draconic
level: 4
diff --git a/data/monsters/necrophidius.yaml b/data/monsters/necrophidius.yaml
index d687e79..6063489 100644
--- a/data/monsters/necrophidius.yaml
+++ b/data/monsters/necrophidius.yaml
@@ -118,19 +118,19 @@ hp: 50
hp_misc: null
immunities:
- bleed
-- death effects
-- disease
-- doomed
-- drained
-- fatigued
-- healing
-- mental
-- necromancy
+- __death__ effects
+- __disease__
+- __doomed__
+- __drained__
+- __fatigued__
+- __healing__
+- __mental__
+- __necromancy__
- nonlethal attacks
-- paralyzed
-- poison
-- sickened
-- unconscious
+- __paralyzed__
+- __poison__
+- __sickened__
+- __unconscious__
level: 3
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/norn.yaml b/data/monsters/norn.yaml
index 9434ee6..d913db1 100644
--- a/data/monsters/norn.yaml
+++ b/data/monsters/norn.yaml
@@ -173,7 +173,7 @@ description: 'Ancient beyond imagining, norns are powerful fey women who hold in
hp: 375
hp_misc: regeneration 20 (deactivated by cold iron)
immunities:
-- flat-footed
+- __flat-footed__
- negative
languages:
- Common
diff --git a/data/monsters/nuckelavee.yaml b/data/monsters/nuckelavee.yaml
index f427b5f..ece2549 100644
--- a/data/monsters/nuckelavee.yaml
+++ b/data/monsters/nuckelavee.yaml
@@ -194,8 +194,8 @@ description: 'When pollution despoils a natural waterway, it draws the dreaded n
hp: 190
hp_misc: null
immunities:
-- disease
-- poison
+- __disease__
+- __poison__
items:
- +1 striking bastard sword
languages:
diff --git a/data/monsters/nyogoth.yaml b/data/monsters/nyogoth.yaml
index 9531f08..e5deee3 100644
--- a/data/monsters/nyogoth.yaml
+++ b/data/monsters/nyogoth.yaml
@@ -124,8 +124,8 @@ hp: 175
hp_misc: null
immunities:
- acid
-- controlled
-- fear
+- __controlled__
+- __fear__
languages:
- Abyssal
- telepathy 100 ft.
diff --git a/data/monsters/obsidian golem.yaml b/data/monsters/obsidian golem.yaml
index 7e54d0c..6761c87 100644
--- a/data/monsters/obsidian golem.yaml
+++ b/data/monsters/obsidian golem.yaml
@@ -132,21 +132,21 @@ hp: 230
hp_misc: null
immunities:
- bleed
-- death effects
-- disease
-- doomed
-- drained
-- fatigued
+- __death__ effects
+- __disease__
+- __doomed__
+- __drained__
+- __fatigued__
- fire (see below)
-- healing
+- __healing__
- magic (see below)
-- mental
-- necromancy
+- __mental__
+- __necromancy__
- nonlethal attacks
-- paralyzed
-- poison
-- sickened
-- unconscious
+- __paralyzed__
+- __poison__
+- __sickened__
+- __unconscious__
level: 16
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/olethrodaemon.yaml b/data/monsters/olethrodaemon.yaml
index 70f995d..fb083d0 100644
--- a/data/monsters/olethrodaemon.yaml
+++ b/data/monsters/olethrodaemon.yaml
@@ -132,7 +132,7 @@ description: 'Even daemons fear the most massive and terrifying of their kind, o
hp: 450
hp_misc: null
immunities:
-- death effects
+- __death__ effects
items:
- soul gem (4)
languages:
diff --git a/data/monsters/ooze mephit.yaml b/data/monsters/ooze mephit.yaml
index 4227211..8812ce1 100644
--- a/data/monsters/ooze mephit.yaml
+++ b/data/monsters/ooze mephit.yaml
@@ -49,9 +49,9 @@ hp: 24
hp_misc: fast healing 2 (when touching mud or slime)
immunities:
- bleed
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Aquan
- Terran
diff --git a/data/monsters/peluda.yaml b/data/monsters/peluda.yaml
index 854f1a7..0abc0ce 100644
--- a/data/monsters/peluda.yaml
+++ b/data/monsters/peluda.yaml
@@ -155,8 +155,8 @@ hp: 170
hp_misc: null
immunities:
- fire
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Draconic
level: 10
diff --git a/data/monsters/piscodaemon.yaml b/data/monsters/piscodaemon.yaml
index 0c76a5e..a31c910 100644
--- a/data/monsters/piscodaemon.yaml
+++ b/data/monsters/piscodaemon.yaml
@@ -148,8 +148,8 @@ description: 'Scions of death by poisoning, piscodaemons are cruel even by daemo
hp: 200
hp_misc: null
immunities:
-- death effects
-- poison
+- __death__ effects
+- __poison__
languages:
- Common
- Daemonic
diff --git a/data/monsters/purrodaemon.yaml b/data/monsters/purrodaemon.yaml
index 83bdc8c..01b774f 100644
--- a/data/monsters/purrodaemon.yaml
+++ b/data/monsters/purrodaemon.yaml
@@ -142,7 +142,7 @@ hp: 335
hp_misc: null
immunities:
- bleed
-- death effects
+- __death__ effects
items:
- +2 greater striking glaive
- soul gem (2)
diff --git a/data/monsters/radiant warden.yaml b/data/monsters/radiant warden.yaml
index 920f22d..79120c4 100644
--- a/data/monsters/radiant warden.yaml
+++ b/data/monsters/radiant warden.yaml
@@ -133,17 +133,17 @@ hp: 300
hp_misc: null
immunities:
- bleed
-- death effects
-- disease
-- doomed
-- drained
-- fatigued
-- necromancy
+- __death__ effects
+- __disease__
+- __doomed__
+- __drained__
+- __fatigued__
+- __necromancy__
- nonlethal attacks
-- paralyzed
-- poison
-- sickened
-- unconscious
+- __paralyzed__
+- __poison__
+- __sickened__
+- __unconscious__
languages:
- any one ancient language (such as Jistkan)
level: 17
diff --git a/data/monsters/raven swarm.yaml b/data/monsters/raven swarm.yaml
index ef0f1b2..41a82ee 100644
--- a/data/monsters/raven swarm.yaml
+++ b/data/monsters/raven swarm.yaml
@@ -74,7 +74,7 @@ hp: 30
hp_misc: null
immunities:
- precision
-- swarm mind
+- __swarm mind__
level: 3
melee_attacks: null
name: Raven Swarm
diff --git a/data/monsters/ravener husk.yaml b/data/monsters/ravener husk.yaml
index dbf1486..b0c85de 100644
--- a/data/monsters/ravener husk.yaml
+++ b/data/monsters/ravener husk.yaml
@@ -138,11 +138,11 @@ description: 'Raveners require a steady diet of souls, and a ravener that''s una
hp: 325
hp_misc: null
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
-- sleep
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
+- __sleep__
level: 14
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/ravener.yaml b/data/monsters/ravener.yaml
index f1ca9c0..2628049 100644
--- a/data/monsters/ravener.yaml
+++ b/data/monsters/ravener.yaml
@@ -327,12 +327,12 @@ description: 'The ravener presented here was once an __ancient red dragon__.
hp: 500
hp_misc: null
immunities:
-- death effects
-- disease
+- __death__ effects
+- __disease__
- fire
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Abyssal
- Common
diff --git a/data/monsters/revenant.yaml b/data/monsters/revenant.yaml
index 2b5c86e..f2ca4ca 100644
--- a/data/monsters/revenant.yaml
+++ b/data/monsters/revenant.yaml
@@ -167,11 +167,11 @@ description: 'Revenants are obsessed, undead stalkers who arise from their own m
hp: 115
hp_misc: null
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
-- sleep
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- any one spoken in life by their murderer (typically Common)
level: 6
diff --git a/data/monsters/sand sentry.yaml b/data/monsters/sand sentry.yaml
index bcb167c..e9e6d14 100644
--- a/data/monsters/sand sentry.yaml
+++ b/data/monsters/sand sentry.yaml
@@ -89,9 +89,9 @@ hp: 94
hp_misc: null
immunities:
- bleed
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Terran
level: 6
diff --git a/data/monsters/sandpoint devil.yaml b/data/monsters/sandpoint devil.yaml
index f7cd8f3..6049439 100644
--- a/data/monsters/sandpoint devil.yaml
+++ b/data/monsters/sandpoint devil.yaml
@@ -172,7 +172,7 @@ hp: 165
hp_misc: null
immunities:
- fire
-- fear
+- __fear__
languages:
- Abyssal
- Varisian
diff --git a/data/monsters/scarecrow.yaml b/data/monsters/scarecrow.yaml
index 9b9badc..61f691b 100644
--- a/data/monsters/scarecrow.yaml
+++ b/data/monsters/scarecrow.yaml
@@ -163,19 +163,19 @@ hp: 60
hp_misc: null
immunities:
- bleed
-- death effects
-- disease
-- doomed
-- drained
-- fatigued
-- healing
-- mental
-- necromancy
+- __death__ effects
+- __disease__
+- __doomed__
+- __drained__
+- __fatigued__
+- __healing__
+- __mental__
+- __necromancy__
- nonlethal attacks
-- paralyzed
-- poison
-- sickened
-- unconscious
+- __paralyzed__
+- __poison__
+- __sickened__
+- __unconscious__
level: 4
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/sceaduinar.yaml b/data/monsters/sceaduinar.yaml
index 023f590..e0b8c70 100644
--- a/data/monsters/sceaduinar.yaml
+++ b/data/monsters/sceaduinar.yaml
@@ -139,8 +139,8 @@ description: 'Strange creatures born from jagged crystals in the heart of the __
hp: 100
hp_misc: negative healing
immunities:
-- death effects
-- drained
+- __death__ effects
+- __drained__
languages:
- Aklo
level: 7
diff --git a/data/monsters/sea drake.yaml b/data/monsters/sea drake.yaml
index 185cb27..a1957de 100644
--- a/data/monsters/sea drake.yaml
+++ b/data/monsters/sea drake.yaml
@@ -176,8 +176,8 @@ hp: 95
hp_misc: null
immunities:
- electricity
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Draconic
level: 6
diff --git a/data/monsters/shadow drake.yaml b/data/monsters/shadow drake.yaml
index 0037be3..52dcc66 100644
--- a/data/monsters/shadow drake.yaml
+++ b/data/monsters/shadow drake.yaml
@@ -94,8 +94,8 @@ description: 'Shadow drakes are typically among the smallest and least powerful
hp: 28
hp_misc: null
immunities:
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Draconic
level: 2
diff --git a/data/monsters/shoal linnorm.yaml b/data/monsters/shoal linnorm.yaml
index 9b30e15..586cf98 100644
--- a/data/monsters/shoal linnorm.yaml
+++ b/data/monsters/shoal linnorm.yaml
@@ -140,10 +140,10 @@ description: 'Shoal linnorms occupy rocky shoreline shallows and slither along l
hp: 295
hp_misc: regeneration 10 (deactivated by cold iron)
immunities:
-- curse
+- __curse__
- fire
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Aklo
- Draconic
diff --git a/data/monsters/shoggti.yaml b/data/monsters/shoggti.yaml
index 14089eb..c44311e 100644
--- a/data/monsters/shoggti.yaml
+++ b/data/monsters/shoggti.yaml
@@ -131,8 +131,8 @@ description: 'Shoggti travel to other planes in roving bands to capture and char
hp: 105
hp_misc: null
immunities:
-- controlled
-- fear
+- __controlled__
+- __fear__
languages:
- Abyssal
- telepathy 100 feet
diff --git a/data/monsters/siege shard.yaml b/data/monsters/siege shard.yaml
index 5e913ae..4a25e38 100644
--- a/data/monsters/siege shard.yaml
+++ b/data/monsters/siege shard.yaml
@@ -112,18 +112,18 @@ hp: 37
hp_misc: null
immunities:
- bleed
-- death effects
-- disease
-- doomed
-- drained
-- fatigued
-- healing
-- necromancy
-- nonlethal attacks
-- paralyzed
-- poison
-- sickened
-- unconscious
+- __death__ effects
+- __disease__
+- __doomed__
+- __drained__
+- __fatigued__
+- __healing__
+- __necromancy__
+- __nonlethal__ attacks
+- __paralyzed__
+- __poison__
+- __sickened__
+- __unconscious__
level: 3
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/skinstitch.yaml b/data/monsters/skinstitch.yaml
index 22b51e8..78b4aad 100644
--- a/data/monsters/skinstitch.yaml
+++ b/data/monsters/skinstitch.yaml
@@ -113,19 +113,19 @@ hp: 95
hp_misc: null
immunities:
- bleed
-- death effects
-- disease
-- doomed
-- drained
-- fatigued
-- healing
-- mental
-- necromancy
-- nonlethal attacks
-- paralyzed
-- poison
-- sickened
-- unconscious
+- __death__ effects
+- __disease__
+- __doomed__
+- __drained__
+- __fatigued__
+- __healing__
+- __mental__
+- __necromancy__
+- __nonlethal__ attacks
+- __paralyzed__
+- __poison__
+- __sickened__
+- __unconscious__
level: 5
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/slime mold.yaml b/data/monsters/slime mold.yaml
index 92ffa48..d0fd944 100644
--- a/data/monsters/slime mold.yaml
+++ b/data/monsters/slime mold.yaml
@@ -62,10 +62,10 @@ hp: 60
hp_misc: null
immunities:
- critical hits
-- mental
+- __mental__
- precision
-- unconscious
-- visual
+- __unconscious__
+- __visual__
level: 2
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/soul eater.yaml b/data/monsters/soul eater.yaml
index b5f6525..7fe1d6a 100644
--- a/data/monsters/soul eater.yaml
+++ b/data/monsters/soul eater.yaml
@@ -103,11 +103,11 @@ hp: 80
hp_misc: null
immunities:
- critical hits
-- disease
-- paralyzed
-- poison
+- __disease__
+- __paralyzed__
+- __poison__
- precision
-- sleep
+- __sleep__
languages:
- Daemonic
level: 7
diff --git a/data/monsters/spark bat.yaml b/data/monsters/spark bat.yaml
index e799321..3c6a40e 100644
--- a/data/monsters/spark bat.yaml
+++ b/data/monsters/spark bat.yaml
@@ -49,9 +49,9 @@ hp_misc: null
immunities:
- bleed
- electricity
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
level: 2
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/specter.yaml b/data/monsters/specter.yaml
index f0d1c73..b2d9dcd 100644
--- a/data/monsters/specter.yaml
+++ b/data/monsters/specter.yaml
@@ -169,12 +169,12 @@ description: 'When an evil mortal creature dies, it sometimes returns to haunt t
hp: 95
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
- precision
-- unconscious
+- __unconscious__
languages:
- Common
- Necril
diff --git a/data/monsters/spiral centurion.yaml b/data/monsters/spiral centurion.yaml
index 827155c..2b03bc2 100644
--- a/data/monsters/spiral centurion.yaml
+++ b/data/monsters/spiral centurion.yaml
@@ -128,27 +128,25 @@ hp: 170
hp_misc: null
immunities:
- bleed
-- death effects
-- disease
-- doomed
-- drained
-- fatigued
-- healing
-- mental
-- necromancy
+- __death__ effects
+- __disease__
+- __doomed__
+- __drained__
+- __fatigued__
+- __healing__
+- __mental__
+- __necromancy__
- nonlethal attacks
-- paralyzed
-- poison
-- sickened
-- unconsciousTop-Heavy
- A spiral centurion's top-like design makes it susceptible to effects that would
- cause it to fall prone. The DC of any attempt to knock the spiral centurion prone is reduced by 5. If the spiral centurion
- attempts a check or saving throw to resist being knocked prone
+- __paralyzed__
+- __poison__
+- __sickened__
+- __unconscious__**Top-Heavy** A spiral centurion's top-like design makes it susceptible
+ to effects that would cause it to fall prone. The DC of any attempt to knock the
+ spiral centurion __prone__ is reduced by 5. If the spiral centurion attempts a check
+ or saving throw to resist being knocked prone
- it takes a -5 status penalty. A spiral centurion that has been knocked prone can-t
use any actions other than to attempt to Stand
-- but it must succeed at a DC 30 Acrobatics
- check to do so.
+- but it must succeed at a DC 30 __Acrobatics__ check to do so.
level: 11
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/sportlebore swarm.yaml b/data/monsters/sportlebore swarm.yaml
index 6c70122..f24e862 100644
--- a/data/monsters/sportlebore swarm.yaml
+++ b/data/monsters/sportlebore swarm.yaml
@@ -82,7 +82,7 @@ hp: 85
hp_misc: null
immunities:
- precision
-- swarm mind
+- __swarm mind__
level: 7
melee_attacks: null
name: Sportlebore Swarm
diff --git a/data/monsters/steam mephit.yaml b/data/monsters/steam mephit.yaml
index fd24ec7..d61de53 100644
--- a/data/monsters/steam mephit.yaml
+++ b/data/monsters/steam mephit.yaml
@@ -76,9 +76,9 @@ hp_misc: fast healing 2 (in boiling water or steam)
immunities:
- bleed
- fire
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Aquan
- Ignan
diff --git a/data/monsters/striding fire.yaml b/data/monsters/striding fire.yaml
index 20ce96a..fc376d0 100644
--- a/data/monsters/striding fire.yaml
+++ b/data/monsters/striding fire.yaml
@@ -52,9 +52,9 @@ hp_misc: null
immunities:
- bleed
- fire
-- paralyzed
-- poison
-- sleep
+- __paralyzed__
+- __poison__
+- __sleep__
languages:
- Ignan
level: 6
diff --git a/data/monsters/stygira.yaml b/data/monsters/stygira.yaml
index 063d93c..a190849 100644
--- a/data/monsters/stygira.yaml
+++ b/data/monsters/stygira.yaml
@@ -100,9 +100,9 @@ description: 'Withered hermits wrapped in tattered rags, these scarred, eyeless
hp: 80
hp_misc: null
immunities:
-- paralyzed
-- petrified
-- visual
+- __paralyzed__
+- __petrified__
+- __visual__
items:
- gemstone
languages:
diff --git a/data/monsters/taiga giant.yaml b/data/monsters/taiga giant.yaml
index 87d35e4..1b820b6 100644
--- a/data/monsters/taiga giant.yaml
+++ b/data/monsters/taiga giant.yaml
@@ -164,7 +164,7 @@ description: 'Taiga giants prefer a nomadic lifestyle, both to keep from depleti
hp: 230
hp_misc: null
immunities:
-- controlled
+- __controlled__
items:
- +1 striking longspear
- sack with 5 rocks
diff --git a/data/monsters/taiga linnorm.yaml b/data/monsters/taiga linnorm.yaml
index dcb401a..f29701f 100644
--- a/data/monsters/taiga linnorm.yaml
+++ b/data/monsters/taiga linnorm.yaml
@@ -150,10 +150,10 @@ description: 'Taiga linnorms are covered in hundreds of quill-like black spines
hp: 385
hp_misc: regeneration 15 (deactivated by cold iron)
immunities:
-- curse
+- __curse__
- electricity
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Aklo
- Draconic
diff --git a/data/monsters/tatzlwyrm.yaml b/data/monsters/tatzlwyrm.yaml
index 40093d9..9e7ebaa 100644
--- a/data/monsters/tatzlwyrm.yaml
+++ b/data/monsters/tatzlwyrm.yaml
@@ -96,8 +96,8 @@ description: 'Tatzlwyrms resemble human-sized snakes with two arms and a dragon'
hp: 30
hp_misc: null
immunities:
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Draconic
level: 2
diff --git a/data/monsters/thanadaemon.yaml b/data/monsters/thanadaemon.yaml
index 1f8f99a..781a8d8 100644
--- a/data/monsters/thanadaemon.yaml
+++ b/data/monsters/thanadaemon.yaml
@@ -134,7 +134,7 @@ description: 'Also known as the deacons of death, thanadaemons represent death v
hp: 270
hp_misc: null
immunities:
-- death effects
+- __death__ effects
items:
- +1 striking bo staff
- soul gem (2)
diff --git a/data/monsters/thanatotic titan.yaml b/data/monsters/thanatotic titan.yaml
index 83ff1cd..443ef18 100644
--- a/data/monsters/thanatotic titan.yaml
+++ b/data/monsters/thanatotic titan.yaml
@@ -200,8 +200,8 @@ description: 'Thanatotic titans served as assassins in the war against the deiti
hp: 540
hp_misc: null
immunities:
-- death effects
-- disease
+- __death__ effects
+- __disease__
items:
- +3 greater striking halberd
- +2 greater resilient full plate
diff --git a/data/monsters/thulgant.yaml b/data/monsters/thulgant.yaml
index d162397..9852534 100644
--- a/data/monsters/thulgant.yaml
+++ b/data/monsters/thulgant.yaml
@@ -161,8 +161,8 @@ description: 'Although they spend most of their time hunting and battling __demo
hp: 305
hp_misc: null
immunities:
-- controlled
-- fear
+- __controlled__
+- __fear__
languages:
- Abyssal
- telepathy 100 feet
diff --git a/data/monsters/tick swarm.yaml b/data/monsters/tick swarm.yaml
index b2543b8..520170b 100644
--- a/data/monsters/tick swarm.yaml
+++ b/data/monsters/tick swarm.yaml
@@ -87,7 +87,7 @@ hp: 130
hp_misc: null
immunities:
- precision
-- swarm mind
+- __swarm mind__
level: 9
melee_attacks: null
name: Tick Swarm
diff --git a/data/monsters/totenmaske.yaml b/data/monsters/totenmaske.yaml
index 77e5bb9..b9844f4 100644
--- a/data/monsters/totenmaske.yaml
+++ b/data/monsters/totenmaske.yaml
@@ -126,9 +126,9 @@ description: 'Spawned by the same unnatural and self-destructive obsessions that
hp: 128
hp_misc: negative healing negative healing
immunities:
-- death effects
-- disease
-- paralyzed
+- __death__ effects
+- __disease__
+- __paralyzed__
- poison
- unconscious
languages:
diff --git a/data/monsters/urdefhan dominator.yaml b/data/monsters/urdefhan dominator.yaml
index 36ea529..d68edae 100644
--- a/data/monsters/urdefhan dominator.yaml
+++ b/data/monsters/urdefhan dominator.yaml
@@ -108,10 +108,9 @@ description: 'Urdefhan dominators control the minds of others to glean useful se
hp: 250
hp_misc: negative healing
immunities:
-- death effects
- (except necrotic decay)
-- disease
-- fear
+- __death__ effects (except necrotic decay)
+- __disease__
+- __fear__
items:
- +2 striking rhoka sword
languages:
diff --git a/data/monsters/urdefhan high tormentor.yaml b/data/monsters/urdefhan high tormentor.yaml
index ccb36a1..538149c 100644
--- a/data/monsters/urdefhan high tormentor.yaml
+++ b/data/monsters/urdefhan high tormentor.yaml
@@ -117,10 +117,9 @@ description: 'An urdefhan cult''s best tormentors can advance to become truly fo
hp: 195
hp_misc: negative healing
immunities:
-- death effects
- (except necrotic decay)
-- disease
-- fear
+- __death__ effects (except necrotic decay)
+- __disease__
+- __fear__
items:
- +1 striking warhammer
languages:
diff --git a/data/monsters/urdefhan hunter.yaml b/data/monsters/urdefhan hunter.yaml
index 4d6402e..8600542 100644
--- a/data/monsters/urdefhan hunter.yaml
+++ b/data/monsters/urdefhan hunter.yaml
@@ -148,10 +148,9 @@ description: 'Urdefhan hunters serve as their cults'' trappers, hunters, and poa
hp: 190
hp_misc: negative healing
immunities:
-- death effects
- (except necrotic decay)
-- disease
-- fear
+- __death__ effects (except necrotic decay)
+- __disease__
+- __fear__
items:
- +1 striking rhoka sword
- +1 striking composite longbow with 50 arrows
diff --git a/data/monsters/urdefhan tormentor.yaml b/data/monsters/urdefhan tormentor.yaml
index f4ca495..b26dcc4 100644
--- a/data/monsters/urdefhan tormentor.yaml
+++ b/data/monsters/urdefhan tormentor.yaml
@@ -121,9 +121,9 @@ description: 'Urdefhan spellcasters with a knack for the divine are invariably u
hp: 77
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- fear
+- __death__ effects
+- __disease__
+- __fear__
items:
- warhammer
languages:
diff --git a/data/monsters/urdefhan warrior.yaml b/data/monsters/urdefhan warrior.yaml
index 4e95826..dad2428 100644
--- a/data/monsters/urdefhan warrior.yaml
+++ b/data/monsters/urdefhan warrior.yaml
@@ -134,9 +134,9 @@ description: 'From the moment they are born, urdefhans are prepared for war. Urd
hp: 55
hp_misc: negative healing negative healing negative healing
immunities:
-- death effects
-- disease
-- fear
+- __death__ effects
+- __disease__
+- __fear__
items:
- composite longbow (20 arrows)
- rhoka sword
diff --git a/data/monsters/vanth.yaml b/data/monsters/vanth.yaml
index b471ece..09d0fde 100644
--- a/data/monsters/vanth.yaml
+++ b/data/monsters/vanth.yaml
@@ -184,8 +184,8 @@ description: 'Protecting the __Boneyard__ are the stern and resolute guardians o
hp: 105
hp_misc: null
immunities:
-- death effects
-- disease
+- __death__ effects
+- __disease__
items:
- +1 scythe
languages:
diff --git a/data/monsters/vaultbreaker ooze.yaml b/data/monsters/vaultbreaker ooze.yaml
index 77393b1..fececbc 100644
--- a/data/monsters/vaultbreaker ooze.yaml
+++ b/data/monsters/vaultbreaker ooze.yaml
@@ -114,12 +114,12 @@ description: 'Though many oozes hunt among the dreary confines of underground ca
hp: 150
hp_misc: null
immunities:
-- acid
+- __acid__
- critical hits
-- mental
+- __mental__
- precision
-- unconscious
-- visual
+- __unconscious__
+- __visual__
level: 6
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/verdurous ooze.yaml b/data/monsters/verdurous ooze.yaml
index 9fb0106..cfa2e89 100644
--- a/data/monsters/verdurous ooze.yaml
+++ b/data/monsters/verdurous ooze.yaml
@@ -187,12 +187,12 @@ hp_misc: null
immunities:
- acid
- critical hits
-- mental
+- __mental__
- piercing
- precision
- slashing
-- unconscious
-- visual
+- __unconscious__
+- __visual__
level: 6
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/violet fungus.yaml b/data/monsters/violet fungus.yaml
index b0feff4..6f9c92d 100644
--- a/data/monsters/violet fungus.yaml
+++ b/data/monsters/violet fungus.yaml
@@ -62,11 +62,11 @@ hp: 60
hp_misc: null
immunities:
- bleed
-- fatigued
-- mental
-- poison
-- sleep
-- unconscious
+- __fatigued__
+- __mental__
+- __poison__
+- __sleep__
+- __unconscious__
level: 3
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/viskithrel.yaml b/data/monsters/viskithrel.yaml
index 1347f95..57316a6 100644
--- a/data/monsters/viskithrel.yaml
+++ b/data/monsters/viskithrel.yaml
@@ -101,7 +101,7 @@ description: 'One of the many horrid life-forms native to __Zevgavizeb''s__ Abys
hp: 275
hp_misc: null
immunities:
-- sickened
+- __sickened__
languages:
- Abyssal
- (can't speak any languages)
diff --git a/data/monsters/vitalia.yaml b/data/monsters/vitalia.yaml
index ec2681d..874ebe4 100644
--- a/data/monsters/vitalia.yaml
+++ b/data/monsters/vitalia.yaml
@@ -162,10 +162,10 @@ hp: 425
hp_misc: fast healing 20
immunities:
- bleed
-- mental
-- sleep
-- unconscious
-- visual
+- __mental__
+- __sleep__
+- __unconscious__
+- __visual__
level: 18
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/void zombie.yaml b/data/monsters/void zombie.yaml
index 87d7ef5..3839d99 100644
--- a/data/monsters/void zombie.yaml
+++ b/data/monsters/void zombie.yaml
@@ -110,10 +110,10 @@ description: 'A void zombie arises when a humanoid dies from an __akata''s__ voi
hp: 26
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- paralyzed
-- poison
+- __death__ effects
+- __disease__
+- __paralyzed__
+- __poison__
level: 1
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/vrolikai.yaml b/data/monsters/vrolikai.yaml
index 3c8afa7..12b9f50 100644
--- a/data/monsters/vrolikai.yaml
+++ b/data/monsters/vrolikai.yaml
@@ -209,7 +209,7 @@ description: 'Unlike other demons, the dread vrolikai doesn''t form from a sinfu
hp: 375
hp_misc: null
immunities:
-- death effects
+- __death__ effects
languages:
- Abyssal
- Celestial
diff --git a/data/monsters/vrykolakas ancient.yaml b/data/monsters/vrykolakas ancient.yaml
index afcc920..7dd3849 100644
--- a/data/monsters/vrykolakas ancient.yaml
+++ b/data/monsters/vrykolakas ancient.yaml
@@ -321,11 +321,11 @@ description: 'Vrykolakas ancients are the sinister overlords of their kind, stea
hp: 250
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- paralyze
-- poison
-- sleep
+- __death__ effects
+- __disease__
+- __paralyze__
+- __poison__
+- __sleep__
languages:
- Common
level: 13
diff --git a/data/monsters/vrykolakas master.yaml b/data/monsters/vrykolakas master.yaml
index f8ded1b..beb8c7f 100644
--- a/data/monsters/vrykolakas master.yaml
+++ b/data/monsters/vrykolakas master.yaml
@@ -296,11 +296,11 @@ description: 'Vrykolakas masters are sinister shapechangers. They walk undetecte
hp: 190
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- paralyze
-- poison
-- sleep
+- __death__ effects
+- __disease__
+- __paralyze__
+- __poison__
+- __sleep__
languages:
- Common
level: 10
diff --git a/data/monsters/vrykolakas spawn.yaml b/data/monsters/vrykolakas spawn.yaml
index 3f4889c..2490ffb 100644
--- a/data/monsters/vrykolakas spawn.yaml
+++ b/data/monsters/vrykolakas spawn.yaml
@@ -180,11 +180,11 @@ description: 'Vrykolakas unleash their spawn upon the world to spread terror, pl
hp: 99
hp_misc: negative healing
immunities:
-- death effects
-- disease
-- paralyze
-- poison
-- sleep
+- __death__ effects
+- __disease__
+- __paralyze__
+- __poison__
+- __sleep__
languages:
- Common
level: 6
diff --git a/data/monsters/witchfire.yaml b/data/monsters/witchfire.yaml
index c80f7b7..2c146f1 100644
--- a/data/monsters/witchfire.yaml
+++ b/data/monsters/witchfire.yaml
@@ -127,13 +127,13 @@ description: 'Manifesting as a sinuous form wreathed in sickly green flames, thi
hp: 125
hp_misc: negative healing
immunities:
-- death effects
-- disease
+- __death__ effects
+- __disease__
- fire
-- paralyzed
-- poison
+- __paralyzed__
+- __poison__
- precision
-- unconscious
+- __unconscious__
languages:
- Aklo
- Common
diff --git a/data/monsters/wood golem.yaml b/data/monsters/wood golem.yaml
index 873b92e..7cadbba 100644
--- a/data/monsters/wood golem.yaml
+++ b/data/monsters/wood golem.yaml
@@ -122,20 +122,20 @@ hp: 95
hp_misc: null
immunities:
- bleed
-- death effects
-- disease
-- doomed
-- drained
-- fatigued
-- healing
+- __death__ effects
+- __disease__
+- __doomed__
+- __drained__
+- __fatigued__
+- __healing__
- magic (see Golem Antimagic below)
-- mental
-- necromancy
+- __mental__
+- __necromancy__
- nonlethal attacks
-- paralyzed
-- poison
-- sickened
-- unconscious
+- __paralyzed__
+- __poison__
+- __sickened__
+- __unconscious__
level: 6
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/worm that walks cultist.yaml b/data/monsters/worm that walks cultist.yaml
index f986710..a762281 100644
--- a/data/monsters/worm that walks cultist.yaml
+++ b/data/monsters/worm that walks cultist.yaml
@@ -118,12 +118,12 @@ description: 'This worm that walks was a cultist of the Great Old One __Hastur__
hp: 200
hp_misc: fast healing 10
immunities:
-- disease
-- paralyzed
-- poison
+- __disease__
+- __paralyzed__
+- __poison__
- precision
-- swarm mind
-- unconscious
+- __swarm mind__
+- __unconscious__
languages:
- Aklo
- Common
diff --git a/data/monsters/yamaraj.yaml b/data/monsters/yamaraj.yaml
index 10be321..1f8a1c8 100644
--- a/data/monsters/yamaraj.yaml
+++ b/data/monsters/yamaraj.yaml
@@ -190,8 +190,8 @@ description: 'The greatest judges among the psychopomps are the massive yamaraje
hp: 375
hp_misc: fast healing 20, lightning drinker
immunities:
-- death effects
-- disease
+- __death__ effects
+- __disease__
- electricity (see lightning drinker)
languages:
- Abyssal
diff --git a/data/monsters/yellow musk brute.yaml b/data/monsters/yellow musk brute.yaml
index 8e780bb..63df159 100644
--- a/data/monsters/yellow musk brute.yaml
+++ b/data/monsters/yellow musk brute.yaml
@@ -113,7 +113,7 @@ description: 'A creature transformed by a yellow musk creeper''s tendrils boring
hp: 45
hp_misc: null
immunities:
-- mental
+- __mental__
level: 2
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/yellow musk creeper.yaml b/data/monsters/yellow musk creeper.yaml
index 858e4ca..42827fc 100644
--- a/data/monsters/yellow musk creeper.yaml
+++ b/data/monsters/yellow musk creeper.yaml
@@ -116,7 +116,7 @@ description: 'Made up of thick, green vines with numerous yellow flowers, the ye
hp: 34
hp_misc: null
immunities:
-- mental
+- __mental__
level: 2
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/yellow musk thrall.yaml b/data/monsters/yellow musk thrall.yaml
index 83b18e2..5ad8d23 100644
--- a/data/monsters/yellow musk thrall.yaml
+++ b/data/monsters/yellow musk thrall.yaml
@@ -113,7 +113,7 @@ description: 'A creature transformed by a yellow musk creeper''s tendrils boring
hp: 12
hp_misc: null
immunities:
-- mental
+- __mental__
level: -1
melee_attacks:
- action_cost: One Action
diff --git a/data/monsters/young brine dragon.yaml b/data/monsters/young brine dragon.yaml
index a94b340..1816656 100644
--- a/data/monsters/young brine dragon.yaml
+++ b/data/monsters/young brine dragon.yaml
@@ -173,8 +173,8 @@ hp: 142
hp_misc: null
immunities:
- acid
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Aquan
- Common
diff --git a/data/monsters/young cloud dragon.yaml b/data/monsters/young cloud dragon.yaml
index b15e11a..728fc25 100644
--- a/data/monsters/young cloud dragon.yaml
+++ b/data/monsters/young cloud dragon.yaml
@@ -199,8 +199,8 @@ hp: 175
hp_misc: null
immunities:
- electricity
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Auran
- Common
diff --git a/data/monsters/young crystal dragon.yaml b/data/monsters/young crystal dragon.yaml
index cb522c6..ca09b0e 100644
--- a/data/monsters/young crystal dragon.yaml
+++ b/data/monsters/young crystal dragon.yaml
@@ -171,8 +171,8 @@ description: 'Good-natured but vain, crystal dragons are beautiful creatures wit
hp: 105
hp_misc: null
immunities:
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Common
- Draconic
diff --git a/data/monsters/young magma dragon.yaml b/data/monsters/young magma dragon.yaml
index 4f5a047..f793750 100644
--- a/data/monsters/young magma dragon.yaml
+++ b/data/monsters/young magma dragon.yaml
@@ -177,8 +177,8 @@ hp: 175
hp_misc: null
immunities:
- fire
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Common
- Draconic
diff --git a/data/monsters/young umbral dragon.yaml b/data/monsters/young umbral dragon.yaml
index 044854b..d11525d 100644
--- a/data/monsters/young umbral dragon.yaml
+++ b/data/monsters/young umbral dragon.yaml
@@ -193,8 +193,8 @@ hp: 195
hp_misc: null
immunities:
- negative
-- paralyzed
-- sleep
+- __paralyzed__
+- __sleep__
languages:
- Common
- Draconic
diff --git a/data/monsters/zomok.yaml b/data/monsters/zomok.yaml
index 87f03c9..bcfd40c 100644
--- a/data/monsters/zomok.yaml
+++ b/data/monsters/zomok.yaml
@@ -140,10 +140,10 @@ description: 'Mighty plant-dragons, zomoks prowl the woodlands, defending their
hp: 310
hp_misc: null
immunities:
-- paralyzed
-- poison
-- sleep
-- stunned
+- __paralyzed__
+- __poison__
+- __sleep__
+- __stunned__
languages:
- Arboreal
- Common
diff --git a/data/monsters/zrukbat.yaml b/data/monsters/zrukbat.yaml
index 6e3260c..6a7851e 100644
--- a/data/monsters/zrukbat.yaml
+++ b/data/monsters/zrukbat.yaml
@@ -103,7 +103,7 @@ description: 'Zrukbats resemble long-limbed bats with gangly wings, which make t
hp: 30
hp_misc: null
immunities:
-- sleep
+- __sleep__
languages:
- Common
- Sylvan