change orc shamans dmg type

It might be that they do not follow same color map

data/campaigns/Secrets_of_the_Ancients/units/Orcish_Shaman.cfg

@@ -1,101 +0,0 @@
-#textdomain wesnoth-sota
-[unit_type]
-    id=Orcish Shaman
-    name= _ "Orcish Shaman"
-    race=orc
-    image="units/orcish-shaman.png"
-    hitpoints=23
-    movement_type=orcishfoot
-    profile="portraits/orcish-shaman.webp"
-    [defense]
-        village=30
-    [/defense]
-    movement=5
-    experience=50
-    level=1
-    alignment=chaotic
-    advances_to=null
-    {AMLA_DEFAULT}
-    cost=21
-    usage=mixed fighter
-    description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life."
-    die_sound={SOUND_LIST:ORC_DIE}
-    {DEFENSE_ANIM "units/orcish-shaman-defend-2.png" "units/orcish-shaman-defend-1.png" {SOUND_LIST:ORC_HIT} }
-    [attack]
-        name=staff
-        #textdomain wesnoth-units
-        description= _"staff"
-        type=impact
-        range=melee
-        damage=5
-        number=1
-        icon=attacks/druidstaff.png
-    [/attack]
-    [attack]
-        name=curse
-        description= _"curse"
-        #textdomain wesnoth-sota
-        type=pierce
-        range=ranged
-        damage=8
-        number=2
-        [specials]
-            {WEAPON_SPECIAL_DRAIN}
-        [/specials]
-        icon=attacks/curse.png
-    [/attack]
-    [attack_anim]
-        [filter_attack]
-            name=curse
-        [/filter_attack]
-
-        missile_start_time=-200
-        start_time=-350
-        halo1_start_time=-350
-        halo2_start_time=-200
-        sound_start_time=0
-
-        [missile_frame]
-            halo="halo/elven/druid-healing[8~1].png~CS(50,-30,-50):50"
-            offset=1.0~0.0
-        [/missile_frame]
-
-        [frame]
-            image="units/orcish-shaman.png:200"
-        [/frame]
-        [frame]
-            image="units/orcish-shaman-magic.png:300"
-        [/frame]
-
-        [halo1_frame]
-            halo="halo/elven/nature-halo[8~1].png~CS(50,-30,-50)~O([80%*2,60%,40%,30%,20%*3]):75"
-            offset=1.0
-            auto_vflip=no
-            auto_hflip=no
-        [/halo1_frame]
-
-        [halo2_frame]
-            halo="halo/elven/nature-halo[1~8].png~CS(50,-30,-50)~O([20%*3,30%,40%,60%,80%*2]):75"
-            offset=0.0
-            auto_vflip=no
-            auto_hflip=no
-        [/halo2_frame]
-
-        [sound_frame]
-            sound=magicmissile.wav
-        [/sound_frame]
-    [/attack_anim]
-    [attack_anim]
-        [filter_attack]
-            name=staff
-        [/filter_attack]
-
-        start_time=-200
-
-        [frame]
-            image="units/orcish-shaman.png:350"
-        [/frame]
-
-        {SOUND:HIT_AND_MISS staff.ogg staff-miss.ogg -125}
-    [/attack_anim]
-[/unit_type]

data/campaigns/Son_Of_The_Black_Eye/_main.cfg

@@ -77,10 +77,6 @@
     path=data/campaigns/Son_Of_The_Black_Eye
 [/binary_path]
 
-[units]
-    {campaigns/Son_Of_The_Black_Eye/units}
-[/units]
-
 #endif
 
 # wmllint: directory spelling Kapou'e Grüü Rahul Karun

data/campaigns/Son_Of_The_Black_Eye/units/Orcish_Shaman.cfg

