Renames the Dunefolk(formerly Khalifate) units based on forum discuss…

…ions. This commit actually changes the contents of the unit files, and adds deprecated.cfg for all the old IDs.
wesnoth · Feb 4, 2018 · 6976091 · 6976091
1 parent dc21c42
commit 6976091
Show file tree

Hide file tree

Showing 32 changed files with 495 additions and 187 deletions.
diff --git a/changelog b/changelog
@@ -39,7 +39,8 @@ Version 1.13.10+dev:
    * Allow moving on-map units by setting unit.x an unit.y fields.
  * Multiplayer:
    * Dark Forecast: Fixed broken faction and leader selection.
-   * Rename the Khalifate to Dunefolk.
+   * Rename the Khalifate to Dunefolk. This includes renaming all the faction's
+     units.
  * 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 %.

diff --git a/data/core/units.cfg b/data/core/units.cfg
@@ -215,9 +215,9 @@ The eastern provinces of Wesnoth, known as the Clan Homelands, have a geography
     # wmllint: general spellings Khalifate
     [race]
         id=khalifate
-        male_name= _"race^Khalifate Human"
-        female_name= _"race+female^Khalifate Human"
-        plural_name= _"race+plural^Khalifate"
+        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

diff --git a/data/core/units/dunefolk/Apothecary.cfg b/data/core/units/dunefolk/Apothecary.cfg
@@ -1,10 +1,10 @@
 #textdomain wesnoth-units
 [unit_type]
-    id=Tabib
-    name= _ "Tabib"
+    id=Dune Apothecary
+    name= _ "Dune Apothecary"
     race=dunefolk
-    image="units/dunefolk/tabib.png"
-    profile="portraits/dunefolk/hakim.png"
+    image="units/dunefolk/apothecary.png"
+    profile="portraits/dunefolk/herbalist.png"
     hitpoints=39
     movement_type=dunefoot
     [abilities]
@@ -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 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}
+    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 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/dunefolk/tabib.png" "units/dunefolk/tabib.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/apothecary.png" "units/dunefolk/apothecary.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=mace
         description= _ "mace"
@@ -39,7 +39,7 @@
         start_time=-200
 
         [frame]
-            image="units/dunefolk/tabib.png:300"
+            image="units/dunefolk/apothecary.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}

diff --git a/data/core/units/dunefolk/Blademaster.cfg b/data/core/units/dunefolk/Blademaster.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-units
 [unit_type]
-    id=Shuja
-    name= _ "Shuja"
+    id=Dune Blademaster
+    name= _ "Dune Blademaster"
     race=dunefolk
-    image="units/dunefolk/shuja.png"
+    image="units/dunefolk/blademaster.png"
     hitpoints=70
     movement_type=dunearmoredfoot
     movement=5
@@ -14,9 +14,9 @@
     {AMLA_DEFAULT}
     cost=52
     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}
