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 65ebde1 + 9ff20ec commit 6a1d5eb
Show file tree
Hide file tree
Showing 9 changed files with 1,042 additions and 562 deletions.
177 changes: 177 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 @@ -4339,6 +4339,12 @@ e_byzantium = { # Basileia Rh
c_strymon = { # Strymonos (492)
color = { 139 29 101 }
color2 = { 255 255 255 }
turkish = "Serres"
turkmen = "Serres"
oghuz = "Serres"
pecheneg = "Serres"
serbian = "Serres"
bulgarian = "Serres"
b_serres = {}
b_kavala = {}
b_philippi = {}
Expand Down Expand Up @@ -4431,6 +4437,10 @@ e_byzantium = { # Basileia Rh
c_demetrias = { # Demetrias (488)
color = { 209 69 161 }
color2 = { 255 255 255 }
turkish = "Volos"
turkmen = "Volos"
oghuz = "Volos"
pecheneg = "Volos"
b_demetrias = {}
b_halmyros = {}
b_velestino = {}
Expand All @@ -4439,6 +4449,10 @@ e_byzantium = { # Basileia Rh
c_upper_wallachia = { # Meg�le Vlachia (1528)
color = { 212 72 164 }
color2 = { 255 255 255 }
turkish = "Trikala"
turkmen = "Trikala"
oghuz = "Trikala"
pecheneg = "Trikala"
b_kalabaka = {}
b_trikala = {}
b_grevena = {}
Expand Down Expand Up @@ -4525,6 +4539,9 @@ e_byzantium = { # Basileia Rh
c_epeiros = { # Epeiros (472)
color = { 138 67 113 }
color2 = { 255 255 255 }
turkish = "Ioannina"
turkmen = "Ioannina"
oghuz = "Ioannina"
b_butrint = {}
b_ioannina = {}
b_dryinoupolis = {}
Expand All @@ -4542,6 +4559,23 @@ e_byzantium = { # Basileia Rh
c_arta = { # Nikopolis (473)
color = { 142 71 117 }
color2 = { 255 255 255 }
frankish = "Arta"
norman = "Arta"
turkish = "Arta"
turkmen = "Arta"
oghuz = "Arta"
pecheneg = "Arta"
sardinian = "Arta"
sicilian = "Arta"
corsican = "Arta"
central_italian = "Arta"
southern_italian = "Arta"
neapolitan = "Arta"
tuscan = "Arta"
ligurian = "Arta"
italian = "Arta"
venetian = "Arta"
dalmatian = "Arta"
b_angelokastron = {}
b_preveza = {}
b_arta = {}
Expand Down Expand Up @@ -4633,6 +4667,24 @@ e_byzantium = { # Basileia Rh
c_thebai = { # Boiot�a (1999)
color = { 209 69 161 }
color2 = { 255 255 255 }
frankish = "Thebes"
norman = "Thebes"
catalan = "Thebes"
turkish = "Thebes"
turkmen = "Thebes"
oghuz = "Thebes"
pecheneg = "Thebes"
sardinian = "Thebes"
sicilian = "Thebes"
corsican = "Thebes"
central_italian = "Thebes"
southern_italian = "Thebes"
neapolitan = "Thebes"
tuscan = "Thebes"
ligurian = "Thebes"
italian = "Thebes"
venetian = "Thebes"
dalmatian = "Thebes"
b_thebes = {}
b_amfissa = {}
b_levadia = {}
Expand All @@ -4642,6 +4694,26 @@ e_byzantium = { # Basileia Rh
c_euboia = { # Euripos (485)
color = { 151 59 119 }
color2 = { 255 255 255 }
frankish = "Euboea"
norman = "Euboea"
catalan = "Euboea"
turkish = "Euboea"
turkmen = "Egriboz"
oghuz = "Egriboz"
pecheneg = "Egriboz"
croatian = "Euboea"
serbian = "Euboea"
sardinian = "Euboea"
sicilian = "Euboea"
corsican = "Euboea"
central_italian = "Euboea"
southern_italian = "Euboea"
neapolitan = "Euboea"
tuscan = "Euboea"
ligurian = "Euboea"
italian = "Euboea"
venetian = "Euboea"
dalmatian = "Euboea"
b_chalkis = {}
b_karystos = {}
b_armena = {}
Expand All @@ -4651,6 +4723,24 @@ e_byzantium = { # Basileia Rh
color = { 215 75 167 }
color2 = { 255 255 255 }
holy_site = hellenic_pagan
frankish = "Athens"
norman = "Athens"
catalan = "Athens"
turkish = "Athens"
turkmen = "Athens"
oghuz = "Athens"
pecheneg = "Athens"
sardinian = "Athens"
sicilian = "Athens"
corsican = "Athens"
central_italian = "Athens"
southern_italian = "Athens"
neapolitan = "Athens"
tuscan = "Athens"
ligurian = "Athens"
italian = "Athens"
venetian = "Athens"
dalmatian = "Athens"
b_athens = {}
b_megara = {}
b_oropos = {}
Expand Down Expand Up @@ -4703,6 +4793,17 @@ e_byzantium = { # Basileia Rh
c_methone = { # Messinia (477)
color = { 196 35 140 }
color2 = { 255 255 255 }
sardinian = "Methoni"
sicilian = "Methoni"
corsican = "Methoni"
central_italian = "Methoni"
southern_italian = "Methoni"
neapolitan = "Methoni"
tuscan = "Methoni"
ligurian = "Methoni"
italian = "Methoni"
venetian = "Methoni"
dalmatian = "Methoni"
b_kalamata = {}
b_modon = {}
b_coron = {}
Expand All @@ -4712,6 +4813,25 @@ e_byzantium = { # Basileia Rh
c_monemvasia = { # Lakonia (478)
color = { 198 37 142 }
color2 = { 255 255 255 }
frankish = "Chaconie"
norman = "Chaconie"
turkish = "Monemvasia"
turkmen = "Monemvasia"
oghuz = "Monemvasia"
pecheneg = "Monemvasia"
croatian = "Monemvasia"
serbian = "Monemvasia"
sardinian = "Monemvasia"
sicilian = "Monemvasia"
corsican = "Monemvasia"
central_italian = "Monemvasia"
southern_italian = "Monemvasia"
neapolitan = "Monemvasia"
tuscan = "Monemvasia"
ligurian = "Monemvasia"
italian = "Monemvasia"
venetian = "Monemvasia"
dalmatian = "Monemvasia"
b_monemvasia = {}
b_lacedaemonia = {}
b_elos = {}
Expand All @@ -4722,6 +4842,10 @@ e_byzantium = { # Basileia Rh
c_arcadia = { # Arkadia (1986)
color = { 198 37 142 }
color2 = { 255 255 255 }
turkish = "Tripoli"
turkmen = "Tripoli"
oghuz = "Tripoli"
pecheneg = "Tripoli"
b_nikli = {}
b_veligosti = {}
b_akova = {}
Expand Down Expand Up @@ -5091,6 +5215,22 @@ e_byzantium = { # Basileia Rh
c_rhodos = { # Dodek�nisa (483)
color = { 116 37 88 }
color2 = { 255 255 255 }
frankish = "Rhodes"
norman = "Rhodes"
turkish = "Rhodes"
turkmen = "Rhodes"
oghuz = "Rhodes"
sardinian = "Rhodes"
sicilian = "Rhodes"
corsican = "Rhodes"
central_italian = "Rhodes"
southern_italian = "Rhodes"
neapolitan = "Rhodes"
tuscan = "Rhodes"
ligurian = "Rhodes"
italian = "Rhodes"
venetian = "Rhodes"
dalmatian = "Rhodes"
b_rhodos = {}
b_kos = {}
b_lindos = {}
Expand Down Expand Up @@ -7763,6 +7903,8 @@ k_jerusalem = { # Jerusalem
c_petra = { # Elim (722)
color = { 133 208 14 }
color2 = { 255 255 255 }
greek = "Aqaba"
roman = "Aqaba"
b_pharaohosisland = {}
b_jordanaqba = {}
b_syrarandal = {}
Expand Down Expand Up @@ -7882,6 +8024,14 @@ k_jerusalem = { # Jerusalem
c_safed = { # Toron (769)
color = { 14 208 73 }
color2 = { 255 255 255 }
greek = "Banias"
bedouin_arabic = "Safed"
maghreb_arabic = "Safed"
levantine_arabic = "Safed"
egyptian_arabic = "Safed"
sicilian_arabic = "Safed"
ashkenazi = "Safed"
roman = "Banias"
b_safed = {}
b_banyas = {}
b_chastelet = {}
Expand Down Expand Up @@ -8029,6 +8179,15 @@ k_antioch = { # Antioche
c_archa = { # Berzieh (765)
color = { 109 194 47 }
color2 = { 255 255 255 }
frankish = "Apamea"
norman = "Apamea"
andalusian_arabic = "Qalaat al-Madiq"
greek = "Apamea"
bedouin_arabic = "Qalaat al-Madiq"
maghreb_arabic = "Qalaat al-Madiq"
levantine_arabic = "Qalaat al-Madiq"
egyptian_arabic = "Qalaat al-Madiq"
sicilian_arabic = "Qalaat al-Madiq"
b_sarmeniasyria = {}
b_albarasyria = {}
b_famia = {}
Expand Down Expand Up @@ -8208,6 +8367,10 @@ k_syria = { # Al-Sham
holy_site = samaritan
holy_site = karaite
holy_site = shiite
frankish = "Damascus"
norman = "Damascus"
greek = "Damascus"
roman = "Damascus"
b_citadelofdamascus = {}
b_damascus = {}
b_martalqamonestary = {}
Expand All @@ -8222,6 +8385,10 @@ k_syria = { # Al-Sham
c_baalbek = { # Bekaa (768)
color = { 77 156 38 }
color2 = { 255 255 255 }
frankish = "Baalbek"
norman = "Baalbek"
greek = "Baalbek"
roman = "Baalbek"
b_baalbek = {}
b_rasbaalek = {}
b_nimrodcastle = {}
Expand All @@ -8232,6 +8399,8 @@ k_syria = { # Al-Sham
c_syria = { # Hauran (727)
color = { 37 234 22 }
color2 = { 255 255 255 }
greek = "Bosra"
roman = "Bosra"
b_ramtah = {}
b_suwaida = {}
b_nimreh = {}
Expand All @@ -8243,6 +8412,8 @@ k_syria = { # Al-Sham
c_suwaida = { # Bathaniyya (712)
color = { 41 238 26 }
color2 = { 255 255 255 }
greek = "Shahba"
roman = "Shahba"
b_salah = {}
b_shahba = {}
b_adrasyria = {}
Expand All @@ -8251,6 +8422,8 @@ k_syria = { # Al-Sham
c_irbid = { # Jaulan (725)
color = { 128 255 9 }
color2 = { 255 255 255 }
greek = "Irbid"
roman = "Irbid"
b_irbid = {}
b_nawasyria = {}
b_hasbaya = {}
Expand All @@ -8267,6 +8440,10 @@ k_syria = { # Al-Sham
c_amman = { # Balqa (724)
color = { 131 255 12 }
color2 = { 255 255 255 }
frankish = "Amman"
norman = "Amman"
greek = "Amman"
roman = "Amman"
b_amman = {}
b_dhiban = {}
b_salt = {}
Expand Down
Loading

0 comments on commit 6a1d5eb

Please sign in to comment.