Dunefolk faction rework by various people

Changelog provided by @ghype below. Additional credits at the end.
=================================================================================================

*Art*
Most of units were reworked - some more some less - but our goal was to make them fit for mainline all together.
If any changes are needed to any unit, then we gladly execute those. There have been months worth of progress
documented in the according art thread for this project.

Base Units: https://forums.wesnoth.org/viewtopic.php?f=9&t=49075
Extra Units: https://forums.wesnoth.org/viewtopic.php?f=9&t=49625

*Balance*
The main reason why this project started in the first place. Here as well we have all the progress for balancing
Dunefolk documented and all developers and users interested in this project and seemed to agree on the current
state of balance. Thats the reason why we will not enlist all the changes here. If there are any problems with
the balance, then we too are willing to provide alternatives that can be discussed either here or on forum.

Balance Thread: https://forums.wesnoth.org/viewtopic.php?f=15&t=49627

*Alignment*
The balance of this faction was based on the newly proposed liminal alignment which works as +0/+0/+25/+0/+0/+25
instead of the old -25/-25/+0/-25/-25/+0

*Weapon Portraits*
As Dunefolk features entirely new units, we found some weapon portraits that fits the attacks of certain units.
The portrait - called „blade-curved“ is a franken but a convincing one. As the current blow pipe for UtbS is a
franken as well, this new weapon portrait should good enough to be mainlined as well. If this request get’s denied,
then we are free to provide alternatives as well. It just fits very well the theme of exotic Naga weapon
craftsmanship without relying on the orcish theme. It used for the following two units:

Lv2 Naga Bladewhirler
Lv3 Naga Dervish

*Descriptions*
New unit concepts require changes and new units require entirely new descriptions. We enlisted all problems and
inconsistencies that resulted with the rework and provided either solutions for them or new descriptions. Yumi
already started doing them but for those who want to see the initial conflicts, here you can find all the problems
displayed:

Unit Descriptions: https://forums.wesnoth.org/viewtopic.php?f=32&t=49867#p642698

*Female Dunefolk Names*
With the introduction of female units to this faction, we would require female names as well. Apparently this was
already coded in mainline, but simple not used.

*Future Plans - Animations*
There are some recourses from past works that allow us to - more or less - easily animate most of Dunefolk units.
The animations range from idle to attack-only, while other units will be fully animated. Some of the units that
are harder to animate will first receive single attack/defend frames until animation concepts were agreed upon.
Our goal is to make Dunefolk as alive as possible.

*Future Plans - Theme, Sound FX*
Rather unimportant to most people but I am interested to add some new sound fx that can start with different hit/death
sounds or new weapon sounds for scimitars. Those are just example and I do not know what I will end up with. But I know
that I will compose a Dunefolk Theme at some point. Using your feedback, I am sure I can manage to create something that
fits the faction the best.

*Future Plans - Wyvern Rider*
This is the only unit is the only one that did not get touched or reworked. The wyvern on it self looks amazing an does
not need any rework but the rider does not really fit thematically anymore, not to mention the weapon is too oversized
and not the usual Wesnoth style. But I won’t touch this sprite until it actually will be needed, most likely - IF -
there is ever going to be a mainline Dunefolk campaign.

*Credits*
I don’t know how detailed you need this to be but here all contributors.
ghype, Hejnewar, Krogen, The_Gnat, Lordlewis, EarthCake, Tom_Of_Wesnoth

It is however important to mention that the amount of contributions of each varies a lot in different categories. I will
organise it a bit and you make use of this info how ever you want. The names are in order of the amount of work put in.

Art: ghype, The_Gnat, Lordlewis
Balance: Hejnewar, Krogen, ghype, The_Gnat
Descriptions: Tom_Of_Wesnoth, Hejnewar

Earthcake joined us in the end and helped us finishing this project by cleaning/finishing the codes and doing all the git
stuff together with The_Gnat. Although none of his work can be categorised in one of the three categories, he still deserves
to be credit in one way or another.

Thanks for your time and efforts.

data/core/about.cfg

@@ -1485,6 +1485,9 @@
     [entry]
         name = "newfrenchy88"
     [/entry]
+    [entry]
+        name = "Niall Burton (Leonard03)"
+    [/entry]
     [entry]
         name = "niegenug"
     [/entry]

data/core/macros/abilities.cfg

@@ -75,6 +75,19 @@ This ability will not cure an affected unit of poison, however, only delay its e
     [/regenerate]
 #enddef
 
+#define ABILITY_SELF_HEAL
+    # Canned definition of the regenerate 4 hp ability, to be included in an [abilities] clause.
+    [heals]
+        value=4
+        id=regenerates_4
+        name= _ "regenerates +4"
+        female_name= _ "female^regenerates +4"
+        description= _ "The unit will heal itself 4 HP per turn. If it is poisoned, it will remove the poison instead of healing."
+        affect_self=yes
+        poison=cured
+    [/heals]
+#enddef
+
 #define ABILITY_STEADFAST
     # Canned definition of the Steadfast ability to be included in an [abilities]
     # clause.

data/core/units.cfg

@@ -205,7 +205,7 @@ The eastern provinces of Wesnoth, known as the Clan Homelands, have a geography
         {HUMAN_NAMES}
     [/race]
 
-    # wmllint: general spellings Dunefolk 
+    # wmllint: general spellings Dunefolk
     # wmllint: general spelling liminal
     [race]
         id=dunefolk
@@ -1485,7 +1485,7 @@ The life span of the wose is unknown, although the most ancient members of this
             reef=70
             swamp_water=70
             flat=60
-            sand=50
+            sand=60
             forest=60
             hills=40
             mountains=40
@@ -1493,11 +1493,53 @@ The life span of the wose is unknown, although the most ancient members of this
             castle=40
             cave=60
             frozen=80
-            fungus=60
+            fungus=50
         [/defense]
         [resistance]
-            blade=90
+            blade=100
             pierce=100
+            impact=100
+            fire=100
+            cold=100
+            arcane=80
+        [/resistance]
+    [/movetype]
+
+    [movetype]
+        name=duneelusivefoot
+        [movement_costs]
+            shallow_water=3
+            reef=2
+            swamp_water=2
+            flat=1
+            sand=1
+            forest=2
+            hills=2
+            mountains=2
+            village=1
+            castle=1
+            cave=2
+            frozen=3
+            fungus=2
+        [/movement_costs]
+        [defense]
+            shallow_water=70
+            reef=60
+            swamp_water=70
+            flat=50
+            sand=40
+            forest=40
+            hills=40
+            mountains=40
+            village=40
+            castle=40
+            cave=60
+            frozen=80
+            fungus=40
+        [/defense]
+        [resistance]
+            blade=110
+            pierce=110
             impact=110
             fire=100
             cold=100
@@ -1527,10 +1569,10 @@ The life span of the wose is unknown, although the most ancient members of this
             reef=70
             swamp_water=70
             flat=60
-            sand=50
+            sand=60
             forest=60
-            hills=40
+            hills=50
-            mountains=60
+            mountains=50
             village=50
             castle=40
             cave=60
@@ -1542,7 +1584,7 @@ The life span of the wose is unknown, although the most ancient members of this
             pierce=80
             impact=110
             fire=100
-            cold=100
+            cold=110
             arcane=80
         [/resistance]
     [/movetype]
@@ -1557,32 +1599,32 @@ The life span of the wose is unknown, although the most ancient members of this
             sand=1
             forest=3
             hills=2
-            mountains=4
+            mountains=3
             village=1
             castle=1
-            cave=4
+            cave=3
             frozen=2
-            fungus=4
+            fungus=3
         [/movement_costs]
         [defense]
             shallow_water=80
             reef=70
             swamp_water=80
             flat=60
-            sand=50
+            sand=60
             forest=60
             hills=40
-            mountains=60
+            mountains=40
             village=60
-            castle=60
+            castle=40
-            cave=80
+            cave=70
             frozen=70
-            fungus=80
+            fungus=60
         [/defense]
         [resistance]
-            blade=90
+            blade=100
-            pierce=110
+            pierce=120
-            impact=100
+            impact=90
             fire=100
             cold=100
             arcane=80
@@ -1599,32 +1641,34 @@ The life span of the wose is unknown, although the most ancient members of this
             sand=1
             forest=3
             hills=2
+            mountains=4
             village=1
             castle=1
-            cave=4
+            cave=3
             frozen=2
-            fungus=4
+            fungus=3
         [/movement_costs]
         [defense]
             shallow_water=80
             reef=70
             swamp_water=80
             flat=60
-            sand=50
+            sand=60
-            forest=60
+            forest=70
-            hills=50
+            hills=40
+            mountains=60
             village=60
             castle=50
-            cave=80
+            cave=70
             frozen=70
-            fungus=80
+            fungus=70
         [/defense]
         [resistance]
-            blade=70
+            blade=80
-            pierce=100
+            pierce=120
-            impact=90
+            impact=80
             fire=100
-            cold=120
+            cold=100
             arcane=80
         [/resistance]
     [/movetype]

data/core/units/dunefolk/Alchemist.cfg

@@ -0,0 +1,77 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Dune Alchemist
+    name= _ "Dune Alchemist"
+    race=dunefolk
+    image="units/dunefolk/alchemist.png"
+    profile="portraits/dunefolk/herbalist.png"
+    hitpoints=41
+    movement_type=dunefoot
+    movement=5
+    experience=100
+    level=2
+    alignment=liminal
+    advances_to=null
+    {AMLA_DEFAULT}
+    cost=33
+    usage=fighter
+    [abilities]
+        {ABILITY_REGENERATES}
+    [/abilities]
+    description= _ "To the Dunefolk, alchemy is less a form of philosophy or science, and more of an extension of the phytology that is practiced by herbalists. However, in contrast to their brethrens’ focus on herbs for medicine and healing, Alchemists utilize various plants and naturally occurring venoms to concoct potent poisons. Though useful for weakening tough enemies, the Alchemists’ art is viewed warily by other Dunefolk, for it is often employed for espionage and assassination. Nevertheless, almost every caravan will contain at least one Alchemist for precisely this reason — the political advantage from the threat of nearly untraceable poisons is not to be underestimated."+{SPECIAL_NOTES}+{SPECIAL_NOTES_POISON}+{SPECIAL_NOTES_REGENERATES}
+    die_sound={SOUND_LIST:HUMAN_DIE}
+    {DEFENSE_ANIM "units/dunefolk/alchemist.png" "units/dunefolk/alchemist.png" {SOUND_LIST:HUMAN_HIT} }
+
+    [resistance]
+        blade=110
+    [/resistance]
+
+    [attack]
+        name=mace
+        description= _ "mace"
+        type=impact
+        range=melee
+        damage=9
+        number=3
+        icon=attacks/quarterstaff.png
+    [/attack]
+    [attack]
+        name=blowgun
+        description= _"blowgun"
+        type=pierce
+        range=ranged
+        damage=7
+        number=2
+        icon=attacks/blowgun.png
+        [specials]
+            {WEAPON_SPECIAL_POISON}
+        [/specials]
+    [/attack]
+
+    [attack_anim]
+        [filter_attack]
+            name=mace
+        [/filter_attack]
+        start_time=-200
+        [frame]
+            image="units/dunefolk/apothecary.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=blowgun
+        [/filter_attack]
+        missile_start_time=-150
+        [missile_frame]
+            duration=150
+            image="projectiles/bullet.png"
+            image_diagonal="projectiles/bullet.png"
+        [/missile_frame]
+        start_time=-300
+        [frame]
+            image="units/dunefolk/apothecary.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS bow.ogg bow-miss.ogg -380}
+    [/attack_anim]
+[/unit_type]

data/core/units/dunefolk/Apothecary.cfg

@@ -8,40 +8,43 @@
     hitpoints=39
     movement_type=dunefoot
     [abilities]
-        {ABILITY_CURES}
+        {ABILITY_EXTRA_HEAL}
-        {ABILITY_REGENERATES}
+        {ABILITY_SELF_HEAL}
     [/abilities]
     movement=5
     experience=100
     level=2
     alignment=liminal
-    advances_to=null
+    advances_to=Dune Luminary
-    {AMLA_DEFAULT}
     cost=33
     usage=fighter
-    description= _ "Some men excel at medicine the way others do at strength of arms, and the Apothecaries are those whose knowledge is without peer outside of the Dunefolk. Their remedies can not only heal wounds but remove infection and poison as well, often to the disbelief of the injured. Hardened by years of travels, many are able to treat themselves."+{SPECIAL_NOTES}+{SPECIAL_NOTES_CURES}+{SPECIAL_NOTES_REGENERATES}
+    description= _ "Even in the absence of battle, infection and injury are common plights in the harsh desert sands. Dunefolk healers, in particular, require vast knowledge of herbs and medicine in comparison with healers of other races; the lack of magic combined with the meager plantlife in the desert results in great difficulty in treating the plethora of ailments and poisons that plague the dune peoples. Apothecaries are typically more knowledgeable and well-traveled compared to their less experienced brethren, but the title is usually applied to those who undertake the complex task of tending to valuable medicinal plants. The Dunefolk have no means of healing without the necessary materials, and thus Apothecaries possess a special role in supporting the remedial arts of their kind."+{SPECIAL_NOTES}+{SPECIAL_NOTES_EXTRA_HEAL}+{SPECIAL_NOTES_REGENERATES} 
-    die_sound={SOUND_LIST:ELF_HIT}
+    die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/dunefolk/apothecary.png" "units/dunefolk/apothecary.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/apothecary.png" "units/dunefolk/apothecary.png" {SOUND_LIST:HUMAN_HIT} }
+
+    [resistance]
+        blade=110
+        pierce=90
+    [/resistance]
+
     [attack]
         name=mace
         description= _ "mace"
         type=impact
         range=melee
-        damage=7
+        damage=6
-        number=3
+        number=4
+        icon=attacks/mace.png
     [/attack]
 
     [attack_anim]
         [filter_attack]
             name=mace
         [/filter_attack]
-
         start_time=-200
-
         [frame]
             image="units/dunefolk/apothecary.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Blademaster.cfg

@@ -4,11 +4,8 @@
     name= _ "Dune Blademaster"
     race=dunefolk
     image="units/dunefolk/blademaster.png"
-    hitpoints=70
+    hitpoints=69
     movement_type=dunearmoredfoot
-    [resistance]
-        cold=110
-    [/resistance]
     movement=5
     experience=150
     level=3
@@ -17,32 +14,31 @@
     {AMLA_DEFAULT}
     cost=52
     usage=fighter
-    description= _ "Distinguished for their bravery and skill, Blademasters are the leaders among the Dunefolk's ranks. Their exploits are well known among their cohorts, inspiring soldiers to fight for their cause. Despite this, they are often found leading from the front, taking down their foes with sword and shield."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}+{SPECIAL_NOTES_SLOW}
+    description= _ "Dunefolk swordsmen are known for playing a game called the ‘Laeqad Challenge’, in which Laeqads—thick, sturdy reeds that are several sword-lengths in height—are hurled at them like javelins and they attempt to split the reed length-wise in midair. The trick to the game is that the reed is not circularly symmetric: most of the stalk is quite hard, but there is a thin line across the cross section that is softer and easier to cut. For even an experienced swordsman, splitting an entire Laeqad down its length would be an extraordinary achievement; most would be hard-pressed to cut even a single sword length, given the precise aim required to line up the blade with the reed’s soft spot. For a Blademaster, however, splitting several Laeqads in quick succession is quite ordinary, and some are even able to cut through two or three reeds simultaneously with a single sword swish.
-    die_sound={SOUND_LIST:ELF_HIT}
+
-    {DEFENSE_ANIM "units/dunefolk/blademaster.png" "units/dunefolk/blademaster.png" {SOUND_LIST:ELF_HIT} }
+This game has more practical implications in real battles. No matter how elusive or well-armored the fighter, against a Blademaster, it often seems like the defense does not even exist. These warriors are undoubtedly the masters of offensive swordsmanship and are capable of subverting even the strongest fortifications."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}
-    {TRAIT_FEARLESS}
+    die_sound={SOUND_LIST:HUMAN_DIE}
+    {DEFENSE_ANIM "units/dunefolk/blademaster.png" "units/dunefolk/blademaster.png" {SOUND_LIST:HUMAN_HIT} }
+
     [attack]
         name=sword
