diff --git a/common/dynasties/NEOW_dynasties.txt b/common/dynasties/NEOW_dynasties.txt index b186600a..c0bfeb77 100644 --- a/common/dynasties/NEOW_dynasties.txt +++ b/common/dynasties/NEOW_dynasties.txt @@ -338,6 +338,7 @@ lindenbrock_dynasty = { } #e_germania + zollern_dynasty = { name = dynn_zollern culture = saxon diff --git a/common/landed_titles/alps.txt b/common/landed_titles/alps.txt index dc32a5c4..f83179eb 100644 --- a/common/landed_titles/alps.txt +++ b/common/landed_titles/alps.txt @@ -14,11 +14,6 @@ e_alps = { c_aosta = { color = { 90 5 15 } - b_aosta = { - province = 2039 - - color = { 90 5 15 } - } b_ivrea = { province = 2040 @@ -39,11 +34,6 @@ e_alps = { color = { 230 205 205 } } - b_konstanz = { - province = 2054 - - color = { 230 205 205 } - } b_vares = { province = 2789 @@ -63,16 +53,20 @@ e_alps = { color = { 255 215 205 } } + b_konstanz = { + province = 2054 + + color = { 230 205 205 } + } b_schwyz = { province = 2461 color = { 255 215 205 } } - b_engelberg = { - province = 3107 + } + c_basel = { + color = { 255 215 205 } - color = { 255 215 205 } - } b_basel = { province = 2050 @@ -98,27 +92,40 @@ e_alps = { color = { 139 30 10 } } - b_lausanne = { - province = 2037 + b_biel = { + province = 2049 - color = { 139 30 10 } + color = { 150 70 15 } } b_thun = { province = 2047 color = { 139 30 10 } } + b_neuchatel = { + province = 2460 + + color = { 135 55 45 } + } + + } + c_geneva = { b_geneva = { province = 2035 color = { 175 40 65 } } + b_lausanne = { + province = 2037 + + color = { 139 30 10 } + } b_martigny = { province = 2038 color = { 90 5 15 } } - } + } c_ticino = { color = { 139 30 10 } b_bellinzona = { @@ -126,43 +133,37 @@ e_alps = { color = { 240 175 255 } } - b_thusis = { - province = 9700 - - color = { 139 30 10 } - } b_davos = { province = 9701 color = { 139 30 10 } } - b_ugano = { - province = 9713 + } + c_sion = { + color = { 139 30 10 } + b_thusis = { + province = 9700 color = { 139 30 10 } } - } + b_aosta = { + province = 2039 + + color = { 90 5 15 } + } + } c_aargau = { color = { 150 70 15 } - b_biel = { - province = 2049 - - color = { 150 70 15 } - } b_lucerne = { province = 2048 color = { 150 70 15 } } - } - c_neuchatel = { - color = { 135 55 45 } + b_engelberg = { + province = 3107 - b_neuchatel = { - province = 2460 - - color = { 135 55 45 } + color = { 255 215 205 } } } } @@ -182,12 +183,20 @@ e_alps = { color = { 255 220 220 } } + } + c_chur = { + color = { 255 220 220 } b_chur = { province = 2055 color = { 255 220 220 } } - } + b_bludenz = { + province = 9704 + + color = { 170 150 190 } + } + } } } k_tirol = { @@ -212,11 +221,6 @@ e_alps = { color = { 45 40 45 } } - b_bludenz = { - province = 9704 - - color = { 170 150 190 } - } b_lech = { province = 9705 diff --git a/common/landed_titles/benelux.txt b/common/landed_titles/benelux.txt index 80dc1061..8737b2f5 100644 --- a/common/landed_titles/benelux.txt +++ b/common/landed_titles/benelux.txt @@ -5,7 +5,7 @@ e_benelux = { k_frisia = { color = { 245 100 20 } - capital = c_holland #Holland + capital = c_westfriesland #Holland can_create = { trigger_if = { @@ -34,16 +34,11 @@ e_benelux = { d_holland = { color = { 235 80 30 } - capital = c_holland #Amsterdam + capital = c_westfriesland #Amsterdam c_holland = { color = { 235 85 30 } - b_amsterdam = { - province = 2406 - - color = { 235 85 30 } - } b_delft = { province = 2404 @@ -59,11 +54,33 @@ e_benelux = { color = { 235 85 30 } } - } + b_utrecth = { + province = 2424 + color = { 160 100 10 } + } + b_brielle = { + province = 2401 + + color = { 200 100 30 } + } + } + c_nedersticht = { + color = { 160 100 10 } + + b_amersfoort = { + province = 2451 + + color = { 160 100 10 } + } + } c_westfriesland = { color = { 245 99 50 } + b_amsterdam = { + province = 2406 + color = { 235 85 30 } + } b_haarlem = { province = 2405 @@ -88,42 +105,16 @@ e_benelux = { color = { 245 99 50 } } } - c_zeeland = { - color = { 200 100 30 } - - b_middelburg = { - province = 2112 - - color = { 200 100 30 } - } - - b_bergen_op_zoom = { - province = 2113 - - color = { 200 100 30 } - } - - b_brielle = { - province = 2401 - - color = { 200 100 30 } - } - } } d_gelre = { color = { 200 60 40 } - capital = c_guelders #Geldern + capital = c_arnhem #Arnhem c_guelders = { color = { 200 60 40 } - b_geldern = { - province = 2450 - - color = { 200 60 40 } - } b_nijmegen = { province = 2103 @@ -154,13 +145,21 @@ e_benelux = { color = { 235 45 30 } } + + } + c_flevoland = { + color = { 235 45 30 } b_flevoland = { province = 9698 color = { 235 45 30 } } - } + b_noordoostpolder = { + province = 9699 + color = { 175 70 20 } + } + } c_zutphen = { color = { 195 30 5 } @@ -185,22 +184,7 @@ e_benelux = { d_utrecht = { color = { 170 100 10 } - capital = c_nedersticht #Utrecht - - c_nedersticht = { - color = { 160 100 10 } - - b_utrecth = { - province = 2424 - - color = { 160 100 10 } - } - b_amersfoort = { - province = 2451 - - color = { 160 100 10 } - } - } + capital = c_oversticht #Zwolle c_oversticht = { color = { 180 120 10 } @@ -223,11 +207,6 @@ e_benelux = { b_almelo = { province = 2431 - color = { 180 120 10 } - } - b_coevorden = { - province = 2422 - color = { 180 120 10 } } } @@ -245,15 +224,10 @@ e_benelux = { color = { 200 145 40 } } - b_emmen = { - province = 2419 + b_coevorden = { + province = 2422 - color = { 200 145 40 } - } - b_steenwijk = { - province = 2452 - - color = { 200 145 40 } + color = { 180 120 10 } } } } @@ -266,11 +240,6 @@ e_benelux = { c_dokkum = { color = { 190 90 10 } - b_dokkum = { - province = 2414 - - color = { 190 90 10 } - } b_appingedam = { province = 2415 @@ -281,6 +250,11 @@ e_benelux = { color = { 190 90 10 } } + b_emmen = { + province = 2419 + + color = { 200 145 40 } + } } c_ostfriesland = { @@ -324,6 +298,11 @@ e_benelux = { color = { 175 70 20 } } + b_steenwijk = { + province = 2452 + + color = { 200 145 40 } + } b_staveren = { province = 2410 @@ -339,10 +318,10 @@ e_benelux = { color = { 175 70 20 } } - b_noordoostpolder = { - province = 9699 + b_dokkum = { + province = 2414 - color = { 175 70 20 } + color = { 190 90 10 } } } } @@ -385,11 +364,6 @@ e_benelux = { color = { 110 110 155 } } - b_bastogne = { - province = 2090 - - color = { 110 110 155 } - } b_clervaux = { province = 2449 @@ -414,16 +388,12 @@ e_benelux = { color = { 145 125 195 } } - b_eindhoven = { - province = 2100 + b_geldern = { + province = 2450 - color = { 145 125 195 } + color = { 200 60 40 } } - b_tilburg = { - province = 2110 - color = { 145 125 195 } - } } c_liege = { color = { 90 95 135 } @@ -472,6 +442,11 @@ e_benelux = { color = { 100 110 180 } } + b_bastogne = { + province = 2090 + + color = { 110 110 155 } + } } } @@ -724,6 +699,16 @@ e_benelux = { color = { 125 85 110 } } + b_eindhoven = { + province = 2100 + + color = { 145 125 195 } + } + b_tilburg = { + province = 2110 + + color = { 145 125 195 } + } } c_hainaut = { color = { 110 95 145 } @@ -744,6 +729,22 @@ e_benelux = { color = { 110 95 145 } } } + c_zeeland = { + color = { 200 100 30 } + + b_middelburg = { + province = 2112 + + color = { 200 100 30 } + } + + b_bergen_op_zoom = { + province = 2113 + + color = { 200 100 30 } + } + + } c_cambray = { color = { 95 80 135 } diff --git a/common/landed_titles/iberia.txt b/common/landed_titles/iberia.txt index 72d1c2b0..074b2e4a 100644 --- a/common/landed_titles/iberia.txt +++ b/common/landed_titles/iberia.txt @@ -2172,66 +2172,6 @@ e_iberia = { color = { 156 110 72 } } } - c_urgell = { - color = { 170 97 92 } - can_be_named_after_dynasty = no - - b_urgell = { - province = 1878 - - color = { 170 97 92 } - } - b_seu_d_urgell = { #Seu d'Urgell - province = 8801 - - color = { 170 97 92 } - } - b_andorra = { - province = 1869 - - color = { 170 97 92 } - } - b_balaguer = { #Organya - province = 1884 - - color = { 170 97 92 } - } - } - c_pallas = { - color = { 163 81 75 } - can_be_named_after_dynasty = no - - b_pallars_jussa = { - province = 8799 - - color = { 163 81 75 } - } - b_pallars_sobira = { - province = 8800 - - color = { 163 81 75 } - } - b_vielha = { - province = 1870 - - color = { 163 81 75 } - } - } - c_puigcerda = { #Cerdana - color = { 145 105 90 } - can_be_named_after_dynasty = no - - b_puigcerda = { - province = 1868 - - color = { 145 105 90 } - } - b_llivia = { - province = 8797 - - color = { 145 105 90 } - } - } c_girona = { color = { 170 115 110 } can_be_named_after_dynasty = no @@ -2350,7 +2290,84 @@ e_iberia = { } } } + k_andorra = { + color = { 5 60 150 } + capital = c_andorra # Andorra + can_be_named_after_dynasty = no + d_andorra = { + color = { 140 130 0 } + + capital = c_andorra # Andorra + can_be_named_after_dynasty = no + + c_andorra = { + color = { 140 130 0 } + can_be_named_after_dynasty = no + + b_andorra = { + province = 1869 + + color = { 170 97 92 } + } + } + c_urgell = { + color = { 170 97 92 } + can_be_named_after_dynasty = no + + b_urgell = { + province = 1878 + + color = { 170 97 92 } + } + b_seu_d_urgell = { #Seu d'Urgell + province = 8801 + + color = { 170 97 92 } + } + b_balaguer = { #Organya + province = 1884 + + color = { 170 97 92 } + } + } + c_pallas = { + color = { 163 81 75 } + can_be_named_after_dynasty = no + + b_pallars_jussa = { + province = 8799 + + color = { 163 81 75 } + } + b_pallars_sobira = { + province = 8800 + + color = { 163 81 75 } + } + b_vielha = { + province = 1870 + + color = { 163 81 75 } + } + } + c_puigcerda = { #Cerdana + color = { 145 105 90 } + can_be_named_after_dynasty = no + + b_puigcerda = { + province = 1868 + + color = { 145 105 90 } + } + b_llivia = { + province = 8797 + + color = { 145 105 90 } + } + } + } + } k_navarra = { color = { 150 120 5 } diff --git a/common/landed_titles/italy.txt b/common/landed_titles/italy.txt index 35c17354..25aeb5cf 100644 --- a/common/landed_titles/italy.txt +++ b/common/landed_titles/italy.txt @@ -113,13 +113,21 @@ e_italy = { color = { 195 140 130 } } + } + c_domodossola = { + color = { 195 140 130 } + b_pombia = { province = 2472 color = { 240 175 255 } } - } + b_ugano = { + province = 9713 + color = { 139 30 10 } + } + } c_cuneo = { color = { 195 130 145 } @@ -965,7 +973,7 @@ e_italy = { k_san_marino = { color = { 44 167 224 } - capital = c_rimini + capital = c_montefeltro d_emilia = { color = { 225 180 180 } @@ -1046,7 +1054,19 @@ e_italy = { color = { 244 180 130 } capital = c_ravenna # Ravenna - + c_montefeltro = { + color = { 229 165 115 } + b_montefeltro = { + province = 2552 + + color = { 209 125 105 } + } + b_rimini = { + province = 2547 + + color = { 229 165 115 } + } + } c_ravenna = { color = { 229 165 115 } @@ -1109,21 +1129,7 @@ e_italy = { d_ancona = { color = { 240 240 190 } - capital = c_rimini # Ancona - c_rimini = { - color = { 229 165 115 } - - b_rimini = { - province = 2547 - - color = { 229 165 115 } - } - b_montefeltro = { - province = 2552 - - color = { 209 125 105 } - } - } + capital = c_ancona # Ancona c_ancona = { color = { 245 245 195 } diff --git a/history/characters/NEOW_e_germania.txt b/history/characters/NEOW_e_germania.txt index 06868425..05e6ed91 100644 --- a/history/characters/NEOW_e_germania.txt +++ b/history/characters/NEOW_e_germania.txt @@ -243,7 +243,7 @@ germany0014 = { trait = honest trait = just - 2539.12.23 = { + 2538.12.23 = { birth = yes } 2600.12.29={ 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 9af3ac83..af1b977b 100644 --- a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml @@ -89,6 +89,10 @@ dynn_belgium:0 "Belgium" dynn_belgium_oranje_nassau_weilburg:0 "Belgium-Oranje-Nassau-Weilburg" + #e_germania + + dynn_furrer:0 "Furrer" + # PATRONYMS — PREFIXES AND SUFFIXES #Brittannic diff --git a/localization/english/titles_l_english.yml b/localization/english/titles_l_english.yml index ebab6eae..63d5b417 100644 --- a/localization/english/titles_l_english.yml +++ b/localization/english/titles_l_english.yml @@ -41,9 +41,10 @@ b_isola:0 "Isola" c_ticino:0 "Ticino" c_ticino_adj:0 "Ticinon" - b_thusis:0 "Thusis" - b_davos:0 "Davos" - b_ugano:0 "Ugano" + b_thusis:0 "Sion" + b_davos:0 "Bellinzona" + b_ugano:0 "Domodossola" + b_bludenz:0 "Davos" b_Xanten:0 "Xanten" b_Xauen:0 "Xauen" b_aabenraa:0 "Abenraa" @@ -679,7 +680,7 @@ b_anwala:0 "Anwala" b_anxi:0 "Anxi" b_aos:0 "Aos" - b_aosta:0 "Aosta" + b_aosta:0 "Martigny" b_aoudaghost:0 "Aoudaghost" b_aougrout:0 "Aougrout" b_apamea:0 "Apamea" @@ -1374,7 +1375,7 @@ b_belkassem:0 "Belkassem" b_bellac:0 "Bellac" b_belley:0 "Belley" - b_bellinzona:0 "Bellinzona" + b_bellinzona:0 "Lugano" b_belogradchik:0 "Belogradchik" b_beloret:0 "Beloret" b_beloyarskiy:0 "Beloyar" @@ -4247,7 +4248,7 @@ b_hohenberg:0 "Hohenberg" b_hohenburg:0 "Hohenburg" b_hohenfurth:0 "Hohenfurth" - b_hohenschwangau:0 "Hohenschwangau" + b_hohenschwangau:0 "Bludenz" b_hohenstein:0 "Hohenstein" b_hohenwarth:0 "Hohenwarth" b_holar:0 "Holar" @@ -4487,7 +4488,7 @@ b_iveland:0 "Iveland" b_ivios:0 "Ivios" b_iviza:1 "Ibiza" - b_ivrea:0 "Ivrea" + b_ivrea:0 "Aosta" b_ivry:0 "Ivry" b_iveagh:0 "Iveagh" b_izaj:0 "Izaj" @@ -5371,7 +5372,7 @@ b_konosha:0 "Konosha" b_konou:0 "Konou" b_konstantios:0 "Konstantios" - b_konstanz:0 "Konstanz" + b_konstanz:0 "Winterthur" b_kontupohja:0 "Kontupohja" b_konz:0 "Konz" b_koodalur:0 "Koodalur" @@ -6409,7 +6410,7 @@ b_marsetten:0 "Marsetten" b_marslatour:0 "Mars-la-Tour" b_marstrand:0 "Marstrand" - b_martigny:0 "Martigny" + b_martigny:0 "Montreux" b_martil:0 "Martil" b_martos:0 "Martós" b_martyropolis:0 "Martyrpolis" @@ -6792,7 +6793,7 @@ b_montecastrilli:0 "Montecastrilli" b_montecchio:0 "Montecchio" b_montecuccoli:0 "Montecuccoli" - b_montefeltro:0 "Montefeltro" + b_montefeltro:0 "San Marino" b_montehermoso:0 "Montehermoso" b_montelimar:0 "Montélimar" b_montemarono:0 "Montemarono" @@ -7143,7 +7144,7 @@ b_neiguiat:0 "Neïguiat" b_nekrasoskoye:0 "Nekrasoskoye" b_nelakondapalli:0 "Nelakondapalli" - b_nellenburg:0 "Nellenburg" + b_nellenburg:0 "Konstanz" b_nellore:0 "Nellore" b_nemesocsa:0 "Nemesócsa" b_nemetlipcse:0 "Németlipcse" @@ -10061,7 +10062,7 @@ b_thughra:0 "Thughra" b_thun:0 "Thun" b_thurso:0 "Thurso" - b_thusis:0 "Thusis" + b_thusis:0 "Sion" b_thyatira:0 "Thyatira" b_tiace:0 "Tiace" b_tiaret:0 "Tiaret"