From d4021f4522b05c47b8c5d5e2117b0e2e33fb4a54 Mon Sep 17 00:00:00 2001 From: Jeroen Schweitzer Date: Sun, 8 Feb 2026 14:09:11 +0100 Subject: [PATCH] fix(loc): remove 17 duplicate localization keys Removed 10 dynasty name keys duplicated between cultures and dynasties loc files, 5 character names (Conrad, Kayna, Mare, Miren, Shan) that collide with vanilla, and dynnp_of already in vanilla. Moved b_bindal title override to localization/english/replace/ for proper vanilla key replacement. Co-Authored-By: Claude Opus 4.6 --- .../english/mistborn_character_names_l_english.yml | 7 +------ .../english/mistborn_cultures_l_english.yml | 13 ++----------- .../english/mistborn_titles_l_english.yml | 2 +- .../replace/mistborn_overrides_l_english.yml | 6 ++++++ 4 files changed, 10 insertions(+), 18 deletions(-) create mode 100644 lords_of_ash/localization/english/replace/mistborn_overrides_l_english.yml diff --git a/lords_of_ash/localization/english/mistborn_character_names_l_english.yml b/lords_of_ash/localization/english/mistborn_character_names_l_english.yml index 198a576..cb34c2f 100644 --- a/lords_of_ash/localization/english/mistborn_character_names_l_english.yml +++ b/lords_of_ash/localization/english/mistborn_character_names_l_english.yml @@ -67,7 +67,6 @@ Goradel:0 "Goradel" Telden:0 "Telden" Aradan:0 "Aradan" - Conrad:0 "Conrad" Jaxton:0 "Jaxton" Colston:0 "Colston" Risten:0 "Risten" @@ -90,7 +89,6 @@ # --- Noble female names --- Vin:0 "Vin" - Shan:0 "Shan" Valette:0 "Valette" Kliss:0 "Kliss" Allrianne:0 "Allrianne" @@ -98,8 +96,6 @@ Beldre:0 "Beldre" Reen:0 "Reen" Sarene:0 "Sarene" - Kayna:0 "Kayna" - Miren:0 "Miren" Philen:0 "Philen" Sheshen:0 "Sheshen" Daniren:0 "Daniren" @@ -174,7 +170,6 @@ Garven:0 "Garven" # --- Skaa female names --- - Mare:0 "Mare" Jalla:0 "Jalla" Kareien:0 "Kareien" Merin:0 "Merin" @@ -269,4 +264,4 @@ Zezendia:0 "Zezendia" # ========== DYNASTY NAME PREFIX ========== - dynnp_of:0 "of" + # dynnp_of already defined in vanilla diff --git a/lords_of_ash/localization/english/mistborn_cultures_l_english.yml b/lords_of_ash/localization/english/mistborn_cultures_l_english.yml index c99fd91..b8e9b91 100644 --- a/lords_of_ash/localization/english/mistborn_cultures_l_english.yml +++ b/lords_of_ash/localization/english/mistborn_cultures_l_english.yml @@ -23,22 +23,13 @@ name_list_scadrial_skaa:0 "Skaa" name_list_terris:0 "Terris" - # ========== DYNASTY NAMES ========== + # ========== CADET / NAME LIST DYNASTY NAMES ========== + # (Great House dynasty names are in mistborn_dynasties_l_english.yml) - dynn_Venture:0 "Venture" - dynn_Elariel:0 "Elariel" - dynn_Hasting:0 "Hasting" - dynn_Lekal:0 "Lekal" - dynn_Tekiel:0 "Tekiel" - dynn_Erikeller:0 "Erikeller" - dynn_Entrone:0 "Entrone" - dynn_Urbain:0 "Urbain" dynn_Renoux:0 "Renoux" dynn_Penrod:0 "Penrod" dynn_Cett:0 "Cett" dynn_Ladrian:0 "Ladrian" - dynn_Bylerum:0 "Bylerum" - dynn_Conrad:0 "Conrad" dynn_Jaxton:0 "Jaxton" dynn_Fathvell:0 "Fathvell" dynn_Crew:0 "Crew" diff --git a/lords_of_ash/localization/english/mistborn_titles_l_english.yml b/lords_of_ash/localization/english/mistborn_titles_l_english.yml index 598fccd..f092519 100644 --- a/lords_of_ash/localization/english/mistborn_titles_l_english.yml +++ b/lords_of_ash/localization/english/mistborn_titles_l_english.yml @@ -248,7 +248,7 @@ b_erlnest_steading:0 "Erlnest Steading" b_tathingdwen:0 "Tathingdwen" b_tathingdwen_library:0 "Great Library of Tathingdwen" - b_bindal:0 "Bindal" + # b_bindal overrides vanilla — moved to replace/mistborn_overrides_l_english.yml b_bindal_pastures:0 "Bindal Pastures" b_vennsat:0 "Vennsat" b_vennsat_highlands:0 "Vennsat Highlands" diff --git a/lords_of_ash/localization/english/replace/mistborn_overrides_l_english.yml b/lords_of_ash/localization/english/replace/mistborn_overrides_l_english.yml new file mode 100644 index 0000000..5de4a19 --- /dev/null +++ b/lords_of_ash/localization/english/replace/mistborn_overrides_l_english.yml @@ -0,0 +1,6 @@ +l_english: + + # ========== VANILLA LOC OVERRIDES ========== + # Keys that collide with vanilla and need explicit replacement + + b_bindal:0 "Bindal"