-        description= _ "sword"
+        description= _ "scimitar"
-        icon=attacks/longsword.png
         type=blade
         range=melee
-        damage=13
+        damage=15
         number=3
-        [specials]
+        icon=attacks/scimitar.png
-            {WEAPON_SPECIAL_MARKSMAN}
-        [/specials]
     [/attack]
     [attack]
-        name=shield bash
+        name=sword
-        description= _ "shield bash"
+        description= _ "scimitar"
-        icon=attacks/heater-shield.png #TODO: add "correct" shield form!
+        type=blade
-        type=impact
         range=melee
-        damage=11
+        damage=18
         number=2
+        icon=attacks/scimitar.png
         [specials]
-            {WEAPON_SPECIAL_SLOW}
+            {WEAPON_SPECIAL_MARKSMAN}
         [/specials]
     [/attack]
 
@@ -50,26 +46,10 @@
         [filter_attack]
             name=sword
         [/filter_attack]
-
         start_time=-200
-
         [frame]
             image="units/dunefolk/blademaster.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
     [/attack_anim]
-    [attack_anim]
-        [filter_attack]
-            name=shield bash
-        [/filter_attack]
-
-        start_time=-200
-
-        [frame]
-            image="units/dunefolk/blademaster.png:300"
-        [/frame]
-
-        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
-    [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Burner.cfg

@@ -3,66 +3,61 @@
     id=Dune Burner
     name= _ "Dune Burner"
     race=dunefolk
-    ignore_race_traits=yes
+    gender=male,female
-    {TRAIT_QUICK}
-    {TRAIT_INTELLIGENT}
-    {TRAIT_RESILIENT}
     image="units/dunefolk/burner.png"
-    hitpoints=31
+    hitpoints=34
     movement_type=dunefoot
-    [resistance]
-        cold=120
-    [/resistance]
     movement=5
-    experience=44
+    experience=40
     level=1
     alignment=lawful
     advances_to=Dune Scorcher
-    cost=19
+    cost=17
     usage=archer
-    description= _ "Utilizing various resources found in the Dunefolk domain, a highly flammable substance can be made. The Burners are those charged with making and carrying this dangerous mixture into battle. While the use of fire in warfare is not a novel concept, the effectiveness of their work is."
+    description= _ "An oft forgotten hazard of traversing the desert is the freezing cold that descends upon the sands during the night. To combat this, the Dunefolk typically make use of the highly flammable sap of the Sanbaar tree, which burns slowly and gently in small quantities. In larger amounts, however, Sanbaar sap is very nearly combustible and burns extremely violently. The Dunefolk quickly realized the applicability of such a substance to warfare and regularly employ fire spouting weapons to sow chaos among their enemies."
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/dunefolk/burner.png" "units/dunefolk/burner.png" {SOUND_LIST:HUMAN_HIT} }
+
+    [resistance]
+        cold=90
+        blade=110
+    [/resistance]
+
     [attack]
-        name=naphtha attack
+        name=dagger
-        description= _ "naphtha attack"
+        description= _ "dagger"
-        icon=attacks/fire-blast.png
+        type=blade
-        type=fire
         range=melee
-        damage=8
+        damage=7
         number=2
+        icon=attacks/dagger-curved.png
     [/attack]
     [attack]
-        name=fire arrow
+        name=flamethrower
-        description= _ "fire arrow"
+        description= _ "flamethrower"
-        icon=attacks/bow-elven.png
         type=fire
         range=ranged
         damage=6
         number=3
+        icon=attacks/fire-blast.png
     [/attack]
 
     [attack_anim]
         [filter_attack]
-            name=naphtha attack
+            name=dagger
         [/filter_attack]
-
         start_time=-200
-
         [frame]
             image="units/dunefolk/burner.png:300"
         [/frame]
-
+        {SOUND:HIT_AND_MISS dagger-swish.wav dagger-swish.wav -150}
-        {SOUND:HIT_AND_MISS melee-fire.ogg torch-miss.ogg -150}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
-            name=fire arrow
+            name=flamethrower
         [/filter_attack]
-
         start_time=-225
         missile_start_time=-150
-
         [if]
             hits=yes
             [missile_frame]
@@ -90,4 +85,54 @@
             [/frame]
         [/else]
     [/attack_anim]
+    [female]
+        name= _ "female^Dune Burner"
+        gender=female
+        image="units/dunefolk/burner+female.png"
+        die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
+        {DEFENSE_ANIM "units/dunefolk/burner+female.png" "units/dunefolk/burner+female.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
+        [attack_anim]
+            [filter_attack]
+                name=dagger
+            [/filter_attack]
+            start_time=-200
+            [frame]
+                image="units/dunefolk/burner+female.png:300"
+            [/frame]
+            {SOUND:HIT_AND_MISS dagger-swish.wav dagger-swish.wav -150}
+        [/attack_anim]
+        [attack_anim]
+            [filter_attack]
+                name=flamethrower
+            [/filter_attack]
+            start_time=-225
+            missile_start_time=-150
+            [if]
+                hits=yes
+                [missile_frame]
+                    duration=150
+                    image="projectiles/missile-fire-n.png"
+                    image_diagonal="projectiles/missile-fire-ne.png"
+                    offset=0~0.8
+                [/missile_frame]
+                {FIRE_BURST_SMALL}
+                [frame]
+                    image="units/dunefolk/burner+female.png:300"
+                    sound=bow-puny-fire.ogg
+                [/frame]
+            [/if]
+            [else]
+                hits=no
+                [missile_frame]
+                    duration=150
+                    image="projectiles/missile-fire-n.png"
+                    image_diagonal="projectiles/missile-fire-ne.png"
+                [/missile_frame]
+                [frame]
+                    image="units/dunefolk/burner+female.png:300"
+                    sound=bow-puny-fire-miss.ogg
+                [/frame]
+            [/else]
+        [/attack_anim]
+    [/female]
 [/unit_type]

data/core/units/dunefolk/Captain.cfg

@@ -0,0 +1,49 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Dune Captain
+    name= _ "Dune Captain"
+    race=dunefolk
+    image="units/dunefolk/captain.png"
+    [leading_anim]
+        start_time=-150
+        [frame]
+            image="units/dunefolk/captain.png"
+        [/frame]
+    [/leading_anim]
+    hitpoints=45
+    movement_type=dunearmoredfoot
+    movement=5
+    experience=86
+    level=2
+    alignment=liminal
+    advances_to=Dune Warmaster
+    cost=38
+    usage=mixed fighter
+    [abilities]
+        {ABILITY_LEADERSHIP}
+    [/abilities]
+    description= _ "Traditionally hailing from noble or military families, Dune Captains are the core of any Dunefolk platoon. Usually a position filled based on heritage rather than merit, Captains are those who are often relatively weak with the blade, but still reasonably trained in tactics. Unlike other leaders, the Captains’ abilities lie largely in directing their troops to strategically advantageous positions rather than directly raising their morale. The presence of such a commander is rarely inspiring for most Soldiers, but they are still quick to follow the expert tactical direction of their officers."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
+    die_sound={SOUND_LIST:HUMAN_DIE}
+    {DEFENSE_ANIM "units/dunefolk/captain.png" "units/dunefolk/captain.png" {SOUND_LIST:HUMAN_HIT} }
+
+    [attack]
+        name=scimitar
+        description= _ "scimitar"
+        type=blade
+        range=melee
+        damage=9
+        number=3
+        icon=attacks/scimitar.png
+    [/attack]
+
+    [attack_anim]
+        [filter_attack]
+            name=scimitar
+        [/filter_attack]
+        start_time=-200
+        [frame]
+            image="units/dunefolk/captain.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
+    [/attack_anim]
+[/unit_type]

data/core/units/dunefolk/Cataphract.cfg

@@ -4,9 +4,9 @@
     name= _ "Dune Cataphract"
     race=dunefolk
     image="units/dunefolk/cataphract.png"
-    hitpoints=65
+    hitpoints=71
     movement_type=dunearmoredhorse
-    movement=6
+    movement=7
     experience=150
     level=3
     alignment=lawful
@@ -14,18 +14,15 @@
     {AMLA_DEFAULT}
     cost=61
     usage=fighter
-    # wmllint: local spelling scrollwork
+    description= _ "Cataphracts are eminent horsemen, riders of mounts that are possessed less of speed or endurance, but tremendous power instead. Bearing a lance along with their signature maces, these warriors are most often the secondary strike force after a primary assault. After enemy forces are already occupied and weakened by a flank of swordsmen, a common and terrifying sight is a group of Cataphracts lining up, lances pitched at the ready. A gap is made amongst the Dunefolk ranks, and in a single charge, these mighty horsemen pierce straight through enemy formations, dealing a lethal blow in a single stroke. Those who try to flee swiftly discover that neither sand nor hills deter these riders in the slightest, and the displaced air of a descending mace is the last sound they hear."+{SPECIAL_NOTES}+{SPECIAL_NOTES_CHARGE}
-    description= _ "The Cataphract are eminent horsemen, amassing titles and accolades that are as distinguishing for them as the scrollwork on their armor. Having honed their skill with a lance in years of battle, the Cataphract are an unstoppable force of nature. Fleeing enemies swiftly discover that hills do not deter these riders in the slightest, and the displaced air of a descending mace is the last sound they hear."
+    die_sound=horse-die.ogg
-    die_sound={SOUND_LIST:ELF_HIT}
+    {DEFENSE_ANIM "units/dunefolk/cataphract.png" "units/dunefolk/cataphract.png" {SOUND_LIST:HORSE_HIT} }
-    {DEFENSE_ANIM "units/dunefolk/cataphract.png" "units/dunefolk/cataphract.png" {SOUND_LIST:ELF_HIT} }
+
-    [attack]
+    [resistance]
-        name=lance
+        blade=70
-        description= _ "lance"
+        impact=70
-        type=pierce
+    [/resistance]
-        range=melee
+
-        damage=44
-        number=1
-    [/attack]
     [attack]
         name=mace
         description= _ "mace"
@@ -33,42 +30,72 @@
         range=melee
         damage=14
         number=3
+        icon=attacks/mace.png
+    [/attack]
+    [attack]
+        name=lance
+        description=_"lance"
+        type=pierce
+        range=melee
+        damage=13
+        number=2
+        icon=attacks/lance.png
+        [specials]
+            {WEAPON_SPECIAL_CHARGE}
+        [/specials]
+    [/attack]
+    [attack]
+        name=composite bow
+        description= _ "composite bow"
+        type=pierce
+        range=ranged
+        damage=6
+        number=3
+        icon=attacks/bow-short-reinforced.png
     [/attack]
 
     [attack_anim]
         [filter_attack]
-            name=lance
+            name=mace
         [/filter_attack]
-
         start_time=-250
         horse_sound_start_time=-250
-
         [frame]
-            image="units/dunefolk/cataphract.png:400"
+            image="units/dunefolk/cataphract.png:300"
         [/frame]
-
         [horse_sound_frame]
             sound=horse-canter.wav
         [/horse_sound_frame]
-
+        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
-        {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -75}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
-            name=mace
+            name=lance
         [/filter_attack]
-
         start_time=-250
         horse_sound_start_time=-250
-
         [frame]
-            image="units/dunefolk/cataphract.png:400"
+            image="units/dunefolk/cataphract.png:300"
         [/frame]
-
         [horse_sound_frame]
             sound=horse-canter.wav
         [/horse_sound_frame]
-
+        {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}
-        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=composite bow
+        [/filter_attack]
+        start_time=-250
+        missile_start_time=-150
+        [missile_frame]
+            duration=150
+            image="projectiles/missile-n.png"
+            image_diagonal="projectiles/missile-ne.png"
+        [/missile_frame]
+        [frame]
+            image="units/dunefolk/cataphract.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Explorer.cfg

@@ -4,7 +4,7 @@
     name= _ "Dune Explorer"
     race=dunefolk
     image="units/dunefolk/explorer.png"
-    hitpoints=50
+    hitpoints=46
     movement_type=dunefoot
     movement=6
     experience=80
@@ -13,12 +13,18 @@
     advances_to=Dune Ranger
     cost=35
     usage=mixed fighter
-    description= _ "Explorers are often utilized as heavy scouts, no longer just probing the enemy but conducting raids on the supply lines or eliminating patrols. Often away from the main body of the army for long periods of time, Explorers have no issue pilfering these supplies, and so they tend to be more well-equipped than most."
+    description= _ "A slow-moving caravan out in the open desert is a prime target for bandits or marauders. In order to protect themselves, the Dunefolk employ Explorers to scout and repel potential threats. In doing so, these fleet fighters not only protect their vulnerable caravans, but pilfer the supplies of supposed raiders for themselves. When employed for warfare, Explorers no longer act only as scouts for probing enemies, but are skilled enough to be effective flankers or potent shock attackers."
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/dunefolk/explorer.png" "units/dunefolk/explorer.png" {SOUND_LIST:HUMAN_HIT} }
+
     [resistance]
         pierce=90
     [/resistance]
+    [defense]
+        sand=50
+        forest=50
+    [/defense]
+
     [attack]
         name=axe
         description= _ "axe"
@@ -26,48 +32,42 @@
         range=melee
         damage=6
         number=4
+        icon=attacks/axe.png
     [/attack]
     [attack]
         name=composite bow
         description= _ "composite bow"
         type=pierce
         range=ranged
-        damage=7
+        damage=8
-        number=4
+        number=3
-        icon=attacks/bow-elven.png
+        icon=attacks/bow-short-reinforced.png
     [/attack]
 
     [attack_anim]
         [filter_attack]
             name=axe
         [/filter_attack]
-
         start_time=-200
-
         [frame]
             image="units/dunefolk/explorer.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS axe.ogg {SOUND_LIST:MISS} -50}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
             name=composite bow
         [/filter_attack]
-
         start_time=-250
         missile_start_time=-150
-
         [missile_frame]
             duration=150
             image="projectiles/missile-n.png"
             image_diagonal="projectiles/missile-ne.png"
         [/missile_frame]
-
         [frame]
             image="units/dunefolk/explorer.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Firetrooper.cfg

@@ -3,16 +3,10 @@
     id=Dune Firetrooper
     name= _ "Dune Firetrooper"
     race=dunefolk
-    ignore_race_traits=yes
+    gender=male,female
-    {TRAIT_QUICK}
-    {TRAIT_INTELLIGENT}
-    {TRAIT_RESILIENT}
     image="units/dunefolk/firetrooper.png"
-    hitpoints=51
+    hitpoints=57
     movement_type=dunefoot
-    [resistance]
-        cold=120
-    [/resistance]
     movement=5
     experience=150
     level=3
@@ -21,49 +15,50 @@
     {AMLA_DEFAULT}
     cost=50
     usage=fighter
-    description= _ "Scorchers who have shut out the world for their experiments are given the title of Firetrooper, as both a sign of respect and of fear. No longer cognizant of the value of life, Firetroopers are caught up in the power of their caged fire and likely to test their latest naphtha jar at the first opportunity."
+    description= _ "By refining Sanbaar sap through a very specific distillation process, it becomes possible to produce exceedingly flammable naphtha which burns even more violently than the sap it was derived from. Such a substance is, of course, extremely dangerous due to its highly combustible nature. Even Scorchers will shy away from its use since the potential for self injury is very high, but a few daring souls choose to use pure naphtha as their weapon of choice. The resulting destruction is more than enough to justify the use of such a hazardous chemical."
-    die_sound={SOUND_LIST:ELF_HIT}
+    die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/dunefolk/firetrooper.png" "units/dunefolk/firetrooper.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/firetrooper.png" "units/dunefolk/firetrooper.png" {SOUND_LIST:HUMAN_HIT} }
+
+    [resistance]
+        cold=70
+        blade=110
+    [/resistance]
+
     [attack]
-        name=naphtha attack
+        name=dagger
-        description= _ "naphtha attack"
+        description= _ "dagger"
-        icon=attacks/fire-blast.png
+        type=blade
-        type=fire
         range=melee
-        damage=10
+        damage=9
         number=3
+        icon=attacks/dagger-curved.png
     [/attack]
     [attack]
-        name=fire arrow
+        name=flamethrower
-        description= _ "fire arrow"
+        description= _ "flamethrower"
-        icon=attacks/bow-elven.png
         type=fire
         range=ranged
         damage=9
         number=4
+        icon=attacks/fire-blast.png
     [/attack]
 
     [attack_anim]
         [filter_attack]
-            name=naphtha attack
+            name=dagger
         [/filter_attack]
-
         start_time=-200
-
         [frame]
             image="units/dunefolk/firetrooper.png:300"
         [/frame]
-
+        {SOUND:HIT_AND_MISS dagger-swish.wav dagger-swish.wav -150}
-        {SOUND:HIT_AND_MISS melee-fire.ogg torch-miss.ogg -150}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
-            name=fire arrow
+            name=flamethrower
         [/filter_attack]
-
         start_time=-225
         missile_start_time=-150
-
         [if]
             hits=yes
             [missile_frame]
@@ -91,4 +86,55 @@
             [/frame]
         [/else]
     [/attack_anim]
+
+    [female]
+        name= _ "female^Dune Firetrooper"
+        gender=female
+        image="units/dunefolk/firetrooper+female.png"
+        die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
+        {DEFENSE_ANIM "units/dunefolk/firetrooper+female.png" "units/dunefolk/firetrooper+female.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
+        [attack_anim]
+            [filter_attack]
+                name=dagger
+            [/filter_attack]
+            start_time=-200
+            [frame]
+                image="units/dunefolk/firetrooper+female.png:300"
+            [/frame]
+            {SOUND:HIT_AND_MISS dagger-swish.wav dagger-swish.wav -150}
+        [/attack_anim]
+        [attack_anim]
+            [filter_attack]
+                name=flamethrower
+            [/filter_attack]
+            start_time=-225
+            missile_start_time=-150
+            [if]
+                hits=yes
+                [missile_frame]
+                    duration=150
+                    image="projectiles/missile-fire-n.png"
+                    image_diagonal="projectiles/missile-fire-ne.png"
+                    offset=0~0.8
+                [/missile_frame]
+                {FIRE_BURST_SMALL}
+                [frame]
+                    image="units/dunefolk/firetrooper+female.png:300"
+                    sound=bow-puny-fire.ogg
+                [/frame]
+            [/if]
+            [else]
+                hits=no
+                [missile_frame]
+                    duration=150
+                    image="projectiles/missile-fire-n.png"
+                    image_diagonal="projectiles/missile-fire-ne.png"
+                [/missile_frame]
+                [frame]
+                    image="units/dunefolk/firetrooper+female.png:300"
+                    sound=bow-puny-fire-miss.ogg
+                [/frame]
+            [/else]
+        [/attack_anim]
+    [/female]
 [/unit_type]

data/core/units/dunefolk/Harrier.cfg

@@ -1,49 +1,92 @@
 #textdomain wesnoth-units
 [unit_type]
     id=Dune Harrier
-    name= _ "Dune Harrier"
+    name= _ "female^Dune Harrier"
     race=dunefolk
+    gender=female
     image="units/dunefolk/harrier.png"
-    hitpoints=58
+    hitpoints=53
-    movement_type=dunefoot
+    movement_type=duneelusivefoot
-    movement=6
+    movement=7
-    experience=150
+    experience=100
     level=3
-    alignment=liminal
+    alignment=lawful
     advances_to=null
     {AMLA_DEFAULT}
-    cost=56
+    cost=46
     usage=mixed fighter
     [abilities]
         {ABILITY_SKIRMISHER}
     [/abilities]
-    description= _ "Harriers hold themselves to a higher standard than the ranks of the Skirmishers from which they ascended. Not content to merely draw the enemy out, they combine their speed with an aggression that sends the Harriers dancing through the ranks of the enemy, swords ripping and tearing at those around them. "+{SPECIAL_NOTES}+{SPECIAL_NOTES_SKIRMISHER}
+    description= _ "While Dune Harriers can fulfill a similar role to Striders in hampering enemy forces, their name is actually derived from the harrier falcons they employ to maintain contact with the bulk of a Dunefolk army. Most commonly found operating behind enemy lines, Harriers are usually tasked with providing useful intelligence on enemy troop movements. However, when the time is right, these agile warriors gather together and strike at the rear of weakened supply lines or flanks. A rain of bolas followed by a piercing thrust of spears is often enough to severely cripple the target, allowing the main Dunefolk force to close in and finish the job. The choice to stand and fight is not an easy one either: Harriers are considerably skilled in wielding their spears, and their falcons can provide an extra attack when absolutely necessary."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SKIRMISHER}+{SPECIAL_NOTES_SLOW}
-    die_sound={SOUND_LIST:HUMAN_DIE}
+    die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
-    {DEFENSE_ANIM "units/dunefolk/harrier.png" "units/dunefolk/harrier.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/harrier.png" "units/dunefolk/harrier.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
-    [resistance]
+
-        pierce=90
-    [/resistance]
     [attack]
-        name=longsword
+        name=spear
-        description= _ "longsword"
+        description= _ "spear"
-        icon=attacks/longsword.png
+        type=pierce
-        type=blade
         range=melee
         damage=8
-        number=5
+        number=4
+        icon=attacks/spear.png
+        [specials]
+            {WEAPON_SPECIAL_FIRSTSTRIKE}
+        [/specials]
+    [/attack]
+    [attack]
+        name=bolas
+        description= _ "bolas"
+        type=impact
+        range=ranged
+        damage=6
+        number=3
+        icon=attacks/bolas.png
+        [specials]
+            {WEAPON_SPECIAL_SLOW}
+        [/specials]
     [/attack]
 
     [attack_anim]
         [filter_attack]
-            name=longsword
+            name=spear
         [/filter_attack]
-
+        start_time=-250
-        start_time=-200
-
         [frame]
             image="units/dunefolk/harrier.png:300"
         [/frame]
-
+        {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}
-        {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=bolas
+        [/filter_attack]
+        start_time=-225
+        missile_start_time=-150
+        [if]
+            hits=yes
+            [missile_frame]
+                duration=150
+                image="projectiles/bolas-n.png"
+                image_diagonal="projectiles/bolas-ne.png"
+                offset=0~0.8
+            [/missile_frame]
+            [frame]
+                image="units/dunefolk/harrier.png:300"
+                sound=sling.ogg
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [missile_frame]
+                duration=150
+                image="projectiles/bolas-n.png"
+                image_diagonal="projectiles/bolas-ne.png"
+            [/missile_frame]
+            [frame]
+                image="units/dunefolk/harrier.png:300"
+                sound=sling-miss.ogg
+            [/frame]
+        [/else]
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Herbalist.cfg

@@ -5,40 +5,47 @@
     race=dunefolk
     image="units/dunefolk/herbalist.png"
     profile="portraits/dunefolk/herbalist.png"
-    hitpoints=26
+    hitpoints=29
     movement_type=dunefoot
     [abilities]
-        {ABILITY_EXTRA_HEAL}
+        {ABILITY_SELF_HEAL}
+        {ABILITY_HEALS}
     [/abilities]
     movement=5
     experience=39
     level=1
     alignment=liminal
-    advances_to=Dune Apothecary
+    advances_to=Dune Apothecary,Dune Alchemist
-    cost=17
+    cost=15
     usage=healer
-    description= _ "Herbalists are learned individuals who have given up their urban life in order to assist the Dunefolk armies in their travels. Their motivations are many; some look to it as an adventure or as a steady source of pay, while others feel it to be a duty to their society. Regardless, Herbalists are highly respected by all. They are trained with the advanced medical techniques and possess a potent clutch of medicines and herbs, which allows them to quickly heal even the most gravely wounded allies."+{SPECIAL_NOTES}+{SPECIAL_NOTES_EXTRA_HEAL}
+    description= _ "As those responsible for caring for the ill and wounded among the Dunefolk, Herbalists possess both the medicinal skills to heal a variety of afflictions and the skill to seek and gather restorative herbs. Their motivations are many; some look to it as an adventure or as a steady source of pay while others feel it to be a duty to their society. No matter the reason, Herbalists are an invaluable part of Dunefolk society and are especially useful for their ability to administer quick treatments in the midst of battle or while traveling in the desert.
+
+Even among the nomadic Dunefolk, healers journey a great deal in search of the various flora and fauna that supply their work. Hardened by their travels, many of these men are even able to heal themselves."+{SPECIAL_NOTES}+{SPECIAL_NOTES_HEALS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/dunefolk/herbalist.png" "units/dunefolk/herbalist.png" {SOUND_LIST:HUMAN_HIT} }
+
+    [resistance]
+        blade=110
+    [/resistance]
+
     [attack]
         name=mace
         description= _ "mace"
         type=impact
         range=melee
-        damage=6
+        damage=4
-        number=2
+        number=3
+        icon=attacks/mace.png
     [/attack]
+
     [attack_anim]
         [filter_attack]
             name=mace
         [/filter_attack]
-
         start_time=-200
-
         [frame]
             image="units/dunefolk/herbalist.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Luminary.cfg

@@ -0,0 +1,52 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Dune Luminary
+    name= _ "Dune Luminary"
+    race=dunefolk
+    image="units/dunefolk/luminary.png"
+    profile="portraits/dunefolk/herbalist.png"
+    hitpoints=52
+    movement_type=dunefoot
+    [abilities]
+        {ABILITY_CURES}
+        {ABILITY_SELF_HEAL}
+    [/abilities]
+    movement=5
+    experience=100
+    level=3
+    alignment=liminal
+    {AMLA_DEFAULT}
+    cost=53
+    usage=fighter
+    description= _ "On the surface, it is not entirely clear what distinguishes a Luminary from other healers among the Dunefolk. Certainly, a Luminary may be marginally more knowledgeable, well-traveled, or skilled in combat compared to Herbalists or Apothecaries, but the difference is usually modest at best. Nevertheless, ‘Luminary’ is a formal title granted to the highest order of Dunefolk healers and grants these men both the greatest esteem and the greatest envy.
+
+There is some speculation that a secret order exists among the Luminaries. These so called ‘Eminents’ hoard a great deal of forbidden knowledge and advise many Dunefolk leaders from the shadows. Such a thing has never been proven, but the fact remains that some Luminaries seem to hold much more influence than their abilities should afford."{SPECIAL_NOTES}+{SPECIAL_NOTES_CURES}+{SPECIAL_NOTES_REGENERATES}
+    die_sound={SOUND_LIST:HUMAN_DIE}
+    {DEFENSE_ANIM "units/dunefolk/luminary.png" "units/dunefolk/luminary" {SOUND_LIST:HUMAN_HIT} }
+
+    [resistance]
+        blade=110
+        pierce=80
+    [/resistance]
+
+    [attack]
+        name=mace
+        description= _ "mace"
+        type=impact
+        range=melee
+        damage=9
+        number=4
+        icon=attacks/mace.png
+    [/attack]
+
+    [attack_anim]
+        [filter_attack]
+            name=mace
+        [/filter_attack]
+        start_time=-200
+        [frame]
+            image="units/dunefolk/luminary.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
+    [/attack_anim]
+[/unit_type]

data/core/units/dunefolk/Marauder.cfg

@@ -4,82 +4,75 @@
     name= _ "Dune Marauder"
     race=dunefolk
     image="units/dunefolk/marauder.png"
-    hitpoints=57
+    hitpoints=58
-    movement_type=dunearmoredhorse
+    movement_type=dunehorse
-    [movement_costs]
+    movement=9
-        mountains=4
-    [/movement_costs]
-    [defense]
-        mountains=60
-    [/defense]
-    [resistance]
-        cold=100
-    [/resistance]
-    movement=7
     experience=150
     level=3
-    alignment=lawful
+    alignment=chaotic
     advances_to=null
     {AMLA_DEFAULT}
     cost=52
     usage=fighter
-    description= _ "Those Raiders who prove to be particularly skilled are formed into units of Marauders, which are often used to raid enemy depots and towns for supplies. This greater autonomy often means that these horsemen are gone for weeks at a time, returning to camp only for supplies and to pass on news of their exploits."
+    description= _ "Some find themselves well suited to the life of a Raider and may even form their own clans with like-minded individuals. Ever roaming the deserts for unwary travelers or vulnerable caravans, these horsemen make their livelihood off of scavenging and pilfering. Having no particular specialty, Marauders are neither the strongest warriors, nor the most dexterous archers; nevertheless, they are among the most dangerous enemies out in the desert due to their sheer maneuverability. A coordinated Marauder attack can wipe out even medium-sized camps before any response is possible, and against stronger foes, guerrilla tactics may allow them to prevail where brute force does not. For this reason, they are sometimes hired by small armies or wealthier caravans as a deterrent to unwanted raids."
-    die_sound={SOUND_LIST:ELF_HIT}
+    die_sound=horse-die.ogg
-    {DEFENSE_ANIM "units/dunefolk/marauder.png" "units/dunefolk/marauder.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/marauder.png" "units/dunefolk/marauder.png" {SOUND_LIST:HORSE_HIT} }
+
+    [resistance]
+        blade=80
+        impact=80
+    [/resistance]
+    [defense]
+        mountains=50
+    [/defense]
+
     [attack]
-        name=mace
+        name=torch
-        description= _ "mace"
+        description= _ "torch"
-        type=impact
+        type=fire
         range=melee
-        damage=10
+        damage=11
         number=3
+        icon=attacks/torch.png
     [/attack]
     [attack]
         name=bow
         description=_"bow"
-        icon=attacks/bow-elven.png
         type=pierce
         range=ranged
-        damage=9
+        damage=10
         number=3
+        icon=attacks/bow-short-reinforced.png
     [/attack]
 
     [attack_anim]
         [filter_attack]
-            name=mace
+            name=torch
         [/filter_attack]
-
         start_time=-250
         horse_sound_start_time=-250
-
         [frame]
             image="units/dunefolk/marauder.png:400"
         [/frame]
-
         [horse_sound_frame]
             sound=horse-canter.wav
         [/horse_sound_frame]
-
+        {SOUND:HIT_AND_MISS torch.ogg torch-miss.ogg -100}
-        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
             name=bow
         [/filter_attack]
-
         start_time=-250
         missile_start_time=-150
-
         [missile_frame]
             duration=150
             image="projectiles/missile-n.png"
             image_diagonal="projectiles/missile-ne.png"
         [/missile_frame]
-
         [frame]
             image="units/dunefolk/marauder.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Paragon.cfg

@@ -0,0 +1,66 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Dune Paragon
+    name= _ "Dune Paragon"
+    race=dunefolk
+    image="units/dunefolk/paragon.png"
+    hitpoints=82
+    movement_type=dunearmoredfoot
+    {TRAIT_FEARLESS}
+    movement=5
+    experience=200
+    level=4
+    alignment=lawful
+    advances_to=null
+    {AMLA_DEFAULT}
+    cost=78
+    usage=fighter
+    description= _ "In many Dunefolk city-states, the process for selecting the next generation of leaders is a long process that takes place over many years. In each generation, a few particularly talented youths among the nobility are trained separately from their peers. Eat, sleep, and train, these warriors learn to live and breathe swordsmanship as their core identity more than even an extension of themselves. From adolescence, ten years of intense training paves the path to the final test, a series of duels to the death between pairs of these fighters. When the dust settles and the process is ended, eight are left remaining. These men are granted the title Kal, or collectively, Kalai.
+
+Among the Dunefolk, while great leaders are required to have mastered the blade, the ruling caste is required to know far more than mere swordplay. Gruelling training is usually followed by either several years of nomadic roving through the deserts or dedication of the mind to the sciences, the purpose of which is to find a self-motivated path toward enlightened wisdom. No matter the case, at the end of the second training period, the remaining Kalai return and demonstrate their knowledge to the elders of the current ruling caste. Those who are found worthy are then called Paragon, warriors of great strength and acuity who may then be considered as candidates to lead the next generation of Dunefolk."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}
+    die_sound={SOUND_LIST:HUMAN_DIE}
+    {DEFENSE_ANIM "units/dunefolk/paragon.png" "units/dunefolk/paragon.png" {SOUND_LIST:HUMAN_HIT} }
+
+    [attack]
+        name=sword
+        description= _ "sword"
+        type=blade
+        range=melee
+        damage=13
+        number=4
+        icon=attacks/longsword.png
+        [specials]
+            {WEAPON_SPECIAL_MARKSMAN}
+        [/specials]
+    [/attack]
+    [attack]
+        name=pommel strike
+        description= _ "pommel strike"
+        type=impact
+        range=melee
+        damage=11
+        number=3
+        icon=attacks/quarterstaff.png
+    [/attack]
+
+    [attack_anim]
+        [filter_attack]
+            name=sword
+        [/filter_attack]
+        start_time=-200
+        [frame]
+            image="units/dunefolk/paragon.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=pommel strike
+        [/filter_attack]
+        start_time=-200
+        [frame]
+            image="units/dunefolk/paragon.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
+    [/attack_anim]
+[/unit_type]

data/core/units/dunefolk/Piercer.cfg

@@ -1,77 +0,0 @@
-#textdomain wesnoth-units
-[unit_type]
-    id=Dune Piercer
-    name= _ "Dune Piercer"
-    race=dunefolk
-    image="units/dunefolk/piercer.png"
-    hitpoints=38
-    movement_type=dunearmoredhorse
-    [resistance]
-        blade=80
-        pierce=110
-    [/resistance]
-    movement=6
-    experience=42
-    level=1
-    alignment=lawful
-    advances_to=Dune Sunderer,Dune Raider
-    cost=21
-    usage=fighter
-    undead_variation=mounted
-    description= _ "The Piercer understand the psychological impact of a charging horse, and reinforce this by cladding themselves in heavy armor. Majestic at rest, a Piercer at the charge with lance in hand is often impetus enough to break men. On the rare occurrences that their charge fails to rout their foe, the Piercer ride into the resulting melee with their maces in hand, trusting their armor to keep them safe."
-    die_sound=horse-die.ogg
-    {DEFENSE_ANIM "units/dunefolk/piercer.png" "units/dunefolk/piercer.png" {SOUND_LIST:HORSE_HIT} }
-    [attack]
-        name=lance
-        description= _ "lance"
-        type=pierce
-        range=melee
-        damage=20
-        number=1
-    [/attack]
-    [attack]
-        name=mace
-        description= _ "mace"
-        type=impact
-        range=melee
-        damage=6
-        number=3
-    [/attack]
-
-    [attack_anim]
-        [filter_attack]
-            name=lance
-        [/filter_attack]
-
-        start_time=-250
-        horse_sound_start_time=-250
-
-        [frame]
-            image="units/dunefolk/piercer.png:400"
-        [/frame]
-
-        [horse_sound_frame]
-            sound=horse-canter.wav
-        [/horse_sound_frame]
-
-        {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -75}
-    [/attack_anim]
-    [attack_anim]
-        [filter_attack]
-            name=mace
-        [/filter_attack]
-
-        start_time=-250
-        horse_sound_start_time=-250
-
-        [frame]
-            image="units/dunefolk/piercer.png:400"
-        [/frame]
-
-        [horse_sound_frame]
-            sound=horse-canter.wav
-        [/horse_sound_frame]
-
-        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
-    [/attack_anim]
-[/unit_type]

data/core/units/dunefolk/Raider.cfg

@@ -4,78 +4,73 @@
     name= _ "Dune Raider"
     race=dunefolk
     image="units/dunefolk/raider.png"
-    hitpoints=48
+    hitpoints=45
     movement_type=dunehorse
-    [defense]
+    movement=9
-        hills=50
-    [/defense]
-    [resistance]
-        blade=80
-    [/resistance]
-    movement=7
     experience=70
     level=2
-    alignment=lawful
+    alignment=chaotic
     advances_to=Dune Marauder
-    cost=34
+    cost=36
     usage=archer
-    description= _ "Those horsemen who are not skilled enough to join the ranks of the Sunderers or quick enough with a bow for the Swiftriders are instead placed with the Raiders. Far from being a sign of failure, the Raiders were created as a mounted counterpart to the Explorers, supporting the foot troops with mace or bow as needed. Raiders are often used to draw enemies into a position where they will be surrounded and crushed by Sunderers."
+    description= _ "Though rarely found in organized armies, Raiders are a staple among the nomadic Dunefolk, who regularly ambush rival caravans and camps at night. In these scenarios, raw power is of little concern. The greatest importance is placed on speed—striking quickly, spreading as much chaos with their torches in the shortest time possible, allows these riders to get in and out of the blitz without any fear of counterattack. Raiders are the fastest of the Dunefolk, capable of outpacing nearly anything they might encounter in the sandy deserts."
-    die_sound={SOUND_LIST:ELF_HIT}
+    die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/dunefolk/raider.png" "units/dunefolk/raider.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/raider.png" "units/dunefolk/raider.png" {SOUND_LIST:HUMAN_HIT} }
+
+    [resistance]
+        blade=90
+    [/resistance]
+    [defense]
+        mountains=50
+    [/defense]
+
     [attack]
-        name=mace
+        name=torch
-        description= _ "mace"
+        description= _ "torch"
-        type=impact
+        type=fire
         range=melee
         damage=8
         number=3
+        icon=attacks/torch.png
     [/attack]
     [attack]
         name=bow
         description=_"bow"
-        icon=attacks/bow-elven.png
         type=pierce
         range=ranged
         damage=7
         number=3
+        icon=attacks/bow-short-reinforced.png
     [/attack]
 
     [attack_anim]
         [filter_attack]
-            name=mace
+            name=torch
         [/filter_attack]
-
         start_time=-250
         horse_sound_start_time=-250
-
         [frame]
             image="units/dunefolk/raider.png:400"
         [/frame]
-
         [horse_sound_frame]
             sound=horse-canter.wav
         [/horse_sound_frame]
-
+        {SOUND:HIT_AND_MISS torch.ogg torch-miss.ogg -100}
-        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
             name=bow
         [/filter_attack]
-
         start_time=-250
         missile_start_time=-150
-
         [missile_frame]
             duration=150
             image="projectiles/missile-n.png"
             image_diagonal="projectiles/missile-ne.png"
         [/missile_frame]
-
         [frame]
             image="units/dunefolk/raider.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Ranger.cfg

@@ -4,22 +4,36 @@
     name= _ "Dune Ranger"
     race=dunefolk
     image="units/dunefolk/ranger.png"
-    hitpoints=65
+    hitpoints=62
     movement_type=dunefoot
     movement=6
     experience=150
     level=3
-    alignment=liminal
+    alignment=neutral
-    advances_to=null
+    advances_to=liminal
     {AMLA_DEFAULT}
     cost=52
     usage=mixed fighter
-    description= _ "Rangers are the elite of the Explorers, engaging in constant hit and run attacks against an enemy army. Nimble as a goat and strong as a ram, they prefer to coordinate multiple attacks at the same time, sending foes running from their arrows only to be cut down by their axes. Given their penchant for taking on only the most daring missions, Rangers are often heroes to the common troopers, an image they do not try to dissuade."
+    description= _ "From the journal of Balah, the Dune Watcher:
+
+“... Today was the sixth day. Six days of pursuit through the desert without sleep, without rest... but, I require neither. The Bloodeye Roc has pilfered too many of my herd for its ravenous feasting. I must be rid of it before the caravan starves. I have tracked it thus far, and no matter how far it flees, I shall follow.
+
+... blast it! The creature was only a couple hundred paces away, but the sun was in my eyes! I managed to land a few arrows on the foul thing, but only enough to slow it. Still, it seems to be tiring faster than I. With any luck, I will catch it before it can reach the mountains.
+
+... Day eleven. I cornered the creature after it landed on the hillside, but there were three more that I was not accounting for. Rocs are ferocious creatures in close quarters; fighting one is already no simple task, but four at once? I am lucky I brought my second axe, otherwise I would have sustained severe injury during that battle. As it is, I am waiting for the gauze to set on my leg before I return to slay the final two. Perhaps then it will finally be time to eat and get some rest.
+
+... it comes as a surprise to even me that I traveled nearly halfway across the Northern Dunes in my twenty-one day expedition. It would take the caravan nearly three months to make that trip, but I do suppose the circumstances around my joruney were somewhat extenuating. On the bright side, I was able to procure some salted roc meat along the way, which should make for a fine treat for the children. It will also be nice to see some of the other Rangers again. My tale might not be that impressive to them, but at least it is an improvement over my previous encounter with the wyvern...”"
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/dunefolk/ranger.png" "units/dunefolk/ranger.png" {SOUND_LIST:HUMAN_HIT} }
+
     [resistance]
-        pierce=90
+        pierce=80
     [/resistance]
+    [defense]
+        sand=50
+        forest=50
+    [/defense]
+
     [attack]
         name=axe
         description= _ "axe"
@@ -27,6 +41,7 @@
         range=melee
         damage=8
         number=4
+        icon=attacks/axe.png
     [/attack]
     [attack]
         name=composite bow
@@ -35,39 +50,33 @@
         range=ranged
         damage=8
         number=4
-        icon=attacks/bow-elven.png
+        icon=attacks/bow-short-reinforced.png
     [/attack]
+
     [attack_anim]
         [filter_attack]
             name=axe
         [/filter_attack]
-
         start_time=-200
-
         [frame]
             image="units/dunefolk/ranger.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS axe.ogg {SOUND_LIST:MISS} -50}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
             name=composite bow
         [/filter_attack]
-
         start_time=-250
         missile_start_time=-150
-
         [missile_frame]
             duration=150
             image="projectiles/missile-n.png"
             image_diagonal="projectiles/missile-ne.png"
         [/missile_frame]
-
         [frame]
             image="units/dunefolk/ranger.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Rider.cfg

@@ -6,71 +6,64 @@
     image="units/dunefolk/rider.png"
     hitpoints=34
     movement_type=dunehorse
-    movement=7
+    movement=8
     experience=42
     level=1
     alignment=liminal
-    advances_to=Dune Raider,Dune Swiftrider
+    advances_to=Dune Raider,Dune Swiftrider,Dune Sunderer
-    cost=16
+    cost=18
     usage=archer
-    undead_variation=mounted
+    description= _ "The Dunefolk are prominent horse breeders who raise many different varieties of mounts to fulfill various purposes. Those who are used for hard labor are bred for power, while those for journeys or caravans are bred for endurance. For warfare, a mix of traits is usually best, though the ability to easily and rapidly traverse sand is of utmost importance. The riders of these horses primarily function as scouts and messengers, or occasionally as supporting forces for weakened lines. The crucial trait of maneuverability is what allows these horsemen to be so effective and versatile out on the rolling dunes."
-    description= _ "Riders are excellent horsemen, able to shoot from horseback better than most men can manage from foot. Disdaining the use of heavy armor, Riders use their superior speed and agility to circle and harass their foes, whittling down their numbers with relentless arrows."
     die_sound=horse-die.ogg
     {DEFENSE_ANIM "units/dunefolk/rider.png" "units/dunefolk/rider.png" {SOUND_LIST:HORSE_HIT} }
+
     [attack]
         name=mace
         description= _ "mace"
         type=impact
         range=melee
-        damage=4
+        damage=5
         number=2
+        icon=attacks/mace.png
     [/attack]
     [attack]
         name=composite bow
         description= _ "composite bow"
-        icon=attacks/bow-elven.png
         type=pierce
         range=ranged
-        damage=6
+        damage=5
         number=3
+        icon=attacks/bow-short.png
     [/attack]
 
     [attack_anim]
         [filter_attack]
             name=mace
         [/filter_attack]
-
         start_time=-250
         horse_sound_start_time=-250
-
         [frame]
             image="units/dunefolk/rider.png:400"
         [/frame]
-
         [horse_sound_frame]
             sound=horse-canter.wav
         [/horse_sound_frame]
-
         {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
             name=composite bow
         [/filter_attack]
-
         start_time=-250
         missile_start_time=-150
-
         [missile_frame]
             duration=150
             image="projectiles/missile-n.png"
             image_diagonal="projectiles/missile-ne.png"
         [/missile_frame]
-
         [frame]
             image="units/dunefolk/rider.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Rover.cfg

@@ -6,19 +6,22 @@
     image="units/dunefolk/rover.png"
     hitpoints=32
     movement_type=dunefoot
-    movement=6
+    movement=5
-    experience=44
+    experience=43
     level=1
     alignment=liminal
-    advances_to=Dune Skirmisher,Dune Explorer
+    advances_to=Dune Explorer
-    cost=15
+    cost=14
     usage=mixed fighter
-    description= _ "Rovers in many ways represent the ideal Dunefolk unit; flexible, mobile, equally effective in defense and offense as well as in ranged or close combat. They are most comfortable operating in terrain and environments common to them; the deserts and hills of their southern lands. Moreover they fight best at dawn or dusk, corresponding to the time when desert temperatures are the most reasonable."
+    description= _ "Originating from the nomadic wanderers of the open deserts, Rovers, in many ways, represent the ideal Dunefolk soldier: flexible, mobile, equally effective in defense and offense as well as in ranged or close combat. They are hardy inhabitants of the deserts and hills that they call home and experienced hunters and trackers. While lacking training as formal soldiers, the skills Rovers employ for survival in the desert translate readily to warfare. Their unique trait of fighting best at dawn or dusk corresponds with the time when desert temperatures are the most habitable."
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/dunefolk/rover.png" "units/dunefolk/rover.png" {SOUND_LIST:HUMAN_HIT} }
-    [resistance]
+
-        pierce=90
+    [defense]
-    [/resistance]
+        sand=50
+        forest=50
+    [/defense]
+
     [attack]
         name=axe
         description= _ "axe"
@@ -26,47 +29,42 @@
         range=melee
         damage=4
         number=3
+        icon=attacks/axe.png
     [/attack]
     [attack]
         name=composite bow
         description= _ "composite bow"
-        icon=attacks/bow-elven.png
         type=pierce
         range=ranged
         damage=5
         number=3
+        icon=attacks/bow-short.png
     [/attack]
+
     [attack_anim]
         [filter_attack]
             name=axe
         [/filter_attack]
-
         start_time=-200
-
         [frame]
             image="units/dunefolk/rover.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS axe.ogg {SOUND_LIST:MISS} -50}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
             name=composite bow
         [/filter_attack]
-
         start_time=-250
         missile_start_time=-150
-
         [missile_frame]
             duration=150
             image="projectiles/missile-n.png"
             image_diagonal="projectiles/missile-ne.png"
         [/missile_frame]
-
         [frame]
             image="units/dunefolk/rover.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Scorcher.cfg

@@ -1,18 +1,13 @@
 #textdomain wesnoth-units
 [unit_type]
+    # Below unit id may need changing to use underscores in unit ID only (not in displayed name) to fix bug #18117, as stated in former Dune Scorcher file
     id=Dune Scorcher
     name= _ "Dune Scorcher"
-    race=dunefolk
-    ignore_race_traits=yes
-    {TRAIT_QUICK}
-    {TRAIT_INTELLIGENT}
-    {TRAIT_RESILIENT}
     image="units/dunefolk/scorcher.png"
-    hitpoints=44
+    race=dunefolk
+    gender=male,female
+    hitpoints=47
     movement_type=dunefoot
-    [resistance]
-        cold=120
-    [/resistance]
     movement=5
     experience=70
     level=2
@@ -20,49 +15,50 @@
     advances_to=Dune Firetrooper
     cost=35
     usage=fighter
-    description= _ "Scorchers spend so much time experimenting with their weapons that they smell constantly of ash and flame. Regarded with wariness by their fellow troops, Scorchers can be easily located in battle by the cleared charred area around them, a testament to the success of their experiments."
+    description= _ "The Scorcher’s name is derived not from the destruction they wreak on adversarial formations, but on their own singed appearance. By experimenting endlessly with their equipment, most Scorchers inevitably overstep their bounds and are seared by the highly volatile Sanbaar sap that soaks their weapons. Bearing their burns as a mark of pride in their work, these archers relish igniting great swaths of flame on the battlefield, though this sometimes results in unintended friendly fire as well."
-    die_sound={SOUND_LIST:ELF_HIT}
+    die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/dunefolk/scorcher.png" "units/dunefolk/scorcher.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/scorcher.png" "units/dunefolk/scorcher.png" {SOUND_LIST:HUMAN_HIT} }
+
+    [resistance]
+        cold=80
+        blade=110
+    [/resistance]
+
     [attack]
-        name=naphtha attack
+        name=dagger
-        description= _ "naphtha attack"
+        description= _ "dagger"
-        icon=attacks/fire-blast.png
+        type=blade
-        type=fire
         range=melee
-        damage=10
+        damage=9
         number=2
+        icon=attacks/dagger-curved.png
     [/attack]
     [attack]
-        name=fire arrow
+        name=flamethrower
-        description= _ "fire arrow"
+        description= _ "flamethrower"
-        icon=attacks/bow-elven.png
         type=fire
         range=ranged
-        damage=8
+        damage=9
         number=3
+        icon=attacks/fire-blast.png
     [/attack]
 
     [attack_anim]
         [filter_attack]
-            name=naphtha attack
+            name=dagger
         [/filter_attack]
-
         start_time=-200
-
         [frame]
             image="units/dunefolk/scorcher.png:300"
         [/frame]
-
+        {SOUND:HIT_AND_MISS dagger-swish.wav dagger-swish.wav -150}
-        {SOUND:HIT_AND_MISS melee-fire.ogg torch-miss.ogg -150}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
-            name=fire arrow
+            name=flamethrower
         [/filter_attack]
-
         start_time=-225
         missile_start_time=-150
-
         [if]
             hits=yes
             [missile_frame]
@@ -90,4 +86,55 @@
             [/frame]
         [/else]
     [/attack_anim]
+
+    [female]
+        name= _ "female^Dune Scorcher"
+        gender=female
+        image="units/dunefolk/scorcher+female.png"
+        die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
+        {DEFENSE_ANIM "new/scorcher+female.png" "new/scorcher+female.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
+        [attack_anim]
+            [filter_attack]
+                name=dagger
+            [/filter_attack]
+            start_time=-200
+            [frame]
+                image="units/dunefolk/scorcher+female.png:300"
+            [/frame]
+            {SOUND:HIT_AND_MISS dagger-swish.wav dagger-swish.wav -150}
+        [/attack_anim]
+        [attack_anim]
+            [filter_attack]
+                name=flamethrower
+            [/filter_attack]
+            start_time=-225
+            missile_start_time=-150
+            [if]
+                hits=yes
+                [missile_frame]
+                    duration=150
+                    image="projectiles/missile-fire-n.png"
+                    image_diagonal="projectiles/missile-fire-ne.png"
+                    offset=0~0.8
+                [/missile_frame]
+                {FIRE_BURST_SMALL}
+                [frame]
+                    image="units/dunefolk/scorcher+female.png:300"
+                    sound=bow-puny-fire.ogg
+                [/frame]
+            [/if]
+            [else]
+                hits=no
+                [missile_frame]
+                    duration=150
+                    image="projectiles/missile-fire-n.png"
+                    image_diagonal="projectiles/missile-fire-ne.png"
+                [/missile_frame]
+                [frame]
+                    image="units/dunefolk/scorcher+female.png:300"
+                    sound=bow-puny-fire-miss.ogg
+                [/frame]
+            [/else]
+        [/attack_anim]
+    [/female]
 [/unit_type]

data/core/units/dunefolk/Skirmisher.cfg

@@ -1,48 +1,88 @@
 #textdomain wesnoth-units
 [unit_type]
     id=Dune Skirmisher
-    name= _ "Dune Skirmisher"
+    name= _ "female^Dune Skirmisher"
     race=dunefolk
+    gender=female
     image="units/dunefolk/skirmisher.png"
-    hitpoints=46
+    hitpoints=29
-    movement_type=dunefoot
+    movement_type=duneelusivefoot
     movement=6
-    experience=65
+    experience=34
-    level=2
+    level=1
-    alignment=liminal
+    alignment=lawful
-    advances_to=Dune Harrier
+    advances_to=Dune Strider
-    cost=35
+    cost=16
     usage=mixed fighter
+    description= _ "Born and raised out on the open sands, Dune Skirmishers are accustomed to the harsh, arid desert heat and inhospitable terrain. Compared to even other Dunefolk, Skirmishers are unnaturally agile on the unstable dunes, allowing them to safeguard their herds and hunt the barrens with ease. When applied to battle, the same agility allows them to both slip through enemy lines and avoid all manner of attack. These skills make Skirmishers effective saboteurs, capable of cutting of escape routes and supply lines, assassinating key units, or pincering an enemy formation into a disadvantageous position."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SKIRMISHER}
     [abilities]
         {ABILITY_SKIRMISHER}
     [/abilities]
-    description= _ "Those Rovers who are proficient at scouting are elevated into the ranks of the Skirmishers. Discarding their bow, Skirmishers focus on developing their swiftness of foot to allow them to flow in and out of combat. They are often used to harry the flanks of opposing forces, and it is said to be easier to catch the wind in your hand than to catch a Skirmisher."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SKIRMISHER}
+    die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
-    die_sound={SOUND_LIST:HUMAN_DIE}
+    {DEFENSE_ANIM "units/dunefolk/skirmisher.png" "units/dunefolk/skirmisher.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
-    {DEFENSE_ANIM "units/dunefolk/skirmisher.png" "units/dunefolk/skirmisher.png" {SOUND_LIST:HUMAN_HIT} }
+
-    [resistance]
-        pierce=90
-    [/resistance]
     [attack]
-        name=longsword
+        name=spear
-        description= _ "longsword"
+        description= _ "spear"
-        icon=attacks/longsword.png
+        type=pierce
-        type=blade
         range=melee
-        damage=7
+        damage=4
         number=4
+        icon=attacks/spear.png
+        [specials]
+            {WEAPON_SPECIAL_FIRSTSTRIKE}
+        [/specials]
+    [/attack]
+    [attack]
+        name=sling
+        description= _ "sling"
+        type=impact
+        range=ranged
+        damage=6
+        number=1
+        icon=attacks/sling.png
     [/attack]
 
     [attack_anim]
         [filter_attack]
-            name=longsword
+            name=spear
         [/filter_attack]
-
+        start_time=-250
-        start_time=-200
-
         [frame]
             image="units/dunefolk/skirmisher.png:300"
         [/frame]
-
+        {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}
-        {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=sling
+        [/filter_attack]
+        start_time=-225
+        missile_start_time=-150
+        [if]
+            hits=yes
+            [missile_frame]
+                duration=150
+                image="projectiles/bolas-n.png"
+                image_diagonal="projectiles/bolas-ne.png"
+                offset=0~0.8
+            [/missile_frame]
+            [frame]
+                image="units/dunefolk/skirmisher.png:300"
+                sound=sling.ogg
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [missile_frame]
+                duration=150
+                image="projectiles/bolas-n.png"
+                image_diagonal="projectiles/bolas-ne.png"
+            [/missile_frame]
+            [frame]
+                image="units/dunefolk/skirmisher.png:300"
+                sound=sling-miss.ogg
+            [/frame]
+        [/else]
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Soldier.cfg

@@ -4,46 +4,37 @@
     name= _ "Dune Soldier"
     race=dunefolk
     image="units/dunefolk/soldier.png"
-    hitpoints=40
+    hitpoints=41
     movement_type=dunearmoredfoot
-    [resistance]
-        cold=110
-    [/resistance]
     movement=5
-    experience=47
+    experience=43
     level=1
     alignment=lawful
-    advances_to=Dune Swordsman,Dune Spearguard
+    advances_to=Dune Swordsman,Dune Captain,Dune Spearguard
     cost=18
     usage=fighter
-    description= _ "The Soldier forms the backbone of any Dunefolk foot advance. Many come from noble or military families, and have spent most of their lives training their craft. Given their intense focus on swordplay, they are often sent against fortified enemy positions to create a breach for the remaining troops to exploit. The sight of Soldiers on the march, shields high, has caused many a defender to worry about the strength of their walls."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}
+    description= _ "While most Dunefolk castes serve an additional practical purpose beyond only direct warfare, Dune Soldiers are among the few who are completely dedicated to military purposes. By train intensely to hone their skill in swordplay, Soldiers learn to navigate tricky fights in close quarters and repel ranged assaults with their shields. A typical Dunefolk formation makes use of this adeptness by placing Soldiers in a spaced pattern, allowing them to draw out clustered enemy lines and overwhelm their foes in pseudo single combat."
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/dunefolk/soldier.png" "units/dunefolk/soldier.png" {SOUND_LIST:HUMAN_HIT} }
-    {TRAIT_FEARLESS}
+
     [attack]
-        name=sword
+        name=scimitar
-        description= _ "sword"
+        description= _ "scimitar"
-        icon=attacks/sword-human.png
         type=blade
         range=melee
-        damage=9
+        damage=11
         number=2
-        [specials]
+        icon=attacks/scimitar.png
-            {WEAPON_SPECIAL_MARKSMAN}
-        [/specials]
     [/attack]
 
     [attack_anim]
         [filter_attack]
-            name=sword
+            name=scimitar
         [/filter_attack]
-
         start_time=-200
-
         [frame]
             image="units/dunefolk/soldier.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Spearguard.cfg

@@ -4,11 +4,8 @@
     name= _ "Dune Spearguard"
     race=dunefolk
     image="units/dunefolk/spearguard.png"
-    hitpoints=58
+    hitpoints=53
     movement_type=dunearmoredfoot
-    [resistance]
-        cold=110
-    [/resistance]
     movement=5
     experience=75
     level=2
@@ -16,34 +13,54 @@
     advances_to=Dune Spearmaster
     cost=38
     usage=fighter
-    description= _ "Although the Dunefolk armies are known for their astonishing mobility and fierce attack, they can be able defenders. Spearguard excel at holding their ground, keeping opponents at bay with long, razor sharp spears. Their preferred strategy is to gradually wear down enemies, until they can be defeated in a vicious counter stroke."+{SPECIAL_NOTES}+{SPECIAL_NOTES_FIRSTSTRIKE}
+    description= _ "The push and pull of any battle requires varying degrees of offense and defense. The Dunefolk no doubt value offense as the greater of the two and focus their greatest efforts on training skilled swordsmen, but in any band of warriors, a small number of soldiers opt to trade in their sword and instead fulfill the vital duties of the Spearguard. Guarding crucial supply lines and vantage points, Spearguards are most often positioned slightly behind the main line and used as a supporting force or a deterrent to flanking attacks. Though these fighters tend to see less direct combat than their sword-wielding brethren, they are highly skilled with spear and shield and more than capable of repelling most advances."+{SPECIAL_NOTES}+{SPECIAL_NOTES_FIRSTSTRIKE}
-    die_sound={SOUND_LIST:ELF_HIT}
+    die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/dunefolk/spearguard.png" "units/dunefolk/spearguard.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/spearguard.png" "units/dunefolk/spearguard.png" {SOUND_LIST:HUMAN_HIT} }
-    {TRAIT_FEARLESS}
+
+    [resistance]
+        pierce=70
+    [/resistance]
+
     [attack]
         name=spear
         description=_"spear"
-        icon=attacks/spear.png
         type=pierce
         range=melee
-        damage=15
+        damage=16
         number=2
+        icon=attacks/spear.png
         [specials]
             {WEAPON_SPECIAL_FIRSTSTRIKE}
         [/specials]
     [/attack]
+    [attack]
+        name=shield bash
+        description= _ "shield bash"
+        type=impact
+        range=melee
+        damage=9
+        number=3
+        icon=attacks/heater-shield.png
+    [/attack]
 
     [attack_anim]
         [filter_attack]
             name=spear
         [/filter_attack]
-
         start_time=-200
-
         [frame]
             image="units/dunefolk/spearguard.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}
     [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=shield bash
+        [/filter_attack]
+        start_time=-200
+        [frame]
+            image="units/dunefolk/spearguard.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
+    [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Spearmaster.cfg

@@ -4,11 +4,8 @@
     name= _ "Dune Spearmaster"
     race=dunefolk
     image="units/dunefolk/spearmaster.png"
-    hitpoints=70
+    hitpoints=67
     movement_type=dunearmoredfoot
-    [resistance]
-        cold=110
-    [/resistance]
     movement=5
     experience=150
     level=3
@@ -17,34 +14,56 @@
     {AMLA_DEFAULT}
     cost=51
     usage=fighter
-    description= _ "Spread across the Dunefolk's lands are lonely towers and garrisons that provide shelter to caravans and locals from bandits and monsters. These bastions are defended by the most determined of soldiers, who have often faced off against overwhelming odds only to repel the invaders. In an army they can be trusted to hold any position or line, long after lesser soldiers and men have fled in terror."+{SPECIAL_NOTES}+{SPECIAL_NOTES_FIRSTSTRIKE}
+    description= _ "Among the Dunefolk armies, the highest prestige goes to the master swordsmen leading every assault. Though honored for their service in battle, those who wield the spear and shield are largely forgotten beyond that: the path of a spearman is to fulfill the least desirable role in combat without glory or recognition. When a Dunefolk assault fails and a retreat must be had, a rank of Spearguards is usually left behind to hold back the counterassault. Though providing a formidable defense, the shield line is inevitably overwhelmed and most of the Spearguards lost to the maw of war. On the off chance that one manages to survive and find his way back to the recuperating army, he is often reprimanded for failing to stand his ground and die with the rest of his unnamed brethren. Nevertheless, after a minor scolding, the warrior is accepted back and carries his hard won experience into the next battle.
-    die_sound={SOUND_LIST:ELF_HIT}
+
-    {DEFENSE_ANIM "units/dunefolk/spearmaster.png" "units/dunefolk/spearmaster.png" {SOUND_LIST:ELF_HIT} }
+It is not a formal title, but ‘Spearmaster’ is what Spearguards call their companions who manage to return from the usually suicidal defense that the Dunefolk mount to guard their retreats. Hardly a term of praise or distinction, it is still a modicum of recognition for those who were prepared to die as nameless martyrs to protect their brethren."+{SPECIAL_NOTES}+{SPECIAL_NOTES_FIRSTSTRIKE}
-    {TRAIT_FEARLESS}
+    die_sound={SOUND_LIST:HUMAN_DIE}
+    {DEFENSE_ANIM "units/dunefolk/spearmaster.png" "units/dunefolk/spearmaster.png" {SOUND_LIST:HUMAN_HIT} }
+
+    [resistance]
+        pierce=60
+    [/resistance]
+
     [attack]
         name=spear
         description=_"spear"
-        icon=attacks/spear.png
         type=pierce
         range=melee
-        damage=15
+        damage=23
-        number=3
+        number=2
+        icon=attacks/spear.png
         [specials]
             {WEAPON_SPECIAL_FIRSTSTRIKE}
         [/specials]
     [/attack]
+    [attack]
+        name=shield bash
+        description= _ "shield bash"
+        type=impact
+        range=melee
+        damage=14
+        number=3
+        icon=attacks/heater-shield.png
+    [/attack]
 
     [attack_anim]
         [filter_attack]
             name=spear
         [/filter_attack]
-
         start_time=-200
-
         [frame]
             image="units/dunefolk/spearmaster.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}
     [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=shield bash
+        [/filter_attack]
+        start_time=-200
+        [frame]
+            image="units/dunefolk/spearmaster.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
+    [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Strider.cfg

@@ -0,0 +1,92 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Dune Strider
+    name= _ "female^Dune Strider"
+    race=dunefolk
+    gender=female
+    image="units/dunefolk/strider.png"
+    hitpoints=39
+    movement_type=duneelusivefoot
+    movement=6
+    experience=74
+    level=2
+    alignment=lawful
+    advances_to=Dune Harrier
+    cost=33
+    usage=mixed fighter
+    description= _ "The power of any Dunefolk assault is inhibited by one major drawback: organized Dunefolk forces tend to be rather slow. Because of this, enemy forces often have the ability to regroup and call upon reinforcements, in which case a second assault becomes much more difficult. To combat this, Dune Striders exchange their rudimentary slings with heavy bolas, allowing them to slow retreating lines from the side and prevent a clean escape. The same tactic can be applied in the opposite scenario of a Dunefolk retreat; an advancing army can be hampered, allowing injured Dunefolk warriors time to recuperate. The danger of such a tactic is that despite their elusiveness, Striders are fairly fragile in direct combat and are easily taken down if left exposed."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SKIRMISHER}+{SPECIAL_NOTES_SLOW}
+    die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
+    {DEFENSE_ANIM "units/dunefolk/strider.png" "units/dunefolk/strider.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
+
+    [abilities]
+        {ABILITY_SKIRMISHER}
+    [/abilities]
+
+    [attack]
+        name=spear
+        description= _ "spear"
+        type=pierce
+        range=melee
+        damage=6
+        number=4
+        icon=attacks/spear.png
+        [specials]
+            {WEAPON_SPECIAL_FIRSTSTRIKE}
+        [/specials]
+    [/attack]
+    [attack]
+        name=bolas
+        description= _ "bolas"
+        type=impact
+        range=ranged
+        damage=7
+        number=2
+        icon=attacks/bolas.png
+        [specials]
+            {WEAPON_SPECIAL_SLOW}
+        [/specials]
+    [/attack]
+
+    [attack_anim]
+        [filter_attack]
+            name=spear
+        [/filter_attack]
+        start_time=-250
+        [frame]
+            image="units/dunefolk/strider.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=bolas
+        [/filter_attack]
+        start_time=-225
+        missile_start_time=-150
+        [if]
+            hits=yes
+            [missile_frame]
+                duration=150
+                image="projectiles/bolas-n.png"
+                image_diagonal="projectiles/bolas-ne.png"
+                offset=0~0.8
+            [/missile_frame]
+            [frame]
+                image="units/dunefolk/strider.png:300"
+                sound=sling.ogg
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [missile_frame]
+                duration=150
+                image="projectiles/bolas-n.png"
+                image_diagonal="projectiles/bolas-ne.png"
+            [/missile_frame]
+            [frame]
+                image="units/dunefolk/strider.png:300"
+                sound=sling-miss.ogg
+            [/frame]
+        [/else]
+    [/attack_anim]
+[/unit_type]

data/core/units/dunefolk/Sunderer.cfg

@@ -4,69 +4,71 @@
     name= _ "Dune Sunderer"
     race=dunefolk
     image="units/dunefolk/sunderer.png"
-    hitpoints=50
+    hitpoints=58
     movement_type=dunearmoredhorse
-    movement=6
+    movement=7
-    experience=70
+    experience=76
     level=2
     alignment=lawful
     advances_to=Dune Cataphract
-    cost=40
+    cost=36
     usage=fighter
-    description= _ "Those Piercers who distinguish themselves in battle are given the opportunity to prove themselves worthy of becoming a Sunderer. Those who pass the trial are given the traditional barding for their horse, distinguishing them from the rest of the Dunefolk cavalry. Consummate horsemen, the Sunderers have long claimed they need only a single lance strike to kill a man."
+    description= _ "Among the many different type of Dune horsemen, there are those who most enjoy the frantic melee at the heart of battle. Those who are so disposed—and skilled enough to survive multiple skirmishes—are recruited into the ranks of the Sunderers. As sturdy, robust warriors, these men usually bear short-ranged maces, a rather odd choice of weaponry for most riders. That is not to say Sunderers are impotent in any way: though not typically effective chargers, even a small group of Sunderers is powerful enough breach any enemy line through sheer force. In a situation that requires it, these horsemen possess enough skill with the bow to weaken enemy forces or pick off fleeing stragglers."
-    die_sound={SOUND_LIST:ELF_HIT}
+    die_sound=horse-die.ogg
-    {DEFENSE_ANIM "units/dunefolk/sunderer.png" "units/dunefolk/sunderer.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/sunderer.png" "units/dunefolk/sunderer.png" {SOUND_LIST:HORSE_HIT} }
-    [attack]
+
-        name=lance
+    [resistance]
-        description= _ "lance"
+        blade=80
-        type=pierce
+        impact=80
-        range=melee
+    [/resistance]
-        damage=29
+
-        number=1
-    [/attack]
     [attack]
         name=mace
         description= _ "mace"
         type=impact
         range=melee
-        damage=9
+        damage=11
         number=3
+        icon=attacks/mace.png
+    [/attack]
+    [attack]
+        name=composite bow
+        description= _ "composite bow"
+        type=pierce
+        range=ranged
+        damage=5
+        number=3
+        icon=attacks/bow-short-reinforced.png
     [/attack]
 
     [attack_anim]
         [filter_attack]
-            name=lance
+            name=mace
         [/filter_attack]
-
         start_time=-250
         horse_sound_start_time=-250
-
         [frame]
             image="units/dunefolk/sunderer.png:400"
         [/frame]
-
         [horse_sound_frame]
             sound=horse-canter.wav
         [/horse_sound_frame]
-
+        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
-        {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -75}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
-            name=mace
+            name=composite bow
         [/filter_attack]
-
         start_time=-250
-        horse_sound_start_time=-250
+        missile_start_time=-150
-
+        [missile_frame]
+            duration=150
+            image="projectiles/missile-n.png"
+            image_diagonal="projectiles/missile-ne.png"
+        [/missile_frame]
         [frame]
-            image="units/dunefolk/sunderer.png:400"
+            image="units/dunefolk/sunderer.png:300"
         [/frame]
-
+        {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}
-        [horse_sound_frame]
-            sound=horse-canter.wav
-        [/horse_sound_frame]
-
-        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Swiftrider.cfg

@@ -4,73 +4,66 @@
     name= _ "Dune Swiftrider"
     race=dunefolk
     image="units/dunefolk/swiftrider.png"
-    hitpoints=39
+    hitpoints=44
     movement_type=dunehorse
     movement=8
-    experience=64
+    experience=90
     level=2
     alignment=liminal
     advances_to=Dune Windrider
-    cost=35
+    cost=36
     usage=archer
-    undead_variation=mounted
+    description= _ "Swiftriders are those who favor archery over melee weaponry. Fleet and elusive, these horsemen are experts at harassing less mobile foes with hails of arrows. As excellent skirmishers in the desert, Swiftriders are most often used as combat scouts or to hunt down fleeing enemies. Though not usually trained for infiltration or spying, these equestrians’ ability to pass messages from afar with their long-ranged arrows is of great use to maintain communication among the Dunefolk armies."
-    description= _ "Riders who demonstrate exceptional skill with the bow are made into Swiftriders, spending hours every day practicing and building a rapport with their steed. This has made them the fastest riders in the Dunefolk armies, and a wise Warmaster uses this to their advantage."
     die_sound=horse-die.ogg
     {DEFENSE_ANIM "units/dunefolk/swiftrider.png" "units/dunefolk/swiftrider.png" {SOUND_LIST:HORSE_HIT} }
+
     [attack]
         name=mace
         description= _ "mace"
         type=impact
         range=melee
-        damage=6
+        damage=7
         number=2
+        icon=attacks/mace.png
     [/attack]
     [attack]
         name=composite bow
         description= _ "composite bow"
-        icon=attacks/bow-elven.png
         type=pierce
         range=ranged
         damage=7
         number=4
+        icon=attacks/bow-short-reinforced.png
     [/attack]
 
     [attack_anim]
         [filter_attack]
             name=mace
         [/filter_attack]
-
         start_time=-250
         horse_sound_start_time=-250
-
         [frame]
             image="units/dunefolk/swiftrider.png:400"
         [/frame]
-
         [horse_sound_frame]
             sound=horse-canter.wav
         [/horse_sound_frame]
-
         {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
             name=composite bow
         [/filter_attack]
-
         start_time=-250
         missile_start_time=-150
-
         [missile_frame]
             duration=150
             image="projectiles/missile-n.png"
             image_diagonal="projectiles/missile-ne.png"
         [/missile_frame]
-
         [frame]
             image="units/dunefolk/swiftrider.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Swordsman.cfg

@@ -4,11 +4,8 @@
     name= _ "Dune Swordsman"
     race=dunefolk
     image="units/dunefolk/swordsman.png"
-    hitpoints=58
+    hitpoints=56
     movement_type=dunearmoredfoot
-    [resistance]
-        cold=110
-    [/resistance]
     movement=5
     experience=75
     level=2
@@ -16,59 +13,40 @@
     advances_to=Dune Blademaster
     cost=38
     usage=fighter
-    description= _ "Armed with their sword and shield, Swordsman are warriors of some renown among the Dunefolk armies. They have further refined their combat arts, adding a powerful shield bash to knock back unsuspecting enemies. Though few in number, their presence can be decisive in dislodging even the most hardened redoubt."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}+{SPECIAL_NOTES_SLOW}
+    description= _ "In a direct clash of large armies, the Dunefolk commonly encounter either densely packed ‘Shield Walls’ or heavily fortified enemy positions. Striking against these highly organized fronts can be quite challenging; an enemy formation might leave only small, brief gaps between shields and armor, while threatening a counterstrike with a thrust of spears and projectiles. Thus, Dunefolk swordplay places a heavy emphasis on power and more importantly, precision. A warrior might find only one chance to strike at an enemy, but an experienced Dune Swordsman is more than likely to seize the opportunity and make his strike count. Honing in with nearly unnatural accuracy, a contingent of of Swordsmen is enough to crack even the sternest of defenses."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}
-    die_sound={SOUND_LIST:ELF_HIT}
+    die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/dunefolk/swordsman.png" "units/dunefolk/swordsman.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/swordsman.png" "units/dunefolk/swordsman.png" {SOUND_LIST:HUMAN_HIT} }
-    {TRAIT_FEARLESS}
+
     [attack]
-        name=sword
+        name=scimitar
-        description= _ "sword"
+        description= _ "scimitar"
-        icon=attacks/longsword.png
         type=blade
         range=melee
-        damage=13
+        damage=15
         number=2
+        icon=attacks/scimitar.png
+    [/attack]
+    [attack]
+        name=scimitar
+        description= _ "scimitar"
+        type=blade
+        range=melee
+        damage=12
+        number=2
+        icon=attacks/scimitar.png
         [specials]
             {WEAPON_SPECIAL_MARKSMAN}
         [/specials]
     [/attack]
-    [attack]
-        name=shield bash
-        description= _ "shield bash"
-        icon=attacks/heater-shield.png #TODO: add "correct" shield form!
-        type=impact
-        range=melee
-        damage=10
-        number=1
-        [specials]
-            {WEAPON_SPECIAL_SLOW}
-        [/specials]
-    [/attack]
 
     [attack_anim]
         [filter_attack]
-            name=sword
+            name=scimitar
         [/filter_attack]
-
         start_time=-200
-
         [frame]
-            image="units/dunefolk/swordsman.png:300"
+            image="units/dunefolk/swordsman.png"
         [/frame]
-
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
     [/attack_anim]
-    [attack_anim]
-        [filter_attack]
-            name=shield bash
-        [/filter_attack]
-
-        start_time=-200
-
-        [frame]
-            image="units/dunefolk/swordsman.png:300"
-        [/frame]
-
-        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
-    [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Warmaster.cfg

@@ -4,78 +4,47 @@
     name= _ "Dune Warmaster"
     race=dunefolk
     image="units/dunefolk/warmaster.png"
-    hitpoints=82
+    [leading_anim]
+        start_time=-150
+        [frame]
+            image="units/dunefolk/warmaster.png"
+        [/frame]
+    [/leading_anim]
+    hitpoints=57
     movement_type=dunearmoredfoot
-    [resistance]
-        cold=110
-    [/resistance]
     movement=5
-    experience=200
+    experience=150
-    level=4
+    level=3
-    alignment=lawful
+    alignment=liminal
     advances_to=null
-#ifdef ENABLE_WARMASTER
-    [advancefrom]
-        unit=Dune Blademaster
-        experience=150
-    [/advancefrom]
-#endif
     {AMLA_DEFAULT}
-    cost=78
+    cost=56
-    usage=fighter
+    usage=mixed fighter
-    description= _ "Among every generation, a warrior elevates himself above his peers and foes; They seem to be able to alter the destiny of the world themselves. Often given the name Warmaster, these individuals are celebrated for their strength and skill. Their travels and travails are told endlessly around the campfire with the reverent tones of those that speak of living legends."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}+{SPECIAL_NOTES_SLOW}
+    [abilities]
-    die_sound={SOUND_LIST:ELF_HIT}
+        {ABILITY_LEADERSHIP}
-    {DEFENSE_ANIM "units/dunefolk/warmaster.png" "units/dunefolk/warmaster.png" {SOUND_LIST:ELF_HIT} }
+    [/abilities]
-    {TRAIT_FEARLESS}
+    description= _ "In direct contrast with other Dunefolk commanders, Warmasters focus heavily on rousing their troops and maintaining high morale. These generals are often found at the forefront of battle, leading by example and fighting and bleeding alongside their soldiers. While Warmasters usually leave the finer details of strategy to their Captains, they are certainly capable tacticians as well; many a battle has been won on an inventive or surprise maneuver that is often the creative byproduct of combat experience rather than formal training. Said to be a veteran of a thousand battles, a Warmaster is an expert leader that should never be underestimated."{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
+    die_sound={SOUND_LIST:HUMAN_DIE}
+    {DEFENSE_ANIM "units/dunefolk/warmaster.png" "units/dunefolk/warmaster.png" {SOUND_LIST:HUMAN_HIT} }
+
     [attack]
-        name=sword
+        name=scimitar
-        description= _ "sword"
+        description= _ "scimitar"
-        icon=attacks/longsword.png
         type=blade
         range=melee
-        damage=13
+        damage=9
         number=4
-        [specials]
+        icon=attacks/scimitar.png
-            {WEAPON_SPECIAL_MARKSMAN}
-        [/specials]
-    [/attack]
-    [attack]
-        name=pommel strike
-        description= _ "pommel strike"
-        icon=attacks/quarterstaff.png
-        type=impact
-        range=melee
-        damage=11
-        number=3
-        [specials]
-            {WEAPON_SPECIAL_SLOW}
-        [/specials]
     [/attack]
 
     [attack_anim]
         [filter_attack]
-            name=sword
+            name=scimitar
         [/filter_attack]
-
         start_time=-200
-
         [frame]
             image="units/dunefolk/warmaster.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
     [/attack_anim]
-    [attack_anim]
-        [filter_attack]
-            name=shield bash
-        [/filter_attack]
-
-        start_time=-200
-
-        [frame]
-            image="units/dunefolk/warmaster.png:300"
-        [/frame]
-
-        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
-    [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Windrider.cfg

@@ -4,7 +4,7 @@
     name= _ "Dune Windrider"
     race=dunefolk
     image="units/dunefolk/windrider.png"
-    hitpoints=47
+    hitpoints=52
     movement_type=dunehorse
     movement=8
     experience=150
@@ -14,64 +14,61 @@
     {AMLA_DEFAULT}
     cost=50
     usage=archer
-    undead_variation=mounted
+    description= _ "Archery on horseback presents a number of additional challenges that very few are able to overcome. What separates the renowned Windrider caste from other bowmen is their ability to not only master these difficulties, but turn them into benefits instead. Making great use of their steeds’ incredible speed, a Windrider is actually a better archer when mounted as compared to on land. The extra momentum from riding on horseback provides additional force to their already potent shots, and by riding in meandering patterns, these bowmen are able to curve the trajectories of their arrows, reaching targets they might not be able to otherwise. Having honed their craft to its apex, Windriders are undisputed masters of ranged combat among the Dunefolk."
-    description= _ "The elite of the Swiftriders are the Windriders, horse archers of such speed and dexterity that rumors are always spread that they have elven blood. Irritated at such mystical nonsense, the Windriders can frequently be found demonstrating their exceptional skill at the forefront of battle, riding with great speed through the lines of battle to rain arrows down upon the enemy."
     die_sound=horse-die.ogg
     {DEFENSE_ANIM "units/dunefolk/windrider.png" "units/dunefolk/windrider.png" {SOUND_LIST:HORSE_HIT} }
+
+    [resistance]
+        blade=90
+    [/resistance]
+
     [attack]
         name=mace
         description= _ "mace"
         type=impact
         range=melee
-        damage=7
+        damage=10
-        number=3
+        number=2
+        icon=attacks/mace.png
     [/attack]
     [attack]
         name=composite bow
         description= _ "composite bow"
-        icon=attacks/bow-elven.png
         type=pierce
         range=ranged
         damage=8
         number=5
+        icon=attacks/bow-short-reinforced.png
     [/attack]
 
     [attack_anim]
         [filter_attack]
             name=mace
         [/filter_attack]
-
         start_time=-250
         horse_sound_start_time=-250
-
         [frame]
             image="units/dunefolk/windrider.png:400"
         [/frame]
-
         [horse_sound_frame]
             sound=horse-canter.wav
         [/horse_sound_frame]
-
         {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
             name=composite bow
         [/filter_attack]
-
         start_time=-250
         missile_start_time=-150
-
         [missile_frame]
             duration=150
             image="projectiles/missile-n.png"
             image_diagonal="projectiles/missile-ne.png"
         [/missile_frame]
-
         [frame]
             image="units/dunefolk/windrider.png:300"
         [/frame]
-
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}
     [/attack_anim]
 [/unit_type]

data/core/units/dunefolk/Wyvern_Rider.cfg

@@ -54,13 +54,13 @@
         [filter_attack]
             name=javelin
         [/filter_attack]
-        
+
         start_time=-200
-        
+
         [frame]
             image="units/dunefolk/wyvern-rider.png:300"
         [/frame]
-        
+
         {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}
     [/attack_anim]
 [/unit_type]

data/core/units/elves/Rider.cfg

@@ -18,7 +18,7 @@
     #mostly like a foot Elf, but they
     #aren't good at defending in villages
     #they are weak against piercing attacks
-   description= _ "The prevalence of guerrilla tactics in Elven strategy results in great emphasis on maintaining highly mobile units capable of fighting on an adaptable battlefront. This style of warfare requires rapid communication between small skirmish groups and the ability to quickly transfer troops between combat zones. Experienced Elvish riders know this well and thus devote most of their time to improving their horsemanship rather than their individual fighting skills. The speed at which they travel through the forest would be suicidal for any other cavalry, and they are tenacious enough to ride for as much as two or three days at a time without resting. While the intelligence and communication these horsemen provide is invaluable to Elven tactics, the lack of combat prowess and front line engagement means that Elvish riders are the oft unsung heroes of war, left supporting their brethren from the back lines."
+    description= _ "The prevalence of guerrilla tactics in Elven strategy results in great emphasis on maintaining highly mobile units capable of fighting on an adaptable battlefront. This style of warfare requires rapid communication between small skirmish groups and the ability to quickly transfer troops between combat zones. Experienced Elvish riders know this well and thus devote most of their time to improving their horsemanship rather than their individual fighting skills. The speed at which they travel through the forest would be suicidal for any other cavalry, and they are tenacious enough to ride for as much as two or three days at a time without resting. While the intelligence and communication these horsemen provide is invaluable to Elven tactics, the lack of combat prowess and front line engagement means that Elvish riders are the oft unsung heroes of war, left supporting their brethren from the back lines."
     die_sound=horse-die.ogg
     [defense]
         village=50

data/core/units/humans/Horse_Lancer.cfg

@@ -30,7 +30,7 @@
         number=3
     [/attack]
     {DEFENSE_ANIM_FILTERED "units/human-loyalists/lancer/lancer-se-defend2-miss.png" "units/human-loyalists/lancer/lancer-se-defend1-miss.png" {SOUND_LIST:HORSE_HIT} (hits=miss)}
-    {DEFENSE_ANIM_FILTERED "units/human-loyalists/lancer/lancer-se-defend2.png" "units/human-loyalists/lancer/lancer-se-defend1.png" {SOUND_LIST:HORSE_HIT} (hits=hit,kill)}    
+    {DEFENSE_ANIM_FILTERED "units/human-loyalists/lancer/lancer-se-defend2.png" "units/human-loyalists/lancer/lancer-se-defend1.png" {SOUND_LIST:HORSE_HIT} (hits=hit,kill)}
     [movement_anim]
         start_time=0
         [frame]
@@ -42,7 +42,7 @@
             name=lance
         [/filter_attack]
         start_time=-250
-# this is a placeholder, it looks better than the lance-up default image, but it is not really an animation
+        # this is a placeholder, it looks better than the lance-up default image, but it is not really an animation
         [frame]
             image="units/human-loyalists/lancer/lancer-se-attack1.png:25"
             sound=horse-canter.wav

data/core/units/merfolk/Siren.cfg

@@ -66,7 +66,7 @@ The myriad applications of this rarely occur to land dwellers, who simply regard
             image="units/merfolk/siren-magic-1.png:200"
         [/frame]
         [frame]
-            image="units/merfolk/siren-magic-2.png:200" 
+            image="units/merfolk/siren-magic-2.png:200"
             sound=water-blast.wav
         [/frame]
         [frame]

data/core/units/monsters/Elder_Falcon.cfg

@@ -3,7 +3,7 @@
     id=Elder Falcon
     name= _ "Elder Falcon"
     race=falcon
-    image="units/dunefolk/elder-falcon.png"
+    image="units/monsters/elder-falcon.png"
     {TRAIT_FERAL_MUSTHAVE}
     hitpoints=27
     movement_type=lightfly
@@ -17,7 +17,7 @@
     usage=scout
     description= _ "Elder Falcons bear the telltale scars of veteran warriors from protecting their masters, their bodies proof of repeated dives into a swirling melee. Stronger and faster than their younger kin, they are rumored to hit with enough force to remove an enemy's head. "+{SPECIAL_NOTES}+{SPECIAL_NOTES_CHARGE}
     die_sound={SOUND_LIST:GRYPHON_DIE}
-    {DEFENSE_ANIM "units/dunefolk/elder-falcon.png" "units/dunefolk/elder-falcon.png" {SOUND_LIST:GRYPHON_HIT} }
+    {DEFENSE_ANIM "units/monsters/elder-falcon.png" "units/monsters/elder-falcon.png" {SOUND_LIST:GRYPHON_HIT} }
     [defense]
         village=50
     [/defense]
@@ -50,7 +50,7 @@
         start_time=-200
 
         [frame]
-            image="units/dunefolk/elder-falcon.png:300"
+            image="units/monsters/elder-falcon.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS claws.ogg {SOUND_LIST:MISS} -100}
@@ -63,7 +63,7 @@
         start_time=-200
 
         [frame]
-            image="units/dunefolk/elder-falcon.png:300"
+            image="units/monsters/elder-falcon.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -100}

data/core/units/monsters/Falcon.cfg

@@ -3,7 +3,7 @@
     id=Falcon
     name= _ "Falcon"
     race=falcon
-    image="units/dunefolk/falcon.png"
+    image="units/monsters/falcon.png"
     {TRAIT_FERAL_MUSTHAVE}
     hitpoints=18
     movement_type=lightfly
@@ -16,7 +16,7 @@
     usage=scout
     description= _ "Seen as status symbols of the nobles, falcons are precious possessions normally used for sport. The same techniques are employed to rend and tear foes on the battlefield, and their great speed is a boon to scouting out the land."+{SPECIAL_NOTES}+{SPECIAL_NOTES_CHARGE}
     die_sound={SOUND_LIST:GRYPHON_DIE}
-    {DEFENSE_ANIM "units/dunefolk/falcon.png" "units/dunefolk/falcon.png" {SOUND_LIST:GRYPHON_HIT} }
+    {DEFENSE_ANIM "units/monsters/falcon.png" "units/monsters/falcon.png" {SOUND_LIST:GRYPHON_HIT} }
     [defense]
         village=50
     [/defense]
@@ -49,7 +49,7 @@
         start_time=-200
 
         [frame]
-            image="units/dunefolk/falcon.png:300"
+            image="units/monsters/falcon.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS claws.ogg {SOUND_LIST:MISS} -100}
@@ -62,7 +62,7 @@
         start_time=-200
 
         [frame]
-            image="units/dunefolk/falcon.png:300"
+            image="units/monsters/falcon.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -100}

data/core/units/nagas/Bladewhirler.cfg

@@ -0,0 +1,87 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Naga Bladewhirler
+    name= _ "Naga Bladewhirler"
+    race=naga
+    gender=male
+    image="units/nagas/bladewhirler.png"
+    profile=portraits/nagas/fighter.png
+    hitpoints=46
+    movement_type=naga
+    movement=7
+    experience=76
+    level=2
+    alignment=liminal
+    advances_to=Naga Dervish
+    cost=27
+    usage=fighter
+    description= _ "Experienced warriors of the Southern Naga often find work as mercenaries, usually hired by neighboring Dunefolk to control key waterways near the coastline. Though generally amicable with their wealthy employers, this friendliness should not be mistaken for loyalty. Bladewhirlers, in particular, are known for readily switching between rival city-state factions at the start of each shipping season, when demand for water-based protection is the highest. By encouraging a healthy amount of competition, these nagas ensure that their services are always sought after by one tribe or another."
+    die_sound=naga-die.ogg
+    {DEFENSE_ANIM "units/nagas/bladewhirler.png" "units/nagas/bladewhirler.png" {SOUND_LIST:NAGA_HIT} }
+    [defense]
+        flat=60
+        sand=50
+    [/defense]
+
+    [attack]
+        name=curved blade
+        description=_"curved blade"
+        type=blade
+        range=melee
+        damage=8
+        number=3
+        icon=attacks/blade-curved.png
+    [/attack]
+    [attack]
+        name=bow
+        description= _"bow"
+        type=pierce
+        range=ranged
+        damage=6
+        number=2
+        icon=attacks/bow-orcish.png
+    [/attack]
+
+    [attack_anim]
+        [filter_attack]
+            name=curved blade
+        [/filter_attack]
+        start_time=-200
+        [frame]
+            image="units/nagas/bladewhirler.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -150}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=bow
+        [/filter_attack]
+        start_time=-225
+        missile_start_time=-150
+        [if]
+            hits=yes
+            [missile_frame]
+                duration=150
+                image="projectiles/missile-n.png"
+                image_diagonal="projectiles/missile-ne.png"
+                offset=0~0.8
+            [/missile_frame]
+            [frame]
+                image="units/nagas/bladewhirler.png:300"
+                sound=bow.ogg
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [missile_frame]
+                duration=150
+                image="projectiles/missile-n.png"
+                image_diagonal="projectiles/missile-ne.png"
+            [/missile_frame]
+            [frame]
+                image="units/nagas/bladewhirler.png:300"
+                sound=bow-miss.ogg
+            [/frame]
+        [/else]
+    [/attack_anim]
+[/unit_type]

data/core/units/nagas/Dervish.cfg

@@ -0,0 +1,89 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Naga Dervish
+    name= _ "Naga Dervish"
+    race=naga
+    gender=male
+    image="units/nagas/dervish.png"
+    profile=portraits/nagas/fighter.png
+    hitpoints=57
+    movement_type=naga
+    movement=7
+    experience=100
+    level=3
+    alignment=liminal
+    advances_to=null
+    {AMLA_DEFAULT}
+    cost=48
+    usage=fighter
+    description= _ "While they sometimes still stand in as sellswords for potential Dunefolk allies, Naga Dervishes are more often the keepers of trade routes and resource beds close to waterways. For the right fee or exchange of goods, a Dervish will guarantee safe travel or free access to valuable supplies in his territory. Rubbed the wrong way and a Dervish becomes a fearsome foe—not because of their personal strength in combat, but instead due to the numerous allies that he can call upon to quash any potential nuisance. Though perfectly capable warriors when the time is necessary, these experienced mercenaries know perfectly well that the best methods for generating money are those that do not place themselves in danger."
+    die_sound=naga-die.ogg
+    {DEFENSE_ANIM "units/nagas/dervish.png" "units/nagas/dervish.png" {SOUND_LIST:NAGA_HIT} }
+
+    [defense]
+        flat=50
+        sand=40
+    [/defense]
+
+    [attack]
+        name=curved blade
+        description=_"curved blade"
+        type=blade
+        range=melee
+        damage=10
+        number=4
+        icon=attacks/blade-curved.png
+    [/attack]
+    [attack]
+        name=bow
+        description= _"bow"
+        type=pierce
+        range=ranged
+        damage=9
+        number=2
+        icon=attacks/bow-orcish.png
+    [/attack]
+
+    [attack_anim]
+        [filter_attack]
+            name=curved blade
+        [/filter_attack]
+        start_time=-200
+        [frame]
+            image="units/nagas/dervish.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -150}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=bow
+        [/filter_attack]
+        start_time=-225
+        missile_start_time=-150
+        [if]
+            hits=yes
+            [missile_frame]
+                duration=150
+                image="projectiles/missile-n.png"
+                image_diagonal="projectiles/missile-ne.png"
+                offset=0~0.8
+            [/missile_frame]
+            [frame]
+                image="units/nagas/dervish.png:300"
+                sound=bow.ogg
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [missile_frame]
+                duration=150
+                image="projectiles/missile-n.png"
+                image_diagonal="projectiles/missile-ne.png"
+            [/missile_frame]
+            [frame]
+                image="units/nagas/dervish.png:300"
+                sound=bow-miss.ogg
+            [/frame]
+        [/else]
+    [/attack_anim]
+[/unit_type]

data/core/units/nagas/Ringcaster.cfg

@@ -0,0 +1,88 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Naga Ringcaster
+    name= _ "Naga Ringcaster"
+    race=naga
+    gender=male
+    image="units/nagas/ringcaster.png"
+    profile=portraits/nagas/fighter.png
+    hitpoints=37
+    movement_type=naga
+    movement=7
+    experience=76
+    level=2
+    alignment=liminal
+    advances_to=Naga Zephyr
+    cost=27
+    usage=fighter
+    description= _ "The blade ring, or chakram, is the signature weapon of the southern Naga and their renowned Ringcasters. These nagas choose their tools with great care: the process of forging a chakram underwater is quite tricky and usually results in weapons with a fair bit of variance. Each Ringcaster picks a specific set of chakrams that suits them, whether it be rings with high uniformity for faster spinning, blades with a slight bit of wobble for unpredictability, or lopsided rings for curved trajectories. As different as each blade ring is coming out of the forge, each Ringcaster has a different fighting style to which their tools are tailored."
+    die_sound=naga-die.ogg
+    {DEFENSE_ANIM "units/nagas/ringcaster.png" "units/nagas/ringcaster.png" {SOUND_LIST:NAGA_HIT} }
+
+    [defense]
+        flat=60
+        sand=50
+    [/defense]
+
+    [attack]
+        name=chakram_melee
+        description=_"chakram"
+        type=blade
+        range=melee
+        damage=4
+        number=3
+        icon=attacks/chakram.png
+    [/attack]
+    [attack]
+        name=chakram
+        description= _"chakram"
+        type=blade
+        range=ranged
+        damage=6
+        number=4
+        icon=attacks/chakram.png
+    [/attack]
+
+    [attack_anim]
+        [filter_attack]
+            name=chakram_melee
+        [/filter_attack]
+        start_time=-200
+        [frame]
+            image="units/nagas/ringcaster.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -150}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=chakram
+        [/filter_attack]
+        start_time=-225
+        missile_start_time=-150
+        [if]
+            hits=yes
+            [missile_frame]
+                duration=150
+                image="projectiles/missile-n.png"
+                image_diagonal="projectiles/missile-ne.png"
+                offset=0~0.8
+            [/missile_frame]
+            [frame]
+                image="units/nagas/ringcaster.png:300"
+                sound=hatchet.wav
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [missile_frame]
+                duration=150
+                image="projectiles/missile-n.png"
+                image_diagonal="projectiles/missile-ne.png"
+            [/missile_frame]
+            [frame]
+                image="units/nagas/ringcaster.png:300"
+                sound=hatchet-miss.wav
+            [/frame]
+        [/else]
+    [/attack_anim]
+[/unit_type]

data/core/units/nagas/Slasher.cfg

@@ -0,0 +1,83 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Naga Slasher
+    name= _ "Naga Slasher"
+    race=naga
+    gender=male
+    image="units/nagas/slasher.png"
+    profile=portraits/nagas/fighter.png
+    hitpoints=31
+    movement_type=naga
+    movement=7
+    experience=38
+    level=1
+    alignment=liminal
+    advances_to=Naga Bladewhirler,Naga Ringcaster
+    cost=15
+    usage=fighter
+    description= _ "In contrast to the heavily melee-focused style of their northern brethren, young Naga of the southern tribes prefer to carry small bows, with which they used to pepper their prey with arrows. While finishing off any water-based enemies usually must be done at close range, softening foes with ranged attacks is usually much less dangerous than rushing headlong directly into the fray. Sometimes viewed as cowardly by more proper Naga warriors, these fighters are nonetheless effective when it comes time to engage in warfare."
+    die_sound=naga-die.ogg
+    {DEFENSE_ANIM "units/nagas/slasher.png" "units/nagas/slasher.png" {SOUND_LIST:NAGA_HIT} }
+
+    [attack]
+        name=dagger
+        description=_"dagger"
+        type=blade
+        range=melee
+        damage=4
+        number=3
+        icon=attacks/dagger-curved.png
+    [/attack]
+    [attack]
+        name=bow
+        description= _"bow"
+        type=pierce
+        range=ranged
+        damage=6
+        number=2
+        icon=attacks/bow-orcish.png
+    [/attack]
+
+    [attack_anim]
+        [filter_attack]
+            name=dagger
+        [/filter_attack]
+        start_time=-200
+        [frame]
+            image="units/nagas/slasher.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS dagger-swish.wav dagger-swish.wav -150}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=bow
+        [/filter_attack]
+        start_time=-225
+        missile_start_time=-150
+        [if]
+            hits=yes
+            [missile_frame]
+                duration=150
+                image="projectiles/missile-n.png"
+                image_diagonal="projectiles/missile-ne.png"
+                offset=0~0.8
+            [/missile_frame]
+            [frame]
+                image="units/nagas/slasher.png:300"
+                sound=bow.ogg
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [missile_frame]
+                duration=150
+                image="projectiles/missile-n.png"
+                image_diagonal="projectiles/missile-ne.png"
+            [/missile_frame]
+            [frame]
+                image="units/nagas/slasher.png:300"
+                sound=bow-miss.ogg
+            [/frame]
+        [/else]
+    [/attack_anim]
+[/unit_type]

data/core/units/nagas/Zephyr.cfg

@@ -0,0 +1,101 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Naga Zephyr
+    name= _ "Naga Zephyr"
+    race=naga
+    gender=male
+    image="units/nagas/zephyr.png"
+    profile=portraits/nagas/fighter.png
+    hitpoints=53
+    movement_type=naga
+    movement=7
+    experience=100
+    level=3
+    alignment=liminal
+    advances_to=null
+    {AMLA_DEFAULT}
+    cost=50
+    usage=fighter
+    description= _ "The Southern Naga commonly recount a curious story about the Wind Spirit, Zefra and the aetherial chakram:
+
+In the distant past, there was a chakram wielder who was possessed of legendary skill. It is said that he could cleave the very seas with a flurry of blades, fell a hundred foes before a single could reach him, and deflect a thousand arrows without being struck. Called by the name of Xylrix, tempest, he was a warrior whose arrogance was as great as his talent. He was always more than willing to boast his prowess to any and all who would watch him. Then one day, while flaunting himself to a band of young Nagini, he chose a sacred Allnai tree as his target.
+
+‘Watch,’ he bellowed, and split the tree straight in two.
+
+In that moment, a great wind surrounded him and the Wind Spirit’s voice echoed in his ears, ‘You think yourself mighty for slaying my hapless offspring? Though talent you possess, no mortal should trifle with the divinity that guides them.’
+
+He retorted, ‘Come, spirit. I am not afraid. No weapon, steel, water, or wind, shall stand up to my rings.’
+
+The wind whirled ever faster, a torrent of gale force spiraling and spiraling in a gyrating dance of fury. He felt himself lifted from the ground, spinning at a tremendous rate, rendered utterly hapless at the mercy of Zefra’s wrath. Face upturned in terror, he let go of his blades and suddenly saw it in the whirling tempest—the twirling motion of the ringed chakrams, patterned in the very wind itself.
+
+As quickly as the storm came, it vanished, leaving Xylrix to contemplate his broken weapons. When he finally returned to his home many days later, he announced his new name: Zephyr, a warrior who serves the Wind on which his blades fly."
+    die_sound=naga-die.ogg
+    {DEFENSE_ANIM "units/nagas/zephyr.png" "units/nagas/zephyr.png" {SOUND_LIST:NAGA_HIT} }
+
+    [defense]
+        flat=50
+        sand=40
+    [/defense]
+
+    [attack]
+        name=chakram_melee
+        description=_"chakram"
+        type=blade
+        range=melee
+        damage=6
+        number=3
+        icon=attacks/chakram.png
+    [/attack]
+    [attack]
+        name=chakram
+        description= _"chakram"
+        type=blade
+        range=ranged
+        damage=7
+        number=5
+        icon=attacks/chakram.png
+    [/attack]
+
+    [attack_anim]
+        [filter_attack]
+            name=chakram_melee
+        [/filter_attack]
+        start_time=-200
+        [frame]
+            image="units/nagas/zephyr.png:300"
+        [/frame]
+        {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -150}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=chakram
+        [/filter_attack]
+        start_time=-225
+        missile_start_time=-150
+        [if]
+            hits=yes
+            [missile_frame]
+                duration=150
+                image="projectiles/missile-n.png"
+                image_diagonal="projectiles/missile-ne.png"
+                offset=0~0.8
+            [/missile_frame]
+            [frame]
+                image="units/nagas/zephyr.png:300"
+                sound=hatchet.wav
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [missile_frame]
+                duration=150
+                image="projectiles/missile-n.png"
+                image_diagonal="projectiles/missile-ne.png"
+            [/missile_frame]
+            [frame]
+                image="units/nagas/zephyr.png:300"
+                sound=hatchet-miss.wav
+            [/frame]
+        [/else]
+    [/attack_anim]
+[/unit_type]

data/multiplayer/factions/dunefolk-aoh.cfg

@@ -4,9 +4,9 @@
     name= _"Dunefolk"
     image="units/dunefolk/ranger.png"
     type=random
-    leader=Dune Blademaster,Dune Spearmaster,Dune Harrier,Dune Ranger,Dune Cataphract,Dune Firetrooper
+    leader=Dune Blademaster,Dune Spearmaster,Dune Warmaster,Dune Ranger,Dune Luminary,Dune Firetrooper
-    random_leader=Dune Blademaster,Dune Spearmaster,Dune Harrier,Dune Ranger,Dune Cataphract
+    random_leader=Dune Blademaster,Dune Spearmaster,Dune Warmaster,Dune Ranger,Dune Luminary,Dune Firetrooper
-    recruit=Dune Rover,Dune Soldier,Dune Piercer,Dune Rider,Dune Herbalist,Dune Burner,Falcon,Dune Swordsman,Dune Spearguard,Dune Apothecary,Dune Skirmisher,Dune Explorer,Dune Sunderer,Dune Raider,Dune Swiftrider,Dune Scorcher,Elder Falcon
+    recruit=Dune Rover,Dune Soldier,Dune Rider,Dune Herbalist,Dune Burner,Dune Swordsman,Dune Captain,Dune Spearguard,Dune Apothecary,Dune Skirmisher,Dune Strider,Dune Explorer,Dune Sunderer,Dune Raider,Dune Swiftrider,Dune Scorcher,Dune Alchemist,Naga Slasher,Naga Bladewhirler,Naga Ringcaster
     terrain_liked=Ss, Hh, Ha, Ww
     # wmllint: markcheck off
     description="<img>src='portraits/dunefolk/herbalist.png~BG()' align='middle'</img>

data/multiplayer/factions/dunefolk-default.cfg

@@ -4,9 +4,9 @@
     name= _"Dunefolk"
     image="units/dunefolk/explorer.png"
     type=random
-    leader=Dune Explorer,Dune Swordsman,Dune Spearguard,Dune Skirmisher,Dune Apothecary
+    leader=Dune Explorer,Dune Swordsman,Dune Spearguard,Dune Scorcher,Dune Apothecary
-    random_leader=Dune Explorer,Dune Swordsman,Dune Spearguard,Dune Skirmisher,Dune Apothecary
+    random_leader=Dune Explorer,Dune Swordsman,Dune Spearguard,Dune Scorcher,Dune Apothecary
-    recruit=Dune Rover,Dune Soldier,Dune Piercer,Dune Rider,Dune Herbalist,Dune Burner,Falcon
+    recruit=Dune Rover,Dune Soldier,Dune Skirmisher,Dune Rider,Dune Herbalist,Dune Burner,Naga Slasher
     terrain_liked=Ss, Hh, Ha, Ww
     # wmllint: markcheck off
     description="<img>src='portraits/dunefolk/herbalist.png~BG()' align='middle'</img>

data/test/scenarios/characterize_pathfinding.cfg

@@ -1,11 +1,16 @@
 ### Change GENERATE_ANSWERS to 1 in the next line to generate the correct answers for the characterization test.
 ### The list of answers will appear in console when you run wesnoth, after debug: messages.
-### Copy the lines to a text file ("foo") and use the following sed script to clean them,
+### wesnoth --nocache --log-debug=wml --noreplaycheck --unit characterize_pathfinding_reach_1
 ###
-### sed -n 's/^.*: \([ [:digit:]]*\) ,/\1/p' <foo | tr '\n' ','
+### Copy the lines to a text file ("foo") (alternatively just pipe the stderr of wesnoth),
+### and use the following sed script to clean them,
+###
+### cat foo | sed -n 's/^.*: \([ [:digit:]]*\) ,/\1/p' | tr '\n' ','
 ###
 ### so you get a nice comma separated list. Then paste it in data/test/macros/pathfind_answers.cfg,
-### and in this file change GENERATE_ANSWERS to 0 again.
+### delete the trailing comma, and in this file change GENERATE_ANSWERS to 0 again.
+###
+### Missing the --noreplaycheck option will cause the generated answers to generated twice.
 
 #define GENERATE_ANSWERS
     0
@@ -330,6 +335,9 @@
                 to_chat=false
             [/wml_message]
 
+            # The assert statement should probably be in the [else] block of this,
+            # but the test is currently disabled and I'm not fixing it in the current
+            # task.
             {IF_GEN_ANS (
                 {ASSERT ({VARIABLE_CONDITIONAL answer_counter equals $anslength})}
                 [wml_message]
@@ -446,8 +454,9 @@
                     logger=debug
                     to_chat=false
                 [/wml_message]
-            ) ()}
+            ) (
-            {ASSERT ({VARIABLE_CONDITIONAL answer_counter equals $anslength})}
+                {ASSERT ({VARIABLE_CONDITIONAL answer_counter equals $anslength})}
+            )}
         [/event]
         [event]
             name = side 1 turn refresh