Remove deprecated Khalifate references.

(cherry-picked from commit 994e6ef)
wesnoth · Oct 7, 2018 · 0c69e40 · 0c69e40
1 parent 5a017b5
commit 0c69e40
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 478 deletions.
diff --git a/data/core/macros/deprecated-utils.cfg b/data/core/macros/deprecated-utils.cfg
@@ -442,9 +442,3 @@ _"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
-    #deprecated 3 1.15 Use DUNEFOLK_NAMES instead.
-    {DUNEFOLK_NAMES}
-#enddef
diff --git a/data/core/units.cfg b/data/core/units.cfg
@@ -200,8 +200,7 @@ The eastern provinces of Wesnoth, known as the Clan Homelands, have a geography
         {HUMAN_NAMES}
     [/race]
 
-    # wmllint: general spellings Dunefolk Khalid Khaiyal Qanas Saree Faris
-    # wmllint: general spellings Qatif-al-nar Rami
+    # wmllint: general spellings Dunefolk 
     # wmllint: general spelling liminal
     [race]
         id=dunefolk
@@ -216,21 +215,6 @@ The eastern provinces of Wesnoth, known as the Clan Homelands, have a geography
         # wmlscope: stop ignoring
     [/race]
 
-    # TODO: remove khalifate race with 1.15
-    # wmllint: general spellings Khalifate
-    [race]
-        id=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
-        # wmlscope: start ignoring
-        {DUNEFOLK_NAMES}
-        # wmlscope: stop ignoring
-    [/race]
-
     # wmllint: general spelling Saurgrath lizardman lizardmen
     [race]
         id=lizard
@@ -1725,171 +1709,4 @@ The life span of the wose is unknown, although the most ancient members of this
             arcane=80
         [/resistance]
     [/movetype]
-
-    # TODO: remove khalifate movetypes for 1.15
-    [movetype]
-        name=khalifatefoot
-        [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=khalifatearmoredfoot
-        [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=khalifatehorse
-        [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=khalifatearmoredhorse
-        [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]
 [/units]