MP: Renames the Khalifate to Dunefolk.

Part of an effort to make the faction better fit into Wesnoth. See:
https://forums.wesnoth.org/viewtopic.php?f=12&t=47643
https://forums.wesnoth.org/viewtopic.php?f=12&t=47703

changelog

@@ -37,6 +37,7 @@ Version 1.13.10+dev:
    * New wesnoth.unit_types[].advances_from getter.
  * Multiplayer:
    * Dark Forecast: Fixed broken faction and leader selection.
+   * Rename the Khalifate to Dunefolk.
  * Performance:
    * GUI2 windows no longer redraw everything 50 times per second. This reduces
      CPU usage in fullscreen windows such as MP lobby by about 85 %.

data/campaigns/Secrets_of_the_Ancients/units/Khalif.cfg

@@ -3,7 +3,7 @@
 [unit_type]
     id=Khalif
     name= _ "Khalif"
-    race=khalifate
+    race=dunefolk
     image="units/khalif.png"
     hitpoints=30
     movement_type=smallfoot

data/core/about.cfg

@@ -386,7 +386,7 @@
     [/entry]
     [entry]
         name = "Marcus Rosén (sleepwalker)"
-        comment = "Animations (esp. Saurians, Dwarves, Horseman), khalifate sprites, and portraits (Mermaid Initiate & Hakim)"
+        comment = "Animations (esp. Saurians, Dwarves, Horseman), dunefolk sprites, and portraits (Mermaid Initiate & Hakim)"
     [/entry]
     [entry]
         name = "Mark Goodenough (Ranger M)"
@@ -869,7 +869,7 @@
     title = _"Multiplayer Maps and Balancing"
     [entry]
         name = "George Birthisel (happygrue/Wintermute)"
-        comment = "Unit balancing, Khalifate Era"
+        comment = "Unit balancing, Dunefolk Era"
     [/entry]
     [entry]
         name = "Jake Bailey (jb)"

data/core/macros/deprecated-utils.cfg

@@ -395,3 +395,8 @@ _"No gold carried over to the next scenario."#enddef
     # no interruption of movement, yet prevent the move from being undone.
     {DEPRECATE_ACTION_MACRO "NO_INTERRUPT_NO_UNDO" 3 "1.16" ""}
 #enddef
+
+# TODO: remove for 1.15
+#define KHALIFATE_NAMES
+    {DUNEFOLK_NAMES}
+#enddef

data/core/units.cfg

@@ -13,12 +13,12 @@
     {core/units/bats/}
     {core/units/boats/}
     {core/units/drakes/}
+    {core/units/dunefolk/}
     {core/units/dwarves/}
     {core/units/elves/}
     {core/units/goblins/}
     {core/units/gryphons/}
     {core/units/humans/}
-    {core/units/khalifate/}
     {core/units/merfolk/}
     {core/units/monsters/}
     {core/units/nagas/}
@@ -195,9 +195,24 @@ The eastern provinces of Wesnoth, known as the Clan Homelands, have a geography
         {HUMAN_NAMES}
     [/race]
 
-    # wmllint: general spellings Khalifate Khalid Khaiyal Qanas Saree Faris
+    # wmllint: general spellings Dunefolk Khalid Khaiyal Qanas Saree Faris
     # wmllint: general spellings Qatif-al-nar Rami
     # wmllint: general spelling liminal
+    [race]
+        id=dunefolk
+        male_name= _"race^Dunefolk Human"
+        female_name= _"race+female^Dunefolk Human"
+        plural_name= _"race+plural^Dunefolk"
+        description= _"This race does not have a description yet."
+        num_traits=2
+        markov_chain_size=2
+        # wmlscope: start ignoring
+        {DUNEFOLK_NAMES}
+        # wmlscope: stop ignoring
+    [/race]
+    
+    # TODO: remove khalifate race with 1.15
+    # wmllint: general spellings Khalifate
     [race]
         id=khalifate
         male_name= _"race^Khalifate Human"
@@ -1536,6 +1551,173 @@ The life span of the wose is unknown, although the most ancient members of this
         [/resistance]
     [/movetype]
 
+    [movetype]
+        name=dunefoot
+        [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=80
+            reef=70
+            swamp_water=70
+            flat=60
+            sand=50
+            forest=60
+            hills=40
+            mountains=40
+            village=40
+            castle=40
+            cave=60
+            frozen=80
+            fungus=60
+        [/defense]
+        [resistance]
+            blade=90
+            pierce=100
+            impact=110
+            fire=100
+            cold=100
+            arcane=80
+        [/resistance]
+    [/movetype]
+
+    [movetype]
+        name=dunearmoredfoot
+        [movement_costs]
+            shallow_water=3
+            reef=2
+            swamp_water=3
+            flat=1
+            sand=1
+            forest=2
+            hills=2
+            mountains=3
+            village=1
+            castle=1
+            cave=2
+            frozen=3
+            fungus=2
+        [/movement_costs]
+        [defense]
+            shallow_water=80
+            reef=70
+            swamp_water=70
+            flat=60
+            sand=50
+            forest=60
+            hills=40
+            mountains=60
+            village=50
+            castle=40
+            cave=60
+            frozen=80
+            fungus=60
+        [/defense]
+        [resistance]
+            blade=80
+            pierce=80
+            impact=110
+            fire=100
+            cold=100
+            arcane=80
+        [/resistance]
+    [/movetype]
+
+    [movetype]
+        name=dunehorse
+        [movement_costs]
+            shallow_water=4
+            reef=3
+            swamp_water=4
+            flat=1
+            sand=1
+            forest=3
+            hills=2
+            mountains=4
+            village=1
+            castle=1
+            cave=4
+            frozen=2
+            fungus=4
+        [/movement_costs]
+        [defense]
+            shallow_water=80
+            reef=70
+            swamp_water=80
+            flat=60
+            sand=50
+            forest=60
+            hills=40
+            mountains=60
+            village=60
+            castle=60
+            cave=80
+            frozen=70
+            fungus=80
+        [/defense]
+        [resistance]
+            blade=90
+            pierce=110
+            impact=100
+            fire=100
+            cold=100
+            arcane=80
+        [/resistance]
+    [/movetype]
+
+    [movetype]
+        name=dunearmoredhorse
+        [movement_costs]
+            shallow_water=4
+            reef=3
+            swamp_water=4
+            flat=1
+            sand=1
+            forest=3
+            hills=2
+            village=1
+            castle=1
+            cave=4
+            frozen=2
+            fungus=4
+        [/movement_costs]
+        [defense]
+            shallow_water=80
+            reef=70
+            swamp_water=80
+            flat=60
+            sand=50
+            forest=60
+            hills=50
+            village=60
+            castle=50
+            cave=80
+            frozen=70
+            fungus=80
+        [/defense]
+        [resistance]
+            blade=70
+            pierce=100
+            impact=90
+            fire=100
+            cold=120
+            arcane=80
+        [/resistance]
+    [/movetype]
+    
+    # TODO: remove khalifate movetypes for 1.15
     [movetype]
         name=khalifatefoot
         [movement_costs]

data/core/units/dunefolk/Arif.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Arif
     name= _ "Arif"
-    race=khalifate
-    image="units/khalifate/arif.png"
+    race=dunefolk
+    image="units/dunefolk/arif.png"
     hitpoints=40
-    movement_type=khalifatearmoredfoot
+    movement_type=dunearmoredfoot
     movement=5
     experience=47
     level=1
@@ -13,9 +13,9 @@
     advances_to=Ghazi,Mudafi
     cost=18
     usage=fighter
-    description= _ "The Arif form the backbone of any Khalifate 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 Arif on the march, shields high, has caused many a defender to worry about the strength of their walls."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}
+    description= _ "The Arif form 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 Arif on the march, shields high, has caused many a defender to worry about the strength of their walls."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}
     die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/khalifate/arif.png" "units/khalifate/arif.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/arif.png" "units/dunefolk/arif.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
         name=sword
         description= _ "sword"