@@ -1,159 +0,0 @@
-#textdomain wesnoth-sotbe
-[unit_type]
-    id=Orcish Shaman
-    name= _ "Orcish Shaman"
-    race=orc
-    image="units/orcish-shaman.png"
-    hitpoints=23
-    movement_type=orcishfoot
-    [defense]
-        village=30
-    [/defense]
-    movement=5
-    experience=50
-    level=1
-    alignment=chaotic
-    advances_to=null
-    {AMLA_DEFAULT}
-    cost=21
-    usage=archer
-    description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life."
-    die_sound={SOUND_LIST:ORC_DIE}
-    {DEFENSE_ANIM "units/orcish-shaman-defend-2.png" "units/orcish-shaman-defend-1.png" {SOUND_LIST:ORC_HIT} }
-    [attack]
-        name=staff
-        #textdomain wesnoth-units
-        description= _"staff"
-        type=impact
-        range=melee
-        damage=5
-        number=1
-        icon=attacks/druidstaff.png
-    [/attack]
-    [attack]
-        name=curse
-        description= _"curse"
-        #textdomain wesnoth-sotbe
-        type=pierce
-        range=ranged
-        damage=8
-        number=2
-        [specials]
-            {WEAPON_SPECIAL_DRAIN}
-        [/specials]
-        icon=attacks/curse.png
-    [/attack]
-    [attack_anim]
-        [filter_attack]
-            name=curse
-        [/filter_attack]
-
-        missile_start_time=-200
-        start_time=-350
-        halo1_start_time=-350
-        halo2_start_time=-200
-        sound_start_time=0
-
-        [missile_frame]
-            halo="halo/elven/druid-healing[8~1].png~CS(50,-30,-50):50"
-            offset=1.0~0.0
-        [/missile_frame]
-
-        [frame]
-            image="units/orcish-shaman.png:200"
-        [/frame]
-        [frame]
-            image="units/orcish-shaman-magic.png:300"
-        [/frame]
-
-        [halo1_frame]
-            halo="halo/elven/nature-halo[8~1].png~CS(50,-30,-50)~O([80%*2,60%,40%,30%,20%*3]):75"
-            offset=1.0
-            auto_vflip=no
-            auto_hflip=no
-        [/halo1_frame]
-
-        [halo2_frame]
-            halo="halo/elven/nature-halo[1~8].png~CS(50,-30,-50)~O([20%*3,30%,40%,60%,80%*2]):75"
-            offset=0.0
-            auto_vflip=no
-            auto_hflip=no
-        [/halo2_frame]
-
-        [sound_frame]
-            sound=magicmissile.wav
-        [/sound_frame]
-    [/attack_anim]
-    [attack_anim]
-        [filter_attack]
-            name=staff
-        [/filter_attack]
-
-        start_time=-200
-
-        [frame]
-            image="units/orcish-shaman.png:350"
-        [/frame]
-
-        {SOUND:HIT_AND_MISS staff.ogg staff-miss.ogg -125}
-    [/attack_anim]
-
-    [variation]
-        # Variations are ordered by variadtion_id
-        variation_id=adolescent
-        variation_name= _ "variation^Novice"
-        inherit=yes
-        image="units/novice-orcish-shaman.png"
-        hitpoints=24 # +1
-        description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life. Novice Shamans are still young and vigorous, but their spell-casting ability still needs improvement."
-        {DEFENSE_ANIM "units/novice-orcish-shaman-defend-2.png" "units/novice-orcish-shaman-defend-1.png" {SOUND_LIST:ORC_HIT} }
-        [attack]
-            damage=6 # +1
-        [/attack]
-        [attack]
-            damage=7 # -1
-        [/attack]
-        [attack_anim]
-            [frame]
-                image="units/novice-orcish-shaman.png:200"
-            [/frame]
-            [frame]
-                image="units/novice-orcish-shaman-magic.png:300"
-            [/frame]
-        [/attack_anim]
-        [attack_anim]
-            [frame]
-                image="units/novice-orcish-shaman.png:350"
-            [/frame]
-        [/attack_anim]
-    [/variation]
-
-    [variation]
-        variation_id=old
-        variation_name= _ "variation^Elder"
-        image="units/elder-orcish-shaman.png"
-        inherit=yes
-        hitpoints=22 # -1
-        description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life. Old Orcish Shamans are shamans that have mastered magic, although their physical strength has declined with age."
-        {DEFENSE_ANIM "units/elder-orcish-shaman-defend-2.png" "units/elder-orcish-shaman-defend-1.png" {SOUND_LIST:ORC_HIT} }
-        [attack]
-            damage=4 # -1
-        [/attack]
-        [attack]
-            damage=9 # +1
-        [/attack]
-        [attack_anim]
-            [frame]
-                image="units/elder-orcish-shaman.png:200"
-            [/frame]
-            [frame]
-                image="units/elder-orcish-shaman-magic.png:300"
-            [/frame]
-        [/attack_anim]
-        [attack_anim]
-            [frame]
-                image="units/elder-orcish-shaman.png:350"
-            [/frame]
-        [/attack_anim]
-    [/variation]
-[/unit_type]

data/campaigns/Son_Of_The_Black_Eye/utils/deaths.cfg

@@ -10,7 +10,7 @@
     [event]
         name=last breath
         [filter]
-            type=Orcish Shaman
+            type=Orcish Shaman,Orcish Adept,Orcish Sorceress
         [/filter]
         [message]
             speaker=unit

