From 79382744bde76d295189a2651bf4d94a43ea8c88 Mon Sep 17 00:00:00 2001 From: edwardtheelbowhigh Date: Tue, 11 Feb 2025 23:32:32 +0000 Subject: [PATCH] map stuff --- .../coat_of_arms/NEOW_dynasties.txt | 84 ++- common/landed_titles/germany.txt | 20 +- common/landed_titles/italy.txt | 2 +- common/landed_titles/nistrenia.txt | 611 +++++++++--------- common/landed_titles/zapadoslavia.txt | 165 ++--- .../coat_of_arms/von_karstein.txt | 0 history/characters/NEOW_e_germania.txt | 4 +- .../NEOW_dynasty_names_l_english.yml | 5 +- localization/english/titles_l_english.yml | 48 +- 9 files changed, 515 insertions(+), 424 deletions(-) create mode 100644 gfx/coat_of_arms/coat_of_arms/von_karstein.txt diff --git a/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt b/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt index 692509e3..d2e029bc 100644 --- a/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt +++ b/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt @@ -111,4 +111,86 @@ tudorh_dynasty = { depth=1.010000 } } -} \ No newline at end of file +} + +karstein_dynasty = { + pattern="pattern_diagonal_split_01.dds" + color1=red + color2=black + color3=red + colored_emblem={ + color1=black + color2=black + color3=red + texture="ce_wyvern_rising.dds" + instance={ + position={ 0.330000 0.320000 } + scale={ 0.400000 0.460000 } + depth=1.010000 + } + + } + colored_emblem={ + color1=white + color2=grey + texture="ce_sword_simple.dds" + instance={ + position={ 0.610000 0.630000 } + scale={ 0.680000 0.720000 } + rotation=225 + } + } +} + +habsburg_dynasty = { + pattern="pattern__solid_designer.dds" + color1=yellow_light + color2=yellow + color3=red + colored_emblem={ + color1=red + color2=blue_light + texture="ce_lion_rampant_crown.dds" + instance={ + scale={ 0.910000 0.910000 } + } + } +} + +tepes_dynasty = { + pattern="pattern__solid_designer.dds" + color1=blue + color2=yellow + color3=black + colored_emblem={ + color1=yellow + texture="ce_star_06.dds" + instance={ + position={ 0.290000 0.620000 } + scale={ 0.450000 0.450000 } + } + + } + + colored_emblem={ + color1=white + texture="ce_crescent.dds" + instance={ + position={ 0.280000 0.230000 } + scale={ 0.470000 0.470000 } + depth=1.010000 + rotation=272 + } + + } + + colored_emblem={ + color1=yellow_light + color2=red + texture="ce_barry_06.dds" + instance={ + position={ 1.000000 0.490000 } + depth=2.010000 + } + } +} diff --git a/common/landed_titles/germany.txt b/common/landed_titles/germany.txt index 7caf108b..b46ae2b3 100644 --- a/common/landed_titles/germany.txt +++ b/common/landed_titles/germany.txt @@ -1654,6 +1654,9 @@ e_germany = { color = { 200 200 215 } } + } + c_heilbronn = { + color = { 210 210 210 } b_vaihingen = { province = 2745 @@ -1665,7 +1668,7 @@ e_germany = { color = { 140 140 140 } } - } + } c_ulm = { color = { 210 210 210 } @@ -2782,6 +2785,14 @@ e_germany = { color = { 220 160 205 } } + b_beichtinen = { + province = 3007 + + color = { 220 160 205 } + } + } + c_schmalkalden = { + color = { 220 160 205 } b_schmalkalden = { province = 3010 @@ -2792,12 +2803,7 @@ e_germany = { color = { 220 160 205 } } - b_beichtinen = { - province = 3007 - - color = { 220 160 205 } - } - } + } c_muhlhausen = { color = { 205 155 200 } b_muhlhausen = { diff --git a/common/landed_titles/italy.txt b/common/landed_titles/italy.txt index 25aeb5cf..5a3eb109 100644 --- a/common/landed_titles/italy.txt +++ b/common/landed_titles/italy.txt @@ -1,6 +1,6 @@ e_italy = { - color = { 234 217 110 } + color = { 0 140 69 } capital = c_roma # Rome diff --git a/common/landed_titles/nistrenia.txt b/common/landed_titles/nistrenia.txt index c0c3c69d..d93bc345 100644 --- a/common/landed_titles/nistrenia.txt +++ b/common/landed_titles/nistrenia.txt @@ -1,10 +1,10 @@ e_nistrenia = { color = { 110 82 196 } - - k_dacia = { - color = { 237 147 52 } + + k_transylvania = { + color = { 212 112 63 } - capital = c_campulung # Campulung + capital = c_feher # ai_primary_priority = { if = { @@ -14,76 +14,26 @@ e_nistrenia = { add = @correct_culture_primary_score } } + d_transcarpathia = { + color = { 217 11 26 } - d_transylvanian_alps = { - color = { 175 86 10 } + capital = c_marmaros # Marmaros / Maramarossziget / Maramures - capital = c_campulung # Campulung + c_marmaros = { + color = { 217 11 26 } - c_campulung = { - color = { 175 86 10 } + b_maramarossziget = { + province = 539 - b_targoviste = { - province = 515 - - color = { 175 86 10 } + color = { 217 11 26 } } - b_campulung = { - province = 5009 + b_borsa = { + province = 3915 - color = { 175 86 10 } - } - b_arges = { - province = 5008 - - color = { 175 86 10 } - } - b_pitesti = { - province = 4993 - - color = { 175 86 10 } - } - } - c_polovragi = { - color = { 165 76 10 } - - b_polovragi = { - province = 5005 - - color = { 165 76 10 } - } - b_govora = { - province = 5006 - - color = { 165 76 10 } - } - b_filiasi = { - province = 5007 - - color = { 165 76 10 } - } - } - c_tabla_butii = { - color = { 155 66 10 } - - b_tabla_butii = { - province = 4989 - - color = { 155 66 10 } - } - b_zoresti = { - province = 4980 - - color = { 155 66 10 } - } - b_dumbraveni = { - province = 4977 - - color = { 155 66 10 } + color = { 217 11 26 } } } } - d_temes = { color = { 133 93 38 } @@ -108,6 +58,25 @@ e_nistrenia = { color = { 133 93 38 } } } + c_csanad = { + color = { 135 105 75 } + + b_csanad = { + province = 521 + + color = { 135 105 75 } + } + b_szeged = { + province = 3872 + + color = { 135 105 75 } + } + b_nagylak = { + province = 3974 + + color = { 135 105 75 } + } + } c_arad = { color = { 135 78 51 } @@ -142,6 +111,94 @@ e_nistrenia = { } } } + d_bihar = { + color = { 241 58 58 } + + capital = c_bihar # Bihar / Nagyvarad / Oradea + + c_bihar = { + color = { 241 58 58 } + + b_nagyvarad = { + province = 520 + + color = { 241 58 58 } + } + b_gyozeg = { + province = 3899 + + color = { 241 58 58 } + } + b_belenyes = { + province = 3901 + + color = { 241 58 58 } + } + b_zolonta = { + province = 3902 + + color = { 241 58 58 } + } + b_elesd = { + province = 3947 + + color = { 241 58 58 } + } + } + c_zarand = { + color = { 240 85 90 } + + b_zarand = { + province = 3903 + + color = { 240 85 90 } + } + b_nagyhalmagy = { + province = 3904 + + color = { 240 85 90 } + } + b_pankota = { + province = 3975 + + color = { 240 85 90 } + } + } + c_szatmar = { + color = { 164 45 45 } + + b_szatmar = { + province = 3907 + + color = { 164 45 45 } + } + b_nagybanya = { + province = 3908 + + color = { 164 45 45 } + } + b_szilagy = { + province = 3909 + + color = { 164 45 45 } + } + b_kraszna = { + province = 3910 + + color = { 164 45 45 } + } + b_tasnad = { + province = 3911 + + color = { 164 45 45 } + } + b_nagykaroly = { + province = 3912 + + color = { 164 45 45 } + } + } + } d_transylvania = { color = { 212 112 63 } @@ -321,6 +378,88 @@ e_nistrenia = { } } } + } + k_dacia = { + color = { 237 147 52 } + + capital = c_campulung # Campulung + + ai_primary_priority = { + if = { + limit = { + culture = culture:vlach + } + add = @correct_culture_primary_score + } + } + d_transylvanian_alps = { + color = { 175 86 10 } + + capital = c_campulung # Campulung + + c_campulung = { + color = { 175 86 10 } + + b_targoviste = { + province = 515 + + color = { 175 86 10 } + } + b_campulung = { + province = 5009 + + color = { 175 86 10 } + } + b_arges = { + province = 5008 + + color = { 175 86 10 } + } + b_pitesti = { + province = 4993 + + color = { 175 86 10 } + } + } + c_polovragi = { + color = { 165 76 10 } + + b_polovragi = { + province = 5005 + + color = { 165 76 10 } + } + b_govora = { + province = 5006 + + color = { 165 76 10 } + } + b_filiasi = { + province = 5007 + + color = { 165 76 10 } + } + } + c_tabla_butii = { + color = { 155 66 10 } + + b_tabla_butii = { + province = 4989 + + color = { 155 66 10 } + } + b_zoresti = { + province = 4980 + + color = { 155 66 10 } + } + b_dumbraveni = { + province = 4977 + + color = { 155 66 10 } + } + } + } d_muntenia = { color = { 220 132 40 } @@ -795,6 +934,11 @@ e_nistrenia = { color = { 175 230 40 } } + b_sulina = { + province = 5010 + + color = { 75 100 80 } + } } c_lapusna = { color = { 166 137 21 } @@ -856,6 +1000,83 @@ e_nistrenia = { color = { 245 125 95 } } } + c_hont = { + color = { 210 55 100 } + + b_hont = { + province = 3848 + + color = { 210 55 100 } + } + b_nograd = { + province = 3849 + + color = { 210 55 100 } + + cultural_names = { + name_list_slovien = cn_novohrad + name_list_czech = cn_novohrad + } + } + b_balassagyarmat = { + province = 3850 + + color = { 210 55 100 } + + cultural_names = { + name_list_slovien = cn_balazske_darmoty + name_list_czech = cn_balazske_darmoty + } + } + } + c_bekes = { + color = { 225 100 85 } + + b_bekes = { + province = 3873 + + color = { 225 100 85 } + } + b_svarvas = { + province = 3874 + + color = { 225 100 85 } + } + b_oroshaza = { + province = 3875 + + color = { 225 100 85 } + } + } + c_szabolcs = { + color = { 215 58 58 } + + b_szabolcs = { + province = 3889 + + color = { 215 58 58 } + } + b_nyir = { + province = 3890 + + color = { 215 58 58 } + } + b_nagyboszormeny = { + province = 3891 + + color = { 215 58 58 } + } + b_szobszlo = { + province = 3892 + + color = { 215 58 58 } + } + b_debrecen = { + province = 3900 + + color = { 241 58 58 } + } + } c_komarom = { color = { 245 95 85 } @@ -886,11 +1107,6 @@ e_nistrenia = { name_list_serbian = cn_komarno } } - b_batorkeszi = { - province = 3916 - - color = { 245 95 85 } - } } c_esztergom = { color = { 255 92 91 } @@ -922,11 +1138,6 @@ e_nistrenia = { name_list_serbian = cn_ostrihom } } - b_beny = { - province = 3976 - - color = { 255 92 91 } - } } c_szekesfehervar = { color = { 240 122 75 } @@ -998,6 +1209,20 @@ e_nistrenia = { color = { 255 140 100 } } } + c_borsod = { + color = { 135 50 50 } + + b_borsod = { + province = 3870 + + color = { 135 50 50 } + } + b_miskolc = { + province = 3871 + + color = { 135 50 50 } + } + } } d_somogy = { @@ -1170,228 +1395,11 @@ e_nistrenia = { } } - d_transcarpathia = { - color = { 217 11 26 } - - capital = c_marmaros # Marmaros / Maramarossziget / Maramures - - c_marmaros = { - color = { 217 11 26 } - - b_maramarossziget = { - province = 539 - - color = { 217 11 26 } - } - b_tecso = { - province = 3914 - - color = { 217 11 26 } - } - b_borsa = { - province = 3915 - - color = { 217 11 26 } - } - b_huszt = { - province = 3917 - - color = { 217 11 26 } - } - b_okormezo = { - province = 3918 - - color = { 217 11 26 } - } - } - c_bereg = { - color = { 225 30 45 } - - b_beregszasz = { - province = 537 - - color = { 225 30 45 } - } - b_nagyszolos = { - province = 3913 - - color = { 225 30 45 } - } - b_munkacz = { - province = 3893 - - color = { 225 30 45 } - } - b_alsoverecke = { - province = 3894 - - color = { 225 30 45 } - } - b_borsova = { - province = 3898 - - color = { 225 30 45 } - } - } - } - - - d_bihar = { - color = { 241 58 58 } - - capital = c_bihar # Bihar / Nagyvarad / Oradea - - c_bihar = { - color = { 241 58 58 } - - b_nagyvarad = { - province = 520 - - color = { 241 58 58 } - } - b_gyozeg = { - province = 3899 - - color = { 241 58 58 } - } - b_debrecen = { - province = 3900 - - color = { 241 58 58 } - } - b_belenyes = { - province = 3901 - - color = { 241 58 58 } - } - b_zolonta = { - province = 3902 - - color = { 241 58 58 } - } - b_elesd = { - province = 3947 - - color = { 241 58 58 } - } - } - c_zarand = { - color = { 240 85 90 } - - b_zarand = { - province = 3903 - - color = { 240 85 90 } - } - b_nagyhalmagy = { - province = 3904 - - color = { 240 85 90 } - } - b_pankota = { - province = 3975 - - color = { 240 85 90 } - } - } - c_bekes = { - color = { 225 100 85 } - - b_bekes = { - province = 3873 - - color = { 225 100 85 } - } - b_svarvas = { - province = 3874 - - color = { 225 100 85 } - } - b_oroshaza = { - province = 3875 - - color = { 225 100 85 } - } - } - c_szabolcs = { - color = { 215 58 58 } - - b_szabolcs = { - province = 3889 - - color = { 215 58 58 } - } - b_nyir = { - province = 3890 - - color = { 215 58 58 } - } - b_nagyboszormeny = { - province = 3891 - - color = { 215 58 58 } - } - b_szobszlo = { - province = 3892 - - color = { 215 58 58 } - } - } - c_szatmar = { - color = { 164 45 45 } - - b_szatmar = { - province = 3907 - - color = { 164 45 45 } - } - b_nagybanya = { - province = 3908 - - color = { 164 45 45 } - } - b_szilagy = { - province = 3909 - - color = { 164 45 45 } - } - b_kraszna = { - province = 3910 - - color = { 164 45 45 } - } - b_tasnad = { - province = 3911 - - color = { 164 45 45 } - } - b_nagykaroly = { - province = 3912 - - color = { 164 45 45 } - } - } - } - d_bacs = { color = { 145 90 85 } capital = c_bacs - c_bodrog = { - color = { 155 85 85 } - - b_bodrog = { - province = 3863 - - color = { 155 85 85 } - } - b_zenta = { - province = 3864 - - color = { 155 85 85 } - } - } c_csongrad = { color = { 145 75 65 } @@ -1406,25 +1414,6 @@ e_nistrenia = { color = { 145 75 65 } } } - c_csanad = { - color = { 135 105 75 } - - b_csanad = { - province = 521 - - color = { 135 105 75 } - } - b_szeged = { - province = 3872 - - color = { 135 105 75 } - } - b_nagylak = { - province = 3974 - - color = { 135 105 75 } - } - } } d_gyor = { diff --git a/common/landed_titles/zapadoslavia.txt b/common/landed_titles/zapadoslavia.txt index e2814aa3..5f7733b6 100644 --- a/common/landed_titles/zapadoslavia.txt +++ b/common/landed_titles/zapadoslavia.txt @@ -2276,6 +2276,11 @@ e_zapadoslavia = { name_list_czech = cn_sastin } } + b_batorkeszi = { + province = 3916 + + color = { 245 95 85 } + } } c_gemer = { color = { 230 37 69 } @@ -2393,59 +2398,6 @@ e_zapadoslavia = { name_list_czech = cn_brezno } } - } - c_bars = { - color = { 240 40 100 } - - cultural_names = { - name_list_slovien = cn_tekov - name_list_czech = cn_tekov - } - - b_bars = { - province = 3846 - - color = { 240 40 100 } - - cultural_names = { - name_list_slovien = cn_tekov - name_list_czech = cn_tekov - } - } - b_komorcbanya = { - province = 3847 - - color = { 240 40 100 } - } - } - c_hont = { - color = { 210 55 100 } - - b_hont = { - province = 3848 - - color = { 210 55 100 } - } - b_nograd = { - province = 3849 - - color = { 210 55 100 } - - cultural_names = { - name_list_slovien = cn_novohrad - name_list_czech = cn_novohrad - } - } - b_balassagyarmat = { - province = 3850 - - color = { 210 55 100 } - - cultural_names = { - name_list_slovien = cn_balazske_darmoty - name_list_czech = cn_balazske_darmoty - } - } b_koporna = { province = 3851 @@ -2472,6 +2424,35 @@ e_zapadoslavia = { } } } + c_bars = { + color = { 240 40 100 } + + cultural_names = { + name_list_slovien = cn_tekov + name_list_czech = cn_tekov + } + + b_bars = { + province = 3846 + + color = { 240 40 100 } + + cultural_names = { + name_list_slovien = cn_tekov + name_list_czech = cn_tekov + } + } + b_komorcbanya = { + province = 3847 + + color = { 240 40 100 } + } + b_beny = { + province = 3976 + + color = { 255 92 91 } + } + } c_poszony = { color = { 255 100 125 } @@ -2549,6 +2530,50 @@ e_zapadoslavia = { color = { 156 15 15 } } } + c_bereg = { + color = { 225 30 45 } + + b_beregszasz = { + province = 537 + + color = { 225 30 45 } + } + b_nagyszolos = { + province = 3913 + + color = { 225 30 45 } + } + b_munkacz = { + province = 3893 + + color = { 225 30 45 } + } + b_alsoverecke = { + province = 3894 + + color = { 225 30 45 } + } + b_borsova = { + province = 3898 + + color = { 225 30 45 } + } + b_tecso = { + province = 3914 + + color = { 217 11 26 } + } + b_huszt = { + province = 3917 + + color = { 217 11 26 } + } + b_okormezo = { + province = 3918 + + color = { 217 11 26 } + } + } c_zemplen = { color = { 155 30 30 } @@ -2588,30 +2613,6 @@ e_zapadoslavia = { color = { 155 30 30 } } } - c_borsod = { - color = { 135 50 50 } - - b_borsod = { - province = 3870 - - color = { 135 50 50 } - } - b_miskolc = { - province = 3871 - - color = { 135 50 50 } - } - b_szendro = { - province = 3979 - - color = { 230 37 69 } - - cultural_names = { - name_list_slovien = cn_sendrov - name_list_czech = cn_sendrov - } - } - } c_abauj = { color = { 190 10 10 } @@ -2650,6 +2651,16 @@ e_zapadoslavia = { name_list_slovien = cn_turna } } + b_szendro = { + province = 3979 + + color = { 230 37 69 } + + cultural_names = { + name_list_slovien = cn_sendrov + name_list_czech = cn_sendrov + } + } } } } diff --git a/gfx/coat_of_arms/coat_of_arms/von_karstein.txt b/gfx/coat_of_arms/coat_of_arms/von_karstein.txt new file mode 100644 index 00000000..e69de29b diff --git a/history/characters/NEOW_e_germania.txt b/history/characters/NEOW_e_germania.txt index 05e6ed91..92f7ba5d 100644 --- a/history/characters/NEOW_e_germania.txt +++ b/history/characters/NEOW_e_germania.txt @@ -70,6 +70,7 @@ germany0004 = { germany0005 = { name = "Thorus" + prefix = dynnp_von dynasty = habsburg_dynasty religion = "numenorian" culture = bourguignon @@ -253,8 +254,9 @@ germany0014 = { germany0015 = { name = "Manfred" + prefix = dynnp_von dynasty = karstein_dynasty - religion = "catholic" + religion = "draculean" culture = saxon trait = education_martial_4 trait = flexible_leader diff --git a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml index af1b977b..c7f5fe43 100644 --- a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml @@ -90,9 +90,10 @@ dynn_belgium_oranje_nassau_weilburg:0 "Belgium-Oranje-Nassau-Weilburg" #e_germania - + dynnp_von:0 "von " dynn_furrer:0 "Furrer" - + dynn_karstein:0 "Karstein" + dynn_habsburg:0 "Habsburg" # PATRONYMS — PREFIXES AND SUFFIXES #Brittannic diff --git a/localization/english/titles_l_english.yml b/localization/english/titles_l_english.yml index 63d5b417..9dbff8cb 100644 --- a/localization/english/titles_l_english.yml +++ b/localization/english/titles_l_english.yml @@ -439,7 +439,7 @@ b_alibei:0 "Alibei" b_alicante:0 "Alacant" b_alichur:0 "Alichur" - b_alife:0 "Alife" + b_alife:0 "Campobasso" b_aligoodarz:0 "Aligoodarz" b_alipur:0 "Alipur" b_alir:0 "Alir" @@ -572,7 +572,7 @@ b_amboise:0 "Amboise" b_amelia:0 "Amelia" b_amer:0 "Amer" - b_amersfoort:0 "Amersfoort" + b_amersfoort:0 "Utrecht" b_amethi:0 "Amethi" b_amfissa:0 "Amfissa" b_amida:0 "Amida" @@ -687,7 +687,7 @@ b_aparshahr:0 "Aparshahr" b_apatin:0 "Apatin" b_apchier:0 "Apchier" - b_apeldoorn:0 "Apeldoorn" + b_apeldoorn:0 "Amersfoort" b_apoldoa:0 "Apoldoa" b_appenzell:0 "Appenzell" b_appingedam:0 "Appingedam" @@ -793,7 +793,7 @@ b_armagnac:0 "Armagnac" b_armail:0 "Armail" b_arnedo:0 "Arnedo" - b_arnhem:0 "Arnhem" + b_arnhem:0 "Apeldoorn" b_arnsberg:0 "Arnsberg" b_arnstadt:0 "Arnstadt" b_arnstein:0 "Arnstein" @@ -891,7 +891,7 @@ b_assab:0 "Assab" b_assalif:0 "As Salif" b_assemini:0 "Assemini" - b_assen:0 "Assen" + b_assen:0 "Emmen" b_assens:0 "Assens" b_asshinan:0 "Asshinan" b_assidr:0 "As Sidr" @@ -1677,7 +1677,7 @@ b_bor:0 "Bor" b_borac:0 "Borac" b_borama:0 "Borama" - b_borculo:0 "Borculo" + b_borculo:0 "Zutphen" b_bordeaux:0 "Bordeaux" b_bordj:0 "Bordj" b_bordjelcaid:0 "Bordj el Caid" @@ -1780,7 +1780,7 @@ b_breclav:0 "Břeclav" b_brecon:1 "Aberhonddu" b_breda:0 "Breda" - b_bredevoort:0 "Bredevoort" + b_bredevoort:0 "Winterswikj" b_bregenz:0 "Bregenz" b_bregne:0 "Bregne" b_breisach:0 "Breisach" @@ -2727,8 +2727,8 @@ b_dekcha:0 "Dekcha" b_delaram:0 "Delaram" b_deleus:0 "Deleus" - b_delft:0 "Delft" - b_delfzijl:0 "Delfzijl" + b_delft:0 "Den Hagge" + b_delfzijl:0 "Appingedam" b_delgo:0 "Delgo" b_della_gherardesca:0 "Della Gherardesca" b_delmenhorst:0 "Delmenhorst" @@ -3043,7 +3043,7 @@ b_duqm:0 "Duqm" b_durazzo:0 "Durrës" b_durdevac:0 "Durdevac" - b_duren:0 "Düren" + b_duren:0 "Eueskirchen" b_durga_mandir:0 "Durga Mandir" b_durgas:0 "Durgas" b_durham:0 "Durham" @@ -3199,8 +3199,8 @@ b_emesa:0 "Emesa" b_emli:0 "Emli" b_emly:0 "Emly" - b_emmen:0 "Emmen" - b_emmerich:0 "Emmerich" + b_emmen:0 "Winschoten" + b_emmerich:0 "Winschoter" b_empoli:0 "Empoli" b_emptyspot:0 "Emptyspot" b_empuries:0 "Empúries" @@ -3246,7 +3246,7 @@ b_erythrai:0 "Erythrai" b_escastell:0 "Es Castell" b_eschenlohe:0 "Eschenlohe" - b_eschweiler:0 "Eschweiler" + b_eschweiler:0 "Düren" b_esens:0 "Esens" b_esfahan:0 "Esfahan" b_esfandak:0 "Esfandak" @@ -3623,7 +3623,7 @@ b_gehare:0 "Gehare" b_geisenhausen:0 "Geisenhausen" b_gela:0 "Gela" - b_geldern:0 "Geldern" + b_geldern:0 "Roermond" b_gelersengorersen:0 "Gelersen-Görersen" b_gelnhausen:0 "Gelnhausen" b_genetemariam:0 "Genete Mariam" @@ -3885,7 +3885,7 @@ b_gronau:0 "Gronau" b_grong:1 "Granungar" b_gronhogen:0 "Grönhögen" - b_groningen:0 "Groningen" + b_groningen:0 "Assen" b_grossenhain:0 "Grossenhain" b_grosseto:0 "Grosseto" b_grunberg:0 "Grunberg" @@ -8482,7 +8482,7 @@ b_roth:0 "Roth" b_rothbury:0 "Rothbury" b_rothenburg:0 "Rothenburg" - b_rotterdam:0 "Rotterdam" + b_rotterdam:0 "Delft" b_rottweil:0 "Rottweil" b_roucy:0 "Roucy" b_roudavar:0 "Roud Avar" @@ -10546,8 +10546,8 @@ b_utan_namdal:1 "Ytri Naumudalr" b_utena:0 "Utena" b_utgir:0 "Utgir" - b_utrecht:0 "Utrecht" - b_utrecth:0 "Utrecht" + b_utrecht:0 "Rotterdam" + b_utrecth:0 "Rotterdam" b_utrera:0 "Utrera" b_utrillas:0 "Utrillas" b_utsjoki:0 "Utsjoki" @@ -11374,7 +11374,7 @@ b_zurich:0 "Zürich" b_zurita:1 "Zorita" b_zussow:0 "Züssow" - b_zutphen:0 "Zutphen" + b_zutphen:0 "Arnhem" b_zuwara:0 "Zuwara" b_zuwayid:0 "Zuwayid" b_zvartnots:0 "Zvartnots" @@ -12318,8 +12318,8 @@ c_djerba_adj:0 "Djerban" c_dobrzynska:0 "Dobrzyń" c_dobrzynska_adj:0 "Dobrynskian" - c_dokkum:0 "Dokkum" - c_dokkum_adj:0 "Dokkumer" + c_dokkum:0 "Groningen" + c_dokkum_adj:0 "Groningen" c_dole:0 "Dole" c_dole_adj:0 "Dolian" c_domazlice:0 "Domažlice" @@ -12625,8 +12625,8 @@ c_grobin:0 "Grobin" c_grobin_adj:0 "Grobinian" c_grodno:0 "Grodno" - c_groningen:0 "Groningen" - c_groningen_adj:0 "Groningen" + c_groningen:0 "Dokkum" + c_groningen_adj:0 "Dokkumer" c_grunberg:0 "Grunberg" c_grunberg_adj:0 "Grunberger" c_grunningen:0 "Grünningen" @@ -15062,7 +15062,7 @@ c_zollern_adj:0 "Zollern" c_zurich:0 "Zürich" c_zurich_adj:0 "Züricher" - c_zutphen:0 "Zutphen" + c_zutphen:0 "Arnhem" c_zutphen_adj:0 "Zutphener" c_zyriane:0 "Zyriane" c_zyriane_adj:0 "Zyrian"