From 10653a685182faddff48b5683e15a9492e5b1d7e Mon Sep 17 00:00:00 2001 From: Vannifar Date: Thu, 23 Oct 2025 03:36:17 -0400 Subject: [PATCH] Alps-Scandinavia --- N3OW/common/landed_titles/alps.txt | 70 +-- N3OW/common/landed_titles/germany.txt | 151 +++--- N3OW/common/landed_titles/scandinavia.txt | 444 +++++++++++------- N3OW/gfx/map/map_object_data/activities.txt | 68 ++- .../map/map_object_data/building_locators.txt | 80 +++- .../map/map_object_data/combat_locators.txt | 68 ++- .../map_object_data/player_stack_locators.txt | 68 ++- .../map/map_object_data/siege_locators.txt | 68 ++- .../special_building_locators.txt | 66 +++ N3OW/history/provinces/e_germany.txt | 40 +- N3OW/history/provinces/e_scandinavia.txt | 80 +++- .../localization/english/titles_l_english.yml | 20 +- N3OW/map_data/default.map | 4 + N3OW/map_data/definition.csv | 42 +- N3OW/map_data/provinces.png | 4 +- 15 files changed, 925 insertions(+), 348 deletions(-) diff --git a/N3OW/common/landed_titles/alps.txt b/N3OW/common/landed_titles/alps.txt index 07864ff6..732400b5 100644 --- a/N3OW/common/landed_titles/alps.txt +++ b/N3OW/common/landed_titles/alps.txt @@ -63,6 +63,30 @@ e_alps = { b_delemont = { province = 9763 + color = { 255 215 205 } + } + b_solothurn = { + province = 9783 + + color = { 255 215 205 } + } + } + c_aargau = { + color = { 150 70 15 } + + b_lucerne = { + province = 2048 + + color = { 150 70 15 } + } + b_engelberg = { + province = 3107 + + color = { 255 215 205 } + } + b_aargau = { + province = 9784 + color = { 255 215 205 } } } @@ -116,6 +140,11 @@ e_alps = { b_martigny = { province = 2038 + color = { 90 5 15 } + } + b_fribourg = { + province = 9782 + color = { 90 5 15 } } } @@ -145,20 +174,6 @@ e_alps = { color = { 90 5 15 } } } - c_aargau = { - color = { 150 70 15 } - - b_lucerne = { - province = 2048 - - color = { 150 70 15 } - } - b_engelberg = { - province = 3107 - - color = { 255 215 205 } - } - } } } k_lichtenstein = { @@ -187,6 +202,11 @@ e_alps = { b_bludenz = { province = 9704 + color = { 170 150 190 } + } + b_illanz = { + province = 9786 + color = { 170 150 190 } } } @@ -197,7 +217,7 @@ e_alps = { capital = c_innsbruck d_vorarlberg = { - color = { 75 65 75 } + color = { 175 95 25 } capital = c_vorarlberg @@ -209,6 +229,11 @@ e_alps = { color = { 255 220 220 } } + b_hohenschwangau = { + province = 2790 + + color = { 45 40 45 } + } } } d_tyrol = { @@ -230,11 +255,6 @@ e_alps = { color = { 75 65 75 } } - b_laukental = { - province = 2985 - - color = { 115 105 115 } - } b_kitzbuhel = { province = 2976 @@ -268,11 +288,6 @@ e_alps = { color = { 45 40 45 } } - b_hohenschwangau = { - province = 2790 - - color = { 45 40 45 } - } b_lech = { province = 9705 @@ -299,8 +314,8 @@ e_alps = { } } } - d_tyrol = { - color = { 75 65 75 } + d_south_tyrol = { + color = { 195 5 5 } capital = c_innsbruck #De-facto only, actually Tirol @@ -743,6 +758,5 @@ e_alps = { } } } - } } \ No newline at end of file diff --git a/N3OW/common/landed_titles/germany.txt b/N3OW/common/landed_titles/germany.txt index 7b012850..e1c8cb2d 100644 --- a/N3OW/common/landed_titles/germany.txt +++ b/N3OW/common/landed_titles/germany.txt @@ -922,21 +922,17 @@ e_germany = { color = { 90 95 100 } } - } - c_hallstatt = { - color = { 105 105 115 } + b_laukental = { + province = 2985 - b_hallstatt = { - province = 3135 - - color = { 105 105 115 } - } - b_wels = { - province = 3133 - - color = { 105 105 115 } + color = { 115 105 115 } } } + } + d_upper_austria = { + color = { 140 120 120 } + + capital = c_linz c_linz = { color = { 115 105 105 } @@ -950,6 +946,9 @@ e_germany = { color = { 115 105 105 } } + } + c_muhlviertel = { + color = { 125 115 115 } b_leonfelden = { province = 3072 @@ -961,19 +960,8 @@ e_germany = { color = { 200 195 160 } } } - c_schaumberg = { - color = { 120 120 120 } - - b_schaumberg = { - province = 2971 - - color = { 120 120 120 } - } - b_strasswalchen = { - province = 2979 - - color = { 120 120 120 } - } + c_innviertel = { + color = { 125 115 115 } b_braunau = { province = 2973 @@ -990,8 +978,25 @@ e_germany = { color = { 80 80 80 } } } - } + c_hausruckviertel = { + color = { 145 125 125 } + b_wels = { + province = 3133 + color = { 105 105 115 } + } + b_schaumberg = { + province = 2971 + + color = { 120 120 120 } + } + b_strasswalchen = { + province = 2979 + + color = { 120 120 120 } + } + } + } d_steyermark = { color = { 120 100 100 } @@ -1026,25 +1031,6 @@ e_germany = { color = { 120 100 100 } } } - c_liebnitz = { - color = { 115 90 90 } - - b_liebnitz = { - province = 3109 - - color = { 115 90 90 } - } - b_maribor = { - province = 3103 - - color = { 115 90 90 } - } - b_windische_buhel = { - province = 3106 - - color = { 115 90 90 } - } - } c_murzzuschlag = { color = { 140 120 120 } @@ -1070,11 +1056,6 @@ e_germany = { b_murau = { province = 3114 - color = { 90 95 100 } - } - b_irdning = { - province = 3129 - color = { 90 95 100 } } } @@ -1091,16 +1072,37 @@ e_germany = { color = { 105 100 115 } } + } + c_liezen = { + color = { 115 110 125 } + b_liezen = { + province = 3130 + + color = { 105 105 115 } + } b_admont = { province = 3126 color = { 105 100 115 } } - b_liezen = { - province = 3130 + b_grobming = { + province = 3135 color = { 105 105 115 } } + b_irdning = { + province = 3129 + + color = { 90 95 100 } + } + } + c_liebnitz = { + color = { 115 90 90 } + b_liebnitz = { + province = 3109 + + color = { 115 90 90 } + } } } @@ -1247,6 +1249,25 @@ e_germany = { color = { 190 180 165 } } } + c_burgenland = { + color = { 115 115 130 } + + b_eisenstadt = { + province = 9778 + + color = { 115 115 130 } + } + b_gussing = { + province = 9779 + + color = { 125 125 140 } + } + b_oberpullendorf = { + province = 9780 + + color = { 125 125 140 } + } + } } d_carinthia = { @@ -1296,9 +1317,33 @@ e_germany = { color = { 95 115 120 } } + b_hermagor = { + province = 9798 + + color = { 95 115 120 } + } + } } - } + d_stajerska = { + color = { 115 90 90 } + capital = c_eisenstadt + + c_maribor = { + color = { 115 90 90 } + b_maribor = { + province = 3103 + + color = { 115 90 90 } + } + b_windische_buhel = { + province = 3106 + + color = { 115 90 90 } + } + } + } + } k_rhineland = { diff --git a/N3OW/common/landed_titles/scandinavia.txt b/N3OW/common/landed_titles/scandinavia.txt index 561fd764..c6ce6d0e 100644 --- a/N3OW/common/landed_titles/scandinavia.txt +++ b/N3OW/common/landed_titles/scandinavia.txt @@ -1910,10 +1910,10 @@ e_scandinavia = { } } } - k_sapmi = { + k_sapmi = { color = { 153 204 189 } - capital = c_vingulmork + capital = c_ubmeje ai_primary_priority = { if = { @@ -1923,23 +1923,23 @@ e_scandinavia = { add = @correct_culture_primary_score } } - d_aarjetje = { #Åarjetje (sami for "south") - color = { 15 15 180 } + d_vasterbottena = { + color = { 153 204 189 } capital = c_sjeltie cultural_names = { name_list_norwegian = cn_vasterbotten name_list_swedish = cn_vasterbotten name_list_norse = cn_vasterbotten } - c_umea = { - color = { 20 35 110 } + c_ubmeje = { + color = { 153 204 189 } cultural_names = { name_list_swedish = cn_umea } b_ubmeje = { #(Umeå) province = 368 - color = { 20 35 110 } + color = { 153 204 189 } cultural_names = { name_list_swedish = cn_umea @@ -1948,7 +1948,7 @@ e_scandinavia = { b_arviesjavrrie = { #Árviesjávrrie (Arvidsjaur) province = 375 - color = { 20 35 110 } + color = { 153 204 189 }0 } cultural_names = { name_list_swedish = cn_arvidsjaur @@ -1957,18 +1957,18 @@ e_scandinavia = { b_grundasund = { #(Grundsunda) province = 382 - color = { 30 55 185 } + color = { 153 204 189 } } } c_sjeltie = { - color = { 35 35 180 } + color = { 133 184 159 } cultural_names = { - name_list_sami = cn_sjeltie + name_list_swedish = cn_asele } b_sjeltie = { #Sjeltie (Åsele) province = 430 - color = { 35 35 180 } + color = { 133 184 159 } cultural_names = { name_list_swedish = cn_asele @@ -1977,7 +1977,7 @@ e_scandinavia = { b_gaaltoe = { #Gåaltoe (Kultsjön) province = 431 - color = { 35 35 180 } + color = { 133 184 159 } cultural_names = { name_list_swedish = cn_kultsjon @@ -1986,7 +1986,7 @@ e_scandinavia = { b_vualtjere = { #(Vilhelmina) province = 432 - color = { 35 35 180 } + color = { 133 184 159 } cultural_names = { name_list_swedish = cn_volgsjo @@ -1994,19 +1994,19 @@ e_scandinavia = { } } c_ubmejeiednuo = { #(Umeälven) - color = { 20 25 195 } + color = { 103 154 159 } cultural_names = { name_list_sami = cn_ubmejeiednuo } b_uddjaur = { province = 428 - color = { 20 25 195 } + color = { 103 154 159 } } b_lusspie = { #Storuman province = 429 - color = { 20 25 195 } + color = { 103 154 159 } cultural_names = { name_list_swedish = cn_storuman @@ -2014,45 +2014,29 @@ e_scandinavia = { } b_ume = { province = 8781 - color = { 20 25 195 } + color = { 103 154 159 } } b_lais = { province = 381 - color = { 20 25 195 } + color = { 103 154 159 } } } } d_norrbottena = { - color = { 10 10 90 } + color = { 173 194 229 } - capital = c_biton - c_biton = { - color = { 20 35 110 } - cultural_names = { - name_list_swedish = cn_pitea - } - b_biton = { #(Piteå) - province = 422 - - color = { 20 35 110 } - - cultural_names = { - name_list_swedish = cn_pitea - } - } - } + capital = c_julevadno c_julevadno = { #Julevädno (Luleälven) - color = { 20 20 100 } + color = { 183 204 239 } cultural_names = { name_list_swedish = cn_lulea } b_julevu = { #(Luleå) province = 421 - color = { 20 20 100 } - + color = { 183 204 239 } cultural_names = { name_list_swedish = cn_lulea } @@ -2060,72 +2044,66 @@ e_scandinavia = { b_galaseatnu = { #Gáláseatnu (Kalix) province = 423 - color = { 20 20 100 } - + color = { 183 204 239 } cultural_names = { name_list_swedish = cn_kalix } } + b_biton = { #(Piteå) + province = 422 + + color = { 173 194 229 } + + cultural_names = { + name_list_swedish = cn_pitea + } + } } c_torne = { - color = { 45 45 135 } + color = { 193 204 219 } b_vettanen = { #(=Ängesån) province = 8782 - color = { 45 45 135 } + color = { 193 204 219 } } b_ylikainuu = { #(=Överkalix) province = 8783 - color = { 45 45 135 } + color = { 193 204 219 } } - } - c_siggevara = { - color = { 46 37 225 } - b_siggevara = { province = 380 - color = { 46 30 205 } - } - b_sirkas = { - province = 379 - - color = { 46 30 205 } - } - b_sjokksjokk = { - province = 378 - - color = { 46 30 205 } + color = { 126 137 225 } } } c_pite = { - color = { 10 10 205 } + color = { 150 150 219 } b_luokta = { province = 374 - color = { 10 10 205 } + color = { 150 150 219 } } b_arjepluovve = { #Árjepluovve province = 427 - color = { 10 10 205 } + color = { 150 150 219 } } b_semisjaur = { province = 377 - color = { 10 10 205 } + color = { 150 150 219 } } } c_jahkamakke = { #Lule - color = { 35 15 160 } + color = { 130 120 190 } cultural_names = { name_list_swedish = cn_jokkmokk } b_jahkamakke = { #Jåhkåmåhkke (Jokkmokk) province = 373 - color = { 15 15 180 } + color = { 130 120 190 } cultural_names = { name_list_swedish = cn_jokkmokk @@ -2134,131 +2112,32 @@ e_scandinavia = { b_tuorpon = { province = 376 - color = { 15 15 180 } + color = { 130 120 190 } } b_tingevara = { province = 383 - color = { 80 75 235 } + color = { 130 120 190 } + } + b_sjokksjokk = { + province = 378 + + color = { 130 120 190 } + } + b_sirkas = { + province = 379 + + color = { 130 120 190 } } } } d_torniolaakso = { - #Cobbled sami translation for "Forest (Vuovdi) Sámi Land (Eana)" - #Ideally it would mean "Land of the Forest Sami" - color = { 90 10 10 } + color = { 143 194 249 } capital = c_kittila - - c_kittila = { - color = { 15 0 90 } - - b_kittal = { - province = 385 - - color = { 15 0 90 } - - cultural_names = { - name_list_finnish = cn_kittila - } - } - b_kangos = { - province = 8784 - color = { 45 45 135 } - } - b_suadigil = { #Suádigil (Sodankylä) - province = 387 - - color = { 15 0 90 } - - cultural_names = { - name_list_finnish = cn_sodankyla - } - } - b_roavvenjarga = { #Rovaniemi - province = 8785 - color = { 15 0 90 } - } - } - c_tornionlaakso = { - color = { 20 20 145 } - b_duortnus = { #(Torneå) - province = 424 - - color = { 20 20 100 } - - cultural_names = { - name_list_swedish = cn_tornea - name_list_finnish = cn_tornio - } - } - } - c_inari = { - color = { 20 20 145 } - - b_aanaarjavri = { #Aanaarjävri (Enare Träsk) - province = 391 - - color = { 20 20 145 } - - cultural_names = { - name_list_swedish = cn_enare_trask - name_list_finnish = cn_inarijarvi - } - } - b_suenekele = { - province = 8788 - color = { 20 20 145 } - } - b_laggujakka = { #Laggujåkka - province = 398 - - color = { 100 95 255 } - } - } - c_suondavara = { - color = { 70 55 200 } - - b_suondavara = { - province = 384 - - color = { 70 55 200 } - } - } - c_peaccam = { #Kemi - color = { 20 10 155 } - - b_giempa = { #Kemi - province = 425 - - color = { 20 10 155 } - - cultural_names = { - name_list_finnish = cn_kemi - } - } - b_kemijavri = { #Kemijävri (Kemijärvi) - province = 388 - - color = { 20 10 155 } - - cultural_names = { - name_list_finnish = cn_kemijarvi - } - } - b_iijoki = { - province = 426 - - color = { 20 10 155 } - } - b_kuusama = { - province = 8786 - color = { 20 10 155 } - } - } } d_finnmarku = { #Davvisapmi - color = { 46 30 205 } + color = { 106 90 245 } capital = c_aviovara cultural_names = { @@ -2367,5 +2246,214 @@ e_scandinavia = { } } } + d_giemajohka = { #(Kemi älv) + color = { 130 130 190 } + + capital = c_giempa + + cultural_names = { + name_list_swedish = cn_leporie + name_list_norwegian = cn_leporie + name_list_norse = cn_leporie + name_list_russian = cn_leporie + #More or less this region can be found as "Leporie" in maps from Renaissance Era + #Possibly just means "Laponia" in Russian or interpreted Russian + } + c_giepma = { #Kemi + color = { 210 220 255 } + cultural_names = { + name_list_finnish = cn_kemi + } + b_giempa = { #Kemi + province = 425 + + color = { 210 220 255 } + + cultural_names = { + name_list_finnish = cn_kemi + } + } + b_iijoki = { + province = 426 + + color = { 210 220 255 } + } + b_kuusama = { + province = 8786 + color = { 210 220 255 } + } + } + c_roavvenjarga = { + b_roavvenjarga = { #Rovaniemi + province = 8785 + color = { 210 240 255 } + } + b_suadigil = { #Suádigil (Sodankylä) + province = 387 + + color = { 210 240 255 } + + cultural_names = { + name_list_finnish = cn_sodankyla + } + } + b_kemijavri = { #Kemijävri (Kemijärvi) + province = 388 + + color = { 210 240 255 } + + cultural_names = { + name_list_finnish = cn_kemijarvi + } + } + } + c_kitka = { + color = { 150 100 250 } + + b_kitka = { + province = 419 + + color = { 15 10 150 } + } + b_koulajavri = { #Koulajävri + province = 418 + + color = { 15 10 150 } + + cultural_names = { + name_list_finnish = cn_koulajarvi + } + } + b_maanselka = { #Maanselkä + province = 420 + + color = { 15 10 150 } + } + } + c_sombio = { + color = { 130 125 245 } + + b_sombio = { + province = 390 + + color = { 130 125 245 } + } + b_suonnjel = { #Suõ?nnjel + province = 401 + + color = { 130 125 245 } + + cultural_names = { + name_list_russian = cn_priretjnyj + name_list_finnish = cn_suonikyla + } + } + b_nuottjaurr = { #Nuõ´ttjäu´rr + province = 403 + + color = { 130 125 245 } + + cultural_names = { + name_list_russian = cn_notozero + name_list_finnish = cn_nourtijarvi + } + } + b_saarvesjaurr = { #Sââ´rvesjäu´rr + province = 408 + + color = { 130 125 245 } + + cultural_names = { + name_list_russian = cn_girvasozero + name_list_finnish = cn_hirvas_jarvi + } + } + } + c_skolt = { + color = { 144 120 250 } + + b_skolt = { + province = 8789 + color = { 144 120 250 } + } + b_kiilt = { + province = 404 + + color = { 144 120 250 } + + cultural_names = { + name_list_russian = cn_kildin + } + } + b_muetkk = { #Mue´t?? + province = 402 + + color = { 144 120 250 } + + cultural_names = { + name_list_russian = cn_motovsky + name_list_finnish = cn_muotka + } + } + } + c_kittila = { + color = { 143 194 249 } + + b_kittal = { + province = 385 + + color = { 143 194 249 } + + cultural_names = { + name_list_finnish = cn_kittila + } + } + b_suondavara = { + province = 384 + + color = { 120 110 227 } + } + } + c_tornionlaakso = { + color = { 130 130 190 } + b_duortnus = { #(Torneå) + province = 424 + + color = { 130 130 190 } + + cultural_names = { + name_list_swedish = cn_tornea + name_list_finnish = cn_tornio + } + } + b_kangos = { + province = 8784 + color = { 143 194 249 } + } + } + c_inari = { + color = { 120 160 205 } + + b_aanaarjavri = { #Aanaarjävri (Enare Träsk) + province = 391 + + color = { 120 160 205 } + + cultural_names = { + name_list_swedish = cn_enare_trask + name_list_finnish = cn_inarijarvi + } + } + b_suenekele = { + province = 8788 + color = { 120 160 205 } + } + b_laggujakka = { #Laggujåkka + province = 398 + + color = { 120 160 205 } + } + } + } } } \ No newline at end of file diff --git a/N3OW/gfx/map/map_object_data/activities.txt b/N3OW/gfx/map/map_object_data/activities.txt index 3e8b0717..8be80a77 100644 --- a/N3OW/gfx/map/map_object_data/activities.txt +++ b/N3OW/gfx/map/map_object_data/activities.txt @@ -1,4 +1,4 @@ -game_object_locator={ +game_object_locator={ name="activities" render_pass=Map clamp_to_water_level=no @@ -52127,5 +52127,71 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9780 + position={ 1853.000000 0.000000 2395.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9781 + position={ 1845.000000 0.000000 2363.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9782 + position={ 1336.000000 0.000000 2374.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9783 + position={ 1365.000000 0.000000 2418.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9784 + position={ 1394.000000 0.000000 2426.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9786 + position={ 1456.000000 0.000000 2357.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9798 + position={ 1357.000000 0.000000 2168.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9799 + position={ 2111.000000 0.000000 2283.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9800 + position={ 2087.000000 0.000000 2317.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9801 + position={ 1504.000000 0.000000 3056.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9802 + position={ 1507.000000 0.000000 3060.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } } } diff --git a/N3OW/gfx/map/map_object_data/building_locators.txt b/N3OW/gfx/map/map_object_data/building_locators.txt index d78beb16..cd2b83e7 100644 --- a/N3OW/gfx/map/map_object_data/building_locators.txt +++ b/N3OW/gfx/map/map_object_data/building_locators.txt @@ -1,4 +1,4 @@ -game_object_locator={ +game_object_locator={ name="buildings" render_pass=Map clamp_to_water_level=yes @@ -16331,18 +16331,6 @@ rotation={ -0.000000 -0.985430 -0.000000 0.170081 } scale={ 1.000000 1.000000 1.000000 } } - { - id=0 - position={ 1662.934082 0.000000 2846.836182 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=0 - position={ 1658.924805 0.000000 2839.173828 } - rotation={ -0.000000 -0.071692 -0.000000 -0.997427 } - scale={ 1.000000 1.000000 1.000000 } - } { id=3169 position={ 1659.216675 0.000000 2838.958252 } @@ -52139,5 +52127,71 @@ rotation={ -0.000000 -0.038197 -0.000000 -0.999270 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9780 + position={ 1856.000000 0.000000 2395.000000 } + rotation={ -0.000000 -0.962724 -0.000000 0.270487 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9781 + position={ 1848.000000 0.000000 2363.000000 } + rotation={ -0.000000 -0.996900 -0.000000 0.078680 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9782 + position={ 1339.000000 0.000000 2374.000000 } + rotation={ -0.000000 -0.826200 -0.000000 -0.563376 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9783 + position={ 1368.000000 0.000000 2418.000000 } + rotation={ -0.000000 -0.963800 -0.000000 0.266627 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9784 + position={ 1397.000000 0.000000 2426.000000 } + rotation={ -0.000000 -0.759288 -0.000000 0.650755 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9786 + position={ 1459.000000 0.000000 2357.000000 } + rotation={ -0.000000 -0.695041 -0.000000 -0.718970 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9798 + position={ 1360.000000 0.000000 2168.000000 } + rotation={ -0.000000 -0.601278 -0.000000 -0.799040 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9799 + position={ 2114.000000 0.000000 2283.000000 } + rotation={ -0.000000 -0.338905 -0.000000 0.940821 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9800 + position={ 2090.000000 0.000000 2317.000000 } + rotation={ -0.000000 -0.271433 -0.000000 0.962457 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9801 + position={ 1507.000000 0.000000 3056.000000 } + rotation={ -0.000000 -0.889235 -0.000000 0.457450 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9802 + position={ 1510.000000 0.000000 3060.000000 } + rotation={ -0.000000 -0.042530 -0.000000 0.999095 } + scale={ 1.000000 1.000000 1.000000 } + } } } diff --git a/N3OW/gfx/map/map_object_data/combat_locators.txt b/N3OW/gfx/map/map_object_data/combat_locators.txt index 7b20e335..2e03209a 100644 --- a/N3OW/gfx/map/map_object_data/combat_locators.txt +++ b/N3OW/gfx/map/map_object_data/combat_locators.txt @@ -1,4 +1,4 @@ -game_object_locator={ +game_object_locator={ name="combat" render_pass=Map clamp_to_water_level=yes @@ -55115,5 +55115,71 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9780 + position={ 1856.000000 0.000000 2392.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9781 + position={ 1848.000000 0.000000 2360.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9782 + position={ 1339.000000 0.000000 2371.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9783 + position={ 1368.000000 0.000000 2415.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9784 + position={ 1397.000000 0.000000 2423.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9786 + position={ 1459.000000 0.000000 2354.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9798 + position={ 1360.000000 0.000000 2165.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9799 + position={ 2114.000000 0.000000 2280.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9800 + position={ 2090.000000 0.000000 2314.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9801 + position={ 1507.000000 0.000000 3053.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9802 + position={ 1510.000000 0.000000 3057.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } } } diff --git a/N3OW/gfx/map/map_object_data/player_stack_locators.txt b/N3OW/gfx/map/map_object_data/player_stack_locators.txt index 397fa1b5..fe6b4a1f 100644 --- a/N3OW/gfx/map/map_object_data/player_stack_locators.txt +++ b/N3OW/gfx/map/map_object_data/player_stack_locators.txt @@ -1,4 +1,4 @@ -game_object_locator={ +game_object_locator={ name="unit_stack_player_owned" render_pass=Map clamp_to_water_level=yes @@ -55115,5 +55115,71 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9780 + position={ 1856.000000 0.000000 2395.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9781 + position={ 1848.000000 0.000000 2363.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9782 + position={ 1339.000000 0.000000 2374.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9783 + position={ 1368.000000 0.000000 2418.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9784 + position={ 1397.000000 0.000000 2426.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9786 + position={ 1459.000000 0.000000 2357.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9798 + position={ 1360.000000 0.000000 2168.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9799 + position={ 2114.000000 0.000000 2283.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9800 + position={ 2090.000000 0.000000 2317.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9801 + position={ 1507.000000 0.000000 3056.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9802 + position={ 1510.000000 0.000000 3060.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } } } diff --git a/N3OW/gfx/map/map_object_data/siege_locators.txt b/N3OW/gfx/map/map_object_data/siege_locators.txt index b2e66ba8..19c9fd3d 100644 --- a/N3OW/gfx/map/map_object_data/siege_locators.txt +++ b/N3OW/gfx/map/map_object_data/siege_locators.txt @@ -1,4 +1,4 @@ -game_object_locator={ +game_object_locator={ name="siege" render_pass=Map clamp_to_water_level=no @@ -52133,5 +52133,71 @@ rotation={ -0.000000 -0.000025 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9780 + position={ 1859.000000 0.000000 2395.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9781 + position={ 1851.000000 0.000000 2363.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9782 + position={ 1342.000000 0.000000 2374.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9783 + position={ 1371.000000 0.000000 2418.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9784 + position={ 1400.000000 0.000000 2426.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9786 + position={ 1462.000000 0.000000 2357.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9798 + position={ 1363.000000 0.000000 2168.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9799 + position={ 2117.000000 0.000000 2283.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9800 + position={ 2093.000000 0.000000 2317.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9801 + position={ 1510.000000 0.000000 3056.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9802 + position={ 1513.000000 0.000000 3060.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } } } diff --git a/N3OW/gfx/map/map_object_data/special_building_locators.txt b/N3OW/gfx/map/map_object_data/special_building_locators.txt index 8e7a4d9e..a48c8c59 100644 --- a/N3OW/gfx/map/map_object_data/special_building_locators.txt +++ b/N3OW/gfx/map/map_object_data/special_building_locators.txt @@ -52127,5 +52127,71 @@ game_object_locator={ rotation={ -0.000000 -0.503517 -0.000000 -0.863985 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9780 + position={ 1856.000000 0.000000 2395.000000 } + rotation={ -0.000000 -0.987597 -0.000000 0.157013 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9781 + position={ 1848.000000 0.000000 2363.000000 } + rotation={ -0.000000 -0.110778 -0.000000 -0.993845 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9782 + position={ 1339.000000 0.000000 2374.000000 } + rotation={ -0.000000 -0.908579 -0.000000 0.417712 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9783 + position={ 1368.000000 0.000000 2418.000000 } + rotation={ -0.000000 -0.688511 -0.000000 -0.725226 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9784 + position={ 1397.000000 0.000000 2426.000000 } + rotation={ -0.000000 -0.281626 -0.000000 0.959524 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9786 + position={ 1459.000000 0.000000 2357.000000 } + rotation={ -0.000000 -0.715077 -0.000000 -0.699046 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9798 + position={ 1360.000000 0.000000 2168.000000 } + rotation={ -0.000000 -0.754782 -0.000000 0.655975 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9799 + position={ 2114.000000 0.000000 2283.000000 } + rotation={ -0.000000 -0.940512 -0.000000 0.339759 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9800 + position={ 2090.000000 0.000000 2317.000000 } + rotation={ -0.000000 -0.988946 -0.000000 0.148275 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9801 + position={ 1507.000000 0.000000 3056.000000 } + rotation={ -0.000000 -0.593636 -0.000000 -0.804734 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9802 + position={ 1510.000000 0.000000 3060.000000 } + rotation={ -0.000000 -0.237407 -0.000000 0.971410 } + scale={ 1.000000 1.000000 1.000000 } + } } } diff --git a/N3OW/history/provinces/e_germany.txt b/N3OW/history/provinces/e_germany.txt index 1465f2c7..08692dfd 100644 --- a/N3OW/history/provinces/e_germany.txt +++ b/N3OW/history/provinces/e_germany.txt @@ -600,12 +600,12 @@ } ###c_hallstatt 3135 = { - culture = bavarian - religion = teutonic holding = castle_holding } 3133 = { - holding = city_holding + culture = bavarian + religion = teutonic + holding = castle_holding } ###c_linz 3131 = { @@ -628,10 +628,9 @@ holding = castle_holding } 3072 = { - holding = none - 1000.1.1 = { - holding = city_holding - } + culture = bavarian + religion = teutonic + holding = castle_holding } 3073 = { culture = bavarian @@ -640,18 +639,15 @@ } ###c_schaumberg 2971 = { - culture = bavarian - religion = teutonic holding = castle_holding } 2979 = { holding = none } 2973 = { - holding = none - 1120.1.1 = { - holding = city_holding - } + culture = bavarian + religion = teutonic + holding = castle_holding } 2972 = { holding = none @@ -700,10 +696,9 @@ holding = castle_holding } 3103 = { - holding = none - 1164.1.1 = { + culture = NEOW_carantanian + religion = roman_catholic holding = castle_holding - } } 3106 = { holding = none @@ -760,10 +755,15 @@ } } 3130 = { - holding = none - 1125.1.1 = { - holding = church_holding - } + culture = bavarian + religion = teutonic + holding = castle_holding +} + +9778 = { + culture = bavarian + religion = teutonic + holding = castle_holding } ##d_osterreich ###c_vienna diff --git a/N3OW/history/provinces/e_scandinavia.txt b/N3OW/history/provinces/e_scandinavia.txt index 51cf5f5e..5facc762 100644 --- a/N3OW/history/provinces/e_scandinavia.txt +++ b/N3OW/history/provinces/e_scandinavia.txt @@ -173,18 +173,6 @@ 381 = { holding = none } -###c_pite -374 = { - culture = sami - religion = finnish_pagan - holding = tribal_holding -} -427 = { - holding = none -} -377 = { - holding = none -} ###c_jahkamakke 373 = { culture = sami @@ -197,9 +185,7 @@ ##d_vuovdisamieana ###c_biton 422 = { - culture = svealandsk - religion = midnighter - holding = tribal_holding + holding = none } 375 = { holding = none @@ -207,6 +193,18 @@ 382 = { holding = none } +###c_pite +374 = { + culture = sami + religion = finnish_pagan + holding = tribal_holding +} +427 = { + holding = none +} +377 = { + holding = none +} ###c_julevadno 421 = { culture = sami @@ -246,9 +244,7 @@ ##d_duortnoseatnu ###c_siggevara 380 = { - culture = sami - religion = finnish_pagan - holding = tribal_holding + holding = none } 379 = { holding = none @@ -258,9 +254,8 @@ } ###c_suondavara 384 = { - culture = sami - religion = finnish_pagan - holding = tribal_holding + holding = none +} } 392 = { holding = none @@ -298,11 +293,6 @@ religion = finnish_pagan holding = tribal_holding } -425 = { - culture = sami - religion = finnish_pagan - holding = tribal_holding -} ###c_karasjohka 399 = { culture = sami @@ -315,6 +305,44 @@ 398 = { holding = none } +###c_karasjohka +425 = { + culture = sami + religion = finnish_pagan + holding = tribal_holding +} +388 = { + holding = none +} +426 = { + holding = none +} +8786 = { + holding = none +} +8785 = { + culture = sami + religion = finnish_pagan + holding = tribal_holding +} +385 = { + holding = none +} +419 = { + culture = sami + religion = finnish_pagan + holding = tribal_holding +} +390 = { + culture = sami + religion = finnish_pagan + holding = tribal_holding +} +8789 = { + culture = sami + religion = finnish_pagan + holding = tribal_holding +} ##d_svealand ###c_upland 9777 = { diff --git a/N3OW/localization/english/titles_l_english.yml b/N3OW/localization/english/titles_l_english.yml index 4d510a10..619ec633 100644 --- a/N3OW/localization/english/titles_l_english.yml +++ b/N3OW/localization/english/titles_l_english.yml @@ -7453,7 +7453,7 @@ b_obalj:0 "Obalj" b_obdorsk:0 "Obdorsk" b_obe:0 "Obe" - b_obervallach:0 "Obervellach" + b_obervallach:0 "Spittal an der Drau" b_oberwart:0 "Oberwart" b_obidos:0 "Espinho" b_oblucita:0 "ObluciÈ›a" @@ -10551,7 +10551,7 @@ b_umapur:0 "Umapur" b_umba:0 "Umba" b_umbriatico:0 "Umbriatico" - b_umea:0 "UmeÃ¥" + b_umea:0 "Ubmeje" b_umerkote:0 "Umerkote" b_umm_al_nasan:0 "Umm al Nasan" b_umm_ar-rasas:0 "Umm ar-Rasas" @@ -16285,7 +16285,8 @@ d_toulouse:0 "Toulouse" d_toulouse_adj:0 "Toulousan" d_trandalog:1 "Trøndelag" - d_transjurania:0 "Trøndelager" + d_trandalog_adj:1 "Trøndelager" + d_transjurania:0 "Transjurania" d_transjurania_adj:0 "Transjuranian" d_transylvania:0 "Transylvania" d_transylvania_adj:0 "Transylvanian" @@ -24890,11 +24891,24 @@ c_orkdala_adj:0 "Orklander" d_finnmarku:0 "Finnmárku" d_finnmarku_adj:0 "Finnmárkan" + d_vasterbottena:0 "Västerbottena" + d_vasterbottena_adj:0 "Västerbottenan" + d_norrbottena:0 "Norrbottena" + d_norrbottena_adj:0 "Norrbottenan" + d_torniolaakso:0 "Torniolaakso" + d_torniolaakso_adj:0 "Torniolaaksan" b_alta:0 "Ãltá" c_porsangu:0 "Porsáŋgu" c_cahcesuolu:0 "Čáhcesuolu" c_cahcesuolu_adj:0 "Čáhcesuoluan" b_matta_varjjat:0 "Máttá-Várjjat" + c_ubmeje:0 "Ubmeje" + c_ubmeje_adj:0 "Ubmejean" + c_giepma:0 "Giepma" + c_giepma_adj:0 "Giepman" + c_roavvenjarga:0 "Roavvenjárga" + c_roavvenjarga_adj:0 "Roavvenjárgan" + ##NEOW special titles diff --git a/N3OW/map_data/default.map b/N3OW/map_data/default.map index 635218fb..49909fc1 100644 --- a/N3OW/map_data/default.map +++ b/N3OW/map_data/default.map @@ -277,3 +277,7 @@ impassable_seas = LIST { 660 976 978 984 998 1293 1465 1467 8690 8691 8701 } impassable_mountains = RANGE { 8802 8992 } impassable_mountains = LIST { 3222 } + +impassable_mountains = RANGE { 9787 9797 } +impassable_mountains = LIST { 9785 } + diff --git a/N3OW/map_data/definition.csv b/N3OW/map_data/definition.csv index 2d87cb00..e8f38a83 100644 --- a/N3OW/map_data/definition.csv +++ b/N3OW/map_data/definition.csv @@ -9776,27 +9776,27 @@ 9775;9;144;215;;x; 9776;51;147;88;;x; 9777;93;150;216;;x; -#9778;135;153;89;;x; -#9779;177;156;217;;x; -#9780;9;159;90;;x; -#9781;51;162;218;;x; -#9782;93;165;91;;x; -#9783;135;168;219;;x; -#9784;177;171;92;;x; -#9785;9;174;220;;x; -#9786;51;177;93;;x; -#9787;93;180;221;;x; -#9788;135;183;94;;x; -#9789;177;186;222;;x; -#9790;9;189;95;;x; -#9791;51;192;223;;x; -#9792;93;195;96;;x; -#9793;135;198;224;;x; -#9794;177;201;97;;x; -#9795;9;204;225;;x; -#9796;51;207;98;;x; -#9797;93;210;226;;x; -#9798;135;0;99;;x; +9778;135;153;89;;x; +9779;177;156;217;;x; +9780;9;159;90;;x; +9781;51;162;218;Prekmurje;x; +9782;93;165;91;Fribourg;x; +9783;135;168;219;Solothurn;x; +9784;177;171;92;Aargau;x; +9785;9;174;220;New Alps 1;x; +9786;51;177;93;Illanz;x; +9787;93;180;221;;x; +9788;135;183;94;;x; +9789;177;186;222;;x; +9790;9;189;95;;x; +9791;51;192;223;;x; +9792;93;195;96;;x; +9793;135;198;224;;x; +9794;177;201;97;;x; +9795;9;204;225;;x; +9796;51;207;98;;x; +9797;93;210;226;;x; +9798;135;0;99;;x; #9799;177;3;227;;x; #9800;9;6;0;;x; #9801;51;9;128;;x; diff --git a/N3OW/map_data/provinces.png b/N3OW/map_data/provinces.png index 66f0bf8d..e453ebb7 100644 --- a/N3OW/map_data/provinces.png +++ b/N3OW/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e52a8da191b3dc65f76e267dbef5a5e0fa17458a216cdc750274ddae5e9649b -size 1920872 +oid sha256:59e1c34fa81106af28ae2c234e73eb17cf10452d46ef2722df122cf014d361c5 +size 1923288