@@ -37,7 +37,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/arif.png:300"
+            image="units/dunefolk/arif.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}

data/core/units/dunefolk/Batal.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Batal
     name= _ "Batal"
-    race=khalifate
-    image="units/khalifate/batal.png"
+    race=dunefolk
+    image="units/dunefolk/batal.png"
     hitpoints=65
-    movement_type=khalifatefoot
+    movement_type=dunefoot
     movement=6
     experience=150
     level=3
@@ -16,7 +16,7 @@
     usage=mixed fighter
     description= _ "Batal are the elite of the Muharib, 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, Batal are often heroes to the common troopers, an image they do not try to dissuade."
     die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/khalifate/batal.png" "units/khalifate/batal.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/batal.png" "units/dunefolk/batal.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
         name=axe
         description= _ "axe"
@@ -42,7 +42,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/batal.png:300"
+            image="units/dunefolk/batal.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS axe.ogg {SOUND_LIST:MISS} -50}
@@ -62,7 +62,7 @@
         [/missile_frame]
 
         [frame]
-            image="units/khalifate/batal.png:300"
+            image="units/dunefolk/batal.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}

data/core/units/dunefolk/Elder_Falcon.cfg

@@ -3,7 +3,7 @@
     id=Elder Falcon
     name= _ "Elder Falcon"
     race=falcon
-    image="units/khalifate/elder-falcon.png"
+    image="units/dunefolk/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/khalifate/elder-falcon.png" "units/khalifate/elder-falcon.png" {SOUND_LIST:GRYPHON_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/elder-falcon.png" "units/dunefolk/elder-falcon.png" {SOUND_LIST:GRYPHON_HIT} }
     [defense]
         village=50
     [/defense]
@@ -50,7 +50,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/elder-falcon.png:300"
+            image="units/dunefolk/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/khalifate/elder-falcon.png:300"
+            image="units/dunefolk/elder-falcon.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -100}

data/core/units/dunefolk/Falcon.cfg

@@ -3,7 +3,7 @@
     id=Falcon
     name= _ "Falcon"
     race=falcon
-    image="units/khalifate/falcon.png"
+    image="units/dunefolk/falcon.png"
     {TRAIT_FERAL_MUSTHAVE}
     hitpoints=18
     movement_type=lightfly
@@ -14,9 +14,9 @@
     advances_to=Elder Falcon
     cost=12
     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 the enemies of the Khalifate, and their great speed is a boon to scouting out the land."+{SPECIAL_NOTES}+{SPECIAL_NOTES_CHARGE}
+    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 the enemies of the Dunefolk, 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/khalifate/falcon.png" "units/khalifate/falcon.png" {SOUND_LIST:GRYPHON_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/falcon.png" "units/dunefolk/falcon.png" {SOUND_LIST:GRYPHON_HIT} }
     [defense]
         village=50
     [/defense]
@@ -49,7 +49,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/falcon.png:300"
+            image="units/dunefolk/falcon.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS claws.ogg {SOUND_LIST:MISS} -100}
@@ -62,7 +62,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/falcon.png:300"
+            image="units/dunefolk/falcon.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -100}

data/core/units/dunefolk/Faris.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Faris
     name= _ "Faris"
-    race=khalifate
-    image="units/khalifate/faris.png"
+    race=dunefolk
+    image="units/dunefolk/faris.png"
     hitpoints=50
-    movement_type=khalifatearmoredhorse
+    movement_type=dunearmoredhorse
     movement=6
     experience=70
     level=2
@@ -13,9 +13,9 @@
     advances_to=Mufariq
     cost=40
     usage=fighter
