From 4309da0d01deecd3fcf52706e178c110d9ff84fa Mon Sep 17 00:00:00 2001 From: JulesFlammenkueche Date: Sun, 8 Mar 2026 19:16:30 +0100 Subject: [PATCH] Renaming Portuguese glup shittos, adding Meursault and Tarrou to French name lists --- common/culture/name_lists/NEOW_french.txt | 4 ++-- common/culture/name_lists/NEOW_normaund.txt | 4 ++-- common/dynasties/NEOW_dynasties.txt | 15 ++++++++------- common/nicknames/NEOW_nicknames.txt | 1 + history/characters/NEOW_e_hispania.txt | 12 ++++++------ .../english/replace/NEOW_nicknames_l_english.yml | 1 + .../dynasties/NEOW_dynasty_names_l_english.yml | 2 ++ .../replace/dynasties/dynasty_names_l_english.yml | 2 -- .../dynasties/zz_NEOW_dynasty_names_l_english.yml | 5 ----- .../names/NEOW_character_names_l_english.yml | 4 +++- .../english/replace/nicknames_I_english.yml | 2 -- 11 files changed, 25 insertions(+), 27 deletions(-) delete mode 100644 localization/english/replace/nicknames_I_english.yml diff --git a/common/culture/name_lists/NEOW_french.txt b/common/culture/name_lists/NEOW_french.txt index e6a535f5..c011e8de 100644 --- a/common/culture/name_lists/NEOW_french.txt +++ b/common/culture/name_lists/NEOW_french.txt @@ -230,14 +230,14 @@ Jeanvaljean J-T-Maston Jules-C_e_act_sar K_i_act_li Legolas Lidenbrock - Mablung Maedhros Meriadoc Minastir Moli_e_grv_re Montaigne Montesquieu Morrel Myriel + Mablung Maedhros Meriadoc Meursault Minastir Moli_e_grv_re Montaigne Montesquieu Morrel Myriel N_e_act_mo Ned-Land Nicholl Nivacrin Num_e_act_robis Ob_e_act_lix Ocatarinetabellatchitchix Ol_o_act_rin Orodreth Orophin Ostoher Paladin Pallando Panoramix Passepartout Pencroff Peregr_i_uml_n Phileas-Fogg Phoebus Pontmercy Porthos Quasimodo Radagast Robur Roheryn Samsagace Spirou Sylvebarbe - T_u_act_rin Th_e_act_oden Th_e_act_odred Thengel Thingol Thorgal Thorin Thorondor Thr_a_act_in Thr_o_act_r Thranduil Tintin Tom-Bombadil Tr_e_act_ville Tuor Turgon + T_u_act_rin Tarrou Th_e_act_oden Th_e_act_odred Thengel Thingol Thorgal Thorin Thorondor Thr_a_act_in Thr_o_act_r Thranduil Tintin Tom-Bombadil Tr_e_act_ville Tuor Turgon Valacar Voltaire Zola diff --git a/common/culture/name_lists/NEOW_normaund.txt b/common/culture/name_lists/NEOW_normaund.txt index 226ba2c0..0793c8d1 100644 --- a/common/culture/name_lists/NEOW_normaund.txt +++ b/common/culture/name_lists/NEOW_normaund.txt @@ -282,14 +282,14 @@ Jeanvaljean J-T-Maston Jules-C_e_act_sar K_i_act_li Legolas Lidenbrock - Mablung Maedhros Meriadoc Minastir Moli_e_grv_re Montaigne Montesquieu Morrel Myriel + Mablung Maedhros Meriadoc Meursault Minastir Moli_e_grv_re Montaigne Montesquieu Morrel Myriel N_e_act_mo Ned-Land Nicholl Nivacrin Num_e_act_robis Ob_e_act_lix Ocatarinetabellatchitchix Ol_o_act_rin Orodreth Orophin Ostoher Paladin Pallando Panoramix Passepartout Pencroff Peregr_i_uml_n Phileas-Fogg Phoebus Pontmercy Porthos Quasimodo Radagast Robur Roheryn Samsagace Spirou Sylvebarbe - T_u_act_rin Th_e_act_oden Th_e_act_odred Thengel Thingol Thorgal Thorin Thorondor Thr_a_act_in Thr_o_act_r Thranduil Tintin Tom-Bombadil Tr_e_act_ville Tuor Turgon + T_u_act_rin Tarrou Th_e_act_oden Th_e_act_odred Thengel Thingol Thorgal Thorin Thorondor Thr_a_act_in Thr_o_act_r Thranduil Tintin Tom-Bombadil Tr_e_act_ville Tuor Turgon Valacar Voltaire Zola diff --git a/common/dynasties/NEOW_dynasties.txt b/common/dynasties/NEOW_dynasties.txt index 8ae029b2..67b7d4f5 100644 --- a/common/dynasties/NEOW_dynasties.txt +++ b/common/dynasties/NEOW_dynasties.txt @@ -1200,18 +1200,19 @@ ourense_dynasty = { culture = asturleonese } -coimbra_dynasty = { - name = dynn_coimbra +lourenco_dynasty = { + name = dynn_Louren_c_ced_o culture = portuguese } -fogaca_dynasty = { - name = dynn_fogaca +leal_dynasty = { + name = dynn_Leal culture = portuguese } alvarenga_dynasty = { - name = dynn_alvarenga + prefix = dynnp_de + name = dynn_Alvarenga culture = portuguese } @@ -1220,8 +1221,8 @@ aboim_dynasty = { culture = portuguese } -tavora_dynasty = { - name = dynn_tavora +martins_dynasty = { + name = dynn_Martins culture = portuguese } diff --git a/common/nicknames/NEOW_nicknames.txt b/common/nicknames/NEOW_nicknames.txt index 9344b90c..fa82c74f 100644 --- a/common/nicknames/NEOW_nicknames.txt +++ b/common/nicknames/NEOW_nicknames.txt @@ -4,6 +4,7 @@ # Exclusively Historical Nicknames nick_no_quarter = {} +nick_the_mighty = {} nick_the_senan = {} nick_the_soldier = {} nick_the_white_ermine = {} diff --git a/history/characters/NEOW_e_hispania.txt b/history/characters/NEOW_e_hispania.txt index c739e21e..913d62fd 100644 --- a/history/characters/NEOW_e_hispania.txt +++ b/history/characters/NEOW_e_hispania.txt @@ -251,6 +251,7 @@ thez_the_mighty = { trait = organizer trait = legend trait = one_legged #meant to reprsent missing arm cause ck3 + give_nickname=nick_the_mighty 1982.7.17 = { birth = yes } @@ -897,8 +898,8 @@ s_galicia_mumadona_ourense = { } } portugal_hermigo_coimbra = { - name = "Hermígo" - dynasty = coimbra_dynasty + name = "Armando" + dynasty = lourenco_dynasty religion = iberian culture = portuguese trait = forgiving @@ -914,7 +915,7 @@ portugal_hermigo_coimbra = { } portugal_bernardo_fogaca = { name = "Bernardo" - dynasty = fogaca_dynasty + dynasty = leal_dynasty religion = iberian culture = portuguese trait = zealous @@ -946,7 +947,7 @@ portugal_garcia_alvarenga = { } } portugal_vela_aboim = { - name = "Vela" + name = "Oct_a_act_vio" dynasty = aboim_dynasty religion = iberian culture = portuguese @@ -963,7 +964,7 @@ portugal_vela_aboim = { } portugal_catarina_tavora = { name = "Catarina" - dynasty = tavora_dynasty + dynasty = martins_dynasty religion = iberian culture = portuguese female = yes @@ -1056,7 +1057,6 @@ hispania_cortes_alonso = { hispania_patriarch_iago = { name = "Iago" - #dynasty = calderon_dynasty religion = "iberian" culture = portuguese trait = education_learning_4 diff --git a/localization/english/replace/NEOW_nicknames_l_english.yml b/localization/english/replace/NEOW_nicknames_l_english.yml index 44a55ddc..2bc3c210 100644 --- a/localization/english/replace/NEOW_nicknames_l_english.yml +++ b/localization/english/replace/NEOW_nicknames_l_english.yml @@ -1,5 +1,6 @@ l_english: nick_no_quarter:0 "No-Quarter" + nick_the_mighty:0 "the Mighty" nick_the_senan:0 "the Sénan" nick_the_senan_desc:1 "[CHARACTER.GetShortUINameNoTooltipNoFormat|U] [CharWereWas(CHARACTER)] raised on the island of Sein, and [CharWereWas(CHARACTER)] known for [CharYourHerHis(CHARACTER)] love of it." nick_the_soldier:0 "the Soldier" 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 dd2b4dfb..83eff261 100644 --- a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml @@ -2282,3 +2282,5 @@ dynn_Sabanc_i_dot_:0 "Sabancı" dynn__O_uml_zbek:0 "Özbek" dynn_Karag_o_uml_z:0 "Karagöz" + dynn_dias:0 "Dias" + dynn_Alvarenga:0 "Alvarenga" diff --git a/localization/english/replace/dynasties/dynasty_names_l_english.yml b/localization/english/replace/dynasties/dynasty_names_l_english.yml index 0512831e..8851d9dc 100644 --- a/localization/english/replace/dynasties/dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/dynasty_names_l_english.yml @@ -350,7 +350,6 @@ dynn_Altuntekin:0 "Altuntekin" dynn_Alupa:0 "Alupa" dynn_al-Yiliqi:0 "al-Yiliqi" - dynn_Alvarenga:0 "Alvarenga" dynn_Alwa:0 "Alwa" dynn_Alyattes:0 "Alyattes" dynn_Alyokid:0 "Alyokid" @@ -1570,7 +1569,6 @@ dynn_Coelho:0 "Coelho" dynn_Coenwalhing:0 "Coenwalhing" dynn_Cognac:0 "Cognac" - dynn_Coimbra:0 "Coimbra" dynn_Coistela:0 "Coistela" dynn_Coligny:0 "Coligny" dynn_Colleoni:0 "Colleoni" diff --git a/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml b/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml index fd18d6c7..ae7578e4 100644 --- a/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml @@ -200,7 +200,6 @@ dynn_borbon:0 "Bourbon" dynn_jimena:0 "Ximénez" dynn_jimena_zaragoza:0 "Ximénez-Zaragoza" - dynn_dias:0 "Dias" dynn_vivar:0 "Vivar" dynn_posas:0 "Posas" dynn_mateu:0 "Mateu" @@ -224,11 +223,7 @@ dynn_agurto:0 "Agurto" dynn_melendez:0 "Meléndez" dynn_estevez:0 "Estévez" - dynn_coimbra:0 "Coimbra" - dynn_fogaca:0 "Fogaça" - dynn_alvarenga:0 "Alvarenga" dynn_aboim:0 "Aboim" - dynn_tavora:0 "Távora" dynn_torre:0 "de la Torre" dynn_santibanez:0 "Santibáñez" dynn_almonte:0 "Almonte" 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 f3bc2f81..73f32f33 100644 --- a/localization/english/replace/names/NEOW_character_names_l_english.yml +++ b/localization/english/replace/names/NEOW_character_names_l_english.yml @@ -7414,4 +7414,6 @@ Nesrin:0 "Nesrin" Saffet:0 "Saffet" Y_u_uml_cel:0 "Yücel" - Birkan:0 "Birkan" \ No newline at end of file + Birkan:0 "Birkan" + Meursault:0 "Meursault" + Tarrou:0 "Tarrou" \ No newline at end of file diff --git a/localization/english/replace/nicknames_I_english.yml b/localization/english/replace/nicknames_I_english.yml deleted file mode 100644 index ea5f768c..00000000 --- a/localization/english/replace/nicknames_I_english.yml +++ /dev/null @@ -1,2 +0,0 @@ -l_english: - nick_the_saltspite:0 "Saltspite" \ No newline at end of file