Cleanse (cont.)

config/fxdata/creature.cfg

@@ -50,6 +50,10 @@ FPActionTime = 0
 FPResetTime = 0
 ; Instance is activated as soon as it's selected.
 FPInstantCast = 0
+; Instance can be used when frozen in possession. Only works when targetting self.
+FPAllowSelfCastWhileFrozen = 0
+; Instance can be used when under the Chicken spell in possession.  Only works when targetting self.
+FPAllowSelfCastWhenChicken = 0
 ; How many game turns after using the instance creature can be spotted even if invisible.
 ForceVisibility = 0
 ; Tooltip string ID, explaining what the instance does.
@@ -256,6 +260,7 @@ FPTime = 5
 FPActionTime = 3
 FPResetTime = 250
 FPInstantCast = 1
+FPAllowSelfCastWhileFrozen = 1
 ForceVisibility = 10
 TooltipTextID = 228
 SymbolSprites = 408
@@ -295,6 +300,7 @@ FPTime = 5
 FPActionTime = 3
 FPResetTime = 250
 FPInstantCast = 1
+FPAllowSelfCastWhileFrozen = 1
 ForceVisibility = 10
 TooltipTextID = 230
 SymbolSprites = 412
@@ -314,6 +320,7 @@ FPTime = 5
 FPActionTime = 3
 FPResetTime = 250
 FPInstantCast = 1
+FPAllowSelfCastWhileFrozen = 1
 ForceVisibility = 1
 TooltipTextID = 248
 SymbolSprites = 414
@@ -353,6 +360,7 @@ FPTime = 5
 FPActionTime = 3
 FPResetTime = 200
 FPInstantCast = 1
+FPAllowSelfCastWhileFrozen = 1
 ForceVisibility = 1
 TooltipTextID = 239
 SymbolSprites = 418
@@ -372,6 +380,7 @@ FPTime = 5
 FPActionTime = 3
 FPResetTime = 3
 FPInstantCast = 1
+FPAllowSelfCastWhileFrozen = 1
 ForceVisibility = 10
 TooltipTextID = 240
 SymbolSprites = 420
@@ -389,6 +398,7 @@ FPTime = 5
 FPActionTime = 3
 FPResetTime = 500
 FPInstantCast = 1
+FPAllowSelfCastWhileFrozen = 1
 ForceVisibility = 3
 TooltipTextID = 236
 SymbolSprites = 422
@@ -544,6 +554,7 @@ FPTime = 5
 FPActionTime = 3
 FPResetTime = 300
 FPInstantCast = 1
+FPAllowSelfCastWhileFrozen = 1
 ForceVisibility = 100
 TooltipTextID = 242
 SymbolSprites = 434
@@ -561,6 +572,7 @@ FPTime = 5
 FPActionTime = 3
 FPResetTime = 250
 FPInstantCast = 1
+FPAllowSelfCastWhileFrozen = 1
 ForceVisibility = 1
 TooltipTextID = 243
 SymbolSprites = 436
@@ -580,6 +592,7 @@ FPTime = 5
 FPActionTime = 3
 FPResetTime = 150
 FPInstantCast = 1
+FPAllowSelfCastWhileFrozen = 1
 ForceVisibility = 0
 TooltipTextID = 232
 SymbolSprites = 438
@@ -978,6 +991,7 @@ FPTime = 6
 FPActionTime = 5
 FPResetTime = 600
 FPInstantCast = 1
+FPAllowSelfCastWhileFrozen = 1
 ForceVisibility = 30
 TooltipTextID = 1080
 SymbolSprites = BIRD_SPELL
@@ -997,6 +1011,7 @@ FPTime = 6
 FPActionTime = 5
 FPResetTime = 190
 FPInstantCast = 1
+FPAllowSelfCastWhileFrozen = 1
 ForceVisibility = 30
 TooltipTextID = 1081
 SymbolSprites = SPIDERLING_SPELL
@@ -1114,6 +1129,53 @@ PrimaryTarget = 3
 Properties = DESTRUCTIVE MELEE_ATTACK DISPLAY_SWIPE
 Function = creature_fire_shot SHOT_CRIPPLE 0
 
+[instance55]
+Name = CLEANSE
+Time = 10
+ActionTime = 6
+ResetTime = 375
+FPTime = 5
+FPActionTime = 3
+FPResetTime = 300
+FPInstantCast = 1
+FPAllowSelfCastWhileFrozen = 1
+FPAllowSelfCastWhenChicken = 1
+ForceVisibility = 10
+TooltipTextID = 1067
+SymbolSprites = 798
+Graphics = CASTSPELL
+Properties = SELF_BUFF
+PrimaryTarget = 6
+Function = creature_cast_spell SPELL_CLEANSE 0
+;param 1 - spell flags under which the instance is allowed
+ValidateSourceFunc = validate_source_even_in_prison 2560 0
+;param 1 - spell kind from which to take CleanseFlags
+ValidateTargetFunc = validate_target_requires_cleansing 32 0
+
+[instance56]
+Name = RANGED_CLEANSE
+Time = 10
+ActionTime = 6
+ResetTime = 375
+FPTime = 5
+FPActionTime = 3
+FPResetTime = 300
+FPInstantCast = 0
+FPAllowSelfCastWhileFrozen = 1
+FPAllowSelfCastWhenChicken = 1
+ForceVisibility = 30
+TooltipTextID = 1068
+SymbolSprites = 794
+Graphics = CASTSPELL
+RangeMin = MIN
+RangeMax = 3072
+Properties = RANGED_BUFF SELF_BUFF NEEDS_TARGET
+PrimaryTarget = 6
+Function = creature_cast_spell SPELL_CLEANSE 0
+ValidateSourceFunc = validate_source_generic 2560 0
+ValidateTargetFunc = validate_target_requires_cleansing 32 0
+SearchTargetsFunc = search_target_generic 0 0
+
 [job0]
 ; Empty job, indicates no job assigned.
 Name = NULL