+    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}
     die_sound={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/dunefolk/shuja.png" "units/dunefolk/shuja.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/blademaster.png" "units/dunefolk/blademaster.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=sword
         description= _ "sword"
@@ -50,7 +50,7 @@
         start_time=-200
 
         [frame]
-            image="units/dunefolk/shuja.png:300"
+            image="units/dunefolk/blademaster.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/dunefolk/shuja.png:300"
+            image="units/dunefolk/blademaster.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}

diff --git a/data/core/units/dunefolk/Burner.cfg b/data/core/units/dunefolk/Burner.cfg
@@ -1,26 +1,25 @@
 #textdomain wesnoth-units
 [unit_type]
-    id=Naffat
-    name= _ "Naffat"
+    id=Dune Burner
+    name= _ "Dune Burner"
     race=dunefolk
     ignore_race_traits=yes
     {TRAIT_QUICK}
     {TRAIT_INTELLIGENT}
     {TRAIT_RESILIENT}
-    image="units/dunefolk/naffat.png"
+    image="units/dunefolk/burner.png"
     hitpoints=31
     movement_type=dunefoot
     movement=5
     experience=44
     level=1
     alignment=lawful
-    # Below unit id changed to use underscores in unit ID only (not in displayed name) to fix bug #18117
-    advances_to=Qatif_al_nar
+    advances_to=Dune Scorcher
     cost=19
     usage=archer
-    description= _ "Utilizing various resources found in the Dunefolk domain, a highly flammable substance can be made. The Naffat 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= _ "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."
     die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/dunefolk/naffat.png" "units/dunefolk/naffat.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/burner.png" "units/dunefolk/burner.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
         name=naphtha attack
         description= _ "naphtha attack"
@@ -48,7 +47,7 @@
         start_time=-200
 
         [frame]
-            image="units/dunefolk/naffat.png:300"
+            image="units/dunefolk/burner.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS melee-fire.ogg torch-miss.ogg -150}
@@ -71,7 +70,7 @@
             [/missile_frame]
             {FIRE_BURST_SMALL}
             [frame]
-                image="units/dunefolk/naffat.png:300"
+                image="units/dunefolk/burner.png:300"
                 sound=bow-puny-fire.ogg
             [/frame]
         [/if]
@@ -83,7 +82,7 @@
                 image_diagonal="projectiles/missile-fire-ne.png"
             [/missile_frame]
             [frame]
-                image="units/dunefolk/naffat.png:300"
+                image="units/dunefolk/burner.png:300"
                 sound=bow-puny-fire-miss.ogg
             [/frame]
         [/else]

diff --git a/data/core/units/dunefolk/Cataphract.cfg b/data/core/units/dunefolk/Cataphract.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-units
 [unit_type]
-    id=Mufariq
-    name= _ "Mufariq"
+    id=Dune Cataphract
+    name= _ "Dune Cataphract"
     race=dunefolk
-    image="units/dunefolk/mufariq.png"
+    image="units/dunefolk/cataphract.png"
     hitpoints=65
     movement_type=dunearmoredhorse
     movement=6
@@ -15,9 +15,9 @@
     cost=61
     usage=fighter
     # 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."
+    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={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/dunefolk/mufariq.png" "units/dunefolk/mufariq.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/cataphract.png" "units/dunefolk/cataphract.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=lance
         description= _ "lance"
@@ -44,7 +44,7 @@
         horse_sound_start_time=-250
 
         [frame]
-            image="units/dunefolk/mufariq.png:400"
+            image="units/dunefolk/cataphract.png:400"
         [/frame]
 
         [horse_sound_frame]
@@ -62,7 +62,7 @@
         horse_sound_start_time=-250
 
         [frame]
-            image="units/dunefolk/mufariq.png:400"
+            image="units/dunefolk/cataphract.png:400"
         [/frame]
 
         [horse_sound_frame]

diff --git a/data/core/units/dunefolk/Explorer.cfg b/data/core/units/dunefolk/Explorer.cfg
@@ -1,21 +1,21 @@
 #textdomain wesnoth-units
 [unit_type]
-    id=Muharib
-    name= _ "Muharib"
+    id=Dune Explorer
+    name= _ "Dune Explorer"
     race=dunefolk
-    image="units/dunefolk/muharib.png"
+    image="units/dunefolk/explorer.png"
     hitpoints=50
     movement_type=dunefoot
     movement=6
     experience=80
     level=2
     alignment=liminal
-    advances_to=Batal
+    advances_to=Dune Ranger
     cost=35
     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."
+    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."
     die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/dunefolk/muharib.png" "units/dunefolk/muharib.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/explorer.png" "units/dunefolk/explorer.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
         name=axe
         description= _ "axe"
@@ -42,7 +42,7 @@
         start_time=-200
 
         [frame]
-            image="units/dunefolk/muharib.png:300"
+            image="units/dunefolk/explorer.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS axe.ogg {SOUND_LIST:MISS} -50}
@@ -62,7 +62,7 @@
         [/missile_frame]
 
         [frame]
-            image="units/dunefolk/muharib.png:300"
+            image="units/dunefolk/explorer.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}

diff --git a/data/core/units/dunefolk/Firetrooper.cfg b/data/core/units/dunefolk/Firetrooper.cfg
@@ -1,13 +1,13 @@
 #textdomain wesnoth-units
 [unit_type]
-    id=Tineen
-    name= _ "Tineen"
+    id=Dune Firetrooper
+    name= _ "Dune Firetrooper"
     race=dunefolk
     ignore_race_traits=yes
     {TRAIT_QUICK}
     {TRAIT_INTELLIGENT}
     {TRAIT_RESILIENT}
-    image="units/dunefolk/tineen.png"
+    image="units/dunefolk/firetrooper.png"
     hitpoints=51
     movement_type=dunefoot
     movement=5
@@ -18,9 +18,9 @@
     {AMLA_DEFAULT}
     cost=50
     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."
+    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."
     die_sound={SOUND_LIST:ELF_HIT}
-    {DEFENSE_ANIM "units/dunefolk/tineen.png" "units/dunefolk/tineen.png" {SOUND_LIST:ELF_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/firetrooper.png" "units/dunefolk/firetrooper.png" {SOUND_LIST:ELF_HIT} }
     [attack]
         name=naphtha attack
         description=_"naphtha attack"
@@ -48,7 +48,7 @@
         start_time=-200
 
         [frame]
-            image="units/dunefolk/tineen.png:300"
+            image="units/dunefolk/firetrooper.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/dunefolk/tineen.png:300"
+                image="units/dunefolk/firetrooper.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/dunefolk/tineen.png:300"
+                image="units/dunefolk/firetrooper.png:300"
                 sound=bow-puny-fire-miss.ogg
             [/frame]
         [/else]

diff --git a/data/core/units/dunefolk/Harrier.cfg b/data/core/units/dunefolk/Harrier.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-units
 [unit_type]
-    id=Mighwar
-    name= _ "Mighwar"
+    id=Dune Harrier
+    name= _ "Dune Harrier"
     race=dunefolk
-    image="units/dunefolk/mighwar.png"
+    image="units/dunefolk/harrier.png"
     hitpoints=58
     movement_type=dunefoot
     movement=6
@@ -17,9 +17,9 @@
     [abilities]
         {ABILITY_SKIRMISHER}
     [/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}
+    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}
     die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/dunefolk/mighwar.png" "units/dunefolk/mighwar.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/harrier.png" "units/dunefolk/harrier.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
         name=longsword
         description= _ "longsword"
@@ -38,7 +38,7 @@
         start_time=-200
 
         [frame]
-            image="units/dunefolk/mighwar.png:300"
+            image="units/dunefolk/harrier.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}

diff --git a/data/core/units/dunefolk/Herbalist.cfg b/data/core/units/dunefolk/Herbalist.cfg
@@ -1,10 +1,10 @@
 #textdomain wesnoth-units
 [unit_type]
-    id=Hakim
-    name= _ "Hakim"
+    id=Dune Herbalist
+    name= _ "Dune Herbalist"
     race=dunefolk
-    image="units/dunefolk/hakim.png"
-    profile="portraits/dunefolk/hakim.png"
+    image="units/dunefolk/herbalist.png"
+    profile="portraits/dunefolk/herbalist.png"
     hitpoints=26
     movement_type=dunefoot
     [abilities]
@@ -14,12 +14,12 @@
     experience=39
     level=1
     alignment=liminal
-    advances_to=Tabib
+    advances_to=Dune Apothecary
     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 duty to their society. 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}
+    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}
     die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/dunefolk/hakim.png" "units/dunefolk/hakim.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/dunefolk/herbalist.png" "units/dunefolk/herbalist.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
         name=mace
         description= _ "mace"
@@ -36,7 +36,7 @@
         start_time=-200
 
         [frame]
-            image="units/dunefolk/hakim.png:300"
+            image="units/dunefolk/herbalist.png:300"
         [/frame]
 
         {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}