Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@escalonn
escalonn committed Aug 16, 2015
2 parents fa01f0c + ebe9d56 commit 65ebde1
Show file tree
Hide file tree
Showing 9 changed files with 907 additions and 502 deletions.
118 changes: 118 additions & 0 deletions SED2/common/landed_titles/swmh_landed_titles.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4789,6 +4789,9 @@ e_byzantium = { # Basileia Rh
c_paphlagonia = { # Paphlagonia (751)
color = { 231 74 177 }
color2 = { 255 255 255 }
turkish = "Kastamonu"
turkmen = "Kastamonu"
oghuz = "Kastamonu"
b_kastamonu = {}
b_dadybra = {}
b_pompeiopolis = {}
Expand Down Expand Up @@ -4849,6 +4852,9 @@ e_byzantium = { # Basileia Rh
c_adramyttion = { # Aiol�a (1982)
color = { 147 55 115 }
color2 = { 255 255 255 }
turkish = "Edremit"
turkmen = "Edremit"
oghuz = "Edremit"
b_adramyttion = {}
b_pergamon = {}
b_antandros = {}
Expand All @@ -4859,6 +4865,9 @@ e_byzantium = { # Basileia Rh
color2 = { 255 255 255 }
holy_site = orthodox
holy_site = nestorian
turkish = "Aydin"
turkmen = "Aydin"
oghuz = "Aydin"
b_ephesos = {}
b_miletos = {}
b_lebedos = {}
Expand All @@ -4868,6 +4877,9 @@ e_byzantium = { # Basileia Rh
c_smyrna = { # Smyrna (745)
color = { 240 45 174 }
color2 = { 255 255 255 }
turkish = "Izmir"
turkmen = "Izmir"
oghuz = "Izmir"
b_smyrna = {}
b_nymphaion = {}
b_phokaia = {}
Expand All @@ -4887,6 +4899,22 @@ e_byzantium = { # Basileia Rh
c_laodikeia = { # Kar�a (748)
color = { 162 51 124 }
color2 = { 255 255 255 }
frankish = "Laodicea"
norman = "Laodicea"
turkish = "L�dik"
turkmen = "L�dik"
oghuz = "L�dik"
sardinian = "Laodicea"
sicilian = "Laodicea"
corsican = "Laodicea"
central_italian = "Laodicea"
southern_italian = "Laodicea"
neapolitan = "Laodicea"
tuscan = "Laodicea"
ligurian = "Laodicea"
italian = "Laodicea"
venetian = "Laodicea"
dalmatian = "Laodicea"
b_chonai = {}
b_laodikeia = {}
b_harpasa = {}
Expand All @@ -4904,6 +4932,9 @@ e_byzantium = { # Basileia Rh
c_thyateira = { # Lyd�a (2000)
color = { 158 47 120 }
color2 = { 255 255 255 }
turkish = "Akhisar"
turkmen = "Akhisar"
oghuz = "Akhisar"
b_thyateira = {}
b_khliara = {}
b_kalamos = {}
Expand Down Expand Up @@ -4937,6 +4968,9 @@ e_byzantium = { # Basileia Rh
c_nikaea = { # Nikaia (750)
color = { 205 104 170 }
color2 = { 255 255 255 }
turkish = "Iznik"
turkmen = "Iznik"
oghuz = "Iznik"
b_malagina = {}
b_nikaia = {}
b_basilinopolis = {}
Expand All @@ -4958,6 +4992,9 @@ e_byzantium = { # Basileia Rh
c_akhyraous = { # Mys�a (1983)
color = { 214 113 179 }
color2 = { 255 255 255 }
turkish = "Karasi"
turkmen = "Karasi"
oghuz = "Karasi"
b_poimanenos = {}
b_akhyraous = {}
b_synaos = {}
Expand All @@ -4968,13 +5005,19 @@ e_byzantium = { # Basileia Rh
c_sangarios = { # Sang�rios (1997)
color = { 214 113 179 }
color2 = { 255 255 255 }
turkish = "S�g�t"
turkmen = "S�g�t"
oghuz = "S�g�t"
b_kibaia = {}
b_thebasion = {}
b_bilekomis = {}
}
c_dorylaion = { # Dorylaion (749)
color = { 176 25 124 }
color2 = { 255 255 255 }
turkish = "K�tahya"
turkmen = "K�tahya"
oghuz = "K�tahya"
b_dorylaion = {}
b_kotyaion = {}
b_nakoleia = {}
Expand Down Expand Up @@ -5009,6 +5052,9 @@ e_byzantium = { # Basileia Rh
c_nikomedeia = { # Nikomedeia (741)
color = { 208 107 173 }
color2 = { 255 255 255 }
turkish = "Ismid"
turkmen = "Ismid"
oghuz = "Ismid"
b_nikomedeia = {}
b_praenetos = {}
b_daphnousia = {}
Expand Down Expand Up @@ -5061,6 +5107,9 @@ e_byzantium = { # Basileia Rh
c_mylasa = { # Mylasa (1992)
color = { 120 41 92 }
color2 = { 255 255 255 }
turkish = "Mentese"
turkmen = "Mentese"
oghuz = "Mentese"
b_halikarnassos = {}
b_mylasa = {}
b_knidos = {}
Expand Down Expand Up @@ -5113,6 +5162,9 @@ e_byzantium = { # Basileia Rh
c_galatia = { # Galat�a (752)
color = { 243 74 184 }
color2 = { 255 255 255 }
turkish = "Yozgat"
turkmen = "Yozgat"
oghuz = "Yozgat"
b_kharsianon = {}
b_tavia = {}
b_mokissos = {}
Expand All @@ -5129,6 +5181,9 @@ e_byzantium = { # Basileia Rh
c_tyana = { # Tyana (760)
color = { 246 77 187 }
color2 = { 255 255 255 }
turkish = "Nigde"
turkmen = "Nigde"
oghuz = "Nigde"
b_loulon = {}
b_tyana = {}
b_anatoliaheraklea = {}
Expand All @@ -5144,6 +5199,9 @@ e_byzantium = { # Basileia Rh
c_nyssa = { # Nyssa (1995)
color = { 246 77 187 }
color2 = { 255 255 255 }
turkish = "U�hisar"
turkmen = "U�hisar"
oghuz = "U�hisar"
b_nyssa = {}
b_aspona = {}
}
Expand Down Expand Up @@ -5198,6 +5256,9 @@ e_byzantium = { # Basileia Rh
c_tzamandos = { # Tzamandos (1980)
color = { 133 235 23 }
color2 = { 255 255 255 }
turkish = "Sarkisla"
turkmen = "Sarkisla"
oghuz = "Sarkisla"
b_tzamandos = {}
b_malandara = {}
b_ariaratheia = {}
Expand All @@ -5220,6 +5281,15 @@ e_byzantium = { # Basileia Rh
c_lykandos = { # Lykandos (736)
color = { 131 192 44 }
color2 = { 255 255 255 }
andalusian_arabic = "Elbistan"
armenian = "Elbistan"
turkish = "Elbistan"
turkmen = "Elbistan"
oghuz = "Elbistan"
bedouin_arabic = "Elbistan"
maghreb_arabic = "Elbistan"
levantine_arabic = "Elbistan"
egyptian_arabic = "Elbistan"
b_lykandos = {}
b_arabissos = {}
b_kokysos = {}
Expand All @@ -5238,6 +5308,9 @@ e_byzantium = { # Basileia Rh
c_sozopolis = { # Pisid�a (754)
color = { 158 47 120 }
color2 = { 255 255 255 }
turkish = "Hamid"
turkmen = "Hamid"
oghuz = "Hamid"
b_sozopolis = {}
b_baris = {}
b_polydorion = {}
Expand All @@ -5254,6 +5327,9 @@ e_byzantium = { # Basileia Rh
c_polybotos = { # Phryg�a (939)
color = { 76 75 124 }
color2 = { 255 255 255 }
turkish = "Afyon"
turkmen = "Afyon"
oghuz = "Afyon"
b_akroinon = {}
b_synnada = {}
b_polybotos = {}
Expand All @@ -5272,6 +5348,9 @@ e_byzantium = { # Basileia Rh
c_laranda = { # Lamotis (1219)
color = { 1 39 10 }
color2 = { 255 255 255 }
turkish = "Karaman"
turkmen = "Karaman"
oghuz = "Karaman"
b_laranda = {}
b_barata = {}
b_derbe = {}
Expand Down Expand Up @@ -5370,6 +5449,9 @@ e_byzantium = { # Basileia Rh
c_mesochaldea = { # Mesochaldia (1991)
color = { 101 152 34 }
color2 = { 255 255 255 }
turkish = "G�m�shane"
turkmen = "G�m�shane"
oghuz = "G�m�shane"
b_tzanikha = {}
b_kharton = {}
}
Expand All @@ -5386,6 +5468,9 @@ e_byzantium = { # Basileia Rh
c_chaldea = { # Chaldia (705)
color = { 106 158 40 }
color2 = { 255 255 255 }
turkish = "Giresun"
turkmen = "Giresun"
oghuz = "Giresun"
b_kerasous = {}
b_kotyora = {}
b_polemonion = {}
Expand Down Expand Up @@ -5481,6 +5566,9 @@ e_byzantium = { # Basileia Rh
c_amisos = { # Amisos (738)
color = { 255 2 169 }
color2 = { 255 255 255 }
turkish = "Canik"
turkmen = "Canik"
oghuz = "Canik"
b_kastronamisos = {}
b_amisos = {}
b_paurai = {}
Expand All @@ -5495,6 +5583,9 @@ e_byzantium = { # Basileia Rh
c_eukhaita = { # Euchaita (1989)
color = { 255 4 171 }
color2 = { 255 255 255 }
turkish = "�orum"
turkmen = "�orum"
oghuz = "�orum"
b_asklepios = {}
b_eukhaita = {}
b_andrapa = {}
Expand Down Expand Up @@ -5595,6 +5686,15 @@ e_byzantium = { # Basileia Rh
c_anamur = { # Anemourion (1221)
color = { 147 208 60 }
color2 = { 255 255 255 }
andalusian_arabic = "Mamure"
turkish = "Anamur"
turkmen = "Anamur"
oghuz = "Anamur"
bedouin_arabic = "Mamure"
maghreb_arabic = "Mamure"
levantine_arabic = "Mamure"
egyptian_arabic = "Mamure"
sicilian_arabic = "Mamure"
b_mamure = {}
b_germanikopolis = {}
b_anemurium = {}
Expand Down Expand Up @@ -6398,6 +6498,16 @@ k_armenia = { # Hayk
c_taron = { # Tarawn (701)
color = { 125 162 44 }
color2 = { 255 255 255 }
andalusian_arabic = "Malazgirt"
turkish = "Malazgirt"
turkmen = "Malazgirt"
oghuz = "Malazgirt"
bedouin_arabic = "Malazgirt"
maghreb_arabic = "Malazgirt"
levantine_arabic = "Malazgirt"
egyptian_arabic = "Malazgirt"
sicilian_arabic = "Malazgirt"
kurdish = "Malazgirt"
b_manzikert = {}
b_mush = {}
b_glak = {}
Expand Down Expand Up @@ -7828,6 +7938,14 @@ k_antioch = { # Antioche
c_aintab = { # Ravendal (734)
color = { 157 255 9 }
color2 = { 255 255 255 }
frankish = "Gaziantep"
norman = "Gaziantep"
andalusian_arabic = "Gaziantep"
bedouin_arabic = "Gaziantep"
maghreb_arabic = "Gaziantep"
levantine_arabic = "Gaziantep"
egyptian_arabic = "Gaziantep"
sicilian_arabic = "Gaziantep"
b_aintab = {}
b_tulupe = {}
b_killiz = {}
Expand Down
Loading

0 comments on commit 65ebde1

Please sign in to comment.