config/fxdata/effects.toml

@@ -1514,6 +1514,24 @@ LightFlags = 1
 ElementsCount = 3
 AlwaysGenerate = 0
 
+[effect83]
+Name = "EFFECT_CLEANSE"
+Health = 8
+GenerationType = 1
+GenerationAccelXYRange = [16,16]
+GenerationAccelZRange = [64,256]
+GenerationKindRange = [124,124]
+AreaAffectType = 0
+HitType = 0
+SpellEffect = 0
+Sound = 0
+AffectedByWind = 0
+LightRadius = 0
+LightIntensity = 0
+LightFlags = 0
+ElementsCount = 1
+AlwaysGenerate = 0
+
 # EffectGenerators.
 
 [effectGenerator0]
@@ -5301,4 +5319,60 @@ TransformModel = 0
 LightRadius = 1
 LightIntensity = 0
 LightFlags = 0
-AffectedByWind = 1
+AffectedByWind = 1
+
+[effectElement124]
+Name = "EFFECTELEMENT_CLEANSE"
+DrawClass = 2
+MoveType = 2
+Unanimated = 0
+Lifespan = [-1,-1]
+AnimationId = 119
+SpriteSize = [96,150]
+AnimateOnce = 0
+SpriteSpeed = [384,512]
+AnimateOnFloor = true
+Unshaded = true
+Transparent = 3
+ThroughWalls = 0
+SizeChange = 0
+FallAcceleration = 0
+InertiaFloor = 0
+InertiaAir = 0
+SubeffectModel = 0
+SubeffectDelay = 0
+Movable = false
+Impacts = false
+TransformModel = 125
+LightRadius = 0
+LightIntensity = 0
+LightFlags = 0
+AffectedByWind = 0
+
+[effectElement125]
+Name = "EFFECTELEMENT_CLEANSE_DURATION"
+DrawClass = 2
+MoveType = 2
+Unanimated = 0
+Lifespan = [10,15]
+AnimationId = 850
+SpriteSize = [12,24]
+AnimateOnce = 0
+SpriteSpeed = [384,512]
+AnimateOnFloor = true
+Unshaded = true
+Transparent = 3
+ThroughWalls = 0
+SizeChange = 0
+FallAcceleration = 0
+InertiaFloor = 0
+InertiaAir = 0
+SubeffectModel = 0
+SubeffectDelay = 0
+Movable = false
+Impacts = false
+TransformModel = 0
+LightRadius = 0
+LightIntensity = 0
+LightFlags = 0
+AffectedByWind = 0

config/fxdata/magic.cfg

@@ -46,6 +46,8 @@ SpellPower = NOPOWER
 ;  32768: TELEPORT - If self-cast, jumps to its next objective or place to fulfill its needs. If cast on a target, jumps it to its lair or flee point.
 ;  65536: TIMEBOMB - Sets a countdown on the target, making it move toward enemies to explode on impact, dealing damage from the linked shot.
 ; 131072: WIND - Not functional on spells, exists only for immunity.
+; 262144: CLEANSE - Cures effects specified in 'CleanseFlags'.
+; 524288: SPELL_BLOCKS - Prevents effects from affecting the creature. Must be combined with 'CleanseFlags' to function, has no effect on its own.
 SpellFlags = 0
 ; Spell effects to remove from the target. Use the same list as 'SpellFlags'. Accepts both names and numbers.
 CleanseFlags = 0
@@ -357,6 +359,21 @@ Duration = 160
 SelfCasted = 1 978 1
 SymbolSprites = 768 770
 
+[spell32]
+; Cures all negative effect and blocks them for a short duration.
+Name = SPELL_CLEANSE
+CastAtThing = 1
+ShotModel = SHOT_RANGED_CLEANSE
+SpellPower = NOPOWER
+SpellFlags = SPELL_BLOCKS
+AuraEffect = EFFECT_CLEANSE
+AuraFrequency = 0
+AuraDuration = 10
+CleanseFlags = SLOW DISEASE CHICKEN FREEZE FEAR
+Duration = 30
+SelfCasted = 1 162 1
+SymbolSprites = 796 798
+
 ; Shots types.
 
 [shot0]
@@ -1586,6 +1603,32 @@ FrozenEffect = EFFECT_HIT_FROZEN_UNIT
 Properties = CAN_COLLIDE NEVER_BLOCK WIND_IMMUNE
 UpdateLogic = SmokeWhenFired
 
