From 8d45a16c341e4079a1de96073ec78df735a7c8b9 Mon Sep 17 00:00:00 2001 From: JulesFlammenkueche Date: Sun, 9 Nov 2025 14:02:13 +0100 Subject: [PATCH] Harpy emblem + some update to French names --- .../name_equivalency/00_NEOW_male_names.txt | 26 +++---- .../common/culture/name_lists/NEOW_french.txt | 78 ++----------------- ...rampant.dds => NEOW_ce_dragon_rampant.dds} | 0 ...rampant.png => NEOW_ce_dragon_rampant.png} | 0 .../colored_emblems/NEOW_ce_harpy.dds | 3 + .../colored_emblems/NEOW_ce_harpy_crowned.dds | 3 + .../NEOW_coa_designer_emblems.txt | 19 +++-- .../names/NEOW_character_names_l_english.yml | 58 ++++++++++++++ 8 files changed, 97 insertions(+), 90 deletions(-) rename N3OW/gfx/coat_of_arms/colored_emblems/{ce_dragon_rampant.dds => NEOW_ce_dragon_rampant.dds} (100%) rename N3OW/gfx/coat_of_arms/colored_emblems/{ce_dragon_rampant.png => NEOW_ce_dragon_rampant.png} (100%) create mode 100644 N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_harpy.dds create mode 100644 N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_harpy_crowned.dds diff --git a/N3OW/common/culture/name_equivalency/00_NEOW_male_names.txt b/N3OW/common/culture/name_equivalency/00_NEOW_male_names.txt index 22f9d731..b925e0c9 100644 --- a/N3OW/common/culture/name_equivalency/00_NEOW_male_names.txt +++ b/N3OW/common/culture/name_equivalency/00_NEOW_male_names.txt @@ -16,39 +16,39 @@ abulqasim_male = { Belkacem } achilles_male = { Achile } adam_male = { Adam } adil_male = { Adel } -adrian_male = { Adrian } +adrian_male = { Adrian Adrien } ahmad_male = { Ahmad Ahmed Amadou } -alan_male = { Alan Allan } +alan_male = { Alain Alan Allan } albanus_male = { Alban Auban } -albert_male = { Alberzh Aubert } +albert_male = { Albert Alberzh Aubert } albinus_male = { Aubin } -alexander_male = { Aleissandre Aleksandr } -alexis_male = { Al_e_grv_ssi } -alfonso_male = { Anfous } +alexander_male = { Aleissandre Aleksandr Alexandre } +alexis_male = { Al_e_grv_ssi Alexis } +alfonso_male = { Alphonse Anfous } alfred_male = { Alfret } ali_male = { Ali } amabilus_male = { Amable } -amadeus_male = { Amadi_e_act_u } -amalric_male = { Amaudri } +amadeus_male = { Am_e_act_d_e_act_e Amadi_e_act_u } +amalric_male = { Amaudri Amaury } amatus_male = { Amat } ambrosius_male = { Ambr_o_grv_si } amin_male = { Amine Elamine } amir_male = { Amir } anatolius_male = { Anat_o_grv_li Anatol } -andrew_male = { Andri_e_act_u } +andrew_male = { Andr_e_act_ Andri_e_act_u } angel_male = { Ael Ange } anselm_male = { Ans_e_grv_ume } -anthony_male = { Ant_o_grv_ni Anton T_o_grv_ni } +anthony_male = { Ant_o_grv_ni Anthony Antoine Anton T_o_grv_ni } antoninus_male = { Antounin } anwar_male = { Anouar } aristides_male = { Aristido } -arnold_male = { Arnaud Arno } +arnold_male = { Arnaud Arnault Arno } arsenius_male = { Arsena } arthur_male = { _A_grv_rtus Arthur } augustine_male = { Agustin } augustus_male = { Aguste } aurelian_male = { Aurelian } -axel_male = { Assel } +axel_male = { Assel Axel } ayman_male = { Aymen } aziz_male = { Anziz Aziz } badruddin_male = { Badroudine } @@ -107,7 +107,7 @@ edward_male = { Audouard Edouard } eligius_male = { Aloi } elijah_male = { El_i_grv_o Eliaz Ilyes Lyes } elouan_male = { Elouan Elouann } -emeric_male = { Eimeri } +emeric_male = { Aimery Eimeri } emil_male = { Emil Emile Milio } emilian_male = { Emilian } emmanuel_male = { Emmanuel Enmanu_e_grv_l Manu_e_grv_ } diff --git a/N3OW/common/culture/name_lists/NEOW_french.txt b/N3OW/common/culture/name_lists/NEOW_french.txt index 4eb2d53f..de6a2649 100644 --- a/N3OW/common/culture/name_lists/NEOW_french.txt +++ b/N3OW/common/culture/name_lists/NEOW_french.txt @@ -209,76 +209,14 @@ name_list_NEOW_french = { } male_names = { - Abbé-Faria - Abraracourcix - Adamaï - Adrien - Aimery - Aiwendil - Alaeddine - Alain - Alatar - Albert - Aldarion - Alexandre - Alexis - Alphonse - Amandil - Amaury - Amédée - Amroth - Anárion - André - Anthony - Antoine - Arador - Aragorn - Aramis - Arathorn - Arnaud - Arnault - Aronnax - Arthur - Arvedui - Astérix - Atanamir - Atanatar - Athos - Aubry - Axel - Azaghâl - Balin - Bandobras - Barahir - Barbicane - Bard - Barthélémy - Baudouin - Beaufort - Beleg - Benjamin - Benoît - Bëor - Beorn - Beregond - Beren - Bérenger - Bernard - Bertrand - Bifur - Bilbon - Bill - Blaise-Pascal - Bödvar - Bofur - Bombur - Bór - Boromir - Brandir - Bree - Brego - Bruno - Caderousse + ### Novelist names + Abb_e_act_-Faria Abraracourcix Aiwendil Alatar Aldarion Amandil Amroth An_a_act_rion Arador Aragorn Aramis Arathorn Aronnax Arvedui Ast_e_act_rix Atanamir Atanatar Athos Azagh_a_hat_l + B_e_uml_or B_o_act_r Balin Bandobras Barahir Barbicane Bard Beaufort Beleg Beorn Beregond Beren Bifur Bilbon Bill Blaise-Pascal Bofur Bombur Boromir Brandir Bree Brego + + ### Normal names + Adrien Aimery Alain Albert Alexandre Alexis Alphonse Am_e_act_d_e_act_e Amaury Andr_e_act_ Anthony Antoine Arnaud Arnault Arthur Aubry Axel + Barthélémy Baudouin Benjamin Benoît Bérenger Bernard Bertrand Bruno + Caderousse Calogrenant Cambacérès Camille-Desmoulins diff --git a/N3OW/gfx/coat_of_arms/colored_emblems/ce_dragon_rampant.dds b/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_dragon_rampant.dds similarity index 100% rename from N3OW/gfx/coat_of_arms/colored_emblems/ce_dragon_rampant.dds rename to N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_dragon_rampant.dds diff --git a/N3OW/gfx/coat_of_arms/colored_emblems/ce_dragon_rampant.png b/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_dragon_rampant.png similarity index 100% rename from N3OW/gfx/coat_of_arms/colored_emblems/ce_dragon_rampant.png rename to N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_dragon_rampant.png diff --git a/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_harpy.dds b/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_harpy.dds new file mode 100644 index 00000000..8bce635a --- /dev/null +++ b/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_harpy.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:548f3e31854817abddb07371b75144492f65adc7c9d422254557e914ef5c80a3 +size 87536 diff --git a/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_harpy_crowned.dds b/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_harpy_crowned.dds new file mode 100644 index 00000000..73ed8ebe --- /dev/null +++ b/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_harpy_crowned.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb8771571dfc4f294f50e7877ff9c3c6ce114d0856f3388f34b593af072d6052 +size 87536 diff --git a/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt b/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt index 0eacabe3..6a6353d4 100644 --- a/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt +++ b/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt @@ -31,17 +31,12 @@ # Double underscore intentional to make it the first option in the list NEOW_ce_gondor_tree.dds = { colors = 1 category = faiths } -NEOW_ce_nap_eagle.dds = { colors = 1 category = animals } NEOW_ce_guinness_logo.dds = { colors = 1 category = manmade } -ce_dragon_rampant.dds = { colors = 3 category = animals } -ce_dragon_rampant.dds = { colors = 3 category = animals } NEOW_ce_gondor_crown.dds = { colors = 1 category = manmade } NEOW_ce_gondor_star.dds = { colors = 1 category = faiths } NEOW_ce_numenor_tree.dds = { colors = 1 category = faiths } -NEOW_ce_wallonia.dds = { colors = 1 category = animals } NEOW_ce_heart.dds = { colors = 1 category = abstract } NEOW_ce_cross_carolignian.dds = { colors = 2 category = crosses_and_knots } -NEOW_ce_eagle_modern.dds = { colors = 3 category = animals } NEOW_ce_cross_nordic.dds = { colors = 2 category = crosses_and_knots } NEOW_ce_armillary_sphere.dds = { colors = 1 category = manmade } NEOW_ce_arnor_sceptre.dds = { colors = 1 category = manmade } @@ -55,7 +50,17 @@ NEOW_ce_giray.dds = { colors = 1 category = tribal_seal } NEOW_ce_newton.dds = { colors = 2 category = patterns } NEOW_ce_spatstone.dds = { colors = 1 category = faiths } NEOW_ce_zanzibar.dds = { colors = 1 category = nature } -NEOW_ce_blackadder.dds = { colors = 3 category = animals } -NEOW_ce_gaul_boar.dds = { colors = 2 category = animals } NEOW_ce_bohemia_crown.dds = { colors = 3 category = manmade } NEOW_ce_rosa_camuna.dds = { colors = 1 category = nature } + +###ANIMALS +NEOW_ce_blackadder.dds = { colors = 3 category = animals } +NEOW_ce_eagle_modern.dds = { colors = 3 category = animals } +NEOW_ce_gaul_boar.dds = { colors = 2 category = animals } +NEOW_ce_harpy.dds = { colors = 3 category = animals } +NEOW_ce_harpy_crowned.dds = { colors = 3 category = animals } +NEOW_ce_nap_eagle.dds = { colors = 1 category = animals } +NEOW_ce_dragon_rampant.dds = { colors = 3 category = animals } +NEOW_ce_dragon_rampant.dds = { colors = 3 category = animals } +NEOW_ce_wallonia.dds = { colors = 1 category = animals } + diff --git a/N3OW/localization/english/names/NEOW_character_names_l_english.yml b/N3OW/localization/english/names/NEOW_character_names_l_english.yml index f312788f..a09db462 100644 --- a/N3OW/localization/english/names/NEOW_character_names_l_english.yml +++ b/N3OW/localization/english/names/NEOW_character_names_l_english.yml @@ -1288,4 +1288,62 @@ Selma:0 "Selma" Nabila:0 "Nabila" Hind:0 "Hind" + Abbé-Faria:0 "Abb_e_act_-Faria" + Aiwendil:0 "Aiwendil" + Alatar:0 "Alatar" + Aldarion:0 "Aldarion" + Amandil:0 "Amandil" + Amroth:0 "Amroth" + An_a_act_rion:0 "Anárion" + Arador:0 "Arador" + Aragorn:0 "Aragorn" + Aramis:0 "Aramis" + Arathorn:0 "Arathorn" + Aronnax:0 "Aronnax" + Arvedui:0 "Arvedui" + Atanamir:0 "Atanamir" + Atanatar:0 "Atanatar" + Athos:0 "Athos" + Azagh_a_hat_l:0 "Azaghâl" Asma:0 "Asma" + Abraracourcix:0 "Abraracourcix" + Adrien:0 "Adrien" + Aimery:0 "Aimery" + Alain:0 "Alain" + Albert:0 "Albert" + Alexandre:0 "Alexandre" + Alexis:0 "Alexis" + Alphonse:0 "Alphonse" + Amaury:0 "Amaury" + Am_e_act_d_e_act_e:0 "Amédée" + Andr_e_act_:0 "André" + Anthony:0 "Anthony" + Antoine:0 "Antoine" + Arnaud:0 "Arnaud" + Arnault:0 "Arnault" + Arthur:0 "Arthur" + Ast_e_act_rix:0 "Astérix" + Aubry:0 "Aubry" + Axel:0 "Axel" + Balin:0 "Balin" + Bandobras:0 "Bandobras" + Barahir:0 "Barahir" + Barbicane:0 "Barbicane" + Bard:0 "Bard" + Beaufort:0 "Beaufort" + Beleg:0 "Beleg" + B_e_uml_or:0 "Bëor" + Beorn:0 "Beorn" + Beregond:0 "Beregond" + Beren:0 "Beren" + Bifur:0 "Bifur" + Bilbon:0 "Bilbon" + Blaise-Pascal:0 "Blaise-Pascal" + Bill:0 "Bill" + Bofur:0 "Bofur" + Bombur:0 "Bombur" + B_o_act_r:0 "Bór" + Boromir:0 "Boromir" + Brandir:0 "Brandir" + Bree:0 "Bree" + Brego:0 "Brego"