Merge e94d131f39 into 9b4f4aba3c

changelog_entries/add-orc-shaman-to-core

@@ -0,0 +1,10 @@
+### Campaigns
+   * Secrets of the Ancients
+        * Now uses the new core shaman units.
+   * Son of the Black-Eye
+        * Now uses the new core shaman units.
+   * The Deceiver's Gambit
+        * Now uses the new core shaman units.
+### Units
+   * Orcish Adept, Shaman, and Sorceress
+        * New unit line! Magical spellcasters with an arcane draining attack.

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

@@ -85,10 +85,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

@@ -1,12 +1,12 @@
-#textdomain wesnoth-tdg
+#textdomain wesnoth-units
 
 [unit_type]
     id=Orcish Adept
     name=_"Orcish Adept"
     race=orc
     gender=female
-    image="units/orcs/adept.png"
-    profile="portraits/shaman.webp~FL()"
+    image="units/orcs/shaman/adept+female.png"
+    profile="portraits/orcs/shaman+female.webp~FL()"
     hitpoints=31
     movement_type=orcishfoot
     [resistance]
@@ -23,9 +23,9 @@
     usage=archer
     description= _ "Female orcs with spiritual leanings may find themselves inducted into the arts of orcish sorcery. Initially called Adepts, these newly-trained orcs gain a curious influence over the shamanistic forces that separate life from non-life. Directed inwards, this art gives them great resilience against most forms of magic. Directed outwards, it grants them the fearsome power to siphon life from their enemies.
 
-Although physically frail compared to other orcs this shamanistic art makes even a freshly trained Adept a force to be reckoned with on the battlefield."
+Although physically frail compared to other orcs, this shamanistic art makes even a freshly trained Adept a force to be reckoned with on the battlefield."
     die_sound={SOUND_LIST:ORC_DIE}
-    {DEFENSE_ANIM "units/orcs/adept-defend-2.png" "units/orcs/adept-defend-1.png" {SOUND_LIST:ORC_HIT} }
+    {DEFENSE_ANIM "units/orcs/shaman/adept+female-defend-2.png" "units/orcs/shaman/adept+female-defend-1.png" {SOUND_LIST:ORC_HIT} }
     [attack]
         name=staff
         description= _ "staff"
@@ -46,7 +46,7 @@ Although physically frail compared to other orcs this shamanistic art makes even
             {WEAPON_SPECIAL_DRAIN}
             {WEAPON_SPECIAL_MAGICAL}
         [/specials]
-        icon=icons/enervate.png
+        icon=attacks/siphon.png
     [/attack]
     [attack_anim]
         [filter_attack]
@@ -65,10 +65,10 @@ Although physically frail compared to other orcs this shamanistic art makes even
         [/missile_frame]
 
         [frame]
-            image="units/orcs/adept.png:550"
+            image="units/orcs/shaman/adept+female.png:550"
         [/frame]
         [frame]
-            image="units/orcs/adept-magic.png:300"
+            image="units/orcs/shaman/adept+female-magic.png:300"
         [/frame]
 
         [halo1_frame]
@@ -97,9 +97,29 @@ Although physically frail compared to other orcs this shamanistic art makes even
         start_time=-200
 
         [frame]
-            image="units/orcs/adept.png:350"
+            image="units/orcs/shaman/adept.png:350"
         [/frame]
 
         {SOUND:HIT_AND_MISS staff.ogg staff-miss.ogg -125}
     [/attack_anim]
+
+    [male]
+        name= _ "Orcish Adept"
+        image="units/orcs/shaman/adept.png"
+        profile="portraits/orcs/adept.webp~FL()"
+        {DEFENSE_ANIM "units/orcs/shaman/adept-defend-2.png" "units/orcs/shaman/adept-defend-1.png" {SOUND_LIST:ORC_HIT} }
+        [attack_anim]
+            [frame]
+                image="units/orcs/shaman/adept.png:250"
+            [/frame]
+            [frame]
+                image="units/orcs/shaman/adept-magic.png:300"
+            [/frame]
+        [/attack_anim]
+        [attack_anim]
+            [frame]
+                image="units/orcs/shaman/adept.png:350"
+            [/frame]
+        [/attack_anim]
+    [/male]
 [/unit_type]

data/core/units/orcs/Shaman.cfg

@@ -1,12 +1,12 @@
-#textdomain wesnoth-tdg
+#textdomain wesnoth-units
 
 [unit_type]
     id=Orcish Shaman
     name=_"Orcish Shaman"
     race=orc
     gender=female
-    image="units/orcs/shaman.png"
-    profile="portraits/shaman.webp~FL()"
+    image="units/orcs/shaman/shaman+female.png"
+    profile="portraits/orcs/shaman+female.webp~FL()"
     hitpoints=43
     movement_type=orcishfoot
     [resistance]