+[shot41]
+Name = SHOT_RANGED_CLEANSE
+Animation = SPARKLE_CLEANSE
+AnimationSize = 128
+AnimationTransparency = 3
+Size_XY = 64
+Size_Z = 64
+Health = 30
+Damage = 0
+HitType = 11
+SpellEffect = SPELL_CLEANSE
+Speed = 128
+BaseExperienceGain = 256
+DestroyOnHit = 1
+TargetHitstopTurns = 6
+FiringSound = 161
+ShotSound = 0
+ShotSoundPriority = 1
+HitWaterEffect = EFFECT_DRIP_1
+HitWaterSound = 21 1
+Properties = NAVIGABLE REBOUND_IMMUNE
+FireLogic = 3
+EffectAmount = 3
+Spread_XY = 50
+Spread_Z = 50
+
 ; Powers types.
 
 [power0]

lang/gtext_fre.po

@@ -2766,10 +2766,10 @@ msgid ""
 "can be rotated. Disable the warp effect for clean lines. Forced perspective "
 "can only be rotated 90 degrees and changes the viewing angle. LMB toggle."
 msgstr ""
-"Type d'affichage: Alterne entre deux types de vue de la perspective. La vue "
-"par défaut a des murs tordus et permet la rotation libre. Désactivez l'effet "
+"Type d'affichage: Alterne entre les vues en perspective. La vue "
+"par défaut a des murs tordus et permet une rotation libre. Désactivez l'effet "
 "de torsion pour des lignes droites. La vue forcée change l'angle de vision "
-"et ne peut faire que des rotations à 90 degrés. Alterner avec le bouton "
+"et ne peut pivoter que par rotations de 90 degrés. Alterner avec le bouton "
 "gauche de la souris."
 
 #: guitext:315

src/config_creature.c

@@ -106,6 +106,8 @@ const struct NamedCommand creaturetype_instance_commands[] = {
   {"SearchTargetsFunc",    20},
   {"PostalPriority",       21},
   {"NoAnimationLoop",      22},
+  {"FPAllowSelfCastWhileFrozen",   23},
+  {"FPAllowSelfCastWhenChicken",   24},
   {NULL,              0},
   };
 
@@ -1014,6 +1016,8 @@ TbBool parse_creaturetype_instance_blocks(char *buf, long len, const char *confi
             inst_inf->validate_target_func_params[0] = 0;
             inst_inf->validate_target_func_params[1] = 0;
             inst_inf->postal_priority = 0;
+            inst_inf->fp_allow_self_cast_while_frozen = 0;
+            inst_inf->fp_allow_self_cast_when_chicken = 0;
         }
     }
     instance_desc[INSTANCE_TYPES_MAX - 1].name = NULL; // must be null for get_id
@@ -1411,6 +1415,32 @@ TbBool parse_creaturetype_instance_blocks(char *buf, long len, const char *confi
                     COMMAND_TEXT(cmd_num), blocknamelen, blockname, config_textname);
             }
             break;
+        case 23: // FPALLOWSELFCASTWHILEFROZEN
+            if (get_conf_parameter_single(buf,&pos,len,word_buf,sizeof(word_buf)) > 0)
+            {
+              k = atoi(word_buf);
+              inst_inf->fp_allow_self_cast_while_frozen = (TbBool)k;
+              n++;
+            }
+            if (n < 1)
+            {
+                CONFWRNLOG("Couldn't read \"%s\" parameter in [%.*s] block of %s file.",
+                    COMMAND_TEXT(cmd_num), blocknamelen, blockname, config_textname);
+            }
+            break;
+        case 24: // FPALLOWSELFCASTWHENCHICKEN
+            if (get_conf_parameter_single(buf,&pos,len,word_buf,sizeof(word_buf)) > 0)
+            {
+              k = atoi(word_buf);
+              inst_inf->fp_allow_self_cast_when_chicken = (TbBool)k;
+              n++;
+            }
+            if (n < 1)
+            {
+                CONFWRNLOG("Couldn't read \"%s\" parameter in [%.*s] block of %s file.",
+                    COMMAND_TEXT(cmd_num), blocknamelen, blockname, config_textname);
+            }
+            break;
         case ccr_comment:
             break;
         case ccr_endOfFile:

src/config_magic.c

@@ -98,6 +98,7 @@ const struct NamedCommand spell_effect_flags[] = {
     {"TELEPORT",      CSAfF_Teleport},
     {"TIMEBOMB",      CSAfF_Timebomb},
     {"WIND",          CSAfF_Wind},
+    {"SPELL_BLOCKS",  CSAfF_SpellBlocks},
     {NULL,            0},
 };
 

src/config_magic.h

@@ -55,6 +55,7 @@ enum CreatureSpellAffectedFlags {
     CSAfF_Teleport     = 0x008000,
     CSAfF_Timebomb     = 0x010000,
     CSAfF_Wind         = 0x020000,
+    CSAfF_SpellBlocks  = 0x040000,
 };
 
 enum SpellPropertiesFlags {