diff --git a/common/culture/name_equivalency/00_NEOW_male_names.txt b/common/culture/name_equivalency/00_NEOW_male_names.txt index 1f7ed2fa6..d5e40e5b9 100644 --- a/common/culture/name_equivalency/00_NEOW_male_names.txt +++ b/common/culture/name_equivalency/00_NEOW_male_names.txt @@ -1033,7 +1033,7 @@ rashad_male = { R_shw__s_ced__shw_d Ra_s_ced_at Re_s_ced_at } rashid_male = { R_a_uml__s_ced_it R_shw__s_ced_id Ra_s_ced_id Rachid Rashid Re_s_ced_it } rasul_male = { Rasul Resul } rauf_male = { R_a_uml_wef Raouf } -rawshan_male = { R_o_uml_v_s_ced_ən Raw_s_ced_an Ru_s_ced_an } +rawshan_male = { R_o_uml_v_s_ced_en Raw_s_ced_an Ru_s_ced_an } rayan_male = { Rayan Rayanne } raymond_male = { Erramun Raimo Raimon Raimond Raimondas Raimondo Raimonds Raimu Raimund Raimundas Raimundo Raivo Rajmund Ram_o_act_n Ramon Ramoun Raymond Raymund Raymwndd Reemt Reima Reimo Remmes Remond Rejmondo Remont } reginald_male = { R_o_uml_gnvaldur Reginaildd Reginald Reinaldo Reinalt Reinaud Reinhold Reinis Reino Reinold Rejnaldo Renaldas Renaldo Renaud Rheinallt Rhonaldd Rhygynaldd Rinaldo Rinalds Ron Ronald Ronaldo Ronalds Ronaldus Ronny Rygynaldd Rygynalldd } diff --git a/common/culture/name_lists/NEOW_azerbaijani.txt b/common/culture/name_lists/NEOW_azerbaijani.txt index d2b9bd218..db19a34d0 100644 --- a/common/culture/name_lists/NEOW_azerbaijani.txt +++ b/common/culture/name_lists/NEOW_azerbaijani.txt @@ -227,7 +227,7 @@ Nadir Namiq Natiq Nazim Nicat Nizami Orxan Qurban - R_o_uml_v_s_ced_ən R_shw__s_ced__shw_d R_shw_him R_u_uml_st_shw_m Rafiq Ramin Ramiz Rasim Rauf Ruslan + R_o_uml_v_s_ced_en R_shw__s_ced__shw_d R_shw_him R_u_uml_st_shw_m Rafiq Ramin Ramiz Rasim Rauf Ruslan Sabir Sad_i_dot_q Sahib Samir Seymur Tahir Taleh Telman Teymur Tofiq Tural V_shw_fa V_u_uml_sal Vahid Vaqif Vasif Vidadi @@ -324,7 +324,7 @@ C_shw_nn_shw_t _C_ced_imnaz Diana Dil_s_ced_ad Durna F_shw_xriy_shw_ F_shw_zil_shw_ Fidan Flora - G_o_uml_vh_shw_r G_o_uml_z_shw_l G_u_uml_l_c_ced__o_uml_hr_shw_ G_u_uml_l_shw_r G_u_uml_ld_shw_st_shw_ G_u_uml_ll_u_uml_ G_u_uml_ls_u_uml_m G_u_uml_lt_shw_kin G_u_uml_n_shw_ş G_u_uml_nd_u_uml_z + G_o_uml_vh_shw_r G_o_uml_z_shw_l G_u_uml_l_c_ced__o_uml_hr_shw_ G_u_uml_l_shw_r G_u_uml_ld_shw_st_shw_ G_u_uml_ll_u_uml_ G_u_uml_ls_u_uml_m G_u_uml_lt_shw_kin G_u_uml_n_shw_s G_u_uml_nd_u_uml_z H_o_uml_kum_shw_ H_shw_c_shw_r Havva Jal_shw_ K_shw_klik Kamil_shw_ diff --git a/common/culture/name_lists/NEOW_cypriot.txt b/common/culture/name_lists/NEOW_cypriot.txt index 36868e8ef..e807639ae 100644 --- a/common/culture/name_lists/NEOW_cypriot.txt +++ b/common/culture/name_lists/NEOW_cypriot.txt @@ -179,8 +179,8 @@ mercenary_names = { - { name = "mercenary_company_akrítai" } - { name = "mercenary_company_cheroúli" } - { name = "mercenary_company_óplitis_of_place" } + { name = "mercenary_company_akritai" } + { name = "mercenary_company_cherouli" } + { name = "mercenary_company_oplitis_of_place" } } } \ No newline at end of file diff --git a/common/culture/name_lists/NEOW_greco_turkish.txt b/common/culture/name_lists/NEOW_greco_turkish.txt index cf759cb2f..c788b3267 100644 --- a/common/culture/name_lists/NEOW_greco_turkish.txt +++ b/common/culture/name_lists/NEOW_greco_turkish.txt @@ -182,8 +182,8 @@ mercenary_names = { - { name = "mercenary_company_akrítai" } - { name = "mercenary_company_cheroúli" } - { name = "mercenary_company_óplitis_of_place" } + { name = "mercenary_company_akritai" } + { name = "mercenary_company_cherouli" } + { name = "mercenary_company_oplitis_of_place" } } } \ No newline at end of file diff --git a/common/culture/name_lists/NEOW_greek.txt b/common/culture/name_lists/NEOW_greek.txt index 3ffba6f8b..8bb3439f5 100644 --- a/common/culture/name_lists/NEOW_greek.txt +++ b/common/culture/name_lists/NEOW_greek.txt @@ -138,8 +138,8 @@ mercenary_names = { - { name = "mercenary_company_akrítai" } - { name = "mercenary_company_cheroúli" } - { name = "mercenary_company_óplitis_of_place" } + { name = "mercenary_company_akritai" } + { name = "mercenary_company_cherouli" } + { name = "mercenary_company_oplitis_of_place" } } } \ No newline at end of file diff --git a/common/culture/name_lists/NEOW_rusyn.txt b/common/culture/name_lists/NEOW_rusyn.txt index 22265a899..675641ba3 100644 --- a/common/culture/name_lists/NEOW_rusyn.txt +++ b/common/culture/name_lists/NEOW_rusyn.txt @@ -28,7 +28,7 @@ "dynn_Dan_i_hat_l_pst_uk" "dynn_Dobr_pst_anskyj" "dynn_Duchnovi_c_crn_" - "dynn_Dul_i_hat_škov_i_hat_č" + "dynn_Dul_i_hat_skov_i_hat_c" "dynn_Dumn_i_hat__c_crn_" "dynn_F_i_hat_l_i_hat_p" "dynn_Felde_s_crn__i_hat_" @@ -163,7 +163,7 @@ "dynn_Dan_i_hat_l_pst_uk" "dynn_Dobr_pst_anskyj" "dynn_Duchnovi_c_crn_" - "dynn_Dul_i_hat_škov_i_hat_č" + "dynn_Dul_i_hat_skov_i_hat_c" "dynn_Dumn_i_hat__c_crn_" "dynn_F_i_hat_l_i_hat_p" "dynn_Felde_s_crn__i_hat_" diff --git a/common/landed_titles/caucasus.txt b/common/landed_titles/caucasus.txt index 6914dedc2..24c461dd4 100644 --- a/common/landed_titles/caucasus.txt +++ b/common/landed_titles/caucasus.txt @@ -481,7 +481,7 @@ e_caucasia = { color = { 125 115 115 } } } - c_samtskhe–javakheti = { # Samtskhe-Javakheti + c_samtskhe_javakheti = { # Samtskhe-Javakheti color = { 165 40 68 } b_akhaltsikhe = { # Akhaltsikhe diff --git a/common/laws/NEOW_succession_laws.txt b/common/laws/NEOW_succession_laws.txt index a6dee6072..1f5453fa3 100644 --- a/common/laws/NEOW_succession_laws.txt +++ b/common/laws/NEOW_succession_laws.txt @@ -1,6 +1,8 @@ -title_succession_laws = { # Default Feudal Elective feudal_elective_succession_law = { + law_group_type = title_succession_laws + index = 0 + can_have = { OR ={ government_has_flag = government_is_feudal @@ -75,6 +77,9 @@ # Thing scandinavian_elective_succession_law = { + law_group_type = title_succession_laws + index = 3 + can_have = { OR = { government_has_flag = government_is_feudal @@ -110,6 +115,9 @@ # Tanistry gaelic_elective_succession_law = { + law_group_type = title_succession_laws + index = 4 + can_have = { OR = { government_has_flag = government_is_feudal @@ -151,6 +159,9 @@ # Jirga elective tribal_elective_succession_law = { #FOR FP3 + law_group_type = title_succession_laws + index = 5 + can_have = { OR = { government_has_flag = government_is_feudal @@ -186,6 +197,9 @@ # Player Heir temporal_head_of_faith_succession_law = { + law_group_type = title_succession_laws + index = 6 + can_title_have = { is_temporal_head_of_faith_trigger = yes } @@ -205,6 +219,9 @@ # Noble Family Succession noble_family_succession_law = { + law_group_type = title_succession_laws + index = 7 + can_title_have = { OR = { is_noble_family_title = yes @@ -227,6 +244,9 @@ # Law of the Land Title Succession # Applied in on_title_gain when a county title's capital province has required heir government types defined and the new holder does not meet the requirement. law_of_the_land_succession_law = { + law_group_type = title_succession_laws + index = 8 + can_title_have = { tier = tier_county title_province = { @@ -249,6 +269,9 @@ } #Confederation elective confederation_elective_succession_law = { + law_group_type = title_succession_laws + index = 9 + can_title_have = { tier >= tier_kingdom } @@ -283,6 +306,9 @@ # Celestial Ministry Succession celestial_ministry_appointment_succession_law = { + law_group_type = title_succession_laws + index = 10 + can_have = { government_has_flag = government_is_celestial NOR = { @@ -350,11 +376,13 @@ # } theomonarchy_succession_law = { # For Helvetics and Monarchomachs + law_group_type = title_succession_laws + index = 12 + can_have = { government_has_flag = government_is_feudal faith = { has_doctrine_parameter = has_access_to_theomonarchy_succession } highest_held_title_tier >= tier_kingdom - } can_pass = { can_change_title_law_trigger = yes } diff --git a/common/on_action/struggle_on_actions.txt b/common/on_action/struggle_on_actions.txt index fc0e9c26a..e3d865b43 100644 --- a/common/on_action/struggle_on_actions.txt +++ b/common/on_action/struggle_on_actions.txt @@ -22,7 +22,7 @@ five_year_struggle_playable_pulse = { fp2_iberian_struggle_random_events = { trigger = { - alwasys = no + always = no # fp2_character_involved_in_struggle_trigger = yes } random_events = { diff --git a/common/religion/tenet_types/00_NEOW_tenet_types.txt b/common/religion/tenet_types/00_NEOW_tenet_types.txt index 4ba5d9f42..058bd592c 100644 --- a/common/religion/tenet_types/00_NEOW_tenet_types.txt +++ b/common/religion/tenet_types/00_NEOW_tenet_types.txt @@ -443,6 +443,7 @@ sins = { callous = { scale = 10 weight = 1 } murderer = { scale = 20 weight = 2 + } } } } @@ -517,7 +518,6 @@ sins = { callous = { weight = 20 scale = 2 } } - } } } diff --git a/common/scripted_effects/NEOW_religion_effects.txt b/common/scripted_effects/NEOW_religion_effects.txt index 98e2a84f6..4da42aa47 100644 --- a/common/scripted_effects/NEOW_religion_effects.txt +++ b/common/scripted_effects/NEOW_religion_effects.txt @@ -366,13 +366,13 @@ form_marblist_decision_effect = { } if = { limit = { - k_pontus = { is_titular = no } + title:k_pontus = { is_titular = no } OR = { - has_title = k_pontus - completely_controls = k_pontus + has_title = title:k_pontus + completely_controls = title:k_pontus } } - k_pontus = { set_de_jure_liege_title = title:e_NEOW_byzantium } + title:k_pontus = { set_de_jure_liege_title = title:e_NEOW_byzantium } } if = { limit = { diff --git a/common/succession_election/04_saxon_elective.txt b/common/succession_election/04_saxon_elective.txt index fd51a1ab0..5f72df397 100644 --- a/common/succession_election/04_saxon_elective.txt +++ b/common/succession_election/04_saxon_elective.txt @@ -59,8 +59,11 @@ saxon_elective = { #Farmer Elective } electors = { - add = holder - add = { + character_sets = { + electors_holder = { + type = holder + } + electors_dejure_vassals = { type = title_dejure_vassals limit = { target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included. @@ -68,14 +71,14 @@ saxon_elective = { #Farmer Elective NOT = { has_trait = incapable } } } - add = { + electors_council_members = { type = holder_council_members limit = { is_adult = yes NOT = { has_trait = incapable } } } - add = { + electors_direct_vassals = { type = holder_direct_vassals limit = { target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included. @@ -83,6 +86,7 @@ saxon_elective = { #Farmer Elective NOT = { has_trait = incapable } } } + } } candidate_score = { @@ -112,7 +116,8 @@ saxon_elective = { #Farmer Elective #scope:candidate = Candidate, scope:title = Title, scope:holder_candidate = Candidate currently selected by ruler. candidates = { - add = { + character_sets = { + candidates_dejure_vassals = { type = title_dejure_vassals limit = { target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included. @@ -131,7 +136,7 @@ saxon_elective = { #Farmer Elective } } } - add = { + candidates_family = { type = holder_close_or_extended_family limit = { feudal_elective_potential_landless_dynastic_candidate_trigger = yes @@ -151,7 +156,7 @@ saxon_elective = { #Farmer Elective } } } - add = { + candidates_direct_vassals = { type = holder_direct_vassals limit = { target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included. @@ -169,7 +174,7 @@ saxon_elective = { #Farmer Elective } } } - add = { + candidates_council_members = { type = holder_council_members limit = { OR = { @@ -190,6 +195,7 @@ saxon_elective = { #Farmer Elective government_has_flag = government_is_prepublic } } + } } } } @@ -256,8 +262,11 @@ urban_elective = { #Urban Elective } electors = { - add = holder - add = { + character_sets = { + electors_holder = { + type = holder + } + electors_dejure_vassals = { type = title_dejure_vassals limit = { target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included. @@ -265,14 +274,14 @@ urban_elective = { #Urban Elective NOT = { has_trait = incapable } } } - add = { + electors_council_members = { type = holder_council_members limit = { is_adult = yes NOT = { has_trait = incapable } } } - add = { + electors_direct_vassals = { type = holder_direct_vassals limit = { target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included. @@ -280,6 +289,7 @@ urban_elective = { #Urban Elective NOT = { has_trait = incapable } } } + } } candidate_score = { @@ -309,7 +319,8 @@ urban_elective = { #Urban Elective #scope:candidate = Candidate, scope:title = Title, scope:holder_candidate = Candidate currently selected by ruler. candidates = { - add = { + character_sets = { + candidates_dejure_vassals = { type = title_dejure_vassals limit = { target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included. @@ -331,7 +342,7 @@ urban_elective = { #Urban Elective } } } - add = { + candidates_family = { type = holder_close_or_extended_family limit = { feudal_elective_potential_landless_dynastic_candidate_trigger = yes @@ -351,7 +362,7 @@ urban_elective = { #Urban Elective } } } - add = { + candidates_direct_vassals = { type = holder_direct_vassals limit = { target_is_liege_or_above = scope:holder #All de jure vassals, no matter the tier, sub-vassals included. @@ -369,7 +380,7 @@ urban_elective = { #Urban Elective } } } - add = { + candidates_council_members = { type = holder_council_members limit = { OR = { @@ -390,6 +401,7 @@ urban_elective = { #Urban Elective government_has_flag = government_is_urepublic } } + } } } } diff --git a/history/provinces/e_caucasia.txt b/history/provinces/e_caucasia.txt index 3cf4d9d7a..70a581727 100644 --- a/history/provinces/e_caucasia.txt +++ b/history/provinces/e_caucasia.txt @@ -111,7 +111,7 @@ 5743 = { # Java holding = church_holding } -###c_samtskhe–javakheti +###c_samtskhe_javakheti 8954 = { # Akhaltsikhe culture = NEOW_armenian rite = armenian_rite diff --git a/localization/english/replace/zz_NEOW_character_names_l_english.yml b/localization/english/replace/zz_NEOW_character_names_l_english.yml index 853987104..ffed9aa2f 100644 --- a/localization/english/replace/zz_NEOW_character_names_l_english.yml +++ b/localization/english/replace/zz_NEOW_character_names_l_english.yml @@ -1165,7 +1165,7 @@ Afonso:0 "Afonso" Afrim:0 "Afrim" Afro:0 "Afro" - Äftax:0 "Äftax" + Aftax:0 "Äftax" Afx_e_act_ntios:0 "Afxéntios" Afzal:0 "Afzal" Afzaletdin:0 "Afzaletdin" @@ -7620,7 +7620,7 @@ G_u_uml_ltekin:0 "Gültekin" G_u_uml_lten:0 "Gülten" G_u_uml_lzira:0 "Gülzira" - G_u_uml_n_shw_ş:0 "Günəş" + G_u_uml_n_shw_s:0 "Günəş" G_u_uml_nar_shw_:0 "Gülnarə" G_u_uml_nd_u_uml_z:0 "Gündüz" G_u_uml_ndogdy:0 "Gündogdy" @@ -14393,7 +14393,7 @@ Muhedin:0 "Muhedin" Muhittin:0 "Muhittin" Muhlis:0 "Muhlis" - Mühls:0 "Mühls" + Muhls:0 "Mühls" Muhtar:0 "Muhtar" Muj_e_uml_:0 "Mujë" Mukadder:0 "Mukadder" @@ -15605,7 +15605,7 @@ Osla:0 "Osla" Osm_a_act_n:0 "Osmán" Osman:0 "Osman" - Ösmann:0 "Ösmann" + O_smann:0 "Ösmann" Osmond:0 "Osmond" Ostoher:0 "Ostoher" Ostoja:0 "Ostoja" @@ -16385,7 +16385,7 @@ R_o_uml_nn:0 "Rönn" R_o_uml_st_a_uml_m:0 "Röstäm" R_o_uml_tger:0 "Rötger" - R_o_uml_v_s_ced_ən:0 "Rövşən" + R_o_uml_v_s_ced_en:0 "Rövşən" R_o_uml_vn_shw_q:0 "Rövnəq" R_o_uml_w_s_ced_en:0 "Röwşen" R_o_uml_ya:0 "Röya" diff --git a/localization/english/replace/zz_NEOW_dynasty_names_l_english.yml b/localization/english/replace/zz_NEOW_dynasty_names_l_english.yml index 812d046eb..9a5e882e3 100644 --- a/localization/english/replace/zz_NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/zz_NEOW_dynasty_names_l_english.yml @@ -2341,7 +2341,7 @@ dynn_Dufour:0 "Dufour" dynn_Duhamel:0 "Duhamel" dynn_Duiker:0 "Duiker" - dynn_Dul_i_hat_škov_i_hat_č:0 "Dulîškovîč" + dynn_Dul_i_hat_skov_i_hat_c:0 "Dulîškovîč" dynn_duleep_singh:0 "Duleep Singh" dynn_Dullaert:0 "Dullaert" dynn_Duma:0 "Duma" diff --git a/localization/english/replace/zz_NEOW_mercenaries_l_english.yml b/localization/english/replace/zz_NEOW_mercenaries_l_english.yml index 4f43377a5..f33403a55 100644 --- a/localization/english/replace/zz_NEOW_mercenaries_l_english.yml +++ b/localization/english/replace/zz_NEOW_mercenaries_l_english.yml @@ -6,9 +6,9 @@ mercenary_company_free_batallion_of_place_article:0 "the " mercenary_company_rota_of_rus:0 "Russkaya Rota" mercenary_company_rota_of_rus_article:0 "the " - mercenary_company_akrítai:0 "Akrítai" - mercenary_company_akrítai_article: "the " - mercenary_company_cheroúli:0 "Eroúli" - mercenary_company_cheroúli_article: "the " - mercenary_company_óplitis_of_place:0 "Oplítes of [TITLE.GetNameNoTierNoTooltip]" + mercenary_company_akritai:0 "Akrítai" + mercenary_company_akritai_article:0 "the " + mercenary_company_cherouli:0 "Eroúli" + mercenary_company_cherouli_article:0 "the " + mercenary_company_oplitis_of_place:0 "Oplítes of [TITLE.GetNameNoTierNoTooltip]" mercenary_company_hoplites_of_place_article:0 "the " \ No newline at end of file diff --git a/localization/english/replace/zz_NEOW_titles_l_english.yml b/localization/english/replace/zz_NEOW_titles_l_english.yml index 8946aff36..97057c3ef 100644 --- a/localization/english/replace/zz_NEOW_titles_l_english.yml +++ b/localization/english/replace/zz_NEOW_titles_l_english.yml @@ -19340,8 +19340,8 @@ c_vanand_adj:0 "Karslı" c_dvin:0 "Lachin" c_dvin_adj:0 "Lachinli" - c_samtskhe–javakheti:0 "Samtskhe-Javakheti" - c_samtskhe–javakheti_adj:0 "Samtskhe-Javakheti" + c_samtskhe_javakheti:0 "Samtskhe-Javakheti" + c_samtskhe_javakheti_adj:0 "Samtskhe-Javakheti" c_klarjeti:0 "Bolnisi" c_klarjeti_adj:0 "Bolnisian" c_odishi:0 "Mingrelia" diff --git a/map_data/geographical_regions/geographical_region.txt b/map_data/geographical_regions/geographical_region.txt index 743fdc29f..40800d03c 100644 --- a/map_data/geographical_regions/geographical_region.txt +++ b/map_data/geographical_regions/geographical_region.txt @@ -4047,7 +4047,7 @@ dlc_fp2_mediterranean_shoreline = { # Then check is_coastal_county = yes } dlc_fp2_caucasian_iberia = { # Next to Georgia (Due to how counties are partitioned, and some warping, it does not match actual maps) - counties = { c_klarjeti c_inner_kartli c_samtskhe–javakheti c_vanand c_ardahan c_hayk c_kartli c_tbilisi c_kakheti c_lori c_gegharkunik c_tavush c_armavir c_hereti } + counties = { c_klarjeti c_inner_kartli c_samtskhe_javakheti c_vanand c_ardahan c_hayk c_kartli c_tbilisi c_kakheti c_lori c_gegharkunik c_tavush c_armavir c_hereti } } dlc_fp2_form_aragon_region = {