@@ -19,13 +19,13 @@
     level=2
     alignment=chaotic
     advances_to=Orcish Sorceress
-    cost=37
+    cost=39
     usage=archer
-    description= _ "Like most sapient races, orcs often ponder the workings of the world in which they live. Some endeavor to take this beyond idle musing, but the violent, nomadic lifestyle of the largest orcish clans does not lend itself to academic study, and the rare scholarly orc is invariably killed or enslaved by their more warlike brethren.
+    description= _ "The larger orcish clans traditionally lead a rugged and nomadic lifestyle, one dominated by both inter- and intra-tribal conflict. While this readily lends itself to the training of skilled assassins and fighters, the rare scholarly orc is usually killed or enslaved by their more warlike brethren.
 
-Orcish Shamans are rare exceptions to this rule. Respected among clans and seen as a trustworthy and neutral party, Shamans serve as guardians of orcish wisdom, and advisors in times of crisis — not something orcs tend to otherwise tolerate. By the time an Adept is recognized as a fully-fledged Shaman, she has committed to memory much of the orcs’ collective oral tradition. This much-practiced wisdom has many applications, not least of which is their improved ability to draw life from their foes during battle."
+Orcish Shamans are rare exceptions to this rule. Respected among clans and seen as a trustworthy and neutral party, Shamans serve as guardians of orcish wisdom, and advisors in times of crisis — not something Warlords tend to otherwise tolerate. By the time an Adept is recognized as a fully-fledged Shaman, she has committed to memory much of the orcs’ collective oral tradition. This much-practiced wisdom has many applications, not least of which is their improved ability to draw life from their foes during battle."
     die_sound={SOUND_LIST:ORC_DIE}
-    {DEFENSE_ANIM "units/orcs/shaman-defend-2.png" "units/orcs/shaman-defend-1.png" {SOUND_LIST:ORC_HIT} }
+    {DEFENSE_ANIM "units/orcs/shaman/shaman+female-defend-2.png" "units/orcs/shaman/shaman+female-defend-1.png" {SOUND_LIST:ORC_HIT} }
     [attack]
         name=staff
         description= _ "staff"
@@ -46,7 +46,7 @@ Orcish Shamans are rare exceptions to this rule. Respected among clans and seen
             {WEAPON_SPECIAL_DRAIN}
             {WEAPON_SPECIAL_MAGICAL}
         [/specials]
-        icon=icons/enervate.png
+        icon=attacks/siphon.png
     [/attack]
     [attack_anim]
         [filter_attack]
@@ -65,10 +65,10 @@ Orcish Shamans are rare exceptions to this rule. Respected among clans and seen
         [/missile_frame]
 
         [frame]
-            image="units/orcs/shaman.png:200"
+            image="units/orcs/shaman/shaman+female.png:200"
         [/frame]
         [frame]
-            image="units/orcs/shaman-magic.png:300"
+            image="units/orcs/shaman/shaman+female-magic.png:300"
         [/frame]
 
         [halo1_frame]
@@ -97,9 +97,29 @@ Orcish Shamans are rare exceptions to this rule. Respected among clans and seen
         start_time=-200
 
         [frame]
-            image="units/orcs/shaman.png:350"
+            image="units/orcs/shaman/shaman+female.png:350"
         [/frame]
 
         {SOUND:HIT_AND_MISS staff.ogg staff-miss.ogg -125}
     [/attack_anim]
+
+    [male]
+        name= _ "Orcish Shaman"
+        image="units/orcs/shaman/shaman.png"
+        profile="portraits/orcs/shaman.webp~FL()"
+        {DEFENSE_ANIM "units/orcs/shaman/shaman-defend-2.png" "units/orcs/shaman/shaman-defend-1.png" {SOUND_LIST:ORC_HIT} }
+        [attack_anim]
+            [frame]
+                image="units/orcs/shaman/shaman.png:200"
+            [/frame]
+            [frame]
+                image="units/orcs/shaman/shaman-magic.png:300"
+            [/frame]
+        [/attack_anim]
+        [attack_anim]
+            [frame]
+                image="units/orcs/shaman/shaman.png:350"
+            [/frame]
+        [/attack_anim]
+    [/male]
 [/unit_type]

data/core/units/orcs/Sorceress.cfg

@@ -1,12 +1,12 @@
-#textdomain wesnoth-tdg
+#textdomain wesnoth-units
 
 [unit_type]
     id=Orcish Sorceress
     name=_"Orcish Sorceress"
     race=orc
     gender=female