-    description= _ "Those Khaiyal who distinguish themselves in battle are given the opportunity to prove themselves worthy of becoming a Faris. Those who pass the trial are given the traditional barding for their horse, distinguishing them from the rest of the Khalifate cavalry. Consummate horsemen, the Faris have long claimed they need only a single lance strike to kill a man."
+    description= _ "Those Khaiyal who distinguish themselves in battle are given the opportunity to prove themselves worthy of becoming a Faris. 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 Faris have long claimed they need only a single lance strike to kill a man."
     die_sound={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/khalifate/faris.png" "units/khalifate/faris.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/faris.png" "units/dunefolk/faris.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=lance
         description= _ "lance"
@@ -42,7 +42,7 @@
         horse_sound_start_time=-250
 
         [frame]
-            image="units/khalifate/faris.png:400"
+            image="units/dunefolk/faris.png:400"
         [/frame]
 
         [horse_sound_frame]
@@ -60,7 +60,7 @@
         horse_sound_start_time=-250
 
         [frame]
-            image="units/khalifate/faris.png:400"
+            image="units/dunefolk/faris.png:400"
         [/frame]
 
         [horse_sound_frame]

data/core/units/dunefolk/Ghazi.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Ghazi
     name= _ "Ghazi"
-    race=khalifate
-    image="units/khalifate/ghazi.png"
+    race=dunefolk
+    image="units/dunefolk/ghazi.png"
     hitpoints=58
-    movement_type=khalifatearmoredfoot
+    movement_type=dunearmoredfoot
     movement=5
     experience=75
     level=2
@@ -13,9 +13,9 @@
     advances_to=Shuja
     cost=38
     usage=fighter
-    description= _ "Armed with their sword, shield and faith, Ghazi are warriors of some renown among the Khalifate 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= _ "Armed with their sword, shield and faith, Ghazi 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}
     die_sound={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/khalifate/ghazi.png" "units/khalifate/ghazi.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/ghazi.png" "units/dunefolk/ghazi.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=sword
         description= _ "sword"
@@ -49,7 +49,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/ghazi.png:300"
+            image="units/dunefolk/ghazi.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
@@ -62,7 +62,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/ghazi.png:300"
+            image="units/dunefolk/ghazi.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}

data/core/units/dunefolk/Hadaf.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Hadaf
     name= _ "Hadaf"
-    race=khalifate
-    image="units/khalifate/hadaf.png"
+    race=dunefolk
+    image="units/dunefolk/hadaf.png"
     hitpoints=57
-    movement_type=khalifatearmoredhorse
+    movement_type=dunearmoredhorse
     movement=7
     experience=150
     level=3
@@ -16,7 +16,7 @@
     usage=fighter
     description= _ "Those Qanas who prove to be particularly skilled are formed into units of Hadaf, 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."
     die_sound={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/khalifate/hadaf.png" "units/khalifate/hadaf.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/hadaf.png" "units/dunefolk/hadaf.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=mace
         description= _ "mace"
@@ -44,7 +44,7 @@
         horse_sound_start_time=-250
 
         [frame]
-            image="units/khalifate/hadaf.png:400"
+            image="units/dunefolk/hadaf.png:400"
         [/frame]
 
         [horse_sound_frame]
@@ -68,7 +68,7 @@
         [/missile_frame]
 
         [frame]
-            image="units/khalifate/hadaf.png:300"
+            image="units/dunefolk/hadaf.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}

data/core/units/dunefolk/Hakim.cfg

@@ -0,0 +1,44 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Hakim
+    name= _ "Hakim"
+    race=dunefolk
+    image="units/dunefolk/hakim.png"
+    profile="portraits/dunefolk/hakim.png"
+    hitpoints=26
+    movement_type=dunefoot
+    [abilities]
+        {ABILITY_EXTRA_HEAL}
+    [/abilities]
+    movement=5
+    experience=39
+    level=1
+    alignment=liminal
+    advances_to=Tabib
+    cost=17
+    usage=healer
+    description= _ "Hakim 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 requirement of their faith. Regardless, Hakim 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}
+    die_sound={SOUND_LIST:HUMAN_DIE}
+    {DEFENSE_ANIM "units/dunefolk/hakim.png" "units/dunefolk/hakim.png" {SOUND_LIST:HUMAN_HIT} }
+    [attack]
+        name=mace
+        description= _ "mace"
+        type=impact
+        range=melee
+        damage=7
+        number=2
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=mace
+        [/filter_attack]
+
+        start_time=-200
+
+        [frame]
+            image="units/dunefolk/hakim.png:300"
+        [/frame]
+
+        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
+    [/attack_anim]
+[/unit_type]

data/core/units/dunefolk/Jawal.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Jawal
     name= _ "Jawal"
-    race=khalifate
-    image="units/khalifate/jawal.png"
+    race=dunefolk
+    image="units/dunefolk/jawal.png"
     hitpoints=47
-    movement_type=khalifatehorse
+    movement_type=dunehorse
     movement=8
     experience=150
     level=3
@@ -17,7 +17,7 @@
     undead_variation=mounted
     description= _ "The elite of the Saree are the Jawal, horse archers of such speed and dexterity that rumors are always spread that they have elven blood. Irritated at such mystical nonsense, the Jawal 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/khalifate/jawal.png" "units/khalifate/jawal.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/jawal.png" "units/dunefolk/jawal.png" {SOUND_LIST:HORSE_HIT} }
     [attack]
         name=mace
         description= _ "mace"
@@ -45,7 +45,7 @@
         horse_sound_start_time=-250
 
         [frame]
-            image="units/khalifate/jawal.png:400"
+            image="units/dunefolk/jawal.png:400"
         [/frame]
 
         [horse_sound_frame]
@@ -69,7 +69,7 @@
         [/missile_frame]
 
         [frame]
-            image="units/khalifate/jawal.png:300"
+            image="units/dunefolk/jawal.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}

data/core/units/dunefolk/Jundi.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Jundi
     name= _ "Jundi"
-    race=khalifate
-    image="units/khalifate/jundi.png"
+    race=dunefolk
+    image="units/dunefolk/jundi.png"
     hitpoints=32
-    movement_type=khalifatefoot
+    movement_type=dunefoot
     movement=6
     experience=44
     level=1
@@ -13,9 +13,9 @@
     advances_to=Muharib,Monawish
     cost=15
     usage=mixed fighter
-    description= _ "Jundi in many ways represent the ideal Khalifate 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= _ "Jundi 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."
     die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/khalifate/jundi.png" "units/khalifate/jundi.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/jundi.png" "units/dunefolk/jundi.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
         name=axe
         description= _ "axe"
@@ -41,7 +41,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/jundi.png:300"
+            image="units/dunefolk/jundi.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS axe.ogg {SOUND_LIST:MISS} -50}
@@ -61,7 +61,7 @@
         [/missile_frame]
 
         [frame]
-            image="units/khalifate/jundi.png:300"
+            image="units/dunefolk/jundi.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}

data/core/units/dunefolk/Khaiyal.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Khaiyal
     name= _ "Khaiyal"
-    race=khalifate
-    image="units/khalifate/khaiyal.png"
+    race=dunefolk
+    image="units/dunefolk/khaiyal.png"
     hitpoints=38
-    movement_type=khalifatearmoredhorse
+    movement_type=dunearmoredhorse
     [resistance]
         blade=80
         pierce=110
@@ -24,7 +24,7 @@
     undead_variation=mounted
     description= _ "The Khaiyal understand the psychological impact of a charging horse, and reinforce this by cladding themselves in heavy armor. Majestic at rest, a Khaiyal 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 Khaiyal 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/khalifate/khaiyal.png" "units/khalifate/khaiyal.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/khaiyal.png" "units/dunefolk/khaiyal.png" {SOUND_LIST:HORSE_HIT} }
     [attack]
         name=lance
         description= _ "lance"
@@ -51,7 +51,7 @@
         horse_sound_start_time=-250
 
         [frame]
-            image="units/khalifate/khaiyal.png:400"
+            image="units/dunefolk/khaiyal.png:400"
         [/frame]
 
         [horse_sound_frame]
@@ -69,7 +69,7 @@
         horse_sound_start_time=-250
 
         [frame]
-            image="units/khalifate/khaiyal.png:400"
+            image="units/dunefolk/khaiyal.png:400"
         [/frame]
 
         [horse_sound_frame]

