dkfans · Loobinex · Jan 5, 2025 · Dec 11, 2024 · Dec 11, 2024 · Dec 11, 2024
diff --git a/campgns/ami2019_crtr/avatar.cfg b/campgns/ami2019_crtr/avatar.cfg
@@ -2,7 +2,7 @@
 Name = AVATAR
 Defence = 110
 ThingSize = 256 512
-Properties = BLEEDS HUMANOID_SKELETON NEVER_CHICKENS IMMUNE_TO_BOULDER LORD NO_STEAL_HERO
+Properties = BLEEDS HUMANOID_SKELETON IMMUNE_TO_BOULDER LORD NO_STEAL_HERO
 
 [experience]
 Powers = SWING_WEAPON_SWORD ARMOUR WORD_OF_POWER HEAL NULL FREEZE LIGHTNING FIRE_BOMB INVISIBILITY SPEED

diff --git a/campgns/dzjr06lv_crtr/bile_demon.cfg b/campgns/dzjr06lv_crtr/bile_demon.cfg
@@ -15,7 +15,8 @@ LairSize = 4
 BaseSpeed = 40
 Pay = 182
 DamageToBoulder = 20
-Properties = BLEEDS UNAFFECTED_BY_WIND EVIL TREMBLING FAT
+Properties = BLEEDS EVIL TREMBLING FAT
+SpellImmunity = WIND
 
 [attraction]
 EntranceRoom = BARRACKS GARDEN NULL

diff --git a/campgns/dzjr06lv_crtr/bug.cfg b/campgns/dzjr06lv_crtr/bug.cfg
@@ -13,7 +13,8 @@ Recovery = 8
 HungerRate = 10000
 BaseSpeed = 120
 SlapsToKill = 18
-Properties = BLEEDS IMMUNE_TO_GAS EVIL INSECT
+Properties = BLEEDS EVIL INSECT
+SpellImmunity = POISON_CLOUD
 
 [attraction]
 EntranceRoom = LAIR NULL NULL

diff --git a/campgns/dzjr06lv_crtr/ghost.cfg b/campgns/dzjr06lv_crtr/ghost.cfg
@@ -16,7 +16,8 @@ HungerFill = 1
 BaseSpeed = 56
 AttackPreference = RANGED
 Pay = 38
-Properties = IMMUNE_TO_GAS FLYING SEE_INVISIBLE PASS_LOCKED_DOORS EVIL
+Properties = FLYING SEE_INVISIBLE PASS_LOCKED_DOORS EVIL
+SpellImmunity = POISON_CLOUD
 
 [attraction]
 RoomSlabsRequired = 9 0 0

diff --git a/campgns/dzjr06lv_crtr/samurai.cfg b/campgns/dzjr06lv_crtr/samurai.cfg
@@ -10,7 +10,8 @@ FearsomeFactor = 100
 Defence = 170
 Pay = 820
 DamageToBoulder = 20
-Properties = BLEEDS IMMUNE_TO_GAS HUMANOID_SKELETON SEE_INVISIBLE
+Properties = BLEEDS HUMANOID_SKELETON SEE_INVISIBLE
+SpellImmunity = POISON_CLOUD
 
 [attraction]
 EntranceRoom = NULL TEMPLE NULL

diff --git a/campgns/dzjr06lv_crtr/skeleton.cfg b/campgns/dzjr06lv_crtr/skeleton.cfg
@@ -14,7 +14,8 @@ Recovery = 24
 HungerFill = 1
 BaseSpeed = 72
 Pay = 46
-Properties = IMMUNE_TO_GAS EVIL
+Properties = EVIL
+SpellImmunity = POISON_CLOUD
 
 [attraction]
 EntranceRoom = NULL PRISON NULL

diff --git a/campgns/dzjr06lv_crtr/spider.cfg b/campgns/dzjr06lv_crtr/spider.cfg
@@ -14,7 +14,8 @@ Luck = 8
 Recovery = 4
 LairSize = 2
 Pay = 86
-Properties = BLEEDS IMMUNE_TO_GAS ARACHNID EVIL INSECT
+Properties = BLEEDS ARACHNID EVIL INSECT
+SpellImmunity = POISON_CLOUD
 
 [attraction]
 EntranceRoom = RESEARCH GARDEN NULL

diff --git a/campgns/lqizgood_crtr/avatar.cfg b/campgns/lqizgood_crtr/avatar.cfg
@@ -2,4 +2,4 @@
 
 [attributes]
 Name = AVATAR