data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg

@@ -5,15 +5,14 @@
         id={ID_STRING}
         name={NAME_STRING}
         unrenamable=yes
-        type=Orcish Shaman
-        variation=old
-        profile=portraits/old_orcish_shaman.webp
+        type=Orcish Sorceress
         side={SIDE}
         x={X}
         y={Y}
         random_traits=no
         [modifications]
             {TRAIT_LOYAL_HERO}
+            {TRAIT_AGED}
         [/modifications]
     [/unit]
 #enddef
@@ -23,9 +22,7 @@
         id={ID_STRING}
         name={NAME_STRING}
         unrenamable=yes
-        type=Orcish Shaman
-        variation=adolescent
-        profile=portraits/young_orcish_shaman.webp
+        type=Orcish Adept
         side={SIDE}
         x={X}
         y={Y}
@@ -42,7 +39,6 @@
         name={NAME_STRING}
         unrenamable=yes
         type=Orcish Shaman
-        profile=portraits/orcish_shaman.webp
         side={SIDE}
         x={X}
         y={Y}

data/core/units/orcs/Adept.cfg

@@ -0,0 +1,124 @@
+#textdomain wesnoth-units
+
+[unit_type]
+    id=Orcish Adept
+    name= _ "female^Orcish Adept"
+    race=orc
+    gender=male,female
+    image="units/orcs/shamans/shaman.png"
+    bar_offset_x=-1
+    profile="portraits/orcs/adept.webp"
+    hitpoints=25
+    movement_type=orcishfoot
+    [defense]
+        village=30
+        fungus=50
+    [/defense]
+    movement=5
+    experience=43
+    level=1
+    alignment=chaotic
+    advances_to=Orcish Shaman
+    cost=20
+    usage=archer
+    description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life. Adepts are the novice shamans, still young and vigorous, but their spell-casting ability still needs improvement."
+    die_sound={SOUND_LIST:ORC_DIE}
+    {DEFENSE_ANIM "units/orcs/shamans/adept+female-defend-2.png" "units/orcs/shamans/adept+female-defend-1.png" {SOUND_LIST:ORC_HIT} }
+    [attack]
+        name=staff
+        description= _ "staff"
+        type=impact
+        range=melee
+        damage=5
+        number=1
+        icon=attacks/druidstaff.png
+    [/attack]
+    [attack]
+        name=curse
+        description= _ "curse"
+        type=arcane
+        range=ranged
+        # drain works best when using only 8 / 10 / 16 / 18 for "damage", as rounding down is avoided
+        damage=8
+        number=2
+        [specials]
+            {WEAPON_SPECIAL_MAGICAL}
+            {WEAPON_SPECIAL_DRAIN}
+        [/specials]
+        icon=attacks/curse.png
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=curse
+        [/filter_attack]
+
+        missile_start_time=-200
+        start_time=-350
+        halo1_start_time=-350
+        halo2_start_time=-200
+        sound_start_time=0
+
+        [missile_frame]
+            halo="halo/elven/druid-healing[8~1].png~CS(50,-30,-50):50"
+            offset=1.0~0.0
+        [/missile_frame]
+
+        [frame]
+            image="units/orcs/shamans/adept+female.png:550"
+        [/frame]
+        [frame]
+            image="units/orcs/shamans/adept+female-magic.png:300"
+        [/frame]
+
+        [halo1_frame]
+            halo="halo/elven/nature-halo[8~1].png~CS(50,-30,-50)~O([80%*2,60%,40%,30%,20%*3]):75"
+            offset=1.0
+            auto_vflip=no
+            auto_hflip=no
+        [/halo1_frame]
+
+        [halo2_frame]
+            halo="halo/elven/nature-halo[1~8].png~CS(50,-30,-50)~O([20%*3,30%,40%,60%,80%*2]):75"
+            offset=0.0
+            auto_vflip=no
+            auto_hflip=no
+        [/halo2_frame]
+
+        [sound_frame]
+            sound=magicmissile.wav
+        [/sound_frame]
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=staff
+        [/filter_attack]
+
+        start_time=-200
+
+        [frame]
+            image="units/orcs/shamans/adept+female.png:350"
+        [/frame]
+
+        {SOUND:HIT_AND_MISS staff.ogg staff-miss.ogg -125}
+    [/attack_anim]
+
+    [male]
+        name= _ "Orcish Adept"
+        image="units/orcs/shamans/adept.png"
+        bar_offset_x=-4
+        {DEFENSE_ANIM "units/orcs/shamans/adept-defend-2.png" "units/orcs/shamans/adept-defend-1.png" {SOUND_LIST:ORC_HIT} }
+        [attack_anim]
+            [frame]
+                image="units/orcs/shamans/adept.png:250"
+            [/frame]
+            [frame]
+                image="units/orcs/shamans/adept-magic.png:300"
+            [/frame]
+        [/attack_anim]
+        [attack_anim]
+            [frame]
+                image="units/orcs/shamans/adept.png:350"
+            [/frame]
+        [/attack_anim]
+    [/male]
+[/unit_type]