data/core/units/dunefolk/Khalid.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Khalid
     name= _ "Khalid"
-    race=khalifate
-    image="units/khalifate/khalid.png"
+    race=dunefolk
+    image="units/dunefolk/khalid.png"
     hitpoints=82
-    movement_type=khalifatearmoredfoot
+    movement_type=dunearmoredfoot
     movement=5
     experience=200
     level=4
@@ -22,7 +22,7 @@
     usage=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 Khalid, after a legendary leader of old, these individuals are celebrated for the piety 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}
     die_sound={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/khalifate/khalid.png" "units/khalifate/khalid.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/khalid.png" "units/dunefolk/khalid.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=sword
         description= _ "sword"
@@ -56,7 +56,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/khalid.png:300"
+            image="units/dunefolk/khalid.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
@@ -69,7 +69,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/khalid.png:300"
+            image="units/dunefolk/khalid.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}

data/core/units/dunefolk/Mighwar.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Mighwar
     name= _ "Mighwar"
-    race=khalifate
-    image="units/khalifate/mighwar.png"
+    race=dunefolk
+    image="units/dunefolk/mighwar.png"
     hitpoints=58
-    movement_type=khalifatefoot
+    movement_type=dunefoot
     movement=6
     experience=150
     level=3
@@ -19,7 +19,7 @@
     [/abilities]
     description= _ "Mighwar hold themselves to a higher standard than the ranks of the Monawish from which they ascended. Not content to merely draw the enemy out, they combine their speed with an aggression that sends the Mighwar dancing through the ranks of the enemy, swords ripping and tearing at those around them. "+{SPECIAL_NOTES}+{SPECIAL_NOTES_SKIRMISHER}
     die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/khalifate/mighwar.png" "units/khalifate/mighwar.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/mighwar.png" "units/dunefolk/mighwar.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
         name=longsword
         description= _ "longsword"
@@ -38,7 +38,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/mighwar.png:300"
+            image="units/dunefolk/mighwar.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}

data/core/units/dunefolk/Monawish.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Monawish
     name= _ "Monawish"
-    race=khalifate
-    image="units/khalifate/monawish.png"
+    race=dunefolk
+    image="units/dunefolk/monawish.png"
     hitpoints=46
-    movement_type=khalifatefoot
+    movement_type=dunefoot
     movement=6
     experience=65
     level=2
@@ -18,7 +18,7 @@
     [/abilities]
     description= _ "Those Jundi who are proficient at scouting are elevated into the ranks of the Monawish. Discarding their bow, the Monawish 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 Monawish."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SKIRMISHER}
     die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/khalifate/monawish.png" "units/khalifate/monawish.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/monawish.png" "units/dunefolk/monawish.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
         name=longsword
         description= _ "longsword"
@@ -37,7 +37,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/monawish.png:300"
+            image="units/dunefolk/monawish.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}

data/core/units/dunefolk/Mudafi.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Mudafi
     name= _ "Mudafi"
-    race=khalifate
-    image="units/khalifate/mudafi.png"
+    race=dunefolk
+    image="units/dunefolk/mudafi.png"
     hitpoints=58
-    movement_type=khalifatearmoredfoot
+    movement_type=dunearmoredfoot
     movement=5
     experience=75
     level=2
@@ -13,9 +13,9 @@
     advances_to=Rasikh
     cost=38
     usage=fighter