-    image="units/orcs/sorceress.png"
-    profile="portraits/shaman.webp~FL()"
+    image="units/orcs/shaman/sorceress+female.png"
+    profile="portraits/orcs/shaman+female.webp~FL()"
     hitpoints=55
     movement_type=orcishfoot
     [resistance]
@@ -19,13 +19,13 @@
     level=3
     alignment=chaotic
     advances_to=null {AMLA_DEFAULT}
-    cost=54
+    cost=71
     usage=archer
-    description= _ "Orcs are sometimes capable of living as long as humans, but very few individuals ever fully realize that potential, as the average orc only sees two or three decades before meeting their end either in war or by the hand of one of their kin. Only the Shamans, isolated from the daily strife of the major orcish clans, commonly live to reach old age.
+    description= _ "Orcs are physically capable of living for fifty or more years, but few individuals ever fully realize that potential, as the average orc only sees two or three decades before meeting their end either in war or by the hand of one of their kin. Only the Shamans, isolated from the daily strife of the major orcish clans, commonly reach old age.
 
 The greatest of these elders make up the Great Council, which may arbitrate the many conflicts that arise between clans of their argumentative brethren. Having practiced their mystical art to perfection, these aged orcs are held in the highest respect across the various clans."
     die_sound={SOUND_LIST:ORC_DIE}
-    {DEFENSE_ANIM "units/orcs/sorceress-defend-2.png" "units/orcs/sorceress-defend-1.png" {SOUND_LIST:ORC_HIT} }
+    {DEFENSE_ANIM "units/orcs/shaman/sorceress+female-defend-2.png" "units/orcs/shaman/sorceress+female-defend-1.png" {SOUND_LIST:ORC_HIT} }
     [attack]
         name=staff
         description= _ "staff"
@@ -42,10 +42,10 @@ The greatest of these elders make up the Great Council, which may arbitrate the
         range=melee
         damage=6
         number=2
-        icon=icons/sap.png
         [specials]
             {WEAPON_SPECIAL_DRAIN}
         [/specials]
+        icon=attacks/sap.png
     [/attack]
     [attack]
         name=siphon
@@ -58,7 +58,7 @@ The greatest of these elders make up the Great Council, which may arbitrate the
             {WEAPON_SPECIAL_DRAIN}
             {WEAPON_SPECIAL_MAGICAL}
         [/specials]
-        icon=icons/enervate.png
+        icon=attacks/siphon.png
     [/attack]
     [attack_anim]
         [filter_attack]
@@ -77,13 +77,13 @@ The greatest of these elders make up the Great Council, which may arbitrate the
         [/missile_frame]
 
         [frame]
-            image="units/orcs/sorceress.png:150"
+            image="units/orcs/shaman/sorceress+female.png:150"
         [/frame]
         [frame]
-            image="units/orcs/sorceress-magic-1.png:450"
+            image="units/orcs/shaman/sorceress+female-magic-1.png:450"
         [/frame]
         [frame]
-            image="units/orcs/sorceress-magic-2.png:150"
+            image="units/orcs/shaman/sorceress+female-magic-2.png:150"
         [/frame]
 
         [halo1_frame]
@@ -112,7 +112,7 @@ The greatest of these elders make up the Great Council, which may arbitrate the
         start_time=-200
 
         [frame]
-            image="units/orcs/sorceress.png:350"
+            image="units/orcs/shaman/sorceress+female.png:350"
         [/frame]
 
         {SOUND:HIT_AND_MISS staff.ogg staff-miss.ogg -125}
@@ -123,8 +123,32 @@ The greatest of these elders make up the Great Council, which may arbitrate the
         [/filter_attack]
         start_time=-200
         [frame]
-            image="units/orcs/sorceress.png:350"
+            image="units/orcs/shaman/sorceress+female.png:350"
         [/frame]
         {SOUND:HIT_AND_MISS magicmissile.wav {SOUND_LIST:MISS} -125}
     [/attack_anim]
+
+    [male]
+        name= _ "Orcish Sorcerer"
+        image="units/orcs/shaman/sorcerer.png"
+        profile="portraits/orcs/sorcerer.webp~FL()"
+        {DEFENSE_ANIM "units/orcs/shaman/sorcerer-defend-2.png" "units/orcs/shaman/sorcerer-defend-1.png" {SOUND_LIST:ORC_HIT} }
+        [attack_anim]
+            # Different frames
+            [frame]
+                image="units/orcs/shaman/sorcerer.png:200"
+            [/frame]
+            [frame]
+                image="units/orcs/shaman/sorcerer-magic.png:300"
+            [/frame]
+            [frame]
+                __remove=yes
+            [/frame]
+        [/attack_anim]
+        [attack_anim]
+            [frame]
+                image="units/orcs/shaman/sorcerer.png:350"
+            [/frame]
+        [/attack_anim]
+    [/male]
 [/unit_type]