Skip to content

Commit

Permalink
MP: Renames the Khalifate to Dunefolk.
Browse files Browse the repository at this point in the history
  • Loading branch information
Pentarctagon authored and sigurdfdragon committed Jan 19, 2018
1 parent fbb0e02 commit 5b31b87
Show file tree
Hide file tree
Showing 71 changed files with 485 additions and 253 deletions.
1 change: 1 addition & 0 deletions changelog
Expand Up @@ -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 %.
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Secrets_of_the_Ancients/units/Khalif.cfg
Expand Up @@ -3,7 +3,7 @@
[unit_type]
id=Khalif
name= _ "Khalif"
race=khalifate
race=dunefolk
image="units/khalif.png"
hitpoints=30
movement_type=smallfoot
Expand Down
4 changes: 2 additions & 2 deletions data/core/about.cfg
Expand Up @@ -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)"
Expand Down Expand Up @@ -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)"
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
5 changes: 5 additions & 0 deletions data/core/macros/deprecated-utils.cfg
Expand Up @@ -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
6 changes: 3 additions & 3 deletions data/core/macros/names.cfg
Expand Up @@ -139,9 +139,9 @@ centre_v=na|lla|na|ry|li|ni|ri|rae|bry
>>
#enddef

#define KHALIFATE_NAMES
#define DUNEFOLK_NAMES
male_names=_ "Aban,Abbas,Abbud,Abdul-ʿAdl,Abdul-Ahad,Abdul-Alim,Abdul-Aliyy,Abdul-Azim,Abdul-Aziz,Abdul-Badi,Abdul-Baʿith,Abdul-Baqi,Abdul-Bari,Abdul-Barr,Abdul-Basir,Abdul-Basit,Abdul-Fattah,Abdul-Ghaffar,Abdul-Ghafur,Abdul-Ghani,Abdul-Hadi,Abdul-Hafiz,Abdul-Hakam,Abdul-Hakim,Abdul-Halim,Abdul-Hamid,Abdul-Haqq,Abdul-Hasib,Abdul-Hayy,Abdul-Jabbar,Abdul-Jalil,Abdul-Karim,Abdul-Khabir,Abdul-Khaliq,Abdul-Latif,Abdul-Malik,Abdul-Majid,Abdul-Matin,Abdul-Mubdiʾ,Abdul-Mughni,Abdul-Muhaimin,Abdul-Muhsi,Abdul-Muhyi,Abdul-Muʿid,Abdul-Muʿizz,Abdul-Mujib,Abdul-Mumin,Abdul-Muqaddim,Abdul-Muqtadir,Abdul-Musawwir,Abdul-Mutaʿal,Abdul-Nafi,Abdul-Nasser,Abdul-Nasir,Abdul-Nur,Abdul-Qadir,Abdul-Qahhar,Abdul-Qawi,Abdul-Qayyum,Abdul-Quddus,Abdul-Rafi,Abdul-Rahim,Abdul-Rahman,Abdul-Rashid,Abdul-Raʿuf,Abdul-Razzaq,Abdul-Shakur,Abdul-Tawwab,Abdul-Wadud,Abdul-Wahhab,Abdul-Wahid,Abdul-Wajid,Abdul-Wakil,Abdul-Wali,Abdul-Waliy,Abdul-Warith,Abdul-Zahir,Abdullah,ʿAbid,ʿAbidin,Abu Bakr,Aby al-Khayr,Adil,Adham,Adib,ʿAdli,ʿAdnan,ʿAfif,Ahmad,ʿAjib,ʿAkif,Akil,Akram,Alaʾ,Alaʾ al-Din,Alʿ Abbas,Aladdin,al-Bara,al-Hakam,al-Harith,Alhasan,Alhusain,Ali,Alim,Almahdi,al-Safi,Altaf,Altair,al-Tayyib,al-Tijani,al-Tufail,Amid,ʿAmid,Amin,Amir,ʿAmir,Amjad,ʿAmmar,ʿAmro,Anas,Anis,ʿAntarah,Anwar,ʿAqil,Arfan,Arif,ʿArif,Asad,Asʿad,Asadel,Ashraf,Asif,ʿAsim,Aswad,Ataʿ,Ataʿ Allah,Ataʿ al-Rahman,Athil,Athir,ʿAtif,ʿAwad,ʿAwf,Aws,Awwab,Ayham,Ayman,Ayser,Ayyub,Aza,ʿAzab,Azhar,Azim,ʿAziz,ʿAzzam,Badi,Badi al-Zaman,Badr,Badr al-Din,Badri,Bahaʿ,Bahiyy al-Din,Bahij,Bahir,Bakr,Bakri,Baligh,Bandar,Barakah,Barir,Bashshar,Basil,Basim,Bassam,Bayezid,Bayhas,Bilal,Bishr,Boulos,Budail,Burhan,Bushr,Butrus,Dabir,Dani,Darwish,Daʿud,Dhakir,Dhakiy,Dhakwan,Dhul Fiqar,Dirar,Diya,Diya al-Din,Duqaq,Fadi,Fadil,Fadl,Fadl Allah,Fahd,Fahad,Fahmi,Faisal,Faʿiz,Fakhir,Fakhr al-Din,Fakhri,Fakih,Falah,Falih,Faraj,Farhan,Farid,Fariq,Fariq,Faris,Faruq,Fath,Fathi,Fatih,Fatin,Fawwaz,Fawzan,Fawzi,Fayyad,Ferran,Fida,Fikri,Firas,Fuʿad,Fudail,Gamal,Ghayth,Ghali,Ghalib,Ghanim,Ghassan,Ghawth,Ghazwan,Ghiyath,Habbab,Habib,Haddad,Hadi,Hafiz,Hakem,Hakim,Halim,Hamal,Hamas,Hamdan,Hamdi,Hamid,Hamim,Hamzah,Hana,Hanaʾi,Hanbal,Hani,Hanif,Hannad,Haris,Harith,Harun,Hashim,Hassan,Hatim,Haydar,Haytham,Hayyan,Hazim,Hilal,Hilmi,Hisham,Hud,Hudad,Hudhafah,Hudhayfah,Humam,Hussein,Husam,Husam al-Din,Ibrahim,ʿId,Idris,Ihsan,Ihtisham,ʿIkrimah,Ilias,ʿImad,Imad al-Din,Imran,Imtiyaz,Inʿam,Iqbal,ʿIrfan,ʿIsa,ʿIsam,Ishaq,Ismaʿil,Iyad,Iyas,Izz al-Din,Jabbar,Jabr,Jabir,Jad Allah,Jaʿfar,Jal,Jalal,Jalal al-Din,Jalil,Jamal,Jamal al-Din,Jamil,Jarir,Jasim,Jaul,Jaun,Jawad,Jawdah,Jawhar,Jibran,Jibril,Jubair,Jul,Jumah,Junayd,Juwain,Kadar,Kadin,Kadir,Kahil,Kaliq,Kamal,Kamil,Karam,Kardal,Karif,Karim,Kasib,Kasim,Katib,Kazim,Khalaf,Khaldun,Khalid,Khalil,Khalil al-Allah,Khalis,Khatib,Khair al-Din,Khairi,Khoury,Khulus,Khuzaymah,Kutaiba,Labib,Lablab,Latif,Layth,LuʿayLubayd,Luqman,Lut,Lutfi,Maʿd,Madani,Mahbub,Mahdi,Mahfuz,Mahir,Mahjub,Mahmud,Mahrus,Maimun,Majd,Majdy,Majd al-Din,Majid,Makin,Malik,Mamduh,Maʿmun,Maʿin,Mandhur,Mansur,Marghub,Marid,Maʿruf,Marwan,Marzuq,Mashʿal,Mashhur,Masrur,Masʿud,Masun,Maysarah,Mazhar,Mazin,Mehmed,Mihran,Mihyar,Mikaʾil,Miqdad,Misbah,Mishʿal,Miyaz,Muʾadh,Muʾawiyah,Muʾayyad,Mubarak,Mubin,Mudar,Muddaththir,Mufid,Muflih,Muhab,Muhayr,Muhammad,Muhanna,Muhannad,Muhib,Muhibb,Muhsin,Muhtadi,Muhyi al-Din,Muʿin,Muʿizz,Mujab,Mujahid,Mukarram,Mukhlis,Mukhtar,Mulham,Mulhim,Muʿmmar,Muʿmin,Mumtaz,Munahid,Mundhir,Munib,Munif,Munir,Muʿnis,Munjid,Munsif,Muntasir,Murad,Murid,Murshid,Murtada,Musa,Musʿab,Musaʿid,Mushtaq,Muslih,Muslim,Mutafa,Mutaʾ,Muʿtasim,Mutawalli,Muʿtazz,Muthanna,Muti,Muwaffaq,Muyassar,Muzaffar,Mussammil,Nabhan,Nabighah,Nabih,Nabil,Nadhir,Nadim,Nadir,Nafiʾ,Nahid,Naʾil,Naʾim,Naji,Najib,Najid,Najjar,Najm al-Din,Naʿaman,Namir,Nashʿah,Nashʿat,Nashwan,Nasib,Nasih,Nasim,Nasir,Nasir al-Din,Nasr,Nasri,Nasuh,Nawaf,Nawfal,Nayif,Nazih,Nazim,Nazmi,Nibras,Nidal,Nijad,Nimr,Nizar,Nuʿaym,Nuh,Nuhayd,Numair,Nuʿman,Nur al-Din,Nuri,Nusrah,Nusrat,Omar,Orhan,Osman,Qasim,Qays,Qudamah,Qusay,Qatadah,Qutaybah,Qutb,Qutuz,Rabah,Rabi,Radi,Rafi,Rafid,Rafiq,Raghib,Rahman,Raʿid,Raʿif,Rais,Rajaa,Rajab,Raji,Rajih,Rakin,Rami,Ramih,Ramiz,Ramzi,Rani,Rashad,Rashid,Rasil,Rasin,Rasmi,Rasul,Ratib,Raʿuf,Rayhan,Rayyan,Razin,Ridha,Ridwan,Rihab,Riyad,Rizq,Ruhi,Rushd,Rushdi,Ruwayd,Saad,Saʿadah,Sab,Sabih,Sabir,Sabri,Saʿd,Saʿd al-Din,Sadad,Sadid,Sadiq,Saʿdun,Saʿid,Safi,Safiy,Safiy al-Din,Safuh,Safwah,Safwat,Safwan,Sahib,Sahir,Sahl,Saʾib,Saif,Saif al-Din,Sajid,Sajjad,Sakhr,Salah,Salah al-Din,Salamah,Salih,Salim,Salman,Sami,Samih,Samir,Samman,Saqr,Sariyah,Sati,Saud,Sayyid,Shaʿban,Shadi,Shadin,Shafi,Shafiq,Shahid,Shahin,Shahir,Shakib,Shakir,Shams al-Din,Shamal,Shamil,Shamim,Sharaf,Sharif,Shawqi,Shihab,Shihab al-Din,Shihad,Shuʿayb,Shukri,Shumayl,Siddiq,Sinan,Siraj,Siraj al-Din,Sofian,Subhi,Sufyan,Suhayb,Suhayl,Suhaym,Sulaiman,Sumrah,Suraqah,Suʿud,Tahir,Tahsin,Taym Allah,Taj,Taj al-Din,Talal,Talib,Tamim,Tamir,Tamam,Tammam,Taqiy,Tarif,Tariq,Taslim,Tawfiq,Tawhid,Taymullah,Taysir,Tayyib,Thabit,Thamir,Thaqib,Thawab,Thawban,ʿUbaidah,Ubaid,Ubayy,ʿUdayl,ʿUday,ʿUmar,Umarah,Umair,ʾaUrwah,Usaym,Usama,ʿUtbah,Uthal,Uthman,Waddah,Wadi,Wadid,Wafiq,Wahab,Wahhab,Wahid,Waʾil,Wajdi,Wajid,Wajih,Wakil,Walid,Walif,Waliy Allah,Waliy al-Din,Waqar,Waqqas,Ward,Wasif,Wasil,Wasim,Wazir,Yahya,Yaman,Yaʿqub,Yasar,Yasin,Yasir,Yazan,Yazid,Yunus,Yushua,Yusri,Yusuf,Zafar,Zafir,Zahid,Zahir,Zayd,Zaim,Zayn,Zarif,Zakarriya,Zaki,Zakwan,Ziyad,Zubayr,Zuhayr"
# po: Generator for male khalifate human names
# po: Generator for male dunefolk human names
male_name_generator= _ <<
main={name_long}|{prefix}{suffix}|{name_mid}{connector}{name_mid}
name_mid={prefix}{suffix}|{name_short}
Expand All @@ -152,7 +152,7 @@ suffix=af|al|lih|bair|sur|bi|lah|at|sim|ma|ih|yl|iq|raj|mam|man|ya|zid|riya|ail|
connector= al-| bin | ibn
centre=ʿ|ʾ|hi|sa|kar|da|na|ja|tay|ki|hai|saw
>>
# po: Generator for female khalifate human names
# po: Generator for female dunefolk human names
female_name_generator= _ <<
main={name_long}|{prefix}{suffix}|{name_mid}{connector}{surname}
name_mid={prefix}{suffix}|{name_short}
Expand Down
186 changes: 184 additions & 2 deletions data/core/units.cfg
Expand Up @@ -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/}
Expand Down Expand Up @@ -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

This comment has been minimized.

Copy link
@CelticMinstrel

CelticMinstrel Mar 1, 2018

Member

...oh hey I just noticed that most of these spellings can be removed at some point.

# 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"
Expand Down Expand Up @@ -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]
Expand Down
Expand Up @@ -2,20 +2,20 @@
[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
alignment=lawful
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"
Expand All @@ -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}
Expand Down
Expand Up @@ -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
Expand All @@ -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"
Expand All @@ -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}
Expand All @@ -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}
Expand Down
Expand Up @@ -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
Expand All @@ -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]
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand Down

0 comments on commit 5b31b87

Please sign in to comment.