-    description= _ "Although the Khalifate armies are known for their astonishing mobility and fierce attack, they can be able defenders. Mudafi 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= _ "Although the Dunefolk armies are known for their astonishing mobility and fierce attack, they can be able defenders. Mudafi 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}
     die_sound={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/khalifate/mudafi.png" "units/khalifate/mudafi.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/mudafi.png" "units/dunefolk/mudafi.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=spear
         description=_"spear"
@@ -37,7 +37,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/mudafi.png:300"
+            image="units/dunefolk/mudafi.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}

data/core/units/dunefolk/Mufariq.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Mufariq
     name= _ "Mufariq"
-    race=khalifate
-    image="units/khalifate/mufariq.png"
+    race=dunefolk
+    image="units/dunefolk/mufariq.png"
     hitpoints=65
-    movement_type=khalifatearmoredhorse
+    movement_type=dunearmoredhorse
     movement=6
     experience=150
     level=3
@@ -17,7 +17,7 @@
     # wmllint: local spelling scrollwork
     description= _ "The Mufariq 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 Mufariq 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={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/khalifate/mufariq.png" "units/khalifate/mufariq.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/mufariq.png" "units/dunefolk/mufariq.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=lance
         description= _ "lance"
@@ -44,7 +44,7 @@
         horse_sound_start_time=-250
 
         [frame]
-            image="units/khalifate/mufariq.png:400"
+            image="units/dunefolk/mufariq.png:400"
         [/frame]
 
         [horse_sound_frame]
@@ -62,7 +62,7 @@
         horse_sound_start_time=-250
 
         [frame]
-            image="units/khalifate/mufariq.png:400"
+            image="units/dunefolk/mufariq.png:400"
         [/frame]
 
         [horse_sound_frame]

data/core/units/dunefolk/Muharib.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Muharib
     name= _ "Muharib"
-    race=khalifate
-    image="units/khalifate/muharib.png"
+    race=dunefolk
+    image="units/dunefolk/muharib.png"
     hitpoints=50
-    movement_type=khalifatefoot
+    movement_type=dunefoot
     movement=6
     experience=80
     level=2
@@ -15,7 +15,7 @@
     usage=mixed fighter
     description= _ "Muharib 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, Muharib have no issue pilfering these supplies, and so they tend to be more well-equipped than most."
     die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/khalifate/muharib.png" "units/khalifate/muharib.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/muharib.png" "units/dunefolk/muharib.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
         name=axe
         description= _ "axe"
@@ -42,7 +42,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/muharib.png:300"
+            image="units/dunefolk/muharib.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS axe.ogg {SOUND_LIST:MISS} -50}
@@ -62,7 +62,7 @@
         [/missile_frame]
 
         [frame]
-            image="units/khalifate/muharib.png:300"
+            image="units/dunefolk/muharib.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}

data/core/units/dunefolk/Naffat.cfg

@@ -2,14 +2,14 @@
 [unit_type]
     id=Naffat
     name= _ "Naffat"
-    race=khalifate
+    race=dunefolk
     ignore_race_traits=yes
     {TRAIT_QUICK}
     {TRAIT_INTELLIGENT}
     {TRAIT_RESILIENT}
-    image="units/khalifate/naffat.png"
+    image="units/dunefolk/naffat.png"
     hitpoints=31
-    movement_type=khalifatefoot
+    movement_type=dunefoot
     movement=5
     experience=44
     level=1
@@ -18,9 +18,9 @@
     advances_to=Qatif_al_nar
     cost=19
     usage=archer
-    description= _ "Naffat are a necessary evil in the ranks of Khalifate armies, utilizing fire to burn down enemy fortifications and sow terror among their ranks. While the use of fire in warfare is not a novel concept, the flames of the Naffat have proven disturbingly difficult for their enemies to extinguish."
+    description= _ "Naffat are a necessary evil in the ranks of Dunefolk armies, utilizing fire to burn down enemy fortifications and sow terror among their ranks. While the use of fire in warfare is not a novel concept, the flames of the Naffat have proven disturbingly difficult for their enemies to extinguish."
     die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/khalifate/naffat.png" "units/khalifate/naffat.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/naffat.png" "units/dunefolk/naffat.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
         name=naphtha attack
         description= _ "naphtha attack"
@@ -48,7 +48,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/naffat.png:300"
+            image="units/dunefolk/naffat.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS melee-fire.ogg torch-miss.ogg -150}
@@ -71,7 +71,7 @@
             [/missile_frame]
             {FIRE_BURST_SMALL}
             [frame]
-                image="units/khalifate/naffat.png:300"
+                image="units/dunefolk/naffat.png:300"
                 sound=bow-puny-fire.ogg
             [/frame]
         [/if]
@@ -83,7 +83,7 @@
                 image_diagonal="projectiles/missile-fire-ne.png"
             [/missile_frame]
             [frame]
-                image="units/khalifate/naffat.png:300"
+                image="units/dunefolk/naffat.png:300"
                 sound=bow-puny-fire-miss.ogg
             [/frame]
         [/else]

data/core/units/dunefolk/Qanas.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Qanas
     name= _ "Qanas"
-    race=khalifate
-    image="units/khalifate/qanas.png"
+    race=dunefolk
+    image="units/dunefolk/qanas.png"
     hitpoints=48
-    movement_type=khalifatehorse
+    movement_type=dunehorse
     movement=7
     experience=70
     level=2
@@ -15,7 +15,7 @@
     usage=archer
     description= _ "Those horsemen who are not skilled enough to join the ranks of the Faris or quick enough with a bow for the Saree are instead placed with the Qanas. Far from being a sign of failure, the Qanas were created as a mounted counterpart to the Muharib, supporting the foot troops with mace or bow as needed. Qanas are often used to draw enemies into a position where they will be surrounded and crushed by Faris."
     die_sound={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/khalifate/qanas.png" "units/khalifate/qanas.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/qanas.png" "units/dunefolk/qanas.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=mace
         description= _ "mace"
@@ -43,7 +43,7 @@
         horse_sound_start_time=-250
 
         [frame]
-            image="units/khalifate/qanas.png:400"
+            image="units/dunefolk/qanas.png:400"
         [/frame]
 
         [horse_sound_frame]
@@ -67,7 +67,7 @@
         [/missile_frame]
 
         [frame]
-            image="units/khalifate/qanas.png:300"
+            image="units/dunefolk/qanas.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}

data/core/units/dunefolk/Qatif-al-nar.cfg

@@ -3,14 +3,14 @@
     # Below unit id changed to use underscores in unit ID only (not in displayed name) to fix bug #18117
     id=Qatif_al_nar
     name= _ "Qatif-al-nar"
-    race=khalifate
+    race=dunefolk
     ignore_race_traits=yes
     {TRAIT_QUICK}
     {TRAIT_INTELLIGENT}
     {TRAIT_RESILIENT}
-    image="units/khalifate/qatif-al-nar.png"
+    image="units/dunefolk/qatif-al-nar.png"
     hitpoints=44
-    movement_type=khalifatefoot
+    movement_type=dunefoot
     movement=5
     experience=70
     level=2
@@ -20,7 +20,7 @@
     usage=fighter
     description= _ "Qatif-al-nar spend so much time experimenting with their weapons that they smell constantly of ash and flame. Regarded with wariness by their fellow troops, Qatif-al-nar can be easily located in battle by the cleared charred area around them, a testament to the success of their experiments."
     die_sound={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/khalifate/qatif-al-nar.png" "units/khalifate/qatif-al-nar.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/qatif-al-nar.png" "units/dunefolk/qatif-al-nar.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=naphtha attack
         description= _ "naphtha attack"
@@ -48,7 +48,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/qatif-al-nar.png:300"
+            image="units/dunefolk/qatif-al-nar.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS melee-fire.ogg torch-miss.ogg -150}
@@ -71,7 +71,7 @@
             [/missile_frame]
             {FIRE_BURST_SMALL}
             [frame]
-                image="units/khalifate/qatif-al-nar.png:300"
+                image="units/dunefolk/qatif-al-nar.png:300"
                 sound=bow-puny-fire.ogg
             [/frame]
         [/if]
@@ -83,7 +83,7 @@
                 image_diagonal="projectiles/missile-fire-ne.png"
             [/missile_frame]
             [frame]
-                image="units/khalifate/qatif-al-nar.png:300"
+                image="units/dunefolk/qatif-al-nar.png:300"
                 sound=bow-puny-fire-miss.ogg
             [/frame]
         [/else]

data/core/units/dunefolk/Rami.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Rami
     name= _ "Rami"
-    race=khalifate
-    image="units/khalifate/rami.png"
+    race=dunefolk
+    image="units/dunefolk/rami.png"
     hitpoints=34
-    movement_type=khalifatehorse
+    movement_type=dunehorse
     movement=7
     experience=39
     level=1
@@ -16,7 +16,7 @@
     undead_variation=mounted
     description= _ "Rami are excellent horsemen, able to shoot from horseback better than most men can manage from foot. Disdaining the use of heavy armor, Rami 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/khalifate/rami.png" "units/khalifate/rami.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/rami.png" "units/dunefolk/rami.png" {SOUND_LIST:HORSE_HIT} }
     [attack]
         name=mace
         description= _ "mace"
@@ -44,7 +44,7 @@
         horse_sound_start_time=-250
 
         [frame]
-            image="units/khalifate/rami.png:400"
+            image="units/dunefolk/rami.png:400"
         [/frame]
 
         [horse_sound_frame]
@@ -68,7 +68,7 @@
         [/missile_frame]
 
         [frame]
-            image="units/khalifate/rami.png:300"
+            image="units/dunefolk/rami.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}

data/core/units/dunefolk/Rasikh.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Rasikh
     name= _ "Rasikh"
-    race=khalifate
-    image="units/khalifate/rasikh.png"
+    race=dunefolk
+    image="units/dunefolk/rasikh.png"
     hitpoints=70
-    movement_type=khalifatearmoredfoot
+    movement_type=dunearmoredfoot
     movement=5
     experience=150
     level=3
@@ -14,9 +14,9 @@
     {AMLA_DEFAULT}
     cost=51
     usage=fighter
-    description= _ "Spread across the Khalifate'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= _ "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}
     die_sound={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/khalifate/rasikh.png" "units/khalifate/rasikh.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/rasikh.png" "units/dunefolk/rasikh.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=spear
         description=_"spear"
@@ -38,7 +38,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/rasikh.png:300"
+            image="units/dunefolk/rasikh.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}

data/core/units/dunefolk/Saree.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Saree
     name= _ "Saree"
-    race=khalifate
-    image="units/khalifate/saree.png"
+    race=dunefolk
+    image="units/dunefolk/saree.png"
     hitpoints=39
-    movement_type=khalifatehorse
+    movement_type=dunehorse
     movement=8
     experience=64
     level=2
@@ -14,9 +14,9 @@
     cost=35
     usage=archer
     undead_variation=mounted
-    description= _ "Rami who demonstrate exceptional skill with the bow are made into Saree, spending hours every day practicing and building a rapport with their steed. This has made them the fastest riders in the Khalifate armies, and a wise Khalid uses this to their advantage."
+    description= _ "Rami who demonstrate exceptional skill with the bow are made into Saree, 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 Khalid uses this to their advantage."
     die_sound=horse-die.ogg
-    {DEFENSE_ANIM "units/khalifate/saree.png" "units/khalifate/saree.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/saree.png" "units/dunefolk/saree.png" {SOUND_LIST:HORSE_HIT} }
     [attack]
         name=mace
         description= _ "mace"
@@ -44,7 +44,7 @@
         horse_sound_start_time=-250
 
         [frame]
-            image="units/khalifate/saree.png:400"
+            image="units/dunefolk/saree.png:400"
         [/frame]
 
         [horse_sound_frame]
@@ -68,7 +68,7 @@
         [/missile_frame]
 
         [frame]
-            image="units/khalifate/saree.png:300"
+            image="units/dunefolk/saree.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}

data/core/units/dunefolk/Shuja.cfg

@@ -2,10 +2,10 @@
 [unit_type]
     id=Shuja
     name= _ "Shuja"
-    race=khalifate
-    image="units/khalifate/shuja.png"
+    race=dunefolk
+    image="units/dunefolk/shuja.png"
     hitpoints=70
-    movement_type=khalifatearmoredfoot
+    movement_type=dunearmoredfoot
     movement=5
     experience=150
     level=3
@@ -16,7 +16,7 @@
     usage=fighter
     description= _ "Distinguished for their bravery and skill, Shuja are the leaders among the Khalif'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}
     die_sound={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/khalifate/shuja.png" "units/khalifate/shuja.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/shuja.png" "units/dunefolk/shuja.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=sword
         description= _ "sword"
@@ -50,7 +50,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/shuja.png:300"
+            image="units/dunefolk/shuja.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
@@ -63,7 +63,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/shuja.png:300"
+            image="units/dunefolk/shuja.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}

data/core/units/dunefolk/Tabib.cfg

@@ -2,11 +2,11 @@
 [unit_type]
     id=Tabib
     name= _ "Tabib"
-    race=khalifate
-    image="units/khalifate/tabib.png"
-    profile="portraits/khalifate/hakim.png"
+    race=dunefolk
+    image="units/dunefolk/tabib.png"
+    profile="portraits/dunefolk/hakim.png"
     hitpoints=39
-    movement_type=khalifatefoot
+    movement_type=dunefoot
     [abilities]
         {ABILITY_CURES}
         {ABILITY_REGENERATES}
@@ -19,9 +19,9 @@
     {AMLA_DEFAULT}
     cost=33
     usage=fighter
-    description= _ "Some men excel at medicine the way others do at strength of arms, and the Tabib are those whose knowledge is without peer outside of the Khalifate. Their remedies cannot 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= _ "Some men excel at medicine the way others do at strength of arms, and the Tabib are those whose knowledge is without peer outside of the Dunefolk. Their remedies cannot 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}
     die_sound={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/khalifate/tabib.png" "units/khalifate/tabib.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/tabib.png" "units/dunefolk/tabib.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=mace
         description= _ "mace"
@@ -39,7 +39,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/tabib.png:300"
+            image="units/dunefolk/tabib.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}

data/core/units/dunefolk/Tineen.cfg

@@ -2,14 +2,14 @@
 [unit_type]
     id=Tineen
     name= _ "Tineen"
-    race=khalifate
+    race=dunefolk
     ignore_race_traits=yes
     {TRAIT_QUICK}
     {TRAIT_INTELLIGENT}
     {TRAIT_RESILIENT}
-    image="units/khalifate/tineen.png"
+    image="units/dunefolk/tineen.png"
     hitpoints=51
-    movement_type=khalifatefoot
+    movement_type=dunefoot
     movement=5
     experience=150
     level=3
@@ -20,7 +20,7 @@
     usage=fighter
     description= _ "Qatif-al-nar who have shut out the world for their experiments are given the honorific Tineen, as both a sign of respect and of fear. No longer cognizant of the value of life, Tineen are caught up in the power of their caged fire and likely to test their latest naphtha jar at the first opportunity."
     die_sound={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/khalifate/tineen.png" "units/khalifate/tineen.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/tineen.png" "units/dunefolk/tineen.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=naphtha attack
         description=_"naphtha attack"
@@ -48,7 +48,7 @@
         start_time=-200
 
         [frame]
-            image="units/khalifate/tineen.png:300"
+            image="units/dunefolk/tineen.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS melee-fire.ogg torch-miss.ogg -150}
@@ -71,7 +71,7 @@
             [/missile_frame]
             {FIRE_BURST_SMALL}
             [frame]
-                image="units/khalifate/tineen.png:300"
+                image="units/dunefolk/tineen.png:300"
                 sound=bow-puny-fire.ogg
             [/frame]
         [/if]
@@ -83,7 +83,7 @@
                 image_diagonal="projectiles/missile-fire-ne.png"
             [/missile_frame]
             [frame]
-                image="units/khalifate/tineen.png:300"
+                image="units/dunefolk/tineen.png:300"
                 sound=bow-puny-fire-miss.ogg
             [/frame]
         [/else]

data/core/units/khalifate/Hakim.cfg

@@ -1,44 +0,0 @@
-#textdomain wesnoth-units
-[unit_type]
-    id=Hakim
-    name= _ "Hakim"
-    race=khalifate
-    image="units/khalifate/hakim.png"
-    profile="portraits/khalifate/hakim.png"
-    hitpoints=26
-    movement_type=khalifatefoot
-    [abilities]
-        {ABILITY_EXTRA_HEAL}
-    [/abilities]
-    movement=5
-    experience=39
-    level=1
-    alignment=liminal
-    advances_to=Tabib
-    cost=17
-    usage=healer
-    description= _ "Hakim are learned individuals who have given up their urban life in order to assist the Khalifate 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 requirement of their faith. Regardless, Hakim 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}
-    die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/khalifate/hakim.png" "units/khalifate/hakim.png" {SOUND_LIST:HUMAN_HIT} }
-    [attack]
-        name=mace
-        description= _ "mace"
-        type=impact
-        range=melee
-        damage=7
-        number=2
-    [/attack]
-    [attack_anim]
-        [filter_attack]
-            name=mace
-        [/filter_attack]
-
-        start_time=-200
-
-        [frame]
-            image="units/khalifate/hakim.png:300"
-        [/frame]
-
-        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
-    [/attack_anim]
-[/unit_type]

data/multiplayer/eras.cfg

@@ -79,23 +79,23 @@
 [/era]
 
 [era]
-    id=era_khalifate
-    name= _ "Default + Khalifate"
-    description= _ "An era featuring an additional faction besides the six factions from Default Era. Khalifate units use no magic, but instead rely on careful use of terrain and coordinated strikes around dusk or dawn.
+    id=era_dunefolk
+    name= _ "Default + Dunefolk"
+    description= _ "An era featuring an additional faction besides the six factions from Default Era. Dunefolk units use no magic, but instead rely on careful use of terrain and coordinated strikes around dusk or dawn.
 
 This era is still under development, so please be sure to report any problems that arise."
 
     {ERA_DEFAULT}
-    {multiplayer/factions/khalifate-default.cfg}
+    {multiplayer/factions/dunefolk-default.cfg}
 [/era]
 
 [era]
-    id=era_khalifate_heroes
-    name= _ "Age of Heroes + Khalifate"
-    description= _ "An era featuring an additional faction besides the six factions from Age of Heroes Era. Khalifate units use no magic, but instead rely on careful use of terrain and coordinated strikes around dusk or dawn.
+    id=era_dunefolk_heroes
+    name= _ "Age of Heroes + Dunefolk"
+    description= _ "An era featuring an additional faction besides the six factions from Age of Heroes Era. Dunefolk units use no magic, but instead rely on careful use of terrain and coordinated strikes around dusk or dawn.
 
 This era is still under development, so please be sure to report any problems that arise."
 
     {ERA_HEROES}
-    {multiplayer/factions/khalifate-aoh.cfg}
+    {multiplayer/factions/dunefolk-aoh.cfg}
 [/era]

data/multiplayer/factions/dunefolk-aoh.cfg

@@ -0,0 +1,19 @@
+#textdomain wesnoth-multiplayer
+[multiplayer_side]
+    id=Dunefolk
+    name= _"Dunefolk"
+    image="units/dunefolk/batal.png"
+    type=random
+    leader=Shuja,Rasikh,Mighwar,Batal,Mufariq,Tineen
+    random_leader=Shuja,Rasikh,Mighwar,Batal,Mufariq
+    recruit=Jundi,Arif,Khaiyal,Rami,Hakim,Naffat,Falcon,Ghazi,Mudafi,Tabib,Monawish,Muharib,Faris,Qanas,Saree,Qatif_al_nar,Elder Falcon
+    terrain_liked=Ss, Hh, Ha, Ww
+    # wmllint: markcheck off
+    description="<img>src='portraits/dunefolk/hakim.png~BG()' align='middle'</img>
+
+"+_"The <bold>text='Dunefolk'</bold> are a faction of humans from the deserts and hills of the southern lands. Lacking magic users, the Dunefolk instead specialize in using terrain features to coordinate attacks at dawn or dusk. Their ranks boast lawful and liminal units, healers, high-accuracy melee fighters, and fearsome horse-mounted archers. While Dunefolk units tend to be more expensive than those of the Loyalist faction, they make up for this with high mobility — especially on hilly terrains."
+    # wmllint: markcheck on
+    [ai]
+        recruitment_pattern=fighter,fighter,fighter,mixed fighter,mixed fighter,archer,archer,scout
+    [/ai]
+[/multiplayer_side]

data/multiplayer/factions/dunefolk-default.cfg

@@ -0,0 +1,19 @@
+#textdomain wesnoth-multiplayer
+[multiplayer_side]
+    id=Dunefolk
+    name= _"Dunefolk"
+    image="units/dunefolk/muharib.png"
+    type=random
+    leader=Muharib,Ghazi,Mudafi,Monawish,Tabib
+    random_leader=Muharib,Ghazi,Mudafi,Monawish,Tabib
+    recruit=Jundi,Arif,Khaiyal,Rami,Hakim,Naffat,Falcon
+    terrain_liked=Ss, Hh, Ha, Ww
+    # wmllint: markcheck off
+    description="<img>src='portraits/dunefolk/hakim.png~BG()' align='middle'</img>
+
+"+_"The <bold>text='Dunefolk'</bold> are a faction of humans from the deserts and hills of the southern lands. Lacking magic users, the Dunefolk instead specialize in using terrain features to coordinate attacks at dawn or dusk. Their ranks boast lawful and liminal units, healers, high-accuracy melee fighters, and fearsome horse-mounted archers. While Dunefolk units tend to be more expensive than those of the Loyalist faction, they make up for this with high mobility — especially on hilly terrains."
+    # wmllint: markcheck on
+    [ai]
+        recruitment_pattern=fighter,fighter,fighter,mixed fighter,mixed fighter,archer,archer,scout
+    [/ai]
+[/multiplayer_side]

data/multiplayer/factions/khalifate-aoh.cfg

@@ -1,19 +1,2 @@
-#textdomain wesnoth-multiplayer
-[multiplayer_side]
-    id=Khalifate
-    name= _"Khalifate"
-    image="units/khalifate/batal.png"
-    type=random
-    leader=Shuja,Rasikh,Mighwar,Batal,Mufariq,Tineen
-    random_leader=Shuja,Rasikh,Mighwar,Batal,Mufariq
-    recruit=Jundi,Arif,Khaiyal,Rami,Hakim,Naffat,Falcon,Ghazi,Mudafi,Tabib,Monawish,Muharib,Faris,Qanas,Saree,Qatif_al_nar,Elder Falcon
-    terrain_liked=Ss, Hh, Ha, Ww
-    # wmllint: markcheck off
-    description="<img>src='portraits/khalifate/hakim.png~BG()' align='middle'</img>
-
-"+_"The <bold>text='Khalifate'</bold> are a faction of humans from the deserts and hills of the southern lands. Lacking magic users, the Khalifate instead specialize in using terrain features to coordinate attacks at dawn or dusk. Their ranks boast lawful and liminal units, healers, high-accuracy melee fighters, and fearsome horse-mounted archers. While Khalifate units tend to be more expensive than those of the Loyalist faction, they make up for this with high mobility — especially on hilly terrains."
-    # wmllint: markcheck on
-    [ai]
-        recruitment_pattern=fighter,fighter,fighter,mixed fighter,mixed fighter,archer,archer,scout
-    [/ai]
-[/multiplayer_side]
+# remove file with 1.15
+{./dunefolk-aoh.cfg}

data/multiplayer/factions/khalifate-default.cfg

@@ -1,19 +1,2 @@
-#textdomain wesnoth-multiplayer
-[multiplayer_side]
-    id=Khalifate
-    name= _"Khalifate"
-    image="units/khalifate/muharib.png"
-    type=random
-    leader=Muharib,Ghazi,Mudafi,Monawish,Tabib
-    random_leader=Muharib,Ghazi,Mudafi,Monawish,Tabib
-    recruit=Jundi,Arif,Khaiyal,Rami,Hakim,Naffat,Falcon
-    terrain_liked=Ss, Hh, Ha, Ww
-    # wmllint: markcheck off
-    description="<img>src='portraits/khalifate/hakim.png~BG()' align='middle'</img>
-
-"+_"The <bold>text='Khalifate'</bold> are a faction of humans from the deserts and hills of the southern lands. Lacking magic users, the Khalifate instead specialize in using terrain features to coordinate attacks at dawn or dusk. Their ranks boast lawful and liminal units, healers, high-accuracy melee fighters, and fearsome horse-mounted archers. While Khalifate units tend to be more expensive than those of the Loyalist faction, they make up for this with high mobility — especially on hilly terrains."
-    # wmllint: markcheck on
-    [ai]
-        recruitment_pattern=fighter,fighter,fighter,mixed fighter,mixed fighter,archer,archer,scout
-    [/ai]
-[/multiplayer_side]
+# remove file with 1.15
+{./dunefolk-default.cfg}

data/tools/wmllint

@@ -831,7 +831,45 @@ linechanges = (
         ("units/human-loyalists/heavy-infantry-idle-6.png", "units/human-loyalists/heavyinfantry-idle-6.png"),
         ("units/human-loyalists/heavy-infantry-idle-7.png", "units/human-loyalists/heavyinfantry-idle-7.png"),
         ("units/human-loyalists/heavy-infantry-idle-8.png", "units/human-loyalists/heavyinfantry-idle-8.png"),
-        ("units/human-loyalists/heavy-infantry-idle-9.png", "units/human-loyalists/heavyinfantry-idle-9.png")
+        ("units/human-loyalists/heavy-infantry-idle-9.png", "units/human-loyalists/heavyinfantry-idle-9.png"),
+        
+        # renamed khalifate to dunefolk
+        ("id=khalifate", "id=dunefolk"),
+        ("movement_type=khalifatefoot", "movement_type=dunefoot"),
+        ("movement_type=khalifatearmoredfoot", "movement_type=dunearmoredfoot"),
+        ("movement_type=khalifatehorse", "movement_type=dunehorse"),
+        ("movement_type=khalifatearmoredhorse", "movement_type=dunearmoredhorse"),
+        ("race=khalifate", "race=dunefolk"),
+        ("{KHALIFATE_NAMES}", "{DUNEFOLK_NAMES}"),
+        ("portraits/khalifate/hakim.png", "portraits/dunefolk/hakim.png"),
+        ("units/khalifate/arif.png", "units/dunefolk/arif.png"),
+        ("units/khalifate/batal.png", "units/dunefolk/batal.png"),
+        ("units/khalifate/elder-falcon.png", "units/dunefolk/elder-falcon.png"),
+        ("units/khalifate/elder-falcon.png", "units/dunefolk/elder-falcon.png"),
+        ("units/khalifate/faris.png", "units/dunefolk/faris.png"),
+        ("units/khalifate/ghazi.png", "units/dunefolk/ghazi.png"),
+        ("units/khalifate/hadaf.png", "units/dunefolk/hadaf.png"),
+        ("units/khalifate/hakim.png", "units/dunefolk/hakim.png"),
+        ("units/khalifate/jawal.png", "units/dunefolk/jawal.png"),
+        ("units/khalifate/jundi.png", "units/dunefolk/jundi.png"),
+        ("units/khalifate/khaiyal.png", "units/dunefolk/khaiyal.png"),
+        ("units/khalifate/khalid.png", "units/dunefolk/khalid.png"),
+        ("units/khalifate/mighwar.png", "units/dunefolk/mighwar.png"),
+        ("units/khalifate/monawish.png", "units/dunefolk/monawish.png"),
+        ("units/khalifate/mudafi.png", "units/dunefolk/mudafi.png"),
+        ("units/khalifate/mufariq.png", "units/dunefolk/mufariq.png"),
+        ("units/khalifate/muharib.png", "units/dunefolk/muharib.png"),
+        ("units/khalifate/naffat.png", "units/dunefolk/naffat.png"),
+        ("units/khalifate/qanas.png", "units/dunefolk/qanas.png"),
+        ("units/khalifate/qatif-al-nar.png", "units/dunefolk/qatif-al-nar.png"),
+        ("units/khalifate/rami.png", "units/dunefolk/rami.png"),
+        ("units/khalifate/rasikh.png", "units/dunefolk/rasikh.png"),
+        ("units/khalifate/saree.png", "units/dunefolk/saree.png"),
+        ("units/khalifate/shuja.png", "units/dunefolk/shuja.png"),
+        ("units/khalifate/tabib.png", "units/dunefolk/tabib.png"),
+        ("units/khalifate/tineen.png", "units/dunefolk/tineen.png"),
+        ("era_khalifate", "era_dunefolk"),
+        ("era_khalifate_heroes", "era_dunefolk_heroes")
 
         )
 

players_changelog

@@ -16,6 +16,8 @@ Version 1.13.10+dev:
      * 'Endless Night' now has accurate & improved scenario objectives. It also
        has received improvements in dialog, map appearance, and difficulty.
      * S08/S09 A Small Favor 2/3 - Fixed bug preventing door operation/usage.
+ * Multiplayer:
+   * Rename the Khalifate to the Dunefolk.
  * Language and i18n:
    * Updated translations: Chinese (Simplified), Italian, Spanish.
  * Performance: