From 9a9336106407a78fe837abaf16093e87a641e921 Mon Sep 17 00:00:00 2001 From: JulesFlammenkueche Date: Wed, 28 Jan 2026 13:34:42 +0100 Subject: [PATCH] Brittany remap, some more loc stuff --- .../coat_of_arms/01_landed_titles.txt | 108 -------- .../name_equivalency/00_NEOW_female_names.txt | 32 +-- .../name_equivalency/00_NEOW_male_names.txt | 190 +++++++------ common/culture/name_lists/NEOW_brittannic.txt | 2 +- common/culture/name_lists/NEOW_swedish.txt | 125 ++++----- common/landed_titles/france.txt | 250 +++++++++--------- .../province_terrain/00_province_terrain.txt | 6 +- .../01_province_properties.txt | 26 +- common/religion/holy_sites/00_holy_sites.txt | 2 +- gfx/map/map_object_data/activities.txt | 46 +++- gfx/map/map_object_data/building_locators.txt | 52 +++- gfx/map/map_object_data/combat_locators.txt | 46 ++-- .../map_object_data/player_stack_locators.txt | 50 ++-- gfx/map/map_object_data/siege_locators.txt | 54 ++-- history/provinces/e_france.txt | 60 +++-- history/titles/k_brittany.txt | 99 +++++-- .../names/NEOW_character_names_l_english.yml | 243 +++++++++++++++++ .../english/replace/titles_l_english.yml | 40 +-- map_data/definition.csv | 46 ++-- map_data/provinces.png | 4 +- 20 files changed, 885 insertions(+), 596 deletions(-) diff --git a/common/coat_of_arms/coat_of_arms/01_landed_titles.txt b/common/coat_of_arms/coat_of_arms/01_landed_titles.txt index 5849f3d9..0d861679 100644 --- a/common/coat_of_arms/coat_of_arms/01_landed_titles.txt +++ b/common/coat_of_arms/coat_of_arms/01_landed_titles.txt @@ -3715,17 +3715,6 @@ c_pavia = { mask = { 2 } } } -c_penthievre = { - pattern = "pattern_shield_01.dds" - color1 = "red" - colored_emblem = { - texture = "ce_ermine.dds" - color1 = "white" - color2 = "black" - instance = { position = { 0.5 0.5 } scale = { 0.65 0.65 } } - mask = { 2 } - } -} c_perfeddwlad = { pattern = "pattern_solid.dds" color1 = "white" @@ -16921,47 +16910,6 @@ c_cornouaille = { } } -c_penthievre = { - pattern = "pattern_solid.dds" - color1 = "red" - color2 = "yellow" - colored_emblem = { - texture = "ce_block_02.dds" - color1 = "yellow" - color2 = "yellow" - instance = { position = { 0.5 0.156 } scale = { 1.0 0.312 } } - } - colored_emblem = { - texture = "ce_block_04.dds" - color1 = "yellow" - color2 = "yellow" - instance = { position = { 0.5 0.45 } scale = { 1.0 0.6 } } - instance = { position = { 0.5 0.55 } scale = { 1.0 0.6 } } - instance = { position = { 0.5 0.70 } scale = { 1.0 0.6 } } - instance = { position = { 0.5 0.80 } scale = { 1.0 0.6 } } - } -} - -c_nantes = { - pattern = "pattern_solid.dds" - color1 = "red" - color2 = "white" - colored_emblem = { - texture = "ce_chief_random.dds" - color1 = "white" - color2 = "white" - instance = { position = { 0.5 0.5 } scale = { 1.0 1.0 } } - } - colored_emblem = { - texture = "ce_crescent.dds" - color1 = "white" - color2 = "white" - instance = { position = { 0.32 0.48 } scale = { 0.5 0.5 } } - instance = { position = { 0.68 0.48 } scale = { 0.5 0.5 } } - instance = { position = { 0.5 0.75 } scale = { 0.5 0.5 } } - } -} - c_vannes = { pattern = "pattern_solid.dds" color1 = "red" @@ -22444,18 +22392,6 @@ b_laval = { } } -b_rais = { - pattern = "pattern_solid.dds" - color1 = "yellow" - color2 = "black" - colored_emblem = { - texture = "ce_ordinary_cross_5.dds" - color1 = "black" - color2 = "black" - instance = { position = { 0.5 0.5 } scale = { 1.0 1.0 } } - } -} - b_montlhery = { # Montlhéry pattern = "pattern_solid.dds" color1 = "yellow" @@ -23977,50 +23913,6 @@ b_chateaudun = { } } -b_chateaubriant = { - pattern = "pattern_solid.dds" - color1 = "red" - color2 = "yellow" - colored_emblem = { - texture = "ce_fleur.dds" - color1 = "yellow" - color2 = "yellow" - instance = { position = { 0.10 0.00 } scale = { 0.23 0.26 } } - instance = { position = { 0.30 0.00 } scale = { 0.23 0.26 } } - instance = { position = { 0.50 0.00 } scale = { 0.23 0.26 } } - instance = { position = { 0.70 0.00 } scale = { 0.23 0.26 } } - instance = { position = { 0.90 0.00 } scale = { 0.23 0.26 } } - instance = { position = { 0.00 0.20 } scale = { 0.23 0.26 } } - instance = { position = { 0.20 0.20 } scale = { 0.23 0.26 } } - instance = { position = { 0.40 0.20 } scale = { 0.23 0.26 } } - instance = { position = { 0.60 0.20 } scale = { 0.23 0.26 } } - instance = { position = { 0.80 0.20 } scale = { 0.23 0.26 } } - instance = { position = { 1.00 0.20 } scale = { 0.23 0.26 } } - instance = { position = { 0.10 0.40 } scale = { 0.23 0.26 } } - instance = { position = { 0.30 0.40 } scale = { 0.23 0.26 } } - instance = { position = { 0.50 0.40 } scale = { 0.23 0.26 } } - instance = { position = { 0.70 0.40 } scale = { 0.23 0.26 } } - instance = { position = { 0.90 0.40 } scale = { 0.23 0.26 } } - instance = { position = { 0.00 0.60 } scale = { 0.23 0.26 } } - instance = { position = { 0.20 0.60 } scale = { 0.23 0.26 } } - instance = { position = { 0.40 0.60 } scale = { 0.23 0.26 } } - instance = { position = { 0.60 0.60 } scale = { 0.23 0.26 } } - instance = { position = { 0.80 0.60 } scale = { 0.23 0.26 } } - instance = { position = { 1.00 0.60 } scale = { 0.23 0.26 } } - instance = { position = { 0.10 0.80 } scale = { 0.23 0.26 } } - instance = { position = { 0.30 0.80 } scale = { 0.23 0.26 } } - instance = { position = { 0.50 0.80 } scale = { 0.23 0.26 } } - instance = { position = { 0.70 0.80 } scale = { 0.23 0.26 } } - instance = { position = { 0.90 0.80 } scale = { 0.23 0.26 } } - instance = { position = { 0.00 1.00 } scale = { 0.23 0.26 } } - instance = { position = { 0.20 1.00 } scale = { 0.23 0.26 } } - instance = { position = { 0.40 1.00 } scale = { 0.23 0.26 } } - instance = { position = { 0.60 1.00 } scale = { 0.23 0.26 } } - instance = { position = { 0.80 1.00 } scale = { 0.23 0.26 } } - instance = { position = { 1.00 1.00 } scale = { 0.23 0.26 } } - } -} - b_piombino = { pattern = "pattern_solid.dds" color1 = "white" diff --git a/common/culture/name_equivalency/00_NEOW_female_names.txt b/common/culture/name_equivalency/00_NEOW_female_names.txt index 85297923..f65c6754 100644 --- a/common/culture/name_equivalency/00_NEOW_female_names.txt +++ b/common/culture/name_equivalency/00_NEOW_female_names.txt @@ -1,15 +1,16 @@ abigail_female = { Abby Abygayl } +ada_female = { Adda } adela_female = { Aaltje Ad_e_grv_lo Addyla } -adelaide_female = { Adelheid Addylaydy Aleida Alida Alijda Azala_i_uml_s Aziliz Azylis Elke Heidi } +adelaide_female = { Adelheid Addylayddy Addylaydy Aleida Alida Alijda Azala_i_uml_s Aziliz Azylis Elke Heidi } adriana_female = { Adriana Adriano } agatha_female = { _A_rng_got Agatha Agathe Agato } -agnes_female = { Agn_e_grv_s Agnes Agneta In_e_grv_s Oanell } +agnes_female = { Agn_e_grv_s Agnes Agneta Agnys In_e_grv_s Oanell } albana_female = { Aubano } alberta_female = { Alberdina Alberta Alberte Albertino_female } alexandra_female = { Alessandrino_female Alessandro_female Alexandra Alyksanddra Sandra Sandrine Sandrino_female Sandy } alexia_female = { Alessio_female } alfhild_female = { Vilde } -alice_female = { Alice Alicia Alis Alixe Alysy } +alice_female = { Alice Alicia Alis Alixe Alycy Alysy } alina_female = { Alina Alino } alfonsa_female = { Anfounsino } amanda_female = { Amanda Amandino Mandy } @@ -23,19 +24,20 @@ anastasia_female = { Anastasi_e_act_ } andrea_female = { Andrea Andrine Andriveto } angela_female = { Aela Aelia Aelig Ang_e_grv_lo_female Angela Engelina } angelica_female = { Angelica Angelico_female Angelika Angelique Lieke } -anna_female = { Ana Ana_i_uml_s Ane Aneto Anette Anita Anja Ann Anna Annaig Anne Anneke Annette Anni Annica Annick Annie Annigje Annika Anniken Anny Ano Anouk Antje Hanna Hannah Hanne Naig } +anna_female = { Ana Ana_i_uml_s Ane Aneto Anette Anita Anja Ann Anna Annaig Anne Anneke Annette Anni Annica Annick Annicka Annie Annigje Annika Anniken Anny Ano Anouk Antje Hanna Hannah Hanne Naig } annacatherine_female = { Anna-Karin } annacharlotte_female = { Ann-Charlotte } -annachristina_female = { Anna-Stina Annki } +annachristina_female = { Anna-Stina Ann-Christin Annki } annaclara_female = { Ano-Claro } annahelena_female = { Anna-Lena } annaeleonora_female = { Hannelore } annalaura_female = { Ano-Lauro } annalisa_female = { Anneli Anneliese Annelise Ano-Liso } annamargaret_female = { Anne-Margrete Anne-Mette } -annamaria_female = { Anna-Vari Annemarie Anne-Marie Annemie Annemieke Ano-Mar_i_grv_o } +annamaria_female = { Anna-Vari Annemarie Anne-Marie Annemie Annemieke Ann-Marie Ano-Mar_i_grv_o } annasophia_female = { Ano-Souf_i_grv_o } antonia_female = { Antoinette Antonetta Antonia Antouneto T_o_grv_nio_female Teuntje Tounieto } +aphrodite_female = { Affrhodyty } apollonia_female = { Lone Poul_o_grv_nio } arlette_female = { Arleto } astrid_female = { Asta Astri Astrid } @@ -69,7 +71,7 @@ carla_female = { Carla Carleno_female Carola Carole Carolo_female } carmen_female = { Carmen Carmina } carolina_female = { Carolina Caroline Caroulino Karolina Karoline } cassandra_female = { Cassandro Kasyy } -catherine_female = { Carin Carina Catarino Catharina Kafyryny Kajsa Karen Kari Karin Karina Karine Karyn Katarina Katell Katharina Katherina Katja Katrin Katrine Katy Kaytlyn Nienke Trijntje Trine } +catherine_female = { Carin Carina Catarino Catharina Kafyryny Kajsa Karen Kari Karin Karina Karine Karyn Katarina Katell Katharina Katherina Katja Katrin Katrina Katrine Katy Kaytlyn Nienke Trijntje Trine } cecilia_female = { Cecilia Cecilie Cecilo Cilly Silje Silke Sille Sisse Sissel Sysylya } celestina_female = { Celestino_female Celesto_female } celia_female = { Celi_a_grv_ } @@ -102,7 +104,7 @@ dominica_female = { Dominique_female Doumenico_female } dorothy_female = { Ddorofy Dorothea Dorthe Dourout_e_grv_io } edith_female = { Eddyf Edith Editha Edito } edmunda_female = { Edmunda } -eleanor_female = { A_e_act_nor Eleonore Eliounor Ellinor Elyanor Leounoro Lore } +eleanor_female = { A_e_act_nor Eleonor Eleonore Eliounor Ellinor Elyanor Leounoro Lore } eliana_female = { Eliano } elisa_female = { Elisa Elise Eliso } elizabeth_female = { Bab_e_grv_u_female Babette Bettina Eisab_e_grv_u Elesbed Elisabet Elisabeth Elizabeth Elsbeth Elsebeth Elyzabyf Liesel Lill Lis Lisbeth Lisen Lisette Liz Lizzie Lyzzyy } @@ -122,13 +124,13 @@ esther_female = { Est_e_grv_r Ester Esther } eugenia_female = { _E_act_ug_e_grv_nio } eulalia_female = { _E_act_ul_a_grv_lio } euphemia_female = { Euphemia } -eva_female = { _E_grv_vo Eva } +eva_female = { _E_grv_vo Eva Ewa } evelyn_female = { Evelien Evelina Eveline Evelino } fabiana_female = { Fabiano_female Fabienne } farah_female = { Farah Ffarrah } farida_female = { Farida } fatiha_female = { Fatiha } -fatima_female = { Fatma } +fatima_female = { Fatima Fatma } fatina_female = { Fatine } faustina_female = { Faustino_female } fawzia_female = { Fawzia } @@ -165,7 +167,7 @@ hajar_female = { Hajer } halima_female = { Halima } hanan_female = { Hanane } heather_female = { Hyafyr } -hedwig_female = { Hedda Hedwig } +hedwig_female = { Hedda Hedvig Hedwig } helen_female = { Elaine Elayny Elen Elena Elene Eleno Elin Elina Eline Ellen H_e_act_l_e_grv_ne Hel_e_act_n Hel_e_act_ne Helen Helena Helene Ilka Ilona Lena Nellie Nelly } henrietta_female = { Enrieto Harriet Heike Henderika Hendrica Hendrika Hendrikje Hendrina Henri_e_uml_tte Henrica Henriette Hetty Jette } hermine_female = { Hermina Hermine } @@ -192,7 +194,7 @@ jade_female = { Jade Jady } jahan_female = { Jihane } jennifer_female = { Gueni_e_grv_vro Guynyvyry Jennie Jennifer Jenny } jessica_female = { Jessic_a_grv_ Jessica Jessika Jyssyka Jyssyy } -joan_female = { Chanig Hanneke Janed Janedig Janeto_female Janine Janna Janneke Jannetje Janni Jannicke Jannie Jannigje Janny Jano_female Jansje Jantina Jantje Jany Jeanette Jeanne Jeannette Jeannick Joanna Johanna Johanne Jwan Sywan Yanna } +joan_female = { Chanig Hanneke Janed Janedig Janeto_female Janine Janna Janneke Jannetje Janni Jannicke Jannie Jannigje Janny Jano_female Jansje Jantina Jantje Jany Jeanette Jeanne Jeannette Jeannick Joanna Johanna Johanne Jonna Jwan Sywan Yanna } joanamaria_female = { Jano-Mar_i_grv_o } jocelyn_female = { Joucelino_female } joelle_female = { Jo_e_uml_lle Jouelo_female } @@ -222,7 +224,7 @@ linda_female = { Linda Lindo_female Lynda } linda_female = { Linn Linn_e_act_a Linnea } lisa_female = { Lisa Lise Liseto Liso_female Liza } lorraine_female = { Lauryn Lourreno } -louise_female = { Aloisia Lizig Lo_i_uml_za Loeiza Lou_i_uml_so_female Lou_i_uml_sono Louisa Louise Lovisa Lowysy Ludwiga Luisa Zaig } +louise_female = { Aloisia Lizig Lo_i_uml_za Loeiza Lou_i_uml_so_female Lou_i_uml_sono Louisa Louise Lova Lovisa Lowysy Ludwiga Luisa Zaig } lubna_female = { Lobna } lucia_female = { L_u_grv_ci Lucia Lusy Lusya } luciana_female = { Luciano_female } @@ -238,7 +240,7 @@ maria_female = { Maaike Maj Maja Majken Manon Manoun Mar_i_grv_o_female Mari Mar mariaangel_female = { Mar_i_grv_o-Ange } mariaanna_female = { Mar_i_grv_o-Ano Maria_spc_Anna Mariannick Marie-Annick Maryannick Rianne } mariaantonia_female = { Mar_i_grv_o-Antouneto } -mariabrigitta_female = { Majbritt } +mariabrigitta_female = { Majbritt Maj-Britt } mariacatherine_female = { Mar_i_grv_o-Catarino } mariacharlotte_female = { Marie_spc_Charlotte } mariachristina_female = { Mar_i_grv_o-Crestino Maria-Kristina } @@ -374,7 +376,7 @@ virginia_female = { Viergino_female } vivian_female = { Viviano_female } wenche_female = { Wenche Wencke } wiebke_female = { Vibeke } -wilhelmina_female = { Mimmi Minna Vilma Wilhelmina Wilhelmine Willemina Willy_female Wilma } +wilhelmina_female = { Hilma Mimmi Minna Vilma Wilhelmina Wilhelmine Willemina Willy_female Wilma } winifred_female = { Wynnyffrydd } yasmin_female = { Iasmino Ioasmyn Jasmijn Jasmin Jasmyn Yasmyn Yassmina } yolanda_female = { Jolanda Vi_o_act_ulando } diff --git a/common/culture/name_equivalency/00_NEOW_male_names.txt b/common/culture/name_equivalency/00_NEOW_male_names.txt index 7cbe4ddb..8b418fbf 100644 --- a/common/culture/name_equivalency/00_NEOW_male_names.txt +++ b/common/culture/name_equivalency/00_NEOW_male_names.txt @@ -28,17 +28,18 @@ albanus_male = { Alban Auban } alberic_male = { Aubrhyy } albert_male = { Adalbert Albert Albertus Alberzh Albrecht Albyrht Albyrt Aubert } albinus_male = { Albin Aubin } -alex_male = { Alyks } +alex_male = { Alex Alyks } alexander_male = { Alastayrh Aleissandre Aleksander Aleksandr Alexander Alexandre Alyksanddyr Alyksandyrh Sander } alexis_male = { Al_e_grv_ssi Alexis } alfonso_male = { Alfons Alphonse Anfous } alfred_male = { Alffrydd Alfred Alfret Alfrhyd } ali_male = { Ali Aly } +alwin_male = { Alvin } amabilus_male = { Amable } amadeus_male = { Am_e_act_d_e_act_e Amadi_e_act_u Gottlob } amalric_male = { Amaudri Amaury } amatus_male = { Amat } -ambrosius_male = { Ambr_o_grv_si Ambrosyws } +ambrosius_male = { Ambr_o_grv_si Ambrosyws Emrhys } amin_male = { Amine Elamine } amir_male = { Amir } anatolius_male = { Anat_o_grv_li Anatol } @@ -57,7 +58,7 @@ arnulf_male = { Arnulf } arsenius_male = { Arsena } arthur_male = { _A_grv_rtus Arfur Arhfurh Arthur } aryeh_male = { Arie } -asbjorn_male = { Asbj_o_stk_rn Espen } +asbjorn_male = { Asbj_o_stk_rn Ebbe Espen } asgeir_male = { Eske } augustine_male = { Agustin Augustinus } augustus_male = { Aguste August Awgustws } @@ -75,10 +76,10 @@ bashir_male = { B_e_act_chir } basil_male = { Basile } bassam_male = { Bassem } bedivere_male = { Byddywyyry Bydyvyrhy } -benedict_male = { Bendiks Bendt Benead Benedikt Benet Benezet Bengt Beno_i_hat_t Bent } +benedict_male = { Bendiks Bendt Benead Benedikt Benet Benezet Bengt Benny Beno_i_hat_t Bent } benjamin_male = { Ben Benjamin Bynjamyn } berengar_male = { B_e_act_renger Berengui_e_act_ } -bernard_male = { Berend Bernard Bernardus Bernat Berndt Bernhard Bernhardt Bernez } +bernard_male = { Berend Bernard Bernardus Bernat Berndt Bernhard Bernhardt Bernez Bernt } bert_male = { Bertus } bertrand_male = { Beltram Bertram Bertrand } bilal_male = { Bilal Bylal } @@ -109,12 +110,12 @@ caspar_male = { Casper Gaspard Jasper Jesper Kaspar Kasper } cedric_male = { C_e_act_dric Cedric Cydrhyc } celestine_male = { Celestin } chakrabarti_male = { Chacrabarty Shakrabarty } -charles_male = { Carl Carle Charhlys Charle Charles Charlez Karel Karl Sharlys } +charles_male = { Carl Carle Charhlys Charle Charles Charlez Charlie Karel Karl Sharlys } charlesedward_male = { Carl-Edvard } charleshenry_male = { Carle-Enri Karlheinz } charlesjohn_male = { Karl-Johan } -christian_male = { Carsten Christer Christiaan Christian Christianus Crestian Karsten Kresten Kristen_male Kristian } -christopher_male = { Chrhystoffyrh Christoffer Christoph Christophe Christopher Crist_o_grv_u Kit Kristof Kristoffer Shrystoffyr } +christian_male = { Carsten Christer Christiaan Christian Christianus Crestian Karsten Kresten Kristen_male Krister Kristian } +christopher_male = { Chrhystoffyrh Christoffer Christoph Christophe Christopher Crist_o_grv_u Kit Kristof Kristofer Kristoffer Shrystoffyr } claudius_male = { Claude_male Claudius Gl_a_grv_udi Glaoda Klaod } clement_male = { Cl_e_act_ment Clem_e_grv_nt Clemens Klement Klymynt } clovis_male = { Clouvis Clovis } @@ -144,13 +145,14 @@ dorian_male = { Ddorhyan Dourian } dylan_male = { Ddylan Dylan } eberhard_male = { Eberhard Evert } edmund_male = { Eddmundd Edmond Edmound Edmund } -edward_male = { _E_act_douard Audouard Eddwardd Edouard Eduard Edvard Edward } -edwin_male = { Edvin Edwin } +edward_male = { _E_act_douard Audouard Eaddwarhd Eddwardd Edouard Eduard Edvard Edward } +edwin_male = { Eddwyn Edvin Edwin } egbert_male = { Egbert } ekkehard_male = { Eike Ekkehard } eligius_male = { Aloi } elijah_male = { El_i_grv_o Elias Eliaz Ilyes Lyes } -elliot_male = { Elywt } +elliot_male = { Elliot Elywt } +elros_male = { Elrhos Elros } elouan_male = { Elouan Elouann } emeric_male = { Aimery Eimeri Emich } emil_male = { _E_act_mile Emil Emile Milio } @@ -158,7 +160,7 @@ emilian_male = { Emilian } emmanuel_male = { Emanuel Emmanuel Enmanu_e_grv_l Manu_e_grv_ Manuel } engelbert_male = { Engelbert Ingebrigt } erasmus_male = { Rasmus } -eric_male = { _E_act_ric Eirik Eri Eric Erich Erik Eryk } +eric_male = { _E_act_ric Eirik Erhyc Eri Eric Erich Erik Eryk } erlend_male = { Erland Erlend } ernest_male = { Ernest Ernst } erwin_male = { Erwein Erwin } @@ -178,36 +180,40 @@ fawzi_male = { Faouzi } felician_male = { Felician } felix_male = { F_e_act_lix F_e_grv_lis Felix } ferdinand_male = { Ferdinand Fernand } +fergus_male = { Ffyrhgus } fidel_male = { Fidelis } finlay_male = { Ffynnlay } -firmin_male = { Fermin } +firmin_male = { Fermin Ffyrhmyn } flavian_male = { Flavian } florent_male = { Floris Flour_e_grv_ns } florian_male = { Florian Flourian } -francis_male = { Chichoues Fa_n_tld_ch Ffransys Fra_n_tld_sez Franc_e_act_s Francis Franciscus Francoun Frank Frankie Frans Franz } +francis_male = { Chichoues Fa_n_tld_ch Ffransys Ffrhancys Fra_n_tld_sez Franc_e_act_s Francis Franciscus Francoun Frank Frankie Frans Franz } francisjoseph_male = { Franz_spc_Josef } francisxavier_male = { Franc_e_act_s-Savi_e_act_ } -frederick_male = { Ffryddyryk Freddie Freddy Frederi Frederig Frederik Fredrik Frieder Friedrich Frits Fritz } +frederick_male = { Ffrhydyrhyc Ffryddyryk Freddie Freddy Frederi Frederig Frederik Fredrik Frieder Friedrich Frits Fritz } fuad_male = { Foued Fu_pst_ad } fulk_male = { Ffulk } gabriel_male = { Gabri_e_act_u Gabriel } gael_male = { Ga_e_grv_l Ga_e_uml_l Gael } gaetan_male = { Gastoun } -galahad_male = { Galahadd } -gareth_male = { Garyf } +galahad_male = { Galahadd Gallahadd } +gareth_male = { Garhyf Garyf } gawayn_male = { Gawayn } -geoffrey_male = { Gaufre Gottfried Gyoffryy Jaufret Jeffrey } -george_male = { _O_uml_rjan G_o_uml_ran Georg Gyorgy J_o_grv_rgi J_o_stk_rgen J_o_stk_rn J_o_uml_ran J_u_uml_rgen Jord Jordy Joris Jorj Schorsch Youri } -gerald_male = { Gerald Giraud Gyraldd } +geoffrey_male = { Gaufre Godffrhyy Gottfried Gyoffrhyy Gyoffryy Jaufret Jeffrey } +george_male = { _O_uml_rjan G_o_uml_ran G_o_uml_rgen Georg Gyorgy Gyorhgy J_o_grv_rgi J_o_stk_rgen J_o_stk_rn J_o_uml_ran J_u_uml_rgen Jord Jordy Joris Jorj Schorsch Youri } +gerald_male = { Gerald Giraud Gyraldd Gyrhaldd } gerard_male = { Geert Gerard Gerardus Gerhard Gerhardus Gerrit Gert Girard } german_male = { German } -gilbert_male = { Gibert Gilbert Gylbyrt Jilberzh } +gerontius_male = { Gyraynt Gyrhaynt } +gilbert_male = { Gibert Gilbert Gylberht Gylbyrt Jilberzh } gildas_male = { Gildas Gweltaz Gylddas } -giles_male = { Gile Jil Jili } +giles_male = { Gile Gylys Jil Jili } gisbert_male = { Gijsbert Gijsbertus } -gordon_male = { Gorddon } +godwin_male = { Godwyn } +gordon_male = { Gorddon Gorhddon } graham_male = { Graham } -gregory_male = { Greg_o_grv_ri Gregor Grygory } +gregory_male = { Greg_o_grv_ri Gregor Grhygorhy Grygory } +griffith_male = { Grhyffyf } gunther_male = { G_u_uml_nter G_u_uml_nther Gunde Gunnar } guntram_male = { Guntram } gustav_male = { G_o_uml_sta Gust_a_grv_vi Gustaf Gustav } @@ -219,14 +225,15 @@ hadi_male = { H_e_act_di } hamed_male = { Hamed } hamza_male = { Hamza } harith_male = { Haryf } -harold_male = { Harald Haroldd } +harold_male = { Harald Harholdd Haroldd } +harper_male = { Harhpyrh } harvey_male = { Erv_e_act_ Herve } hashim_male = { Hachim } hassan_male = { Hasan Hassan Hassen } -hector_male = { Eitor Hyktor } +hector_male = { Ectorh Eitor Hyctorh Hyktor } helgi_male = { Helge } helmut_male = { Helmut Helmuth } -henry_male = { Enri Enzo Harry Heinrich Heinz Hendricus Hendrik Hendrikus Henri Henric Henricus Henrik Henry Herri Hynry } +henry_male = { Enri Enzo Harhrhy Harry Heinrich Heinz Hendricus Hendrik Hendrikus Henri Henric Henricus Henrik Henry Herri Hynry } herbert_male = { Herbert Heribert Hyrbyrt } hermann_male = { Armand Harm Herman Hermann Hermanus } hieronymus_male = { J_e_act_r_o_hat_me Jeroen Jirome Yerom } @@ -234,10 +241,11 @@ hilarius_male = { Il_a_grv_ri } hilmi_male = { Helmi } hippolyte_male = { Hippolyt Ipoulite } hisham_male = { Hicham Hichem } +horace_male = { Horhatyo } hubert_male = { Hubert Hubertus Huberzh Ubert } hugh_male = { Hugh Hugo Ugue } humbert_male = { Umbert } -humphrey_male = { Humffryy } +humphrey_male = { Humfrhyy Humffryy } husni_male = { Housni } hussam_male = { Houssam } hussein_male = { Hocine Houssen } @@ -247,7 +255,7 @@ idris_male = { Driss Iddrys Idriss } ignatius_male = { Ignaz } ingmar_male = { Ingemar } irenaeus_male = { Ireni_e_act_u } -isaac_male = { Isaak Isak } +isaac_male = { Isaac Isaak Isak } isidore_male = { Isidor } ismail_male = { Ishmayl Isma_e_uml_l Isma_i_uml_l } izzuddin_male = { Azzedine } @@ -255,18 +263,19 @@ jabir_male = { Jabyr } jalil_male = { Jalyl } jamal_male = { Djamel Jamel } jamaluddin_male = { Jamel_spc_Eddine } -james_male = { Jacob Jacobus Jakez Jakob Jaky Jamys Jamyy Jaque Jaume Jeppe Jim } +james_male = { Jacob Jacobus Jakez Jakob Jaky Jamys Jamyy Jaque Jaume Jeppe Jim Jimmy } jamesgeorge_male = { Jacob-G_o_uml_ran } jamesyves_male = { Jaque-Ives } jason_male = { Jasoun } jawad_male = { Jawad } +jekyll_male = { Jycyll Jykyll } jeremy_male = { Jarno Jerem_i_grv_a } jesse_male = { Jesse } jesus_male = { Issa } joachim_male = { Joachim Joakim Jochen Jouachin } job_male = { Job } -joel_male = { Jou_e_grv_l } -john_male = { Efan Hannes Hans Ian Ivan Jack Jak Jalyl Jan Janick Jann Jannick Jaouen Jens Joannes Johan Johann Johannes John Johnny Jon Yan Yann Yannick Yannig Yoan Yoann Yohan Yohann } +joel_male = { Joel Jou_e_grv_l } +john_male = { Efan Hampus Hannes Hans Hasse Ian Ivan J_o_uml_ns Jack Jak Jaky Jan Janick Jann Jannick Jaouen Jens Joannes Johan Johann Johannes John Johnny Jon Jonny Yan Yann Yannick Yannig Yoan Yoann Yohan Yohann } johnbaptist_male = { Jan-Batisto Johann_spc_Baptist Yann-Vadezour } johnbernard_male = { Jan-Bernat } johncharles_male = { Jan-Carle Yann-Charlez } @@ -290,15 +299,15 @@ johnphilip_male = { Jan-Felip } johnstephen_male = { Jan-Steve } johnyves_male = { Jan-Ives Jean-Yvon Yann-Erwan } jonah_male = { Jona_Jonah Jonah Jonas Youn_e_grv_s Yunis } -jonathan_male = { Johnafan Jonathan Jounatan } -jordan_male = { Jorddan Jourdan } +jonathan_male = { Johnafan Jonatan Jonathan Jounatan } +jordan_male = { Jorddan Jorhddan Jourdan } joseph_male = { J_o_act_us_e_grv_ Job_Joseph Joep Joey Jos Josef Joseph Josephus Josyff Jozeb Jozef Youssef } josephmary_male = { Jozeb-Mari } joshua_male = { Joschua Josh Joshua } jost_male = { Joost Jost } judicael_male = { Judica_e_uml_l Judikael } -jules_male = { J_u_grv_li Julius } -julian_male = { Julian Juluan } +jules_male = { J_u_grv_li Julius Julys } +julian_male = { Julian Juluan Julyan } justin_male = { Justin Justyn } justus_male = { Justus } kai_male = { Kai Kaj Kay } @@ -314,10 +323,10 @@ khalil_male = { Khalil } kosmas_male = { Cosme } kylian_male = { Kilian Kilyan Kylian Kyliann Kyllian } lambert_male = { Lambert Lambertus Lamprecht } -lancelot_male = { Lancelot Lansylot } +lancelot_male = { Lancelot Lancylot Lansylot } latif_male = { Latuf } lauge_male = { Lage Lauge } -lawrence_male = { Laora_n_tld_s Lars Lasse Laur_e_grv_ns Laurens Laurentius Lawrynsy Lorenz Lourens } +lawrence_male = { Laora_n_tld_s Lars Lasse Laur_e_grv_ns Laurens Laurentius Laurhyncy Lawrynsy Lorenz Lourens } leif_male = { Leif } lenaig_male = { L_e_act_na_i_uml_c Lenaig } leo_male = { Leo Leon Leoun } @@ -327,38 +336,42 @@ levi_male = { Levi } linus_male = { Linus } lionel_male = { Lionel Liounel Lyonyl } lothar_male = { Clotaire Lothar } -louis_male = { Alois Aloys Lo_i_uml_c Lo_i_uml_g Lo_i_uml_s Lodewijk Loeiz Lou_i_uml_s Louis Ludvig Ludwig Luis Lywys } +louis_male = { Alois Aloys Lo_i_uml_c Lo_i_uml_g Lo_i_uml_s Lodewijk Loeiz Lou_i_uml_s Louis Love Ludvig Ludwig Luis Lwddowyyc Lywys } lucian_male = { Lucian Lucien Lukian } -lucius_male = { Lwsyus } +lucius_male = { Lwcyus Lwsyus } luke_male = { Lu Luc Lucas Lukas Luky Luuk } lutfi_male = { Lotfi } mael_male = { Ma_e_uml_l Ma_e_uml_lan Mael } magnus_male = { Magne Magnus Mogens } mahdi_male = { Medhi Mehdi } majid_male = { Madjid } -malik_male = { Malek Mallyc Malyk } -manfred_male = { Manfred } +malcolm_male = { Malcolm } +malik_male = { Malek Mallyc Malyc Malyk } +malthe_male = { Malte Malthe } +manfred_male = { Manfred Manfrid } marcel_male = { Marc_e_grv_u Marcel Marsel } marcelinus_male = { Marcellinus } marinus_male = { Marinus } -marius_male = { M_a_grv_ri_male Marius } -mark_male = { Marc Marco Marcus Mark Markus } +marius_male = { M_a_grv_ri_male Marhyus Marius } +mark_male = { Marc Marco Marcus Marhc Mark Markus } martial_male = { Marciau } -martin_male = { Maarten Marten Martin Martinus Martijn Martyn Morten } +martin_male = { Maarten Marhtyn Marten Martin Martinus Martijn Martyn Morten } marwan_male = { Marouane Marwan } mathurin_male = { Mathurin Matilin } matthew_male = { Mads Mah_e_act_ Maho Matfyw Mathias Mathieu Mati_e_act_u Matias Mats Matth_a_uml_us Matthias Matthijs Mattias Mazhev Theis Thijs } -maurice_male = { Maoris Maurice Maurise Maurysy Moritz } +maurice_male = { Maoris Maurhycy Maurice Maurise Mauritz Maurysy Moritz } mawlud_male = { Miloud Mouloud } maxentius_male = { Meiss_e_grv_ns } max_male = { Mas Max } maximilian_male = { Maximilian } maximus_male = { Maime Maxime } +melchior_male = { Melker } +mercury_male = { Myrhcurhy } merlin_male = { Merlijn Myrlyn } -michael_male = { Chiel Maikel Meik Mich_e_grv_u Michael Michel Michiel Micka_e_uml_l Mikael Mike Mikkel Mikko Miqu_e_grv_u Misha_e_uml_l Myshayl } -morgan_male = { Morgan Morgann } +michael_male = { Chiel Maikel Meik Mich_e_grv_u Michael Michel Michiel Micka_e_uml_l Mikael Mike Mikkel Mikko Miqu_e_grv_u Misha_e_uml_l Mychayl Myshayl } +morgan_male = { Morgan Morgann Morhgan } moses_male = { Moussa } -muhammad_male = { Mamadou Mohamed Mohammad Mohammed Muhamydd } +muhammad_male = { Mamadou Mohamad Mohamed Mohammad Mohammed Mohammydd Muhamydd } muhammadali_male = { Mohamed_spc_Ali } munsif_male = { Moncef } mustafa_male = { Mustapha } @@ -366,53 +379,57 @@ nabil_male = { Nabil } nadir_male = { Nadir } naim_male = { Na_i_uml_m } najib_male = { N_e_act_jib } -nasir_male = { Nasser Nassur Nasyr } +nasir_male = { Nasser Nassur Nasyr Nasyrh } nathan_male = { Natan Nathan } -nathaniel_male = { Nafanayl Natanael } +nathaniel_male = { Nafanayl Nafanyyl Natanael } neville_male = { Nyvylly } -nicholas_male = { Claes Claus Colyn Klaas Klaus Nick Nicklas Nicolaas Nicolai Nicolaj Nicolay Nicoulau Niek Niels Niklas Nikolaj Nikolas Nikolaus Nikolaz Nils Nyk Nysholas } +nicholas_male = { Claes Claus Colyn Klaas Klas Klaus Nick Nicklas Niclas Nicolaas Nicolai Nicolaj Nicolay Nicoulau Niek Niels Niklas Nikolaj Nikolas Nikolaus Nikolaz Nils Nisse Nyk Nycholas Nysholas } noah_male = { Noah Nou_e_grv_ } -noel_male = { Calendau } +noel_male = { Calendau Noel } norbert_male = { Norbert Nourbert } -norman_male = { Normyn } +norman_male = { Norhman Normyn } nuruddin_male = { Nordine Noureddine } +oberon_male = { Wbyrhon Wbyron } octavius_male = { _O_act_ut_a_grv_vi Wktawyyus } odysseus_male = { Ulisse } -olaf_male = { Ola Olaf Olav Ole Olof Oluf } -oliver_male = { _O_act_ulivi_e_act_ Olier Oliver Wlywyyr } +olaf_male = { Ola Olaf Olav Ole Olle Olof Olov Oluf } +oliver_male = { _O_act_ulivi_e_act_ Olier Oliver Wlywyyr Wlywyyrh } oscar_male = { Oscar Oskar Ouscar } oswald_male = { Oswald } otto_male = { Eudes Otto Udo } owen_male = { Owen Owenn } pascal_male = { Pascal Pascau Paskal } patel_male = { Patyl Patyll } -patrick_male = { Padrig Patrice Patrick Patrig Patrik Patryk } +patrick_male = { Padrhyg Padrig Patrice Patrick Patrig Patrik Patryk } paul_male = { P_a_rng_l Palle Paol Pau Paul Paulus Pol Poul } pauljohn_male = { Paul_spc_Johannes } -percival_male = { Pyrsyval } -peter_male = { P_a_uml_r P_e_grv_ire P_e_hat_r Peder Pelle Per Peran Peter Petrus Petter Pierrick Piet Pieter Pytyr Pyyrs } +percival_male = { Pyrhcywyal Pyrsyval } +peter_male = { P_a_uml_r P_e_grv_ire P_e_hat_r Peder Pehr Pelle Per Peran Peter Petrus Petter Pierre Pierrick Piet Pieter Pyrh Pytyr Pytyrh Pyyrs } peteranthony_male = { P_e_grv_ire-Ant_o_grv_ni } +petergeorge_male = { Per-G_o_uml_ran } peterjames_male = { P_e_hat_r-Jakez } peterjohn_male = { P_e_grv_ire-Jan } petermary_male = { P_e_hat_r-Vari } +peterolaf_male = { Per-Olov } peteryves_male = { P_e_grv_ire-Ives P_e_hat_r-Erwan } philip_male = { Felip Ffylyp Filip Fillip Fulup Philip Philipp } -pippin_male = { Pepijn } +pippin_male = { Pepijn Pypyn } pius_male = { Pius } prosper_male = { Prousp_e_grv_r } qasim_male = { Kassim } quentin_male = { Quentin Quinten } quirinus_male = { Krijn } rafiq_male = { Rafik } -ragnar_male = { Rainer } +ragnar_male = { Ragnar Rainer } rahim_male = { Rahyym } +randolph_male = { Rhanddolff } raphael_male = { Raf_e_grv_u Raphael } rashid_male = { Rachid } raoul_male = { Raoul Ravous } rauf_male = { Raouf } rayan_male = { Rayan Rayanne } raymond_male = { Raimund Ramoun Raymond Remond Remont } -reginald_male = { Reinalt Reinaud Reinhold Ron Ronald Ronaldus Ronny Rygynaldd } +reginald_male = { Reinalt Reinaud Reinhold Rhonaldd Rhygynaldd Ron Ronald Ronaldus Ronny Rygynaldd } regis_male = { R_e_grv_gis } reinhard_male = { Reinhard } remigius_male = { Remi Roumi_e_act_ } @@ -420,17 +437,17 @@ renatus_male = { Reini_e_act_ Ren_e_act_ } reza_male = { Reda } reuben_male = { Ruben } riad_male = { Riad Riadh } -richard_male = { Ricard Ricardo Richard Richardt Richarzh Rick Rik Rikard Rykardd } +richard_male = { Rhycharhdd Ricard Ricardo Richard Richardt Richarzh Rick Rickard Rik Rikard Rykardd } ridwan_male = { Redouane } -robert_male = { Bob Rob Robert Robertus Robin Robyrt Roparzh Roubert Rupert Rupprecht } +robert_male = { Bob Rhobyn Rhobyrht Rob Robert Robertus Robin Robyrt Roparzh Roubert Rupert Rupprecht } roch_male = { Rochus } roderick_male = { Roudrigo } -roger_male = { R_u_uml_diger Roger Rogier Rogyr Roje Rougi_e_act_ Rutger } -roland_male = { Roland Rouland Wrlanddo } -roman_male = { Roman Rouman } +roger_male = { R_u_uml_diger Rhogyrh Roger Rogier Rogyr Roje Rougi_e_act_ Rutger } +roland_male = { Rholandd Roland Rouland Wrlanddo } +roman_male = { Rhoman Roman Rouman } romuald_male = { Roumiaud } ronan_male = { Renan Ronan } -rudolf_male = { Ralff Roelof Rolf Roud_o_grv_u Rudolf Ruud } +rudolf_male = { Ralff Rhalff Roelof Rolf Roud_o_grv_u Rudolf Ruud } ryan_male = { Ryan } said_male = { Sa_i_uml_d } salim_male = { Salim Selim Slim } @@ -439,34 +456,37 @@ samir_male = { Samir Samyr } samuel_male = { Sam Samu_e_grv_l Samuel Samuyl } sebastian_male = { Bas Bastiaan Bastian Sebastiaan Sebastian } sergius_male = { S_e_grv_rgi Serj } -severinus_male = { S_o_stk_ren Severin } +severinus_male = { S_o_stk_ren S_o_uml_ren Severin } +severus_male = { Sywyrhus } shamsuddin_male = { Chems-Eddine } shaykh_male = { Cheikh } sherlock_male = { Shyrlok } -siegfried_male = { Siegfried Sigfred Sigurd Sjoerd } +siegfried_male = { Siegfried Sigfred Sigfrid Sigurd Sjoerd } siegmund_male = { Sigismund Sigmund } simon_male = { Simen Simon Simoun Symon } solomon_male = { Slimane Souleymane } spencer_male = { Spynsyr } stanislaus_male = { Estanislau } stanley_male = { Stanlyy } -stein_male = { Steen } +stein_male = { Steen Sten } stephen_male = { _E_act_tienne Est_e_grv_ve Estefan Staffan Stef Stefan Steffen Stephan Steve Steven Styffyn } sufyan_male = { Seufyann Sofian Sofiane Soufian } sven_male = { Svein Sven Svend } +sviatopolk_male = { Svante } sylvain_male = { S_e_act_uvan Sylvain } +sylvester_male = { Sylwystyrh } sylvius_male = { Silvius } talal_male = { Talal } talib_male = { Talyb } taliesin_male = { Talyysyn } tanguy_male = { Tangi Tanguy } tariq_male = { Tarek Tareq Tarik } -thaddaeus_male = { Thadd_a_uml_us } +thaddaeus_male = { Thadd_a_uml_us Thaddyus } theo_male = { Theo } -theobald_male = { Tepot Theobald Tibaud } +theobald_male = { Tepot Theobald Thyobaldd Tibaud } theodore_male = { Teoudor Theodor Theodorus } theodoric_male = { Derk Dieter Dietrich Dirk Terris Thierry } -theophilus_male = { Teoufile Theophil } +theophilus_male = { Teoufile Theophil Thyoffylus } thomas_male = { Thomas Tom Tomas Tomaz Tommy Toumas } thor_male = { Thor Tor } thorbjorn_male = { Thorbj_o_stk_rn Thorbj_o_uml_rn Torben Torbj_o_stk_rn Torbj_o_uml_rn } @@ -476,33 +496,37 @@ thorkell_male = { Torkel } thorleif_male = { Tollef } thorir_male = { Thore Tore Ture } thorstein_male = { Thorsten Torstein Torsten } -tiberius_male = { Tiberius } +thorvald_male = { Torvald } +tiberius_male = { Tiberius Tybyrhyus } timothy_male = { Tim Timouti_e_act_u } tobias_male = { Tobias } -tristan_male = { Tristan Trystan } +tristan_male = { Trhystan Tristan Trystan } tryggve_male = { Tryggve Trygve } tugdual_male = { Tudal Tugdual } ulrich_male = { Ulrich Ulrik } -umar_male = { Oumar Umar } +umar_male = { Omar Oumar Umar } +urban_male = { Urban } +uther_male = { Ufrh Ufyr } uwe_male = { Ove Owe } uways_male = { Uways } -valdemar_male = { Valdemar } +valdemar_male = { Valdemar Waldemar } valentin_male = { Valentin } -valerian_male = { Wyalyryan } +valerian_male = { Wyalyrhyan Wyalyryan } valerius_male = { Val_e_grv_ri } -victor_male = { Victor Viktor Vitour } -vincent_male = { Vinc_e_grv_ns Vincent Visant } +victor_male = { Victor Viktor Vitour Wyyctorh } +vincent_male = { Vinc_e_grv_ns Vincent Visant Wyyncynt } walid_male = { Walid } -walter_male = { Gauchi_e_act_ Valter Walter Walther Waltyr Wouter } +walter_male = { Gauchi_e_act_ Valter Walter Walther Waltyr Waltyrh Wouter } werner_male = { Werner Wessel } wilfried_male = { Wilfried } -william_male = { Lomig Lyam Guih_e_grv_n Guih_e_grv_ume Gwilherm Gwillam Pim Vilhelm Villy Wilhelm Wilhelmus Willem William Willy Wyllyam } +william_male = { Bill Liam Lomig Lyam Guih_e_grv_n Guih_e_grv_ume Gwilherm Gwillam Pim Vilhelm Villy Wilhelm Wilhelmus Willem William Willy Wyllyam } wissam_male = { Wissam Wissem } wolf_male = { Ulf } xavier_male = { Savi_e_act_ Xaver Zavier } yassin_male = { Yacine Yassin Yassine } yves_male = { Eozen Erwan Erwann Ives Ivo Youen Youenn Youn Yves Yvon Yvonig Yvonnick } zachary_male = { Sashary Zacar_i_grv_o Zachary } +zahid_male = { Sahyd } zayn_male = { Sayn } zaynuddin_male = { Zin_e_act_dine } zeno_male = { Zeno } \ No newline at end of file diff --git a/common/culture/name_lists/NEOW_brittannic.txt b/common/culture/name_lists/NEOW_brittannic.txt index 0738d758..3a9ce551 100644 --- a/common/culture/name_lists/NEOW_brittannic.txt +++ b/common/culture/name_lists/NEOW_brittannic.txt @@ -206,7 +206,7 @@ name_list_prytoneg = { Eaddsyg Eaddwald Eaddwarhd Ectorh Eddyrhn Eddmundd Eddwyn Eynyon Elrhos Elyan Emrhys Erhyc Efan Ffyrhgus Ffyrhnffayl Ffyrhrhyks Ffylyp Ffrhancys Ffynyas Ffrhagan Ffrhyog Ffyrhmyn Ffrhydyrhyc Ffrhobyshyrh Gallahadd Gamon Gann Garhyf Gyoffrhyy Gyorhgy Gyrhaynt Gyrhaldd Gylberht Gylddas Gylys Godffrhyy Godwyn Gorhddon Grhygorhy Grhyffyf Grhyngolet Guy Gwyn Gwrhyadd - Hallatan Harholdd Harhpyrh Harhrhy Harhtnyll_Hartnell Hawylock Hyctorh Hyngyst Hyrham Horhatyo Hugh_Hugh Humfrhyy Hurhnddall + Hallatan Harholdd Harhpyrh Harhrhy Harhtnyll_Hartnell Hawylock Hyctorh Hyngyst Hyrham Horhatyo Hugh Humfrhyy Hurhnddall Iddwal Iddnyrhf Inyrh Isaac Isambarhdd Isylmo Ishmayl Jamys Jycyll John Jonathan Jorhddan Josyff Julys Julyan Justyn Lancylot Laurhyncy Lyyrh Lyu Lyonyl Lywarhch Locrhynus Lucan Lwcyus Lwddowyyc Lupus diff --git a/common/culture/name_lists/NEOW_swedish.txt b/common/culture/name_lists/NEOW_swedish.txt index 94ff95af..acdc0f9c 100644 --- a/common/culture/name_lists/NEOW_swedish.txt +++ b/common/culture/name_lists/NEOW_swedish.txt @@ -211,70 +211,71 @@ male_names = { 3 = { _A_rng_ke - Alexander Ali Anders Andreas Anton Arne Axel - Bengt Bertil Bj_o_uml_rn Bo Bror + Adam Alexander Alf Ali Anders Andreas Anton Arne Axel + Bengt Bernt Bertil Bj_o_uml_rn Bo Bror Carl Christer Christian Claes Dan Daniel David Dennis Emil Eric Erik Fredrik G_o_uml_ran Gert Gunnar Gustaf Gustav H_a_rng_kan Hans Henrik - Jan Jens Jesper Joakim Johan John Jonas - Karl Kent Kjell Knut Kurt - Lars Leif Lennart - Magnus Marcus Markus Martin Mattias Mats Michael Mikael + Jan Jens Jesper Jimmy Joakim Johan John Jonas + Karl Kenneth Kent Kjell Klas Knut Kurt + Lars Leif Lennart Linus + Magnus Marcus Markus Martin Mattias Mats Max Michael Mikael Niklas Nils - Ola Olof Oskar + Ola Olof Oscar Oskar P_a_uml_r Patrik Paul Peter Per Pontus Robert Robin Roger Rolf Rune Sebastian Simon Stefan Sten Stig Sven - Thomas Tobias Tommy Tony Tord + Thomas Tobias Tomas Tommy Tony Tord Ulf Viktor } 2 = { - Albert Albin Alfred Arvid August - B_o_uml_rje Benjamin Berndt Bert Birger - Charles Chris Christoffer Conny - Edvin Egon Einar Elias Emanuel Erland Ernst Eskil Evert - Filip Folke Frans Fritz - G_o_uml_sta Georg Gabriel - Hannes Harald Harry Helge Henning Henric Henry Herman Hugo + Adrian Ahmad Ahmed Albert Albin Alex Alfred Amir Andr_e_act_ Arvid August + B_o_uml_rje Benjamin Benny Berndt Bert Bill Birger + Charles Charlie Chris Christoffer Christopher Conny + Ebbe Edvin Egon Einar Elias Emanuel Erland Ernst Eskil Evert + Felix Filip Folke Frank Frans Fritz + G_o_uml_sta G_o_uml_te Georg Gabriel Glenn + Hampus Hannes Harald Harry Hasse Helge Henning Henric Henry Herman Holger Hugo Ibrahim Ingemar Ingvar Isak Ivan Ivar - J_o_uml_rgen Jack Jacob Jakob Jan-Erik Jarl Jim Johannes Jonathan Johnny - Kai Karl-Erik Karl-Johan Kevin Kristian - Lars-Erik Lars-Olof Lasse Leo Lucas Ludvig Ludwig Lukas - Mathias Mohammad - Niels - Ole Oliver Otto Ove Owe - Patrick Pelle Petter - Richard Rikard Roland Ronald Ronny Roy - Sam Samuel Staffan Stellan Sture Sune Sven-Olof - Tage Tom Torbj_o_uml_rn Tore Torsten Ture - Uno - Victor + J_o_uml_rgen Jack Jacob Jakob Jan-Erik Jarl Jerry Jim Joel Johannes Jon Jonatan Jonathan Johnny Jonny Josef + Kai Karl-Erik Karl-Johan Kevin Krister Kristian Kristofer Kristoffer + Lars-_A_rng_ke Lars-Erik Lars-Olof Lasse Leo Love Lucas Ludvig Ludwig Lukas + Malte Mathias Mohamad Mohamed Mohammad Mohammed Morgan + Nicklas Niclas Niels + Ole Oliver Olle Olov Omar Otto Ove Owe + Patrick Pehr Pelle Per-Olov Petter Philip Pierre + Ragnar Rasmus Richard Rickard Rikard Roland Ronald Ronny Roy + S_o_uml_ren Sam Samuel Sixten Staffan Stellan Sture Sune Svante Sven-Olof + Tage Tim Tom Torbj_o_uml_rn Tore Torsten Ture + Uno Urban + Victor Vincent Walter Wilhelm William } 1 = { _O_uml_rjan - Aage Algot Arnold - Brivio - Carl-Axel Carl-Edvard Carl-Einar Claes-Anders - Edvard Elver Evald + Aage Algot Alvin Arnold + Bengt-Urban Bernhard Brivio + Carl-Axel Carl-Edvard Carl-Einar Casper Claes-Anders Claes-Bertil + Edvard Elliot Elver Evald Eyvor Fillip Frankie - Gehn_a_uml_ll Gideon Gordon Gunde - Hilding - J_o_uml_ran Jacob-G_o_uml_ran Jan-Steve Jimisola John-Erik - Kit Kurre - Lage Lars-Inge Lars-Ivan - Manne Mikko - Natanael + Gehn_a_uml_ll Gideon Gordon Gunde Gustav-Adolf Guttorm + Herbert Hilding Hjalmar + J_o_uml_ns J_o_uml_ran Jacob-G_o_uml_ran Jan-Steve Jimisola John-Erik + Karl-Uno Kit Kurre + Lage Lars-Eric Lars-Inge Lars-Ivan Lars-Mikael Lars-Ove Lars-Uno Larz-Thure Leon Leonard Liam + Manfrid Manne Marcus-Gunnar Mauritz Melker Melvin Mikko + Natanael Nikolaus Nisse Noah Noel Orvar - Per-Gordon Per-Owe Per-Uno - Raoul Roine Rudolf - Signar Steve Sverker - Thorbj_o_uml_rn Torkel Tryggve Tyrone - Valter Vilgot Vilhelm + Per-Eric Per-Gordon Per-Otto Per-Owe Per-Uno + Rainer Raoul Ren_e_act_ Roine Rudolf + S_o_uml_lve Sigfrid Signar Sigurd Sten-Sture Steve Sverker + Theo Theodor Thorbj_o_uml_rn Torkel Torvald Tryggve Tyrone + Valdemar Valter Viggo Vilgot Vilhelm Volmar + Waldemar Widar Zlatan } } @@ -284,15 +285,15 @@ Agneta Alexandra Amanda Anette Anita Ann Anna Anne Anneli Annika Astrid Barbro Berit Birgit Birgitta Britt Britt-Marie Britta Camilla Carin Carina Caroline Cecilia Charlotte Christina - Ebba Elin Elisabeth Ellen Elsa Emelie Emma Erika Eva + Ebba Elin Elisabeth Ellen Elsa Emelie Emma Erika Eva Ewa Frida - Gerd_female Gun Gunilla Gunnel + Gerd_female Gun Gunilla Gunnel Gunvor Hanna Helena Ida Inga Ingela Inger Ingrid Irene Jeanette Jennie Jenny Jessica Johanna Julia Karin Katarina Kerstin Kristina Laila Lena Lina Linda Linn Lisa Lisbeth Louise - M_a_uml_rta Maj Malin Margareta Maria Marianne Marie Maud Mona Monica Monika + M_a_uml_rta Maj Malin Margareta Margit Maria Marianne Marie Maud Mona Monica Monika Nina Pernilla Petra Pia Rut @@ -302,37 +303,37 @@ Ylva Yvonne } 2 = { - Agnes Alice Alicia Alma Alva Andrea Angelica Anna-Karin Anna-Lena Anna-Stina Ann-Charlotte Annette Annica - Beata Beatrice Brita + Agnes Alice Alicia Alma Alva Andrea Angelica Anna-Karin Anna-Lena Anna-Stina Ann-Charlotte Ann-Christin Annette Annica Annie Ann-Marie + Beata Beatrice Brita Britt-Inger Catharina Charlotta Clara Claudia Cornelia Cristina - Dagmar Dagny Daniela + Dagmar Dagny Daniela Diana Elina Elisabet Elise Ella Ellinor Else Elvira Emilia Ester Evelina - Fanny Felicia Filippa Fredrika + Fanny Fatima Felicia Filippa Fredrika Gabriella Gerda Gertrud Greta Gudrun Gunhild - Hanne Hel_e_act_n Hel_e_act_ne Helen Helene Hildur Hillevi + Hanne Hedvig Hel_e_act_n Hel_e_act_ne Helen Helene Hildur Hillevi Inga-Lill Ingegerd Iris Isabella Isabelle - Jacqueline Jennifer Jessika Josefin Josefine Josephine + Jacqueline Jennifer Jessika Jonna Josefin Josefine Josephine Kajsa Karolina Katrin Klara Kristin - Li Lill Lillian Lilly Linn_e_act_a Linnea Liv Lotta Lovisa - Madeleine Maja Majken Marie-Louise Marika Marina Marion Marita Martha Martina Mathilda Matilda Mia Mikaela Mimmi Moa My - Nathalie Nellie Nelly Nora + Li Lilian_female Lill Lillian Lilly Linn_e_act_a Linnea Liv Lotta Lovisa + Madeleine Magdalena Maja Maj-Britt Majken Margaretha Mariann Marie-Louise Marika Marina Marion Marita Martha Martina Mathilda Matilda Mia Mikaela Mimmi Moa My + Nanna Natalie Nathalie Nellie Nelly Nicole Nora Olivia Pamela Paula - Rebecca Rebecka Rigmor Rose-Marie Rosita + Rebecca Rebecka Rigmor Ronja Rose-Marie Rosita Saga Sarah Selma Signe Sigrid Siri Sophie Stella Susan Susanna Tilda Titti Tora Tove Tyra - Vera Veronica Victoria Vilma Viola + Vera Veronica Victoria Viktoria Vilma Viola Wilma } 1 = { - Annki + Annicka Annki Beata-Marie - Elaine Eva-Lotta + Elaine Eleonor Ellie Esther Eva-Lotta Freja - Hedda Hildegard + Hedda Hildegard Hilma Janine - Katherina - Larissa Lavinia Lene Lin Lisen + Katherina Katrina + Larissa Lavinia Lene Lin Lisen Lova Malou Malvina Mariella Moah Molly Nova Thea Tilde Tone Tuva diff --git a/common/landed_titles/france.txt b/common/landed_titles/france.txt index 05b0c05b..fab7f4b1 100644 --- a/common/landed_titles/france.txt +++ b/common/landed_titles/france.txt @@ -34,7 +34,7 @@ e_france = { k_brittany = { color = { 197 197 216 } - capital = c_nantes + capital = c_rennes cultural_names = { name_list_brittannic = cn_brytanna @@ -58,10 +58,10 @@ e_france = { } } - d_brittany = { + d_brittany = { # Lower Brittany color = { 176 184 171 } - capital = c_vannes # Vannes + capital = c_french_leon # Brest c_french_leon = { color = { 156 168 170 } @@ -70,37 +70,149 @@ e_france = { province = 2157 color = { 69 97 97 } } + b_morlaix = { + province = 2278 + color = { 25 50 250 } + } + } + c_tregor = { + color = { 136 148 170 } + b_treguier = { province = 2161 color = { 81 133 133 } } - b_morlaix = { - province = 2278 - - color = { 25 50 250 } + b_cornouailles = { # Guinguamp + province = 2159 + color = { 120 161 161 } } } - c_finistere = { + c_finistere = { # Cornouaille color = { 182 185 152 } - b_st_pol_de_leon = { - province = 2158 + b_quimper = { + province = 2156 + color = { 168 101 186 } - color = { 69 97 97 } + cultural_names = { + name_list_breton = cn_kemper + } + } + b_concarneau = { + province = 8802 + color = { 168 101 186 } + + cultural_names = { + name_list_breton=cn_konk_kerne + } + } + b_st_pol_de_leon = { # Douarnenez + province = 2158 + color = { 168 101 186 } cultural_names = { name_list_breton = cn_kastell_paol } } - b_quimper = { - province = 2156 + b_carhaix = { + province = 8803 + color = { 168 101 186 } + + cultural_names = { + name_list_breton=cn_karaez + } + } + } + c_vannes = { + color = { 181 188 168 } - color = { 120 161 161 } + b_vannes = { + province = 2154 + color = { 145 170 171 } cultural_names = { - name_list_breton = cn_kemper + name_list_breton = cn_gwened + name_list_welsh = cn_guened } } + b_rohan = { # Pontivy + province = 2160 + color = { 145 170 171 } + } + b_lorient = { + province = 2155 + color = { 120 161 161 } + } + } + } + d_upper_brittany = { + color = { 185 190 178 } + + capital = c_rennes + + c_rennes = { + color = { 149 171 164 } + + b_rennes = { + province = 2165 + color = { 137 199 199 } + + cultural_names = { + name_list_breton = cn_roazhon + } + } + b_combourg = { # Dol + province = 2282 + color = { 137 199 199 } + } + b_fougeres = { + province = 9740 + color = { 137 199 199 } + } + } + c_nantes = { + color = { 150 172 166 } + + b_nantes = { + province = 2152 + color = { 131 145 145 } + + cultural_names = { + name_list_breton = cn_naoned + } + } + b_guerande = { # Saint-Nazaire + province = 2153 + color = { 131 145 145 } + } + b_chateaubriant = { + province = 2166 + color = { 131 145 145 } + } + b_rais = { # Rezé + province = 2151 + color = { 131 145 145 } + } + b_saint_brevin_les_pins = { # Redon + province = 9741 + color = { 131 145 145 } + } + } + c_saint_malo = { + color = { 129 151 144 } + + b_saint_malo = { + province = 2164 + color = { 81 133 133 } + + cultural_names = { + name_list_breton = cn_sant_malou + } + } + b_porhoet = { + province = 3222 + color = { 81 133 133 } + } } c_penthievre = { color = { 181 203 181 } @@ -113,115 +225,11 @@ e_france = { name_list_breton = cn_saint_brieg } } - b_saint_malo = { - province = 2164 - - color = { 81 133 133 } - - cultural_names = { - name_list_breton = cn_sant_malou - } - } - b_cornouailles = { - province = 2159 - - color = { 120 161 161 } - - } - } - c_vannes = { - color = { 181 188 168 } - - b_vannes = { - province = 2154 - - color = { 145 170 171 } - - cultural_names = { - name_list_breton = cn_gwened - name_list_welsh = cn_guened - } - } - - b_porhoet = { + b_loudeac = { province = 2163 color = { 145 170 171 } } - b_rohan = { - province = 2160 - color = { 145 170 171 } - } - b_lorient = { - province = 2155 - color = { 120 161 161 } - } - } - c_rennes = { - color = { 149 171 164 } - - b_rennes = { - province = 2165 - - color = { 137 199 199 } - - cultural_names = { - name_list_breton = cn_roazhon - } - } - b_combourg = { - province = 2282 - - color = { 137 199 199 } - } - b_fougeres = { - province = 9740 - - color = { 137 199 199 } - } - } - } - d_upper_brittany = { - color = { 185 190 178 } - - capital = c_nantes - - c_reze = { - color = { 170 169 172 } - - b_rais = { - province = 2151 - - color = { 131 145 145 } - } - b_saint_brevin_les_pins = { - province = 9741 - - color = { 131 145 145 } - } - } - c_nantes = { - color = { 150 172 166 } - - b_nantes = { - province = 2152 - - color = { 131 145 145 } - - cultural_names = { - name_list_breton = cn_naoned - } - } - b_guerande = { - province = 2153 - - color = { 131 145 145 } - } - b_chateaubriant = { - province = 2166 - - color = { 131 145 145 } - } } } } @@ -1450,7 +1458,7 @@ e_france = { } } } - d_aquitaine = { + d_aquitaine = { # Guyenne color = { 229 66 34 } capital = c_bordeaux diff --git a/common/province_terrain/00_province_terrain.txt b/common/province_terrain/00_province_terrain.txt index a7cf9992..5d8d0640 100644 --- a/common/province_terrain/00_province_terrain.txt +++ b/common/province_terrain/00_province_terrain.txt @@ -2936,7 +2936,7 @@ default_coastal_sea=coastal_sea 3219=forest 3220=forest 3221=mountains -3222=terraced_hills +3222=hills 3223=plains 3224=plains 3225=plains @@ -8044,8 +8044,8 @@ default_coastal_sea=coastal_sea 8799=mountains 8800=mountains 8801=mountains -8802=terraced_hills -8803=mountains +8802=plains +8803=plains 8804=terraced_hills 8805=terraced_hills 8806=terraced_hills diff --git a/common/province_terrain/01_province_properties.txt b/common/province_terrain/01_province_properties.txt index 13ebbfaa..933acedc 100644 --- a/common/province_terrain/01_province_properties.txt +++ b/common/province_terrain/01_province_properties.txt @@ -21974,10 +21974,6 @@ winter_severity_bias = 0.40 } ## c_issoudun -# b_issoudun -2278 ={ - winter_severity_bias = 0.40 -} # b_valencay 2277 ={ winter_severity_bias = 0.40 @@ -23210,6 +23206,18 @@ 2156 ={ winter_severity_bias = 0.40 } +# b_concarneau +8802 ={ + winter_severity_bias = 0.40 +} +# b_st_pol_de_leon +2158 ={ + winter_severity_bias = 0.40 +} +# b_carhaix +8803 ={ + winter_severity_bias = 0.40 +} # b_lorient 2155 ={ winter_severity_bias = 0.40 @@ -23223,8 +23231,8 @@ 2157 ={ winter_severity_bias = 0.40 } -# b_st_pol_de_leon -2158 ={ +# b_morlaix +2278 ={ winter_severity_bias = 0.40 } ## c_penthievre @@ -23240,6 +23248,9 @@ 2164 ={ winter_severity_bias = 0.40 } +3222 = { + winter_severity_bias = 0.40 +} ## c_rennes # b_rennes 2165 ={ @@ -44124,9 +44135,6 @@ 12819 = { winter_severity_bias = 0.90 } 12820 = { winter_severity_bias = 1.00 } -3222 = { - winter_severity_bias = 0.0 -} 9663 = { winter_severity_bias = 0.0 } diff --git a/common/religion/holy_sites/00_holy_sites.txt b/common/religion/holy_sites/00_holy_sites.txt index 0648f9b5..d2a5226d 100644 --- a/common/religion/holy_sites/00_holy_sites.txt +++ b/common/religion/holy_sites/00_holy_sites.txt @@ -53,7 +53,7 @@ rocamadour = { ker_ys = { county = c_finistere - barony = b_quimper + barony = b_douarnenez character_modifier = { embarkation_cost_mult = -0.25 legitimacy_gain_mult = 0.05 diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index 7f9191ac..2c1af65a 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -10465,7 +10465,7 @@ } { id=2151 - position={ 864.859619 0.000000 2959.745117 } + position={ 829.436768 0.000000 2956.106201 } rotation={ -0.000000 0.399774 -0.000000 0.916614 } scale={ 1.000000 1.000000 1.000000 } } @@ -10483,19 +10483,19 @@ } { id=2154 - position={ 786.531677 0.000000 2999.406494 } + position={ 783.513367 0.000000 3001.222168 } rotation={ -0.000000 0.590362 -0.000000 0.807138 } scale={ 1.000000 1.000000 1.000000 } } { id=2155 - position={ 747.446716 0.000000 3012.429443 } + position={ 749.040283 0.000000 3011.019287 } rotation={ -0.000000 0.400648 -0.000000 0.916232 } scale={ 1.000000 1.000000 1.000000 } } { id=2156 - position={ 694.713867 0.000000 3029.981689 } + position={ 695.520752 0.000000 3035.677490 } rotation={ -0.000000 -0.498280 -0.000000 0.867016 } scale={ 1.000000 1.000000 1.000000 } } @@ -10507,13 +10507,13 @@ } { id=2157 - position={ 697.578552 0.000000 3066.025146 } + position={ 692.956360 0.000000 3067.857666 } rotation={ -0.000000 -0.482095 -0.000000 0.876119 } scale={ 1.000000 1.000000 1.000000 } } { id=2158 - position={ 718.510803 0.000000 3049.344971 } + position={ 712.029297 0.000000 3047.148926 } rotation={ -0.000000 -0.402472 -0.000000 0.915433 } scale={ 1.000000 1.000000 1.000000 } } @@ -10525,7 +10525,7 @@ } { id=2160 - position={ 759.285400 0.000000 3037.775146 } + position={ 772.710999 0.000000 3031.904785 } rotation={ -0.000000 0.540646 -0.000000 0.841250 } scale={ 1.000000 1.000000 1.000000 } } @@ -10537,25 +10537,25 @@ } { id=2162 - position={ 784.612732 0.000000 3061.074463 } + position={ 800.800049 0.000000 3069.085449 } rotation={ -0.000000 -0.395875 -0.000000 0.918304 } scale={ 1.000000 1.000000 1.000000 } } { id=2163 - position={ 803.354675 0.000000 3030.695068 } + position={ 787.688782 0.000000 3046.712158 } rotation={ -0.000000 -0.285653 -0.000000 0.958333 } scale={ 1.000000 1.000000 1.000000 } } { id=2164 - position={ 815.307434 0.000000 3064.443604 } + position={ 812.212646 0.000000 3062.621582 } rotation={ -0.000000 0.287269 -0.000000 0.957850 } scale={ 1.000000 1.000000 1.000000 } } { id=2165 - position={ 844.692383 0.000000 3036.286377 } + position={ 853.628113 0.000000 3044.856934 } rotation={ -0.000000 -0.304526 -0.000000 0.952504 } scale={ 1.000000 1.000000 1.000000 } } @@ -11233,7 +11233,7 @@ } { id=2278 - position={ 730.154663 0.000000 3075.740479 } + position={ 702.707642 0.000000 3076.467529 } rotation={ -0.000000 -0.237011 -0.000000 0.971507 } scale={ 1.000000 1.000000 1.000000 } } @@ -11257,7 +11257,7 @@ } { id=2282 - position={ 845.372986 0.000000 3016.291016 } + position={ 850.377563 0.000000 3069.416260 } rotation={ -0.000000 0.452493 -0.000000 0.891768 } scale={ 1.000000 1.000000 1.000000 } } @@ -16691,6 +16691,12 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=3222 + position={ 803.777405 0.000000 3032.298096 } + rotation={ -0.000000 -0.803873 -0.000000 -0.594801 } + scale={ 1.000000 1.000000 1.000000 } + } { id=3256 position={ 1277.000000 0.000000 2636.000000 } @@ -47549,6 +47555,18 @@ rotation={ 0.000000 0.715236 0.000000 -0.698883 } scale={ 1.000000 1.000000 1.000000 } } + { + id=8802 + position={ 739.953857 0.000000 3017.534180 } + rotation={ 0.000000 0.715236 0.000000 -0.698883 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=8803 + position={ 739.931702 0.000000 3047.716553 } + rotation={ 0.000000 0.715236 0.000000 -0.698883 } + scale={ 1.000000 1.000000 1.000000 } + } { id=8993 position={ 1296.000000 0.000000 993.000000 } @@ -51937,7 +51955,7 @@ } { id=9741 - position={ 842.500854 0.000000 2939.635254 } + position={ 834.810852 0.000000 2992.863770 } rotation={ 0.000000 0.615540 0.000000 0.788105 } 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 2847feb9..e7bdb6cc 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -10447,13 +10447,19 @@ } { id=2154 - position={ 789.915771 0.000000 2990.651855 } + position={ 786.454224 0.000000 2993.452393 } rotation={ -0.000000 -0.980064 -0.000000 -0.198682 } scale={ 1.000000 1.000000 1.000000 } } { id=2155 - position={ 750.077637 0.000000 3005.085449 } + position={ 747.445190 0.000000 3004.728271 } + rotation={ -0.000000 -0.546920 -0.000000 -0.837185 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=2156 + position={ 699.640015 0.000000 3027.995361 } rotation={ -0.000000 -0.546920 -0.000000 -0.837185 } scale={ 1.000000 1.000000 1.000000 } } @@ -10465,19 +10471,19 @@ } { id=2158 - position={ 699.525879 0.000000 3051.644043 } + position={ 697.521301 0.000000 3041.768311 } rotation={ -0.000000 -0.073746 -0.000000 -0.997277 } scale={ 1.000000 1.000000 1.000000 } } { id=2159 - position={ 748.432922 0.000000 3063.345703 } + position={ 763.069397 0.000000 3069.544434 } rotation={ -0.000000 -0.362871 -0.000000 -0.931839 } scale={ 1.000000 1.000000 1.000000 } } { id=2160 - position={ 767.843018 0.000000 3031.123535 } + position={ 775.575867 0.000000 3023.020020 } rotation={ -0.000000 -0.736437 -0.000000 0.676506 } scale={ 1.000000 1.000000 1.000000 } } @@ -10489,25 +10495,25 @@ } { id=2162 - position={ 785.077637 0.000000 3053.085449 } + position={ 790.244995 0.000000 3062.997559 } rotation={ -0.000000 -0.963045 -0.000000 -0.269339 } scale={ 1.000000 1.000000 1.000000 } } { id=2163 - position={ 793.077637 0.000000 3021.085449 } + position={ 790.590576 0.000000 3039.703857 } rotation={ -0.000000 -0.722821 -0.000000 0.691036 } scale={ 1.000000 1.000000 1.000000 } } { id=2164 - position={ 815.974915 0.000000 3054.353271 } + position={ 819.145996 0.000000 3070.399170 } rotation={ -0.000000 -0.919892 -0.000000 0.392172 } scale={ 1.000000 1.000000 1.000000 } } { id=2165 - position={ 838.215576 0.000000 3058.103760 } + position={ 846.197266 0.000000 3041.211670 } rotation={ -0.000000 -0.994969 -0.000000 -0.100182 } scale={ 1.000000 1.000000 1.000000 } } @@ -11209,8 +11215,8 @@ } { id=2282 - position={ 827.672119 0.000000 3014.620117 } - rotation={ -0.000000 -0.992671 -0.000000 0.120850 } + position={ 832.223511 0.000000 3069.666748 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -16643,6 +16649,12 @@ rotation={ -0.000000 -0.803873 -0.000000 -0.594801 } scale={ 1.000000 1.000000 1.000000 } } + { + id=3222 + position={ 801.545410 0.000000 3025.477051 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } { id=3256 position={ 1272.259521 0.000000 2644.063232 } @@ -47501,6 +47513,18 @@ rotation={ 0.000000 0.715236 0.000000 -0.698883 } scale={ 1.000000 1.000000 1.000000 } } + { + id=8802 + position={ 719.064636 0.000000 3019.089600 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=8803 + position={ 741.431274 0.000000 3053.252197 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } { id=8993 position={ 1316.077637 0.000000 1010.085571 } @@ -51859,14 +51883,14 @@ } { id=9740 - position={ 860.726013 0.000000 3052.094238 } + position={ 864.808167 0.000000 3051.158203 } rotation={ 0.000000 0.998840 0.000000 -0.048154 } scale={ 1.000000 1.000000 1.000000 } } { id=9741 - position={ 830.077637 0.000000 2949.085449 } - rotation={ 0.000000 0.615540 0.000000 0.788105 } + position={ 824.000000 0.000000 3001.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } 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 a4b637b8..677bc561 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -12151,7 +12151,7 @@ } { id=2151 - position={ 856.522461 0.000000 2950.047119 } + position={ 837.147278 0.000000 2945.732666 } rotation={ -0.000000 -0.773704 -0.000000 0.633547 } scale={ 1.000000 1.000000 1.000000 } } @@ -12163,25 +12163,25 @@ } { id=2153 - position={ 819.277222 0.000000 2983.745850 } + position={ 819.698730 0.000000 2981.138184 } rotation={ -0.000000 -0.934259 -0.000000 0.356595 } scale={ 1.000000 1.000000 1.000000 } } { id=2154 - position={ 808.419922 0.000000 2999.270264 } + position={ 773.103821 0.000000 2995.883057 } rotation={ -0.000000 -0.732769 -0.000000 0.680477 } scale={ 1.000000 1.000000 1.000000 } } { id=2155 - position={ 769.385315 0.000000 3005.183594 } + position={ 764.547485 0.000000 3002.903320 } rotation={ -0.000000 -0.752676 -0.000000 0.658391 } scale={ 1.000000 1.000000 1.000000 } } { id=2156 - position={ 711.978455 0.000000 3033.133057 } + position={ 687.084839 0.000000 3032.782227 } rotation={ -0.000000 -0.239048 -0.000000 0.971008 } scale={ 1.000000 1.000000 1.000000 } } @@ -12193,49 +12193,49 @@ } { id=2158 - position={ 727.819763 0.000000 3057.205811 } + position={ 717.528809 0.000000 3052.202637 } rotation={ -0.000000 -0.547760 -0.000000 0.836636 } scale={ 1.000000 1.000000 1.000000 } } { id=2159 - position={ 758.941772 0.000000 3063.397217 } - rotation={ -0.000000 -0.715359 -0.000000 0.698757 } + position={ 770.592468 0.000000 3063.687744 } + rotation={ -0.000000 -0.999913 -0.000000 -0.013168 } scale={ 1.000000 1.000000 1.000000 } } { id=2160 - position={ 735.123596 0.000000 3035.936035 } + position={ 761.093811 0.000000 3027.522217 } rotation={ -0.000000 -0.652607 -0.000000 0.757696 } scale={ 1.000000 1.000000 1.000000 } } { id=2161 - position={ 743.000000 0.000000 3089.000000 } + position={ 733.708984 0.000000 3075.658936 } rotation={ -0.000000 -0.724084 -0.000000 0.689712 } scale={ 1.000000 1.000000 1.000000 } } { id=2162 - position={ 795.000000 0.000000 3066.000000 } + position={ 801.322876 0.000000 3045.862549 } rotation={ -0.000000 -0.605587 -0.000000 0.795779 } scale={ 1.000000 1.000000 1.000000 } } { id=2163 - position={ 809.000000 0.000000 3032.000000 } - rotation={ -0.000000 -0.806348 -0.000000 0.591441 } + position={ 788.964172 0.000000 3029.294922 } + rotation={ -0.000000 -0.980252 -0.000000 -0.197752 } scale={ 1.000000 1.000000 1.000000 } } { id=2164 - position={ 822.276672 0.000000 3067.717529 } + position={ 815.706482 0.000000 3047.534668 } rotation={ -0.000000 -0.332751 -0.000000 0.943015 } scale={ 1.000000 1.000000 1.000000 } } { id=2165 - position={ 831.878357 0.000000 3045.331543 } + position={ 845.446594 0.000000 3022.893311 } rotation={ -0.000000 -0.705068 -0.000000 0.709139 } scale={ 1.000000 1.000000 1.000000 } } @@ -12913,8 +12913,8 @@ } { id=2278 - position={ 717.822937 0.000000 3076.012939 } - rotation={ -0.000000 -0.724822 -0.000000 0.688936 } + position={ 718.989868 0.000000 3067.020508 } + rotation={ -0.000000 -0.976550 -0.000000 0.215292 } scale={ 1.000000 1.000000 1.000000 } } { @@ -12937,7 +12937,7 @@ } { id=2282 - position={ 834.262085 0.000000 3010.741211 } + position={ 838.098938 0.000000 3054.916748 } rotation={ -0.000000 -0.751903 -0.000000 0.659274 } scale={ 1.000000 1.000000 1.000000 } } @@ -18373,7 +18373,7 @@ } { id=3222 - position={ 7225.000000 0.000000 2123.000000 } + position={ 817.284790 0.000000 3014.534912 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -50527,13 +50527,13 @@ } { id=8802 - position={ 7280.000000 0.000000 2153.000000 } + position={ 733.600830 0.002930 3031.274170 } rotation={ 0.000000 -0.707107 0.000000 0.707107 } scale={ 1.000000 1.000000 1.000000 } } { id=8803 - position={ 7215.000000 0.000000 2149.000000 } + position={ 762.565674 0.000000 3051.082275 } rotation={ 0.000000 0.838492 0.000000 0.544914 } scale={ 1.000000 1.000000 1.000000 } } @@ -56125,13 +56125,13 @@ } { id=9740 - position={ 862.422852 0.000000 3056.581787 } + position={ 861.026978 0.000000 3058.417969 } rotation={ 0.000000 0.447214 0.000000 0.894427 } scale={ 1.000000 1.000000 1.000000 } } { id=9741 - position={ 822.515503 0.000000 2953.156494 } + position={ 814.095093 0.000000 2998.072266 } rotation={ 0.000000 0.633989 0.000000 0.773342 } 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 fd6ea60b..aeb2ee59 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -12151,7 +12151,7 @@ } { id=2151 - position={ 866.878113 0.000000 2954.406006 } + position={ 844.103394 0.000000 2950.182129 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -12169,19 +12169,19 @@ } { id=2154 - position={ 792.838135 0.000000 2996.566162 } + position={ 799.164124 0.000000 2987.324219 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=2155 - position={ 754.000000 0.000000 3010.000000 } + position={ 754.730957 0.000000 3012.075928 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=2156 - position={ 698.580444 0.000000 3021.729248 } + position={ 698.686218 0.000000 3018.601562 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -12193,49 +12193,49 @@ } { id=2158 - position={ 715.682312 0.000000 3060.410400 } + position={ 700.620178 0.000000 3058.890625 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=2159 - position={ 752.176941 0.000000 3069.733643 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 780.575928 0.000000 3064.912354 } + rotation={ -0.000000 0.852894 -0.000000 0.522084 } scale={ 1.000000 1.000000 1.000000 } } { id=2160 - position={ 772.633789 0.000000 3037.644287 } + position={ 784.885071 0.000000 3018.155762 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=2161 - position={ 754.166748 0.000000 3091.813965 } + position={ 751.648132 0.000000 3073.242188 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=2162 - position={ 791.000000 0.000000 3058.000000 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 796.444397 0.000000 3051.014404 } + rotation={ -0.000000 -0.151691 -0.000000 0.988428 } scale={ 1.000000 1.000000 1.000000 } } { id=2163 - position={ 801.000000 0.000000 3026.000000 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 794.016602 0.000000 3033.959473 } + rotation={ -0.000000 -0.517950 -0.000000 0.855411 } scale={ 1.000000 1.000000 1.000000 } } { id=2164 - position={ 820.801636 0.000000 3058.717773 } + position={ 818.580872 0.000000 3055.161133 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=2165 - position={ 843.777649 0.000000 3043.224854 } + position={ 837.698059 0.000000 3025.277100 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -12913,7 +12913,7 @@ } { id=2278 - position={ 711.699524 0.000000 3073.105957 } + position={ 708.208008 0.000000 3080.542969 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -12937,7 +12937,7 @@ } { id=2282 - position={ 826.229858 0.000000 3007.514404 } + position={ 833.087097 0.000000 3053.951172 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -18373,7 +18373,7 @@ } { id=3222 - position={ 7225.000000 0.000000 2126.000000 } + position={ 822.223633 0.000000 3019.730713 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -50527,14 +50527,14 @@ } { id=8802 - position={ 7265.000000 0.000000 2137.000000 } - rotation={ 0.000000 0.695322 0.000000 0.718699 } + position={ 723.134583 0.000000 3026.355957 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=8803 - position={ 7244.000000 0.000000 2145.000000 } - rotation={ 0.000000 0.898157 0.000000 0.439676 } + position={ 735.827698 0.000000 3054.785400 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -56125,14 +56125,14 @@ } { id=9740 - position={ 863.516174 0.000000 3028.388184 } + position={ 867.802490 0.000000 3035.988770 } rotation={ 0.000000 0.998840 0.000000 -0.048154 } scale={ 1.000000 1.000000 1.000000 } } { id=9741 - position={ 830.487671 0.000000 2956.134277 } - rotation={ 0.000000 0.615540 0.000000 0.788105 } + position={ 810.909119 0.000000 3004.946533 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } 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 0617f7cd..f683a5e7 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -10495,73 +10495,73 @@ } { id=2154 - position={ 798.838135 0.000000 2993.566162 } + position={ 796.043518 0.000000 2995.937744 } rotation={ -0.000000 -0.584710 -0.000000 0.811242 } scale={ 1.000000 1.000000 1.000000 } } { id=2155 - position={ 760.000000 0.000000 3002.000000 } + position={ 757.506287 0.000000 3001.157959 } rotation={ 0.000000 0.802293 0.000000 -0.596931 } scale={ 1.000000 1.000000 1.000000 } } { id=2156 - position={ 712.016663 0.000000 3025.433838 } - rotation={ 0.000000 0.811242 0.000000 -0.584710 } + position={ 707.802368 0.000000 3034.362793 } + rotation={ -0.000000 0.440327 -0.000000 -0.897837 } scale={ 1.000000 1.000000 1.000000 } } { id=2157 - position={ 676.966431 0.000000 3064.547607 } + position={ 673.384644 0.000000 3063.744629 } rotation={ 0.000000 0.850651 0.000000 0.525731 } scale={ 1.000000 1.000000 1.000000 } } { id=2158 - position={ 707.476013 0.000000 3051.380859 } - rotation={ 0.000000 0.957092 0.000000 -0.289784 } + position={ 703.688538 0.000000 3048.223877 } + rotation={ -0.000000 0.327875 -0.000000 -0.944721 } scale={ 1.000000 1.000000 1.000000 } } { id=2159 - position={ 748.719482 0.000000 3055.629639 } - rotation={ 0.000000 0.998759 0.000000 0.049814 } + position={ 774.044861 0.000000 3071.244141 } + rotation={ -0.000000 -0.675500 -0.000000 0.737361 } scale={ 1.000000 1.000000 1.000000 } } { id=2160 - position={ 749.435303 0.000000 3032.527344 } + position={ 771.393494 0.000000 3016.713867 } rotation={ 0.000000 0.952296 0.000000 0.305177 } scale={ 1.000000 1.000000 1.000000 } } { id=2161 - position={ 749.421204 0.000000 3085.384033 } - rotation={ -0.000000 -0.633989 -0.000000 0.773342 } + position={ 749.716797 0.000000 3085.902588 } + rotation={ -0.000000 -0.859414 -0.000000 -0.511279 } scale={ 1.000000 1.000000 1.000000 } } { id=2162 - position={ 777.000000 0.000000 3056.000000 } - rotation={ 0.000000 0.569595 0.000000 0.821926 } + position={ 800.771790 0.000000 3059.734619 } + rotation={ -0.000000 -0.805203 -0.000000 0.593000 } scale={ 1.000000 1.000000 1.000000 } } { id=2163 - position={ 784.000000 0.000000 3022.000000 } + position={ 781.432373 0.000000 3041.073730 } rotation={ 0.000000 0.666921 0.000000 0.745128 } scale={ 1.000000 1.000000 1.000000 } } { id=2164 - position={ 811.595825 0.000000 3070.488770 } - rotation={ 0.000000 0.894427 0.000000 -0.447214 } + position={ 824.140808 0.000000 3061.539795 } + rotation={ -0.000000 0.980337 -0.000000 -0.197330 } scale={ 1.000000 1.000000 1.000000 } } { id=2165 - position={ 823.461304 0.000000 3034.237061 } + position={ 842.478271 0.000000 3033.029785 } rotation={ 0.000000 0.983954 0.000000 0.178425 } scale={ 1.000000 1.000000 1.000000 } } @@ -11239,7 +11239,7 @@ } { id=2278 - position={ 712.051453 0.000000 3082.257812 } + position={ 709.643677 0.000000 3070.750732 } rotation={ 0.000000 0.894427 0.000000 0.447214 } scale={ 1.000000 1.000000 1.000000 } } @@ -11263,7 +11263,7 @@ } { id=2282 - position={ 836.594482 0.000000 3011.534668 } + position={ 838.286316 0.000000 3067.219482 } rotation={ 0.000000 0.811242 0.000000 -0.584710 } scale={ 1.000000 1.000000 1.000000 } } @@ -16699,8 +16699,8 @@ } { id=3222 - position={ 7228.000000 0.000000 2126.000000 } - rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + position={ 811.202393 0.000000 3029.281250 } + rotation={ -0.000000 -0.559791 -0.000000 0.828634 } scale={ 1.000000 1.000000 1.000000 } } { @@ -47563,13 +47563,13 @@ } { id=8802 - position={ 7263.000000 0.000000 2152.000000 } - rotation={ 0.000000 0.741453 0.000000 0.671005 } + position={ 729.208191 0.000000 3020.063232 } + rotation={ -0.000000 -0.605372 -0.000000 0.795943 } scale={ 1.000000 1.000000 1.000000 } } { id=8803 - position={ 7234.000000 0.000000 2153.000000 } + position={ 751.861206 0.000000 3053.801270 } rotation={ 0.000000 -0.707107 0.000000 0.707107 } scale={ 1.000000 1.000000 1.000000 } } @@ -53149,13 +53149,13 @@ } { id=9740 - position={ 868.648376 0.000000 3046.008789 } + position={ 869.803223 0.000000 3047.539551 } rotation={ 0.000000 -0.894427 0.000000 0.447214 } scale={ 1.000000 1.000000 1.000000 } } { id=9741 - position={ 841.459961 0.000000 2947.150879 } + position={ 832.532959 0.000000 2999.286621 } rotation={ 0.000000 -0.741453 0.000000 0.671005 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/history/provinces/e_france.txt b/history/provinces/e_france.txt index 3f81edfb..f73f9ece 100644 --- a/history/provinces/e_france.txt +++ b/history/provinces/e_france.txt @@ -15,25 +15,19 @@ holding = castle_holding } ###c_finistere -2158 = { +2156 = { culture = breton religion = gorsedd holding = castle_holding } -2156 = { +8802 = { + holding = church_holding +} +2158 = { holding = none } -###c_penthievre -2162 = { - culture = galo - religion = gorsedd - holding = castle_holding -} -2164 = { - holding = city_holding -} -2159 = { - holding = church_holding +8803 = { + holding = none } ###c_vannes 2154 = { @@ -41,9 +35,6 @@ religion = numenorian holding = castle_holding } -2163 = { - holding = church_holding -} 2160 = { holding = none 1104.1.1 = { @@ -54,17 +45,6 @@ holding = none } ##d_upper_brittany -###c_reze -2151 = { - culture = poitevin - religion = orleaniste - holding = castle_holding -} -9741 = { - culture = poitevin - religion = orleaniste - holding = castle_holding -} ###c_nantes 2152 = { culture = galo @@ -80,6 +60,16 @@ holding = castle_holding } } +2151 = { + culture = poitevin + religion = orleaniste + holding = castle_holding +} +9741 = { + culture = poitevin + religion = orleaniste + holding = castle_holding +} ###c_rennes 2165 = { culture = galo @@ -98,6 +88,22 @@ 9740 = { holding = none } +###c_saint_malo +2164 = { + holding = castle_holding +} +3222 = { + holding = church_holding +} +###c_penthievre +2162 = { + culture = galo + religion = gorsedd + holding = castle_holding +} +2163 = { + holding = church_holding +} #k_france ##d_ile_de_france diff --git a/history/titles/k_brittany.txt b/history/titles/k_brittany.txt index 7d767888..35c703a5 100644 --- a/history/titles/k_brittany.txt +++ b/history/titles/k_brittany.txt @@ -17,23 +17,19 @@ k_brittany = { change_development_level = 7 } } - -d_brittany = { - 2548.1.1 = { - holder = france_menhir_obelix +c_french_leon = { + 2550.1.1 = { + holder = france_obelix_vassal_2 + liege = k_brittany } + 2555.1.1 = { change_development_level = 13 } } -c_vannes = { - 2548.1.1 = { - holder = france_menhir_obelix +c_tregor = { + 2550.1.1 = { + holder = france_obelix_vassal_2 + liege = k_brittany } - 2555.1.1 = { change_development_level = 10 } -} -c_nantes = { - 2548.1.1 = { - holder = france_menhir_obelix - } - 2555.1.1 = { change_development_level = 15 } + 2555.1.1 = { change_development_level = 13 } } c_finistere = { 2550.1.1 = { @@ -42,19 +38,82 @@ c_finistere = { } 2555.1.1 = { change_development_level = 10 } } -c_french_leon = { - 2550.1.1 = { - holder = france_obelix_vassal_2 - liege = k_brittany +c_vannes = { + 2344.10.21={holder=per_of_brittany} + 2374.12.26={holder=gweltaz_of_brittany} + 2414.7.19={holder=loic_i_of_brittany} + 2420.1.10={holder=yann_fanch_of_brittany} + 2444.3.16={holder=jili_of_brittany} + 2466.11.18={holder=yann_loeiz_of_brittany} + 2468.3.28={holder=yann_of_brittany} + 2481.9.11={holder=yann_baol_of_brittany} + 2498.3.17={holder=loic_ii_of_brittany} + 2518.11.23={holder=alan_of_brittany} + 2545.3.13={holder=nolwenn_of_brittany} + 2548.3.21 = { + holder = france_menhir_obelix + } + 2555.1.1 = { change_development_level = 10 } +} +d_upper_brittany = { + 2344.10.21={holder=per_of_brittany} + 2374.12.26={holder=gweltaz_of_brittany} + 2414.7.19={holder=loic_i_of_brittany} + 2420.1.10={holder=yann_fanch_of_brittany} + 2444.3.16={holder=jili_of_brittany} + 2466.11.18={holder=yann_loeiz_of_brittany} + 2468.3.28={holder=yann_of_brittany} + 2481.9.11={holder=yann_baol_of_brittany} + 2498.3.17={holder=loic_ii_of_brittany} + 2518.11.23={holder=alan_of_brittany} + 2545.3.13={holder=nolwenn_of_brittany} + 2548.3.21 = { + holder = france_menhir_obelix + } + 2505.1.1 = { + change_development_level = 7 } - 2555.1.1 = { change_development_level = 13 } } c_rennes = { + 2344.10.21={holder=per_of_brittany} + 2374.12.26={holder=gweltaz_of_brittany} + 2414.7.19={holder=loic_i_of_brittany} + 2420.1.10={holder=yann_fanch_of_brittany} + 2444.3.16={holder=jili_of_brittany} + 2466.11.18={holder=yann_loeiz_of_brittany} + 2468.3.28={holder=yann_of_brittany} + 2481.9.11={holder=yann_baol_of_brittany} + 2498.3.17={holder=loic_ii_of_brittany} + 2518.11.23={holder=alan_of_brittany} + 2545.3.13={holder=nolwenn_of_brittany} + 2548.3.21 = { + holder = france_menhir_obelix + } + 2555.1.1 = { change_development_level = 15 } +} +c_nantes = { + 2344.10.21={holder=per_of_brittany} + 2374.12.26={holder=gweltaz_of_brittany} + 2414.7.19={holder=loic_i_of_brittany} + 2420.1.10={holder=yann_fanch_of_brittany} + 2444.3.16={holder=jili_of_brittany} + 2466.11.18={holder=yann_loeiz_of_brittany} + 2468.3.28={holder=yann_of_brittany} + 2481.9.11={holder=yann_baol_of_brittany} + 2498.3.17={holder=loic_ii_of_brittany} + 2518.11.23={holder=alan_of_brittany} + 2545.3.13={holder=nolwenn_of_brittany} + 2548.3.21 = { + holder = france_menhir_obelix + } + 2555.1.1 = { change_development_level = 15 } +} +c_saint_malo = { 2550.1.1 = { holder = france_obelix_vassal_1 liege = k_brittany } - 2555.1.1 = { change_development_level = 15 } + 2555.1.1 = { change_development_level = 10 } } c_penthievre = { 2550.1.1 = { 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 3654eb48..17244b58 100644 --- a/localization/english/replace/names/NEOW_character_names_l_english.yml +++ b/localization/english/replace/names/NEOW_character_names_l_english.yml @@ -3188,3 +3188,246 @@ Ddorhyan:0 "Ddorhyan" Ddouglas:0 "Ddouglas" Ddumnagual:0 "Ddumnagual" + Eaddsyg:0 "Eaddsyg" + Eaddwald:0 "Eaddwald" + Eaddwarhd:0 "Eaddwarhd" + Ectorh:0 "Ectorh" + Pehr:0 "Pehr" + Eddyrhn:0 "Eddyrhn" + Eddwyn:0 "Eddwyn" + Ronja:0 "Ronja" + Eynyon:0 "Eynyon" + Elrhos:0 "Elrhos" + Svante:0 "Svante" + Hjalmar:0 "Hjalmar" + Emrhys:0 "Emrhys" + Ann-Christin:0 "Ann-Christin" + Erhyc:0 "Erhyc" + Malte:0 "Malte" + Ffyrhgus:0 "Ffyrhgus" + Ffyrhnffayl:0 "Ffyrhnffayl" + Ffyrhrhyks:0 "Ffyrhrhyks" + Ffynyas:0 "Ffynyas" + Ffrhagan:0 "Ffrhagan" + Ffrhyog:0 "Ffrhyog" + Ffrhancys:0 "Ffrhancys" + Sten-Sture:0 "Sten-Sture" + Ellie:0 "Ellie" + Ffyrhmyn:0 "Ffyrhmyn" + Lars-_A_rng_ke:0 "Lars-Åke" + Larz-Thure:0 "Larz-Thure" + Claes-Bertil:0 "Claes-Bertil" + Mauritz:0 "Mauritz" + Ffrhobyshyrh:0 "Ffrhobyshyrh" + Gallahadd:0 "Gallahadd" + Ffrhydyrhyc:0 "Ffrhydyrhyc" + J_o_uml_ns:0 "Jöns" + Lova:0 "Lova" + Katrina:0 "Katrina" + Olle:0 "Olle" + Gamon:0 "Gamon" + Gann:0 "Gann" + Garhyf:0 "Garhyf" + Gyoffrhyy:0 "Gyoffrhyy" + Ewa:0 "Ewa" + Jonna:0 "Jonna" + Gyorhgy:0 "Gyorhgy" + Ann-Marie:0 "Ann-Marie" + Olov:0 "Olov" + Per-Olov:0 "Per-Olov" + Gyrhaynt:0 "Gyrhaynt" + Gyrhaldd:0 "Gyrhaldd" + Gylberht:0 "Gylberht" + Gylys:0 "Gylys" + Godffrhyy:0 "Godffrhyy" + Godwyn:0 "Godwyn" + Maj-Britt:0 "Maj-Britt" + Gorhddon:0 "Gorhddon" + Grhygorhy:0 "Grhygorhy" + Grhyffyf:0 "Grhyffyf" + Grhyngolet:0 "Grhyngolet" + Gwyn:0 "Gwyn" + Gwrhyadd:0 "Gwrhyadd" + Hallatan:0 "Hallatan" + Harholdd:0 "Harholdd" + Harhpyrh:0 "Harhpyrh" + Harhrhy:0 "Harhrhy" + Harhtnyll_Hartnell:0 "Harhtnyll" + Hawylock:0 "Hawylock" + Hyctorh:0 "Hyctorh" + Hyngyst:0 "Hyngyst" + Hyrham:0 "Hyrham" + Guttorm:0 "Guttorm" + Bengt-Urban:0 "Bengt-Urban" + Urban:0 "Urban" + Sigfrid:0 "Sigfrid" + Horhatyo:0 "Horhatyo" + Klas:0 "Klas" + Humfrhyy:0 "Humfrhyy" + Sixten:0 "Sixten" + Hurhnddall:0 "Hurhnddall" + Lars-Mikael:0 "Lars-Mikael" + Iddwal:0 "Iddwal" + Iddnyrhf:0 "Iddnyrhf" + Inyrh:0 "Inyrh" + Isaac:0 "Isaac" + Isambarhdd:0 "Isambarhdd" + Liam:0 "Liam" + Jycyll:0 "Jycyll" + Jorhddan:0 "Jorhddan" + Julys:0 "Julys" + Julyan:0 "Julyan" + Lancylot:0 "Lancylot" + Joel:0 "Joel" + G_o_uml_rgen:0 "Görgen" + Laurhyncy:0 "Laurhyncy" + Lyyrh:0 "Lyyrh" + Jimmy:0 "Jimmy" + Lyu:0 "Lyu" + Lywarhch:0 "Lywarhch" + Locrhynus:0 "Locrhynus" + Lucan:0 "Lucan" + Lwcyus:0 "Lwcyus" + Lwddowyyc:0 "Lwddowyyc" + Lupus:0 "Lupus" + Malcolm:0 "Malcolm" + Hampus:0 "Hampus" + Maylgwn:0 "Maylgwn" + Malyc:0 "Malyc" + Rickard:0 "Rickard" + Mancsomy:0 "Mancsomy" + Marhc:0 "Marhc" + Jerry:0 "Jerry" + Marhyus:0 "Marhyus" + Marhmadduky:0 "Marhmadduky" + Britt-Inger:0 "Britt-Inger" + Kristofer:0 "Kristofer" + Marhtyn:0 "Marhtyn" + G_o_uml_te:0 "Göte" + Maurhycy:0 "Maurhycy" + Mylddrhyc:0 "Mylddrhyc" + Mymprhycyus:0 "Mymprhycyus" + Charlie:0 "Charlie" + Myrhcurhy:0 "Myrhcurhy" + Lars-Eric:0 "Lars-Eric" + Mychayl:0 "Mychayl" + Mynastyrh:0 "Mynastyrh" + Mohammydd:0 "Mohammydd" + Annicka:0 "Annicka" + Eleonor:0 "Eleonor" + Marcus-Gunnar:0 "Marcus-Gunnar" + Waldemar:0 "Waldemar" + Morhddrhydd:0 "Morhddrhydd" + Morhgan:0 "Morhgan" + Niclas:0 "Niclas" + Volmar:0 "Volmar" + Narhmyrh:0 "Narhmyrh" + Nasyrh:0 "Nasyrh" + Eyvor:0 "Eyvor" + Nafanyyl:0 "Nafanyyl" + Lars-Uno:0 "Lars-Uno" + Nylson:0 "Nylson" + Nyyptyon:0 "Nyyptyon" + Krister:0 "Krister" + Nycholas:0 "Nycholas" + Nynnyaw:0 "Nynnyaw" + Norhman:0 "Norhman" + Padrhyg:0 "Padrhyg" + Palantyrh:0 "Palantyrh" + Elliot:0 "Elliot" + Manfrid:0 "Manfrid" + Hilma:0 "Hilma" + Pellyas:0 "Pellyas" + Pellynorhy:0 "Pellynorhy" + Benny:0 "Benny" + Pypyn:0 "Pypyn" + Pyrhcywyal:0 "Pyrhcywyal" + Nisse:0 "Nisse" + Pytyrh:0 "Pytyrh" + Pyrh:0 "Pyrh" + Ragnar:0 "Ragnar" + Porhrhyks:0 "Porhrhyks" + Rhalff:0 "Rhalff" + Per-Eric:0 "Per-Eric" + Per-G_o_uml_ran:0 "Per-Göran" + Melvin:0 "Melvin" + Rhanddolff:0 "Rhanddolff" + Rhygynaldd:0 "Rhygynaldd" + Hasse:0 "Hasse" + Rhycharhdd:0 "Rhycharhdd" + Rhygby:0 "Rhygby" + Rhyngo:0 "Rhyngo" + Rhywyallo:0 "Rhywyallo" + Per-Otto:0 "Per-Otto" + Bernt:0 "Bernt" + Bill:0 "Bill" + Rhobyrht:0 "Rhobyrht" + Rhobyn:0 "Rhobyn" + Mohamad:0 "Mohamad" + Rhogyrh:0 "Rhogyrh" + Rhonaldd:0 "Rhonaldd" + Rholandd:0 "Rholandd" + Rhoman:0 "Rhoman" + Lars-Ove:0 "Lars-Ove" + Melker:0 "Melker" + Rhubyus:0 "Rhubyus" + Rhuddygorhy:0 "Rhuddygorhy" + Rhudyarhdd:0 "Rhudyarhdd" + Karl-Uno:0 "Karl-Uno" + Sagrhamorhy:0 "Sagrhamorhy" + Sahyd:0 "Sahyd" + Scafylock:0 "Scafylock" + Alex:0 "Alex" + Scott:0 "Scott" + Sywyrhus:0 "Sywyrhus" + Shyrhlock:0 "Shyrhlock" + Noel:0 "Noel" + Sylwystyrh:0 "Sylwystyrh" + Symrhathon:0 "Symrhathon" + Sorhonto:0 "Sorhonto" + Spyky:0 "Spyky" + Stynyan:0 "Stynyan" + Sullywyan:0 "Sullywyan" + Ebbe:0 "Ebbe" + Surhyon:0 "Surhyon" + Widar:0 "Widar" + S_o_uml_lve:0 "Sölve" + Tegwyd:0 "Tegwyd" + Tyygnmouf:0 "Tyygnmouf" + Tarhrhant:0 "Tarhrhant" + Omar:0 "Omar" + Gustav-Adolf:0 "Gustav-Adolf" + Torvald:0 "Torvald" + Hedvig:0 "Hedvig" + Thaddyus:0 "Thaddyus" + Thyobaldd:0 "Thyobaldd" + Thyoffylus:0 "Thyoffylus" + Tybyrhyus:0 "Tybyrhyus" + Trhystan:0 "Trhystan" + Urhyyn:0 "Urhyyn" + Ufrh:0 "Ufrh" + Waltyrh:0 "Waltyrh" + S_o_uml_ren:0 "Sören" + Wbyrhon:0 "Wbyrhon" + Wylbyrht:0 "Wylbyrht" + Alvin:0 "Alvin" + Wlywyyrh:0 "Wlywyyrh" + Jonny:0 "Jonny" + Wutgrhaby:0 "Wutgrhaby" + Wyyysyy:0 "Wyyysyy" + Wyalyrhyan:0 "Wyalyrhyan" + Wyarhddamyrh:0 "Wyarhddamyrh" + Love:0 "Love" + Wyyctorh:0 "Wyyctorh" + Wyyncynt:0 "Wyyncynt" + Wyladd:0 "Wyladd" + Adda:0 "Adda" + Addylayddy:0 "Addylayddy" + Jonatan:0 "Jonatan" + Affrhodyty:0 "Affrhodyty" + Agnys:0 "Agnys" + Alycy:0 "Alycy" + Almarhyan:0 "Almarhyan" + Pierre:0 "Pierre" + Almyrha:0 "Almyrha" + Amyce:0 "Amyce" diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index 9a9007e2..bf030510 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -3257,7 +3257,7 @@ b_comana:0 "Comana" b_comanagene:0 "Comanagene" b_comborn:0 "Comborn" - b_combourg:0 "Redon" + b_combourg:0 "Dol" b_commacchio:0 "Commacchio" b_como:0 "Como" b_compiegne:0 "Compiègne" @@ -9197,13 +9197,13 @@ b_sailana:0 "Sailana" b_saindak:0 "Saindak" b_saint_brieuc:0 "Saint-Brieuc" - b_saint_brevin_les_pins:0 "Saint-Brevin-les-Pins" + b_saint_brevin_les_pins:0 "Redon" b_saint_denis:0 "Saint-Denis" b_saint_dizier:0 "Vitry-le-François" b_saint_flour:0 "Gannat" b_saint_hubert:0 "Bastogne" b_saint_lizier:0 "Auterive" - b_saint_malo:0 "Dinan" + b_saint_malo:0 "Saint-Malo" b_saint_omer:0 "Saint-Omer" b_saint_pourcain:0 "Moulins" b_saint_quentin:0 "Saint-Quentin" @@ -10058,7 +10058,7 @@ b_st_niklaas:0 "St. Niklaas" b_st_pauls:0 "St Pauls" b_st_peters:0 "St Peters" - b_st_pol_de_leon:0 "Châteaulin" + b_st_pol_de_leon:0 "Douarnenez" b_st_swithun:0 "St Swithun" b_stade:0 "Stade" b_staffrique:0 "St Affrique" @@ -10803,7 +10803,7 @@ b_trebic:0 "Trebic" b_trebinje:0 "Trebinje" b_treffen:0 "Treffen" - b_treguier:1 "Lannion" + b_treguier:1 "Tréguier" b_treiz:0 "Treiz" b_trelleborg:0 "Trelleborg" b_tremp:0 "Tremp" @@ -12629,8 +12629,6 @@ c_constantine:0 "Constantine" c_cordoba:0 "Córdoba" c_cordoba_adj:0 "Córdoban" - c_cornouaille:0 "Cornouaille" - c_cornouaille_adj:0 "Cornouaillian" c_corsica:0 "Corsica" c_corsica_adj:0 "Corsican" c_coruna:0 "A Coruña" @@ -12874,7 +12872,8 @@ c_fes_adj:0 "Fesian" c_figuig:0 "Figuig" c_figuig_adj:0 "Figuigian" - c_finistere:0 "Finistère" + c_finistere:0 "Cornouaille" + c_finistere_adj:0 "Cornouaillese" c_finland:0 "Finland" c_finland_adj:1 "Finnish" c_finland_pre:0 "Finno" @@ -13958,7 +13957,7 @@ c_nandurbar:0 "Nandurbar" c_nandurbar_adj:0 "Nandurbaran" c_nantes:0 "Nantes" - c_nantes_adj:0 "Loirian" + c_nantes_adj:0 "Nantese" c_napata:0 "Napata" c_napata_adj:0 "Napata" c_napoli:0 "Napoli" @@ -14163,8 +14162,8 @@ c_pedersore_adj:0 "Pietarsaarian" c_pelusia:0 "Pelusia" c_pelusia_adj:0 "Pelusian" - c_penthievre:1 "Côtes-d'Armor" - c_penthievre_adj:0 "Armorian" + c_penthievre:1 "Saint-Brieuc" + c_penthievre_adj:0 "Briochin" c_penugonda:0 "Penugonda" c_penugonda_adj:0 "Penugondan" c_muluvagil:0 "Muluvagil" @@ -14350,13 +14349,12 @@ c_reims_adj:0 "Reimsian" c_reni:0 "Reni" c_reni_adj:0 "Reni" - c_rennes:0 "Rennais" - c_rennes_adj:0 "Vilainian" + c_rennes:0 "Rennes" + c_rennes_adj:0 "Rennese" c_rethel:0 "Ardennes" c_rethel_adj:0 "Ardennes" c_reval:1 "Rävala" c_reval_adj:1 "Rävalan" - c_reze:0 "Rezé" c_rhein:0 "Rhein" c_rhein_adj:0 "Rheiner" c_rhodopes:0 "Rhodopes" @@ -15034,8 +15032,8 @@ c_valladolid_adj:0 "Valladolidan" c_vanemane:0 "Vanemane" c_vanemane_adj:0 "Vanemanian" - c_vannes:0 "Morbihan" - c_vannes_adj:0 "Morbihanian" + c_vannes:0 "Vannes" + c_vannes_adj:0 "Vannetais" c_varadzin:0 "Varadzin" c_varadzin_adj:0 "Varazdinian" c_varanasi:0 "Varanasi" @@ -15453,8 +15451,8 @@ d_breton_band_adj:0 "Breton" d_breton_company:0 "Breton Company" d_breton_company_adj:0 "Breton" - d_brittany:0 "Brittany" - d_brittany_adj:0 "Breton" + d_brittany:0 "Lower Brittany" + d_brittany_adj:0 "Lower Breton" d_brunswick:0 "Brunswick" d_brunswick_adj:0 "Brunswicker" d_bugeac:0 "Bugeac" @@ -25169,6 +25167,11 @@ ###France ##France + c_saint_malo:0 "Saint-Malo" + c_saint_malo_adj:0 "Malouin" + c_tregor:0 "Tregor" + c_tregor_adj:0 "Tregorrese" + b_concarneau:0 "Concarneau" c_somme:0 "Somme" c_somme_adj:0 "Samarian" c_creil:0 "Creil" @@ -25286,6 +25289,7 @@ c_neuwied:0 "Neuwied" c_neuwied_adj:0 "Neuwieder" b_altenkirchen:0 "Altenkirchen" + d_palatinate_article:0 "the " d_palatinate:0 "Palatinate" d_palatinate_adj:0 "Palatine" c_mannheim:0 "Mannheim" diff --git a/map_data/definition.csv b/map_data/definition.csv index 7e0fc829..2a654014 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -2149,22 +2149,22 @@ 2148;128;54;74;FONTENAY;x 2149;170;57;202;TALMONT;x 2150;2;60;75;MONTAIGU;x -2151;44;63;203;RAIS;x -2152;86;66;76;NANTES;x -2153;128;69;204;GUERANDE;x -2154;170;72;77;VANNES;x -2155;2;75;205;LORIENT;x -2156;44;78;78;QUIMPER;x -2157;86;81;206;BREST;x -2158;128;84;79;LEON;x -2159;170;87;207;CORNOUAILLES;x -2160;2;90;80;ROHAN;x -2161;44;93;208;TREGUIER;x -2162;86;96;81;SAINT-BRIEUC;x -2163;128;99;209;PORHOET;x -2164;170;102;82;SAINT-MALO;x -2165;2;105;210;RENNES;x -2166;44;108;83;CHATEAUBRIANT;x +2151;115;115;115;REZE;x +2152;124;132;134;NANTES;x +2153;85;94;96;SAINT-NAZAIRE;x +2154;185;189;190;VANNES;x +2155;116;120;121;;LORIENT;x +2156;161;165;166;QUIMPER;x +2157;170;187;213;BREST;x +2158;119;119;119;DOUARNENEZ;x +2159;130;130;130;GUINGAMP;x; +2160;72;72;72;PONTIVY;x +2161;101;101;101;TREGUIER;x +2162;205;205;205;SAINT-BRIEUC;x +2163;163;131;131;LOUDEAC;x +2164;132;132;132;SAINT-MALO;x +2165;220;218;218;RENNES;x +2166;191;191;191;CHATEAUBRIANT;x 2167;86;111;211;AVRANCHES;x 2168;128;114;84;COUTANCES;x 2169;170;117;212;CHERBOURG;x @@ -2276,11 +2276,11 @@ 2275;2;9;165;LOCHES;x 2276;44;12;38;LA HAYE;x 2277;86;15;166;VALENCAY;x -2278;128;18;39;ISSOUDUN;x +2278;207;209;209;MORLAIX;x 2279;170;21;167;CHATEAUROUX;x 2280;2;24;40;DEOLS;x 2281;44;27;168;BOUSSAC;x -2282;86;30;41;COMBOURG;x +2282;106;106;106;DOL;x 2283;128;33;169;VENDOME;x 2284;170;36;42;BELLAC;x 2285;2;39;170;GRANDMONT;x @@ -3220,7 +3220,7 @@ 3219;171;72;137;OSTLANDSBERG;x 3220;3;75;10;Wormditt;x 3221;45;78;138;ALTO ARAGON;x -3222;58;165;205;;x +3222;176;176;176;PORHOET;x 3223;76;23;151;river_garonne;x 3224;93;165;43;river_garonne;x 3225;0;255;0;river_garonne;x @@ -8800,8 +8800,8 @@ 8799;176;198;227;Pallars Jussa;x 8800;8;201;0;Pallars Sobira;x 8801;50;204;128;Seu d'Urgell;x -8802;92;207;1;;x -8803;134;210;129;;x +8802;206;206;206;CONCARNEAU;x +8803;39;39;39;CARHAIX;x 8804;176;0;2;;x 8805;8;3;130;;x 8806;50;6;3;;x @@ -9738,8 +9738,8 @@ 9737;93;30;196;Verviers;x 9738;135;33;69;Nivelles;x 9739;177;36;197;Aalst;x -9740;9;39;70;Fougeres;x -9741;51;42;198;Saint-Brevin-les-Pins;x +9740;76;76;76;FOUGERES;x +9741;54;54;54;REDON;x 9742;93;45;71;Zone Rouge;x 9743;135;48;199;Zone Rouge;x 9744;177;51;72;Zone Rouge;x diff --git a/map_data/provinces.png b/map_data/provinces.png index b375492b..07c82ec9 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:bb74e3d02648e9691dc12898cd5e2cf1aca50f228d2f6e25081afd65a6fa70eb -size 2531239 +oid sha256:a5fca19c7461c3248785a71c34e7b0fd94aa5da4e80714e658881c2c26c0c9b5 +size 2463255