move illuminates halo of Lady of Light in sylvan-essence illuminates ability (wesnoth 1.17.23 and later)

macros/abilities.cfg

@@ -46,13 +46,10 @@ Affected units engaging in combat deal 25% less damage and become unable to exer
     [/skirmisher]
 #enddef
 
-#define ABILITY_SYLVAN_ESSENCE_NOUNION
+#define COMMON_SYLVAN_ESSENCE VALUE
     [heals]
         value=8
-        id=sylvan_essence_healing_nounion
-        name= _ "sylvan essence"
-        description=_"This unit can heal and cure friendly units on adjacent hexes every turn, to a base maximum of 8 HP. In vegetated terrains, it will conceal itself from its enemies. It can also regenerate (but not unpoison) 3 HP per-turn, but only in vegetated terrains."+{NOTES_VEGETATED_TERRAINS}
-        special_note={SPECIAL_NOTE_SYLVAN_ESSENCE}
+        id=sylvan_essence_healing
         affect_allies=yes
         affect_self=no
         poison=cured
@@ -61,7 +58,7 @@ Affected units engaging in combat deal 25% less damage and become unable to exer
         [/affect_adjacent]
     [/heals]
     [hides]
-        id=sylvan_essence_conceal_nounion
+        id=sylvan_essence_conceal
         affect_self=yes
         [filter_self]
             [filter_location]
@@ -70,8 +67,8 @@ Affected units engaging in combat deal 25% less damage and become unable to exer
         [/filter_self]
     [/hides]
     [regenerate]
-        value=3
-        id=sylvan_essence_selfheal_nounion
+        value={VALUE}
+        id=sylvan_essence_selfheal
         affect_self=yes
         [filter_self]
             [filter_location]
@@ -81,51 +78,56 @@ Affected units engaging in combat deal 25% less damage and become unable to exer
     [/regenerate]
 #enddef
 
-# FIXME
-#undef ABILITY_SYLVAN_ESSENCE
-
 #define ABILITY_SYLVAN_ESSENCE
-    [illuminates]
-        id=sylvan_essence_illum
-        value=25
-        max_value=25
-        cumulative=no
+    [dummy]
+        id=sylvan_essence_gen
         name= _ "sylvan essence"
-        description=_"This unit illuminates the surrounding area, making lawful units fight better, and chaotic units fight worse. Any units adjacent to this unit will fight as if it were dusk when it is night, and as if it were day when it is dusk.
+        description=_"This unit can heal and cure friendly units on adjacent hexes every turn, to a base maximum of 8 HP. In vegetated terrains, it will conceal itself from its enemies. It can also regenerate (but not unpoison) 3 HP per-turn, but only in vegetated terrains."+{NOTES_VEGETATED_TERRAINS}
+        special_note={SPECIAL_NOTE_SYLVAN_ESSENCE}
+    [/dummy]
+    {COMMON_SYLVAN_ESSENCE 3}
+#enddef
+
+#define ABILITY_SYLVAN_ESSENCE_UNION
+    [dummy]
+        id=sylvan_essence_gen
+        name= _ "sylvan essence"
+        description=_"This unit illuminates the surrounding area, making lawful units fight better, and chaotic units fight worse, but it's weaken when it's hide itself. Any units adjacent to this unit will fight as if it were dusk when it is night, and as if it were day when it is dusk.
 
 The unit also can heal and cure friendly units on adjacent hexes every turn, to a base maximum of 8 HP. In vegetated terrains, it will conceal itself from its enemies. It can also regenerate (but not unpoison) 4 HP per-turn, but only in vegetated terrains."+{NOTES_VEGETATED_TERRAINS}
         special_note={SPECIAL_NOTE_SYLVAN_ESSENCE}
+    [/dummy]
+    [illuminates]
+        id=sylvan_essence_illum_no_hides
+        value=25
+        max_value=25
+        cumulative=no
+        halo_image="halo/illuminates-aura-alt.png"
         affect_self=yes
+        [filter]
+            [not]
+                ability_type_active=hides
+                [not]
+                    status=uncovered
+                [/not]
+            [/not]
+        [/filter]
     [/illuminates]
-    [heals]
-        value=8
-        id=sylvan_essence_healing
-        affect_allies=yes
-        affect_self=no
-        poison=cured
-        [affect_adjacent]
-            adjacent=n,ne,se,s,sw,nw
-        [/affect_adjacent]
-    [/heals]
-    [hides]
-        id=sylvan_essence_conceal
-        affect_self=yes
-        [filter_self]
-            [filter_location]
-                terrain={VEGETATED_TERRAINS}
-            [/filter_location]
-        [/filter_self]
-    [/hides]
-    [regenerate]
-        value=4
-        id=sylvan_essence_selfheal
+    [illuminates]
+        id=sylvan_essence_illum_hides
+        value=13
+        max_value=25
+        cumulative=no
+        halo_image="halo/weaken-illuminates-aura-alt.png"
         affect_self=yes
-        [filter_self]
-            [filter_location]
-                terrain={VEGETATED_TERRAINS}
-            [/filter_location]
-        [/filter_self]
-    [/regenerate]
+        [filter]
+            ability_type_active=hides
+            [not]
+                status=uncovered
+            [/not]
+        [/filter]
+    [/illuminates]
+    {COMMON_SYLVAN_ESSENCE 4}
 #enddef
 
 #define ABILITY_REGENERATES4

units/faeries/Lady_of_Light.cfg

@@ -7,7 +7,7 @@
     gender=female
     image="units/faeries/elynia.png"
     profile="portraits/elynia.webp"
-    halo="halo/elynia-stationary-halo[1~6].png:150"
+    halo="halo/elynia-stationary-halo-[1~6].png:150"
     # initial base hitpoints
     hitpoints=64
     movement_type=elynia_lowfloat
@@ -39,7 +39,7 @@
 Very little is known of her ultimate power, the Union of Light and Darkness once invoked by her and the Master of Darkness against the powerful Demon Lord Zhangor. And now that the Union has been fractured by a cruel twist of fate, it is doubtful that the mystery will ever be elucidated. Nevertheless, the essence of Light continues to radiate from her very skin and provide her with the strength to assist her people in their hour of need."
     die_sound={SOUND_LIST:ELF_FEMALE_HIT}
     [abilities]
-        {ABILITY_SYLVAN_ESSENCE}
+        {ABILITY_SYLVAN_ESSENCE_UNION}
     [/abilities]
     [attack]
         name=staff

units/faeries/Sylvan_Warden.cfg

@@ -7,7 +7,7 @@
     gender=female
     image="units/faeries/elynia.png"
     profile="portraits/elynia.webp"
-    halo="halo/elynia-noillum-stationary-halo[1~6].png:150"
+    halo="halo/elynia-stationary-halo-[1~6].png:150"
     hitpoints=61
     movement_type=elynia_lowfloat
     movement=6
@@ -23,7 +23,7 @@
     description= _ "Elynia’s mastery of faerie magic remains unrivaled on Irdya, even without the legendary power of the Union of Light and Darkness. Always dutiful as the sworn protector of elvenkind and the forests of Irdya, she will do anything to stop those who may threaten her people or upset the delicate balance of nature."
     die_sound={SOUND_LIST:ELF_FEMALE_HIT}
     [abilities]
-        {ABILITY_SYLVAN_ESSENCE_NOUNION}
+        {ABILITY_SYLVAN_ESSENCE}
     [/abilities]
     [attack]
         name=staff