diff --git a/common/culture/name_lists/NEOW_maronite.txt b/common/culture/name_lists/NEOW_maronite.txt index 0b417d42c..a7908978f 100644 --- a/common/culture/name_lists/NEOW_maronite.txt +++ b/common/culture/name_lists/NEOW_maronite.txt @@ -67,6 +67,12 @@ "dynn_Massoud" "dynn_Matar" "dynn_Mazloum" + "dynn_Merhi" + "dynn_Mikhael" + "dynn_Mobarak" + "dynn_Mouawad" + "dynn_Mourany" + "dynn_Mourad" "dynn_Noujaim" "dynn_Roukoz" "dynn_Saab" @@ -90,7 +96,7 @@ Jawad Jihad Joseph Kamil_Camillus Khalil Louis - Mansour Mario Maroun Massoud Maurice Michel Mohsen Mounged Mounir Moussa + Mansour Mario Maroun Massoud Maurice Michel Mohsen Mounged Mounir Mourad Moussa Nabil Nadim Najib Nasser Nematallah Nicolas Nimr Paul Philippe Pierre Rafik Rami Raymond Ren_e_act_ Richard Roger Roland diff --git a/common/landed_titles/caucasus.txt b/common/landed_titles/caucasus.txt index 8527ceb01..3754368bb 100644 --- a/common/landed_titles/caucasus.txt +++ b/common/landed_titles/caucasus.txt @@ -57,11 +57,6 @@ e_caucasia = { color = { 189 136 133 } } - b_sevuki = { - province = 5735 - - color = { 189 136 133 } - } b_ani = { province = 681 diff --git a/common/landed_titles/turkey.txt b/common/landed_titles/turkey.txt index 13c4ef271..c951241e2 100644 --- a/common/landed_titles/turkey.txt +++ b/common/landed_titles/turkey.txt @@ -18,6 +18,7 @@ e_turky = { name_list_NEOW_cypriot = cn_nikaea name_list_NEOW_greco_turkish = cn_nikaea } + color = { 102 42 30 } capital = c_ionia # Izmir @@ -615,6 +616,238 @@ e_turky = { } } } + d_cibyrrhaeot = { # Antalya + color = { 215 40 30 } + capital = c_lycia # Antalya + + cultural_names = { + name_list_NEOW_griko = cn_kibyrrhaiotai + name_list_NEOW_greek = cn_kibyrrhaiotai + name_list_NEOW_cypriot = cn_kibyrrhaiotai + name_list_NEOW_greco_turkish = cn_kibyrrhaiotai + } + + c_lycia = { # Antalya + color = { 205 50 30 } + + cultural_names = { + name_list_NEOW_griko = cn_lykia + name_list_NEOW_greek = cn_lykia + name_list_NEOW_cypriot = cn_lykia + name_list_NEOW_greco_turkish = cn_lykia + } + + b_attaleia = { # Antalya + province = 755 + color = { 215 40 30 } + + cultural_names = { + name_list_NEOW_griko = cn_attaleia + name_list_NEOW_greek = cn_attaleia + name_list_NEOW_cypriot = cn_attaleia + name_list_NEOW_greco_turkish = cn_attaleia + } + } + b_phaselis = { # Kumluca + province = 5643 + color = { 215 40 30 } + + cultural_names = { + name_list_NEOW_griko = cn_phaselis + name_list_NEOW_greek = cn_phaselis + name_list_NEOW_cypriot = cn_phaselis + name_list_NEOW_greco_turkish = cn_phaselis + } + } + b_myra = { # Kaş + province = 5645 + color = { 215 40 30 } + + cultural_names = { + name_list_NEOW_griko = cn_myra + name_list_NEOW_greek = cn_myra + name_list_NEOW_cypriot = cn_myra + name_list_NEOW_greco_turkish = cn_myra + } + } + b_limyra = { # Korkuteli + province = 5644 + color = { 215 40 30 } + + cultural_names = { + name_list_NEOW_griko = cn_limyra + name_list_NEOW_greek = cn_limyra + name_list_NEOW_cypriot = cn_limyra + name_list_NEOW_greco_turkish = cn_limyra + } + } + b_cremna = { # Elmalı + province = 5642 + color = { 215 40 30 } + + cultural_names = { + name_list_NEOW_griko = cn_cremna + name_list_NEOW_greek = cn_cremna + name_list_NEOW_cypriot = cn_cremna + name_list_NEOW_greco_turkish = cn_cremna + } + } + } + c_selge = { # Alanya + color = { 200 99 99 } + + cultural_names = { + name_list_NEOW_griko = cn_selge + name_list_NEOW_greek = cn_selge + name_list_NEOW_cypriot = cn_selge + name_list_NEOW_greco_turkish = cn_selge + } + + b_korakesion = { # Alanya + province = 5640 + color = { 205 68 66 } + + cultural_names = { + name_list_NEOW_griko = cn_korakesion + name_list_NEOW_greek = cn_korakesion + name_list_NEOW_cypriot = cn_korakesion + name_list_NEOW_greco_turkish = cn_korakesion + } + } + b_side = { # Manavgat + province = 5641 + color = { 205 68 66 } + + cultural_names = { + name_list_NEOW_griko = cn_side + name_list_NEOW_greek = cn_side + name_list_NEOW_cypriot = cn_side + name_list_NEOW_greco_turkish = cn_side + } + } + b_selge = { # Serik + province = 5664 + color = { 200 99 99 } + + cultural_names = { + name_list_NEOW_griko = cn_selge + name_list_NEOW_greek = cn_selge + name_list_NEOW_cypriot = cn_selge + name_list_NEOW_greco_turkish = cn_selge + } + } + b_selinus = { # Gazipaşa + province = 5639 + color = { 205 68 66 } + + cultural_names = { + name_list_NEOW_griko = cn_selinus + name_list_NEOW_greek = cn_selinus + name_list_NEOW_cypriot = cn_selinus + name_list_NEOW_greco_turkish = cn_selinus + } + } + b_kaklouma = { # Akseki + province = 5668 + color = { 200 99 99 } + + cultural_names = { + name_list_NEOW_griko = cn_kaklouma + name_list_NEOW_greek = cn_kaklouma + name_list_NEOW_cypriot = cn_kaklouma + name_list_NEOW_greco_turkish = cn_kaklouma + } + } + } + c_adada = { # Burdur + color = { 200 99 99 } + + cultural_names = { + name_list_NEOW_griko = cn_adada + name_list_NEOW_greek = cn_adada + name_list_NEOW_cypriot = cn_adada + name_list_NEOW_greco_turkish = cn_adada + } + + b_sagalassus = { # Burdur + province = 5665 + color = { 200 20 20 } + + cultural_names = { + name_list_NEOW_griko = cn_sagalassus + name_list_NEOW_greek = cn_sagalassus + name_list_NEOW_cypriot = cn_sagalassus + name_list_NEOW_greco_turkish = cn_sagalassus + } + } + b_adada = { # Bucak + province = 5663 + color = { 200 99 99 } + + cultural_names = { + name_list_NEOW_griko = cn_adada + name_list_NEOW_greek = cn_adada + name_list_NEOW_cypriot = cn_adada + name_list_NEOW_greco_turkish = cn_adada + } + } + b_olbasa = { # Yeşilova + province = 5646 + color = { 215 40 30 } + + cultural_names = { + name_list_NEOW_griko = cn_olbasa + name_list_NEOW_greek = cn_olbasa + name_list_NEOW_cypriot = cn_olbasa + name_list_NEOW_greco_turkish = cn_olbasa + } + } + } + c_pisidia = { # Isparta + color = { 200 20 20 } + + cultural_names = { + name_list_NEOW_griko = cn_pisidia + name_list_NEOW_greek = cn_pisidia + name_list_NEOW_cypriot = cn_pisidia + name_list_NEOW_greco_turkish = cn_pisidia + } + + b_sozopolis = { # Isparta + province = 754 + color = { 200 20 20 } + + cultural_names = { + name_list_NEOW_griko = cn_sozopolis + name_list_NEOW_greek = cn_sozopolis + name_list_NEOW_cypriot = cn_sozopolis + name_list_NEOW_greco_turkish = cn_sozopolis + } + } + b_antiochia = { # Yalvaç + province = 5661 + color = { 200 47 22 } + + cultural_names = { + name_list_NEOW_griko = cn_antiochia + name_list_NEOW_greek = cn_antiochia + name_list_NEOW_cypriot = cn_antiochia + name_list_NEOW_greco_turkish = cn_antiochia + } + } + b_neapolis = { # Şarkikaraağaç + province = 5662 + color = { 200 47 22 } + + cultural_names = { + name_list_NEOW_griko = cn_neapolis + name_list_NEOW_greek = cn_neapolis + name_list_NEOW_cypriot = cn_neapolis + name_list_NEOW_greco_turkish = cn_neapolis + } + } + } + } } k_anatolia = { color = { 119 197 216 } @@ -2171,8 +2404,9 @@ e_turky = { } } } - - k_armenitolia = { + k_armenitolia = { # Ermenidolu + color = { 30 102 85 } + capital = c_theodosiopolis # Erzurum cultural_names = { name_list_NEOW_griko = cn_armenitolia @@ -2180,9 +2414,6 @@ e_turky = { name_list_NEOW_cypriot = cn_armenitolia name_list_NEOW_greco_turkish = cn_armenitolia } - color = { 30 102 85 } - - capital = c_theodosiopolis # Theodosiopolis/Erzurum ai_primary_priority = { if = { @@ -2191,8 +2422,11 @@ e_turky = { } add = @correct_culture_primary_score } - } - d_mesopotamia = { + } + + d_mesopotamia = { # Erzurum + color = { 0 103 79 } + capital = c_theodosiopolis # Erzurum cultural_names = { name_list_NEOW_griko = cn_mesopotamia @@ -2200,24 +2434,20 @@ e_turky = { name_list_NEOW_cypriot = cn_mesopotamia name_list_NEOW_greco_turkish = cn_mesopotamia } - color = { 0 103 79 } - capital = c_theodosiopolis # Theodosiopolis/Erzurum - - c_theodosiopolis = { + c_theodosiopolis = { # Erzurum color = { 210 40 50 } cultural_names = { - name_list_armenian = cn_karin + name_list_armenian = cn_karin name_list_NEOW_griko = cn_theodosiopolis name_list_NEOW_greek = cn_theodosiopolis name_list_NEOW_cypriot = cn_theodosiopolis name_list_NEOW_greco_turkish = cn_theodosiopolis - } + } - b_theodosiopolis = { + b_theodosiopolis = { # Erzurum province = 704 - color = { 200 50 50 } cultural_names = { @@ -2228,9 +2458,101 @@ e_turky = { name_list_NEOW_greco_turkish = cn_theodosiopolis } } - b_speri = { - province = 5709 + b_sevuki = { # Karayazı + province = 5735 + color = { 189 136 133 } + } + b_khinisi = { # Hınıs + province = 5714 + color = { 175 60 55 } + cultural_names = { + name_list_NEOW_griko = cn_khinisi + name_list_NEOW_greek = cn_khinisi + name_list_NEOW_cypriot = cn_khinisi + name_list_NEOW_greco_turkish = cn_khinisi + } + } + b_mardali = { # Tercan + province = 5713 + color = { 175 60 55 } + + cultural_names = { + name_list_NEOW_griko = cn_mardali + name_list_NEOW_greek = cn_mardali + name_list_NEOW_cypriot = cn_mardali + name_list_NEOW_greco_turkish = cn_mardali + } + } + } + c_satala = { # Erzincan + color = { 170 155 56 } + + cultural_names = { + name_list_NEOW_griko = cn_satala + name_list_NEOW_greek = cn_satala + name_list_NEOW_cypriot = cn_satala + name_list_NEOW_greco_turkish = cn_satala + } + + b_keltzine = { # Erzincan + province = 5695 + color = { 150 130 20 } + + cultural_names = { + name_list_NEOW_griko = cn_acilisene + name_list_NEOW_greek = cn_acilisene + name_list_NEOW_cypriot = cn_acilisene + name_list_NEOW_greco_turkish = cn_acilisene + } + } + b_satala = { # Kelkit + province = 5703 + color = { 170 155 56 } + + cultural_names = { + name_list_NEOW_griko = cn_satala + name_list_NEOW_greek = cn_satala + name_list_NEOW_cypriot = cn_satala + name_list_NEOW_greco_turkish = cn_satala + } + } + b_kheranion = { # Refahiye + province = 5702 + color = { 170 155 56 } + + cultural_names = { + name_list_NEOW_griko = cn_kheranion + name_list_NEOW_greek = cn_kheranion + name_list_NEOW_cypriot = cn_kheranion + name_list_NEOW_greco_turkish = cn_kheranion + } + } + } + c_horasan = { # Horasan + color = { 48 70 39 } + + b_oltisi = { # Horasan + province = 680 + color = { 60 60 60 } + } + b_tortomi = { # Oltu + province = 5737 + color = { 60 60 60 } + + cultural_names = { + name_list_NEOW_griko = cn_tortomi + name_list_NEOW_greek = cn_tortomi + name_list_NEOW_cypriot = cn_tortomi + name_list_NEOW_greco_turkish = cn_tortomi + } + } + b_askale = { # Aşkale + province = 4899 + color = { 60 60 60 } + } + b_speri = { # İspir + province = 5709 color = { 200 50 50 } cultural_names = { @@ -2241,66 +2563,6 @@ e_turky = { name_list_NEOW_greco_turkish = cn_speri } } - b_baeberdon = { - - cultural_names = { - name_list_NEOW_griko = cn_baeberdon - name_list_NEOW_greek = cn_baeberdon - name_list_NEOW_cypriot = cn_baeberdon - name_list_NEOW_greco_turkish = cn_baeberdon - } - province = 5694 - - color = { 150 130 20 } - } - b_keltzine = { - province = 5695 - - color = { 150 130 20 } - - cultural_names = { - name_list_NEOW_griko = cn_acilisene - name_list_NEOW_greek = cn_acilisene - name_list_NEOW_cypriot = cn_acilisene - name_list_NEOW_greco_turkish = cn_acilisene - } - } - b_tortomi = { - - cultural_names = { - name_list_NEOW_griko = cn_tortomi - name_list_NEOW_greek = cn_tortomi - name_list_NEOW_cypriot = cn_tortomi - name_list_NEOW_greco_turkish = cn_tortomi - } - province = 5737 - - color = { 60 60 60 } - } - b_mardali = { - - cultural_names = { - name_list_NEOW_griko = cn_mardali - name_list_NEOW_greek = cn_mardali - name_list_NEOW_cypriot = cn_mardali - name_list_NEOW_greco_turkish = cn_mardali - } - province = 5713 - - color = { 175 60 55 } - } - b_khinisi = { - - cultural_names = { - name_list_NEOW_griko = cn_khinisi - name_list_NEOW_greek = cn_khinisi - name_list_NEOW_cypriot = cn_khinisi - name_list_NEOW_greco_turkish = cn_khinisi - } - province = 5714 - - color = { 175 60 55 } - } } c_melitene = { color = { 205 83 71 } @@ -2326,6 +2588,18 @@ e_turky = { name_list_NEOW_greco_turkish = cn_melitene } } + b_baeberdon = { + + cultural_names = { + name_list_NEOW_griko = cn_baeberdon + name_list_NEOW_greek = cn_baeberdon + name_list_NEOW_cypriot = cn_baeberdon + name_list_NEOW_greco_turkish = cn_baeberdon + } + province = 5694 + + color = { 150 130 20 } + } b_arguvan = { cultural_names = { @@ -2412,11 +2686,7 @@ e_turky = { } c_tao = { color = { 70 70 60 } - b_oltisi = { - province = 680 - - color = { 60 60 60 } - } + b_taoskari = { province = 5736 @@ -2500,41 +2770,6 @@ e_turky = { } } } - c_satala = { - color = { 170 155 56 } - - cultural_names = { - name_list_NEOW_griko = cn_satala - name_list_NEOW_greek = cn_satala - name_list_NEOW_cypriot = cn_satala - name_list_NEOW_greco_turkish = cn_satala - } - - b_satala = { - province = 5703 - - color = { 170 155 56 } - - cultural_names = { - name_list_NEOW_griko = cn_satala - name_list_NEOW_greek = cn_satala - name_list_NEOW_cypriot = cn_satala - name_list_NEOW_greco_turkish = cn_satala - } - } - b_kheranion = { - - cultural_names = { - name_list_NEOW_griko = cn_kheranion - name_list_NEOW_greek = cn_kheranion - name_list_NEOW_cypriot = cn_kheranion - name_list_NEOW_greco_turkish = cn_kheranion - } - province = 5702 - - color = { 170 155 56 } - } - } } } k_cilicia = { @@ -2943,237 +3178,5 @@ e_turky = { } } } - d_cibyrrhaeot = { # Antalya - color = { 215 40 30 } - capital = c_lycia # Antalya - - cultural_names = { - name_list_NEOW_griko = cn_kibyrrhaiotai - name_list_NEOW_greek = cn_kibyrrhaiotai - name_list_NEOW_cypriot = cn_kibyrrhaiotai - name_list_NEOW_greco_turkish = cn_kibyrrhaiotai - } - - c_lycia = { # Antalya - color = { 205 50 30 } - - cultural_names = { - name_list_NEOW_griko = cn_lykia - name_list_NEOW_greek = cn_lykia - name_list_NEOW_cypriot = cn_lykia - name_list_NEOW_greco_turkish = cn_lykia - } - - b_attaleia = { # Antalya - province = 755 - color = { 215 40 30 } - - cultural_names = { - name_list_NEOW_griko = cn_attaleia - name_list_NEOW_greek = cn_attaleia - name_list_NEOW_cypriot = cn_attaleia - name_list_NEOW_greco_turkish = cn_attaleia - } - } - b_phaselis = { # Kumluca - province = 5643 - color = { 215 40 30 } - - cultural_names = { - name_list_NEOW_griko = cn_phaselis - name_list_NEOW_greek = cn_phaselis - name_list_NEOW_cypriot = cn_phaselis - name_list_NEOW_greco_turkish = cn_phaselis - } - } - b_myra = { # Kaş - province = 5645 - color = { 215 40 30 } - - cultural_names = { - name_list_NEOW_griko = cn_myra - name_list_NEOW_greek = cn_myra - name_list_NEOW_cypriot = cn_myra - name_list_NEOW_greco_turkish = cn_myra - } - } - b_limyra = { # Korkuteli - province = 5644 - color = { 215 40 30 } - - cultural_names = { - name_list_NEOW_griko = cn_limyra - name_list_NEOW_greek = cn_limyra - name_list_NEOW_cypriot = cn_limyra - name_list_NEOW_greco_turkish = cn_limyra - } - } - b_cremna = { # Elmalı - province = 5642 - color = { 215 40 30 } - - cultural_names = { - name_list_NEOW_griko = cn_cremna - name_list_NEOW_greek = cn_cremna - name_list_NEOW_cypriot = cn_cremna - name_list_NEOW_greco_turkish = cn_cremna - } - } - } - c_selge = { # Alanya - color = { 200 99 99 } - - cultural_names = { - name_list_NEOW_griko = cn_selge - name_list_NEOW_greek = cn_selge - name_list_NEOW_cypriot = cn_selge - name_list_NEOW_greco_turkish = cn_selge - } - - b_korakesion = { # Alanya - province = 5640 - color = { 205 68 66 } - - cultural_names = { - name_list_NEOW_griko = cn_korakesion - name_list_NEOW_greek = cn_korakesion - name_list_NEOW_cypriot = cn_korakesion - name_list_NEOW_greco_turkish = cn_korakesion - } - } - b_side = { # Manavgat - province = 5641 - color = { 205 68 66 } - - cultural_names = { - name_list_NEOW_griko = cn_side - name_list_NEOW_greek = cn_side - name_list_NEOW_cypriot = cn_side - name_list_NEOW_greco_turkish = cn_side - } - } - b_selge = { # Serik - province = 5664 - color = { 200 99 99 } - - cultural_names = { - name_list_NEOW_griko = cn_selge - name_list_NEOW_greek = cn_selge - name_list_NEOW_cypriot = cn_selge - name_list_NEOW_greco_turkish = cn_selge - } - } - b_selinus = { # Gazipaşa - province = 5639 - color = { 205 68 66 } - - cultural_names = { - name_list_NEOW_griko = cn_selinus - name_list_NEOW_greek = cn_selinus - name_list_NEOW_cypriot = cn_selinus - name_list_NEOW_greco_turkish = cn_selinus - } - } - b_kaklouma = { # Akseki - province = 5668 - color = { 200 99 99 } - - cultural_names = { - name_list_NEOW_griko = cn_kaklouma - name_list_NEOW_greek = cn_kaklouma - name_list_NEOW_cypriot = cn_kaklouma - name_list_NEOW_greco_turkish = cn_kaklouma - } - } - } - c_adada = { # Burdur - color = { 200 99 99 } - - cultural_names = { - name_list_NEOW_griko = cn_adada - name_list_NEOW_greek = cn_adada - name_list_NEOW_cypriot = cn_adada - name_list_NEOW_greco_turkish = cn_adada - } - - b_sagalassus = { # Burdur - province = 5665 - color = { 200 20 20 } - - cultural_names = { - name_list_NEOW_griko = cn_sagalassus - name_list_NEOW_greek = cn_sagalassus - name_list_NEOW_cypriot = cn_sagalassus - name_list_NEOW_greco_turkish = cn_sagalassus - } - } - b_adada = { # Bucak - province = 5663 - color = { 200 99 99 } - - cultural_names = { - name_list_NEOW_griko = cn_adada - name_list_NEOW_greek = cn_adada - name_list_NEOW_cypriot = cn_adada - name_list_NEOW_greco_turkish = cn_adada - } - } - b_olbasa = { # Yeşilova - province = 5646 - color = { 215 40 30 } - - cultural_names = { - name_list_NEOW_griko = cn_olbasa - name_list_NEOW_greek = cn_olbasa - name_list_NEOW_cypriot = cn_olbasa - name_list_NEOW_greco_turkish = cn_olbasa - } - } - } - c_pisidia = { # Isparta - color = { 200 20 20 } - - cultural_names = { - name_list_NEOW_griko = cn_pisidia - name_list_NEOW_greek = cn_pisidia - name_list_NEOW_cypriot = cn_pisidia - name_list_NEOW_greco_turkish = cn_pisidia - } - - b_sozopolis = { # Isparta - province = 754 - color = { 200 20 20 } - - cultural_names = { - name_list_NEOW_griko = cn_sozopolis - name_list_NEOW_greek = cn_sozopolis - name_list_NEOW_cypriot = cn_sozopolis - name_list_NEOW_greco_turkish = cn_sozopolis - } - } - b_antiochia = { # Yalvaç - province = 5661 - color = { 200 47 22 } - - cultural_names = { - name_list_NEOW_griko = cn_antiochia - name_list_NEOW_greek = cn_antiochia - name_list_NEOW_cypriot = cn_antiochia - name_list_NEOW_greco_turkish = cn_antiochia - } - } - b_neapolis = { # Şarkikaraağaç - province = 5662 - color = { 200 47 22 } - - cultural_names = { - name_list_NEOW_griko = cn_neapolis - name_list_NEOW_greek = cn_neapolis - name_list_NEOW_cypriot = cn_neapolis - name_list_NEOW_greco_turkish = cn_neapolis - } - } - } - } } } diff --git a/common/province_terrain/00_province_terrain.txt b/common/province_terrain/00_province_terrain.txt index 9f655b29b..962864b15 100644 --- a/common/province_terrain/00_province_terrain.txt +++ b/common/province_terrain/00_province_terrain.txt @@ -4511,7 +4511,7 @@ default_coastal_sea=coastal_sea 4895=mountains 4896=plains 4897=plains -4899=mountains +4899=hills 4900=tells 4901=plains 4902=forest diff --git a/common/province_terrain/01_province_properties.txt b/common/province_terrain/01_province_properties.txt index 6d15fded9..781c254b4 100644 --- a/common/province_terrain/01_province_properties.txt +++ b/common/province_terrain/01_province_properties.txt @@ -27308,9 +27308,7 @@ winter_severity_bias = 0.40 } # b_duluk-teluch -4899 ={ - winter_severity_bias = 0.40 -} +4899 = {winter_severity_bias = 0.60} ### d_homs ## c_homs # b_hims diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index 789615b9e..52ad76a6a 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -35,6 +35,12 @@ rotation={ -0.000000 0.241101 -0.000000 0.970500 } scale={ 1.000000 1.000000 1.000000 } } + { + id=0 + position={ 3049.756836 0.000000 2233.305908 } + rotation={ -0.000000 -0.199549 -0.000000 0.979888 } + scale={ 1.000000 1.000000 1.000000 } + } { id=1 position={ 258.331116 0.000000 4468.756836 } @@ -3859,8 +3865,8 @@ } { id=680 - position={ 3254.026123 0.000000 2465.351562 } - rotation={ -0.000000 -0.530434 -0.000000 0.847726 } + position={ 3263.784424 0.000000 2489.672607 } + rotation={ -0.000000 -0.156338 -0.000000 0.987703 } scale={ 1.000000 1.000000 1.000000 } } { @@ -3895,7 +3901,7 @@ } { id=704 - position={ 3183.196289 0.000000 2432.760742 } + position={ 3218.074219 0.000000 2428.182617 } rotation={ -0.000000 -0.362550 -0.000000 0.931964 } scale={ 1.000000 1.000000 1.000000 } } @@ -26293,7 +26299,7 @@ } { id=4899 - position={ 3031.066895 0.000000 2243.681152 } + position={ 3208.350098 0.000000 2457.410645 } rotation={ -0.000000 0.474087 -0.000000 0.880478 } scale={ 1.000000 1.000000 1.000000 } } @@ -30997,7 +31003,7 @@ } { id=5695 - position={ 3147.848633 0.000000 2437.039795 } + position={ 3149.525635 0.000000 2443.143799 } rotation={ -0.000000 0.370783 -0.000000 0.928719 } scale={ 1.000000 1.000000 1.000000 } } @@ -31039,13 +31045,13 @@ } { id=5702 - position={ 3096.910400 0.000000 2432.441406 } + position={ 3081.633301 0.000000 2416.589111 } rotation={ -0.000000 -0.233511 -0.000000 0.972354 } scale={ 1.000000 1.000000 1.000000 } } { id=5703 - position={ 3122.229736 0.000000 2434.046387 } + position={ 3110.034424 0.000000 2434.861084 } rotation={ -0.000000 -0.339174 -0.000000 0.940724 } scale={ 1.000000 1.000000 1.000000 } } @@ -31081,7 +31087,7 @@ } { id=5709 - position={ 3190.932373 0.000000 2458.557373 } + position={ 3206.777100 0.000000 2488.060791 } rotation={ -0.000000 0.329597 -0.000000 0.944122 } scale={ 1.000000 1.000000 1.000000 } } @@ -31105,14 +31111,14 @@ } { id=5713 - position={ 3225.057861 0.000000 2450.017090 } + position={ 3182.053955 0.000000 2436.216309 } rotation={ -0.000000 0.378508 -0.000000 0.925598 } scale={ 1.000000 1.000000 1.000000 } } { id=5714 - position={ 3262.685791 0.000000 2427.198730 } - rotation={ -0.000000 0.085497 -0.000000 0.996338 } + position={ 3245.543213 0.000000 2419.952148 } + rotation={ -0.000000 -0.568814 -0.000000 -0.822466 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31237,7 +31243,7 @@ } { id=5735 - position={ 3267.695068 0.000000 2446.811035 } + position={ 3257.629150 0.000000 2450.400879 } rotation={ -0.000000 -0.324117 -0.000000 0.946017 } scale={ 1.000000 1.000000 1.000000 } } @@ -31249,7 +31255,7 @@ } { id=5737 - position={ 3223.357910 0.000000 2485.598633 } + position={ 3230.980713 0.000000 2483.962158 } rotation={ -0.000000 0.164592 -0.000000 0.986362 } scale={ 1.000000 1.000000 1.000000 } } @@ -32123,12 +32129,6 @@ rotation={ -0.000000 -0.375002 -0.000000 0.927024 } scale={ 1.000000 1.000000 1.000000 } } - { - id=0 - position={ 3049.756836 0.000000 2233.305908 } - rotation={ -0.000000 -0.199549 -0.000000 0.979888 } - scale={ 1.000000 1.000000 1.000000 } - } { id=5900 position={ 3049.756836 0.000000 2233.305908 } diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt index 5196b77da..66150d1c8 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -5,6 +5,12 @@ generated_content=no layer="building_layer" instances={ + { + id=0 + position={ 2981.235107 0.000000 2248.633057 } + rotation={ -0.000000 -0.167118 -0.000000 0.985937 } + scale={ 1.000000 1.000000 1.000000 } + } { id=1 position={ 271.799835 0.000000 4462.883301 } @@ -3829,8 +3835,8 @@ } { id=680 - position={ 3247.077637 0.000000 2471.085449 } - rotation={ -0.000000 -0.170153 -0.000000 0.985418 } + position={ 3244.692139 0.000000 2459.799316 } + rotation={ -0.000000 -0.050358 -0.000000 0.998732 } scale={ 1.000000 1.000000 1.000000 } } { @@ -3865,7 +3871,7 @@ } { id=704 - position={ 3177.105713 0.000000 2424.592773 } + position={ 3221.451172 0.000000 2437.936279 } rotation={ -0.000000 -0.502511 -0.000000 -0.864571 } scale={ 1.000000 1.000000 1.000000 } } @@ -3893,12 +3899,6 @@ rotation={ -0.000000 -0.982873 -0.000000 -0.184282 } scale={ 1.000000 1.000000 1.000000 } } - { - id=0 - position={ 2981.235107 0.000000 2248.633057 } - rotation={ -0.000000 -0.167118 -0.000000 0.985937 } - scale={ 1.000000 1.000000 1.000000 } - } { id=736 position={ 2981.235107 0.000000 2248.633057 } @@ -26269,8 +26269,8 @@ } { id=4899 - position={ 3032.913818 0.000000 2250.799316 } - rotation={ -0.000000 -0.568629 -0.000000 -0.822594 } + position={ 3182.049072 0.000000 2450.384277 } + rotation={ -0.000000 0.854706 -0.000000 -0.519113 } scale={ 1.000000 1.000000 1.000000 } } { @@ -30973,7 +30973,7 @@ } { id=5695 - position={ 3152.077637 0.000000 2431.085449 } + position={ 3140.313232 0.000000 2434.188477 } rotation={ -0.000000 -0.390045 -0.000000 0.920796 } scale={ 1.000000 1.000000 1.000000 } } @@ -31015,14 +31015,14 @@ } { id=5702 - position={ 3095.077637 0.000000 2425.085449 } + position={ 3107.222900 0.000000 2422.748291 } rotation={ -0.000000 -0.232975 -0.000000 0.972483 } scale={ 1.000000 1.000000 1.000000 } } { id=5703 - position={ 3115.077637 0.000000 2431.085449 } - rotation={ -0.000000 -0.393156 -0.000000 0.919472 } + position={ 3129.381592 0.000000 2443.883057 } + rotation={ -0.000000 -0.727943 -0.000000 0.685638 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31057,8 +31057,8 @@ } { id=5709 - position={ 3196.799805 0.000000 2463.634766 } - rotation={ -0.000000 -0.236083 -0.000000 -0.971733 } + position={ 3195.606445 0.000000 2477.634766 } + rotation={ -0.000000 0.462176 -0.000000 -0.886788 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31081,14 +31081,14 @@ } { id=5713 - position={ 3227.077637 0.000000 2443.085449 } - rotation={ -0.000000 -0.609771 -0.000000 -0.792578 } + position={ 3201.212891 0.000000 2419.383545 } + rotation={ -0.000000 0.020863 -0.000000 -0.999783 } scale={ 1.000000 1.000000 1.000000 } } { id=5714 - position={ 3266.108887 0.000000 2420.368652 } - rotation={ -0.000000 -0.605586 -0.000000 0.795780 } + position={ 3245.484131 0.000000 2407.709961 } + rotation={ -0.000000 -0.791667 -0.000000 0.610953 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31213,8 +31213,8 @@ } { id=5735 - position={ 3262.077637 0.000000 2451.085449 } - rotation={ -0.000000 -0.368515 -0.000000 -0.929622 } + position={ 3262.308594 0.000000 2425.405029 } + rotation={ -0.000000 -0.996754 -0.000000 0.080514 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31225,7 +31225,7 @@ } { id=5737 - position={ 3227.077637 0.000000 2475.085449 } + position={ 3233.023193 0.000000 2492.333984 } rotation={ -0.000000 -0.008860 -0.000000 -0.999961 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt index 7033cf293..f94b3f072 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -4015,8 +4015,8 @@ } { id=680 - position={ 3251.050049 0.000000 2486.122559 } - rotation={ -0.000000 -0.997841 -0.000000 0.065676 } + position={ 3250.700928 0.000000 2481.373291 } + rotation={ -0.000000 -0.945634 -0.000000 0.325232 } scale={ 1.000000 1.000000 1.000000 } } { @@ -4159,7 +4159,7 @@ } { id=704 - position={ 3190.170166 0.000000 2437.662598 } + position={ 3221.749268 0.000000 2444.544678 } rotation={ -0.000000 -0.999421 -0.000000 0.034026 } scale={ 1.000000 1.000000 1.000000 } } @@ -28147,7 +28147,7 @@ } { id=4899 - position={ 3052.000000 0.000000 2254.000000 } + position={ 3219.505127 0.000000 2465.672607 } rotation={ -0.000000 -0.973253 -0.000000 0.229737 } scale={ 1.000000 1.000000 1.000000 } } @@ -32863,8 +32863,8 @@ } { id=5695 - position={ 3142.030273 0.000000 2440.196777 } - rotation={ -0.000000 -0.833416 -0.000000 0.552646 } + position={ 3159.280029 0.000000 2431.526611 } + rotation={ -0.000000 -0.417807 -0.000000 0.908535 } scale={ 1.000000 1.000000 1.000000 } } { @@ -32905,14 +32905,14 @@ } { id=5702 - position={ 3087.139404 0.000000 2437.759033 } + position={ 3086.760986 0.000000 2430.242676 } rotation={ -0.000000 -0.933383 -0.000000 0.358882 } scale={ 1.000000 1.000000 1.000000 } } { id=5703 - position={ 3127.156250 0.000000 2438.398926 } - rotation={ -0.000000 -0.796653 -0.000000 0.604437 } + position={ 3103.193359 0.000000 2442.782715 } + rotation={ -0.000000 -0.999421 -0.000000 -0.034040 } scale={ 1.000000 1.000000 1.000000 } } { @@ -32947,7 +32947,7 @@ } { id=5709 - position={ 3181.000000 0.000000 2468.000000 } + position={ 3209.645020 0.000000 2480.218750 } rotation={ -0.000000 -0.975439 -0.000000 0.220270 } scale={ 1.000000 1.000000 1.000000 } } @@ -32971,14 +32971,14 @@ } { id=5713 - position={ 3229.722900 0.000000 2457.042236 } + position={ 3201.389648 0.000000 2435.335693 } rotation={ -0.000000 -0.999364 -0.000000 0.035652 } scale={ 1.000000 1.000000 1.000000 } } { id=5714 - position={ 3254.072266 0.000000 2432.806885 } - rotation={ -0.000000 -0.957813 -0.000000 0.287391 } + position={ 3220.205078 0.000000 2416.783691 } + rotation={ -0.000000 -0.993826 -0.000000 0.110945 } scale={ 1.000000 1.000000 1.000000 } } { @@ -33103,7 +33103,7 @@ } { id=5735 - position={ 3292.194336 0.000000 2460.250000 } + position={ 3253.754395 0.000000 2441.719971 } rotation={ 0.000000 0.000000 0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -33115,8 +33115,8 @@ } { id=5737 - position={ 3234.000000 0.000000 2489.000000 } - rotation={ -0.000000 -0.592040 -0.000000 0.805909 } + position={ 3238.830811 0.000000 2500.067139 } + rotation={ -0.000000 0.069573 -0.000000 0.997577 } scale={ 1.000000 1.000000 1.000000 } } { diff --git a/gfx/map/map_object_data/player_stack_locators.txt b/gfx/map/map_object_data/player_stack_locators.txt index 6e8caacc8..8301f9ee0 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -4015,8 +4015,8 @@ } { id=680 - position={ 3255.000000 0.000000 2478.000000 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 3258.043213 0.000000 2473.295410 } + rotation={ -0.000000 0.088997 -0.000000 0.996032 } scale={ 1.000000 1.000000 1.000000 } } { @@ -4159,7 +4159,7 @@ } { id=704 - position={ 3190.000000 0.000000 2429.000000 } + position={ 3234.978271 0.000000 2437.153076 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -28147,7 +28147,7 @@ } { id=4899 - position={ 3038.595215 0.000000 2253.080566 } + position={ 3203.136230 0.000000 2464.792969 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32863,7 +32863,7 @@ } { id=5695 - position={ 3156.000000 0.000000 2437.000000 } + position={ 3158.510254 0.000000 2443.126465 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32905,13 +32905,13 @@ } { id=5702 - position={ 3102.000000 0.000000 2428.000000 } + position={ 3084.029297 0.000000 2408.823730 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5703 - position={ 3119.000000 0.000000 2439.000000 } + position={ 3122.681885 0.000000 2446.292236 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32947,7 +32947,7 @@ } { id=5709 - position={ 3200.116943 0.000000 2468.788574 } + position={ 3177.920410 0.000000 2467.519775 } rotation={ 0.000000 0.000000 0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -32971,14 +32971,14 @@ } { id=5713 - position={ 3231.912354 0.000000 2447.282959 } + position={ 3209.902832 0.000000 2422.586182 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5714 - position={ 3269.723145 0.000000 2424.100586 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 3256.327148 0.000000 2410.908691 } + rotation={ -0.000000 -0.452556 -0.000000 -0.891736 } scale={ 1.000000 1.000000 1.000000 } } { @@ -33103,7 +33103,7 @@ } { id=5735 - position={ 3269.014893 0.000000 2455.846680 } + position={ 3265.372559 0.000000 2434.148193 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -33115,7 +33115,7 @@ } { id=5737 - position={ 3236.000000 0.000000 2477.000000 } + position={ 3235.742676 0.000000 2478.329590 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/gfx/map/map_object_data/siege_locators.txt b/gfx/map/map_object_data/siege_locators.txt index bd5546e0b..b43c488dd 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -5,6 +5,12 @@ generated_content=no layer="unit_layer" instances={ + { + id=0 + position={ 2980.147705 0.000000 2264.234619 } + rotation={ -0.000000 -0.047122 -0.000000 0.998890 } + scale={ 1.000000 1.000000 1.000000 } + } { id=1 position={ 280.866028 0.000000 4465.129883 } @@ -3829,8 +3835,8 @@ } { id=680 - position={ 3256.000000 0.000000 2473.000000 } - rotation={ -0.000000 -0.625727 -0.000000 0.780042 } + position={ 3252.790039 0.000000 2464.098145 } + rotation={ -0.000000 -0.527332 -0.000000 0.849659 } scale={ 1.000000 1.000000 1.000000 } } { @@ -3865,7 +3871,7 @@ } { id=704 - position={ 3185.000000 0.000000 2417.000000 } + position={ 3229.345459 0.000000 2430.343506 } rotation={ -0.000000 0.872749 -0.000000 -0.488170 } scale={ 1.000000 1.000000 1.000000 } } @@ -3893,12 +3899,6 @@ rotation={ 0.000000 0.633989 0.000000 0.773342 } scale={ 1.000000 1.000000 1.000000 } } - { - id=0 - position={ 2980.147705 0.000000 2264.234619 } - rotation={ -0.000000 -0.047122 -0.000000 0.998890 } - scale={ 1.000000 1.000000 1.000000 } - } { id=736 position={ 2980.147705 0.000000 2264.234619 } @@ -26269,8 +26269,8 @@ } { id=4899 - position={ 3024.836182 0.000000 2245.713867 } - rotation={ 0.000000 0.874642 0.000000 0.484769 } + position={ 3195.383789 0.000000 2456.881592 } + rotation={ -0.000000 -0.535521 -0.000000 0.844522 } scale={ 1.000000 1.000000 1.000000 } } { @@ -30973,7 +30973,7 @@ } { id=5695 - position={ 3162.000000 0.000000 2428.000000 } + position={ 3150.235596 0.000000 2431.103027 } rotation={ 0.000000 0.802293 0.000000 -0.596931 } scale={ 1.000000 1.000000 1.000000 } } @@ -31015,14 +31015,14 @@ } { id=5702 - position={ 3085.000000 0.000000 2424.000000 } + position={ 3097.145264 0.000000 2421.662842 } rotation={ 0.000000 0.741453 0.000000 0.671005 } scale={ 1.000000 1.000000 1.000000 } } { id=5703 - position={ 3112.000000 0.000000 2421.000000 } - rotation={ 0.000000 0.989400 0.000000 0.145213 } + position={ 3119.695557 0.000000 2439.446777 } + rotation={ -0.000000 0.848853 -0.000000 0.528628 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31057,8 +31057,8 @@ } { id=5709 - position={ 3201.722168 0.000000 2454.549072 } - rotation={ 0.000000 0.968028 0.000000 -0.250841 } + position={ 3186.510010 0.000000 2471.709473 } + rotation={ -0.000000 0.893717 -0.000000 0.448630 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31081,14 +31081,14 @@ } { id=5713 - position={ 3227.000000 0.000000 2433.000000 } - rotation={ 0.000000 1.000000 0.000000 -0.000000 } + position={ 3190.343018 0.000000 2418.090332 } + rotation={ -0.000000 0.779684 -0.000000 0.626173 } scale={ 1.000000 1.000000 1.000000 } } { id=5714 - position={ 3255.031250 0.000000 2422.283203 } - rotation={ 0.000000 0.640747 0.000000 0.767752 } + position={ 3237.145752 0.000000 2415.518311 } + rotation={ -0.000000 0.419087 -0.000000 0.907946 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31213,8 +31213,8 @@ } { id=5735 - position={ 3272.000000 0.000000 2451.000000 } - rotation={ 0.000000 0.707107 0.000000 -0.707107 } + position={ 3251.384521 0.000000 2431.866211 } + rotation={ -0.000000 -0.469380 -0.000000 -0.882996 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31225,7 +31225,7 @@ } { id=5737 - position={ 3216.000000 0.000000 2476.000000 } + position={ 3221.945557 0.000000 2493.248535 } rotation={ 0.000000 0.674338 0.000000 0.738423 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/history/provinces/e_caucasia.txt b/history/provinces/e_caucasia.txt index a09192e76..518a646cf 100644 --- a/history/provinces/e_caucasia.txt +++ b/history/provinces/e_caucasia.txt @@ -78,19 +78,6 @@ } -# 680 - Oltisi -680 = { # 680 - Oltisi - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = city_holding - - # History - -} - # 1013 - Lori 1013 = { # 1013 - Lori @@ -132,8 +119,8 @@ 5736 = { # 5736 - Taoskari # Misc - culture = NEOW_georgian - religion = orthodox + culture = karadenizli + religion = naqshbandi holding = none @@ -141,19 +128,6 @@ } -# 5737 - Tortomi -5737 = { # 5737 - Tortomi - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = castle_holding - - # History - -} - # 5738 - Tmogvi 5738 = { # 5738 - Tmogvi @@ -800,18 +774,6 @@ # History } -# 704 - Theodosiopolis -704 = { # 704 - Theodosiopolis - - # Misc - culture = kurd - religion = alevi - - holding = castle_holding - - # History -} - # 707 - Melitene 707 = { # 707 - Melitene @@ -860,18 +822,6 @@ # History } -# 5709 - Speri -5709 = { # 5709 - Speri - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = none - - # History -} - # 5710 - Camacha 5710 = { # 5710 - Camacha @@ -908,30 +858,6 @@ # History } -# 5713 - Mardali -5713 = { # 5713 - Mardali - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = city_holding - - # History -} - -# 5714 - Khinisi -5714 = { # 5714 - Khinisi - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = none - - # History -} - # 5715 - Varto 5715 = { # 5715 - Varto @@ -1192,18 +1118,6 @@ # History } -# 5735 - Sevuki -5735 = { # 5735 - Sevuki - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = none - - # History -} - # 5780 - Tovuz 5780 = { # 5780 - Tovuz diff --git a/history/provinces/e_mashriq.txt b/history/provinces/e_mashriq.txt index b21850ced..11143c110 100644 --- a/history/provinces/e_mashriq.txt +++ b/history/provinces/e_mashriq.txt @@ -1609,22 +1609,6 @@ religion = alevi } -# 4899 - DULUK-TELUCH -4899 = { # 4899 - Duluk-Teluch - - # Misc - culture = armenian - religion = armenian_apostolic - - # History - 1177.1.1 = { - culture = kurd - religion = majlisi - } - 1320.1.1 = { culture = syrian } - -} - # 5902 - JARABULUS 5902 = { # 5902 - Jarabulus diff --git a/history/provinces/e_turkey.txt b/history/provinces/e_turkey.txt index c153b0d57..75caceca6 100644 --- a/history/provinces/e_turkey.txt +++ b/history/provinces/e_turkey.txt @@ -664,6 +664,50 @@ 5901 = { # İslahiye holding = none } +### k_armenitolia/Armenitolia ############################## +##d_mesopotamia/Erzurum ################################### +###c_theodosiopolis/Erzurum +704 = { # Erzurum + culture = karadenizli + religion = alevi + holding = castle_holding +} +5735 = { # Karayazı + holding = city_holding +} +5714 = { # Hınıs + holding = church_holding +} +5713 = { # Tercan + holding = none +} +###c_satala/Erzincan +5695 = { # Erzincan + culture = zazaki + religion = alevi + holding = castle_holding +} +5703 = { # Kelkit + holding = church_holding +} +5702 = { # Refahiye + holding = none +} +###c_horasan/Horasan +680 = { # Horasan + culture = karadenizli + religion = naqshbandi + holding = castle_holding +} +5737 = { # Oltu + holding = city_holding +} +4899 = { # Aşkale + holding = church_holding +} +5709 = { # İspir + holding = none +} # custom @@ -1237,22 +1281,6 @@ } } -# 5695 - Keltzine -5695 = { # 5695 - Keltzine - - # Misc - culture = greek - religion = orthodox - - holding = city_holding - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - # 5698 - Neocaesara 5698 = { # 5698 - Neocaesara @@ -1304,32 +1332,3 @@ } -# 5702 - Kheranion -5702 = { # 5702 - Kheranion - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } - -} - -# 5703 - Satala -5703 = { # 5703 - Satala - - # Misc - culture = zazaki - religion = alevi - - holding = castle_holding - -} - - diff --git a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml index de5d22a93..2354c5e93 100644 --- a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml @@ -7517,3 +7517,8 @@ dynn_Massad:0 "Massad" dynn_Massoud:0 "Massoud" dynn_Mazloum:0 "Mazloum" + dynn_Merhi:0 "Merhi" + dynn_Mikhael:0 "Mikhael" + dynn_Mobarak:0 "Mobarak" + dynn_Mourany:0 "Mourany" + dynn_Mourad:0 "Mourad" diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index 90c59f9d5..b96105179 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -4757,7 +4757,6 @@ b_ask:0 "Ask" b_aska:0 "Aska" b_askala:0 "Äskälä" - b_askale:0 "Askale" b_askeaton:0 "Askeaton" b_askedal:0 "Askedal" b_askersund:0 "Askersund" @@ -11491,7 +11490,6 @@ b_sason:0 "Sason" b_sasovo:0 "Sasovo" b_sassuolo:0 "Sassuolo" - b_satala:0 "Satala" b_satara:0 "Satara" b_sater:0 "Säter" b_satgaon:0 "Satgaon" @@ -15984,8 +15982,6 @@ c_tharasset_adj:0 "Tamdoulti" c_theodosia:0 "Theodosia" c_theodosia_adj:0 "Theodosian" - c_theodosiopolis:0 "Theodosiopolis" - c_theodosiopolis_adj:0 "Theodosiopolite" c_thessalia:0 "Thessalia" c_thessalia_adj:0 "Thessalian" c_thessaliotis:0 "Thessaliotis" @@ -16913,8 +16909,6 @@ d_meryas_adj:0 "Meryan" d_meshcheras:0 "Meshcheras" d_meshcheras_adj:0 "Meshcheran" - d_mesopotamia:0 "Mesopotamia" - d_mesopotamia_adj:0 "Mesopotamian" d_milano:0 "Milano" d_milano_adj:0 "Milanese" d_minsk:0 "Minsk" @@ -19163,8 +19157,6 @@ c_acampse_adj:0 "Acampsian" c_colonea:0 "Colonea" c_colonea_adj:0 "Colonean" - c_satala:0 "Satala" - c_satala_adj:0 "Satalan" c_hark:0 "Hark" c_hark_adj:0 "Harkian" c_apahunik:0 "Apahunik" @@ -19210,14 +19202,10 @@ b_colonea:0 "Colonea" b_sinoria:0 "Sinoria" b_hypseie:0 "Hypseie" - b_kheranion:0 "Kheranion" b_arsamosata:0 "Arsamosata" - b_speri:0 "Speri" b_camacha:0 "Camacha" b_koloberd:0 "Koloberd" b_balu:0 "Balu" - b_mardali:0 "Mardali" - b_khinisi:0 "Khinisi" b_varto:0 "Varto" b_musch:0 "Musch" b_tatvan:0 "Tatvan" @@ -19236,10 +19224,9 @@ b_patnos:0 "Patnos" b_zariskat:0 "Zariskat" b_kars:0 "Kars" - b_sevuki:0 "Sevuki" + b_sevuki:0 "Karayazı" b_taoskari:0 "Taoskari" - b_tortomi:0 "Tortomi" - b_oltisi:0 "Oltisi" + b_oltisi:0 "Horasan" b_tmogvi:0 "Tmogvi" b_arthanuji:0 "Arthanuji" b_artaani:0 "Artaani" @@ -27352,15 +27339,15 @@ b_as-suwaida:0 "Siverek" b_tall_mauzan:0 "Viranşehir" d_mesopotamia:0 "Erzurum" - d_mesopotamia_adj:0 "Erzurum" + d_mesopotamia_adj:0 "Erzurumlu" c_theodosiopolis:0 "Erzurum" - c_theodosiopolis_adj:0 "Erzurum" + c_theodosiopolis_adj:0 "Erzurumlu" b_theodosiopolis:0 "Erzurum" b_speri:0 "İspir" b_martyropolis:0 "Meyafarikin" b_baeberdon:0 "Bayburt" b_keltzine:0 "Erzincan" - b_tortomi:0 "Tortum" + b_tortomi:0 "Oltu" c_mayyafariqin:0 "Silvan" c_mayyafariqin_adj:0 "Silvan" b_mayyafariqin:0 "Silvan" @@ -27377,7 +27364,7 @@ c_turuberan:0 "Muş" c_turuberan_adj:0 "Muş" b_varto:0 "Varto" - b_mardali:0 "Malazgirt" + b_mardali:0 "Tercan" b_khinisi:0 "Hınıs" c_melitene:0 "Malatya" c_melitene_adj:0 "Malatya" @@ -27391,10 +27378,12 @@ b_camacha:0 "Kemah" b_koloberd:0 "Kale" b_balu:0 "Palu" - c_satala:0 "Sadak" - c_satala_adj:0 "Sadak" - b_satala:0 "Sadak" - b_kheranion:0 "Harput" + c_horasan:0 "Horasan" + c_horasan_adj:0 "Horasanlı" + c_satala:0 "Erzincan" + c_satala_adj:0 "Erzincanlı" + b_satala:0 "Kelkit" + b_kheranion:0 "Refahiye" b_kamisa:0 "Ulaş" b_tephrice:0 "Divriği" d_sebasteia:0 "Sivas" @@ -27451,6 +27440,7 @@ c_mersin_adj:0 "Mersinli" d_hatay:0 "Hatay" d_hatay_adj:0 "Hataylı" + b_askale:0 "Aşkale" e_caucasia:0 "Caucasia" e_caucasia_adj:0 "Caucasian" diff --git a/map_data/provinces.png b/map_data/provinces.png index dfd847caf..8960691b4 100644 --- a/map_data/provinces.png +++ b/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cff9d2c30fb455aac39d21945dec131dc5eaf481c3242988ab744bb3fa1f35ed -size 2680623 +oid sha256:27f74bb902e4138779ee78c46977eb259d815747050a4cc7903bfa20e923407a +size 2681315