diff --git a/common/landed_titles/scandinavia.txt b/common/landed_titles/scandinavia.txt index 98140a623..ceb5dd178 100644 --- a/common/landed_titles/scandinavia.txt +++ b/common/landed_titles/scandinavia.txt @@ -1229,172 +1229,170 @@ e_scandinavia = { # Scandinavia b_middelfart = { # Middelfart province = 228 color = { 237 71 71 } - - cultural_names = { - name_list_NEOW_icelander=cn_skandinav_i_act_a - name_list_NEOW_faroese=cn_skandinavia - name_list_norwegian=cn_skandinavia - name_list_NEOW_vestlandsk=cn_skandinavia - name_list_NEOW_danish=cn_skandinavien - name_list_NEOW_swedish=cn_skandinavien - name_list_NEOW_finnish=cn_skandinavia - name_list_sami=cn_skandinavia - name_list_NEOW_low_saxon=cn_skandinavia - name_list_NEOW_frisian=cn_skandinavia - } } } - c_lolland_falster = { + c_lolland_falster = { # Lolland-Falster color = { 255 38 38 } - b_nykobing = { - province = 67 + cultural_names = { + name_list_NEOW_icelander=cn_l_a_act_land_falstur + } + b_nykobing = { # Nykøbing Falster + province = 67 color = { 207 33 33 } } - b_nakskov = { + b_nakskov = { # Nakskov province = 68 - color = { 207 33 33 } } } } - - d_jylland = { # Jylland + d_jylland = { # Jutland color = { 191 71 47 } + capital = c_aarhus # Aarhus - capital = c_aarhus # Jylland + cultural_names = { + name_list_NEOW_icelander=cn_j_o_act_tland + name_list_NEOW_faroese=cn_j_u_act_tland + name_list_norwegian=cn_jylland + name_list_NEOW_vestlandsk=cn_jylland + name_list_NEOW_danish=cn_jylland + name_list_NEOW_swedish=cn_jylland + name_list_NEOW_finnish=cn_jyllanti + name_list_NEOW_low_saxon=cn_jutlaand + name_list_NEOW_frisian=cn_j_u_uml_tlun + } - c_aarhus = { + c_aarhus = { # # Århus color = { 204 76 51 } - b_aarhus = { + b_aarhus = { # Århus province = 57 - color = { 155 50 26 } cultural_names = { - name_list_NEOW_swedish = cn_arhus + name_list_NEOW_icelander=cn__a_act_r_o_act_sar } } - b_jelling = { + b_jelling = { # Horsens province = 58 - color = { 155 50 26 } } - b_djursland = { + b_djursland = { # Grenå province = 226 - color = { 155 50 26 } } } - c_vorbasse = { + c_vorbasse = { # Vejle color = { 178 66 44 } - b_vorbasse = { + b_vorbasse = { # Billund province = 59 - color = { 160 43 17 } } - b_taulov = { + b_taulov = { # Vejle province = 227 - color = { 160 43 17 } } - b_aabenraa = { + b_aabenraa = { # Aabenraa province = 61 - color = { 216 89 60 } cultural_names = { - name_list_NEOW_swedish = cn_abenra - name_list_franconian = cn_apenrade - name_list_saxon = cn_apenrade - name_list_swabian = cn_apenrade - name_list_NEOW_bavarian = cn_apenrade + name_list_NEOW_swedish=cn__a_rng_benr_a_rng_ + name_list_NEOW_bavarian=cn_apenrade + name_list_NEOW_brandenburger=cn_apenrade + name_list_NEOW_franconian=cn_apenrade + name_list_NEOW_low_saxon=cn_apenrade + name_list_NEOW_palatine=cn_apenrade + name_list_NEOW_rhinelander=cn_apenrade + name_list_NEOW_swabian=cn_apenrade } } - b_kolding = { + b_kolding = { # Kolding province = 434 - color = { 160 43 17 } } } - - c_ribe = { + c_ribe = { # Esbjerg color = { 229 86 57 } - b_ribe = { - province = 60 - + b_varde = { # Esbjerg + province = 83 color = { 186 96 76 } } - b_varde = { - province = 83 - + b_ribe = { # Tønder + province = 60 color = { 186 96 76 } + + cultural_names = { + name_list_NEOW_frisian=cn_tuner + name_list_NEOW_bavarian=cn_tondern + name_list_NEOW_brandenburger=cn_tondern + name_list_NEOW_franconian=cn_tondern + name_list_NEOW_low_saxon=cn_tondern + name_list_NEOW_palatine=cn_tondern + name_list_NEOW_rhinelander=cn_tondern + name_list_NEOW_swabian=cn_tondern + } } } - c_viborg = { + c_viborg = { # Viborg color = { 153 57 38 } - b_viborg = { + b_viborg = { # Viborg province = 56 - color = { 175 40 56 } } - b_ormstrup = { + b_ormstrup = { # Ikast province = 222 - color = { 175 40 56 } } } - - c_ringkobing = { + c_ringkobing = { # Herning color = { 255 95 63 } - b_ringkobing = { - province = 82 - - color = { 175 70 22 } - } - b_holstebro = { - province = 221 - - color = { 175 70 22 } - } - b_ycost = { + b_ycost = { # Herning province = 223 - color = { 175 70 22 } } - b_tarm = { + b_ringkobing = { # Ringkøbing + province = 82 + color = { 175 70 22 } + } + b_holstebro = { # Holstebro + province = 221 + color = { 175 70 22 } + } + b_tarm = { # Varde province = 225 - color = { 175 70 22 } } } - - c_aalborg = { + c_aalborg = { # Aalborg color = { 127 47 31 } - b_aalborg = { - province = 81 + cultural_names = { + name_list_NEOW_icelander = cn__a_act_laborg + name_list_NEOW_swedish = cn__a_rng_lborg + } + b_aalborg = { # Aalborg + province = 81 color = { 165 9 64 } cultural_names = { - name_list_NEOW_swedish = cn_alborg + name_list_NEOW_icelander = cn__a_act_laborg + name_list_NEOW_swedish = cn__a_rng_lborg } } - b_lindholm = { + b_lindholm = { # Hjørring province = 55 - color = { 165 9 64 } } - b_randros = { + b_randros = { # Randers province = 224 - color = { 165 9 64 } } } diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_babalon2.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_babalon2.dds index 4b9d17bba..464f36144 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_babalon2.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_babalon2.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f952bedfbdbb4a7f136018934530b4c5bc18cf1a610cbc8c2b8b503a17580c6 -size 262272 +oid sha256:998d5f76e9ce4f5df1a2dc8b583dbe83b57fe5ec20d4531b8cb56e52a528fbc2 +size 87536 diff --git a/history/provinces/e_scandinavia.txt b/history/provinces/e_scandinavia.txt index 444564dcc..7d04340c8 100644 --- a/history/provinces/e_scandinavia.txt +++ b/history/provinces/e_scandinavia.txt @@ -803,22 +803,18 @@ holding = none } ###c_ribe -60 = { +83 = { culture = slesvigsk religion = lutheran holding = castle_holding 1066.1.1 = { - buildings = { - common_tradeport_01 - curtain_walls_01 - } + buildings = { + common_tradeport_01 + curtain_walls_01 } } -83 = { - holding = none - 1066.1.1 = { +60 = { holding = city_holding - } } ###c_viborg 56 = { @@ -835,24 +831,16 @@ holding = none } ###c_ringkobing -82 = { - culture = norse - religion = folketro - holding = tribal_holding - 965.1.1 = { +223 = { culture = dansk religion = lutheran holding = castle_holding - } +} +82 = { + holding = none } 221 = { - holding = none - 1066.1.1 = { holding = church_holding - } -} -223 = { - holding = none } 225 = { holding = none diff --git a/localization/english/replace/bookmark/bookmark_N3OW_north_europe_2555_l_english.yml b/localization/english/replace/bookmark/bookmark_N3OW_north_europe_2555_l_english.yml index b5852d4a2..493dad6f2 100644 --- a/localization/english/replace/bookmark/bookmark_N3OW_north_europe_2555_l_english.yml +++ b/localization/english/replace/bookmark/bookmark_N3OW_north_europe_2555_l_english.yml @@ -17,7 +17,7 @@ bookmark_NE_sjaelland_glucksburg_christian:0 "Christian" bookmark_NE_sjaelland_glucksburg_christian_subheading:0 "The Danish Prince" - bookmark_NE_sjaelland_glucksburg_christian_desc:0 "insert shit here 1\n\n#bold insert shit here?#!" + bookmark_NE_sjaelland_glucksburg_christian_desc:0 "Christian, prince of Sjælland, has always had an abysmal relationship with his elder brother Frederik. For their entire lives, Frederik had been the golden child - the eldest son, the heir to the throne, destined to reunite Denmark and negate the claims of their treacherous cousins in Schleswig and Jutland, especially after he took to wife Freya, a pastor destined to become Archprimate. Yet what happened two years ago, when the two brothers quarreled and Christian slew Frederik, was a tragic accident - or at least, that it what Christian claims. Having exiled his vengeful nephew and married his brother's widow, it is now up to him to restore the crown.\n\n#bold Will Christian bring glory to the house of Glücksburg once more? Or is he destined to be remembered as an usurper, and Denmark condemned to rot?#!" bookmark_NE_goralia_lubranski_gosciwuj:0 "Gościwuj" bookmark_NE_goralia_lubranski_gosciwuj_subheading:0 "The Mountain King" diff --git a/localization/english/replace/titles_cultural_names_l_english.yml b/localization/english/replace/titles_cultural_names_l_english.yml index 2e587c85a..89c9df9db 100644 --- a/localization/english/replace/titles_cultural_names_l_english.yml +++ b/localization/english/replace/titles_cultural_names_l_english.yml @@ -4782,11 +4782,30 @@ cn_kopenhuuwen:0 "Kopenhuuwen" # Bornholm cn_borgundarh_o_act_lmur:0 "Borgundarhólmur" - ## Fyn/Funen + # Fyn/Funen cn_fj_o_act_n:0 "Fjón" cn_funnen:0 "Funnen" cn_fyn:0 "Fyn" cn__o_act__eth_insv_e_act_:0 "Óðinsvé" + cn_l_a_act_land_falstur:0 "Láland-Falstur" + ## Jylland/Jutland + cn_j_o_act_tland:0 "Jótland" + cn_j_u_act_tland:0 "Jútland" + cn_j_u_uml_tlun:0 "Jütlun" + cn_jutlaand:0 "Jutlaand" + cn_jylland:0 "Jylland" + cn_jyllanti:0 "Jyllanti" + # Aarhus + cn__a_act_r_o_act_sar:0 "Árósar" + # Vorbasse/Vejle + cn__a_rng_benr_a_rng_:0 "Åbenrå" + cn_apenrade:0 "Apenrade" + # Ribe + cn_tondern:0 "Tondern" + cn_tuner:0 "Tuner" + # Aalborg + cn__a_act_laborg:0 "Álaborg" + cn__a_rng_lborg:0 "Ålborg" # Custom (changed from default) title names: cn_bratislava:0 "Bratislava" @@ -5434,16 +5453,8 @@ cn_finnmork:0 "Finnmörk" #Denmark - cn_arhus:0 "Århus" - cn_arhus_adj:0 "Århuser" - cn_alborg:0 "Ålborg" - cn_alborg_adj:0 "Ålborger" cn_heidabyr:0 "Heiðabyr" cn_heidabyr_adj:0 "Heiðabyrer" - cn_abenra:0 "Åbenrå" - cn_abenra_adj:0 "Åbenrån" - cn_apenrade:0 "Apenrade" - cn_apenrade_adj:0 "Apenrader" #Britannia cn_machynlleth:0 "Machynlleth" diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index 72c288437..f883227bd 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -3694,12 +3694,55 @@ c_bornholm:0 "Bornholm" c_bornholm_adj:0 "Bornholmian" b_ronne:0 "Rønne" - ## Fyn/Funen + # Fyn/Funen c_fyn:0 "Funen" c_fyn_adj:0 "Fynbo" b_odense:0 "Odense" b_svendborg:0 "Svendborg" b_middelfart:0 "Middelfart" + # Lolland-Falster + c_lolland_falster:0 "Lolland-Falster" + c_lolland_falster_adj:0 "Lolland-Falsterian" + b_nykobing:0 "Nykøbing Falster" + b_nakskov:0 "Nakskov" + ## Jylland/Jutland + d_jylland:0 "Jutland" + d_jylland_adj:0 "Jutlander" + # Aarhus + c_aarhus:0 "Århus" + c_aarhus_adj:0 "Århuser" + b_jelling:0 "Horsens" + b_djursland:0 "Grenå" + # Vorbasse/Vejle + c_vorbasse:0 "Vejle" + c_vorbasse_adj:0 "Vejlenser" + b_vorbasse:0 "Billund" + b_taulov:0 "Vejle" + b_aabenraa:0 "Aabenraa" + b_kolding:0 "Kolding" + # Ribe/Esbjerg + c_ribe:0 "Esbjerg" + c_ribe_adj:0 "Esbjergenser" + b_varde:0 "Esbjerg" + b_ribe:0 "Tønder" + # Viborg + c_viborg:0 "Viborg" + c_viborg_adj:0 "Viborgenser" + b_viborg:0 "Viborg" + b_ormstrup:0 "Ikast" + # Ringkobing + c_ringkobing:0 "Herning" + c_ringkobing_adj:0 "Herningbo" + b_ycost:0 "Herning" + b_ringkobing:0 "Ringkøbing" + b_holstebro:0 "Holstebro" + b_tarm:0 "Varde" + # Aalborg + c_aalborg:0 "Aalborg" + c_aalborg_adj:0 "Aalborgenser" + b_aalborg:0 "Aalborg" + b_lindholm:0 "Hjørring" + b_randros:0 "Randers" # Custom (changed from default) title names: LOTHARINGIA:0 "$k_lotharingia$" @@ -3806,10 +3849,8 @@ b_ugano:0 "Domodossola" b_Xanten:0 "Xanten" b_Xauen:0 "Xauen" - b_aabenraa:0 "Abenraa" b_aadel:0 "Aadel" b_aakirkeby:0 "Åkirkeby" - b_aalborg:0 "Aalborg" b_aalst:0 "Aalst" b_aanaarjavri:0 "Aanaarjävri" b_aarak:1 "Nedenes" @@ -6205,7 +6246,6 @@ b_djenne:0 "Djenne" b_djibouti:0 "Djibouti" b_djinesh:0 "Djinesh" - b_djursland:0 "Djursland" b_djvari:0 "Djavri" b_dmanis:0 "Dmanis" b_dnieprkherson:0 "Kherson" @@ -7340,7 +7380,6 @@ b_hohenwarth:0 "Hohenwarth" b_holar:0 "Holar" b_holhol:0 "Holhol" - b_holstebro:0 "Holstebro" b_holt:0 "Holt" b_holuf:0 "Holuf" b_homs:0 "Homs" @@ -7658,7 +7697,6 @@ b_jekabpils:0 "Jekabpils" b_jekanskoi:0 "Jekanskoi" b_jelgava:0 "Jelgava" - b_jelling:0 "Horsens" b_jenbach:0 "Jenbach" b_jendouba:0 "Jendouba" b_jerada:0 "Jerada" @@ -8336,7 +8374,6 @@ b_kolachi:0 "Kolachi" b_kolayat:0 "Kolayat" b_kolbatz:0 "Kolbatz" - b_kolding:0 "Kolding" b_kolhapur:0 "Kolhapur" b_kolin:0 "Kolin" b_kollam:0 "Kollam" @@ -8861,7 +8898,6 @@ b_limmassol:0 "Limmassol" b_limyra:0 "Limyra" b_lindau:0 "Lindau" - b_lindholm:0 "Hjørring" b_lindos:0 "Lindos" b_linewerd:0 "Linewerd" b_lingen:0 "Lingen" @@ -9786,7 +9822,6 @@ b_nakhshab:0 "Nakhshab" b_naklo:0 "Nakło nad Notecią" b_nakoleia:0 "Nakoleia" - b_nakskov:0 "Maribo" b_nakur:0 "Nakur" b_nalanda:0 "Nalanda" b_naldurg:0 "Naldurg" @@ -10047,7 +10082,6 @@ b_nyen:0 "Nyen" b_nyitra:1 "Nitra" b_nykarleby:0 "Uusikaarlepyy" - b_nykobing:0 "Nykøbing" b_nymphaion:0 "Nymphaion" b_nyon:0 "Nyon" b_nysa:0 "Nysa" @@ -10151,7 +10185,6 @@ b_orlamunde:0 "Orlamünde" b_orlanto:1 "Otranto" b_ormara:0 "Ormara" - b_ormstrup:0 "Ormstrup" b_ornans:0 "Ornans" b_ornois:0 "Ornois" b_ornskoldsvik:0 "Örnsköldsvik" @@ -10848,7 +10881,6 @@ b_randa:0 "Randa" b_rander:0 "Rander" b_randers:0 "Randers" - b_randros:0 "Randers" b_ranikot:0 "Ranikot" b_ranipur:0 "Ranipur" b_rannoch:0 "Rannoch" @@ -10951,7 +10983,6 @@ b_ribat-shakir:0 "Ribat-Shakir" b_ribat_al-fath:0 "Ribat al-Fath" b_ribat_malik:0 "Ribat Malik" - b_ribe:0 "Ribe" b_ribnica:1 "Ribnica" b_ribnicapodgorica:0 "Podgorica" b_richemont:0 "Richemont" @@ -10966,7 +10997,6 @@ b_rila:0 "Rila" b_rimini:0 "Rimini" b_ringariki:1 "Nesbyen" - b_ringkobing:0 "Ringkøbing" b_ringsted:0 "Ringsted" b_riqan:0 "Riqan" b_risan:0 "Risan" @@ -12284,7 +12314,6 @@ b_tarhalet:0 "Tarhalet" b_taris:0 "Taris" b_tarki:0 "Tarki" - b_tarm:0 "Varde" b_tarnow:0 "Tarnów" b_tarom:0 "Tarom" b_taroudaut:0 "Taroudaut" @@ -12307,7 +12336,6 @@ b_tatev:0 "Tatev" b_tattandapura:0 "Tattandapura" b_taufiq:0 "Taufiq" - b_taulov:0 "Vejle" b_taurage:0 "Taurage" b_tavavis:0 "Tavavis" b_tavia:0 "Tavia" @@ -12943,7 +12971,6 @@ b_varazdin:0 "Varazdin" b_varberg:0 "Varberg" b_varbitsz:0 "Varbitsz" - b_varde:0 "Esbjerg" b_vardhamana:0 "Vardhamāna" b_vardohus:0 "Vardøhus" b_vardzia:0 "Vardzia" @@ -13040,7 +13067,6 @@ b_viadana:0 "Viadana" b_vianadocastelo:0 "Viana do Castelo" b_viareggio:0 "Viareggio" - b_viborg:0 "Viborg" b_vicalapura:0 "Vicalapura" b_vicenza:0 "Vicenza" b_vichy:0 "Vichy" @@ -13138,7 +13164,6 @@ b_volzhsk:0 "Volzhsk" b_vonitsa:0 "Vonitsa" b_vonitsza:0 "Vonitsza" - b_vorbasse:0 "Billund" b_vordingborg:0 "Vordingborg" b_vorgashor:0 "Vorgashor" b_vorkuta:0 "Vorkuta" @@ -13361,7 +13386,6 @@ b_yazd:0 "Yazd" b_yazhma:0 "Yazhma" b_yazur:0 "Yazur" - b_ycost:0 "Herning" b_yecheng:0 "Yecheng" b_yecla:0 "Yecla" b_yedisu:0 "Yedisu" @@ -13558,12 +13582,8 @@ b_zweitina:0 "Zweitina" b_zwickau:0 "Zwickau" b_zwiefalten:0 "Zweifalten" - c_aalborg:0 "Aalborg" - c_aalborg_adj:0 "Aalborger" c_aanaarjavri:0 "Aanaarjävri" c_aanaarjavri_adj:0 "Aanaarjävrian" - c_aarhus:0 "Aarhus" - c_aarhus_adj:0 "Aarhuser" c_abauj:0 "Košice" c_abauj_adj:0 "Košicean" c_abensberg:0 "Abensberg" @@ -14958,8 +14978,6 @@ c_ljubljana_adj:1 "Ljubljanan" c_lobdaburg:0 "Lobdaburg" c_lobdaburg_adj:0 "Lobdaburger" - c_lolland_falster:0 "Lolland-Falster" - c_lolland_falster_adj:0 "Lolland-Falsterian" c_lombardia:0 "Lombardia" c_lombardia_adj:0 "Lombard" c_lomzynska:0 "Łomża" @@ -15571,11 +15589,8 @@ c_smolyan:0 "Rhodopes" c_rhodos:0 "Rhodos" c_rhodos_adj:0 "Rhodian" - c_ribe:0 "Ribe" - c_ribe_adj:0 "Ribenian" c_rijeka:0 "Rijeka" c_rijeka_adj:0 "Rijekan" - c_ringkobing:0 "Ringkøbing" c_riqan:0 "Riqan" c_rivsharan:0 "Rivsharan" c_rogaland:0 "Rogaland" @@ -16199,8 +16214,6 @@ c_vexin_adj:0 "Vexinian" c_sarajevo:1 "Sarajevo" c_sarajevo_adj:0 "Sarajevan" - c_viborg:0 "Viborg" - c_viborg_adj:0 "Viborgian" c_vidin:0 "Vidin" c_vidin_adj:0 "Vidinian" c_vidisa:0 "Vidisa" @@ -16245,8 +16258,6 @@ c_volkovysk:0 "Volkovysk" c_vologda:0 "Vologda" c_vologda_adj:0 "Vologdan" - c_vorbasse:0 "Vejle" - c_vorbasse_adj:0 "Vejlean" c_vosges:0 "Vosges" c_vosges_adj:0 "Vosges" c_votyaki:0 "Votyaki" @@ -16750,8 +16761,6 @@ d_jharkand_adj:0 "Jharkandi" d_jomsvikings:0 "Jomsvikings" d_jomsvikings_adj:0 "Jomsviking" - d_jylland:0 "Jylland" - d_jylland_adj:0 "Jyllander" d_kabul:0 "Kabulistan" d_kabul_adj:0 "Kabulian" d_kabylia:0 "Kabylia"