-Properties = BLEEDS HUMANOID_SKELETON NEVER_CHICKENS IMMUNE_TO_BOULDER ONE_OF_KIND NO_STEAL_HERO
+Properties = BLEEDS HUMANOID_SKELETON IMMUNE_TO_BOULDER ONE_OF_KIND NO_STEAL_HERO
diff --git a/campgns/twinkprs_crtr/ghost.cfg b/campgns/twinkprs_crtr/ghost.cfg
@@ -5,4 +5,4 @@
 
 [attributes]
 Name = GHOST
-Properties = IMMUNE_TO_GAS FLYING SEE_INVISIBLE EVIL
+Properties = FLYING SEE_INVISIBLE EVIL
diff --git a/config/creatrs/avatar.cfg b/config/creatrs/avatar.cfg
@@ -30,7 +30,8 @@ DamageToBoulder = 60
 ; Creature thing size - XY and Z, one cube is 256x256.
 ThingSize = 256 590
 LairObject = LAIR_AVATR
-Properties = BLEEDS HUMANOID_SKELETON NEVER_CHICKENS IMMUNE_TO_BOULDER LORD ONE_OF_KIND NO_STEAL_HERO
+SpellImmunity = CHICKEN
+Properties = BLEEDS HUMANOID_SKELETON IMMUNE_TO_BOULDER LORD ONE_OF_KIND NO_STEAL_HERO
 
 [attraction]
 EntranceRoom = LAIR TRAINING GARDEN

diff --git a/config/creatrs/bile_demon.cfg b/config/creatrs/bile_demon.cfg
@@ -30,7 +30,8 @@ DamageToBoulder = 50
 ; Creature thing size - XY and Z, one cube is 256x256.
 ThingSize = 256 512
 LairObject = LAIR_BILDM
-Properties = BLEEDS UNAFFECTED_BY_WIND IMMUNE_TO_GAS EVIL TREMBLING FAT
+SpellImmunity = POISON_CLOUD WIND
+Properties = BLEEDS EVIL TREMBLING FAT
 
 [attraction]
 EntranceRoom = GARDEN LAIR NULL

diff --git a/config/creatrs/fairy.cfg b/config/creatrs/fairy.cfg
@@ -30,7 +30,8 @@ DamageToBoulder = 15
 ; Creature thing size - XY and Z, one cube is 256x256.
 ThingSize = 256 560
 LairObject = LAIR_FAIRY
-Properties = BLEEDS IMMUNE_TO_GAS HUMANOID_SKELETON FLYING FEMALE
+SpellImmunity = POISON_CLOUD
+Properties = BLEEDS HUMANOID_SKELETON FLYING FEMALE
 
 [attraction]
 EntranceRoom = RESEARCH LAIR NULL

diff --git a/config/creatrs/floating_spirit.cfg b/config/creatrs/floating_spirit.cfg
@@ -29,7 +29,8 @@ SlapsToKill = 0
 DamageToBoulder = 0
 ; Creature thing size - XY and Z, one cube is 256x256.
 ThingSize = 0 0
-Properties = UNAFFECTED_BY_WIND IMMUNE_TO_GAS FLYING SEE_INVISIBLE PASS_LOCKED_DOORS SPECTATOR
+SpellImmunity = POISON_CLOUD WIND
+Properties = FLYING SEE_INVISIBLE PASS_LOCKED_DOORS SPECTATOR
 
 [attraction]
 EntranceRoom = NULL NULL NULL

diff --git a/config/creatrs/ghost.cfg b/config/creatrs/ghost.cfg
@@ -30,7 +30,8 @@ DamageToBoulder = 20
 ; Creature thing size - XY and Z, one cube is 256x256.
 ThingSize = 256 512
 LairObject = LAIR_GHOST
-Properties = IMMUNE_TO_GAS FLYING SEE_INVISIBLE PASS_LOCKED_DOORS EVIL NO_CORPSE_ROTTING
+SpellImmunity = POISON_CLOUD
+Properties = FLYING SEE_INVISIBLE PASS_LOCKED_DOORS EVIL NO_CORPSE_ROTTING
 
 [attraction]
 EntranceRoom = TORTURE NULL NULL

diff --git a/config/creatrs/horny.cfg b/config/creatrs/horny.cfg
@@ -30,6 +30,7 @@ DamageToBoulder = 40
 ; Creature thing size - XY and Z, one cube is 256x256.
 ThingSize = 256 600
 LairObject = LAIR_HORNY
+SpellImmunity = FEAR
 Properties = BLEEDS HUMANOID_SKELETON EVIL
 
 [attraction]

diff --git a/config/creatrs/imp.cfg b/config/creatrs/imp.cfg
@@ -97,10 +97,10 @@ PrisonKind = NULL
 ; Defines the kind of creature it will become if it dies from torture.
 ; The same rule applies as above, except it does not consider the 'HUMANOID_SKELETON' property.
 TortureKind = NULL