data/core/units/orcs/Shaman.cfg

@@ -0,0 +1,124 @@
+#textdomain wesnoth-units
+
+[unit_type]
+    id=Orcish Shaman
+    name= _ "female^Orcish Shaman"
+    race=orc
+    gender=male,female
+    image="units/orcs/shamans/shaman+female.png"
+    bar_offset_x=-5
+    profile="portraits/orcs/shaman.webp"
+    hitpoints=37
+    movement_type=orcishfoot
+    [defense]
+        village=30
+        fungus=50
+    [/defense]
+    movement=5
+    experience=90
+    level=2
+    alignment=chaotic
+    advances_to=Orcish Sorceress
+    cost=29
+    usage=archer
+    description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life."
+    die_sound={SOUND_LIST:ORC_DIE}
+    {DEFENSE_ANIM "units/orcs/shamans/shaman+female-defend-2.png" "units/orcs/shamans/shaman+female-defend-1.png" {SOUND_LIST:ORC_HIT} }
+    [attack]
+        name=staff
+        description= _ "staff"
+        type=impact
+        range=melee
+        damage=8
+        number=1
+        icon=attacks/druidstaff.png
+    [/attack]
+    [attack]
+        name=curse
+        description= _ "curse"
+        type=arcane
+        range=ranged
+        # drain works best when using only 8 / 10 / 16 / 18 for "damage", as rounding down is avoided
+        damage=8
+        number=3
+        [specials]
+            {WEAPON_SPECIAL_MAGICAL}
+            {WEAPON_SPECIAL_DRAIN}
+        [/specials]
+        icon=attacks/curse.png
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=curse
+        [/filter_attack]
+
+        missile_start_time=-200
+        start_time=-350
+        halo1_start_time=-350
+        halo2_start_time=-200
+        sound_start_time=0
+
+        [missile_frame]
+            halo="halo/elven/druid-healing[8~1].png~CS(50,-30,-50):50"
+            offset=1.0~0.0
+        [/missile_frame]
+
+        [frame]
+            image="units/orcs/shamans/shaman+female.png:200"
+        [/frame]
+        [frame]
+            image="units/orcs/shamans/shaman+female-magic.png:300"
+        [/frame]
+
+        [halo1_frame]
+            halo="halo/elven/nature-halo[8~1].png~CS(50,-30,-50)~O([80%*2,60%,40%,30%,20%*3]):75"
+            offset=1.0
+            auto_vflip=no
+            auto_hflip=no
+        [/halo1_frame]
+
+        [halo2_frame]
+            halo="halo/elven/nature-halo[1~8].png~CS(50,-30,-50)~O([20%*3,30%,40%,60%,80%*2]):75"
+            offset=0.0
+            auto_vflip=no
+            auto_hflip=no
+        [/halo2_frame]
+
+        [sound_frame]
+            sound=magicmissile.wav
+        [/sound_frame]
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=staff
+        [/filter_attack]
+
+        start_time=-200
+
+        [frame]
+            image="units/orcs/shamans/shaman+female.png:350"
+        [/frame]
+
+        {SOUND:HIT_AND_MISS staff.ogg staff-miss.ogg -125}
+    [/attack_anim]
+
+    [male]
+        name= _ "Orcish Shaman"
+        image="units/orcs/shamans/shaman.png"
+        bar_offset_x=-7
+        {DEFENSE_ANIM "units/orcs/shamans/shaman-defend-2.png" "units/orcs/shamans/shaman-defend-1.png" {SOUND_LIST:ORC_HIT} }
+        [attack_anim]
+            [frame]
+                image="units/orcs/shamans/shaman.png:200"
+            [/frame]
+            [frame]
+                image="units/orcs/shamans/shaman-magic.png:300"
+            [/frame]
+        [/attack_anim]
+        [attack_anim]
+            [frame]
+                image="units/orcs/shamans/shaman.png:350"
+            [/frame]
+        [/attack_anim]
+    [/male]
+[/unit_type]

data/core/units/orcs/Sorceress.cfg

