diff --git a/common/artifacts/templates/NEOW_templates.txt b/common/artifacts/templates/NEOW_templates.txt index a6caf48ca..4e85401eb 100644 --- a/common/artifacts/templates/NEOW_templates.txt +++ b/common/artifacts/templates/NEOW_templates.txt @@ -95,3 +95,26 @@ pearl_crown_template = { unique = yes } + +st_edwards_crown_template = { + can_equip = { + always = yes + } + + can_benefit = { + OR = { + culture = { + has_cultural_pillar = heritage_brythonic + has_cultural_pillar = heritage_scottish + has_cultural_pillar = heritage_anglo_frisian + } + has_title = title:e_britannia + } + } + + fallback = { + monthly_prestige = 1 + } + + unique = yes +} diff --git a/common/artifacts/visuals/00_personal_misc.txt b/common/artifacts/visuals/00_personal_misc.txt index 1f0d3ff8a..5e2734edc 100644 --- a/common/artifacts/visuals/00_personal_misc.txt +++ b/common/artifacts/visuals/00_personal_misc.txt @@ -474,6 +474,18 @@ crown = { } reference = female_headgear_neow_eastern_royalty_01_entity } + asset = { + trigger = { + has_variable = st_edwards_crown + } + reference = male_headgear_neow_western_royalty_01_entity + } + asset = { + trigger = { + has_variable = st_edwards_crown + } + reference = female_headgear_neow_western_royalty_01_entity + } } armor = { diff --git a/common/artifacts/visuals/NEOW_artifacts_visuals.txt b/common/artifacts/visuals/NEOW_artifacts_visuals.txt index d523f631d..0453f05d6 100644 --- a/common/artifacts/visuals/NEOW_artifacts_visuals.txt +++ b/common/artifacts/visuals/NEOW_artifacts_visuals.txt @@ -18,4 +18,10 @@ pearl_crown = { icon = "artefact_icons_unique_artifact_neow_pearl_crown.dds" asset = male_headgear_neow_eastern_royalty_01_artifact_entity pedestal = "tall_pillow" +} + +st_edwards_crown = { + icon = "artefact_icons_unique_artifact_neow_st_edwards_crown.dds" + asset = male_headgear_neow_western_royalty_01_artifact_entity + pedestal = "tall_pillow" } \ No newline at end of file diff --git a/common/culture/name_equivalency/00_NEOW_male_names.txt b/common/culture/name_equivalency/00_NEOW_male_names.txt index fb6a9c4cf..f8d15a736 100644 --- a/common/culture/name_equivalency/00_NEOW_male_names.txt +++ b/common/culture/name_equivalency/00_NEOW_male_names.txt @@ -330,7 +330,7 @@ ekkehard_male = { Echard Eckehard Eckhard Eckart Eicke Eike Ekkehard Eyke } eleazar_male = { _E_act_li_e_act_zer Eleazar Elizar } eleutherius_male = { Elefth_e_act_rios Eleut_e_act_rio Eleuterio Lefter Lifteri } eligius_male = { Aloi Aloizo El_o_act_i Eligijus Elixio Eloi Eloy } -elijah_male = { _E_act_lias _E_act_lie _I_dot_lyas Eelis El_i_act_as El_i_grv_o Eli_a_act__s_crn_ Elies Elia Elias Eliaz Eliyahu I_l_crn_ja Il_c_crn_o Il_i_act_as Il_pst_iya Il_pst_yas Ilaz Ilia Ilian Ilie Iliias Iliya Ilija Ilja Iljas Iljaz Ilya Ilyas Ilyes Lyes } +elijah_male = { _E_act_lias _E_act_lie _I_dot_lyas Eelis El_i_act_as El_i_grv_o Eli_a_act__s_crn_ Elies Elia Elias Eliaz Elie Eliyahu I_l_crn_ja Il_c_crn_o Il_i_act_as Il_pst_iya Il_pst_yas Ilaz Ilia Ilian Ilie Iliias Iliya Ilija Ilja Iljas Iljaz Ilya Ilyas Ilyes Lyes } elio_male = { _E_act_lio Elio Elios } eliseus_male = { El_i_act_sio Eliseo Eliseu Elisey Yelisey } elliot_male = { Eliot Eliott Elliot Ellioth Elliott Ellyot Elywt } diff --git a/common/culture/name_lists/NEOW_maronite.txt b/common/culture/name_lists/NEOW_maronite.txt index ca9f0f635..c1c76c834 100644 --- a/common/culture/name_lists/NEOW_maronite.txt +++ b/common/culture/name_lists/NEOW_maronite.txt @@ -33,8 +33,18 @@ "dynn_Chehab" "dynn_Chedid" "dynn_Chemali" + "dynn_Chihane" + "dynn_Debs" + "dynn_Dergham" + "dynn_Doueihi" + "dynn_Doumith" + "dynn_Eid" + "dynn_El_dsh_Hachem" "dynn_El_dsh_Hajj" + "dynn_El_dsh_Sayah" "dynn_El_dsh_Warcha" + "dynn_Faddoul" + "dynn_Farah" "dynn_Harb" "dynn_Hayek" "dynn_Jalakh" @@ -54,23 +64,23 @@ _E_act_mile Abdallah Alain Antoine Antoun Assaad Augustin Bechara Boulos Boutros - Chamel Charbel Choukrallah + Chamel Charbel Choukrallah Christophe Dany Dory - Elias + Elias Elie Estefan Fadi Fouad Fran_c_ced_ois Francis Gaby Gebran Gennadios Georges Ghassan Ghattas Guy-Paul Habib Hamid Hanna_male Jawad Jihad Kamil_Camillus Khalil Louis - Mansour Mario Maroun Maurice Michel Mohsen Mounir + Mansour Mario Maroun Maurice Michel Mohsen Mounged Mounir Moussa Nabil Nadim Najib Nasser Nematallah Nicolas Nimr Paul Philippe Pierre Rafik Rami Raymond Ren_e_act_ Richard Roger Roland Sami Samir Selim Simon Sleiman Tarek Tobia Youhanna Youssef - Zakaria + Zakaria Zakhia } female_names = { Andr_e_act_e diff --git a/common/decisions/major_decisions_NEOW.txt b/common/decisions/major_decisions_NEOW.txt index 725540aae..e2569df6d 100644 --- a/common/decisions/major_decisions_NEOW.txt +++ b/common/decisions/major_decisions_NEOW.txt @@ -35,7 +35,7 @@ restore_european_union_decision = { culture = { has_cultural_pillar = heritage_greek } culture = { has_cultural_pillar = heritage_rhaeto_helvetic } culture = { has_cultural_pillar = heritage_cisalpine } - culture = { has_cultural_pillar = heritage_anglo_saxon } + culture = { has_cultural_pillar = heritage_anglo_frisian } culture = { has_cultural_pillar = heritage_hungarian } culture = { has_cultural_pillar = heritage_balto_finnic } } diff --git a/common/genes/06_genes_special_accessories_headgear.txt b/common/genes/06_genes_special_accessories_headgear.txt index 92a6dc607..706264fdd 100644 --- a/common/genes/06_genes_special_accessories_headgear.txt +++ b/common/genes/06_genes_special_accessories_headgear.txt @@ -211,6 +211,7 @@ special_genes = { #N3OW 1 = male_headgear_neow_eastern_royalty_01 + 1 = male_headgear_neow_western_royalty_01 } female = { @@ -392,7 +393,11 @@ special_genes = { 1 = f_headgear_ccp9_tan_nob_01 1 = f_headgear_ccp9_tan_roy_01 1 = f_headgear_ccp9_jur_nob_01 - 1 = f_headgear_ccp9_min_nob_01 + 1 = f_headgear_ccp9_min_nob_01 + + #N3OW + 1 = female_headgear_neow_eastern_royalty_01 + 1 = female_headgear_neow_western_royalty_01 } boy = male @@ -3794,6 +3799,18 @@ special_genes = { boy = male girl = female } + + neow_western_royalty_01 = { + index = 234 + male = { + 1 = male_headgear_neow_western_royalty_01 + } + female = { + 1 = female_headgear_neow_western_royalty_01 + } + boy = male + girl = female + } } diff --git a/common/genes/07_genes_special_accessories_misc.txt b/common/genes/07_genes_special_accessories_misc.txt index bd4910601..cef3f4b6a 100644 --- a/common/genes/07_genes_special_accessories_misc.txt +++ b/common/genes/07_genes_special_accessories_misc.txt @@ -1747,6 +1747,15 @@ props_left = { boy = male girl = female } + coronation_crown_britannia_imperial_gene = { + index = 111 + male = { + 1 = coronation_crown_britannia_imperial + } + female = male + boy = male + girl = female + } } ##################################### diff --git a/common/landed_titles/turkey.txt b/common/landed_titles/turkey.txt index 68bf0e084..d07bbd148 100644 --- a/common/landed_titles/turkey.txt +++ b/common/landed_titles/turkey.txt @@ -611,7 +611,6 @@ e_turky = { } } } - k_anatolia = { color = { 119 197 216 } @@ -725,18 +724,6 @@ e_turky = { b_kandara = { # Şabanözü province = 5586 color = { 185 105 140 } - } - b_pimolisa = { - province = 5593 - - color = { 195 100 165 } - - cultural_names = { - name_list_NEOW_griko = cn_pimolisa - name_list_NEOW_greek = cn_pimolisa - name_list_NEOW_cypriot = cn_pimolisa - name_list_NEOW_greco_turkish = cn_pimolisa - } } } c_phrygia = { # Eskişehir @@ -1231,10 +1218,9 @@ e_turky = { } } } - d_charsianon = { + d_charsianon = { # Kayseri color = { 215 120 85 } - - capital = c_charsianon + capital = c_kaisereia # Kayseri cultural_names = { name_list_NEOW_griko = cn_charsianon @@ -1243,66 +1229,73 @@ e_turky = { name_list_NEOW_greco_turkish = cn_charsianon } - c_charsianon = { - color = { 205 140 95 } + c_kaisereia = { # Kayseri + color = { 195 118 65 } cultural_names = { - name_list_NEOW_griko = cn_charsianon - name_list_NEOW_greek = cn_charsianon - name_list_NEOW_cypriot = cn_charsianon - name_list_NEOW_greco_turkish = cn_charsianon + name_list_NEOW_griko = cn_kaisereia + name_list_NEOW_greek = cn_kaisereia + name_list_NEOW_cypriot = cn_kaisereia + name_list_NEOW_greco_turkish = cn_kaisereia } - b_charsianon = { - province = 5617 - - color = { 205 130 85 } + b_kaisereia = { # Kayseri + province = 737 + color = { 195 118 65 } cultural_names = { - name_list_NEOW_griko = cn_charsianon - name_list_NEOW_greek = cn_charsianon - name_list_NEOW_cypriot = cn_charsianon - name_list_NEOW_greco_turkish = cn_charsianon + name_list_NEOW_griko = cn_kaisereia + name_list_NEOW_greek = cn_kaisereia + name_list_NEOW_cypriot = cn_kaisereia + name_list_NEOW_greco_turkish = cn_kaisereia } } - b_therma = { - province = 5618 - - color = { 205 130 85 } + b_herpha = { # Develi + province = 5615 + color = { 195 118 65 } cultural_names = { - name_list_NEOW_griko = cn_therma - name_list_NEOW_greek = cn_therma - name_list_NEOW_cypriot = cn_therma - name_list_NEOW_greco_turkish = cn_therma + name_list_NEOW_griko = cn_herpha + name_list_NEOW_greek = cn_herpha + name_list_NEOW_cypriot = cn_herpha + name_list_NEOW_greco_turkish = cn_herpha } } - b_agranai = { - province = 5600 - - color = { 195 135 145 } + b_arasaxa = { # Yahyalı + province = 5616 + color = { 205 118 118 } cultural_names = { - name_list_NEOW_griko = cn_agranai - name_list_NEOW_greek = cn_agranai - name_list_NEOW_cypriot = cn_agranai - name_list_NEOW_greco_turkish = cn_agranai + name_list_NEOW_griko = cn_arasaxa + name_list_NEOW_greek = cn_arasaxa + name_list_NEOW_cypriot = cn_arasaxa + name_list_NEOW_greco_turkish = cn_arasaxa } - } - b_euaissa = { - province = 5621 - - color = { 205 130 85 } + } + b_armaxa = { # Bünyan + province = 5614 + color = { 195 118 65 } cultural_names = { - name_list_NEOW_griko = cn_euaissa - name_list_NEOW_greek = cn_euaissa - name_list_NEOW_cypriot = cn_euaissa - name_list_NEOW_greco_turkish = cn_euaissa + name_list_NEOW_griko = cn_armaxa + name_list_NEOW_greek = cn_armaxa + name_list_NEOW_cypriot = cn_armaxa + name_list_NEOW_greco_turkish = cn_armaxa + } + } + b_dasmenda = { # Pınarbaşı + province = 5613 + color = { 195 170 65 } + + cultural_names = { + name_list_NEOW_griko = cn_dasmenda + name_list_NEOW_greek = cn_dasmenda + name_list_NEOW_cypriot = cn_dasmenda + name_list_NEOW_greco_turkish = cn_dasmenda } } } - c_euchaita = { + c_euchaita = { # Çorum color = { 195 100 165 } cultural_names = { @@ -1312,21 +1305,8 @@ e_turky = { name_list_NEOW_greco_turkish = cn_euchaita } - b_euchaita = { - province = 5594 - - color = { 195 100 165 } - - cultural_names = { - name_list_NEOW_griko = cn_euchaita - name_list_NEOW_greek = cn_euchaita - name_list_NEOW_cypriot = cn_euchaita - name_list_NEOW_greco_turkish = cn_euchaita - } - } - b_carissa = { + b_carissa = { # Çorum province = 5595 - color = { 150 130 180 } cultural_names = { @@ -1335,31 +1315,8 @@ e_turky = { name_list_NEOW_cypriot = cn_carissa name_list_NEOW_greco_turkish = cn_carissa } - } - b_pteria = { - province = 5596 - - color = { 195 100 165 } - - cultural_names = { - name_list_NEOW_griko = cn_pteria - name_list_NEOW_greek = cn_pteria - name_list_NEOW_cypriot = cn_pteria - name_list_NEOW_greco_turkish = cn_pteria - } } - } - c_cappadocia = { - color = { 210 87 52 } - - cultural_names = { - name_list_NEOW_griko = cn_kappadokia - name_list_NEOW_greek = cn_kappadokia - name_list_NEOW_cypriot = cn_kappadokia - name_list_NEOW_greco_turkish = cn_kappadokia - } - - b_tabia = { + b_tabia = { # Sungurlu province = 5683 color = { 210 25 120 } @@ -1370,105 +1327,96 @@ e_turky = { name_list_NEOW_greco_turkish = cn_tabia } } + b_pimolisa = { # Osmancık + province = 5593 + color = { 195 100 165 } + + cultural_names = { + name_list_NEOW_griko = cn_pimolisa + name_list_NEOW_greek = cn_pimolisa + name_list_NEOW_cypriot = cn_pimolisa + name_list_NEOW_greco_turkish = cn_pimolisa + } + } + b_euchaita = { # Alaca + province = 5594 + color = { 195 100 165 } + + cultural_names = { + name_list_NEOW_griko = cn_euchaita + name_list_NEOW_greek = cn_euchaita + name_list_NEOW_cypriot = cn_euchaita + name_list_NEOW_greco_turkish = cn_euchaita + } + } + b_pteria = { # İskilip + province = 5596 + color = { 195 100 165 } + + cultural_names = { + name_list_NEOW_griko = cn_pteria + name_list_NEOW_greek = cn_pteria + name_list_NEOW_cypriot = cn_pteria + name_list_NEOW_greco_turkish = cn_pteria + } + } } - c_kaisereia = { - color = { 195 118 65 } + c_charsianon = { # Yozgat + color = { 205 140 95 } cultural_names = { - name_list_NEOW_griko = cn_kaisereia - name_list_NEOW_greek = cn_kaisereia - name_list_NEOW_cypriot = cn_kaisereia - name_list_NEOW_greco_turkish = cn_kaisereia + name_list_NEOW_griko = cn_charsianon + name_list_NEOW_greek = cn_charsianon + name_list_NEOW_cypriot = cn_charsianon + name_list_NEOW_greco_turkish = cn_charsianon } - b_kaisereia = { - province = 737 - - color = { 195 118 65 } + b_therma = { # Yozgat + province = 5618 + color = { 205 130 85 } cultural_names = { - name_list_NEOW_griko = cn_kaisereia - name_list_NEOW_greek = cn_kaisereia - name_list_NEOW_cypriot = cn_kaisereia - name_list_NEOW_greco_turkish = cn_kaisereia - } - } - b_armaxa = { - province = 5614 - - color = { 195 118 65 } - - cultural_names = { - name_list_NEOW_griko = cn_armaxa - name_list_NEOW_greek = cn_armaxa - name_list_NEOW_cypriot = cn_armaxa - name_list_NEOW_greco_turkish = cn_armaxa + name_list_NEOW_griko = cn_therma + name_list_NEOW_greek = cn_therma + name_list_NEOW_cypriot = cn_therma + name_list_NEOW_greco_turkish = cn_therma } } - b_herpha = { - province = 5615 - - color = { 195 118 65 } + b_agranai = { # Sorgun + province = 5600 + color = { 195 135 145 } cultural_names = { - name_list_NEOW_griko = cn_herpha - name_list_NEOW_greek = cn_herpha - name_list_NEOW_cypriot = cn_herpha - name_list_NEOW_greco_turkish = cn_herpha + name_list_NEOW_griko = cn_agranai + name_list_NEOW_greek = cn_agranai + name_list_NEOW_cypriot = cn_agranai + name_list_NEOW_greco_turkish = cn_agranai } - } - b_dasmenda = { - province = 5613 - - color = { 195 170 65 } + } + b_charsianon = { # Akdağmadeni + province = 5617 + color = { 205 130 85 } cultural_names = { - name_list_NEOW_griko = cn_dasmenda - name_list_NEOW_greek = cn_dasmenda - name_list_NEOW_cypriot = cn_dasmenda - name_list_NEOW_greco_turkish = cn_dasmenda + name_list_NEOW_griko = cn_charsianon + name_list_NEOW_greek = cn_charsianon + name_list_NEOW_cypriot = cn_charsianon + name_list_NEOW_greco_turkish = cn_charsianon } - } - } - } - - d_sebasteia = { - color = { 197 157 76 } - - capital = c_sebasteia - - cultural_names = { - name_list_NEOW_griko = cn_sebasteia - name_list_NEOW_greek = cn_sebasteia - name_list_NEOW_cypriot = cn_sebasteia - name_list_NEOW_greco_turkish = cn_sebasteia - } - - c_sebasteia = { - color = { 197 157 76 } - - cultural_names = { - name_list_NEOW_griko = cn_sebasteia - name_list_NEOW_greek = cn_sebasteia - name_list_NEOW_cypriot = cn_sebasteia - name_list_NEOW_greco_turkish = cn_sebasteia } - - b_sebasteia = { - province = 5602 - - color = { 197 157 76 } + b_euaissa = { # Boğazlıyan + province = 5621 + color = { 205 130 85 } cultural_names = { - name_list_NEOW_griko = cn_sebasteia - name_list_NEOW_greek = cn_sebasteia - name_list_NEOW_cypriot = cn_sebasteia - name_list_NEOW_greco_turkish = cn_sebasteia + name_list_NEOW_griko = cn_euaissa + name_list_NEOW_greek = cn_euaissa + name_list_NEOW_cypriot = cn_euaissa + name_list_NEOW_greco_turkish = cn_euaissa } } - b_malandra = { + b_malandra = { # Sarıkaya province = 5603 - color = { 197 157 76 } cultural_names = { @@ -1478,21 +1426,42 @@ e_turky = { name_list_NEOW_greco_turkish = cn_malandra } } - b_nicopolis_ARM = { - province = 5701 + } + } + d_sebasteia = { # Sivas + color = { 197 157 76 } + capital = c_sebasteia # Sivas - color = { 136 116 40 } + cultural_names = { + name_list_NEOW_griko = cn_sebasteia + name_list_NEOW_greek = cn_sebasteia + name_list_NEOW_cypriot = cn_sebasteia + name_list_NEOW_greco_turkish = cn_sebasteia + } + + c_sebasteia = { # Sivas + color = { 197 157 76 } + + cultural_names = { + name_list_NEOW_griko = cn_sebasteia + name_list_NEOW_greek = cn_sebasteia + name_list_NEOW_cypriot = cn_sebasteia + name_list_NEOW_greco_turkish = cn_sebasteia + } + + b_sebasteia = { # Sivas + province = 5602 + color = { 197 157 76 } cultural_names = { - name_list_NEOW_griko = cn_nicopolis_ARM - name_list_NEOW_greek = cn_nicopolis_ARM - name_list_NEOW_cypriot = cn_nicopolis_ARM - name_list_NEOW_greco_turkish = cn_nicopolis_ARM + name_list_NEOW_griko = cn_sebasteia + name_list_NEOW_greek = cn_sebasteia + name_list_NEOW_cypriot = cn_sebasteia + name_list_NEOW_greco_turkish = cn_sebasteia } } - b_sebastopolis = { + b_sebastopolis = { # Yıldızeli province = 5599 - color = { 197 157 76 } cultural_names = { @@ -1502,9 +1471,19 @@ e_turky = { name_list_NEOW_greco_turkish = cn_sebastopolis } } - b_pedachtoe = { - province = 5601 + b_nicopolis_ARM = { # Suşehri + province = 5701 + color = { 136 116 40 } + cultural_names = { + name_list_NEOW_griko = cn_nicopolis_ARM + name_list_NEOW_greek = cn_nicopolis_ARM + name_list_NEOW_cypriot = cn_nicopolis_ARM + name_list_NEOW_greco_turkish = cn_nicopolis_ARM + } + } + b_pedachtoe = { # Zara + province = 5601 color = { 197 157 76 } cultural_names = { @@ -1514,32 +1493,9 @@ e_turky = { name_list_NEOW_greco_turkish = cn_pedachtoe } } - b_kamisa = { - - cultural_names = { - name_list_NEOW_griko = cn_kamisa - name_list_NEOW_greek = cn_kamisa - name_list_NEOW_cypriot = cn_kamisa - name_list_NEOW_greco_turkish = cn_kamisa - } - province = 5704 - - color = { 170 155 56 } - } - b_tephrice = { - - cultural_names = { - name_list_NEOW_griko = cn_tephrice - name_list_NEOW_greek = cn_tephrice - name_list_NEOW_cypriot = cn_tephrice - name_list_NEOW_greco_turkish = cn_tephrice - } - province = 5705 - - color = { 170 155 56 } - } } c_azysia = { + color = { 195 170 65 } cultural_names = { name_list_NEOW_griko = cn_azysia @@ -1547,11 +1503,9 @@ e_turky = { name_list_NEOW_cypriot = cn_azysia name_list_NEOW_greco_turkish = cn_azysia } - color = { 195 170 65 } - b_karnalis = { + b_karnalis = { # Şarkışla province = 5604 - color = { 195 170 65 } cultural_names = { @@ -1561,9 +1515,8 @@ e_turky = { name_list_NEOW_greco_turkish = cn_karnalis } } - b_euspena = { + b_euspena = { # Kangal province = 5605 - color = { 195 170 65 } cultural_names = { @@ -1573,9 +1526,8 @@ e_turky = { name_list_NEOW_greco_turkish = cn_euspena } } - b_gauraina = { + b_gauraina = { # Gürün province = 5606 - color = { 195 170 65 } cultural_names = { @@ -1585,10 +1537,31 @@ e_turky = { name_list_NEOW_greco_turkish = cn_gauraina } } + b_tephrice = { # Divriği + province = 5705 + color = { 170 155 56 } + + cultural_names = { + name_list_NEOW_griko = cn_tephrice + name_list_NEOW_greek = cn_tephrice + name_list_NEOW_cypriot = cn_tephrice + name_list_NEOW_greco_turkish = cn_tephrice + } + } + b_kamisa = { # Ulaş + province = 5704 + color = { 170 155 56 } + + cultural_names = { + name_list_NEOW_griko = cn_kamisa + name_list_NEOW_greek = cn_kamisa + name_list_NEOW_cypriot = cn_kamisa + name_list_NEOW_greco_turkish = cn_kamisa + } + } } } } - k_pontus = { cultural_names = { @@ -2641,19 +2614,7 @@ e_turky = { name_list_NEOW_cypriot = cn_podandus name_list_NEOW_greco_turkish = cn_podandus } - } - b_arasaxa = { - province = 5616 - - color = { 205 118 118 } - - cultural_names = { - name_list_NEOW_griko = cn_arasaxa - name_list_NEOW_greek = cn_arasaxa - name_list_NEOW_cypriot = cn_arasaxa - name_list_NEOW_greco_turkish = cn_arasaxa - } - } + } } c_ablastha = { diff --git a/common/modifiers/NEOW_historical_artifact_modifiers.txt b/common/modifiers/NEOW_historical_artifact_modifiers.txt index 97e6e974b..64857b239 100644 --- a/common/modifiers/NEOW_historical_artifact_modifiers.txt +++ b/common/modifiers/NEOW_historical_artifact_modifiers.txt @@ -52,4 +52,12 @@ pearl_crown_modifier = { monthly_prestige_gain_mult = 0.05 learning_per_piety_level = 1 same_faith_opinion = 15 +} + +st_edwards_crown_modifier = { + court_grandeur_baseline_add = 4 + monthly_dynasty_prestige_mult = 0.05 + vassal_limit = 10 + domain_limit = 1 + naval_movement_speed_mult = 0.15 } \ No newline at end of file diff --git a/common/religion/religion_types/NEOW_uralic.txt b/common/religion/religion_types/NEOW_uralic.txt index d1958d2d7..92881ce73 100644 --- a/common/religion/religion_types/NEOW_uralic.txt +++ b/common/religion/religion_types/NEOW_uralic.txt @@ -304,7 +304,7 @@ uralic_religion = { #placeholder doctrine = clerical_succession_temporal_appointment } udmurt_pagan = { - color = { 153 61 30 } + color = { 140 50 28 } icon = udmurt reformed_icon = udmurt @@ -332,6 +332,35 @@ uralic_religion = { #placeholder doctrine = doctrine_pluralism_pluralistic doctrine = clerical_succession_temporal_appointment } + chuvash_pagan = { + color = { 216 155 32 } + icon = chuvash + reformed_icon = chuvash + + holy_site = turku + holy_site = helsinki + holy_site = oulu + holy_site = sammallahdenmaki + holy_site = ukko + holy_site = sortavala + + #Special Doctrine + doctrine = special_doctrine_old_lore + + #Tenets + doctrine = tenet_ritual_celebrations + doctrine = tenet_wandering_bards + doctrine_selection_pair = { + requires_dlc_flag = all_under_heaven + doctrine = tenet_takamin + fallback_doctrine = tenet_ancestor_worship + } + + doctrine = doctrine_pilgrimage_local_rites + doctrine = unreformed_faith_doctrine + doctrine = doctrine_pluralism_pluralistic + doctrine = clerical_succession_temporal_appointment + } malachite = { color = { 17 114 80 } icon = malachite diff --git a/common/scripted_effects/NEOW_historical_artifacts_creation_effect.txt b/common/scripted_effects/NEOW_historical_artifacts_creation_effect.txt index f30572dbc..981d8cc0c 100644 --- a/common/scripted_effects/NEOW_historical_artifacts_creation_effect.txt +++ b/common/scripted_effects/NEOW_historical_artifacts_creation_effect.txt @@ -240,4 +240,46 @@ create_artifact_pearl_crown_effect = { value = yes } } +} + +create_artifact_st_edwards_crown_effect = { + # Get the character the artifact is being made for. + $OWNER$ = { save_scope_as = owner } + # Not really used, but if we don't set the scopes we get errors in the feature selection + set_artifact_rarity_illustrious = yes + create_artifact = { + name = artifact_st_edwards_crown_name + description = artifact_st_edwards_crown_description + type = helmet + visuals = st_edwards_crown + wealth = scope:wealth + quality = scope:quality + history = { + type = created_before_history + } + modifier = st_edwards_crown_modifier + save_scope_as = newly_created_artifact + decaying = no + } + scope:newly_created_artifact = { + set_variable = { name = historical_unique_artifact value = yes } + set_variable = st_edwards_crown + set_variable = { + name = portrait_remains_after_death + value = yes + } + set_variable = { + name = artifact_succession_title + value = title:e_britannia + } + add_artifact_title_history = { + target = title:e_britannia + date = 2212.1.1 + } + save_scope_as = epic + save_scope_value_as = { + name = st_edwards_crown + value = yes + } + } } \ No newline at end of file diff --git a/common/scripted_effects/NEOW_scripted_effects.txt b/common/scripted_effects/NEOW_scripted_effects.txt index e6aa0c681..e1931b58d 100644 --- a/common/scripted_effects/NEOW_scripted_effects.txt +++ b/common/scripted_effects/NEOW_scripted_effects.txt @@ -33,4 +33,18 @@ artifact_visual_after_death_dead_character_flag_effect = { debug_log = "Nistrenian Crown Dead Character Flag Set" } } + else_if = { + limit = { + scope:dead_artifact_visual_heir = { + has_character_flag = st_edwards_crown + } + } + scope:dead_ruler = { + add_dead_character_flag = { + flag = st_edwards_crown_wearer_dead + years = 400 + } + debug_log = "British Crown Dead Character Flag Set" + } + } } \ No newline at end of file diff --git a/common/scripted_triggers/00_clothing_triggers.txt b/common/scripted_triggers/00_clothing_triggers.txt index 5bd880332..207f94470 100644 --- a/common/scripted_triggers/00_clothing_triggers.txt +++ b/common/scripted_triggers/00_clothing_triggers.txt @@ -3378,4 +3378,16 @@ portrait_pearl_crown_trigger = { } } portrait_wear_no_crown_trigger = no +} + +portrait_st_edwards_crown_trigger = { + exists = this + OR = { + has_primary_title = title:e_britannia + has_dead_character_flag = st_edwards_crown_wearer_dead + any_equipped_character_artifact = { + has_variable = st_edwards_crown + } + } + portrait_wear_no_crown_trigger = no } \ No newline at end of file diff --git a/events/artifacts/NEOW_historical_artifacts_events.txt b/events/artifacts/NEOW_historical_artifacts_events.txt index 29bd278f9..0f708f644 100644 --- a/events/artifacts/NEOW_historical_artifacts_events.txt +++ b/events/artifacts/NEOW_historical_artifacts_events.txt @@ -59,5 +59,11 @@ historical_artifacts.999 = { equip_artifact_to_owner = yes } } + title:e_britannia.holder = { + create_artifact_st_edwards_crown_effect = { OWNER = this } + scope:newly_created_artifact = { + equip_artifact_to_owner = yes + } + } } } \ No newline at end of file diff --git a/gfx/interface/icons/artifact/artefact_icons_unique_artifact_neow_st_edwards_crown.dds b/gfx/interface/icons/artifact/artefact_icons_unique_artifact_neow_st_edwards_crown.dds new file mode 100644 index 000000000..4ce8b1c46 --- /dev/null +++ b/gfx/interface/icons/artifact/artefact_icons_unique_artifact_neow_st_edwards_crown.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3158be4acd79c9b2abc8f8b28bfe7e52e663cc6141514c98c16e1347142091fd +size 230528 diff --git a/gfx/interface/icons/faith/chuvash.dds b/gfx/interface/icons/faith/chuvash.dds new file mode 100644 index 000000000..1af5cfa80 --- /dev/null +++ b/gfx/interface/icons/faith/chuvash.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc9473466aa97ddf82ce7662a0b7002b93e192e95a1ea59424e48d615a6e0cc6 +size 40128 diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index 4f94c6579..85702cd2d 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -29,6 +29,12 @@ rotation={ -0.000000 -0.327320 -0.000000 0.944914 } scale={ 1.000000 1.000000 1.000000 } } + { + id=0 + position={ 2871.864502 0.000000 2326.454102 } + rotation={ -0.000000 0.241101 -0.000000 0.970500 } + scale={ 1.000000 1.000000 1.000000 } + } { id=1 position={ 258.331116 0.000000 4468.756836 } @@ -30403,25 +30409,25 @@ } { id=5593 - position={ 2886.328613 0.000000 2474.030518 } + position={ 2882.550293 0.000000 2480.124268 } rotation={ -0.000000 -0.588927 -0.000000 0.808186 } scale={ 1.000000 1.000000 1.000000 } } { id=5594 - position={ 2889.271484 0.000000 2452.720703 } + position={ 2892.929688 0.000000 2431.023438 } rotation={ -0.000000 0.339260 -0.000000 0.940693 } scale={ 1.000000 1.000000 1.000000 } } { id=5595 - position={ 2911.000000 0.000000 2457.000000 } + position={ 2915.371338 0.000000 2466.187500 } rotation={ -0.000000 0.249946 -0.000000 0.968260 } scale={ 1.000000 1.000000 1.000000 } } { id=5596 - position={ 2918.238770 0.000000 2427.491699 } + position={ 2871.759277 0.000000 2477.499023 } rotation={ -0.000000 0.355743 -0.000000 0.934584 } scale={ 1.000000 1.000000 1.000000 } } @@ -30439,49 +30445,49 @@ } { id=5599 - position={ 2982.582275 0.000000 2431.557861 } + position={ 2968.410645 0.000000 2418.156250 } rotation={ -0.000000 -0.552777 -0.000000 0.833329 } scale={ 1.000000 1.000000 1.000000 } } { id=5600 - position={ 2955.507568 0.000000 2404.293945 } + position={ 2927.291504 0.000000 2432.080078 } rotation={ -0.000000 0.434867 -0.000000 0.900495 } scale={ 1.000000 1.000000 1.000000 } } { id=5601 - position={ 3019.158203 0.000000 2434.830811 } + position={ 3021.447510 0.000000 2436.883301 } rotation={ -0.000000 -0.370018 -0.000000 0.929025 } scale={ 1.000000 1.000000 1.000000 } } { id=5602 - position={ 3026.420898 0.000000 2390.630859 } + position={ 3014.035156 0.000000 2429.260986 } rotation={ -0.000000 -0.400263 -0.000000 0.916400 } scale={ 1.000000 1.000000 1.000000 } } { id=5603 - position={ 2984.011719 0.000000 2374.118164 } + position={ 2946.637207 0.000000 2367.510254 } rotation={ -0.000000 -0.297753 -0.000000 0.954643 } scale={ 1.000000 1.000000 1.000000 } } { id=5604 - position={ 3012.191650 0.000000 2343.426270 } + position={ 2973.316895 0.000000 2374.746826 } rotation={ -0.000000 -0.398221 -0.000000 0.917290 } scale={ 1.000000 1.000000 1.000000 } } { id=5605 - position={ 3057.382080 0.000000 2363.988037 } + position={ 3018.766357 0.000000 2378.785156 } rotation={ -0.000000 -0.431566 -0.000000 0.902081 } scale={ 1.000000 1.000000 1.000000 } } { id=5606 - position={ 3039.247559 0.000000 2346.136719 } + position={ 3026.335693 0.000000 2363.053223 } rotation={ -0.000000 -0.429335 -0.000000 0.903145 } scale={ 1.000000 1.000000 1.000000 } } @@ -30523,37 +30529,37 @@ } { id=5613 - position={ 2987.084473 0.000000 2324.195801 } + position={ 2979.113037 0.000000 2321.692139 } rotation={ -0.000000 -0.434812 -0.000000 0.900521 } scale={ 1.000000 1.000000 1.000000 } } { id=5614 - position={ 2977.031982 0.000000 2365.610107 } + position={ 2976.735352 0.000000 2364.079834 } rotation={ -0.000000 -0.373644 -0.000000 0.927572 } scale={ 1.000000 1.000000 1.000000 } } { id=5615 - position={ 2955.879883 0.000000 2319.541992 } + position={ 2968.273438 0.000000 2327.428955 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=5616 - position={ 2947.076172 0.000000 2293.039062 } + position={ 2948.811035 0.000000 2287.599365 } rotation={ -0.000000 -0.203136 -0.000000 0.979151 } scale={ 1.000000 1.000000 1.000000 } } { id=5617 - position={ 2950.985107 0.000000 2381.830811 } + position={ 2938.877930 0.000000 2411.554443 } rotation={ -0.000000 0.265544 -0.000000 0.964099 } scale={ 1.000000 1.000000 1.000000 } } { id=5618 - position={ 2918.919189 0.000000 2394.303711 } + position={ 2889.485352 0.000000 2401.327393 } rotation={ -0.000000 -0.329654 -0.000000 0.944102 } scale={ 1.000000 1.000000 1.000000 } } @@ -30571,7 +30577,7 @@ } { id=5621 - position={ 2930.528076 0.000000 2372.989746 } + position={ 2903.113525 0.000000 2398.664307 } rotation={ -0.000000 0.116131 -0.000000 0.993234 } scale={ 1.000000 1.000000 1.000000 } } @@ -30635,12 +30641,6 @@ rotation={ -0.000000 -0.404259 -0.000000 0.914645 } scale={ 1.000000 1.000000 1.000000 } } - { - id=0 - position={ 2871.864502 0.000000 2326.454102 } - rotation={ -0.000000 0.241101 -0.000000 0.970500 } - scale={ 1.000000 1.000000 1.000000 } - } { id=5632 position={ 2871.864502 0.000000 2326.454102 } @@ -30949,7 +30949,7 @@ } { id=5683 - position={ 2882.726318 0.000000 2418.742188 } + position={ 2868.379150 0.000000 2435.102295 } rotation={ -0.000000 -0.367465 -0.000000 0.930037 } scale={ 1.000000 1.000000 1.000000 } } @@ -31033,7 +31033,7 @@ } { id=5701 - position={ 3049.796875 0.000000 2438.246338 } + position={ 3062.314697 0.000000 2433.938232 } rotation={ -0.000000 0.722009 -0.000000 0.691884 } scale={ 1.000000 1.000000 1.000000 } } @@ -31051,7 +31051,7 @@ } { id=5704 - position={ 3072.742188 0.000000 2416.043457 } + position={ 3023.187012 0.000000 2403.157471 } rotation={ -0.000000 -0.386628 -0.000000 0.922236 } 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 bbdbfc43a..c1f9d35b0 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -30379,26 +30379,26 @@ } { id=5593 - position={ 2879.559570 0.000000 2477.203125 } - rotation={ -0.000000 -0.911037 -0.000000 -0.412324 } + position={ 2893.117676 0.000000 2485.335449 } + rotation={ -0.000000 -0.564782 -0.000000 -0.825240 } scale={ 1.000000 1.000000 1.000000 } } { id=5594 - position={ 2897.077637 0.000000 2451.085449 } + position={ 2907.519287 0.000000 2438.551270 } rotation={ -0.000000 -0.598592 -0.000000 -0.801054 } scale={ 1.000000 1.000000 1.000000 } } { id=5595 - position={ 2916.898193 0.000000 2450.662109 } - rotation={ -0.000000 -0.999117 -0.000000 0.042010 } + position={ 2917.308838 0.000000 2456.278076 } + rotation={ -0.000000 -0.744250 -0.000000 -0.667901 } scale={ 1.000000 1.000000 1.000000 } } { id=5596 - position={ 2924.077637 0.000000 2421.085449 } - rotation={ -0.000000 -0.023064 -0.000000 -0.999734 } + position={ 2877.869873 0.000000 2464.536621 } + rotation={ -0.000000 0.669652 -0.000000 -0.742676 } scale={ 1.000000 1.000000 1.000000 } } { @@ -30415,49 +30415,49 @@ } { id=5599 - position={ 2984.077637 0.000000 2423.085449 } - rotation={ -0.000000 -0.876758 -0.000000 -0.480931 } + position={ 2979.767334 0.000000 2424.550049 } + rotation={ -0.000000 -0.425875 -0.000000 -0.904781 } scale={ 1.000000 1.000000 1.000000 } } { id=5600 - position={ 2964.077637 0.000000 2406.085449 } - rotation={ -0.000000 -0.987896 -0.000000 -0.155115 } + position={ 2911.164062 0.000000 2415.978516 } + rotation={ -0.000000 -0.953834 -0.000000 0.300332 } scale={ 1.000000 1.000000 1.000000 } } { id=5601 - position={ 3022.077637 0.000000 2428.085449 } - rotation={ -0.000000 -0.166961 -0.000000 0.985963 } + position={ 3034.985596 0.000000 2431.365723 } + rotation={ -0.000000 -0.715830 -0.000000 0.698274 } scale={ 1.000000 1.000000 1.000000 } } { id=5602 - position={ 3029.077637 0.000000 2398.085449 } - rotation={ -0.000000 -0.995615 -0.000000 -0.093541 } + position={ 3010.387695 0.000000 2420.215576 } + rotation={ -0.000000 -0.782681 -0.000000 -0.622422 } scale={ 1.000000 1.000000 1.000000 } } { id=5603 - position={ 2997.077637 0.000000 2383.085449 } - rotation={ -0.000000 -0.893221 -0.000000 -0.449617 } + position={ 2914.822510 0.000000 2383.074707 } + rotation={ -0.000000 -0.946627 -0.000000 0.322329 } scale={ 1.000000 1.000000 1.000000 } } { id=5604 - position={ 3002.077637 0.000000 2351.085449 } + position={ 2981.220459 0.000000 2379.022949 } rotation={ -0.000000 -0.348811 -0.000000 0.937193 } scale={ 1.000000 1.000000 1.000000 } } { id=5605 - position={ 3047.460693 0.000000 2371.337402 } + position={ 3031.537598 0.000000 2375.427734 } rotation={ -0.000000 -0.127582 -0.000000 -0.991828 } scale={ 1.000000 1.000000 1.000000 } } { id=5606 - position={ 3031.077637 0.000000 2350.085449 } + position={ 3029.414062 0.000000 2350.486816 } rotation={ -0.000000 -0.999966 -0.000000 -0.008208 } scale={ 1.000000 1.000000 1.000000 } } @@ -30499,37 +30499,37 @@ } { id=5613 - position={ 2980.077637 0.000000 2324.085449 } + position={ 2978.444824 0.000000 2331.884766 } rotation={ -0.000000 -0.138696 -0.000000 0.990335 } scale={ 1.000000 1.000000 1.000000 } } { id=5614 - position={ 2968.711426 0.000000 2365.559082 } - rotation={ -0.000000 -0.081691 -0.000000 -0.996658 } + position={ 2968.329834 0.000000 2346.500732 } + rotation={ -0.000000 -0.999970 -0.000000 0.007842 } scale={ 1.000000 1.000000 1.000000 } } { id=5615 - position={ 2961.077637 0.000000 2325.085449 } - rotation={ -0.000000 -0.856854 -0.000000 0.515560 } + position={ 2955.476807 0.000000 2314.852539 } + rotation={ -0.000000 -0.130478 -0.000000 0.991452 } scale={ 1.000000 1.000000 1.000000 } } { id=5616 - position={ 2949.077637 0.000000 2285.085449 } - rotation={ -0.000000 -0.587111 -0.000000 -0.809506 } + position={ 2955.897461 0.000000 2290.674072 } + rotation={ -0.000000 0.950953 -0.000000 -0.309334 } scale={ 1.000000 1.000000 1.000000 } } { id=5617 - position={ 2958.077637 0.000000 2377.085449 } - rotation={ -0.000000 -0.369788 -0.000000 -0.929116 } + position={ 2949.153320 0.000000 2408.695557 } + rotation={ -0.000000 -0.990756 -0.000000 -0.135657 } scale={ 1.000000 1.000000 1.000000 } } { id=5618 - position={ 2912.077637 0.000000 2401.085449 } + position={ 2893.952393 0.000000 2413.354736 } rotation={ -0.000000 -0.930767 -0.000000 0.365612 } scale={ 1.000000 1.000000 1.000000 } } @@ -30547,8 +30547,8 @@ } { id=5621 - position={ 2936.077637 0.000000 2367.085449 } - rotation={ -0.000000 -0.995068 -0.000000 -0.099198 } + position={ 2925.307861 0.000000 2393.227539 } + rotation={ -0.000000 -0.693955 -0.000000 -0.720019 } scale={ 1.000000 1.000000 1.000000 } } { @@ -30919,7 +30919,7 @@ } { id=5683 - position={ 2875.077637 0.000000 2416.085449 } + position={ 2879.439941 0.000000 2432.744629 } rotation={ -0.000000 -0.858918 -0.000000 0.512114 } scale={ 1.000000 1.000000 1.000000 } } @@ -31003,8 +31003,8 @@ } { id=5701 - position={ 3060.077637 0.000000 2438.085449 } - rotation={ -0.000000 -0.439740 -0.000000 0.898125 } + position={ 3069.502930 0.000000 2437.801758 } + rotation={ -0.000000 -0.896093 -0.000000 0.443866 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31021,7 +31021,7 @@ } { id=5704 - position={ 3062.682373 0.000000 2414.560059 } + position={ 3004.190918 0.000000 2402.703857 } rotation={ -0.000000 -0.013699 -0.000000 -0.999906 } 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 bb586bf9c..b7d2067f3 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -32275,25 +32275,25 @@ } { id=5593 - position={ 2874.643799 0.000000 2488.836426 } - rotation={ -0.000000 -0.943082 -0.000000 0.332561 } + position={ 2874.466309 0.000000 2492.047363 } + rotation={ -0.000000 -0.996432 -0.000000 0.084401 } scale={ 1.000000 1.000000 1.000000 } } { id=5594 - position={ 2883.000000 0.000000 2457.000000 } + position={ 2894.218262 0.000000 2449.271240 } rotation={ -0.000000 -0.921377 -0.000000 0.388671 } scale={ 1.000000 1.000000 1.000000 } } { id=5595 - position={ 2911.057617 0.000000 2465.236328 } + position={ 2905.928223 0.000000 2469.713623 } rotation={ -0.000000 -0.958626 -0.000000 0.284668 } scale={ 1.000000 1.000000 1.000000 } } { id=5596 - position={ 2907.000000 0.000000 2421.000000 } + position={ 2861.960205 0.000000 2477.729980 } rotation={ -0.000000 -0.854670 -0.000000 0.519171 } scale={ 1.000000 1.000000 1.000000 } } @@ -32311,49 +32311,49 @@ } { id=5599 - position={ 2980.096680 0.000000 2438.010986 } + position={ 2977.177002 0.000000 2398.720459 } rotation={ -0.000000 -0.974199 -0.000000 0.225690 } scale={ 1.000000 1.000000 1.000000 } } { id=5600 - position={ 2955.000000 0.000000 2413.000000 } + position={ 2914.200195 0.000000 2427.548096 } rotation={ -0.000000 -0.917885 -0.000000 0.396848 } scale={ 1.000000 1.000000 1.000000 } } { id=5601 - position={ 3010.371094 0.000000 2435.759766 } - rotation={ -0.000000 -0.861378 -0.000000 0.507964 } + position={ 3035.572266 0.000000 2447.914795 } + rotation={ -0.000000 -0.998294 -0.000000 0.058391 } scale={ 1.000000 1.000000 1.000000 } } { id=5602 - position={ 3022.000000 0.000000 2412.000000 } + position={ 3003.329590 0.000000 2439.547607 } rotation={ -0.000000 -0.983913 -0.000000 0.178648 } scale={ 1.000000 1.000000 1.000000 } } { id=5603 - position={ 2993.273438 0.000000 2398.271240 } + position={ 2937.141357 0.000000 2373.084961 } rotation={ -0.000000 -0.923124 -0.000000 0.384502 } scale={ 1.000000 1.000000 1.000000 } } { id=5604 - position={ 3013.000000 0.000000 2368.000000 } + position={ 2991.455322 0.000000 2395.074707 } rotation={ -0.000000 -0.806817 -0.000000 0.590801 } scale={ 1.000000 1.000000 1.000000 } } { id=5605 - position={ 3033.532471 0.000000 2369.219727 } + position={ 3028.943604 0.000000 2388.712158 } rotation={ -0.000000 -0.929954 -0.000000 0.367675 } scale={ 1.000000 1.000000 1.000000 } } { id=5606 - position={ 3043.000000 0.000000 2358.000000 } + position={ 3014.341064 0.000000 2361.635742 } rotation={ -0.000000 -0.695366 -0.000000 0.718656 } scale={ 1.000000 1.000000 1.000000 } } @@ -32395,37 +32395,37 @@ } { id=5613 - position={ 2983.941895 -0.131836 2343.830566 } + position={ 2987.614990 -0.131836 2346.960693 } rotation={ -0.000000 -0.899500 -0.000000 0.436920 } scale={ 1.000000 1.000000 1.000000 } } { id=5614 - position={ 2953.843994 0.000000 2357.894043 } + position={ 2956.672119 0.000000 2351.946289 } rotation={ -0.000000 0.314284 -0.000000 0.949329 } scale={ 1.000000 1.000000 1.000000 } } { id=5615 - position={ 2967.000000 0.000000 2342.000000 } - rotation={ -0.000000 -0.538289 -0.000000 0.842760 } + position={ 2960.395508 0.000000 2329.128662 } + rotation={ -0.000000 0.210435 -0.000000 0.977608 } scale={ 1.000000 1.000000 1.000000 } } { id=5616 - position={ 2950.843994 0.000000 2301.218750 } + position={ 2945.454834 0.000000 2304.228516 } rotation={ -0.000000 -0.986391 -0.000000 0.164414 } scale={ 1.000000 1.000000 1.000000 } } { id=5617 - position={ 2941.000000 0.000000 2387.000000 } + position={ 2956.731201 0.000000 2407.421875 } rotation={ -0.000000 -0.701263 -0.000000 0.712903 } scale={ 1.000000 1.000000 1.000000 } } { id=5618 - position={ 2894.000000 0.000000 2401.000000 } + position={ 2876.303955 0.000000 2414.526855 } rotation={ -0.000000 -0.991251 -0.000000 0.131989 } scale={ 1.000000 1.000000 1.000000 } } @@ -32443,8 +32443,8 @@ } { id=5621 - position={ 2924.800293 0.000000 2362.402100 } - rotation={ -0.000000 -0.807914 -0.000000 0.589300 } + position={ 2927.593994 0.000000 2402.481445 } + rotation={ -0.000000 -0.999107 -0.000000 -0.042250 } scale={ 1.000000 1.000000 1.000000 } } { @@ -32815,7 +32815,7 @@ } { id=5683 - position={ 2877.000000 0.000000 2434.000000 } + position={ 2875.386719 0.000000 2441.506348 } rotation={ -0.000000 -0.996716 -0.000000 0.080972 } scale={ 1.000000 1.000000 1.000000 } } @@ -32899,7 +32899,7 @@ } { id=5701 - position={ 3044.413330 0.000000 2443.438965 } + position={ 3067.704102 0.000000 2428.873779 } rotation={ -0.000000 -0.970793 -0.000000 0.239918 } scale={ 1.000000 1.000000 1.000000 } } @@ -32917,13 +32917,13 @@ } { id=5704 - position={ 3044.813721 0.000000 2419.517578 } + position={ 3019.818848 0.000000 2410.925781 } rotation={ -0.000000 -0.973447 -0.000000 0.228913 } scale={ 1.000000 1.000000 1.000000 } } { id=5705 - position={ 3073.951416 0.000000 2392.624512 } + position={ 3065.931885 0.000000 2405.616455 } rotation={ -0.000000 -0.543172 -0.000000 0.839622 } 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 4e3cc2b6c..91a19423d 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -32275,25 +32275,25 @@ } { id=5593 - position={ 2885.879883 0.000000 2481.670166 } + position={ 2888.287842 0.000000 2473.775391 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5594 - position={ 2898.000000 0.000000 2459.000000 } + position={ 2906.602539 0.000000 2444.738281 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5595 - position={ 2920.820557 0.000000 2458.576660 } + position={ 2925.427246 0.000000 2462.418701 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5596 - position={ 2930.000000 0.000000 2429.000000 } + position={ 2867.944580 0.000000 2459.845215 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32311,49 +32311,49 @@ } { id=5599 - position={ 2990.000000 0.000000 2430.000000 } + position={ 2988.772949 0.000000 2411.402344 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5600 - position={ 2973.000000 0.000000 2410.000000 } + position={ 2922.772217 0.000000 2413.688721 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5601 - position={ 3028.000000 0.000000 2431.000000 } + position={ 3046.003174 0.000000 2431.092773 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5602 - position={ 3032.000000 0.000000 2406.000000 } + position={ 3000.977295 0.000000 2414.078125 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5603 - position={ 3001.000000 0.000000 2390.000000 } + position={ 2931.764160 0.000000 2360.510498 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5604 - position={ 3007.000000 0.000000 2355.000000 } + position={ 2999.904053 0.000000 2370.184570 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5605 - position={ 3050.171875 0.000000 2378.033203 } + position={ 3049.489258 0.000000 2381.565430 } rotation={ 0.000000 0.000000 0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=5606 - position={ 3034.000000 0.000000 2358.000000 } + position={ 3016.158936 0.000000 2339.601074 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32395,37 +32395,37 @@ } { id=5613 - position={ 2984.000000 0.000000 2330.000000 } + position={ 2998.383545 0.000000 2337.481689 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5614 - position={ 2973.223877 0.000000 2370.464355 } + position={ 2979.780273 0.000000 2357.778076 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5615 - position={ 2966.000000 0.000000 2330.000000 } + position={ 2961.260498 0.000000 2308.712891 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5616 - position={ 2958.000000 0.000000 2293.000000 } + position={ 2958.607666 0.000000 2295.496094 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5617 - position={ 2968.000000 0.000000 2385.000000 } + position={ 2959.070557 0.000000 2381.493408 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5618 - position={ 2919.000000 0.000000 2405.000000 } + position={ 2898.334961 0.000000 2419.430664 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32443,7 +32443,7 @@ } { id=5621 - position={ 2937.000000 0.000000 2375.000000 } + position={ 2938.024414 0.000000 2391.784424 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32815,7 +32815,7 @@ } { id=5683 - position={ 2885.000000 0.000000 2424.000000 } + position={ 2884.276123 0.000000 2425.143066 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32899,7 +32899,7 @@ } { id=5701 - position={ 3070.000000 0.000000 2442.000000 } + position={ 3078.863525 0.000000 2443.755371 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32917,13 +32917,13 @@ } { id=5704 - position={ 3064.604736 0.000000 2420.474609 } + position={ 3009.881592 0.000000 2388.996094 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5705 - position={ 3062.000000 0.000000 2398.000000 } + position={ 3046.372803 0.000000 2405.746094 } 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 7a1bc62ad..06ef46b77 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -30379,26 +30379,26 @@ } { id=5593 - position={ 2874.381104 0.000000 2469.575684 } - rotation={ -0.000000 0.958633 -0.000000 0.284644 } + position={ 2883.884766 0.000000 2486.570068 } + rotation={ -0.000000 0.671727 -0.000000 0.740799 } scale={ 1.000000 1.000000 1.000000 } } { id=5594 - position={ 2888.000000 0.000000 2449.000000 } + position={ 2898.441650 0.000000 2436.465820 } rotation={ 0.000000 0.780042 0.000000 0.625727 } scale={ 1.000000 1.000000 1.000000 } } { id=5595 - position={ 2911.820557 0.000000 2441.576660 } - rotation={ 0.000000 0.968028 0.000000 0.250841 } + position={ 2907.816895 0.000000 2462.087646 } + rotation={ -0.000000 0.517426 -0.000000 0.855728 } scale={ 1.000000 1.000000 1.000000 } } { id=5596 - position={ 2920.000000 0.000000 2413.000000 } - rotation={ 0.000000 0.973249 0.000000 0.229753 } + position={ 2869.082520 0.000000 2469.464844 } + rotation={ -0.000000 0.549835 -0.000000 0.835273 } scale={ 1.000000 1.000000 1.000000 } } { @@ -30415,49 +30415,49 @@ } { id=5599 - position={ 2995.000000 0.000000 2419.000000 } - rotation={ 0.000000 0.819067 0.000000 -0.573697 } + position={ 2976.518066 0.000000 2411.068359 } + rotation={ -0.000000 0.999835 -0.000000 0.018137 } scale={ 1.000000 1.000000 1.000000 } } { id=5600 - position={ 2974.000000 0.000000 2402.000000 } - rotation={ 0.000000 0.828067 0.000000 -0.560629 } + position={ 2921.408203 0.000000 2420.371338 } + rotation={ -0.000000 0.492418 -0.000000 -0.870359 } scale={ 1.000000 1.000000 1.000000 } } { id=5601 - position={ 3014.000000 0.000000 2426.000000 } - rotation={ 0.000000 0.788205 0.000000 0.615412 } + position={ 3030.657471 0.000000 2438.732178 } + rotation={ -0.000000 0.274261 -0.000000 0.961655 } scale={ 1.000000 1.000000 1.000000 } } { id=5602 - position={ 3020.000000 0.000000 2394.000000 } - rotation={ 0.000000 0.838492 0.000000 0.544914 } + position={ 3003.039062 0.000000 2427.167480 } + rotation={ -0.000000 0.404429 -0.000000 0.914569 } scale={ 1.000000 1.000000 1.000000 } } { id=5603 - position={ 2994.000000 0.000000 2373.000000 } - rotation={ 0.000000 0.989400 0.000000 0.145213 } + position={ 2925.005859 0.000000 2380.205566 } + rotation={ -0.000000 0.796811 -0.000000 -0.604228 } scale={ 1.000000 1.000000 1.000000 } } { id=5604 - position={ 3013.000000 0.000000 2354.000000 } + position={ 2992.142822 0.000000 2381.937500 } rotation={ -0.000000 -0.606994 -0.000000 0.794707 } scale={ 1.000000 1.000000 1.000000 } } { id=5605 - position={ 3056.383057 0.000000 2372.251953 } + position={ 3040.459961 0.000000 2376.342285 } rotation={ -0.000000 -0.666921 -0.000000 0.745128 } scale={ 1.000000 1.000000 1.000000 } } { id=5606 - position={ 3022.000000 0.000000 2347.000000 } + position={ 3020.336426 0.000000 2347.401367 } rotation={ 0.000000 0.811242 0.000000 0.584710 } scale={ 1.000000 1.000000 1.000000 } } @@ -30499,37 +30499,37 @@ } { id=5613 - position={ 2991.000000 0.000000 2324.000000 } + position={ 2989.367188 0.000000 2331.799316 } rotation={ 0.000000 0.707107 0.000000 -0.707107 } scale={ 1.000000 1.000000 1.000000 } } { id=5614 - position={ 2970.633789 0.000000 2356.473633 } - rotation={ 0.000000 0.994029 0.000000 -0.109117 } + position={ 2966.965332 0.000000 2361.269531 } + rotation={ -0.000000 -0.035388 -0.000000 -0.999374 } scale={ 1.000000 1.000000 1.000000 } } { id=5615 - position={ 2965.000000 0.000000 2316.000000 } - rotation={ 0.000000 0.978216 0.000000 -0.207591 } + position={ 2963.455566 0.000000 2320.716553 } + rotation={ -0.000000 0.446992 -0.000000 -0.894538 } scale={ 1.000000 1.000000 1.000000 } } { id=5616 - position={ 2959.000000 0.000000 2287.000000 } - rotation={ -0.000000 -0.633989 -0.000000 0.773342 } + position={ 2946.111816 0.000000 2295.008301 } + rotation={ -0.000000 -0.540560 -0.000000 -0.841305 } scale={ 1.000000 1.000000 1.000000 } } { id=5617 - position={ 2947.000000 0.000000 2380.000000 } - rotation={ 0.000000 0.606994 0.000000 0.794707 } + position={ 2953.688721 0.000000 2396.639893 } + rotation={ -0.000000 0.990574 -0.000000 -0.136983 } scale={ 1.000000 1.000000 1.000000 } } { id=5618 - position={ 2903.000000 0.000000 2395.000000 } + position={ 2884.874756 0.000000 2407.269287 } rotation={ 0.000000 0.881675 0.000000 0.471858 } scale={ 1.000000 1.000000 1.000000 } } @@ -30547,8 +30547,8 @@ } { id=5621 - position={ 2933.000000 0.000000 2357.000000 } - rotation={ 0.000000 0.989400 0.000000 0.145213 } + position={ 2912.966553 0.000000 2397.559082 } + rotation={ -0.000000 0.659836 -0.000000 0.751409 } scale={ 1.000000 1.000000 1.000000 } } { @@ -30919,7 +30919,7 @@ } { id=5683 - position={ 2866.000000 0.000000 2411.000000 } + position={ 2870.362305 0.000000 2427.659180 } rotation={ 0.000000 0.861871 0.000000 0.507128 } scale={ 1.000000 1.000000 1.000000 } } @@ -31003,8 +31003,8 @@ } { id=5701 - position={ 3053.000000 0.000000 2433.000000 } - rotation={ 0.000000 0.889168 0.000000 0.457582 } + position={ 3062.769043 0.000000 2443.285889 } + rotation={ -0.000000 0.425889 -0.000000 0.904776 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31021,7 +31021,7 @@ } { id=5704 - position={ 3073.604736 0.000000 2410.474609 } + position={ 3015.113281 0.000000 2398.618408 } rotation={ 0.000000 0.819067 0.000000 -0.573697 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/gfx/models/artifacts/NEOW_crowns/NEOW_crowns.asset b/gfx/models/artifacts/NEOW_crowns/NEOW_crowns.asset index 95d108fce..7bf410eed 100644 --- a/gfx/models/artifacts/NEOW_crowns/NEOW_crowns.asset +++ b/gfx/models/artifacts/NEOW_crowns/NEOW_crowns.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a772f890e976e4ac59c94252d5e3ff8ded08d1119ec418f2adc493c806266bc -size 820 +oid sha256:051fa052d65d675681a65c45e1245e1ce629fe2f7b654f9cf704c571fa138dd4 +size 1643 diff --git a/gfx/models/artifacts/NEOW_crowns/m_headgear_neow_western_royalty_01_portrait.mesh b/gfx/models/artifacts/NEOW_crowns/m_headgear_neow_western_royalty_01_portrait.mesh new file mode 100644 index 000000000..d72b2418f --- /dev/null +++ b/gfx/models/artifacts/NEOW_crowns/m_headgear_neow_western_royalty_01_portrait.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:939fddae2d28e2a0ae5210f52d6f11601bcc83819f4613a897b1cdc3b7451a78 +size 4904362 diff --git a/gfx/models/portraits/f_headgear/neow_western/st_edwards_crown/f_headgear_neow_western_royalty_01.asset b/gfx/models/portraits/f_headgear/neow_western/st_edwards_crown/f_headgear_neow_western_royalty_01.asset new file mode 100644 index 000000000..982a11301 --- /dev/null +++ b/gfx/models/portraits/f_headgear/neow_western/st_edwards_crown/f_headgear_neow_western_royalty_01.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4e1f3e5a08e61196bb7c151a9c56a925b13e5b2e4dd7c5836755a6d2d09bafd +size 1319 diff --git a/gfx/models/portraits/f_headgear/neow_western/st_edwards_crown/f_headgear_neow_western_royalty_01.mesh b/gfx/models/portraits/f_headgear/neow_western/st_edwards_crown/f_headgear_neow_western_royalty_01.mesh new file mode 100644 index 000000000..5612eeced --- /dev/null +++ b/gfx/models/portraits/f_headgear/neow_western/st_edwards_crown/f_headgear_neow_western_royalty_01.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea37ada3bb8307f72fbad3648ef42e595089f8262878a7df1e1a7647674ce752 +size 7928230 diff --git a/gfx/models/portraits/f_headgear/neow_western/st_edwards_crown/f_headgear_neow_western_royalty_01_mask.mesh b/gfx/models/portraits/f_headgear/neow_western/st_edwards_crown/f_headgear_neow_western_royalty_01_mask.mesh new file mode 100644 index 000000000..c86b3f227 --- /dev/null +++ b/gfx/models/portraits/f_headgear/neow_western/st_edwards_crown/f_headgear_neow_western_royalty_01_mask.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d98f531910cf6c778259d5a23137c7a1020d9fc495d23a6fb20b17598a3653bb +size 7928235 diff --git a/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01.asset b/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01.asset new file mode 100644 index 000000000..405fab394 --- /dev/null +++ b/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4531b585d75d02fb8897cce7b1c0fe4832afbebd81030e848bc463691c971d89 +size 1975 diff --git a/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01.mesh b/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01.mesh new file mode 100644 index 000000000..089a67eb1 --- /dev/null +++ b/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8635162ab25e0b4abdde0786b57744060b09eb2a8d6823541cebcf5cf4d851a8 +size 7928228 diff --git a/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_artifact.mesh b/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_artifact.mesh new file mode 100644 index 000000000..07a72ac01 --- /dev/null +++ b/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_artifact.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ca32c8a10c247dd827cc0ce049caa2e5dbeaf23a4faa90d8be5fc4b913adbaf +size 1429498 diff --git a/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_diffuse.dds b/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_diffuse.dds new file mode 100644 index 000000000..0f34dd438 --- /dev/null +++ b/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_diffuse.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ea4f0603dad69d3cca7e3db1ea63538ecd7fc942e15632c58f3307ffc3f135e +size 2796344 diff --git a/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_mask.mesh b/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_mask.mesh new file mode 100644 index 000000000..de4022bf3 --- /dev/null +++ b/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_mask.mesh @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2ee337801a51261933e47cbde2c46879f373a1f7ed3ee9f613b43b4dc49c06e +size 7928233 diff --git a/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_normal.dds b/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_normal.dds new file mode 100644 index 000000000..a22be7739 --- /dev/null +++ b/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_normal.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:239ab9d1238013d327e705c002cceaaaebf53ef5a1f552c95f6df5c719f1b1bd +size 5592560 diff --git a/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_properties.dds b/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_properties.dds new file mode 100644 index 000000000..4ad561e40 --- /dev/null +++ b/gfx/models/portraits/m_headgear/neow_western/st_edwards_crown/m_headgear_neow_western_royalty_01_properties.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b756c6bd432cf734cbca4be4f3ed538a46295feedc323fb6b118de60bf766be +size 5592560 diff --git a/gfx/portraits/accessories/NEOW_headgear.txt b/gfx/portraits/accessories/NEOW_headgear.txt index 348e85b0e..2bad8a650 100644 --- a/gfx/portraits/accessories/NEOW_headgear.txt +++ b/gfx/portraits/accessories/NEOW_headgear.txt @@ -13,6 +13,13 @@ male_headgear_neow_eastern_royalty_01 = { entity = { required_tags = "" shared_pose_entity = head entity = male_headgear_neow_eastern_royalty_01_entity } } +male_headgear_neow_western_royalty_01 = { + set_tags = "crown,mask_hat" + entity = { required_tags = "hood_on" shared_pose_entity = head } + entity = { required_tags = "mask" shared_pose_entity = head entity = male_headgear_neow_western_royalty_01_mask_entity } + entity = { required_tags = "" shared_pose_entity = head entity = male_headgear_neow_western_royalty_01_entity } +} + ################## # FEMALE # ################## @@ -26,4 +33,10 @@ female_headgear_neow_eastern_royalty_01 = { entity = { required_tags = "" shared_pose_entity = head entity = female_headgear_neow_eastern_royalty_01_entity } } +female_headgear_neow_western_royalty_01 = { + set_tags = "crown,mask_hat,fit_over_headgear" + entity = { required_tags = "hood_on" shared_pose_entity = head } + entity = { required_tags = "mask" shared_pose_entity = head entity = female_headgear_neow_western_royalty_01_mask_entity } + entity = { required_tags = "" shared_pose_entity = head entity = female_headgear_neow_western_royalty_01_entity } +} diff --git a/gfx/portraits/accessories/NEOW_props.txt b/gfx/portraits/accessories/NEOW_props.txt index bda443e55..0f7f96802 100644 --- a/gfx/portraits/accessories/NEOW_props.txt +++ b/gfx/portraits/accessories/NEOW_props.txt @@ -10,3 +10,7 @@ coronation_crown_nistrenia_imperial = { entity = { required_tags = "" node = "bn_l_prop" entity = "male_headgear_neow_eastern_royalty_01_portrait_entity" } } +#British St. Edward's Crown +coronation_crown_britannia_imperial = { + entity = { required_tags = "" node = "bn_l_prop" entity = "male_headgear_neow_western_royalty_01_portrait_entity" } +} diff --git a/gfx/portraits/portrait_animations/animations.modifierpack b/gfx/portraits/portrait_animations/animations.modifierpack index 67f61a7a7..380001e33 100644 --- a/gfx/portraits/portrait_animations/animations.modifierpack +++ b/gfx/portraits/portrait_animations/animations.modifierpack @@ -3103,6 +3103,24 @@ coronation_crowns = { animations = female_prop_fix_additive } + portrait_modifier = { # Britannia + trigger = { + trigger_if = { + limit = { + exists = involved_activity + } + involved_activity.activity_host = { + primary_title = title:e_britannia + } + } + trigger_else = { + primary_title = title:e_britannia + } + } + animations_props = coronation_crown_prop_britannia_imperial + animations = female_prop_fix_additive + } + portrait_modifier = { # HRE trigger = { trigger_if = { diff --git a/gfx/portraits/portrait_modifiers/00_animation_props.txt b/gfx/portraits/portrait_modifiers/00_animation_props.txt index 914085252..bbe8b7953 100644 --- a/gfx/portraits/portrait_modifiers/00_animation_props.txt +++ b/gfx/portraits/portrait_modifiers/00_animation_props.txt @@ -3241,4 +3241,15 @@ } } } + + coronation_crown_prop_britannia_imperial = { + dna_modifiers = { + accessory = { + mode = add + gene = props_left + template = coronation_crown_britannia_imperial_gene + value = 1 + } + } + } } diff --git a/gfx/portraits/portrait_modifiers/00_custom_headgear.txt b/gfx/portraits/portrait_modifiers/00_custom_headgear.txt index b97fe8f85..3c49b4eac 100644 --- a/gfx/portraits/portrait_modifiers/00_custom_headgear.txt +++ b/gfx/portraits/portrait_modifiers/00_custom_headgear.txt @@ -1586,6 +1586,11 @@ gene = headgear template = neow_eastern_royalty_01 } + + add_accessory_modifiers = { + gene = headgear + template = neow_western_royalty_01 + } } diff --git a/gfx/portraits/portrait_modifiers/01_headgear_base.txt b/gfx/portraits/portrait_modifiers/01_headgear_base.txt index 3b9cbefa6..a4a9dbca8 100644 --- a/gfx/portraits/portrait_modifiers/01_headgear_base.txt +++ b/gfx/portraits/portrait_modifiers/01_headgear_base.txt @@ -5418,4 +5418,28 @@ headgear_base = { } } } + + british_emperor = { + dna_modifiers = { + accessory = { + mode = add + gene = headgear + template = no_headgear + range = { 0 1 } + } + accessory = { + mode = add + gene = headgear + template = neow_western_royalty_01 + range = { 0 1 } # For the randomness to work correctly + } + } + weight = { + base = 0 + modifier = { + add = 500 + portrait_st_edwards_crown_trigger = yes + } + } + } } \ No newline at end of file diff --git a/history/characters/NEOW_e_idel_ural.txt b/history/characters/NEOW_e_idel_ural.txt index ed58d12f6..afe3a28a6 100644 --- a/history/characters/NEOW_e_idel_ural.txt +++ b/history/characters/NEOW_e_idel_ural.txt @@ -158,7 +158,7 @@ russia_shabdar_ipai = { # Duke of Mari El russia_kestenttin_husankai = { # Duke of Chuvashia name = "Kĕştenttin" dynasty = husankai_dynasty - religion = "russian_orthodox" + religion = "chuvash_pagan" culture = NEOW_chuvash trait = education_diplomacy_3 trait = generous diff --git a/history/provinces/e_turkey.txt b/history/provinces/e_turkey.txt index c086d7838..dc0ff15a4 100644 --- a/history/provinces/e_turkey.txt +++ b/history/provinces/e_turkey.txt @@ -465,6 +465,99 @@ 5623 = { # Çiftlik holding = none } +##d_charsianon/Kayseri ################################### +###c_kaisereia/Kayseri +737 = { # Kayseri + culture = kapadokyali + religion = naqshbandi + holding = castle_holding + 200.1.1 = { + special_building_slot = fairy_chimneys + special_building = fairy_chimneys + } +} +5615 = { # Develi + holding = city_holding +} +5616 = { # Yahyalı + holding = church_holding +} +5614 = { # Bünyan + holding = none +} +5613 = { # Pınarbaşı + holding = none +} +###c_corum +5595 = { # Çorum + culture = kapadokyali + religion = naqshbandi + holding = castle_holding +} +5683 = { # Sungurlu + holding = city_holding +} +5593 = { # Osmancık + holding = church_holding +} +5594 = { # Alaca + holding = none +} +5596 = { # İskilip + holding = none +} +###c_yozgat +5618 = { # Yozgat + culture = kapadokyali + religion = turkology + holding = castle_holding +} +5600 = { # Sorgun + holding = city_holding +} +5617 = { # Akdağmadeni + holding = church_holding +} +5621 = { # Boğazlıyan + holding = none +} +3745 = { # Sarıkaya + holding = none +} +##d_sebasteia/Sivas ################################### +###c_sebasteia/Sivas +5602 = { # Sivas + culture = kapadokyali + religion = alevi + holding = castle_holding +} +5599 = { # Yıldızeli + holding = city_holding +} +5701 = { # Suşehri + holding = church_holding +} +5601 = { # Zara + holding = none +} +###c_sarkısla +5604 = { # Şarkışla + culture = kapadokyali + religion = alevi + holding = castle_holding +} +5605 = { # Kangal + holding = church_holding +} +5606 = { # Gürün + holding = none +} +5705 = { # Divriği + holding = none +} +5704 = { # Ulaş + holding = none +} # custom # 740 - Herakleia @@ -872,22 +965,6 @@ holding = castle_holding } -# 737 - Kaisereia -737 = { # 737 - Kaisereia - - # Misc - culture = kapadokyali - religion = naqshbandi - - holding = castle_holding - - # History - 200.1.1 = { - special_building_slot = fairy_chimneys - special_building = fairy_chimneys - } -} - # 738 - Amisos 738 = { # 738 - Amisos @@ -1061,58 +1138,6 @@ } -# 5593 - Pimolisa -5593 = { # 5593 - Pimolisa - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - -} - -# 5594 - Euchaita -5594 = { # 5594 - Euchaita - - # Misc - culture = kapadokyali - religion = naqshbandi - - holding = castle_holding - - # History - -} - -# 5595 - Carissa -5595 = { # 5595 - Carissa - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - -} - -# 5596 - Pteria -5596 = { # 5596 - Pteria - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - -} - # 5597 - Zela 5597 = { # 5597 - Zela @@ -1139,61 +1164,6 @@ } -# 5599 - Sebastopolis -5599 = { # 5599 - Sebastopolis - - # Misc - culture = kapadokyali - religion = alevi - - holding = city_holding - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - -# 5600 - Agranai -5600 = { # 5600 - Agranai - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - -} - -# 5601 - Pedachtoe -5601 = { # 5601 - Pedachtoe - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - -# 5602 - Sebasteia -5602 = { # 5602 - Sebasteia - - # Misc - culture = kapadokyali - religion = alevi - - holding = castle_holding -} - # 5603 - Malandra 5603 = { # 5603 - Malandra @@ -1210,48 +1180,6 @@ } } -# 5604 - Karnalis -5604 = { # 5604 - Karnalis - - # Misc - culture = kapadokyali - religion = alevi - - holding = castle_holding -} - -# 5605 - Euspena -5605 = { # 5605 - Euspena - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - -# 5606 - Gauraina -5606 = { # 5606 - Gauraina - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - # 5607 - Dalanda 5607 = { # 5607 - Dalanda @@ -1300,96 +1228,6 @@ } } -# 5613 - Ariaratheia -5613 = { # 5613 - Ariaratheia - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - -# 5614 - Armaxa -5614 = { # 5614 - Armaxa - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - -# 5615 - Herpha -5615 = { # 5615 - Herpha - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - -# 5616 - Arasaxa -5616 = { # 5616 - Arasaxa - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - -# 5617 - Charsianon -5617 = { # 5617 - Charsianon - - # Misc - culture = kapadokyali - religion = turkology - - holding = castle_holding -} - -# 5618 - Therma -5618 = { # 5618 - Therma - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - # 5621 - Euaissa 5621 = { # 5621 - Euaissa @@ -1577,23 +1415,6 @@ } -# 5701 - Nicopolis_ARM -5701 = { # 5701 - Nicopolis - - # Misc - culture = greek - religion = orthodox - - holding = city_holding - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } - -} - # 5702 - Kheranion 5702 = { # 5702 - Kheranion @@ -1622,39 +1443,4 @@ } -# 5704 - Kamisa -5704 = { # 5704 - Kamisa - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } - -} - -# 5705 - Tephrice -5705 = { # 5705 - Tephrice - - # Misc - culture = greek - religion = orthodox - - holding = city_holding - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } - -} - - diff --git a/history/provinces/e_volga-ural.txt b/history/provinces/e_volga-ural.txt index bda67162a..8bf8c7072 100644 --- a/history/provinces/e_volga-ural.txt +++ b/history/provinces/e_volga-ural.txt @@ -83,7 +83,7 @@ ###c_cheboksary 590 = { culture = NEOW_chuvash - religion = russian_orthodox + religion = chuvash_pagan holding = tribal_holding } 5363 = { @@ -100,7 +100,7 @@ 591 = { holding = castle_holding culture = NEOW_chuvash - religion = russian_orthodox + religion = chuvash_pagan } 5406 = { holding = none diff --git a/localization/english/replace/artifacts/NEOW_artifacts_l_english.yml b/localization/english/replace/artifacts/NEOW_artifacts_l_english.yml index 97e1f2c80..3a6c6dea7 100644 --- a/localization/english/replace/artifacts/NEOW_artifacts_l_english.yml +++ b/localization/english/replace/artifacts/NEOW_artifacts_l_english.yml @@ -12,7 +12,8 @@ crown_charlemagne_description:0 "Napoleon's "Crown of Charlemagne" was a 1804 recreation fabricated by goldsmith Martin-Guillaume Biennais for his coronation, designed to evoke the ancient, destroyed Carolingian crown and legitimize his rule. \n\nAfter [Concept('neow_the_event','the Event')|E] it was used by the Bonaparte dynasty to crown the kings and emperors of France." artifact_pearl_crown_name:0 "Pearl Crown of Nistrenia" artifact_pearl_crown_description:0 "The Pearl Crown is the traditional headwear of Moldovan and Nistrenian monarchs. First worn by Stephen the Great who laid the foundations of Nistrenia, it was lost for centuries before being found once more." - + artifact_st_edwards_crown_name:0 "St. Edward's Crown" + artifact_st_edwards_crown_description:0 "Forged for King Charles II in 1661, The Crown of St. Edward is the Coronation Crown of the United Kingdom of Great Britain and the most important of the British Crown Jewels." artifact_pedestal_reliquary_fracture_name:0 "[SCOPE.Custom('FractureRelicName')|U]" artifact_pedestal_reliquary_fracture_description:1 "An elegant reliquary containing a holy relic: [SCOPE.Custom('FractureRelic')|l]." artifact_pedestal_amethyst_name:0 "Radiant Amethyst" 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 4c13c4587..15c251e94 100644 --- a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml @@ -7470,6 +7470,8 @@ dynn_Alwan:0 "Alwan" dynn_El_dsh_Hajj:0 "El-Hajj" dynn_El_dsh_Warcha:0 "El-Warcha" + dynn_El_dsh_Hachem:0 "El-Hachem" + dynn_El_dsh_Sayah:0 "El-Sayah" dynn_Ammar:0 "Ammar" dynn_Andari:0 "Andari" dynn_Chehab:0 "Chehab" @@ -7494,3 +7496,10 @@ dynn_Borri:0 "Borri" dynn_Chemali:0 "Chemali" dynn_Abdelnour:0 "Abdelnour" + dynn_Chihane:0 "Chihane" + dynn_Debs:0 "Debs" + dynn_Dergham:0 "Dergham" + dynn_Doueihi:0 "Doueihi" + dynn_Doumith:0 "Doumith" + dynn_Eid:0 "Eid" + dynn_Faddoul:0 "Faddoul" diff --git a/localization/english/replace/names/NEOW_character_names_l_english.yml b/localization/english/replace/names/NEOW_character_names_l_english.yml index c9d8c8142..00f92797b 100644 --- a/localization/english/replace/names/NEOW_character_names_l_english.yml +++ b/localization/english/replace/names/NEOW_character_names_l_english.yml @@ -20127,5 +20127,8 @@ Ghassan:0 "Ghassan" Jihad:0 "Jihad" Nimr:0 "Nimr" + Mounged:0 "Mounged" + Zakhia:0 "Zakhia" Dory:0 "Dory" Dany:0 "Dany" + Elie:0 "Elie" diff --git a/localization/english/replace/portraits/portrait_modifiers_NEOW_l_english.yml b/localization/english/replace/portraits/portrait_modifiers_NEOW_l_english.yml index 57fc9e71c..846ab100a 100644 --- a/localization/english/replace/portraits/portrait_modifiers_NEOW_l_english.yml +++ b/localization/english/replace/portraits/portrait_modifiers_NEOW_l_english.yml @@ -14,5 +14,7 @@ ## Male ## PORTRAIT_MODIFIER_custom_headgear_male_headgear_neow_eastern_royalty_01: "@neow_icon! Pearl Crown of Nistrenia" + PORTRAIT_MODIFIER_custom_headgear_male_headgear_neow_western_royalty_01: "@neow_icon! Crown of St-Edward" ## Female ## - PORTRAIT_MODIFIER_custom_headgear_female_headgear_neow_eastern_royalty_01: "@neow_icon! Pearl Crown of Nistrenia" \ No newline at end of file + PORTRAIT_MODIFIER_custom_headgear_female_headgear_neow_eastern_royalty_01: "@neow_icon! Pearl Crown of Nistrenia" + PORTRAIT_MODIFIER_custom_headgear_female_headgear_neow_western_royalty_01: "@neow_icon! Crown of St-Edward" \ No newline at end of file diff --git a/localization/english/replace/religion/zz_NEOW_religion_uralic_l_english.yml b/localization/english/replace/religion/zz_NEOW_religion_uralic_l_english.yml index 8ed7e8bc6..b1eb04cab 100644 --- a/localization/english/replace/religion/zz_NEOW_religion_uralic_l_english.yml +++ b/localization/english/replace/religion/zz_NEOW_religion_uralic_l_english.yml @@ -7,23 +7,29 @@ uralic_religion_desc:1 "Uralic religion is largely rooted in its mythology, dating back thousands of years. With many of the old stories have been lost to time, the surviving folklore of the Uralic peoples has diverged heavily over the course of millennia, each community having a different level of influence from syncretic and reconstructionist elements." udmurt_pagan:0 "Udmurt Vöś" - udmurt_pagan_adj:0 "Udmurt" - udmurt_pagan_adherent:0 "Udmurt" - udmurt_pagan_adherent_plural:0 "Udmurts" + udmurt_pagan_adj:0 "Vosic" + udmurt_pagan_adherent:0 "Vosic" + udmurt_pagan_adherent_plural:0 "Vosics" udmurt_pagan_desc:0 "WRITE ME" mari_pagan:0 "Čimarii jüla" - mari_pagan_adj:0 "Mari" - mari_pagan_adherent:0 "Mari" - mari_pagan_adherent_plural:0 "Maris" + mari_pagan_adj:0 "Yumic" + mari_pagan_adherent:0 "Yumic" + mari_pagan_adherent_plural:0 "Yumics" mari_pagan_desc:0 "WRITE ME" mordvin_pagan:0 "Ras'ken' Ozks" - mordvin_pagan_adj:0 "Mordvin" - mordvin_pagan_adherent:0 "Mordvin" - mordvin_pagan_adherent_plural:0 "Mordvins" + mordvin_pagan_adj:0 "Ozksic" + mordvin_pagan_adherent:0 "Ozksic" + mordvin_pagan_adherent_plural:0 "Ozksics" mordvin_pagan_desc:0 "WRITE ME" + chuvash_pagan:0 "Vattisen yăli" + chuvash_pagan_adj:0 "Yalic" + chuvash_pagan_adherent:0 "Yalic" + chuvash_pagan_adherent_plural:0 "Yalics" + chuvash_pagan_desc:0 "WRITE ME" + malachite:0 "Malakhitstvo" malachite_adj:0 "Malakhitstvo" malachite_adherent:0 "Malachite" diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index e1da30ef0..0e9c695ca 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -5735,7 +5735,6 @@ b_caraoasis:0 "Cara" b_carbajosadelasagrada:0 "Carbajosa de la Sagrada" b_carcastillo:0 "Carcastillo" - b_carissa:0 "Carissa" b_cary:0 "Cary" b_carpi:0 "Carpi" b_carrion:0 "Carrión" @@ -7954,7 +7953,6 @@ b_kaik:0 "Kaik" b_kairouan:0 "Kairouan" b_kairy:0 "Kairy" - b_kaisereia:0 "Kaisereia" b_kaisun:0 "Kaisun" b_kaj:0 "Kaj" b_kajaani:0 "Kajaani" @@ -14703,8 +14701,6 @@ c_kainuu_adj:0 "Kainuu" c_kairwan:0 "Kairwan" c_kairwan_adj:0 "Kairwanian" - c_kaisereia:0 "Kaisereia" - c_kaisereia_adj:0 "Kaisereian" c_kakheti:0 "Kakheti" c_kakheti_adj:0 "Kakhetian" c_kakisalmi:0 "Kakisalmi" @@ -16543,8 +16539,6 @@ d_cephalonia_adj:0 "Cephalonian" d_chaldea:0 "Chaldea" d_chaldea_adj:0 "Chaldean" - d_charsianon:0 "Charsianon" - d_charsianon_adj:0 "Charsianine" d_chera_nadu:0 "Chera Nadu" d_cheremisa:0 "Cheremisa" d_cheremisa_adj:0 "Cheremisan" @@ -19123,14 +19117,10 @@ c_pompeiopolis_adj:0 "Pompeiopolitan" c_helenopontus:0 "Helenopontus" c_helenopontus_adj:0 "Helenopontic" - c_euchaita:0 "Euchaita" - c_euchaita_adj:0 "Euchaitan" c_zela:0 "Zela" c_zela_adj:0 "Zelian" c_sebasteia:0 "Sebasteia" c_sebasteia_adj:0 "Sebasteian" - c_azysia:0 "Azysia" - c_azysia_adj:0 "Azysian" c_ablastha:0 "Ablastha" c_ablastha_adj:0 "Ablasthan" c_charsianon:0 "Charsianon" @@ -19155,7 +19145,6 @@ b_boli:0 "Boli" b_cratea:0 "Cratea" b_papira:0 "Kaman" - b_tabia:0 "Tabia" b_krateia:0 "Çubuk" b_iuliopolis:0 "Kızılcahamam" b_lagania:0 "Keçiören" @@ -19187,28 +19176,11 @@ b_zagora:0 "Zagora" b_andrapa:0 "Andrapa" b_pimolisa:0 "Pimolisa" - b_euchaita:0 "Euchaita" - b_pteria:0 "Pteria" b_comana_pontica:0 "Comana Pontica" - b_agranai:0 "Agranai" - b_sebastopolis:0 "Sebastopolis" - b_pedachtoe:0 "Pedachtoe" - b_sebasteia:0 "Sebasteia" - b_malandra:0 "Malandra" - b_karnalis:0 "Karnalis" - b_euspena:0 "Euspena" - b_gauraina:0 "Gauraina" b_tanadaris:0 "Tanadaris" - b_dasmenda:0 "Dasmenda" b_dalanda:0 "Dalanda" b_osdara:0 "Osdara" b_ablastha:0 "Ablastha" - b_charsianon:0 "Charsianon" - b_therma:0 "Therma" - b_euaissa:0 "Euaissa" - b_herpha:0 "Herpha" - b_armaxa:0 "Armaxa" - b_arasaxa:0 "Arasaxa" b_soli_CYP:0 "Soli" #Armenia & Georgia @@ -19278,9 +19250,7 @@ b_colonea:0 "Colonea" b_sinoria:0 "Sinoria" b_hypseie:0 "Hypseie" - b_nicopolis_ARM:0 "Nicopolis" b_kheranion:0 "Kheranion" - b_kamisa:0 "Kamisa" b_arsamosata:0 "Arsamosata" b_speri:0 "Speri" b_camacha:0 "Camacha" @@ -27284,10 +27254,8 @@ b_kandara:0 "Şabanözü" b_gangra:0 "Çankırı" b_ecobrogis:0 "Kırıkkale" - b_tabia:0 "Büyüknefes" + b_tabia:0 "Sungurlu" b_hadrianopolis:0 "Çerkeş" - c_cappadocia:0 "Nevşehir" - c_cappadocia_adj:0 "Nevşehir" b_tyana:0 "Niğde" b_comitanassus:0 "Çumra" b_garsaura:0 "Aksaray" @@ -27297,13 +27265,13 @@ c_lower_galatia_adj:0 "Aksaraylı" b_parnassos:0 "Ortaköy" b_aspona:0 "Şereflikoçhisar" - d_charsianon:0 "Yozgat" - d_charsianon_adj:0 "Yozgat" + d_charsianon:0 "Kayseri" + d_charsianon_adj:0 "Kayserili" c_charsianon:0 "Yozgat" - c_charsianon_adj:0 "Yozgat" + c_charsianon_adj:0 "Yozgatlı" b_charsianon:0 "Akdağmadeni" - b_therma:0 "Yerköy" - b_euaissa:0 "Yoğunhisar" + b_therma:0 "Yozgat" + b_euaissa:0 "Boğazlıyan" c_kirsehir:0 "Kırşehir" c_kirsehir_adj:0 "Kırşehirli" b_galatia:0 "Ereğli" @@ -27312,9 +27280,9 @@ c_kaisereia:0 "Kayseri" c_kaisereia_adj:0 "Kayseri" b_kaisereia:0 "Kayseri" - b_herpha:0 "Karmalas" - b_armaxa:0 "Gemerek" - b_arasaxa:0 "Akmescit" + b_herpha:0 "Develi" + b_armaxa:0 "Bünyan" + b_arasaxa:0 "Yahyalı" c_kyzistra:0 "Niğde" c_kyzistra_adj:0 "Niğdeli" b_kyzistra:0 "Çiftlik" @@ -27325,21 +27293,21 @@ c_helenopontus_adj:0 "Amasya" b_amaseia:0 "Amasya" b_magnopolis:0 "Kale" - b_carissa:0 "Elvançelebi" + b_carissa:0 "Çorum" c_euchaita:0 "Çorum" - c_euchaita_adj:0 "Çorum" - b_euchaita:0 "Beyözü" + c_euchaita_adj:0 "Çorumlu" + b_euchaita:0 "Alaca" b_pimolisa:0 "Osmancık" - b_pteria:0 "Kerkenes Dağı" + b_pteria:0 "İskilip" c_zela:0 "Tokat" c_zela_adj:0 "Tokat" b_comana_pontica:0 "Kılıçlı" b_zela:0 "Zile" - b_agranai:0 "Muşalim Kalesi" + b_agranai:0 "Sorgun" b_hypseie:0 "Akkuş" - b_nicopolis_ARM:0 "Koyulhisar" - b_sebastopolis:0 "Sulusaray" - b_pedachtoe:0 "Akşehir" + b_nicopolis_ARM:0 "Suşehri" + b_sebastopolis:0 "Yıldızeli" + b_pedachtoe:0 "Zara" d_bucellaria:0 "Bolu" d_bucellaria_adj:0 "Bolu" c_honorias:0 "Bolu" @@ -27464,21 +27432,21 @@ c_satala_adj:0 "Sadak" b_satala:0 "Sadak" b_kheranion:0 "Harput" - b_kamisa:0 "Kemaliye" + b_kamisa:0 "Ulaş" b_tephrice:0 "Divriği" d_sebasteia:0 "Sivas" - d_sebasteia_adj:0 "Sivas" + d_sebasteia_adj:0 "Sivaslı" c_sebasteia:0 "Sivas" - c_sebasteia_adj:0 "Sivas" + c_sebasteia_adj:0 "Sivaslı" b_sebasteia:0 "Sivas" - b_malandra:0 "Sarkisla" - c_azysia:0 "Azysia" - c_azysia_adj:0 "Azysia" - b_karnalis:0 "Viransehir" + b_malandra:0 "Sarıkaya" + c_azysia:0 "Şarkışla" + c_azysia_adj:0 "Şarkışlalı" + b_karnalis:0 "Şarkışla" b_euspena:0 "Kangal" b_gauraina:0 "Gürün" b_tanadaris:0 "Tanir" - b_dasmenda:0 "Kuskalesi" + b_dasmenda:0 "Pınarbaşı" c_ablastha:0 "Elbistan" c_ablastha_adj:0 "Elbistan" b_ablastha:0 "Elbistan" diff --git a/map_data/provinces.png b/map_data/provinces.png index edf5ada79..396481f0b 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:468cebb535b409690f0401e49e7dc3ff75f68a2e811caf60a68dd799d13d5203 -size 2679670 +oid sha256:14996d2cc84e6569448fcbe4f913930dbfcc92570d4935167692fac31e8e8eaa +size 2680861