diff --git a/common/coat_of_arms/coat_of_arms/01_landed_titles.txt b/common/coat_of_arms/coat_of_arms/01_landed_titles.txt index 79193d893..b758c6e7b 100644 --- a/common/coat_of_arms/coat_of_arms/01_landed_titles.txt +++ b/common/coat_of_arms/coat_of_arms/01_landed_titles.txt @@ -32531,32 +32531,6 @@ d_lebanon = { } } -c_harran={ - pattern="pattern_solid.dds" - color1=white - color2=white - color3=green - colored_emblem={ - color1=green - color2=green - texture="ce_octogon_plain_frame.dds" - instance={ - position={ 0.5 0.48 } - scale={ 0.75 0.75 } - } - - } - colored_emblem={ - color1=white - color2=white - texture="ce_rubh_el_hizb_iranian.dds" - instance={ - position={ 0.5 0.48 } - scale={ 0.7 0.7 } - } - } -} - c_seleucia = { pattern = "pattern_solid.dds" color1 = "white" diff --git a/common/landed_titles/mashriq.txt b/common/landed_titles/mashriq.txt index 182598b6e..99c86687a 100644 --- a/common/landed_titles/mashriq.txt +++ b/common/landed_titles/mashriq.txt @@ -670,11 +670,6 @@ e_mashriq = { c_upper_khabur = { color = { 25 175 75 } - b_ras_al-ain = { - province = 4853 - - color = { 25 175 75 } - } b_tall_mahra = { province = 4878 @@ -694,56 +689,20 @@ e_mashriq = { color = { 95 150 40 } } - } - c_harran = { - - cultural_names = { - name_list_NEOW_griko = cn_harran - name_list_NEOW_greek = cn_harran - name_list_NEOW_cypriot = cn_harran - name_list_NEOW_greco_turkish = cn_harran - } - color = { 5 128 71 } - - b_harran = { - - cultural_names = { - name_list_NEOW_griko = cn_harran - name_list_NEOW_greek = cn_harran - name_list_NEOW_cypriot = cn_harran - name_list_NEOW_greco_turkish = cn_harran - } - province = 4870 - - color = { 5 128 71 } - } - b_saruj = { - - cultural_names = { - name_list_NEOW_griko = cn_saruj - name_list_NEOW_greek = cn_saruj - name_list_NEOW_cypriot = cn_saruj - name_list_NEOW_greco_turkish = cn_saruj - } - province = 4874 - - color = { 5 128 71 } - } - } + } } } - k_jazira = { + k_jazira = { # Kurdistan color = { 216 47 32 } - capital = c_irbil # Erbil - - d_diyarbakr = { + d_diyarbakr = { # Diyarbakır color = { 70 195 100 } - capital = c_amida - c_amida = { + + c_amida = { # Diyarbakır + color = { 70 195 100 } cultural_names = { name_list_NEOW_griko = cn_amida @@ -751,9 +710,10 @@ e_mashriq = { name_list_NEOW_cypriot = cn_amida name_list_NEOW_greco_turkish = cn_amida } - color = { 70 195 100 } - b_amid = { + b_amid = { # Diyarbakır + province = 4867 + color = { 70 195 100 } cultural_names = { name_list_NEOW_griko = cn_amida @@ -761,23 +721,10 @@ e_mashriq = { name_list_NEOW_cypriot = cn_amida name_list_NEOW_greco_turkish = cn_amida } - province = 4867 - - color = { 70 195 100 } } - b_zermion = { - - cultural_names = { - name_list_NEOW_griko = cn_zermion - name_list_NEOW_greek = cn_zermion - name_list_NEOW_cypriot = cn_zermion - name_list_NEOW_greco_turkish = cn_zermion - } - province = 4866 - + b_as-suwaida = { # Ergani + province = 4868 color = { 70 195 100 } - } - b_as-suwaida = { cultural_names = { name_list_NEOW_griko = cn_siverek @@ -785,22 +732,198 @@ e_mashriq = { name_list_NEOW_cypriot = cn_siverek name_list_NEOW_greco_turkish = cn_siverek } - province = 4868 - - color = { 70 195 100 } } - b_tall_mauzan = { + b_tall_basma = { # Çınar + province = 4855 + color = { 90 215 120 } + } + b_zermion = { # Çermik + province = 4866 + color = { 70 195 100 } + + cultural_names = { + name_list_NEOW_griko = cn_zermion + name_list_NEOW_greek = cn_zermion + name_list_NEOW_cypriot = cn_zermion + name_list_NEOW_greco_turkish = cn_zermion + } + } + } + c_samosata = { # Adıyaman + color = { 175 105 45 } + + cultural_names = { + name_list_NEOW_griko = cn_samosata + name_list_NEOW_greek = cn_samosata + name_list_NEOW_cypriot = cn_samosata + name_list_NEOW_greco_turkish = cn_samosata + } + + b_samosata = { # Adıyaman + province = 4894 + color = { 175 105 45 } + + cultural_names = { + name_list_NEOW_griko = cn_samosata + name_list_NEOW_greek = cn_samosata + name_list_NEOW_cypriot = cn_samosata + name_list_NEOW_greco_turkish = cn_samosata + } + } + b_kaisum = { # Kahta + province = 4891 + color = { 175 125 35 } + + cultural_names = { + name_list_NEOW_griko = cn_kaisum + name_list_NEOW_greek = cn_kaisum + name_list_NEOW_cypriot = cn_kaisum + name_list_NEOW_greco_turkish = cn_kaisum + } + } + b_bahasna = { # Besni + province = 4892 + color = { 175 105 45 } + + cultural_names = { + name_list_NEOW_griko = cn_bahasna + name_list_NEOW_greek = cn_bahasna + name_list_NEOW_cypriot = cn_bahasna + name_list_NEOW_greco_turkish = cn_bahasna + } + } + } + c_mayyafariqin = { # Bismil + color = { 30 145 110 } + + cultural_names = { + name_list_NEOW_griko = cn_martyropolis + name_list_NEOW_greek = cn_martyropolis + name_list_NEOW_cypriot = cn_martyropolis + name_list_NEOW_greco_turkish = cn_martyropolis + } + + b_nasriye = { # Bismil + province = 4860 + color = { 30 145 110 } + + cultural_names = { + name_list_NEOW_griko = cn_nasriye + name_list_NEOW_greek = cn_nasriye + name_list_NEOW_cypriot = cn_nasriye + name_list_NEOW_greco_turkish = cn_nasriye + } + } + b_mayyafariqin = { # Silvan + province = 4859 + color = { 30 145 110 } + + cultural_names = { + name_list_NEOW_griko = cn_martyropolis + name_list_NEOW_greek = cn_martyropolis + name_list_NEOW_cypriot = cn_martyropolis + name_list_NEOW_greco_turkish = cn_martyropolis + } + } + b_erkne = { # Dicle + province = 4865 + color = { 70 125 120 } + + cultural_names = { + name_list_NEOW_griko = cn_erkne + name_list_NEOW_greek = cn_erkne + name_list_NEOW_cypriot = cn_erkne + name_list_NEOW_greco_turkish = cn_erkne + } + } + } + c_siverek = { # Siverek + color = { 83 94 73 } + + b_tall_mauzan = { # Siverek + province = 4871 + color = { 70 195 100 } + cultural_names = { name_list_NEOW_griko = cn_konstantini name_list_NEOW_greek = cn_konstantini name_list_NEOW_cypriot = cn_konstantini name_list_NEOW_greco_turkish = cn_konstantini } + } + b_kafartutha = { # Viranşehir + province = 4856 + color = { 25 175 75 } + } + b_ras_al-ain = { # Ceylanpınar + province = 4853 + color = { 25 175 75 } + } + b_arca = { # Hilvan + province = 5708 + color = { 205 83 71 } + cultural_names = { + name_list_NEOW_griko = cn_arca + name_list_NEOW_greek = cn_arca + name_list_NEOW_cypriot = cn_arca + name_list_NEOW_greco_turkish = cn_arca + } + } + } + c_edessa = { # Şanlıurfa + color = { 105 165 45 } - province = 4871 + cultural_names = { + name_list_NEOW_griko = cn_edessa + name_list_NEOW_greek = cn_edessa + name_list_NEOW_cypriot = cn_edessa + name_list_NEOW_greco_turkish = cn_edessa + } - color = { 70 195 100 } + b_edessa = { + province = 4869 + color = { 105 165 45 } + + cultural_names = { + name_list_NEOW_griko = cn_edessa + name_list_NEOW_greek = cn_edessa + name_list_NEOW_cypriot = cn_edessa + name_list_NEOW_greco_turkish = cn_edessa + } + } + b_harran = { # Akçakale + province = 4870 + color = { 5 128 71 } + + cultural_names = { + name_list_NEOW_griko = cn_harran + name_list_NEOW_greek = cn_harran + name_list_NEOW_cypriot = cn_harran + name_list_NEOW_greco_turkish = cn_harran + } + } + b_saruj = { # Suruç + province = 4874 + color = { 5 128 71 } + + cultural_names = { + name_list_NEOW_griko = cn_saruj + name_list_NEOW_greek = cn_saruj + name_list_NEOW_cypriot = cn_saruj + name_list_NEOW_greco_turkish = cn_saruj + } + } + b_al-bira = { # Birecik + province = 4872 + color = { 105 165 45 } + + cultural_names = { + name_list_NEOW_griko = cn_al + name_list_NEOW_greek = cn_al + name_list_NEOW_cypriot = cn_al + name_list_NEOW_greco_turkish = cn_al + } } } c_hakkari = { @@ -827,74 +950,27 @@ e_mashriq = { color = { 50 175 80 } } } - c_bakriya = { - - cultural_names = { - name_list_NEOW_griko = cn_bakriya - name_list_NEOW_greek = cn_bakriya - name_list_NEOW_cypriot = cn_bakriya - name_list_NEOW_greco_turkish = cn_bakriya - } - color = { 70 125 120 } - - b_erkne = { - - cultural_names = { - name_list_NEOW_griko = cn_erkne - name_list_NEOW_greek = cn_erkne - name_list_NEOW_cypriot = cn_erkne - name_list_NEOW_greco_turkish = cn_erkne - } - province = 4865 - - color = { 70 125 120 } - } - } c_tall_basma = { color = { 90 215 120 } - b_tall_basma = { - province = 4855 - - color = { 90 215 120 } - } b_mardin = { province = 4854 color = { 25 175 75 } } - b_kafartutha = { - province = 4856 - - color = { 25 175 75 } - } b_dara = { province = 4846 color = { 25 150 90 } } } - c_mayyafariqin = { + c_nasibin = { + color = { 40 205 90 } - cultural_names = { - name_list_NEOW_griko = cn_martyropolis - name_list_NEOW_greek = cn_martyropolis - name_list_NEOW_cypriot = cn_martyropolis - name_list_NEOW_greco_turkish = cn_martyropolis - } - color = { 30 145 110 } + b_nasibin = { + province = 4845 - b_mayyafariqin = { - - cultural_names = { - name_list_NEOW_griko = cn_martyropolis - name_list_NEOW_greek = cn_martyropolis - name_list_NEOW_cypriot = cn_martyropolis - name_list_NEOW_greco_turkish = cn_martyropolis - } - province = 4859 - - color = { 30 145 110 } + color = { 25 150 90 } } b_tall_fafan = { cultural_names = { @@ -921,27 +997,6 @@ e_mashriq = { color = { 30 145 110 } } - b_nasriye = { - - cultural_names = { - name_list_NEOW_griko = cn_nasriye - name_list_NEOW_greek = cn_nasriye - name_list_NEOW_cypriot = cn_nasriye - name_list_NEOW_greco_turkish = cn_nasriye - } - province = 4860 - - color = { 30 145 110 } - } - } - c_nasibin = { - color = { 40 205 90 } - - b_nasibin = { - province = 4845 - - color = { 25 150 90 } - } b_gazirat_ibn_umar = { province = 4844 @@ -953,114 +1008,8 @@ e_mashriq = { color = { 90 215 120 } } - } + } } - d_edessa = { - - cultural_names = { - name_list_NEOW_griko = cn_marash - name_list_NEOW_greek = cn_marash - name_list_NEOW_cypriot = cn_marash - name_list_NEOW_greco_turkish = cn_marash - } - color = { 182 110 45 } - capital = c_edessa # Edessa - - c_samosata = { - - cultural_names = { - name_list_NEOW_griko = cn_samosata - name_list_NEOW_greek = cn_samosata - name_list_NEOW_cypriot = cn_samosata - name_list_NEOW_greco_turkish = cn_samosata - } - color = { 175 105 45 } - - b_samosata = { - - cultural_names = { - name_list_NEOW_griko = cn_samosata - name_list_NEOW_greek = cn_samosata - name_list_NEOW_cypriot = cn_samosata - name_list_NEOW_greco_turkish = cn_samosata - } - province = 4894 - - color = { 175 105 45 } - } - b_bahasna = { - - cultural_names = { - name_list_NEOW_griko = cn_bahasna - name_list_NEOW_greek = cn_bahasna - name_list_NEOW_cypriot = cn_bahasna - name_list_NEOW_greco_turkish = cn_bahasna - } - province = 4892 - - color = { 175 105 45 } - } - b_kaisum = { - - cultural_names = { - name_list_NEOW_griko = cn_kaisum - name_list_NEOW_greek = cn_kaisum - name_list_NEOW_cypriot = cn_kaisum - name_list_NEOW_greco_turkish = cn_kaisum - } - province = 4891 - - color = { 175 125 35 } - } - b_arca = { - province = 5708 - - color = { 205 83 71 } - - cultural_names = { - name_list_NEOW_griko = cn_arca - name_list_NEOW_greek = cn_arca - name_list_NEOW_cypriot = cn_arca - name_list_NEOW_greco_turkish = cn_arca - } - } - } - c_edessa = { - - cultural_names = { - name_list_NEOW_griko = cn_edessa - name_list_NEOW_greek = cn_edessa - name_list_NEOW_cypriot = cn_edessa - name_list_NEOW_greco_turkish = cn_edessa - } - color = { 105 165 45 } - - b_edessa = { - - cultural_names = { - name_list_NEOW_griko = cn_edessa - name_list_NEOW_greek = cn_edessa - name_list_NEOW_cypriot = cn_edessa - name_list_NEOW_greco_turkish = cn_edessa - } - province = 4869 - - color = { 105 165 45 } - } - b_al-bira = { - - cultural_names = { - name_list_NEOW_griko = cn_al - name_list_NEOW_greek = cn_al - name_list_NEOW_cypriot = cn_al - name_list_NEOW_greco_turkish = cn_al - } - province = 4872 - - color = { 105 165 45 } - } - } - } d_vaspurakan = { color = { 172 82 55 } diff --git a/common/religion/religion_types/NEOW_protestant.txt b/common/religion/religion_types/NEOW_protestant.txt index 6918bf653..2629222fd 100644 --- a/common/religion/religion_types/NEOW_protestant.txt +++ b/common/religion/religion_types/NEOW_protestant.txt @@ -256,7 +256,6 @@ protestant_religion = { holy_site = dublin holy_site = kent holy_site = llandrindod - #holy_site = segrada_familia #Special Tolerance | placeholder doctrine = special_doctrine_via_media @@ -586,9 +585,6 @@ protestant_religion = { holy_site = wittenberg holy_site = lund holy_site = lejre - #holy_site = belfast - #holy_site = leath - #holy_site = segrada_familia #Special Tolerance | placeholder doctrine = special_doctrine_reformation_roots @@ -677,8 +673,7 @@ protestant_religion = { holy_site = london holy_site = standrews holy_site = belfast - #holy_site = leath - #holy_site = segrada_familia + holy_site = geneva #Special Tolerance | placeholder doctrine = special_doctrine_reformation_roots diff --git a/events/dlc/ep3/ep3_travel_events_3.txt b/events/dlc/ep3/ep3_travel_events_3.txt index f730ebc77..3e49432d1 100644 --- a/events/dlc/ep3/ep3_travel_events_3.txt +++ b/events/dlc/ep3/ep3_travel_events_3.txt @@ -1165,7 +1165,6 @@ ep3_travel_events.3010 = { this = title:d_cilicia this = title:d_hatay this = title:d_cibyrrhaeot - this = title:d_edessa } } holder = { diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_cossack_outline.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_cossack_outline.dds index f5604078c..f11076c3d 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_cossack_outline.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_cossack_outline.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a31fe6cd82defa38436a20e6e1acfb9087a9eab1b5236c00bec31c94a0ffbeb -size 1048704 +oid sha256:f8f783644743729771af7212f2ee87c7fd411a629089d48c5e45d024a1db95cb +size 349680 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_cross_burgundian.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_cross_burgundian.dds index 0e620bb70..b08777b3e 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_cross_burgundian.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_cross_burgundian.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a83bdbeba294a0c5d980746132a18dca017b0276c4895435ebd2861367e52a60 -size 262272 +oid sha256:2afa5035b6eeef508cb2f1f653d234918a5c6fbe4b893030bc87967b88f8f48d +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_cross_carolignian.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_cross_carolignian.dds index 693afd163..dc9b12017 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_cross_carolignian.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_cross_carolignian.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a74ee2837fc9d97ed6c4e4ebc702ac78bc27b8ecec67069514ffc58178640f7 -size 262272 +oid sha256:a9141caeb5a254c0a1109be908efa6b6c3f61f28ad000ae7501913ca3bfb5d0f +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_cross_nordic.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_cross_nordic.dds index 772f02f96..f34b1fd73 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_cross_nordic.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_cross_nordic.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67ac51a929d541f666aeae3c2a6bfdf2df79448dbec97038a0677c073bce349b -size 65664 +oid sha256:c07899c1ef2050159c07001a83db8705beca603abadd2ee69ca4632c87a857f1 +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_crow.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_crow.dds index 4d87af70a..0e497cf41 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_crow.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_crow.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50ba973f88a1b96e4ad8e2b1a2f90d4e2a2825cdf0c98333bbbc29276729cc7a -size 1398228 +oid sha256:58133f797f352ba89d9874bb3cccd14492e140474121c42853ba6d4372fa9ef9 +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_crown_koln.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_crown_koln.dds index b850a9108..7b7419181 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_crown_koln.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_crown_koln.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04b5f62064fc5936cb46bcdbf19e7ffe1478bacc49891b3c8cd3127ea0b90db2 -size 65664 +oid sha256:0a422f21c22eaf64ce54f3bfd4008e3ee8cf6ecf7ab9e61b51df0906f4600ff0 +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_crown_koln_imperial.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_crown_koln_imperial.dds index 12ea9e144..e59914a98 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_crown_koln_imperial.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_crown_koln_imperial.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ede025dc274de966937b7c456a7e355cc0d4c4ca212a3905d965161a1781292 -size 262272 +oid sha256:d06331af29f72ffb2c22703aeb468b44e9a68bdaa95bf655eee3d566d73221fb +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_cyprus.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_cyprus.dds index 0fc450184..934a8381a 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_cyprus.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_cyprus.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:803824633e46611306914c64583b365a313acbdbaf9744c60dd3d992aede4e92 -size 262272 +oid sha256:7eb7e265e44e5e5e1e933033b8df318c0ebf7ae096dda8675cec9e870b076b0c +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_dragos_dragon.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_dragos_dragon.dds index e09a83a9a..9ac26ab5e 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_dragos_dragon.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_dragos_dragon.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ed2676f6ba5a58359153d43ce4a72ef7e3240b9ffbab32c984edbeaf65ecb50 -size 1398228 +oid sha256:776be413a60b1305fce4cd783d011ee87ee010fa8681cd7d3caf2cdab2487b5f +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_drop.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_drop.dds index 874c8e5fc..43f28484a 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_drop.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_drop.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bd68cc49953bafcb067f7f280278966654a66c5d3f4a6aa91a707c41f18b325 -size 16512 +oid sha256:75f3a0091e3ed4593d0a9e0a3857f9f9c81d91c4214f66118163c38c03971210 +size 5616 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_albania.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_albania.dds index 5372473af..39c895b0c 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_albania.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_albania.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3593313cde22addafdf15bffbc35ff11a6c14f4bd017f4f0f80f453e39acd9aa -size 262272 +oid sha256:e53049019448313ffa11e0ec9f88fce24cb575b70a6cab0f4011a29f36e4296b +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_dagestani.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_dagestani.dds index 82d30e8a0..31fffef8d 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_dagestani.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_dagestani.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:347cb50d1b100c031a55bf41bd345d8107c6cddf3f3f569ae85ffb14a1a35253 -size 262272 +oid sha256:d55448f57f2ab134b09b1cd7b78f1ac011cc1081463c42c1fac2eae1b23cd245 +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_modern.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_modern.dds index bd99f67ff..47418ff98 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_modern.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_modern.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0761e0dfb796ba2d643115c0e922e48956ce5ce54b424109e6fedb41f5c5143 -size 262272 +oid sha256:56e3b5bea9aff309a1964faa13aaaa3f1e76cc469a1256e944997e728d76265d +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_quraish.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_quraish.dds index 0673c5ce0..a03b86772 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_quraish.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_quraish.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:903a4b2ce29545eb3e780fce6273aa1d90490a90108e0d5ace59c23dc1de226d -size 262272 +oid sha256:fc8e9b382cd70e4c8ef7e0f8e1a8755c19faa023eba80aec5565b7c13ddb2808 +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_romania.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_romania.dds index 6f22f347f..9ed2167a4 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_romania.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_romania.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e0dca1a8bd9423a7cea980e157a81f54c6d105a82df8b14b9c0795985ad6d29 -size 262272 +oid sha256:00a44d8bad2498991451012a05a58d380b1c983bdd1505a681ed512d0fe59b7b +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_russia.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_russia.dds index d7849d3e5..1f3c8abea 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_russia.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_russia.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdc3c9babf88505fd50801131cbd870f078fc18949978711024014e50020e1f2 -size 262272 +oid sha256:8c74725f7760d4634a8e1786af669a2a65a999b51f43c318faa44a1a897cfebc +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_serbia.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_serbia.dds index 7317e708c..34e0db234 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_serbia.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eagle_serbia.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7862f5ea70395d27727984f6c05f3a89ff9ad48a4003fc14037796515d6e4f8 -size 262272 +oid sha256:868af03ed542bc238747ad3a1fbdf82c28d1483e67afd2284017c680ea08be17 +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eyeofhorus.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eyeofhorus.dds index f17fd617d..16adde001 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_eyeofhorus.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_eyeofhorus.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9d6fce17950dc0f096d7b56a3d46dfe86075122bd98f5d69bac2c180bd43c85 -size 262272 +oid sha256:0ce7d317e1b8ebd33725f601ab900f4df487ab364c70faa565c30f39d9f25494 +size 87536 diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index 5684f2517..aabb460a3 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -26029,7 +26029,7 @@ } { id=4853 - position={ 3161.226318 0.000000 2225.128418 } + position={ 3175.052246 0.000000 2250.011963 } rotation={ -0.000000 -0.330317 -0.000000 0.943870 } scale={ 1.000000 1.000000 1.000000 } } @@ -26041,13 +26041,13 @@ } { id=4855 - position={ 3182.329834 0.000000 2288.725342 } + position={ 3194.039795 0.000000 2302.365967 } rotation={ -0.000000 0.258328 -0.000000 0.966057 } scale={ 1.000000 1.000000 1.000000 } } { id=4856 - position={ 3175.499756 0.000000 2257.086182 } + position={ 3143.066895 0.000000 2264.358398 } rotation={ -0.000000 0.278934 -0.000000 0.960310 } scale={ 1.000000 1.000000 1.000000 } } @@ -26065,13 +26065,13 @@ } { id=4859 - position={ 3196.677246 0.000000 2331.434570 } + position={ 3217.363525 0.000000 2355.599609 } rotation={ -0.000000 0.222755 -0.000000 0.974874 } scale={ 1.000000 1.000000 1.000000 } } { id=4860 - position={ 3182.859619 0.000000 2323.228516 } + position={ 3182.918701 0.000000 2324.644775 } rotation={ -0.000000 0.323193 -0.000000 0.946333 } scale={ 1.000000 1.000000 1.000000 } } @@ -26101,25 +26101,25 @@ } { id=4865 - position={ 3143.793213 0.000000 2331.939453 } + position={ 3174.550781 0.000000 2340.093262 } rotation={ -0.000000 0.308861 -0.000000 0.951107 } scale={ 1.000000 1.000000 1.000000 } } { id=4866 - position={ 3132.968262 0.000000 2315.076416 } + position={ 3143.335449 0.000000 2324.169189 } rotation={ -0.000000 0.364625 -0.000000 0.931154 } scale={ 1.000000 1.000000 1.000000 } } { id=4867 - position={ 3151.836914 0.000000 2300.258057 } + position={ 3176.276367 0.000000 2307.608154 } rotation={ -0.000000 0.165134 -0.000000 0.986271 } scale={ 1.000000 1.000000 1.000000 } } { id=4868 - position={ 3127.126221 0.000000 2280.279785 } + position={ 3171.154053 0.000000 2319.139404 } rotation={ -0.000000 0.196318 -0.000000 0.980540 } scale={ 1.000000 1.000000 1.000000 } } @@ -26137,7 +26137,7 @@ } { id=4871 - position={ 3147.592773 0.000000 2256.562500 } + position={ 3126.768066 0.000000 2302.168945 } rotation={ -0.000000 -0.322673 -0.000000 0.946510 } scale={ 1.000000 1.000000 1.000000 } } @@ -26257,13 +26257,13 @@ } { id=4891 - position={ 3057.630127 0.000000 2283.315430 } + position={ 3096.742432 0.000000 2312.557129 } rotation={ -0.000000 0.341814 -0.000000 0.939768 } scale={ 1.000000 1.000000 1.000000 } } { id=4892 - position={ 3071.807373 0.000000 2286.588623 } + position={ 3058.084961 0.000000 2290.947021 } rotation={ -0.000000 0.190389 -0.000000 0.981709 } scale={ 1.000000 1.000000 1.000000 } } @@ -26275,7 +26275,7 @@ } { id=4894 - position={ 3106.944092 0.000000 2295.040039 } + position={ 3076.878662 0.000000 2297.976562 } rotation={ -0.000000 0.320853 -0.000000 0.947129 } scale={ 1.000000 1.000000 1.000000 } } @@ -31081,8 +31081,8 @@ } { id=5708 - position={ 3082.239746 0.000000 2322.852539 } - rotation={ -0.000000 0.610005 -0.000000 0.792398 } + position={ 3118.568115 0.000000 2273.021973 } + rotation={ -0.000000 -0.943523 -0.000000 0.331309 } scale={ 1.000000 1.000000 1.000000 } } { diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt index 1c097c4ae..673f89b74 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -25999,8 +25999,8 @@ } { id=4853 - position={ 3166.077637 0.000000 2231.085449 } - rotation={ -0.000000 -0.854805 -0.000000 -0.518949 } + position={ 3174.148926 0.000000 2231.116211 } + rotation={ -0.000000 0.089907 -0.000000 -0.995950 } scale={ 1.000000 1.000000 1.000000 } } { @@ -26011,13 +26011,13 @@ } { id=4855 - position={ 3190.211426 0.000000 2287.647949 } - rotation={ -0.000000 -0.015700 -0.000000 -0.999877 } + position={ 3188.522217 0.000000 2289.086182 } + rotation={ -0.000000 -0.494657 -0.000000 -0.869088 } scale={ 1.000000 1.000000 1.000000 } } { id=4856 - position={ 3180.077637 0.000000 2250.085449 } + position={ 3165.751465 0.000000 2256.283691 } rotation={ -0.000000 -0.997833 -0.000000 -0.065790 } scale={ 1.000000 1.000000 1.000000 } } @@ -26035,13 +26035,13 @@ } { id=4859 - position={ 3203.548584 0.000000 2327.791016 } - rotation={ -0.000000 -0.377476 -0.000000 0.926020 } + position={ 3207.778320 0.000000 2329.781250 } + rotation={ -0.000000 -0.127141 -0.000000 0.991885 } scale={ 1.000000 1.000000 1.000000 } } { id=4860 - position={ 3182.794922 0.000000 2315.688965 } + position={ 3185.561768 0.000000 2317.453369 } rotation={ -0.000000 -0.803710 -0.000000 0.595021 } scale={ 1.000000 1.000000 1.000000 } } @@ -26071,26 +26071,26 @@ } { id=4865 - position={ 3150.077637 0.000000 2329.085449 } + position={ 3186.671631 0.000000 2345.803223 } rotation={ -0.000000 -0.783295 -0.000000 -0.621651 } scale={ 1.000000 1.000000 1.000000 } } { id=4866 - position={ 3139.077637 0.000000 2310.085449 } + position={ 3145.955566 0.000000 2314.956787 } rotation={ -0.000000 -0.671620 -0.000000 -0.740896 } scale={ 1.000000 1.000000 1.000000 } } { id=4867 - position={ 3151.806885 0.000000 2292.268066 } - rotation={ -0.000000 -0.802171 -0.000000 -0.597095 } + position={ 3168.856934 0.000000 2290.405273 } + rotation={ -0.000000 -0.954567 -0.000000 -0.297998 } scale={ 1.000000 1.000000 1.000000 } } { id=4868 - position={ 3131.692627 0.000000 2274.305664 } - rotation={ -0.000000 -0.268694 -0.000000 -0.963225 } + position={ 3159.548584 0.000000 2313.492920 } + rotation={ -0.000000 0.412501 -0.000000 -0.910957 } scale={ 1.000000 1.000000 1.000000 } } { @@ -26107,7 +26107,7 @@ } { id=4871 - position={ 3148.077637 0.000000 2265.085449 } + position={ 3143.670654 0.000000 2290.689209 } rotation={ -0.000000 -0.521574 -0.000000 0.853206 } scale={ 1.000000 1.000000 1.000000 } } @@ -26227,13 +26227,13 @@ } { id=4891 - position={ 3062.089111 0.000000 2276.291992 } - rotation={ -0.000000 -0.729285 -0.000000 0.684210 } + position={ 3099.735107 0.000000 2302.950684 } + rotation={ -0.000000 -0.941860 -0.000000 -0.336004 } scale={ 1.000000 1.000000 1.000000 } } { id=4892 - position={ 3078.077637 0.000000 2291.085449 } + position={ 3064.894043 0.000000 2278.178955 } rotation={ -0.000000 -0.173532 -0.000000 0.984828 } scale={ 1.000000 1.000000 1.000000 } } @@ -26245,7 +26245,7 @@ } { id=4894 - position={ 3095.874268 0.000000 2293.098633 } + position={ 3078.833984 0.000000 2291.164551 } rotation={ -0.000000 -0.932583 -0.000000 -0.360956 } scale={ 1.000000 1.000000 1.000000 } } @@ -31051,7 +31051,7 @@ } { id=5708 - position={ 3082.077637 0.000000 2314.085449 } + position={ 3124.614258 0.000000 2277.388428 } rotation={ -0.000000 -0.662893 -0.000000 0.748714 } 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 9575744c9..3affd489d 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -27877,8 +27877,8 @@ } { id=4853 - position={ 3155.845215 0.000000 2239.886719 } - rotation={ -0.000000 -0.881414 -0.000000 0.472345 } + position={ 3177.737549 0.000000 2238.946777 } + rotation={ -0.000000 -0.939561 -0.000000 -0.342382 } scale={ 1.000000 1.000000 1.000000 } } { @@ -27889,14 +27889,14 @@ } { id=4855 - position={ 3182.350830 0.000000 2299.411133 } - rotation={ -0.000000 -0.936916 -0.000000 0.349554 } + position={ 3209.033936 0.000000 2300.080322 } + rotation={ -0.000000 -0.968216 -0.000000 -0.250115 } scale={ 1.000000 1.000000 1.000000 } } { id=4856 - position={ 3171.467773 0.000000 2262.756836 } - rotation={ -0.000000 -0.981819 -0.000000 0.189820 } + position={ 3165.583252 0.000000 2265.791260 } + rotation={ -0.000000 -0.962650 -0.000000 -0.270748 } scale={ 1.000000 1.000000 1.000000 } } { @@ -27913,13 +27913,13 @@ } { id=4859 - position={ 3198.785889 0.000000 2338.842773 } + position={ 3216.123291 0.000000 2346.047363 } rotation={ -0.000000 -0.999782 -0.000000 -0.020868 } scale={ 1.000000 1.000000 1.000000 } } { id=4860 - position={ 3200.529541 0.000000 2314.083496 } + position={ 3208.731689 0.000000 2312.086426 } rotation={ -0.000000 -0.162484 -0.000000 0.986711 } scale={ 1.000000 1.000000 1.000000 } } @@ -27949,25 +27949,25 @@ } { id=4865 - position={ 3166.269531 0.000000 2326.103516 } + position={ 3199.567871 0.000000 2347.640625 } rotation={ -0.000000 -0.962115 -0.000000 0.272644 } scale={ 1.000000 1.000000 1.000000 } } { id=4866 - position={ 3134.000000 0.000000 2327.000000 } - rotation={ -0.000000 -0.396596 -0.000000 0.917993 } + position={ 3137.355957 0.000000 2327.113525 } + rotation={ -0.000000 0.089541 -0.000000 0.995983 } scale={ 1.000000 1.000000 1.000000 } } { id=4867 - position={ 3168.852539 0.000000 2311.799561 } + position={ 3174.693604 0.000000 2286.304932 } rotation={ -0.000000 -0.921326 -0.000000 0.388790 } scale={ 1.000000 1.000000 1.000000 } } { id=4868 - position={ 3115.000000 0.000000 2284.000000 } + position={ 3158.418945 0.000000 2329.692627 } rotation={ -0.000000 -0.931746 -0.000000 0.363111 } scale={ 1.000000 1.000000 1.000000 } } @@ -27985,7 +27985,7 @@ } { id=4871 - position={ 3161.405273 0.000000 2270.636230 } + position={ 3134.243896 0.000000 2297.801270 } rotation={ -0.000000 -0.881973 -0.000000 0.471300 } scale={ 1.000000 1.000000 1.000000 } } @@ -28105,14 +28105,14 @@ } { id=4891 - position={ 3057.476318 -1.561157 2290.522949 } + position={ 3112.011230 -1.561157 2320.482178 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=4892 - position={ 3085.260986 0.000000 2297.083008 } - rotation={ -0.000000 -0.760599 -0.000000 0.649222 } + position={ 3060.848389 0.000000 2283.282715 } + rotation={ -0.000000 -0.999526 -0.000000 0.030775 } scale={ 1.000000 1.000000 1.000000 } } { @@ -28123,7 +28123,7 @@ } { id=4894 - position={ 3109.887695 0.000000 2300.630615 } + position={ 3087.009277 0.000000 2276.834717 } rotation={ -0.000000 -0.996457 -0.000000 0.084108 } scale={ 1.000000 1.000000 1.000000 } } @@ -32941,8 +32941,8 @@ } { id=5708 - position={ 3086.307129 0.000000 2331.296875 } - rotation={ -0.000000 -0.998396 -0.000000 0.056611 } + position={ 3116.000732 0.000000 2283.840332 } + rotation={ -0.000000 -0.932516 -0.000000 0.361128 } 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 ca0553289..275385bdb 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -27877,7 +27877,7 @@ } { id=4853 - position={ 3175.000000 0.000000 2231.000000 } + position={ 3167.393066 0.000000 2228.610107 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -27889,13 +27889,13 @@ } { id=4855 - position={ 3196.133789 0.000000 2291.562500 } + position={ 3187.726318 0.000000 2296.982422 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4856 - position={ 3185.000000 0.000000 2255.000000 } + position={ 3153.787598 0.000000 2252.226318 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -27913,13 +27913,13 @@ } { id=4859 - position={ 3210.000000 0.000000 2332.000000 } + position={ 3216.485840 0.000000 2336.207764 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4860 - position={ 3189.723877 0.000000 2319.224121 } + position={ 3199.210938 0.000000 2319.419922 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -27949,25 +27949,25 @@ } { id=4865 - position={ 3160.000000 0.000000 2331.000000 } + position={ 3181.223145 0.000000 2335.333496 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4866 - position={ 3142.000000 0.000000 2317.000000 } + position={ 3149.878418 0.000000 2307.197021 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4867 - position={ 3158.729248 0.000000 2299.182373 } + position={ 3167.537109 0.000000 2299.513428 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4868 - position={ 3137.614990 0.000000 2279.219971 } + position={ 3168.979736 0.000000 2313.094238 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -27985,7 +27985,7 @@ } { id=4871 - position={ 3152.000000 0.000000 2271.000000 } + position={ 3154.812500 0.000000 2291.001465 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -28105,13 +28105,13 @@ } { id=4891 - position={ 3063.011475 0.000000 2283.206299 } + position={ 3104.557861 0.000000 2294.125977 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=4892 - position={ 3080.000000 0.000000 2298.000000 } + position={ 3073.070312 0.000000 2272.484619 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -28123,7 +28123,7 @@ } { id=4894 - position={ 3101.331299 0.000000 2293.960938 } + position={ 3082.982910 0.000000 2298.311035 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32941,7 +32941,7 @@ } { id=5708 - position={ 3089.000000 0.000000 2322.000000 } + position={ 3140.167969 0.000000 2278.612549 } 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 84a8dcfdb..84a9a6e90 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -25999,8 +25999,8 @@ } { id=4853 - position={ 3166.000000 0.000000 2220.000000 } - rotation={ 0.000000 1.000000 0.000000 -0.000000 } + position={ 3164.582764 0.000000 2239.713623 } + rotation={ -0.000000 0.439994 -0.000000 0.898000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -26011,13 +26011,13 @@ } { id=4855 - position={ 3199.133789 0.000000 2283.562500 } - rotation={ 0.000000 0.838492 0.000000 -0.544914 } + position={ 3196.654785 0.000000 2296.314941 } + rotation={ -0.000000 0.473068 -0.000000 -0.881026 } scale={ 1.000000 1.000000 1.000000 } } { id=4856 - position={ 3171.000000 0.000000 2253.000000 } + position={ 3156.673828 0.000000 2259.198242 } rotation={ 0.000000 0.584710 0.000000 0.811242 } scale={ 1.000000 1.000000 1.000000 } } @@ -26035,13 +26035,13 @@ } { id=4859 - position={ 3209.800781 0.000000 2319.953613 } - rotation={ -0.000000 0.946522 -0.000000 -0.322639 } + position={ 3217.035156 0.000000 2325.986084 } + rotation={ -0.000000 0.831997 -0.000000 -0.554780 } scale={ 1.000000 1.000000 1.000000 } } { id=4860 - position={ 3191.717285 0.000000 2310.603516 } + position={ 3194.484131 0.000000 2312.367920 } rotation={ 0.000000 0.861871 0.000000 -0.507128 } scale={ 1.000000 1.000000 1.000000 } } @@ -26071,26 +26071,26 @@ } { id=4865 - position={ 3155.000000 0.000000 2320.000000 } + position={ 3191.593994 0.000000 2336.717773 } rotation={ 0.000000 0.968028 0.000000 -0.250841 } scale={ 1.000000 1.000000 1.000000 } } { id=4866 - position={ 3129.000000 0.000000 2311.000000 } + position={ 3135.877930 0.000000 2315.871338 } rotation={ 0.000000 0.671005 0.000000 0.741453 } scale={ 1.000000 1.000000 1.000000 } } { id=4867 - position={ 3161.729248 0.000000 2294.182373 } - rotation={ -0.000000 -0.633989 -0.000000 0.773342 } + position={ 3174.432617 0.000000 2299.481201 } + rotation={ -0.000000 -0.342353 -0.000000 0.939571 } scale={ 1.000000 1.000000 1.000000 } } { id=4868 - position={ 3121.614990 0.000000 2277.219971 } - rotation={ 0.000000 0.596931 0.000000 0.802293 } + position={ 3162.793213 0.000000 2324.739990 } + rotation={ -0.000000 -0.057533 -0.000000 0.998344 } scale={ 1.000000 1.000000 1.000000 } } { @@ -26107,7 +26107,7 @@ } { id=4871 - position={ 3154.000000 0.000000 2259.000000 } + position={ 3149.593018 0.000000 2284.603760 } rotation={ 0.000000 0.923880 0.000000 -0.382684 } scale={ 1.000000 1.000000 1.000000 } } @@ -26227,13 +26227,13 @@ } { id=4891 - position={ 3054.011475 0.000000 2279.206299 } - rotation={ 0.000000 0.569595 0.000000 0.821926 } + position={ 3108.627441 0.000000 2308.031982 } + rotation={ -0.000000 -0.470784 -0.000000 0.882249 } scale={ 1.000000 1.000000 1.000000 } } { id=4892 - position={ 3068.000000 0.000000 2289.000000 } + position={ 3054.816406 0.000000 2276.093506 } rotation={ 0.000000 0.773342 0.000000 0.633989 } scale={ 1.000000 1.000000 1.000000 } } @@ -26245,7 +26245,7 @@ } { id=4894 - position={ 3105.331299 0.000000 2284.960938 } + position={ 3088.291016 0.000000 2283.026855 } rotation={ 0.000000 0.773342 0.000000 -0.633989 } scale={ 1.000000 1.000000 1.000000 } } @@ -31051,7 +31051,7 @@ } { id=5708 - position={ 3091.000000 0.000000 2312.000000 } + position={ 3133.536621 0.000000 2275.302979 } rotation={ 0.000000 0.780042 0.000000 -0.625727 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/history/provinces/e_caucasia.txt b/history/provinces/e_caucasia.txt index 3788dbbf0..641f7d481 100644 --- a/history/provinces/e_caucasia.txt +++ b/history/provinces/e_caucasia.txt @@ -685,18 +685,6 @@ holding = castle_holding } -# 5708 - Arca -5708 = { # 5708 - Arca - - # Misc - culture = NEOW_armenian - religion = orthodox - - holding = city_holding - - # History -} - # 5715 - Varto 5715 = { # 5715 - Varto diff --git a/history/provinces/e_mashriq.txt b/history/provinces/e_mashriq.txt index 8a8b440da..c0cbf2eba 100644 --- a/history/provinces/e_mashriq.txt +++ b/history/provinces/e_mashriq.txt @@ -1,3 +1,76 @@ +###k_jazira/Kurdistan ############################## +##d_diyarbakr/Diyarbakır ################################### +###c_amida/Diyarbakır +4867 = { # Diyarbakır + culture = kurd + religion = majlisi + holding = castle_holding +} +4868 = { # Ergani + holding = city_holding +} +4855 = { # Çınar + holding = church_holding +} +4866 = { # Çermik + holding = none +} +###c_samosata/Adıyaman +4894 = { # Adıyaman + culture = kurd + religion = majlisi + holding = castle_holding +} +4891 = { # Kâhta + holding = city_holding +} +4892 = { # Besni + holding = church_holding +} +###c_mayyafariqin/Bismil +4860 = { # Bismil + culture = kurd + religion = majlisi + holding = castle_holding +} +4859 = { # Silvan + holding = church_holding +} +4865 = { # Dicle + holding = none +} +###c_siverek/Siverek +4871 = { # Siverek + culture = kurd + religion = majlisi + holding = castle_holding +} +4856 = { # Viranşehir + holding = church_holding +} +4853 = { # Ceylanpınar + holding = none +} +5708 = { # Hilvan + holding = none +} +###c_edessa/Şanlıurfa +4869 = { # Şanlıurfa + culture = syrian + religion = majlisi + holding = castle_holding +} +4870 = { # Akçakale + holding = city_holding +} +4874 = { # Suruç + holding = church_holding +} +4872 = { # Birecik + holding = none +} +#custom + # 4810 - BARTULLA 4810 = { # 4810 - Bartulla @@ -196,17 +269,6 @@ } -# 4853 - RAS_AL-AIN -4853 = { # 4853 - Ras al-ain, Upper Khabur - - #Misc - culture = assyrian - religion = chaldean - - # History - -} - # 4854 - MARDIN 4854 = { # 4854 - Mardin @@ -218,113 +280,6 @@ } -# 4855 - TALL_BASMA -4855 = { # Misc - culture = kurd - religion = majlisi -} - -# 4856 - KAFARTUTHA -4856 = { # 4856 - Kafartutha - - #Misc - culture = syrian - religion = majlisi - - # History - -} - -# 4859 - MAYYAFARIQIN -4859 = { # Misc - culture = kurd - religion = alevi - -} - -# 4865 - b_erkne -4865 = { # 4865 - - # Misc - culture = kurd - religion = alevi -} - -# 4866 - ZERMION -4866 = { # 4866 - Zermion - - # Misc - culture = armenian - religion = armenian_apostolic - - # History - 1164.1.1 = { - culture = kurd - religion = majlisi - } - -} - -# 4867 - AMID -4867 = { # 4867 - Amid, Amida - - # Misc - culture = kurd - religion = majlisi -} - -# 4868 - AS-SUWAIDA -4868 = { # 4868 - As-Suwaida - - # Misc - culture = armenian - religion = armenian_apostolic -} - -# 4869 - EDESSA -4869 = { # 4869 - Edessa - - # Misc - culture = syrian - religion = orthodox -} - -# 4870 - HARRAN -4870 = { # Misc - culture = syrian - religion = orthodox -} - -# 4871 - TALL_MAUZAN -4871 = { # 4871 - Tall Mauzan - - # Misc - culture = armenian - religion = armenian_apostolic - - # History - 1164.1.1 = { - culture = kurd - religion = majlisi - } - -} - -# 4872 - AL-BIRA -4872 = { # 4872 - Al-Bira - - # Misc - culture = armenian - religion = armenian_apostolic - - # History - 1164.1.1 = { - culture = kurd - religion = majlisi - } - -} - # 4873 - TALL_AMMAR 4873 = { # 4873 - Tall_Ammar @@ -337,22 +292,6 @@ } -# 4874 - SARUJ -4874 = { # 4874 - Saruj - - # Misc - culture = syrian - religion = armenian_apostolic - - # History - 1098.1.1 = { culture = armenian } - 1170.1.1 = { - culture = syrian - religion = majlisi - } - -} - # 4875 - DAUSAR 4875 = { # 4875 - Dausar @@ -1569,46 +1508,6 @@ } -# 4891 - KAISUM -4891 = { # 4891 - Kaisum - - # Misc - culture = armenian - religion = armenian_apostolic - - # History - 1177.1.1 = { - culture = kurd - religion = majlisi - } - 1320.1.1 = { culture = syrian } - -} - -# 4892 - BAHASNA -4892 = { # 4892 - Bahasna - - # Misc - culture = armenian - religion = armenian_apostolic - - # History - 1177.1.1 = { - culture = kurd - religion = majlisi - } - 1320.1.1 = { culture = syrian } - -} - -# 4894 - SAMOSATA -4894 = { # 4894 - Samosata - - # Misc - culture = kurd - religion = alevi -} - # 5902 - JARABULUS 5902 = { # 5902 - Jarabulus diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index 3d8d8487b..511ce01a0 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -4634,7 +4634,6 @@ b_arasikere:0 "Arasikere" b_arbil:0 "Arbil" b_arbinjan:0 "Arbinjan" - b_arca:0 "Arca" b_arcadia:0 "Arcadia" b_archa:0 "Archa" b_archangelsk:0 "Archangelsk" @@ -7392,7 +7391,6 @@ b_harnosand:0 "Härnösand" b_haro:0 "Haro" b_haromszek:0 "Háromszék" - b_harran:0 "Harran" b_harrand:0 "Harrand" b_harrow:0 "Harrow" b_harshnath:0 "Harshnath" @@ -11346,7 +11344,6 @@ b_samobor:0 "Samobor" b_samoded:0 "Samoded" b_samos:0 "Samos" - b_samosata:0 "Samosata" b_samoudah:0 "Samoudah" b_samrah:0 "Samrah" b_samsat:0 "Samsat" @@ -14328,8 +14325,6 @@ c_east_kiilt_adj:0 "East Kiiltian" c_eberswalde:0 "Eberswalde" c_eberswalde_adj:0 "Eberswaldenian" - c_edessa:0 "Edessa" - c_edessa_adj:0 "Edessan" c_eichstadt:1 "Eichstätt" c_eichstadt_adj:0 "Eichstätter" c_eilat:0 "Eilat" @@ -16591,8 +16586,6 @@ d_duortnoseatnu_adj:0 "Duortnoseatnuan" d_dyrrachion:0 "Myzeqe" d_dyrrachion_adj:0 "Myzeqe" - d_edessa:0 "Edessa" - d_edessa_adj:0 "Edessan" d_el-arish:0 "El-Arish" d_el-arish_adj:0 "El-Arishan" d_el_rif:0 "El Rif" @@ -18110,14 +18103,10 @@ b_qarqisiya:0 "Qarqisiya" c_upper_khabur:0 "Upper Khabur" c_upper_khabur_adj:0 "Upper Khaburan" - b_ras_al-ain:0 "Ras al-Ain" - b_kafartutha:0 "Kafartuth" + b_ras_al-ain:0 "Ceylanpınar" + b_kafartutha:0 "Viranşehir" d_diyarmudar:0 "Diyarmudar" d_diyarmudar_adj:0 "Diyarmudaran" - b_al-bira:0 "al-Bira" - c_harran:0 "Harran" - c_harran_adj:0 "Harrani" - b_saruj:0 "Saruj" b_tall_mahra:0 "Tall Mahra" c_dausar:0 "Dausar" c_dausar_adj:0 "Dausarian" @@ -18127,11 +18116,11 @@ c_raqqa_adj:0 "Raqqan" b_raqqa:0 "Raqqa" b_bajarwan:0 "Bajarwan" - d_diyarbakr:0 "Diyarbakr" - d_diyarbakr_adj:0 "Diyarbakrian" + d_diyarbakr:0 "Diyarbakır" + d_diyarbakr_adj:0 "Diyarbakırlı" c_tall_basma:0 "Tall Basma" c_tall_basma_adj:0 "Tall Basmani" - b_tall_basma:0 "Tall Basma" + b_tall_basma:0 "Çınar" b_hisn_kaifa:0 "Hisn Kaifa" c_hakkari:0 "Hakkari" c_hakkari_adj:0 "Hakkari" @@ -18140,19 +18129,9 @@ b_tamanin:0 "Tamanin" b_saird:0 "Saird" b_juza:0 "Juza" - c_mayyafariqin:0 "Mayyafariqin" - c_mayyafariqin_adj:0 "Mayyafariqini" - b_mayyafariqin:0 "Mayyafariqin" b_tall_fafan:0 "Tall Fafan" b_arzan:0 "Arzan" - b_nasriye:0 "Nasriye" - c_bakriya:0 "Bakriya" - c_bakriya_adj:0 "Bakriyani" - b_erkne:0 "Erkne" - b_amid:0 "Amid" - b_zermion:0 "Zermion" - b_as-suwaida:0 "as-Suwaida" - b_tall_mauzan:0 "Tall Mauzan" + b_erkne:0 "Dicle" d_euphrates:0 "Euphrates" d_euphrates_adj:0 "Euphratese" c_rahba:0 "Rahba" @@ -18499,7 +18478,6 @@ b_az-zarqa:0 "Az-Zarqa" b_azam:0 "Azam" b_baalbak:0 "Baalbak" - b_bahasna:0 "Bahasna" b_baidha-petra:0 "Baidha-Petra" b_bajlan:0 "Bajlan" b_baniyas:0 "Baniyas" @@ -18523,7 +18501,7 @@ b_jusiya:0 "Jusiya" b_juwair:0 "Juwair" b_kafartab:0 "Kafartab" - b_kaisum:0 "Kaisum" + b_kaisum:0 "Kahta" b_khaffan:0 "Khaffan" b_khunasira:0 "Khunasira" b_latakia:0 "Latakia" @@ -18588,8 +18566,6 @@ c_rusafa_adj:0 "Rusafan" c_safata:0 "Safata" c_safata_adj:0 "Safatan" - c_samosata:0 "Samosata" - c_samosata_adj:0 "Samosatan" c_shayzar:0 "Shayzar" c_shayzar_adj:0 "Shayzari" c_sukhna:0 "Sukhna" @@ -27293,34 +27269,30 @@ b_colonea:0 "Şebinkarahisar" b_neocaesara:0 "Niksar" b_sinoria:0 "Yağlıdere" - d_edessa:0 "Şanlıurfa" - d_edessa_adj:0 "Şanlıurfa" c_edessa:0 "Şanlıurfa" - c_edessa_adj:0 "Şanlıurfa" + c_edessa_adj:0 "Şanlıurfalı" b_edessa:0 "Şanlıurfa" b_al-bira:0 "Birecik" c_marash:0 "Kahramanmaraş" c_marash_adj:0 "Kahramanmaraşlı" b_marash:0 "Kahramanmaraş" b_kaisum:0 "Keysun" - c_samosata:0 "Samsat" - c_samosata_adj:0 "Samsat" - b_samosata:0 "Samsat" + c_samosata:0 "Adıyaman" + c_samosata_adj:0 "Adıyamanlı" + b_samosata:0 "Adıyaman" b_bahasna:0 "Besni" c_aintab:0 "Gaziantep" c_aintab_adj:0 "Gaziantepli" b_aintab:0 "Gaziantep" b_tall_bashir:0 "İslahiye" - c_harran:0 "Harran" - c_harran_adj:0 "Harran" - b_harran:0 "Harran" + b_harran:0 "Akçakale" b_saruj:0 "Suruç" c_amida:0 "Diyarbakır" - c_amida_adj:0 "Diyarbakır" + c_amida_adj:0 "Diyarbakırlı" b_amid:0 "Diyarbakır" b_zermion:0 "Çermik" - b_as-suwaida:0 "Siverek" - b_tall_mauzan:0 "Viranşehir" + b_as-suwaida:0 "Ergani" + b_tall_mauzan:0 "Siverek" d_mesopotamia:0 "Erzurum" d_mesopotamia_adj:0 "Erzurumlu" c_theodosiopolis:0 "Erzurum" @@ -27331,18 +27303,17 @@ b_baeberdon:0 "Bayburt" b_keltzine:0 "Erzincan" b_tortomi:0 "Oltu" - c_mayyafariqin:0 "Silvan" - c_mayyafariqin_adj:0 "Silvan" + c_siverek:0 "Siverek" + c_siverek_adj:0 "Siverekli" + c_mayyafariqin:0 "Bismil" + c_mayyafariqin_adj:0 "Bismilli" b_mayyafariqin:0 "Silvan" b_tall_fafan:0 "Fafan" b_arzan:0 "Erzen" - b_nasriye:0 "Nasriye" - c_bakriya:0 "Hani" - c_bakriya_adj:0 "Hani" + b_nasriye:0 "Bismil" b_hani:0 "Arıcak" b_hisn_di-l-qarnain:0 "Bingöl" b_qulb:0 "Solhan" - b_erkne:0 "Ergani" b_shimshat:0 "Baskil" c_turuberan:0 "Muş" c_turuberan_adj:0 "Muş" @@ -27356,7 +27327,7 @@ b_melitene:0 "Malatya" b_arguvan:0 "Hekimhan" b_arsamosata:0 "Elazığ" - b_arca:0 "Akçadağ" + b_arca:0 "Hilvan" c_mesopotamia:0 "Bingöl" c_mesopotamia_adj:0 "Bingöllü" b_tzimisca:0 "Pertek" diff --git a/map_data/geographical_regions/geographical_region.txt b/map_data/geographical_regions/geographical_region.txt index 5a23fe9bb..5092d9cc5 100644 --- a/map_data/geographical_regions/geographical_region.txt +++ b/map_data/geographical_regions/geographical_region.txt @@ -249,7 +249,7 @@ world_asia_minor = { world_middle_east_jerusalem = { duchies = { #Syria - d_damascus d_aleppo d_antioch d_edessa d_homs d_lebanon d_palmyra + d_damascus d_aleppo d_antioch d_homs d_lebanon d_palmyra #Jerusalem d_oultrejourdain d_palestine d_urdunn } @@ -1574,7 +1574,7 @@ custom_theodosian_ere = { # Cyprus d_cyprus # Edessa - d_edessa d_diyarmudar d_palmyra + d_diyarmudar d_palmyra # Jerusalem d_amman # Arabia @@ -1604,7 +1604,7 @@ custom_outremer = { #Borders of Egypt d_sinai #Syria - d_damascus d_aleppo d_antioch d_edessa d_homs d_lebanon d_palmyra + d_damascus d_aleppo d_antioch d_homs d_lebanon d_palmyra #Jerusalem d_oultrejourdain d_palestine d_urdunn } @@ -1827,7 +1827,7 @@ custom_greater_armenia = { #Cilicia d_cilicia d_hatay #Syria - d_edessa d_antioch + d_antioch } } @@ -2066,7 +2066,7 @@ custom_polabia = { custom_beth_nahrain = { duchies = { #Syria - d_damascus d_aleppo d_antioch d_edessa d_homs d_lebanon d_palmyra + d_damascus d_aleppo d_antioch d_homs d_lebanon d_palmyra #Jerusalem d_oultrejourdain d_palestine d_urdunn #Jazira @@ -2272,7 +2272,7 @@ world_horse_buildings_in_hills_and_mountains = { #Wallachia d_oltenia d_muntenia d_transylvanian_alps d_moldova d_bugeac d_bukovina - d_medapata d_edessa d_oultrejourdain + d_medapata d_oultrejourdain } regions = { world_africa_north world_africa_sahara world_steppe_east world_steppe_tarim world_middle_east_persia world_middle_east_arabia world_europe_west_iberia @@ -2603,7 +2603,7 @@ special_mongol_empire_conquest_region_bonus = { d_lubusz d_lesser_poland d_wielkopolska d_mazovia d_podlachia d_lubelia d_upper_silesia d_lower_silesia d_imperial_silesia d_kuyavia #k_syria - d_aleppo d_edessa d_homs d_antioch d_lebanon d_damascus d_palmyra + d_aleppo d_homs d_antioch d_lebanon d_damascus d_palmyra #North India #k_delhi @@ -2945,7 +2945,7 @@ ghw_region_near_east = { #Mesopotamia d_samarra d_kurdistan d_wasit d_kufa d_basra d_baghdad #Northern Syria - d_aleppo d_edessa d_homs d_antioch d_palmyra + d_aleppo d_homs d_antioch d_palmyra } } ghw_region_mediterranean = { @@ -5008,7 +5008,7 @@ dlc_tgp_silk_road_route_occident = { tgp_silk_road_occident_region = { duchies = { d_aegean_islands d_ephese d_kutahya d_opsikion d_cilicia d_hatay d_cibyrrhaeot d_anatolia d_thracesia d_optimatoi d_bucellaria d_paphlagonia d_armeniac d_sebasteia d_charsianon d_cappadocia d_ankara d_chaldia d_mesopotamia d_malatya d_vaspurakan d_greater_armenia d_tao-klarjeti d_abkhazia d_georgia d_shirvan # Anatolia - d_damascus d_aleppo d_antioch d_edessa d_homs d_lebanon d_palmyra d_palestine d_urdunn # Jerusalem + d_damascus d_aleppo d_antioch d_homs d_lebanon d_palmyra d_palestine d_urdunn # Jerusalem d_daylam d_tabaristan d_gurgan d_azerbaijan # Daylam d_isfahan d_kirman d_yazd d_rayy d_hamadan d_fars d_hormuz d_khuzestan d_kermanshah # Persia d_samarra d_kurdistan d_wasit d_kufa d_basra d_baghdad # Mesopotamia @@ -5693,7 +5693,7 @@ arab_nomad_area = { #Yemen d_sanaa d_jawf-al-yamani d_taizz d_hadramawt d_mahra d_socotra #Syria - d_damascus d_aleppo d_antioch d_edessa d_homs d_lebanon d_palmyra + d_damascus d_aleppo d_antioch d_homs d_lebanon d_palmyra #Jerusalem d_oultrejourdain d_palestine d_urdunn } diff --git a/map_data/provinces.png b/map_data/provinces.png index f07ff528e..eaf7d1202 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:a938c6001577541e80745d6982ba91de2e2d831a873e001293c4f83d6e36e2f3 -size 2681157 +oid sha256:1cab29204e2cb99bbe0828e38373034c3a24d9fb47c89bf703e8e577ba3c6a4f +size 2682016