@@ -0,0 +1,132 @@
+#textdomain wesnoth-units
+
+[unit_type]
+    id=Orcish Sorceress
+    name= _ "female^Orcish Sorceress"
+    race=orc
+    gender=male,female
+    image="units/orcs/shamans/sorceress+female.png"
+    bar_offset_x=-11
+    profile="portraits/orcs/sorceress.webp"
+    hitpoints=51
+    movement_type=orcishfoot
+    [defense]
+        village=30
+        fungus=50
+    [/defense]
+    movement=5
+    experience=150
+    level=3
+    alignment=chaotic
+    advances_to=null
+    {AMLA_DEFAULT}
+    cost=43
+    usage=archer
+    description= _ "Orcish Shamans are the guardians of orcish magic. Respected among orcish tribes, they form the Orcish Council, which makes important decisions for the whole Orcish community and arbitrates the many conflicts that arise between tribes of this argumentative race. Although physically weak (for orcs), Orcish Shamans are good spell casters and can curse their enemies, draining their life. Sorceresses are shamans that have mastered magic, although their physical strength often declines with age."
+    die_sound={SOUND_LIST:ORC_DIE}
+    {DEFENSE_ANIM "units/orcs/shamans/sorceress+female-defend-2.png" "units/orcs/shamans/sorceress+female-defend-1.png" {SOUND_LIST:ORC_HIT} }
+    [attack]
+        name=staff
+        description= _ "staff"
+        type=impact
+        range=melee
+        damage=8
+        number=2
+        icon=attacks/druidstaff.png
+    [/attack]
+    [attack]
+        name=curse
+        description= _ "curse"
+        type=arcane
+        range=ranged
+        # drain works best when using only 8 / 10 / 16 / 18 for "damage", as rounding down is avoided
+        damage=10
+        number=3
+        [specials]
+            {WEAPON_SPECIAL_MAGICAL}
+            {WEAPON_SPECIAL_DRAIN}
+        [/specials]
+        icon=attacks/curse.png
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=curse
+        [/filter_attack]
+
+        missile_start_time=-200
+        start_time=-350
+        halo1_start_time=-350
+        halo2_start_time=-200
+        sound_start_time=0
+
+        [missile_frame]
+            halo="halo/elven/druid-healing[8~1].png~CS(50,-30,-50):50"
+            offset=1.0~0.0
+        [/missile_frame]
+
+        [frame]
+            image="units/orcs/shamans/sorceress+female.png:150"
+        [/frame]
+        [frame]
+            image="units/orcs/shamans/sorceress+female-magic-1.png:450"
+        [/frame]
+        [frame]
+            image="units/orcs/shamans/sorceress+female-magic-2.png:150"
+        [/frame]
+
+        [halo1_frame]
+            halo="halo/elven/nature-halo[8~1].png~CS(50,-30,-50)~O([80%*2,60%,40%,30%,20%*3]):75"
+            offset=1.0
+            auto_vflip=no
+            auto_hflip=no
+        [/halo1_frame]
+
+        [halo2_frame]
+            halo="halo/elven/nature-halo[1~8].png~CS(50,-30,-50)~O([20%*3,30%,40%,60%,80%*2]):75"
+            offset=0.0
+            auto_vflip=no
+            auto_hflip=no
+        [/halo2_frame]
+
+        [sound_frame]
+            sound=magicmissile.wav
+        [/sound_frame]
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=staff
+        [/filter_attack]
+
+        start_time=-200
+
+        [frame]
+            image="units/orcs/shamans/sorceress+female.png:350"
+        [/frame]
+
+        {SOUND:HIT_AND_MISS staff.ogg staff-miss.ogg -125}
+    [/attack_anim]
+
+    [male]
+        name= _ "Orcish Sorcerer"
+        image="units/orcs/shamans/sorcerer.png"
+        bar_offset_x=-4
+        {DEFENSE_ANIM "units/orcs/shamans/sorcerer-defend-2.png" "units/orcs/shamans/sorcerer-defend-1.png" {SOUND_LIST:ORC_HIT} }
+        [attack_anim]
+            # Different frames
+            [frame]
+                image="units/orcs/shamans/sorcerer.png:200"
+            [/frame]
+            [frame]
+                image="units/orcs/shamans/sorcerer-magic.png:300"
+            [/frame]
+            [frame]
+                __remove=yes
+            [/frame]
+        [/attack_anim]
+        [attack_anim]
+            [frame]
+                image="units/orcs/shamans/sorcerer.png:350"
+            [/frame]
+        [/attack_anim]
+    [/male]
+[/unit_type]