diff --git a/data/core/macros/deprecated-utils.cfg b/data/core/macros/deprecated-utils.cfg index b8b96f5ef0c..39142cb44b1 100644 --- 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 index d1b9d8545e4..0f50f144ccb 100644 --- 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] diff --git a/data/core/units/dunefolk/deprecated.cfg b/data/core/units/dunefolk/deprecated.cfg deleted file mode 100644 index 5557ae685fc..00000000000 --- a/data/core/units/dunefolk/deprecated.cfg +++ /dev/null @@ -1,288 +0,0 @@ - -[unit_type] - id=Batal - race=khalifate - [base_unit] - id=Dune Ranger - [/base_unit] - advances_to=null - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Batal "Dune Ranger" 1.15} -[/unit_type] - -[unit_type] - id=Hadaf - race=khalifate - [base_unit] - id=Dune Marauder - [/base_unit] - advances_to=null - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Hadaf "Dune Marauder" 1.15} -[/unit_type] - -[unit_type] - id=Jawal - race=khalifate - [base_unit] - id=Dune Windrider - [/base_unit] - advances_to=null - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Jawal "Dune Windrider" 1.15} -[/unit_type] - -[unit_type] - id=Mighwar - race=khalifate - [base_unit] - id=Dune Harrier - [/base_unit] - advances_to=null - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Mighwar "Dune Harrier" 1.15} -[/unit_type] - -[unit_type] - id=Khalid - race=khalifate - [base_unit] - id=Dune Warmaster - [/base_unit] - advances_to=null - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Khalid "Dune Warmaster" 1.15} -[/unit_type] - -[unit_type] - id=Tabib - race=khalifate - [base_unit] - id=Dune Apothecary - [/base_unit] - advances_to=null - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Tabib "Dune Apothecary" 1.15} -[/unit_type] - -[unit_type] - id=Shuja - race=khalifate - [base_unit] - id=Dune Blademaster - [/base_unit] - advances_to=null - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Shuja "Dune Blademaster" 1.15} -[/unit_type] - -[unit_type] - id=Mufariq - race=khalifate - [base_unit] - id=Dune Cataphract - [/base_unit] - advances_to=null - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Mufariq "Dune Cataphract" 1.15} -[/unit_type] - -[unit_type] - id=Rasikh - race=khalifate - [base_unit] - id=Dune Spearmaster - [/base_unit] - advances_to=null - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Rasikh "Dune Spearmaster" 1.15} -[/unit_type] - -[unit_type] - id=Tineen - race=khalifate - [base_unit] - id=Dune Firetrooper - [/base_unit] - advances_to=null - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Tineen "Dune Firetrooper" 1.15} -[/unit_type] - -[unit_type] - id=Qanas - race=khalifate - [base_unit] - id=Dune Raider - [/base_unit] - advances_to=Hadaf - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Qanas "Dune Raider" 1.15} -[/unit_type] - -[unit_type] - id=Rami - race=khalifate - [base_unit] - id=Dune Rider - [/base_unit] - advances_to=Saree - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Rami "Dune Rider" 1.15} -[/unit_type] - -[unit_type] - id=Naffat - race=khalifate - [base_unit] - id=Dune Burner - [/base_unit] - advances_to=Qatif_al_nar - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Naffat "Dune Burner" 1.15} -[/unit_type] - -[unit_type] - id=Muharib - race=khalifate - [base_unit] - id=Dune Explorer - [/base_unit] - advances_to=Batal - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Muharib "Dune Explorer" 1.15} -[/unit_type] - -[unit_type] - id=Faris - race=khalifate - [base_unit] - id=Dune Sunderer - [/base_unit] - advances_to=Mufariq - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Faris "Dune Sunderer" 1.15} -[/unit_type] - -[unit_type] - id=Hakim - race=khalifate - [base_unit] - id=Dune Herbalist - [/base_unit] - advances_to=Tabib - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Hakim "Dune Herbalist" 1.15} -[/unit_type] - -[unit_type] - id=Saree - race=khalifate - [base_unit] - id=Dune Swiftrider - [/base_unit] - advances_to=Jawal - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Saree "Dune Swiftrider" 1.15} -[/unit_type] - -[unit_type] - id=Ghazi - race=khalifate - [base_unit] - id=Dune Swordsman - [/base_unit] - advances_to=Shuja - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Ghazi "Dune Swordsman" 1.15} -[/unit_type] - -[unit_type] - id=Monawish - race=khalifate - [base_unit] - id=Dune Skirmisher - [/base_unit] - advances_to=Mighwar - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Monawish "Dune Skirmisher" 1.15} -[/unit_type] - -[unit_type] - id=Mudafi - race=khalifate - [base_unit] - id=Dune Spearguard - [/base_unit] - advances_to=Rasikh - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Mudafi "Dune Spearguard" 1.15} -[/unit_type] - -[unit_type] - id=Qatif_al_nar - race=khalifate - [base_unit] - id=Dune Scorcher - [/base_unit] - advances_to=Tineen - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Qatif_al_nar "Dune Scorcher" 1.15} -[/unit_type] - -[unit_type] - id=Jundi - race=khalifate - [base_unit] - id=Dune Rover - [/base_unit] - advances_to=Monawish,Muharib - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Jundi "Dune Rover" 1.15} -[/unit_type] - -[unit_type] - id=Khaiyal - race=khalifate - [base_unit] - id=Dune Piercer - [/base_unit] - advances_to=Faris,Qanas - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Khaiyal "Dune Piercer" 1.15} -[/unit_type] - -[unit_type] - id=Arif - race=khalifate - [base_unit] - id=Dune Soldier - [/base_unit] - advances_to=Ghazi,Mudafi - hide_help=yes - do_not_list=yes - {DEPRECATED_UNIT Arif "Dune Soldier" 1.15} -[/unit_type]