diff --git a/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt b/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt index 2b83c1162..4a0af89ff 100644 --- a/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt +++ b/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt @@ -12744,6 +12744,133 @@ k_san_marino = { } +k_andorra = { + pattern="pattern_checkers_02.dds" + color1=yellow_light + color2=red + color3=blue + colored_emblem={ + color1=yellow_light + color2=red + texture="ce_verticle_stripes_02.dds" + instance={ + position={ 0.740000 0.250000 } + scale={ 0.480000 0.510000 } + depth=8.010000 + } + + } + + colored_emblem={ + color1=red + color2=blue_light + color3=yellow_light + texture="NEOW_ce_cow.dds" + instance={ + position={ 0.710000 0.810000 } + scale={ 0.330000 0.330000 } + depth=3.010000 + } + + } + + colored_emblem={ + color1=yellow_light + color2=red + texture="ce_vertical_stripes_01.dds" + instance={ + position={ 0.270000 1.000000 } + scale={ 0.460000 1.000000 } + depth=10.010000 + } + + } + + colored_emblem={ + color1=yellow_light + texture="ce_block_02.dds" + instance={ + position={ 1.000000 1.000000 } + depth=7.010000 + } + + instance={ + position={ 1.000000 0.000000 } + depth=9.010000 + } + + instance={ + position={ 0.000000 1.000000 } + depth=11.010000 + } + + } + + colored_emblem={ + color1=white + color2=yellow_light + color3=white + texture="NEOW_ce_bishops_mitre.dds" + instance={ + position={ 0.280000 0.260000 } + scale={ 0.450000 0.450000 } + depth=1.010000 + } + + } + + colored_emblem={ + color1=yellow_light + texture="ce_block_05.dds" + instance={ + position={ 0.180000 0.370000 } + scale={ 0.140000 0.140000 } + rotation=129 + } + + } + + colored_emblem={ + color1=red + color2=blue + color3=yellow_light + texture="NEOW_ce_cow.dds" + instance={ + position={ 0.710000 0.630000 } + scale={ 0.340000 0.340000 } + depth=4.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_block_02.dds" + instance={ + scale={ 1.000000 0.050000 } + depth=5.010000 + } + + instance={ + scale={ 0.040000 1.000000 } + depth=6.010000 + } + + } + + colored_emblem={ + color1=yellow_light + texture="ce_crozier.dds" + instance={ + position={ 0.290000 0.240000 } + scale={ 0.520000 0.520000 } + depth=2.010000 + rotation=41 + } + + } + +} d_andorra = { pattern="pattern_checkers_02.dds" diff --git a/common/decisions/NEOW_historical_formation_decisions.txt b/common/decisions/NEOW_historical_formation_decisions.txt index f82b54837..6f4a3d4bc 100644 --- a/common/decisions/NEOW_historical_formation_decisions.txt +++ b/common/decisions/NEOW_historical_formation_decisions.txt @@ -519,7 +519,8 @@ spain_decision = { completely_controls = title:k_aragon completely_controls = title:k_navarra completely_controls = title:k_spanish_galicia - completely_controls = title:k_canarias + completely_controls = title:k_canarias + completely_controls = title:k_andorra } is_valid_showing_failures_only = { diff --git a/common/dynasty_houses/NEOW_dynasty_houses.txt b/common/dynasty_houses/NEOW_dynasty_houses.txt index 47e993c97..155a087f9 100644 --- a/common/dynasty_houses/NEOW_dynasty_houses.txt +++ b/common/dynasty_houses/NEOW_dynasty_houses.txt @@ -7,11 +7,13 @@ house_belgium_oranje_nassau_weilburg = { house_jimena_zaragoza = { name = "dynn_jimena_zaragoza" dynasty = dias_dynasty # Dias + motto = dynn_dias_motto } house_jimena = { name = dynn_jimena dynasty = dias_dynasty #Dias + motto = dynn_dias_motto } house_britannia_crowtemple = { @@ -39,21 +41,25 @@ house_bourbon_naundorff = { prefix = "dynnp_de" name = dynn_Bourbon_dsh_Naundorff dynasty = borbon_dynasty + motto = dynn_bourbon_motto } house_bourbon_anjou = { prefix = "dynnp_de" name = dynn_Bourbon_Anjou dynasty = borbon_dynasty + motto = dynn_bourbon_motto } house_bourbon_parma = { prefix = "dynnp_de" name = dynn_Bourbon_Parma dynasty = borbon_dynasty + motto = dynn_bourbon_motto } house_bourbon_orleans = { prefix = "dynnp_de" name = dynn_Bourbon_Orleans dynasty = borbon_dynasty + motto = dynn_bourbon_motto } house_palermo = { diff --git a/common/flavorization/00_title_holders.txt b/common/flavorization/00_title_holders.txt index 8d8ffbb60..0d42c842e 100644 --- a/common/flavorization/00_title_holders.txt +++ b/common/flavorization/00_title_holders.txt @@ -104,7 +104,7 @@ title_prince = { gender = male special = holder priority = 60 - titles = { k_wales d_monaco d_lictenstein k_dacia k_moldavia c_chios k_bulgaria d_piedmonte d_sjaelland } + titles = { k_wales d_monaco d_lictenstein k_dacia k_moldavia c_chios k_bulgaria d_piedmonte d_sjaelland k_andorra d_andorra } governments = { feudal_government tribal_government administrative_government } #flavourization_rules = { # top_liege = no @@ -115,7 +115,7 @@ title_princess = { gender = female special = holder priority = 60 - titles = { k_wales d_monaco d_lictenstein k_dacia k_moldavia c_chios k_bulgaria d_piedmonte d_sjaelland } + titles = { k_wales d_monaco d_lictenstein k_dacia k_moldavia c_chios k_bulgaria d_piedmonte d_sjaelland k_andorra d_andorra } governments = { feudal_government tribal_government administrative_government } #flavourization_rules = { # top_liege = no @@ -123,7 +123,7 @@ title_princess = { } title_principality = { type = title - titles = { k_wales d_monaco d_lictenstein k_dacia k_moldavia c_chios k_bulgaria d_piedmonte d_sjaelland } + titles = { k_wales d_monaco d_lictenstein k_dacia k_moldavia c_chios k_bulgaria d_piedmonte d_sjaelland k_andorra d_andorra } priority = 160 governments = { feudal_government tribal_government administrative_government } #flavourization_rules = { diff --git a/common/landed_titles/iberia.txt b/common/landed_titles/iberia.txt index f6f1e72af..ccfe3ea4a 100644 --- a/common/landed_titles/iberia.txt +++ b/common/landed_titles/iberia.txt @@ -1977,102 +1977,6 @@ e_iberia = { } } } - d_andorra = { # Andorra - color = { 178 150 8 } - capital = c_andorra # Andorra la Vella - - cultural_names = { - name_list_occitan = cn_and_o_grv_rra - } - - c_andorra = { # Andorra - color = { 153 128 7 } - - cultural_names = { - name_list_occitan = cn_and_o_grv_rra - } - - b_andorra = { # Andorra la Vella - province = 1869 - color = { 170 97 92 } - - cultural_names = { - name_list_castilian = cn_andorra_la_vieja - name_list_NEOW_portuguese = cn_andorra_dsh_a_dsh_velha - name_list_NEOW_basque = cn_andorra_zaharra - name_list_occitan = cn_and_o_grv_rra_la_vi_e_grv_lha - name_list_aragonese = cn_andorra_la_viella - name_list_asturleonese = cn_andorra_la_vieya - } - } - } - c_urgell = { # Urgell - color = { 204 171 10 } - - cultural_names = { - name_list_castilian = cn_urgel - name_list_NEOW_portuguese = cn_urgel - name_list_occitan = cn_urg_e_grv_l - name_list_aragonese = cn_urchel - name_list_asturleonese = cn_urgel - } - - b_seu_d_urgell = { # La Seu d'Urgell - province = 8801 - color = { 170 97 92 } - - cultural_names = { - name_list_castilian = cn_seo_de_urgel - name_list_occitan = cn_la_seu_d_urg_e_grv_l - name_list_aragonese = cn_seu_d_pst_urchel - } - } - b_puigcerda = { # Puigcerdà - province = 1868 - color = { 145 105 90 } - - cultural_names = { - name_list_castilian = cn_puigcerd_a_act_ - name_list_aragonese = cn_puicerd_a_act_n - } - } - b_balaguer = { # Organyà - province = 1884 - color = { 170 97 92 } - - cultural_names = { - name_list_castilian = cn_orga_n_tld__a_act_ - } - } - } - c_pallas = { # Pallars - color = { 229 193 11 } - - cultural_names = { - name_list_occitan = cn_palhars - } - - b_pallars_jussa = { # Tremp - province = 8799 - color = { 163 81 75 } - } - b_pallars_sobira = { # Sort - province = 8800 - color = { 163 81 75 } - } - b_vielha = { # Aran - province = 1870 - color = { 163 81 75 } - - cultural_names = { - name_list_castilian = cn_ar_a_act_n - name_list_aragonese = cn_ar_a_act_n - name_list_asturleonese = cn_ar_a_act_n - name_list_NEOW_galician = cn_ar_a_act_n - } - } - } - } } k_navarra = { # Vasconia color = { 127 32 25 } @@ -3045,4 +2949,106 @@ e_iberia = { } } } + k_andorra = { # Andorra + color = { 178 150 20 } + capital = c_andorra # Andorra la Vella + definite_form = yes + + d_andorra = { # Andorra + color = { 178 150 8 } + capital = c_andorra # Andorra la Vella + + cultural_names = { + name_list_occitan = cn_and_o_grv_rra + } + + c_andorra = { # Andorra + color = { 153 128 7 } + + cultural_names = { + name_list_occitan = cn_and_o_grv_rra + } + + b_andorra = { # Andorra la Vella + province = 1869 + color = { 170 97 92 } + + cultural_names = { + name_list_castilian = cn_andorra_la_vieja + name_list_NEOW_portuguese = cn_andorra_dsh_a_dsh_velha + name_list_NEOW_basque = cn_andorra_zaharra + name_list_occitan = cn_and_o_grv_rra_la_vi_e_grv_lha + name_list_aragonese = cn_andorra_la_viella + name_list_asturleonese = cn_andorra_la_vieya + } + } + } + c_urgell = { # Urgell + color = { 204 171 10 } + + cultural_names = { + name_list_castilian = cn_urgel + name_list_NEOW_portuguese = cn_urgel + name_list_occitan = cn_urg_e_grv_l + name_list_aragonese = cn_urchel + name_list_asturleonese = cn_urgel + } + + b_seu_d_urgell = { # La Seu d'Urgell + province = 8801 + color = { 170 97 92 } + + cultural_names = { + name_list_castilian = cn_seo_de_urgel + name_list_occitan = cn_la_seu_d_urg_e_grv_l + name_list_aragonese = cn_seu_d_pst_urchel + } + } + b_puigcerda = { # Puigcerdà + province = 1868 + color = { 145 105 90 } + + cultural_names = { + name_list_castilian = cn_puigcerd_a_act_ + name_list_aragonese = cn_puicerd_a_act_n + } + } + b_balaguer = { # Organyà + province = 1884 + color = { 170 97 92 } + + cultural_names = { + name_list_castilian = cn_orga_n_tld__a_act_ + } + } + } + c_pallas = { # Pallars + color = { 229 193 11 } + + cultural_names = { + name_list_occitan = cn_palhars + } + + b_pallars_jussa = { # Tremp + province = 8799 + color = { 163 81 75 } + } + b_pallars_sobira = { # Sort + province = 8800 + color = { 163 81 75 } + } + b_vielha = { # Aran + province = 1870 + color = { 163 81 75 } + + cultural_names = { + name_list_castilian = cn_ar_a_act_n + name_list_aragonese = cn_ar_a_act_n + name_list_asturleonese = cn_ar_a_act_n + name_list_NEOW_galician = cn_ar_a_act_n + } + } + } + } + } } \ No newline at end of file diff --git a/common/scripted_effects/NEOW_historical_formation_decisions.txt b/common/scripted_effects/NEOW_historical_formation_decisions.txt index 892e99f36..7180808c4 100644 --- a/common/scripted_effects/NEOW_historical_formation_decisions.txt +++ b/common/scripted_effects/NEOW_historical_formation_decisions.txt @@ -74,6 +74,7 @@ spain_decision_effect = { title:k_navarra = { set_de_jure_liege_title = title:e_spain } title:k_spanish_galicia = { set_de_jure_liege_title = title:e_spain } title:k_canarias = { set_de_jure_liege_title = title:e_spain } + title:k_andorra = { set_de_jure_liege_title = title:e_spain } if = { limit = { diff --git a/history/provinces/e_france.txt b/history/provinces/e_france.txt index 34bd3727e..616e573d7 100644 --- a/history/provinces/e_france.txt +++ b/history/provinces/e_france.txt @@ -1090,7 +1090,7 @@ ###c_foix 2209 = { culture = occitan - rite = iberian_rite + rite = carolingian_rite holding = castle_holding } 2210 = { diff --git a/history/titles/k_relgious_heads.txt b/history/titles/k_relgious_heads.txt index a332c6fdb..4c298ebb5 100644 --- a/history/titles/k_relgious_heads.txt +++ b/history/titles/k_relgious_heads.txt @@ -1006,7 +1006,7 @@ d_andorra = { } 2550.1.1 = { holder = hispania0009 - government = theocracy_government + government = ecclesiastical_government } } 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 801623ff2..b9ec5a715 100644 --- a/localization/english/replace/zz_NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/zz_NEOW_dynasty_names_l_english.yml @@ -3801,8 +3801,8 @@ dynn_Jeziorny:0 "Jeziorny" dynn_Jikhl_a_uml_n:0 "Jikhlän" dynn_Jim_e_act_nez:0 "Jiménez" - dynn_jimena_zaragoza:0 "Ximénez-Zaragoza" - dynn_jimena:0 "Ximénez" + dynn_jimena_zaragoza:0 "Yáñez-Zaragoza" + dynn_jimena:0 "Yáñez" dynn_jimenez:0 "Jiménez" dynn_Jitaru:0 "Jitaru" dynn_Joggerst:0 "Joggerst" diff --git a/localization/english/replace/zz_NEOW_titles_l_english.yml b/localization/english/replace/zz_NEOW_titles_l_english.yml index 97057c3ef..33d38388a 100644 --- a/localization/english/replace/zz_NEOW_titles_l_english.yml +++ b/localization/english/replace/zz_NEOW_titles_l_english.yml @@ -1821,6 +1821,9 @@ b_amposta:0 "Amposta" b_maials:0 "El Vendrell" ## Andorra + k_andorra:0 "Andorra" + k_andorra_adj:0 "Andorran" + ## Andorra d_andorra:0 "Andorra" d_andorra_adj:0 "Andorran" # Andorra