+; Set to 0, leave empty, or remove the field for the creature to have no immunities.
+SpellImmunity = 0
 ; Creature properties:
 ;   BLEEDS - the creature leaves blood when is hit, slapped, dying or being injured in any way.
-;   UNAFFECTED_BY_WIND - the creature isn't pushed back by Wind spell.
-;   IMMUNE_TO_GAS - the creature isn't injured by Gas Traps and Farts.
 ;   HUMANOID_SKELETON - the creature leaves a skeleton if left in prison to die.
 ;   PISS_ON_DEAD - creature feels urge to piss on nearby dead bodies.
 ;   FLYING - creature normally isn't touching ground when moving and can move up and down.
@@ -113,7 +113,6 @@ TortureKind = NULL
 ;   EVENTFUL_DEATH - when the creature dies the LAST_DEATH_EVENT[] script variable is updated, so mapmaker can use the location.
 ;   SPECTATOR - creature is just a spectator for multiplayer games.
 ;   EVIL - creature has evil nature.
-;   NEVER_CHICKENS - creature isn't affected by Chicken spell.
 ;   IMMUNE_TO_BOULDER - when boulder trap hits the creature, falls apart without dealing any damage.
 ;   NO_CORPSE_ROTTING - Creature body can't be taken to rot on graveyard and will disappear quickly.
 ;   NO_ENMHEART_ATTCK - Creature won't attack enemy dungeon heart on sight.
@@ -127,10 +126,16 @@ TortureKind = NULL
 ;   NO_TRANSFER - Creature cannot be transferred with a transfer creature special.
 ;   NO_STEAL_HERO - Creature cannot be stolen from a steal hero special.
 ;   PREFER_STEAL - Creature can be generated from steal hero special if there is nothing to steal from.
-;   IMMUNE_TO_DISEASE - Creature cannot get diseased.
 ;   ILLUMINATED - A bright light will shine from the Creature.
 ;   ALLURING_SCVNGR - When scavenging will give the keeper a portal boost compared to rival keepers.
 Properties = BLEEDS SPECIAL_DIGGER EVIL NO_ENMHEART_ATTCK NO_CORPSE_ROTTING
+; Creature immunities. Takes 'SpellFlags', see magic.cfg for the names or numbers.
+; Special cases:
+; LIGHT - Prevents 'LIGHT', but does not stop 'ILLUMINATED' from working.
+; POISON_CLOUD - Prevents damages/status from effects with 'AreaAffectType' set to 1/2/3.
+; MAD_KILLING - Prevents 'MAD_KILLING', but does not stop 'MAD_PSYCHO' anger job.
+; FEAR - Prevents 'FEAR', but does not stop fleeing/real fear.
+; WIND - Prevents the creature from being blown away from shots with 'UpdateLogic' set to 2.
 
 [attraction]
 ; Rooms required to attract the creature from entrance, and number of slabs which is needed (max 3 rooms).

diff --git a/config/creatrs/skeleton.cfg b/config/creatrs/skeleton.cfg
@@ -30,7 +30,8 @@ DamageToBoulder = 20
 ; Creature thing size - XY and Z, one cube is 256x256.
 ThingSize = 256 512
 LairObject = LAIR_SKELT
-Properties = IMMUNE_TO_GAS HUMANOID_SKELETON EVIL
+SpellImmunity = POISON_CLOUD
+Properties = HUMANOID_SKELETON EVIL
 
 [attraction]
 EntranceRoom = NULL PRISON TRAINING

diff --git a/config/creatrs/vampire.cfg b/config/creatrs/vampire.cfg
@@ -30,7 +30,8 @@ DamageToBoulder = 40
 ; Creature thing size - XY and Z, one cube is 256x256.
 ThingSize = 256 560
 LairObject = LAIR_VAMP
-Properties = BLEEDS IMMUNE_TO_GAS HUMANOID_SKELETON SEE_INVISIBLE EVIL ALLURING_SCVNGR
+SpellImmunity = POISON_CLOUD
+Properties = BLEEDS HUMANOID_SKELETON SEE_INVISIBLE EVIL ALLURING_SCVNGR
 
 [attraction]
 EntranceRoom = GRAVEYARD LAIR NULL

diff --git a/config/creatrs/wizard.cfg b/config/creatrs/wizard.cfg
@@ -30,7 +30,8 @@ DamageToBoulder = 30
 ; Creature thing size - XY and Z, one cube is 256x256.
 ThingSize = 256 512
 LairObject = LAIR_WIZRD
-Properties = BLEEDS IMMUNE_TO_GAS HUMANOID_SKELETON
+SpellImmunity = POISON_CLOUD
+Properties = BLEEDS HUMANOID_SKELETON
 
 [attraction]
 EntranceRoom = RESEARCH NULL NULL