From c16ef26536a51abe795aa1d1d13ecf3271d8e175 Mon Sep 17 00:00:00 2001 From: Vannifar Date: Sun, 19 Oct 2025 19:18:58 -0400 Subject: [PATCH] Scandinavia --- N3OW/common/landed_titles/scandinavia.txt | 1290 +++++++++-------- N3OW/gfx/map/map_object_data/activities.txt | 312 +++- .../map/map_object_data/building_locators.txt | 348 ++++- .../map/map_object_data/combat_locators.txt | 320 +++- .../map_object_data/player_stack_locators.txt | 338 ++++- .../map/map_object_data/siege_locators.txt | 322 +++- .../special_building_locators.txt | 668 ++++++++- N3OW/history/provinces/e_scandinavia.txt | 88 +- .../common/landed_titles/finland.txt | 60 - .../titles_cultural_names_l_english.yml | 20 +- .../localization/english/titles_l_english.yml | 315 ++-- N3OW/map_data/definition.csv | 2 +- N3OW/map_data/provinces.png | 4 +- 13 files changed, 3007 insertions(+), 1080 deletions(-) diff --git a/N3OW/common/landed_titles/scandinavia.txt b/N3OW/common/landed_titles/scandinavia.txt index ab872d21..561fd764 100644 --- a/N3OW/common/landed_titles/scandinavia.txt +++ b/N3OW/common/landed_titles/scandinavia.txt @@ -227,7 +227,7 @@ e_scandinavia = { k_sweden = { color = { 50 110 165 } - capital = c_upland # Sigtuna + capital = c_stockholm ai_primary_priority = { if = { @@ -237,393 +237,35 @@ e_scandinavia = { add = @correct_culture_primary_score } } - - d_aarjetje = { #arjetje (sami for "south") - color = { 15 15 180 } - capital = c_sjeltie # sele - - cultural_names = { - name_list_english = cn_lapland - name_list_scottish = cn_lapland - name_list_anglo_saxon = cn_lapland - - name_list_norwegian = cn_lappland - name_list_swedish = cn_lappland - name_list_norse = cn_lappland - } - - c_sjeltie = { - color = { 35 35 180 } - - b_sjeltie = { #Sjeltie (sele) - province = 430 - - color = { 35 35 180 } - - cultural_names = { - name_list_swedish = cn_asele - } - } - b_gaaltoe = { #Galtoe (Kultsjn) - province = 431 - - color = { 35 35 180 } - - cultural_names = { - name_list_swedish = cn_kultsjon - } - } - b_vualtjere = { #(Vilhelmina) - province = 432 - - color = { 35 35 180 } - - cultural_names = { - name_list_swedish = cn_volgsjo - } - } - } - c_ubmejeiednuo = { #(Umelven) - color = { 20 25 195 } - - b_uddjaur = { - province = 428 - - color = { 20 25 195 } - } - b_lusspie = { #Storuman - province = 429 - - color = { 20 25 195 } - - cultural_names = { - name_list_swedish = cn_storuman - } - } - b_ume = { - province = 8781 - color = { 20 25 195 } - } - b_lais = { - province = 381 - - color = { 20 25 195 } - } - } - c_pite = { - color = { 10 10 205 } - - b_luokta = { - province = 374 - - color = { 10 10 205 } - } - b_arjepluovve = { #rjepluovve - province = 427 - - color = { 10 10 205 } - } - b_semisjaur = { - province = 377 - - color = { 10 10 205 } - } - } - c_jahkamakke = { #Lule - color = { 35 15 160 } - - b_jahkamakke = { #Jhkmhkke (Jokkmokk) - province = 373 - - color = { 15 15 180 } - - cultural_names = { - name_list_swedish = cn_jokkmokk - } - } - b_tuorpon = { - province = 376 - - color = { 15 15 180 } - } - } - } - - d_vuovdisamieana = { - #Cobbled sami translation for "Forest (Vuovdi) Smi Land (Eana)" - #Ideally it would mean "Land of the Forest Sami" - color = { 10 10 90 } - - capital = c_biton - - cultural_names = { - name_list_norwegian = cn_vasterbotten - name_list_swedish = cn_vasterbotten - name_list_norse = cn_vasterbotten - } - - c_biton = { - color = { 20 35 110 } - - b_biton = { #(Pite) - province = 422 - - color = { 20 35 110 } - - cultural_names = { - name_list_swedish = cn_pitea - } - } - b_arviesjavrrie = { #rviesjvrrie (Arvidsjaur) - province = 375 - - color = { 20 35 110 } - - cultural_names = { - name_list_swedish = cn_arvidsjaur - } - } - b_ubmeje = { #(Ume) - province = 382 - - color = { 20 35 110 } - - cultural_names = { - name_list_swedish = cn_umea - } - } - } - c_julevadno = { #Julevdno (Lulelven) - color = { 20 20 100 } - - b_julevu = { #(Lule) - province = 421 - - color = { 20 20 100 } - - cultural_names = { - name_list_swedish = cn_lulea - } - } - b_galaseatnu = { #Glseatnu (Kalix) - province = 423 - - color = { 20 20 100 } - - cultural_names = { - name_list_swedish = cn_kalix - } - } - b_duortnus = { #(Torne) - province = 424 - - color = { 20 20 100 } - - cultural_names = { - name_list_swedish = cn_tornea - name_list_finnish = cn_tornio - } - } - } - c_kittila = { - color = { 15 0 90 } - - b_kittal = { - province = 385 - - color = { 15 0 90 } - - cultural_names = { - name_list_finnish = cn_kittila - } - } - b_suadigil = { #Sudigil (Sodankyl) - province = 387 - - color = { 15 0 90 } - - cultural_names = { - name_list_finnish = cn_sodankyla - } - } - b_roavvenjarga = { #Rovaniemi - province = 8785 - color = { 15 0 90 } - } - } - c_torne = { - color = { 45 45 135 } - - b_vettanen = { #(=ngesn) - province = 8782 - color = { 45 45 135 } - } - b_ylikainuu = { #(=verkalix) - province = 8783 - color = { 45 45 135 } - } - b_kangos = { - province = 8784 - color = { 45 45 135 } - } - } - } - - d_duortnoseatnu = { #Davvisapmi - color = { 46 30 205 } - - capital = c_siggevara # Siggevara - - cultural_names = { - name_list_norse = cn_finnmork - name_list_norwegian = cn_finnmork - name_list_swedish = cn_finnmork - name_list_finnish = cn_ruija - } - - 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 } - } - } - c_suondavara = { - color = { 70 55 200 } - - b_suondavara = { - province = 384 - - color = { 70 55 200 } - } - b_peldojavri = { #Peldojvri - province = 392 - - color = { 70 55 200 } - } - } - c_rounala = { - color = { 80 75 235 } - - cultural_names = { - name_list_norse = cn_trums - name_list_norwegian = cn_trums - } - - b_rounala = { - province = 393 - - color = { 80 75 235 } - - cultural_names = { - name_list_norse = cn_b_trums - name_list_norwegian = cn_b_trums - } - } - b_tingevara = { - province = 383 - - color = { 80 75 235 } - } - } - c_aviovara = { - color = { 110 110 255 } - - b_aviovara = { - province = 397 - - color = { 110 110 255 } - - cultural_names = { - name_list_norse = cn_kollefjord - name_list_norwegian = cn_kollefjord - } - } - b_guovdageaidnu = { - province = 394 - - color = { 110 110 255 } - - cultural_names = { - name_list_norse = cn_oksfjord - name_list_norwegian = cn_oksfjord - } - } - b_iesjavri = { #Iejvri - province = 395 - - color = { 110 110 255 } - - cultural_names = { - name_list_norse = cn_rafsbotn - name_list_norwegian = cn_rafsbotn - } - } - } - c_karasjohka = { #Krjohka - color = { 100 95 255 } - - cultural_names = { - name_list_norse = cn_vargo - name_list_norwegian = cn_vardo - } - - b_karasjohka = { #Krjohka - province = 396 - - color = { 100 95 255 } - - cultural_names = { - name_list_norse = cn_porsanger - name_list_norwegian = cn_porsanger - } - } - b_laggujakka = { #Laggujkka - province = 398 - - color = { 100 95 255 } - } - b_ohcejohka = { - province = 399 - - color = { 100 95 255 } - - cultural_names = { - name_list_norse = cn_b_vargo - name_list_norwegian = cn_b_vardo - } - } - } - } d_svealand = { # Uppland color = { 20 20 145 } - capital = c_upland # Sigtuna + capital = c_stockholm + c_stockholm = { + color = { 20 20 145 } + b_stockholm = { + province = 9777 + + color = { 20 20 145 } + } + b_sigtuna = { + province = 341 + + color = { 20 20 145 } + } + b_talje = { #Tlje + province = 336 + + color = { 20 20 145 } + } + } c_upland = { #Upland color = { 30 90 210 } cultural_names = { name_list_swedish = d_svealand } - - b_sigtuna = { - province = 341 - - color = { 30 90 210 } - } b_uppsala = { province = 342 @@ -645,25 +287,6 @@ e_scandinavia = { color = { 30 90 210 } } } - c_gastrikland = { #Gestrikalandia - color = { 40 70 220 } - - b_gavle = { - province = 354 - - color = { 40 70 220 } - } - b_oklabo = { #(Ockelbo) - province = 355 - - color = { 40 70 220 } - } - b_odmarden = { #dmrden - province = 356 - - color = { 40 70 220 } - } - } c_sodermannaland = { #Sdermannaland color = { 50 110 230 } @@ -672,11 +295,6 @@ e_scandinavia = { color = { 50 110 230 } } - b_talje = { #Tlje - province = 336 - - color = { 50 110 230 } - } b_nykopung = { #Nykpung (Nykping) province = 337 @@ -855,6 +473,11 @@ e_scandinavia = { color = { 215 5 5 } } + b_lister = { + province = 87 + + color = { 220 30 20 } + } } c_halland = { color = { 220 10 15 } @@ -888,11 +511,6 @@ e_scandinavia = { color = { 220 30 20 } } - b_lister = { - province = 87 - - color = { 220 30 20 } - } b_avaskar = { province = 80 @@ -1059,11 +677,7 @@ e_scandinavia = { } } c_raniriki = { - color = { 220 4 40 } - - cultural_names = { - name_list_norse = cn_alfheimar - } + color = { 40 40 220 } b_bagahus = { province = 229 @@ -1295,6 +909,11 @@ e_scandinavia = { color = { 55 80 255 } } + b_liongby = { #Liongby (Ljungby) + province = 300 + + color = { 55 80 215 } + } } c_njudung = { color = { 35 90 255 } @@ -1319,18 +938,9 @@ e_scandinavia = { color = { 35 90 255 } } - } - c_finnveden = { - color = { 55 80 215 } - b_warnnamo = { #Warnnamo (Vrnamo) province = 301 - color = { 55 80 215 } - } - b_liongby = { #Liongby (Ljungby) - province = 300 - color = { 55 80 215 } } } @@ -1353,32 +963,8 @@ e_scandinavia = { d_norrland = { color = { 40 70 220 } - capital = c_halsingland + capital = c_medelpad - c_halsingland = { - color = { 60 70 235 } - - b_norale = { #(Norrala) - province = 360 - - color = { 60 70 235 } - } - b_baldanas = { #Baldans (Bollns) - province = 357 - - color = { 60 70 235 } - } - b_farila = { #Frila (Frila) - province = 358 - - color = { 60 70 235 } - } - b_dilsbo = { #(Delsbo) - province = 359 - - color = { 60 70 235 } - } - } c_medelpad = { color = { 55 65 215 } @@ -1421,14 +1007,55 @@ e_scandinavia = { color = { 30 55 185 } } - b_grundasund = { #(Grundsunda) - province = 368 + } + } + d_gavleborg = { + color = { 10 100 170 } + capital = c_gastrikland + c_gastrikland = { #Gestrikalandia + color = { 40 70 220 } - color = { 30 55 185 } + b_gavle = { + province = 354 + + color = { 40 70 220 } + } + b_oklabo = { #(Ockelbo) + province = 355 + + color = { 40 70 220 } + } + b_odmarden = { #dmrden + province = 356 + + color = { 40 70 220 } + } + } + c_halsingland = { + color = { 60 70 235 } + + b_norale = { #(Norrala) + province = 360 + + color = { 60 70 235 } + } + b_baldanas = { #Baldans (Bollns) + province = 357 + + color = { 60 70 235 } + } + b_farila = { #Frila (Frila) + province = 358 + + color = { 60 70 235 } + } + b_dilsbo = { #(Delsbo) + province = 359 + + color = { 60 70 235 } } } } - d_gotland = { color = { 0 90 160 } @@ -1846,341 +1473,312 @@ e_scandinavia = { } d_viken = { - color = { 220 4 40 } + color = { 150 150 190 } capital = c_vingulmork c_vingulmork = { - color = { 190 25 40 } + color = { 140 125 190 } b_oslosyslar = { province = 234 - color = { 190 25 40 } - } - b_austfold = { - province = 231 - - color = { 190 25 40 } - } - b_borgarsyslar = { - province = 285 - - color = { 190 25 40 } + color = { 140 125 190 } } b_romerriki = { province = 232 - color = { 190 25 40 } + color = { 140 125 190 } } b_ski = { province = 8768 - color = { 190 25 40 } + color = { 140 125 190 } } } c_vestfold = { - color = { 205 5 60 } + color = { 160 105 205 } b_tunsberg = { province = 286 - color = { 205 5 60 } + color = { 160 105 205 } } b_skiringssal = { province = 287 - color = { 205 5 60 } + color = { 160 105 205 } } + } + c_buskerud = { + color = { 160 105 205 } b_drafn = { province = 246 - color = { 205 5 60 } + color = { 160 105 205 } } b_ringariki = { province = 233 - color = { 205 5 60 } + color = { 160 105 205 } } } c_telemark = { - color = { 205 50 60 } + color = { 160 150 205 } b_telemark = { province = 248 - color = { 205 50 60 } + color = { 160 150 205 } } b_heddall = { province = 288 - color = { 205 50 60 } + color = { 160 150 205 } } b_numedall = { province = 247 - color = { 205 50 60 } + color = { 160 150 205 } + } + } + c_ostfold = { + color = { 150 150 190 } + + b_austfold = { + province = 231 + + color = { 150 150 190 } + } + b_borgarsyslar = { + province = 285 + + color = { 150 150 190 } } } } d_agder = { - color = { 170 30 30 } + color = { 100 100 170 } capital = c_nedenes # Arendall c_nedenes = { - color = { 180 20 30 } + color = { 130 120 180 } b_arendall = { province = 249 - color = { 170 30 30 } + color = { 130 120 180 } } b_raaboigde = { province = 250 - color = { 170 30 30 } + color = { 130 120 180 } } b_aarak = { province = 292 - color = { 170 30 30 } + color = { 130 120 180 } } } c_agdeside = { - color = { 165 50 45 } + color = { 120 115 165 } b_ottrunes = { province = 289 - color = { 165 50 45 } + color = { 120 115 165 } } b_norwegian_lister = { province = 251 - color = { 165 50 45 } + color = { 120 115 165 } } b_heiane = { province = 290 - color = { 165 50 45 } + color = { 120 115 165 } } } } d_vestlandi = { - color = { 170 100 30 } + color = { 90 100 190 } capital = c_rogalandi # Jatharr c_rogalandi = { - color = { 170 100 30 } + color = { 90 100 190 } b_jatharr = { province = 252 - color = { 170 100 30 } + color = { 90 100 190 } } b_ryfylki = { province = 253 - color = { 170 100 30 } + color = { 90 100 190 } } b_haugelandi = { province = 254 - color = { 170 100 30 } + color = { 90 100 190 } } } c_hordalandi = { - color = { 170 85 45 } + color = { 80 100 200 } b_bjorgvin = { province = 257 - color = { 170 85 45 } + color = { 60 80 200 } } b_northrihordalandi = { province = 258 - color = { 170 85 45 } + color = { 60 80 200 } + } b_sunnhordalandi = { province = 256 - color = { 170 85 45 } + color = { 60 80 200 } + } b_hardanger = { province = 255 - color = { 170 85 45 } + color = { 60 80 200 } + } b_voss = { province = 259 - color = { 170 85 45 } + color = { 60 80 200 } + } } c_sogn = { - color = { 185 75 60 } + color = { 70 90 140 } b_sognfylki = { province = 260 - color = { 185 75 60 } + color = { 40 60 140 } } b_stolsheimen = { province = 262 - color = { 185 75 60 } + color = { 40 60 140 } } b_bremanger = { province = 261 - color = { 185 75 60 } + color = { 40 60 140 } } b_dale = { province = 264 - color = { 185 75 60 } + color = { 40 60 140 } } b_fjarlandi = { province = 263 - color = { 185 75 60 } + color = { 40 60 140 } + } + } + c_firdafylki = { + color = { 100 120 140 } + + b_firdafylki = { + province = 265 + + color = { 100 120 140 } + } + b_jolster = { + province = 266 + + color = { 100 120 140 } } } } d_trandalog = { - color = { 150 30 80 } + color = { 120 70 150 } capital = c_trandheim # Nidaros c_trandheim = { - color = { 130 22 85 } + color = { 120 70 150 } b_nidaros = { province = 270 - color = { 150 30 80 } + color = { 120 70 150 } } b_eynafylki = { province = 273 - color = { 150 30 80 } + color = { 120 70 150 } } b_verdala = { province = 243 - color = { 150 30 80 } + color = { 120 70 150 } } b_hitrar = { province = 272 - color = { 150 30 80 } + color = { 120 70 150 } } } c_norwegian_more = { - color = { 160 45 75 } + color = { 115 85 160 } b_raumsdali = { province = 268 - color = { 160 45 75 } + color = { 115 85 160 } } b_northri_more = { province = 269 - color = { 160 45 75 } + color = { 115 85 160 } } b_sunnmore = { province = 267 - color = { 160 45 75 } + color = { 115 85 160 } } } - c_firdafylki = { - color = { 170 55 75 } + c_namdalfylki = { + color = { 125 80 200 } - b_firdafylki = { - province = 265 + b_utan_namdal = { + province = 245 - color = { 170 55 75 } + color = { 125 80 200 } } - b_jolster = { - province = 266 + b_innan_namdal = { + province = 244 - color = { 170 55 75 } + color = { 125 80 200 } } - } - } + b_torgar = { + province = 274 - d_dalir = { - color = { 80 30 30 } - - capital = c_hedmork # Hedmork - - c_hedmork = { - color = { 80 30 30 } - - b_hedmork = { - province = 236 - - color = { 80 30 30 } + color = { 125 80 200 } } - b_valdres = { - province = 235 + b_grong = { + province = 283 - color = { 80 30 30 } - } - b_stange = { - province = 8769 - - color = { 80 30 30 } - } - } - c_gudbrandsdalir = { - color = { 95 20 30 } - - b_suthri_gudbrandsdali = { - province = 238 - - color = { 95 20 30 } - } - b_northri_gudbrandsdali = { - province = 237 - - color = { 95 20 30 } - } - b_dovre = { - province = 293 - - color = { 95 20 30 } - } - b_orkdala = { - province = 271 - - color = { 95 20 30 } - } - } - c_eystridalir = { - color = { 85 45 30 } - - b_northri_eystridali = { - province = 239 - - color = { 85 45 30 } - } - b_suthri_eystridali = { - province = 240 - - color = { 85 45 30 } + color = { 125 80 200 } } } c_gauldala = { - color = { 65 15 15 } + color = { 95 65 145 } b_gauldala = { province = 241 @@ -2193,10 +1791,77 @@ e_scandinavia = { color = { 65 15 15 } } } + c_orkdala = { + color = { 95 30 125 } + b_orkdala = { + province = 271 + + color = { 95 30 125 } + } + } + } + + d_dalir = { + color = { 50 50 100 } + + capital = c_hedmork # Hedmork + + c_hedmork = { + color = { 50 50 100 } + + b_hedmork = { + province = 236 + + color = { 50 50 100 } + } + b_valdres = { + province = 235 + + color = { 50 50 100 } + } + b_stange = { + province = 8769 + + color = { 50 50 100 } + } + } + c_gudbrandsdalir = { + color = { 40 20 90 } + + b_suthri_gudbrandsdali = { + province = 238 + + color = { 40 20 90 } + } + b_northri_gudbrandsdali = { + province = 237 + + color = { 40 20 90 } + } + b_dovre = { + province = 293 + + color = { 40 20 90 } + } + } + c_eystridalir = { + color = { 40 30 80 } + + b_northri_eystridali = { + province = 239 + + color = { 40 30 80 } + } + b_suthri_eystridali = { + province = 240 + + color = { 40 30 80 } + } + } } d_halogaland = { - color = { 210 150 255 } + color = { 180 140 245 } capital = c_vastvag # Vastvagborg @@ -2243,31 +1908,464 @@ e_scandinavia = { color = { 225 160 225 } } } - c_namdalfylki = { - color = { 215 140 200 } + } + } + k_sapmi = { + color = { 153 204 189 } - b_utan_namdal = { - province = 245 + capital = c_vingulmork - color = { 215 140 200 } + ai_primary_priority = { + if = { + limit = { + culture = culture:norwegian } - b_innan_namdal = { - province = 244 + add = @correct_culture_primary_score + } + } + d_aarjetje = { #arjetje (sami for "south") + color = { 15 15 180 } + 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 } + cultural_names = { + name_list_swedish = cn_umea + } + b_ubmeje = { #(Ume) + province = 368 - color = { 215 140 200 } + color = { 20 35 110 } + + cultural_names = { + name_list_swedish = cn_umea + } } - b_torgar = { - province = 274 + b_arviesjavrrie = { #rviesjvrrie (Arvidsjaur) + province = 375 - color = { 215 140 200 } + color = { 20 35 110 } + + cultural_names = { + name_list_swedish = cn_arvidsjaur + } } - b_grong = { - province = 283 + b_grundasund = { #(Grundsunda) + province = 382 - color = { 215 140 200 } + color = { 30 55 185 } + } + } + c_sjeltie = { + color = { 35 35 180 } + cultural_names = { + name_list_sami = cn_sjeltie + } + b_sjeltie = { #Sjeltie (sele) + province = 430 + + color = { 35 35 180 } + + cultural_names = { + name_list_swedish = cn_asele + } + } + b_gaaltoe = { #Galtoe (Kultsjn) + province = 431 + + color = { 35 35 180 } + + cultural_names = { + name_list_swedish = cn_kultsjon + } + } + b_vualtjere = { #(Vilhelmina) + province = 432 + + color = { 35 35 180 } + + cultural_names = { + name_list_swedish = cn_volgsjo + } + } + } + c_ubmejeiednuo = { #(Umelven) + color = { 20 25 195 } + cultural_names = { + name_list_sami = cn_ubmejeiednuo + } + b_uddjaur = { + province = 428 + + color = { 20 25 195 } + } + b_lusspie = { #Storuman + province = 429 + + color = { 20 25 195 } + + cultural_names = { + name_list_swedish = cn_storuman + } + } + b_ume = { + province = 8781 + color = { 20 25 195 } + } + b_lais = { + province = 381 + + color = { 20 25 195 } } } } - } - + + d_norrbottena = { + color = { 10 10 90 } + + 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 + } + } + } + c_julevadno = { #Julevdno (Lulelven) + color = { 20 20 100 } + cultural_names = { + name_list_swedish = cn_lulea + } + b_julevu = { #(Lule) + province = 421 + + color = { 20 20 100 } + + cultural_names = { + name_list_swedish = cn_lulea + } + } + b_galaseatnu = { #Glseatnu (Kalix) + province = 423 + + color = { 20 20 100 } + + cultural_names = { + name_list_swedish = cn_kalix + } + } + } + c_torne = { + color = { 45 45 135 } + + b_vettanen = { #(=ngesn) + province = 8782 + color = { 45 45 135 } + } + b_ylikainuu = { #(=verkalix) + province = 8783 + color = { 45 45 135 } + } + } + 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 } + } + } + c_pite = { + color = { 10 10 205 } + + b_luokta = { + province = 374 + + color = { 10 10 205 } + } + b_arjepluovve = { #rjepluovve + province = 427 + + color = { 10 10 205 } + } + b_semisjaur = { + province = 377 + + color = { 10 10 205 } + } + } + c_jahkamakke = { #Lule + color = { 35 15 160 } + cultural_names = { + name_list_swedish = cn_jokkmokk + } + b_jahkamakke = { #Jhkmhkke (Jokkmokk) + province = 373 + + color = { 15 15 180 } + + cultural_names = { + name_list_swedish = cn_jokkmokk + } + } + b_tuorpon = { + province = 376 + + color = { 15 15 180 } + } + b_tingevara = { + province = 383 + + color = { 80 75 235 } + } + } + } + d_torniolaakso = { + #Cobbled sami translation for "Forest (Vuovdi) Smi Land (Eana)" + #Ideally it would mean "Land of the Forest Sami" + color = { 90 10 10 } + + 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 = { #Sudigil (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 = { #Aanaarjvri (Enare Trsk) + 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 = { #Laggujkka + 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 = { #Kemijvri (Kemijrvi) + 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 } + + capital = c_aviovara + cultural_names = { + name_list_norwegian = cn_finnmark + } + cultural_names = { + name_list_norse = cn_finnmork + name_list_norwegian = cn_finnmork + name_list_swedish = cn_finnmork + name_list_finnish = cn_ruija + } + + c_rounala = { + color = { 80 75 235 } + + cultural_names = { + name_list_norwegian = cn_tromso + } + + b_rounala = { + province = 393 + + color = { 80 75 235 } + + cultural_names = { + name_list_norwegian = cn_tromso + } + } + } + c_karasjohka = { + color = { 120 120 255 } + cultural_names = { + name_list_norwegian = cn_karasjok + } + b_karasjohka = { + province = 397 + + color = { 110 110 255 } + + cultural_names = { + name_list_norwegian = cn_karasjok + } + } + b_guovdageaidnu = { + province = 392 + + color = { 70 55 200 } + cultural_names = { + name_list_norwegian = cn_kautokeino + } + } + } + c_aviovara = { + color = { 110 110 255 } + b_aviovara = { + province = 395 + + color = { 110 110 255 } + + cultural_names = { + name_list_norwegian = cn_hammerfest + } + } + b_alta = { + province = 394 + + color = { 110 110 255 } + + cultural_names = { + name_list_norwegian = cn_alta + } + } + } + c_cahcesuolu = { + color = { 100 95 255 } + + cultural_names = { + name_list_norwegian = cn_vadso + } + b_cahcesuolu = { + province = 399 + + color = { 100 95 255 } + + cultural_names = { + name_list_norwegian = cn_vadso + } + } + b_porsangu = { #Krjohka + province = 396 + + color = { 100 95 255 } + + cultural_names = { + name_list_norwegian = cn_porsanger + } + } + b_matta_varjjat = { + province = 400 + + color = { 20 20 145 } + + cultural_names = { + name_list_norse = cn_sor_varanger + } + } + } + } + } } \ 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 3d7cfd3f..3e8b0717 100644 --- a/N3OW/gfx/map/map_object_data/activities.txt +++ b/N3OW/gfx/map/map_object_data/activities.txt @@ -1507,7 +1507,7 @@ } { id=251 - position={ 1397.442749 0.000000 3276.222900 } + position={ 1397.748413 0.000000 3276.120605 } rotation={ -0.000000 0.348087 -0.000000 0.937462 } scale={ 1.000000 1.000000 1.000000 } } @@ -1717,7 +1717,7 @@ } { id=287 - position={ 1551.310913 0.000000 3319.843750 } + position={ 1551.363647 0.000000 3319.905029 } rotation={ -0.000000 0.482583 -0.000000 0.875850 } scale={ 1.000000 1.000000 1.000000 } } @@ -1747,7 +1747,7 @@ } { id=292 - position={ 1432.838867 0.000000 3292.432129 } + position={ 1470.329224 0.000000 3285.235840 } rotation={ -0.000000 -0.565151 -0.000000 0.824987 } scale={ 1.000000 1.000000 1.000000 } } @@ -14275,7 +14275,7 @@ } { id=2806 - position={ 1566.035889 0.000000 2928.057617 } + position={ 1551.060181 0.000000 2923.536865 } rotation={ -0.000000 -0.354088 -0.000000 0.935212 } scale={ 1.000000 1.000000 1.000000 } } @@ -14353,7 +14353,7 @@ } { id=2819 - position={ 1650.895264 0.000000 2933.980957 } + position={ 1630.957031 0.000000 2931.867432 } rotation={ -0.000000 -0.316687 -0.000000 0.948530 } scale={ 1.000000 1.000000 1.000000 } } @@ -16333,7 +16333,7 @@ } { id=3169 - position={ 1642.832642 0.000000 2864.516113 } + position={ 1667.427612 0.000000 2845.300781 } rotation={ -0.000000 0.372214 -0.000000 0.928147 } scale={ 1.000000 1.000000 1.000000 } } @@ -51461,18 +51461,6 @@ rotation={ -0.000000 0.227780 -0.000000 0.973713 } scale={ 1.000000 1.000000 1.000000 } } - { - id=9660 - position={ 5287.000000 0.000000 1040.000000 } - rotation={ -0.000000 -0.320455 -0.000000 -0.947264 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9661 - position={ 5287.000000 0.000000 1040.000000 } - rotation={ -0.000000 -0.320455 -0.000000 -0.947264 } - scale={ 1.000000 1.000000 1.000000 } - } { id=9662 position={ 597.000000 0.000000 2687.000000 } @@ -51689,6 +51677,102 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9698 + position={ 1273.000000 0.000000 2834.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9699 + position={ 1290.000000 0.000000 2853.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9700 + position={ 1394.000000 0.000000 2351.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9701 + position={ 1441.000000 0.000000 2349.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9702 + position={ 1476.000000 0.000000 2316.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9703 + position={ 1515.000000 0.000000 2332.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9704 + position={ 1503.000000 0.000000 2359.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9705 + position={ 1530.000000 0.000000 2382.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9706 + position={ 1540.000000 0.000000 2363.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9707 + position={ 1641.000000 0.000000 2335.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9708 + position={ 1679.000000 0.000000 2329.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9709 + position={ 1652.000000 0.000000 2358.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9710 + position={ 1525.000000 0.000000 2307.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9711 + position={ 1343.000000 0.000000 2182.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9712 + position={ 1335.000000 0.000000 2202.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9713 + position={ 1407.000000 0.000000 2329.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } { id=9714 position={ 887.931641 0.000000 3072.692871 } @@ -51857,30 +51941,6 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } - { - id=9742 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9743 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9744 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9745 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } { id=9746 position={ 883.000000 0.000000 2727.000000 } @@ -51899,5 +51959,173 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9749 + position={ 1180.000000 0.000000 2548.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9750 + position={ 1222.000000 0.000000 2473.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9751 + position={ 1179.000000 0.000000 2524.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9752 + position={ 1792.000000 0.000000 1658.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9753 + position={ 1804.000000 0.000000 1675.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9755 + position={ 1800.000000 0.000000 1699.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9756 + position={ 1793.000000 0.000000 1556.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9757 + position={ 1820.000000 0.000000 1737.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9758 + position={ 1830.000000 0.000000 1888.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9760 + position={ 1841.000000 0.000000 1938.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9761 + position={ 1881.000000 0.000000 1934.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9762 + position={ 1353.000000 0.000000 2544.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9763 + position={ 1336.000000 0.000000 2432.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9765 + position={ 1865.000000 0.000000 1855.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9766 + position={ 1887.000000 0.000000 1882.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9767 + position={ 1863.000000 0.000000 1884.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9768 + position={ 1321.000000 0.000000 2450.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9769 + position={ 656.000000 0.000000 1641.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9770 + position={ 1453.000000 0.000000 2891.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9771 + position={ 1503.000000 0.000000 2908.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9772 + position={ 1630.000000 0.000000 2847.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9773 + position={ 1671.000000 0.000000 2832.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9774 + position={ 1565.000000 0.000000 2413.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9775 + position={ 1412.000000 0.000000 2554.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9776 + position={ 1435.000000 0.000000 2566.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9777 + position={ 1879.000000 0.000000 3319.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9778 + position={ 2111.000000 0.000000 2283.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9779 + position={ 2087.000000 0.000000 2317.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 f03ead40..d78beb16 100644 --- a/N3OW/gfx/map/map_object_data/building_locators.txt +++ b/N3OW/gfx/map/map_object_data/building_locators.txt @@ -1489,8 +1489,8 @@ } { id=248 - position={ 1507.540161 0.000000 3305.620117 } - rotation={ -0.000000 -0.015163 -0.000000 -0.999885 } + position={ 1522.000000 0.000000 3303.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -1507,8 +1507,8 @@ } { id=251 - position={ 1402.330688 0.000000 3280.288574 } - rotation={ -0.000000 -0.917633 -0.000000 0.397429 } + position={ 1410.000000 0.000000 3270.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -1717,8 +1717,8 @@ } { id=287 - position={ 1547.111816 0.000000 3312.604736 } - rotation={ -0.000000 -0.805762 -0.000000 -0.592239 } + position={ 1552.000000 0.000000 3319.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -1747,8 +1747,8 @@ } { id=292 - position={ 1435.892822 0.000000 3286.593506 } - rotation={ -0.000000 -0.099623 -0.000000 -0.995025 } + position={ 1467.000000 0.000000 3288.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -14275,14 +14275,14 @@ } { id=2806 - position={ 1558.000000 0.000000 2929.000000 } - rotation={ -0.000000 -0.099616 -0.000000 0.995026 } + position={ 1543.000000 0.000000 2912.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=2807 - position={ 1596.000000 0.000000 2936.000000 } - rotation={ -0.000000 -0.707972 -0.000000 0.706241 } + position={ 1573.000000 0.000000 2926.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -14353,8 +14353,8 @@ } { id=2819 - position={ 1647.000000 0.000000 2940.000000 } - rotation={ -0.000000 -0.772094 -0.000000 -0.635509 } + position={ 1616.000000 0.000000 2937.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -16267,8 +16267,8 @@ } { id=3158 - position={ 1679.673340 0.000000 2819.071045 } - rotation={ -0.000000 -0.444716 -0.000000 -0.895672 } + position={ 1683.000000 0.000000 2826.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -16315,7 +16315,7 @@ } { id=3166 - position={ 1638.000000 0.000000 2839.000000 } + position={ 1640.452148 0.000000 2834.038574 } rotation={ -0.000000 -0.024292 -0.000000 0.999705 } scale={ 1.000000 1.000000 1.000000 } } @@ -16331,9 +16331,21 @@ 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={ 1647.000000 0.000000 2858.000000 } + position={ 1659.216675 0.000000 2838.958252 } rotation={ -0.000000 -0.071692 -0.000000 -0.997427 } scale={ 1.000000 1.000000 1.000000 } } @@ -51461,18 +51473,6 @@ rotation={ -0.000000 -0.320455 -0.000000 -0.947264 } scale={ 1.000000 1.000000 1.000000 } } - { - id=9660 - position={ 5287.000000 0.000000 1040.000000 } - rotation={ -0.000000 -0.320455 -0.000000 -0.947264 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9661 - position={ 5287.000000 0.000000 1040.000000 } - rotation={ -0.000000 -0.320455 -0.000000 -0.947264 } - scale={ 1.000000 1.000000 1.000000 } - } { id=9662 position={ 597.288574 0.000000 2687.819092 } @@ -51689,6 +51689,102 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9698 + position={ 1276.000000 0.000000 2834.000000 } + rotation={ -0.000000 -0.962724 -0.000000 0.270487 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9699 + position={ 1293.000000 0.000000 2853.000000 } + rotation={ -0.000000 -0.996900 -0.000000 0.078680 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9700 + position={ 1397.000000 0.000000 2351.000000 } + rotation={ -0.000000 -0.826200 -0.000000 -0.563376 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9701 + position={ 1444.000000 0.000000 2349.000000 } + rotation={ -0.000000 -0.963800 -0.000000 0.266627 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9702 + position={ 1479.000000 0.000000 2316.000000 } + rotation={ -0.000000 -0.759288 -0.000000 0.650755 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9703 + position={ 1518.000000 0.000000 2332.000000 } + rotation={ -0.000000 -0.695041 -0.000000 -0.718970 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9704 + position={ 1506.000000 0.000000 2359.000000 } + rotation={ -0.000000 -0.601278 -0.000000 -0.799040 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9705 + position={ 1533.000000 0.000000 2382.000000 } + rotation={ -0.000000 -0.338905 -0.000000 0.940821 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9706 + position={ 1543.000000 0.000000 2363.000000 } + rotation={ -0.000000 -0.271433 -0.000000 0.962457 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9707 + position={ 1644.000000 0.000000 2335.000000 } + rotation={ -0.000000 -0.889235 -0.000000 0.457450 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9708 + position={ 1682.000000 0.000000 2329.000000 } + rotation={ -0.000000 -0.042530 -0.000000 0.999095 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9709 + position={ 1655.000000 0.000000 2358.000000 } + rotation={ -0.000000 -0.943708 -0.000000 0.330780 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9710 + position={ 1528.000000 0.000000 2307.000000 } + rotation={ -0.000000 -0.246639 -0.000000 -0.969107 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9711 + position={ 1346.000000 0.000000 2182.000000 } + rotation={ -0.000000 -0.751435 -0.000000 0.659807 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9712 + position={ 1338.000000 0.000000 2202.000000 } + rotation={ -0.000000 -0.008268 -0.000000 -0.999966 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9713 + position={ 1410.000000 0.000000 2329.000000 } + rotation={ -0.000000 -0.175313 -0.000000 -0.984513 } + scale={ 1.000000 1.000000 1.000000 } + } { id=9714 position={ 899.513306 0.000000 3075.612793 } @@ -51857,30 +51953,6 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } - { - id=9742 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9743 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9744 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9745 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } { id=9746 position={ 883.000000 0.000000 2727.000000 } @@ -51899,5 +51971,173 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9749 + position={ 1183.000000 0.000000 2548.000000 } + rotation={ -0.000000 -0.216567 -0.000000 0.976268 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9750 + position={ 1225.000000 0.000000 2473.000000 } + rotation={ -0.000000 -0.930385 -0.000000 -0.366584 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9751 + position={ 1182.000000 0.000000 2524.000000 } + rotation={ -0.000000 -0.215025 -0.000000 0.976608 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9752 + position={ 1795.000000 0.000000 1658.000000 } + rotation={ -0.000000 -0.235842 -0.000000 0.971791 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9753 + position={ 1807.000000 0.000000 1675.000000 } + rotation={ -0.000000 -0.933035 -0.000000 0.359786 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9755 + position={ 1803.000000 0.000000 1699.000000 } + rotation={ -0.000000 -0.149469 -0.000000 0.988766 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9756 + position={ 1796.000000 0.000000 1556.000000 } + rotation={ -0.000000 -0.851638 -0.000000 0.524130 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9757 + position={ 1823.000000 0.000000 1737.000000 } + rotation={ -0.000000 -0.955055 -0.000000 -0.296429 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9758 + position={ 1833.000000 0.000000 1888.000000 } + rotation={ -0.000000 -0.763981 -0.000000 0.645238 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9760 + position={ 1844.000000 0.000000 1938.000000 } + rotation={ -0.000000 -0.988132 -0.000000 0.153608 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9761 + position={ 1884.000000 0.000000 1934.000000 } + rotation={ -0.000000 -0.858271 -0.000000 -0.513197 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9762 + position={ 1356.000000 0.000000 2544.000000 } + rotation={ -0.000000 -0.773227 -0.000000 0.634130 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9763 + position={ 1339.000000 0.000000 2432.000000 } + rotation={ -0.000000 -0.564998 -0.000000 0.825092 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9765 + position={ 1868.000000 0.000000 1855.000000 } + rotation={ -0.000000 -0.242634 -0.000000 -0.970118 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9766 + position={ 1890.000000 0.000000 1882.000000 } + rotation={ -0.000000 -0.837185 -0.000000 -0.546920 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9767 + position={ 1866.000000 0.000000 1884.000000 } + rotation={ -0.000000 -0.725192 -0.000000 0.688547 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9768 + position={ 1324.000000 0.000000 2450.000000 } + rotation={ -0.000000 -0.397930 -0.000000 -0.917416 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9769 + position={ 659.000000 0.000000 1641.000000 } + rotation={ -0.000000 -0.497946 -0.000000 0.867208 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9770 + position={ 1465.000000 0.000000 2883.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9771 + position={ 1506.000000 0.000000 2908.000000 } + rotation={ -0.000000 -0.597641 -0.000000 0.801764 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9772 + position={ 1642.000000 0.000000 2854.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9773 + position={ 1674.000000 0.000000 2832.000000 } + rotation={ -0.000000 -0.501156 -0.000000 -0.865357 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9774 + position={ 1568.000000 0.000000 2415.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9775 + position={ 1420.000000 0.000000 2556.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9776 + position={ 1436.000000 0.000000 2563.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9777 + position={ 1872.000000 0.000000 3316.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9778 + position={ 2114.000000 0.000000 2283.000000 } + rotation={ -0.000000 -0.311985 -0.000000 -0.950087 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9779 + position={ 2090.000000 0.000000 2317.000000 } + rotation={ -0.000000 -0.038197 -0.000000 -0.999270 } + 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 3751bbad..7b20e335 100644 --- a/N3OW/gfx/map/map_object_data/combat_locators.txt +++ b/N3OW/gfx/map/map_object_data/combat_locators.txt @@ -1513,7 +1513,7 @@ } { id=251 - position={ 1394.595093 0.000000 3292.551270 } + position={ 1419.149292 0.000000 3265.879639 } rotation={ -0.000000 -0.990846 -0.000000 0.135000 } scale={ 1.000000 1.000000 1.000000 } } @@ -1723,7 +1723,7 @@ } { id=287 - position={ 1534.241089 0.000000 3341.190186 } + position={ 1552.605713 0.000000 3322.108398 } rotation={ -0.000000 -0.899982 -0.000000 0.435928 } scale={ 1.000000 1.000000 1.000000 } } @@ -1753,7 +1753,7 @@ } { id=292 - position={ 1455.050659 0.000000 3289.216064 } + position={ 1474.710938 0.000000 3285.401367 } rotation={ -0.000000 -0.167147 -0.000000 0.985932 } scale={ 1.000000 1.000000 1.000000 } } @@ -15961,7 +15961,7 @@ } { id=2806 - position={ 1568.000000 0.000000 2944.000000 } + position={ 1550.996460 0.000000 2908.986816 } rotation={ -0.000000 -0.569877 -0.000000 0.821730 } scale={ 1.000000 1.000000 1.000000 } } @@ -16039,7 +16039,7 @@ } { id=2819 - position={ 1636.781616 0.000000 2942.140869 } + position={ 1625.144287 0.000000 2938.458252 } rotation={ -0.000000 -0.905982 -0.000000 0.423316 } scale={ 1.000000 1.000000 1.000000 } } @@ -18001,7 +18001,7 @@ } { id=3166 - position={ 1633.000000 0.000000 2853.000000 } + position={ 1641.224243 0.000000 2831.490479 } rotation={ -0.000000 -0.899938 -0.000000 0.436018 } scale={ 1.000000 1.000000 1.000000 } } @@ -18019,7 +18019,7 @@ } { id=3169 - position={ 1640.499512 0.000000 2870.770508 } + position={ 1657.189697 0.000000 2849.699219 } rotation={ -0.000000 -0.969702 -0.000000 0.244291 } scale={ 1.000000 1.000000 1.000000 } } @@ -54443,18 +54443,6 @@ rotation={ -0.000000 -0.998220 -0.000000 0.059641 } scale={ 1.000000 1.000000 1.000000 } } - { - id=9660 - position={ 5287.000000 0.000000 1040.000000 } - rotation={ -0.000000 -0.320455 -0.000000 -0.947264 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9661 - position={ 5287.000000 0.000000 1040.000000 } - rotation={ -0.000000 -0.320455 -0.000000 -0.947264 } - scale={ 1.000000 1.000000 1.000000 } - } { id=9662 position={ 597.000000 0.000000 2687.000000 } @@ -54671,6 +54659,102 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9698 + position={ 1276.000000 0.000000 2831.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9699 + position={ 1293.000000 0.000000 2850.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9700 + position={ 1397.000000 0.000000 2348.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9701 + position={ 1444.000000 0.000000 2346.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9702 + position={ 1479.000000 0.000000 2313.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9703 + position={ 1518.000000 0.000000 2329.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9704 + position={ 1506.000000 0.000000 2356.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9705 + position={ 1533.000000 0.000000 2379.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9706 + position={ 1543.000000 0.000000 2360.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9707 + position={ 1644.000000 0.000000 2332.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9708 + position={ 1682.000000 0.000000 2326.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9709 + position={ 1655.000000 0.000000 2355.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9710 + position={ 1528.000000 0.000000 2304.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9711 + position={ 1346.000000 0.000000 2179.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9712 + position={ 1338.000000 0.000000 2199.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9713 + position={ 1410.000000 0.000000 2326.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } { id=9714 position={ 894.774414 0.000000 3070.438477 } @@ -54839,30 +54923,6 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } - { - id=9742 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9743 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9744 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9745 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } { id=9746 position={ 883.000000 0.000000 2727.000000 } @@ -54881,5 +54941,179 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9749 + position={ 1183.000000 0.000000 2545.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9750 + position={ 1225.000000 0.000000 2470.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9751 + position={ 1182.000000 0.000000 2521.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9752 + position={ 1795.000000 0.000000 1655.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9753 + position={ 1807.000000 0.000000 1672.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9755 + position={ 1803.000000 0.000000 1696.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9756 + position={ 1796.000000 0.000000 1553.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9757 + position={ 1823.000000 0.000000 1734.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9758 + position={ 1833.000000 0.000000 1885.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9759 + position={ 0.000000 0.000000 -3.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9760 + position={ 1844.000000 0.000000 1935.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9761 + position={ 1884.000000 0.000000 1931.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9762 + position={ 1356.000000 0.000000 2541.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9763 + position={ 1339.000000 0.000000 2429.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9765 + position={ 1868.000000 0.000000 1852.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9766 + position={ 1890.000000 0.000000 1879.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9767 + position={ 1866.000000 0.000000 1881.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9768 + position={ 1324.000000 0.000000 2447.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9769 + position={ 659.000000 0.000000 1638.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9770 + position={ 1456.000000 0.000000 2888.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9771 + position={ 1506.000000 0.000000 2905.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9772 + position={ 1633.000000 0.000000 2844.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9773 + position={ 1674.000000 0.000000 2829.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9774 + position={ 1568.000000 0.000000 2410.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9775 + position={ 1415.000000 0.000000 2551.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9776 + position={ 1438.000000 0.000000 2563.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9777 + position={ 1882.000000 0.000000 3316.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9778 + position={ 2114.000000 0.000000 2280.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9779 + position={ 2090.000000 0.000000 2314.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 7dff94dd..397fa1b5 100644 --- a/N3OW/gfx/map/map_object_data/player_stack_locators.txt +++ b/N3OW/gfx/map/map_object_data/player_stack_locators.txt @@ -1495,7 +1495,7 @@ } { id=248 - position={ 1504.270386 0.000000 3310.944580 } + position={ 1524.065552 0.000000 3309.314209 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -1513,8 +1513,8 @@ } { id=251 - position={ 1405.608521 0.000000 3285.049316 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 1420.000000 0.000000 3266.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -1723,7 +1723,7 @@ } { id=287 - position={ 1543.252563 0.000000 3322.382568 } + position={ 1550.588379 0.000000 3320.456055 } rotation={ -0.000000 0.645991 -0.000000 0.763345 } scale={ 1.000000 1.000000 1.000000 } } @@ -1753,8 +1753,8 @@ } { id=292 - position={ 1441.171631 0.000000 3290.124023 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 1477.000000 0.000000 3284.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -15961,13 +15961,13 @@ } { id=2806 - position={ 1564.000000 0.000000 2934.000000 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 1551.364502 0.000000 2905.436523 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=2807 - position={ 1606.000000 0.000000 2939.000000 } + position={ 1578.537354 0.000000 2936.426270 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -16039,8 +16039,8 @@ } { id=2819 - position={ 1650.000000 0.000000 2947.000000 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 1626.000000 0.000000 2935.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18001,7 +18001,7 @@ } { id=3166 - position={ 1645.000000 0.000000 2843.000000 } + position={ 1640.394409 0.000000 2832.070312 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -18013,14 +18013,14 @@ } { id=3168 - position={ 1656.000000 0.000000 2891.000000 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 1641.000000 0.000000 2872.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=3169 - position={ 1650.000000 0.000000 2865.000000 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 1669.000000 0.000000 2848.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { @@ -54443,18 +54443,6 @@ rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } - { - id=9660 - position={ 5287.000000 0.000000 1040.000000 } - rotation={ -0.000000 -0.320455 -0.000000 -0.947264 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9661 - position={ 5287.000000 0.000000 1040.000000 } - rotation={ -0.000000 -0.320455 -0.000000 -0.947264 } - scale={ 1.000000 1.000000 1.000000 } - } { id=9662 position={ 597.000000 0.000000 2687.000000 } @@ -54671,6 +54659,102 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9698 + position={ 1276.000000 0.000000 2834.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9699 + position={ 1293.000000 0.000000 2853.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9700 + position={ 1397.000000 0.000000 2351.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9701 + position={ 1444.000000 0.000000 2349.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9702 + position={ 1479.000000 0.000000 2316.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9703 + position={ 1518.000000 0.000000 2332.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9704 + position={ 1506.000000 0.000000 2359.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9705 + position={ 1533.000000 0.000000 2382.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9706 + position={ 1543.000000 0.000000 2363.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9707 + position={ 1644.000000 0.000000 2335.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9708 + position={ 1682.000000 0.000000 2329.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9709 + position={ 1655.000000 0.000000 2358.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9710 + position={ 1528.000000 0.000000 2307.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9711 + position={ 1346.000000 0.000000 2182.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9712 + position={ 1338.000000 0.000000 2202.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9713 + position={ 1410.000000 0.000000 2329.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } { id=9714 position={ 888.943909 0.000000 3076.585693 } @@ -54839,30 +54923,6 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } - { - id=9742 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9743 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9744 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9745 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } { id=9746 position={ 883.000000 0.000000 2727.000000 } @@ -54881,5 +54941,179 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9749 + position={ 1183.000000 0.000000 2548.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9750 + position={ 1225.000000 0.000000 2473.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9751 + position={ 1182.000000 0.000000 2524.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9752 + position={ 1795.000000 0.000000 1658.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9753 + position={ 1807.000000 0.000000 1675.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9755 + position={ 1803.000000 0.000000 1699.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9756 + position={ 1796.000000 0.000000 1556.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9757 + position={ 1823.000000 0.000000 1737.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9758 + position={ 1833.000000 0.000000 1888.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9759 + position={ 0.000000 0.000000 0.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9760 + position={ 1844.000000 0.000000 1938.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9761 + position={ 1884.000000 0.000000 1934.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9762 + position={ 1356.000000 0.000000 2544.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9763 + position={ 1339.000000 0.000000 2432.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9765 + position={ 1868.000000 0.000000 1855.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9766 + position={ 1890.000000 0.000000 1882.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9767 + position={ 1866.000000 0.000000 1884.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9768 + position={ 1324.000000 0.000000 2450.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9769 + position={ 659.000000 0.000000 1641.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9770 + position={ 1456.000000 0.000000 2891.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9771 + position={ 1506.000000 0.000000 2908.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9772 + position={ 1645.000000 0.000000 2844.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9773 + position={ 1674.000000 0.000000 2832.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9774 + position={ 1568.000000 0.000000 2413.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9775 + position={ 1415.000000 0.000000 2554.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9776 + position={ 1438.000000 0.000000 2566.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9777 + position={ 1882.000000 0.000000 3319.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9778 + position={ 2114.000000 0.000000 2283.000000 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9779 + position={ 2090.000000 0.000000 2317.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 30d9b715..b2e66ba8 100644 --- a/N3OW/gfx/map/map_object_data/siege_locators.txt +++ b/N3OW/gfx/map/map_object_data/siege_locators.txt @@ -1507,7 +1507,7 @@ } { id=251 - position={ 1392.330688 0.000000 3282.288574 } + position={ 1410.987183 0.000000 3268.942383 } rotation={ 0.000000 0.633989 0.000000 0.773342 } scale={ 1.000000 1.000000 1.000000 } } @@ -1717,7 +1717,7 @@ } { id=287 - position={ 1538.563599 0.000000 3316.971680 } + position={ 1553.120361 0.000000 3318.913574 } rotation={ -0.000000 0.541287 -0.000000 0.840838 } scale={ 1.000000 1.000000 1.000000 } } @@ -1747,7 +1747,7 @@ } { id=292 - position={ 1426.334351 0.000000 3289.887207 } + position={ 1471.643677 0.000000 3288.557861 } rotation={ -0.000000 0.591486 -0.000000 0.806315 } scale={ 1.000000 1.000000 1.000000 } } @@ -14281,7 +14281,7 @@ } { id=2807 - position={ 1588.000000 0.000000 2930.000000 } + position={ 1583.229858 0.000000 2929.733643 } rotation={ 0.000000 0.894427 0.000000 0.447214 } scale={ 1.000000 1.000000 1.000000 } } @@ -14353,7 +14353,7 @@ } { id=2819 - position={ 1657.000000 0.000000 2942.000000 } + position={ 1629.485352 0.000000 2934.270508 } rotation={ -0.000000 -0.633989 -0.000000 0.773342 } scale={ 1.000000 1.000000 1.000000 } } @@ -16327,13 +16327,13 @@ } { id=3168 - position={ 1646.000000 0.000000 2880.000000 } - rotation={ 0.000000 0.987087 0.000000 0.160182 } + position={ 1629.000000 0.000000 2877.000000 } + rotation={ -0.000000 -0.956558 -0.000000 0.291540 } scale={ 1.000000 1.000000 1.000000 } } { id=3169 - position={ 1638.000000 0.000000 2859.000000 } + position={ 1659.721436 0.000000 2841.958252 } rotation={ 0.000000 0.666921 0.000000 0.745128 } scale={ 1.000000 1.000000 1.000000 } } @@ -51461,18 +51461,6 @@ rotation={ 0.000000 0.584710 0.000000 0.811242 } scale={ 1.000000 1.000000 1.000000 } } - { - id=9660 - position={ 5287.000000 0.000000 1040.000000 } - rotation={ -0.000000 -0.320455 -0.000000 -0.947264 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9661 - position={ 5287.000000 0.000000 1040.000000 } - rotation={ -0.000000 -0.320455 -0.000000 -0.947264 } - scale={ 1.000000 1.000000 1.000000 } - } { id=9662 position={ 597.658508 0.000000 2691.965576 } @@ -51689,6 +51677,102 @@ rotation={ -0.000000 -0.229177 -0.000000 0.973385 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9698 + position={ 1279.000000 0.000000 2834.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9699 + position={ 1296.000000 0.000000 2853.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9700 + position={ 1400.000000 0.000000 2351.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9701 + position={ 1447.000000 0.000000 2349.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9702 + position={ 1482.000000 0.000000 2316.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9703 + position={ 1521.000000 0.000000 2332.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9704 + position={ 1509.000000 0.000000 2359.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9705 + position={ 1536.000000 0.000000 2382.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9706 + position={ 1546.000000 0.000000 2363.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9707 + position={ 1647.000000 0.000000 2335.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9708 + position={ 1685.000000 0.000000 2329.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9709 + position={ 1658.000000 0.000000 2358.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9710 + position={ 1531.000000 0.000000 2307.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9711 + position={ 1349.000000 0.000000 2182.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9712 + position={ 1341.000000 0.000000 2202.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9713 + position={ 1413.000000 0.000000 2329.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } { id=9714 position={ 894.705444 0.000000 3075.479492 } @@ -51857,30 +51941,6 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } - { - id=9742 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9743 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9744 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=9745 - position={ 883.000000 0.000000 2727.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } - scale={ 1.000000 1.000000 1.000000 } - } { id=9746 position={ 883.000000 0.000000 2727.000000 } @@ -51899,5 +51959,179 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9749 + position={ 1186.000000 0.000000 2548.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9750 + position={ 1228.000000 0.000000 2473.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9751 + position={ 1185.000000 0.000000 2524.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9752 + position={ 1798.000000 0.000000 1658.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9753 + position={ 1810.000000 0.000000 1675.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9755 + position={ 1806.000000 0.000000 1699.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9756 + position={ 1799.000000 0.000000 1556.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9757 + position={ 1826.000000 0.000000 1737.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9758 + position={ 1836.000000 0.000000 1888.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9759 + position={ 3.000000 0.000000 0.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9760 + position={ 1847.000000 0.000000 1938.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9761 + position={ 1887.000000 0.000000 1934.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9762 + position={ 1359.000000 0.000000 2544.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9763 + position={ 1342.000000 0.000000 2432.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9765 + position={ 1871.000000 0.000000 1855.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9766 + position={ 1893.000000 0.000000 1882.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9767 + position={ 1869.000000 0.000000 1884.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9768 + position={ 1327.000000 0.000000 2450.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9769 + position={ 662.000000 0.000000 1641.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9770 + position={ 1465.448364 0.000000 2883.684570 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9771 + position={ 1509.000000 0.000000 2908.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9772 + position={ 1633.691040 0.000000 2852.878662 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9773 + position={ 1677.000000 0.000000 2832.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9774 + position={ 1571.000000 0.000000 2413.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9775 + position={ 1418.000000 0.000000 2554.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9776 + position={ 1441.000000 0.000000 2566.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9777 + position={ 1885.000000 0.000000 3319.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9778 + position={ 2117.000000 0.000000 2283.000000 } + rotation={ -0.000000 -0.000025 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9779 + position={ 2093.000000 0.000000 2317.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 0e43c2db..8e7a4d9e 100644 --- a/N3OW/gfx/map/map_object_data/special_building_locators.txt +++ b/N3OW/gfx/map/map_object_data/special_building_locators.txt @@ -1,4 +1,4 @@ -game_object_locator={ +game_object_locator={ name="special_building" render_pass=Map clamp_to_water_level=yes @@ -51461,5 +51461,671 @@ rotation={ -0.000000 0.002575 -0.000000 0.999997 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9662 + position={ 591.000000 0.000000 2687.000000 } + rotation={ -0.000000 -0.987597 -0.000000 0.157013 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9663 + position={ 821.000000 0.000000 2608.000000 } + rotation={ -0.000000 -0.110778 -0.000000 -0.993845 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9664 + position={ 797.000000 0.000000 2630.000000 } + rotation={ -0.000000 -0.908579 -0.000000 0.417712 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9665 + position={ 808.000000 0.000000 2627.000000 } + rotation={ -0.000000 -0.688511 -0.000000 -0.725226 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9666 + position={ 819.000000 0.000000 2650.000000 } + rotation={ -0.000000 -0.281626 -0.000000 0.959524 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9667 + position={ 603.000000 0.000000 3023.000000 } + rotation={ -0.000000 -0.715077 -0.000000 -0.699046 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9668 + position={ 640.000000 0.000000 3021.000000 } + rotation={ -0.000000 -0.754782 -0.000000 0.655975 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9669 + position={ 572.000000 0.000000 3059.000000 } + rotation={ -0.000000 -0.940512 -0.000000 0.339759 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9670 + position={ 590.000000 0.000000 3069.000000 } + rotation={ -0.000000 -0.988946 -0.000000 0.148275 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9671 + position={ 581.000000 0.000000 3029.000000 } + rotation={ -0.000000 -0.593636 -0.000000 -0.804734 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9672 + position={ 612.000000 0.000000 3085.000000 } + rotation={ -0.000000 -0.237407 -0.000000 0.971410 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9673 + position={ 641.000000 0.000000 3088.000000 } + rotation={ -0.000000 -0.717062 -0.000000 -0.697009 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9674 + position={ 646.000000 0.000000 3035.000000 } + rotation={ -0.000000 -0.953778 -0.000000 -0.300511 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9675 + position={ 551.000000 0.000000 3090.000000 } + rotation={ -0.000000 -0.199190 -0.000000 0.979961 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9676 + position={ 552.000000 0.000000 3011.000000 } + rotation={ -0.000000 -0.768259 -0.000000 -0.640139 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9677 + position={ 586.000000 0.000000 3009.000000 } + rotation={ -0.000000 -0.955662 -0.000000 0.294467 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9678 + position={ 501.000000 0.000000 3004.000000 } + rotation={ -0.000000 -0.366340 -0.000000 -0.930481 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9679 + position={ 631.000000 0.000000 2966.000000 } + rotation={ -0.000000 -0.990080 -0.000000 -0.140501 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9680 + position={ 596.000000 0.000000 2906.000000 } + rotation={ -0.000000 -0.915090 -0.000000 -0.403250 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9681 + position={ 571.000000 0.000000 2954.000000 } + rotation={ -0.000000 -0.979391 -0.000000 0.201973 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9682 + position={ 554.000000 0.000000 2932.000000 } + rotation={ -0.000000 -0.297214 -0.000000 0.954811 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9683 + position={ 476.000000 0.000000 2900.000000 } + rotation={ -0.000000 -0.294071 -0.000000 0.955784 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9684 + position={ 438.000000 0.000000 2861.000000 } + rotation={ -0.000000 -0.154000 -0.000000 0.988071 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9685 + position={ 1115.000000 0.000000 3028.000000 } + rotation={ -0.000000 -0.654115 -0.000000 0.756395 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9686 + position={ 1150.000000 0.000000 3026.000000 } + rotation={ -0.000000 -0.992960 -0.000000 -0.118454 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9687 + position={ 1131.000000 0.000000 3031.000000 } + rotation={ -0.000000 -0.148980 -0.000000 -0.988840 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9688 + position={ 1110.000000 0.000000 3048.000000 } + rotation={ -0.000000 -0.913270 -0.000000 0.407354 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9689 + position={ 1173.000000 0.000000 3038.000000 } + rotation={ -0.000000 -0.450278 -0.000000 0.892888 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9690 + position={ 1178.000000 0.000000 3076.000000 } + rotation={ -0.000000 -0.822084 -0.000000 0.569366 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9691 + position={ 1132.000000 0.000000 3062.000000 } + rotation={ -0.000000 -0.982182 -0.000000 0.187931 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9692 + position={ 1133.000000 0.000000 3018.000000 } + rotation={ -0.000000 -0.631227 -0.000000 -0.775598 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9693 + position={ 1166.000000 0.000000 3040.000000 } + rotation={ -0.000000 -0.281281 -0.000000 -0.959626 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9694 + position={ 747.000000 0.000000 3102.000000 } + rotation={ -0.000000 -0.838904 -0.000000 0.544280 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9695 + position={ 730.000000 0.000000 3169.000000 } + rotation={ -0.000000 -0.996040 -0.000000 -0.088907 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9696 + position={ 604.000000 0.000000 3250.000000 } + rotation={ -0.000000 -0.641479 -0.000000 -0.767140 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9697 + position={ 640.000000 0.000000 3313.000000 } + rotation={ -0.000000 -0.414964 -0.000000 -0.909838 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9698 + position={ 1276.000000 0.000000 2834.000000 } + rotation={ -0.000000 -0.965479 -0.000000 -0.260482 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9699 + position={ 1293.000000 0.000000 2853.000000 } + rotation={ -0.000000 -0.990764 -0.000000 0.135597 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9700 + position={ 1397.000000 0.000000 2351.000000 } + rotation={ -0.000000 -0.217983 -0.000000 -0.975953 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9701 + position={ 1444.000000 0.000000 2349.000000 } + rotation={ -0.000000 -0.468681 -0.000000 -0.883368 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9702 + position={ 1479.000000 0.000000 2316.000000 } + rotation={ -0.000000 -0.385712 -0.000000 -0.922619 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9703 + position={ 1518.000000 0.000000 2332.000000 } + rotation={ -0.000000 -0.712547 -0.000000 0.701624 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9704 + position={ 1506.000000 0.000000 2359.000000 } + rotation={ -0.000000 -0.347681 -0.000000 0.937613 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9705 + position={ 1533.000000 0.000000 2382.000000 } + rotation={ -0.000000 -0.220390 -0.000000 0.975412 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9706 + position={ 1543.000000 0.000000 2363.000000 } + rotation={ -0.000000 -0.688882 -0.000000 0.724873 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9707 + position={ 1644.000000 0.000000 2335.000000 } + rotation={ -0.000000 -0.373816 -0.000000 -0.927503 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9708 + position={ 1682.000000 0.000000 2329.000000 } + rotation={ -0.000000 -0.999904 -0.000000 0.013841 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9709 + position={ 1655.000000 0.000000 2358.000000 } + rotation={ -0.000000 -0.271490 -0.000000 0.962441 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9710 + position={ 1528.000000 0.000000 2307.000000 } + rotation={ -0.000000 -0.997370 -0.000000 -0.072477 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9711 + position={ 1346.000000 0.000000 2182.000000 } + rotation={ -0.000000 -0.954281 -0.000000 -0.298911 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9712 + position={ 1338.000000 0.000000 2202.000000 } + rotation={ -0.000000 -0.667255 -0.000000 0.744829 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9713 + position={ 1410.000000 0.000000 2329.000000 } + rotation={ -0.000000 -0.884690 -0.000000 0.466180 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9714 + position={ 893.000000 0.000000 3072.000000 } + rotation={ -0.000000 -0.849464 -0.000000 0.527646 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9715 + position={ 873.000000 0.000000 3079.000000 } + rotation={ -0.000000 -0.452056 -0.000000 0.891989 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9716 + position={ 882.000000 0.000000 3044.000000 } + rotation={ -0.000000 -0.915914 -0.000000 0.401373 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9717 + position={ 845.000000 0.000000 3046.000000 } + rotation={ -0.000000 -0.935943 -0.000000 0.352153 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9718 + position={ 822.000000 0.000000 3041.000000 } + rotation={ -0.000000 -0.963010 -0.000000 0.269465 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9719 + position={ 813.000000 0.000000 2984.000000 } + rotation={ -0.000000 -0.980071 -0.000000 -0.198646 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9720 + position={ 812.000000 0.000000 2948.000000 } + rotation={ -0.000000 -0.927982 -0.000000 0.372626 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9721 + position={ 834.000000 0.000000 2954.000000 } + rotation={ -0.000000 -0.256329 -0.000000 0.966590 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9722 + position={ 925.000000 0.000000 3007.000000 } + rotation={ -0.000000 -0.898512 -0.000000 0.438949 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9723 + position={ 823.000000 0.000000 2895.000000 } + rotation={ -0.000000 -0.359293 -0.000000 -0.933225 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9724 + position={ 842.000000 0.000000 2868.000000 } + rotation={ -0.000000 -0.988664 -0.000000 -0.150147 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9725 + position={ 845.000000 0.000000 2848.000000 } + rotation={ -0.000000 -0.293745 -0.000000 0.955884 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9726 + position={ 853.000000 0.000000 2893.000000 } + rotation={ -0.000000 -0.724658 -0.000000 0.689109 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9727 + position={ 867.000000 0.000000 2844.000000 } + rotation={ -0.000000 -0.806442 -0.000000 -0.591313 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9728 + position={ 811.000000 0.000000 2766.000000 } + rotation={ -0.000000 -0.828638 -0.000000 -0.559785 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9729 + position={ 788.000000 0.000000 2771.000000 } + rotation={ -0.000000 -0.837298 -0.000000 -0.546747 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9730 + position={ 846.000000 0.000000 2823.000000 } + rotation={ -0.000000 -0.988560 -0.000000 0.150830 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9731 + position={ 863.000000 0.000000 2759.000000 } + rotation={ -0.000000 -0.321068 -0.000000 0.947056 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9732 + position={ 898.000000 0.000000 2869.000000 } + rotation={ -0.000000 -0.874268 -0.000000 0.485443 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9733 + position={ 975.000000 0.000000 2790.000000 } + rotation={ -0.000000 -0.793146 -0.000000 -0.609031 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9734 + position={ 961.000000 0.000000 2795.000000 } + rotation={ -0.000000 -0.995079 -0.000000 0.099088 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9735 + position={ 935.000000 0.000000 2764.000000 } + rotation={ -0.000000 -0.372962 -0.000000 -0.927847 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9736 + position={ 1259.000000 0.000000 2733.000000 } + rotation={ -0.000000 -0.994008 -0.000000 0.109307 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9737 + position={ 1279.000000 0.000000 2670.000000 } + rotation={ -0.000000 -0.121546 -0.000000 0.992586 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9738 + position={ 1211.000000 0.000000 2709.000000 } + rotation={ -0.000000 -0.254985 -0.000000 0.966945 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9739 + position={ 1167.000000 0.000000 2724.000000 } + rotation={ -0.000000 -0.618200 -0.000000 0.786021 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9740 + position={ 862.000000 0.000000 2530.000000 } + rotation={ -0.000000 -0.722298 -0.000000 -0.691582 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9741 + position={ 833.000000 0.000000 2436.000000 } + rotation={ -0.000000 -0.650820 -0.000000 -0.759232 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9746 + position={ 914.000000 0.000000 2534.000000 } + rotation={ -0.000000 -0.934242 -0.000000 0.356640 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9747 + position={ 946.000000 0.000000 2426.000000 } + rotation={ -0.000000 -0.893739 -0.000000 -0.448587 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9748 + position={ 1817.000000 0.000000 1620.000000 } + rotation={ -0.000000 -0.643726 -0.000000 0.765256 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9749 + position={ 1183.000000 0.000000 2548.000000 } + rotation={ -0.000000 -0.964936 -0.000000 -0.262487 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9750 + position={ 1225.000000 0.000000 2473.000000 } + rotation={ -0.000000 -0.900174 -0.000000 -0.435531 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9751 + position={ 1182.000000 0.000000 2524.000000 } + rotation={ -0.000000 -0.106053 -0.000000 0.994360 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9752 + position={ 1795.000000 0.000000 1658.000000 } + rotation={ -0.000000 -0.210941 -0.000000 -0.977499 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9753 + position={ 1807.000000 0.000000 1675.000000 } + rotation={ -0.000000 -0.536142 -0.000000 0.844128 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9755 + position={ 1803.000000 0.000000 1699.000000 } + rotation={ -0.000000 -0.456120 -0.000000 -0.889918 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9756 + position={ 1796.000000 0.000000 1556.000000 } + rotation={ -0.000000 -0.994309 -0.000000 -0.106531 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9757 + position={ 1823.000000 0.000000 1737.000000 } + rotation={ -0.000000 -0.306977 -0.000000 -0.951717 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9758 + position={ 1833.000000 0.000000 1888.000000 } + rotation={ -0.000000 -0.414291 -0.000000 -0.910144 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9760 + position={ 1844.000000 0.000000 1938.000000 } + rotation={ -0.000000 -0.341154 -0.000000 0.940007 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9761 + position={ 1884.000000 0.000000 1934.000000 } + rotation={ -0.000000 -0.920975 -0.000000 -0.389621 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9762 + position={ 1356.000000 0.000000 2544.000000 } + rotation={ -0.000000 -0.030314 -0.000000 0.999540 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9763 + position={ 1339.000000 0.000000 2432.000000 } + rotation={ -0.000000 -0.878807 -0.000000 -0.477178 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9765 + position={ 1868.000000 0.000000 1855.000000 } + rotation={ -0.000000 -0.687863 -0.000000 0.725841 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9766 + position={ 1890.000000 0.000000 1882.000000 } + rotation={ -0.000000 -0.999863 -0.000000 -0.016532 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9767 + position={ 1866.000000 0.000000 1884.000000 } + rotation={ -0.000000 -0.124309 -0.000000 0.992244 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9768 + position={ 1324.000000 0.000000 2450.000000 } + rotation={ -0.000000 -0.138566 -0.000000 0.990353 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9769 + position={ 659.000000 0.000000 1641.000000 } + rotation={ -0.000000 -0.082028 -0.000000 0.996630 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9770 + position={ 1456.000000 0.000000 2891.000000 } + rotation={ -0.000000 -0.816101 -0.000000 -0.577909 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9771 + position={ 1506.000000 0.000000 2908.000000 } + rotation={ -0.000000 -0.999834 -0.000000 -0.018242 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9772 + position={ 1633.000000 0.000000 2847.000000 } + rotation={ -0.000000 -0.204300 -0.000000 0.978908 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9773 + position={ 1674.000000 0.000000 2832.000000 } + rotation={ -0.000000 -0.549807 -0.000000 0.835292 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9774 + position={ 1568.000000 0.000000 2413.000000 } + rotation={ -0.000000 -0.695626 -0.000000 0.718404 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9775 + position={ 1415.000000 0.000000 2554.000000 } + rotation={ -0.000000 -0.244975 -0.000000 -0.969529 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9776 + position={ 1438.000000 0.000000 2566.000000 } + rotation={ -0.000000 -0.523327 -0.000000 -0.852132 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9777 + position={ 1882.000000 0.000000 3319.000000 } + rotation={ -0.000000 -0.634238 -0.000000 0.773138 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9778 + position={ 2114.000000 0.000000 2283.000000 } + rotation={ -0.000000 -0.417538 -0.000000 -0.908660 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9779 + position={ 2090.000000 0.000000 2317.000000 } + rotation={ -0.000000 -0.503517 -0.000000 -0.863985 } + scale={ 1.000000 1.000000 1.000000 } + } } } diff --git a/N3OW/history/provinces/e_scandinavia.txt b/N3OW/history/provinces/e_scandinavia.txt index 9b871faa..51cf5f5e 100644 --- a/N3OW/history/provinces/e_scandinavia.txt +++ b/N3OW/history/provinces/e_scandinavia.txt @@ -160,8 +160,8 @@ } ###c_ubmejeiednuo 428 = { - culture = svealandsk - religion = midnighter + culture = sami + religion = finnish_pagan holding = tribal_holding } 429 = { @@ -175,8 +175,8 @@ } ###c_pite 374 = { - culture = svealandsk - religion = midnighter + culture = sami + religion = finnish_pagan holding = tribal_holding } 427 = { @@ -275,7 +275,7 @@ holding = none } ###c_aviovara -397 = { +395 = { culture = sami religion = finnish_pagan holding = tribal_holding @@ -283,28 +283,44 @@ 394 = { holding = none } -395 = { - holding = none -} -###c_karasjohka -396 = { +397 = { culture = sami religion = finnish_pagan holding = tribal_holding } -398 = { +391 = { + culture = sami + religion = finnish_pagan + holding = tribal_holding +} +424 = { + culture = sami + religion = finnish_pagan + holding = tribal_holding +} +425 = { + culture = sami + religion = finnish_pagan + holding = tribal_holding +} +###c_karasjohka +399 = { + culture = sami + religion = finnish_pagan + holding = tribal_holding +} +396 = { holding = none } -399 = { +398 = { holding = none } ##d_svealand ###c_upland -341 = { - culture = norse - religion = norse_pagan +9777 = { + culture = svealandsk + religion = lutheran holding = tribal_holding - special_building = temple_of_uppsala_01 867.1.1 = { buildings = { market_villages_01 @@ -314,19 +330,25 @@ holding = castle_holding } 1066.1.1 = { - culture = svealandsk - } - 1066.1.1 = { buildings = { common_tradeport_01 barracks_01 } } - 1090.1.1 = { - religion = lutheran +} +341 = { + holding = none +} +336 = { + holding = none + 1066.1.1 = { + holding = church_holding } } 342 = { + culture = svealandsk + religion = lutheran + special_building = temple_of_uppsala_01 holding = church_holding } 343 = { @@ -356,21 +378,12 @@ } ###c_sodermannaland 339 = { - culture = norse - religion = norse_pagan - holding = tribal_holding 1066.1.1 = { culture = svealandsk religion = lutheran holding = castle_holding } } -336 = { - holding = none - 1066.1.1 = { - holding = church_holding - } -} 337 = { holding = none 1066.1.1 = { @@ -385,9 +398,6 @@ } ###c_aland 216 = { - culture = norse - religion = norse_pagan - holding = tribal_holding 1066.1.1 = { culture = svealandsk holding = castle_holding @@ -1018,7 +1028,9 @@ holding = none } 368 = { - holding = none + culture = svealandsk + religion = midnighter + holding = tribal_holding } ##d_gotland ###c_gutland @@ -1390,6 +1402,8 @@ } } 231 = { + culture = ostsk + religion = lutheran holding = none 1016.1.1 = { holding = city_holding @@ -1429,6 +1443,8 @@ } } 246 = { + culture = ostsk + religion = lutheran holding = none } 233 = { @@ -1667,7 +1683,9 @@ } } 271 = { - holding = none + culture = vestsk + religion = vaesenite + holding = castle_holding } ###c_eystridalir 239 = { diff --git a/N3OW/holder for later/common/landed_titles/finland.txt b/N3OW/holder for later/common/landed_titles/finland.txt index aaa72588..183241cb 100644 --- a/N3OW/holder for later/common/landed_titles/finland.txt +++ b/N3OW/holder for later/common/landed_titles/finland.txt @@ -718,38 +718,6 @@ e_finland = { #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_peaccam = { #Kemi - color = { 20 10 155 } - - b_giempa = { #Kemi - province = 425 - - color = { 20 10 155 } - - cultural_names = { - name_list_finnish = cn_kemi - } - } - b_kemijavri = { #Kemijvri (Kemijrvi) - 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 } - } - } c_kitka = { color = { 15 10 150 } @@ -812,34 +780,6 @@ e_finland = { } } } - c_inari = { - color = { 20 20 145 } - - b_aanaarjavri = { #Aanaarjvri (Enare Trsk) - province = 391 - - color = { 20 20 145 } - - cultural_names = { - name_list_swedish = cn_enare_trask - name_list_finnish = cn_inarijarvi - } - } - b_peaccam = { #Peccam - province = 400 - - color = { 20 20 145 } - - cultural_names = { - name_list_russian = cn_pechengsky - name_list_finnish = cn_petsamo - } - } - b_suenekele = { - province = 8788 - color = { 20 20 145 } - } - } c_skolt = { color = { 44 20 169 } diff --git a/N3OW/localization/english/titles_cultural_names_l_english.yml b/N3OW/localization/english/titles_cultural_names_l_english.yml index 083c6b28..eb7158f1 100644 --- a/N3OW/localization/english/titles_cultural_names_l_english.yml +++ b/N3OW/localization/english/titles_cultural_names_l_english.yml @@ -2828,4 +2828,22 @@ cn_memmenge:0 "Memmenge" cn_ougschburg:0 "Ougschburg" - \ No newline at end of file + #Scandinavia + cn_ubmejeiednuo:0 "Ubmejeiednuo" + cn_ubmejeiednuo_adj:0 "Ubmejeiednuoan" + cn_sjeltie:0 "Sjeltie" + cn_sjeltie_adj:0 "Sjeltian" + cn_tromso:0 "Tromsø" + cn_tromso_adj:0 "Tromsan" + cn_finnmark:0 "Finnmark" + cn_finnmark_adj:0 "Finnmarker" + cn_kautokeino:0 "Kautokeino" + cn_hammerfest:0 "Hammerfest" + cn_hammerfest_adj:0 "Hammerfestian" + cn_sor_varanger:0 "Sør-Varanger" + cn_karasjok:0 "Karasjok" + cn_karasjok_adj:0 "Karasjokan" + cn_alta:0 "Alta" + cn_porsanger:0 "Porsanger" + cn_vadso:0 "Vadsø" + cn_vadso_adj:0 "Vadsan" \ No newline at end of file diff --git a/N3OW/localization/english/titles_l_english.yml b/N3OW/localization/english/titles_l_english.yml index e7182903..2f53cb7d 100644 --- a/N3OW/localization/english/titles_l_english.yml +++ b/N3OW/localization/english/titles_l_english.yml @@ -1,4 +1,4 @@ -l_english: +l_english: TITLE_NAME:1 "$NAME|U$" TITLE_TIERED_NAME:0 "$TIER|U$ of $NAME$" TITLE_DEFINITIVE_NAME:0 "the $TIER|U$ of $NAME$" @@ -135,8 +135,8 @@ b_aalkmar:1 "Alkmaar" b_aalst:0 "Aalst" b_aanaarjavri:0 "Aanaarjävri" - b_aarak:1 "Hvínisdalr" - b_aarborte:1 "Raðund" + b_aarak:1 "Nedenes" + b_aarborte:1 "Hattfjelldal" b_aardenburg:0 "Aardenburg" b_aargau:0 "Aargau" b_aarhus:0 "Aarhus" @@ -832,7 +832,7 @@ b_ardistan:0 "Ardistan" b_ardnamurchon:0 "Ardnamurchon" b_ardres:0 "Ardres" - b_arendall:1 "Þrymlingar" + b_arendall:1 "Arendal" b_areni:0 "Areni" b_arezzo:0 "Arezzo" b_argan:0 "Argan" @@ -1045,7 +1045,7 @@ b_aurillac:0 "Aurillac" b_aurland:0 "Aurland" b_ausa:0 "Ausa" - b_austfold:1 "Stangir" + b_austfold:1 "Sarpsborg" b_austratt:0 "Austrått" b_autun:0 "Autun" b_auxerre:0 "Auxerre" @@ -1067,7 +1067,7 @@ b_avezzano:0 "Avezzano" b_avignon:0 "Avignon" b_avila:0 "Avila" - b_aviovara:0 "Aviovara" + b_aviovara:0 "Hámmerfeasta" b_avis:0 "Ponte de Sor" b_avlonas:0 "Avlonas" b_avoch:0 "Avoch" @@ -1764,7 +1764,7 @@ b_borg:0 "Borg" b_borganas:0 "Borganäs" b_borgarh:0 "Borgarh" - b_borgarsyslar:1 "Sarpsborg" + b_borgarsyslar:1 "Marker" b_borgesblanques:0 "Les Borges Blanques" b_borgholm:0 "Borgholm" b_borgund:0 "Borgund" @@ -1795,7 +1795,7 @@ b_bost:0 "Bost" b_boston:0 "Boston" b_bosworth:0 "Swadlincote" - b_bothin:1 "Boðin" + b_bothin:1 "Bodø" b_bothme:0 "Bothme" b_bothwell:0 "Bothwell" b_bottaman:0 "Bottaman" @@ -1863,7 +1863,7 @@ b_bregenz:0 "Bregenz" b_bregne:0 "Bregne" b_breisach:0 "Breisach" - b_bremanger:1 "Ruslar" + b_bremanger:1 "Gulen" b_bremen:0 "Bremen" b_brene:0 "Brene" b_brentford:0 "Hounslow" @@ -1976,7 +1976,7 @@ b_burhanpur:0 "Burhanpur" b_burlus:0 "Burlus" b_burriana:0 "Burriana" - b_burss:0 "Burss" + b_burss:0 "Hemse" b_burta:0 "Burta" b_burton:0 "Burton" b_bury:0 "Bury" @@ -2682,7 +2682,7 @@ b_dalaborg:0 "Dalaborg" b_dalang:0 "Dalang" b_dalby:0 "Dalby" - b_dale:1 "Drifeyjar" + b_dale:1 "Hyllestad" b_dalisandus:0 "Dalisandus" b_dalverzintepe:0 "Dal'verzin Tepe" b_damala:0 "Damala" @@ -3031,12 +3031,12 @@ b_doune:0 "Doune" b_douz:0 "Douz" b_dover:0 "Dover" - b_dovre:1 "Dofrafjall" + b_dovre:1 "Dovre" b_downpatrick:0 "Downpatrick" b_dozz_aap:0 "Dozz Aap" b_draaelmizan:0 "Draa el Mizan" b_dradate:0 "Dradate" - b_drafn:0 "Drafn" + b_drafn:0 "Drammen" b_dragasani:0 "Drăgășani" b_dragugnian:1 "Draguignan" b_draksharama:0 "Draksharama" @@ -3212,7 +3212,7 @@ b_eivissa:0 "Eivissa" b_ejea:0 "Ejea" b_ekdala:0 "Ekdala" - b_eketorp:0 "Eketorp" + b_eketorp:0 "Mörbylånga" b_eklingji:0 "Eklingji" b_eksjo:0 "Eksjö" b_elRdair:0 "El Rdair" @@ -3371,7 +3371,7 @@ b_ewloe:0 "Ewloe" b_ewyas_harold:0 "Ewyas Harold" b_exeter:0 "Exeter" - b_eynafylki:0 "Eynafylki" + b_eynafylki:0 "Forsen" b_eynsham:0 "Eynsham" b_eysk:0 "Eysk" b_ezhva:0 "Ezhva" @@ -3421,7 +3421,7 @@ b_farnebo:0 "Färnebo" b_farnham:0 "Farnham" b_faro:0 "Faro" - b_faroo:0 "Faröö" + b_faroo:0 "Farö" b_farrah:0 "Farrah" b_farsan:0 "Farsan" b_farsh:0 "Farsh" @@ -3488,7 +3488,7 @@ b_finstigen:1 "Sarrebourg" b_finstrom:0 "Finström" b_firabr:0 "Firabr" - b_firdafylki:1 "Úlfasund" + b_firdafylki:1 "Måløy" b_firenze:0 "Florence" b_firrim:0 "Firrim" b_firuzabad:0 "Firuzabad" @@ -3678,7 +3678,7 @@ b_garioch:0 "Garioch" b_garmo:0 "Garmo" b_garmsar:0 "Garmsar" - b_garna:0 "Garnä" + b_garna:0 "Klintehamn" b_garo:0 "Garo" b_garoowe:0 "Garoowe" b_garsaura:0 "Garsaura" @@ -3690,7 +3690,7 @@ b_gateshead:0 "Gateshead" b_gatteo:0 "Gatteo" b_gaujiena:0 "Gaujiena" - b_gauldala:1 "Gauldalr" + b_gauldala:1 "Gauldal" b_gaur:0 "Gaur" b_gavi:0 "Gavi" b_gavle:0 "Gävle" @@ -3968,7 +3968,7 @@ b_grodno:0 "Grodno" b_grojec:0 "Grojec" b_gronau:0 "Gronau" - b_grong:1 "Granungar" + b_grong:1 "Grong" b_gronhogen:0 "Grönhögen" b_groningen:0 "Assen" b_grossenhain:0 "Grossenhain" @@ -4150,7 +4150,7 @@ b_harbijah:0 "Harbijah" b_harburg:0 "Harburg" b_harcourt:0 "Bernay" - b_hardanger:1 "Harðangr" + b_hardanger:1 "Hardanger" b_hardenburg:0 "Hardenburg" b_harderwijk:0 "Harderwijk" b_hardoi:0 "Hardoi" @@ -4201,7 +4201,7 @@ b_hattula:0 "Hattula" b_hatuna:0 "Håtuna" b_hatvan:0 "Hatvan" - b_haugelandi:1 "Ögvaldsnes" + b_haugelandi:1 "Haugesund" b_haugsdorf:0 "Haugsdorf" b_hautpoul:0 "Hautpoul" b_havelberg:0 "Havelberg" @@ -4220,16 +4220,16 @@ b_hazretisuleymancamii:0 "Hazreti Suleyman Cami" b_hebron:0 "Hebron" b_hedanger:0 "Hedanger" - b_heddall:1 "Grenland" + b_heddall:1 "Notodden" b_hede:0 "Hede" b_hedeby:0 "Hedeby" b_hedemora:0 "Hedemora" b_hedesunda:0 "Hedesunda" b_hedingham:0 "Hedingham" - b_hedmork:1 "Hamarr" + b_hedmork:1 "Hamar" b_heerhugowaard:0 "Heerhugowaard" b_hegra:0 "Hegra" - b_heiane:1 "Veggir" + b_heiane:1 "Farsund" b_heidelberg:0 "Heidelberg" b_heilbronn:0 "Heilbronn" b_heiligenberg:0 "Heiligenberg" @@ -4311,7 +4311,7 @@ b_hiskampis:0 "Hiskampis" b_hisn_lawata:0 "Hisn Lawata" b_hit:0 "Hit" - b_hitrar:0 "Hitrar" + b_hitrar:0 "Hitra" b_hitterdals:0 "Hitterdals" b_hlerin:0 "Hlerin" b_hlidarendi:0 "Hlidarendi" @@ -4391,7 +4391,7 @@ b_hukeswag:1 "Hückeswagen" b_hulbuk:0 "Hulbuk" b_huliaipole:0 "Huliaipole" - b_hulingsryd:0 "Hulingsryd" + b_hulingsryd:0 "Hultsfred" b_hull:0 "Hull" b_hultaby:0 "Hultaby" b_hulterstad:0 "Hulterstad" @@ -4408,7 +4408,7 @@ b_husaby:0 "Husaby" b_husaiba:0 "Husaiba" b_husan:0 "Husån" - b_husavik:1 "Norðrland" + b_husavik:1 "Akureyri" b_husby:0 "Husby" b_husi:0 "Huși" b_husseiniya:0 "Husseiniya" @@ -4492,7 +4492,7 @@ b_ingelheim:0 "Ingelheim" b_ingolstadt:0 "Ingolstadt" b_inis_patraic:0 "Inis Patraic" - b_innan_namdal:1 "Innri Naumudalr" + b_innan_namdal:1 "Snåsa" b_innsbruck:0 "Innsbruck" b_inowroclaw:0 "Inowrocław" b_insar:0 "Insar" @@ -4670,7 +4670,7 @@ b_jaslo:0 "Jaslo" b_jasnaul:0 "Jasnaul" b_jasto:0 "Jasto" - b_jatharr:1 "Jaðarr" + b_jatharr:1 "Stavanger" b_jativa:0 "Xàtiva" b_jattendal:0 "Jättendal" b_jaugada:0 "Jaugada" @@ -4748,7 +4748,7 @@ b_johannisburg:0 "Johannisburg" b_joigny:0 "Joigny" b_joinville:0 "Joinville" - b_jolster:1 "Stoðreimr" + b_jolster:1 "Stryn" b_jolsva:0 "Jolsva" b_jomala:0 "Jomala" b_jomsberg:0 "Jomsberg" @@ -6785,7 +6785,7 @@ b_mitford:0 "Mitford" b_mithankot:0 "Mithankot" b_mithila:0 "Mithila" - b_bjorgvin:1 "Björgyn" + b_bjorgvin:1 "Bergen" b_mithymna:0 "Mithymna" b_mitmatna:0 "Mitmatna" b_mitterburg:0 "Mitterburg" @@ -7284,7 +7284,7 @@ b_nice:0 "Nice" b_nicotera:0 "Nicotera" b_nida:0 "Nida" - b_nidaros:1 "Niðaróss" + b_nidaros:1 "Trondheim" b_nidda:0 "Nidda" b_nidugallu:0 "Nidugallu" b_niebla:0 "Niebla" @@ -7372,12 +7372,12 @@ b_northampton:0 "Northampton" b_northeim:0 "Northeim" b_northmavine:0 "Northmavine" - b_northri_eystridali:1 "Norðr Eystridalr" - b_northri_gudbrandsdali:1 "Harðkinn" - b_northri_more:1 "Norðrmærr" - b_northrihordalandi:1 "Norðrhörðaland" + b_northri_eystridali:1 "Rendal" + b_northri_gudbrandsdali:1 "Fron" + b_northri_more:1 "Nordmøre" + b_northrihordalandi:1 "Nordhordland" b_northwich:0 "Northwich" - b_norwegian_lister:1 "Líðandisnes" + b_norwegian_lister:1 "Lindesnes" b_norwich:0 "Norwich" b_nosok:0 "Nosok" b_noteborg:0 "Pähkinälinna" @@ -7419,7 +7419,7 @@ b_nul_lamta:0 "Nul Lamta" b_nules:0 "Nules" b_numaligarh:0 "Numaligarh" - b_numedall:1 "Þelamörk" + b_numedall:1 "Vinje" b_nunney:0 "Nunney" b_nuokkijarvi:0 "Nuokkijärvi" b_nuottjaurr:0 "Nuõ'ttjäu'rr" @@ -7564,7 +7564,7 @@ b_orihuela:0 "Orihuela" b_orisaare:0 "Orisaare" b_oristano:0 "Oristano" - b_orkdala:1 "Orkadalr" + b_orkdala:1 "Orkland" b_orkistos:0 "Orkistos" b_orlamunde:0 "Orlamünde" b_orlanto:1 "Otranto" @@ -7629,7 +7629,7 @@ b_otricoli:0 "Otricoli" b_ottana:0 "Ottana" b_ottenby:0 "Ottenby" - b_ottrunes:1 "Seleyjar" + b_ottrunes:1 "Kristiansand" b_otuken:0 "Ötüken" b_ouadane:0 "Ouadane" b_oualata:0 "Oualata" @@ -8244,7 +8244,7 @@ b_quwairah:0 "Quwairah" b_quzdar:0 "Quzdar" b_raab:0 "Raab" - b_raaboigde:1 "Robyggjalög" + b_raaboigde:1 "Setesdal" b_rabag:0 "Rabag" b_raban:0 "Raban" b_rabat:0 "Rabat" @@ -8371,7 +8371,7 @@ b_ratu:0 "Ratu" b_ratzeburg:0 "Ratzeburg" b_rauma:0 "Rauma" - b_raumsdali:1 "Raumsdalr" + b_raumsdali:1 "Romsdal" b_rauna:0 "Rauna" b_rautu:0 "Rautu" b_ravansar:0 "Ravansar" @@ -8438,7 +8438,7 @@ b_reus:0 "Reus" b_reuss:0 "Reuss" b_reval:1 "Lindanisa" - b_reydarfjall:1 "Austfirðir" + b_reydarfjall:1 "Egilsstaðir" b_reykjavik:1 "Reykjavík" b_rezekne:0 "Rezekne" b_rezoa:0 "Rezoa" @@ -8479,7 +8479,7 @@ b_rikala:0 "Rikala" b_rila:0 "Rila" b_rimini:0 "Rimini" - b_ringariki:1 "Hríngaríki" + b_ringariki:1 "Nesbyen" b_ringkobing:0 "Ringkøbing" b_ringsted:0 "Ringsted" b_ripon:0 "Selby" @@ -8506,7 +8506,7 @@ b_rodez:0 "Rodez" b_rodkhan:0 "Rodkhan" b_rodnya:0 "Rodnya" - b_rodoy:1 "Rauðey" + b_rodoy:1 "Rødøy" b_roermond:0 "Roermond" b_roeselare:0 "Roeselare" b_rogatica:0 "Rogatica" @@ -8529,7 +8529,7 @@ b_romani:0 "Romani" b_romanov:0 "Romanov" b_romans:0 "Romans" - b_romerriki:1 "Raumaríki" + b_romerriki:1 "Jessheim" b_romigny:0 "Charleville-Mézières" b_romilly:0 "Saint-Dizier" b_romney:0 "Romney" @@ -8576,7 +8576,7 @@ b_rouen:0 "Rouen" b_rouessa:0 "Rouessa" b_roumana:0 "Roumana" - b_rounala:0 "Rounala" + b_rounala:0 "Romsa" b_rovaniemi:0 "Rovaniemi" b_rovereto:0 "Rovereto" b_rovigo:0 "Rovigo" @@ -8632,7 +8632,7 @@ b_rybnik:0 "Rybnik" b_rybnino:0 "Rybnino" b_rye:0 "Rye" - b_ryfylki:1 "Rýgjarfylki" + b_ryfylki:1 "Ryfylke" b_rysk:0 "Rysk" b_ryumino:0 "Ryumino" b_rzepin:0 "Rzepin" @@ -9361,7 +9361,7 @@ b_siwistan:0 "Siwistan" b_siyahjird:0 "Siyahjird" b_siyyamangalam:0 "Siyyamangalam" - b_sjeltie:0 "Sjeltie" + b_sjeltie:0 "Åsele" b_sjenica:0 "Sjenica" b_sjokksjokk:0 "Sjokksjokk" b_skadar:0 "Skadar" @@ -9429,7 +9429,7 @@ b_sochur:0 "Sochur" b_soderkoping:0 "Söderköping" b_soest:0 "Soest" - b_sognfylki:1 "Lúsakaupangr" + b_sognfylki:1 "Årdal" b_soissons:0 "Soissons" b_sokol:0 "Sokol" b_sokolka:0 "Sokolka" @@ -9648,14 +9648,14 @@ b_stjeanbaptiste:0 "St Jean-Baptiste" b_stjeandangely:0 "St Jean-d'Angély" b_stjeandelosne:0 "St Jean-de-Losne" - b_stjordala:1 "Stjórdalr" + b_stjordala:1 "Stjørdal" b_stleonard:0 "St Léonard" b_stmaixent:0 "St Maixent" b_stockholm:0 "Stockholm" b_stoenesti:0 "Stoenești" b_stoke_on_trent:1 "Stoke-on-Trent" - b_stokkseyri:1 "Skálaholt" - b_stolsheimen:1 "Hof" + b_stokkseyri:1 "Selfoss" + b_stolsheimen:1 "Vik" b_ston:0 "Ston" b_storkow:0 "Storkow" b_stornoway:0 "Stornoway" @@ -9756,8 +9756,8 @@ b_sundsvall:0 "Sundsvall" b_sundyr:0 "Sundyr" b_sunderland:0 "Sunderland" - b_sunnhordalandi:1 "Sunnhörðaland" - b_sunnmore:1 "Sunnmærr" + b_sunnhordalandi:1 "Sunnhordland" + b_sunnmore:1 "Sunnmøre" b_suojarvi:0 "Suojärvi" b_suondavara:0 "Soundavara" b_suonnjel:0 "Suo 'nnjel" @@ -9782,8 +9782,8 @@ b_susanino:0 "Susanino" b_susice:0 "Susice" b_sutang:0 "Sutang" - b_suthri_eystridali:1 "Suðr Eystridalr" - b_suthri_gudbrandsdali:1 "Steig" + b_suthri_eystridali:1 "Elverum" + b_suthri_gudbrandsdali:1 "Lillehammer" b_sutrapur:0 "Sutrapur" b_sutri:0 "Sutri" b_suvalkai:0 "Suvalkai" @@ -10056,7 +10056,7 @@ b_telavi:0 "Telavi" b_telcz:1 "Telč" b_tele:0 "Tele" - b_telemark:1 "Rýgjarbit" + b_telemark:1 "Skien" b_telengit:0 "Telengit" b_telford:0 "Telford" b_telge:0 "Telge" @@ -10286,7 +10286,7 @@ b_torchyn:0 "Torchyn" b_tordesillas:0 "Tordesillas" b_toreno:0 "Toreno" - b_torgar:0 "Torgar" + b_torgar:0 "Namsos" b_torgau:0 "Torgau" b_torhout:0 "Torhout" b_torino:0 "Torino" @@ -10451,7 +10451,7 @@ b_tunbeja:0 "Beja" b_tungut:0 "Tungut" b_tunis:0 "Tunis" - b_tunsberg:1 "Túnsberg" + b_tunsberg:1 "Tønsberg" b_tuorpon:0 "Tuorpon" b_tura:0 "Tura" b_turbat:0 "Turbat" @@ -10632,7 +10632,7 @@ b_usttsilma:0 "Ust-Tsilma" b_usttuntor:0 "Ust-Tuntor" b_usvyaty:0 "Usvyaty" - b_utan_namdal:1 "Ytri Naumudalr" + b_utan_namdal:1 "Steinkjer" b_utena:0 "Utena" b_utgir:0 "Utgir" b_utrecht:0 "Gouda" @@ -10662,7 +10662,7 @@ b_vadstena:0 "Vadstena" b_vaduz:0 "Vaduz" b_vaestraaros:0 "Västraaros" - b_vagan:1 "Leirnes" + b_vagan:1 "Vågan" b_vagay:0 "Vagay" b_vaghli:0 "Vaghli" b_vahka:0 "Vahka" @@ -10755,7 +10755,7 @@ b_vasterhus:0 "Västerhus" b_vastervik:0 "Västervik" b_vastseliina:0 "Vastseliina" - b_vastvagborg:1 "Vágar" + b_vastvagborg:1 "Vestvågøy" b_vasvar:0 "Vasvár" b_vasyliv:0 "Vasyliv" b_vatagiri:0 "Vatagiri" @@ -10818,7 +10818,7 @@ b_vera:0 "Vera" b_veraval:0 "Veraval" b_vercelli:0 "Vercelli" - b_verdala:1 "Verdalr" + b_verdala:1 "Verdal" b_verdelet:0 "Verdelet" b_verden:0 "Verden" b_verdu:0 "Verdú" @@ -10841,7 +10841,7 @@ b_veset:0 "Veset" b_vesilahti:0 "Vesilahti" b_vesoul:0 "Vesoul" - b_vestfirdir:0 "Vestfirðir" + b_vestfirdir:0 "Ísafjörður" b_veteli:0 "Veteli" b_vetlanda:0 "Vetlanda" b_vetulonia:0 "Vetulonia" @@ -10912,7 +10912,7 @@ b_villingen:0 "Villingen" b_vilnius:0 "Vilnius" b_vilya:0 "Vilya" - b_vimmerby:0 "Vimarby" + b_vimmerby:0 "Vimmerby" b_vinaros:0 "Vinaròs" b_vindhyachal:0 "Vindhyachal" b_vinitapura:0 "Vinitapura" @@ -10933,7 +10933,7 @@ b_visegrad:0 "Višegrad" b_viseslav:0 "Viseslav" b_viseu:0 "Viseu" - b_visingso:0 "Wisinghnsö" + b_visingso:0 "Kaxholmen" b_visoki:0 "Visoki" b_vistino:0 "Vistino" b_vitebsk:0 "Vitebsk" @@ -10979,7 +10979,7 @@ b_vosges:0 "Vosges" b_vosnesjensk:0 "Vosnesjensk" b_vosporo:0 "Vosporo" - b_voss:1 "Vörs" + b_voss:1 "Voss" b_vostan:0 "Vostan" b_vostitsa:0 "Vostitsa" b_vostitza:0 "Vostitza" @@ -11525,8 +11525,8 @@ c_agadir_adj:0 "Agadirian" c_agder:0 "Agder" c_agder_adj:0 "Agderian" - c_agdeside:1 "Vestr Agðir" - c_agdeside_adj:1 "West Agðerian" + c_agdeside:1 "Vest-Agder" + c_agdeside_adj:1 "West Agderian" c_agen:0 "Agen" c_agen_adj:0 "Agenian" c_agenais:1 "Agen" @@ -11800,8 +11800,8 @@ c_aukshayts_adj:0 "Aukshaytsi" c_aunis:0 "Aunis" c_aunis_adj:0 "Rochelle" - c_austisland:1 "Austrland" - c_austisland_adj:0 "East Icelandic" + c_austisland:1 "Austurland" + c_austisland_adj:0 "Austurlander" c_autun:0 "Autun" c_autun_adj:0 "Autunian" c_auvergne:0 "Cantal" @@ -12023,8 +12023,8 @@ c_bornholm_adj:0 "Bornholmian" c_bost:0 "Bost" c_bost_adj:0 "Bostian" - c_bothin:1 "Boðin" - c_bothin_adj:0 "Boðinian" + c_bothin:1 "Helgeland" + c_bothin_adj:0 "Helgelander" c_bouillon:0 "West-Luxembourg" c_bouillon_adj:0 "Bouillonese" c_boullion:0 "Boullion" @@ -12524,8 +12524,8 @@ c_evora_adj:0 "Évoran" c_evreux:1 "Eure" c_evreux_adj:1 "Eurean" - c_eystridalir:1 "Eystridalir" - c_eystridalir_adj:0 "Eystridæler" + c_eystridalir:1 "Østerdalen" + c_eystridalir_adj:0 "Østerdalenian" c_faereyar:1 "Færeyjar" c_faereyar_adj:1 "Faroese" c_falkenstein:0 "Falkenstein" @@ -12571,8 +12571,8 @@ c_finnveden:0 "Finnveden" c_finnveden_adj:0 "Finnvedian" c_firabr:0 "Firabr" - c_firdafylki:1 "Firðafylki" - c_firdafylki_adj:0 "Firðafylkian" + c_firdafylki:1 "Fjordane" + c_firdafylki_adj:0 "Fjordaner" c_firenze:0 "Firenze" c_firenze_adj:0 "Florentine" c_foggia:0 "Foggia" @@ -12634,8 +12634,8 @@ c_gastrikland_adj:0 "Gästriklander" c_gauda:0 "Gauda" c_gauda_adj:0 "Gaudan" - c_gauldala:1 "Gauldælafylki" - c_gauldala_adj:0 "Gauldæler" + c_gauldala:1 "Gauldal" + c_gauldala_adj:0 "Gauldaler" c_gaya:0 "Gaya" c_gaya_adj:0 "Gaya" c_geisenhausen:0 "Geisenhausen" @@ -12727,8 +12727,8 @@ c_grunberg_adj:0 "Grunberger" c_grunningen:0 "Grünningen" c_grunningen_adj:0 "Grünninger" - c_gudbrandsdalir:1 "Guðbrandsdalir" - c_gudbrandsdalir_adj:0 "Guðbrandsdæler" + c_gudbrandsdalir:1 "Gudbrandsdalen" + c_gudbrandsdalir_adj:0 "Gudbrandsdalenian" c_guelders:0 "Guelders" c_guelders_adj:0 "Gueldrian" c_guines:1 "Nord" @@ -12773,8 +12773,8 @@ c_hallein_adj:0 "Halleiner" c_hallstatt:0 "Hallstatt" c_hallstatt_adj:0 "Hallstatter" - c_halogaland:0 "Halogaland" - c_halogaland_adj:0 "Hålogalander" + c_halogaland:0 "Nordland" + c_halogaland_adj:0 "Nordlander" c_halsingland:0 "Halsingland" c_halsingland_adj:0 "Hälsinglander" c_hama:0 "Hama" @@ -12805,8 +12805,8 @@ c_hebron_adj:0 "Hebronian" c_hedmark:0 "Hedmark" c_hedmark_adj:0 "Hedmarkian" - c_hedmork:1 "Heiðmörk" - c_hedmork_adj:0 "Heiðmarkian" + c_hedmork:1 "Hedmark" + c_hedmork_adj:0 "Hedmarkian" c_helgum:0 "Helgum" c_helgum_adj:0 "Helgumer" c_hellas:0 "Hellas" @@ -12852,8 +12852,8 @@ c_homs_adj:0 "Homsian" c_honnore:0 "Honnore" c_honnore_adj:0 "Honnoran" - c_hordalandi:1 "Hörðaland" - c_hordalandi_adj:0 "Hörðalander" + c_hordalandi:1 "Hordaland" + c_hordalandi_adj:0 "Hordalander" c_hormuz:0 "Hormuz" c_hormuz_adj:0 "Hormuzian" c_hotin:0 "Hotin" @@ -13650,8 +13650,8 @@ c_moray_adj:0 "Moravian" c_mordva:0 "Mordva" c_mordva_adj:0 "Mordvian" - c_more:0 "Möre" - c_more_adj:0 "Mörenian" + c_more:0 "Kalmar" + c_more_adj:0 "Kalmarian" c_moskva:0 "Moskva" c_moskva_adj:0 "Muscovite" c_mosul:0 "Mosul" @@ -13710,8 +13710,8 @@ c_nakhshab:0 "Nakhshab" c_naldurg:0 "Naldurg" c_naldurg_adj:0 "Naldurgan" - c_namdalfylki:1 "Naumdælafylki" - c_namdalfylki_adj:0 "Naumdælafylker" + c_namdalfylki:1 "Namdalen" + c_namdalfylki_adj:0 "Namdalenian" c_namur:0 "Namur" c_namur_adj:0 "Namurian" c_nancy:0 "Nancy" @@ -13736,8 +13736,8 @@ c_narbonne_adj:0 "Narbonnian" c_narim:0 "Narim" c_narim_adj:0 "Narimian" - c_narke:0 "Neeric" - c_narke_adj:0 "Närkian" + c_narke:0 "Örebro" + c_narke_adj:0 "Örebroan" c_narva:1 "Virumaa" c_narva_adj:1 "Virumaan" c_nasaiya:0 "Nasaiya" @@ -13760,8 +13760,8 @@ c_naxos_adj:0 "Naxosian" c_neamnt:0 "Neamț" c_neamnt_adj:0 "Neamțian" - c_nedenes:1 "Austr Agðir" - c_nedenes_adj:0 "East Agðer" + c_nedenes:1 "Aust-Agder" + c_nedenes_adj:0 "East Agderian" c_nedersticht:0 "Nedersticht" c_nedersticht_adj:0 "Utrechtian" c_negev:0 "Negev" @@ -13803,8 +13803,8 @@ c_nitra_adj:0 "Nyitran" c_nizhny_novgorod:1 "Obran Osh" c_nizhny_novgorod_adj:1 "Obran Oshan" - c_njudung:0 "Njudung" - c_njudung_adj:0 "Njudunger" + c_njudung:0 "Jönköping" + c_njudung_adj:0 "Jönköpinger" c_nobatia:0 "Nobatia" c_nobatia_adj:1 "Nobatian" c_nordgau:0 "Nordgau" @@ -13824,8 +13824,8 @@ c_northamptonshire_adj:0 "Northamptonian" c_northumberland:0 "Northumberland" c_northumberland_adj:0 "Northumbrian" - c_norwegian_more:1 "Mæri" - c_norwegian_more_adj:0 "Mærran" + c_norwegian_more:1 "Møre og Romsdal" + c_norwegian_more_adj:0 "Mørran" c_nottinghamshire:0 "Nottinghamshire" c_nottinghamshire_adj:0 "Nottinghamian" c_novara:0 "Novara" @@ -14128,8 +14128,8 @@ c_ramhurmuz:0 "Ramhurmuz" c_ranikot:0 "Ranikot" c_ranikot_adj:0 "Ranikotan" - c_raniriki:1 "Elfinn" - c_raniriki_adj:0 "Elfian" + c_raniriki:1 "Bohuslän" + c_raniriki_adj:0 "Bohuslänian" c_ranthambore:0 "Ranthambore" c_ranthambore_adj:0 "Ranthambore" c_raseiniai:0 "Raseiniai" @@ -14211,8 +14211,8 @@ c_rouen_adj:0 "Rouen" c_rouergue:0 "Aveyron" c_rouergue_adj:0 "Aveyronian" - c_rounala:0 "Rounala" - c_rounala_adj:0 "Rounalan" + c_rounala:0 "Romsa" + c_rounala_adj:0 "Romsan" c_rudbar:0 "Rudbar" c_rudbar_adj:0 "Rudbarian" c_rugen:0 "Rügen" @@ -14420,8 +14420,8 @@ c_siwistan_adj:0 "Siwistan" c_sjaelland:2 "Sjælland" c_sjaelland_adj:0 "Sjællander" - c_sjeltie:0 "Sjeltie" - c_sjeltie_adj:0 "Sjeltian" + c_sjeltie:0 "Åsele" + c_sjeltie_adj:0 "Åsele" c_skane:0 "Skåne" c_skane_adj:0 "Scanian" c_skopje:0 "Skopje" @@ -14630,8 +14630,8 @@ c_taza:0 "Taza" c_tecklenburg:0 "Emsland" c_tecklenburg_adj:0 "Emslander" - c_telemark:1 "Þelamörk" - c_telemark_adj:1 "Þelamarkian" + c_telemark:1 "Telemark" + c_telemark_adj:1 "Telemarkian" c_tell_atlas:0 "Tell Atlas" c_tell_atlas_adj:0 "Tell Atlasian" c_tell_bashir:0 "Tell Bashir" @@ -14734,8 +14734,8 @@ c_tourraine:1 "Touraine" c_tourraine_adj:1 "Tourainian" c_trakai:0 "Trakai" - c_trandheim:1 "Þrándheimr" - c_trandheim_adj:0 "Þrænder" + c_trandheim:1 "Trondheim" + c_trandheim_adj:0 "Tronder" c_trans-portage:0 "Trans-Portage" c_trans-portage_adj:0 "Onegian" c_trans:0 "Trans" @@ -14821,8 +14821,8 @@ c_tyrus:0 "Tyrus" c_tyrus_adj:0 "Tyrusian" c_tyumen:0 "Tyumen" - c_ubmejeiednuo:0 "Ubmejeiednuo" - c_ubmejeiednuo_adj:0 "Ubmejeiednuoan" + c_ubmejeiednuo:0 "Umeälven" + c_ubmejeiednuo_adj:0 "Umeälvenian" c_uch:0 "Uch" c_uch_adj:0 "Uch" c_uchangidurga:0 "Uchangidurga" @@ -14899,8 +14899,8 @@ c_varanasi_adj:0 "Varanasi" c_vardhamana:0 "Vardhamāna" c_vardhamana_adj:0 "Vardhamana" - c_varend:0 "Värend" - c_varend_adj:0 "Värender" + c_varend:0 "Kronoberg" + c_varend_adj:0 "Kronoberger" c_varmland:1 "Värmaland" c_varmland_adj:0 "Wermelandian" c_vas:0 "Vas" @@ -14913,8 +14913,8 @@ c_vastergotland_adj:0 "West Geatish" c_vastmanland:0 "Västmannaland" c_vastmanland_adj:0 "Västmanlander" - c_vastvag:1 "Lófótr" - c_vastvag_adj:0 "Lófótnian" + c_vastvag:1 "Lofoten" + c_vastvag_adj:0 "Lofotenian" c_vatapi:0 "Vatapi" c_vatapi_adj:0 "Vatapi" c_vatsagulma:0 "Vatsagulma" @@ -14956,8 +14956,8 @@ c_verviers:0 "Vervieran" c_vestfold:0 "Vestfold" c_vestfold_adj:0 "Vestfolder" - c_vestisland:1 "Vestrland" - c_vestisland_adj:0 "West Icelandic" + c_vestisland:1 "Vesturland" + c_vestisland_adj:0 "Vesturlander" c_vexin:0 "Vexin" c_vexin_adj:0 "Vexinian" c_vhrbosna:1 "Vrhbosna" @@ -14988,8 +14988,8 @@ c_vikramapura_adj:0 "Vikramapuran" c_villach:0 "Villach" c_villach_adj:0 "Villacher" - c_vingulmork:1 "Vingulmörk" - c_vingulmork_adj:0 "Vingulmarkian" + c_vingulmork:1 "Akershus" + c_vingulmork_adj:0 "Akershusian" c_viraja:0 "Viraja" c_viraja_adj:0 "Virajan" c_viscaya:0 "Viscaya" @@ -15198,8 +15198,8 @@ d_aegean_islands_adj:0 "Aegean" d_afar:0 "Afar" d_afar_adj:0 "Afar" - d_agder:1 "Egðafylki" - d_agder_adj:0 "Agðer" + d_agder:1 "Agder" + d_agder_adj:0 "Agderian" d_ajmer:0 "Ajmer" d_akara_dasarna:0 "Akara-Dasarna" d_alan_band:0 "Alan Riders" @@ -15461,8 +15461,8 @@ d_dakhina_desa_adj:1 "Mayan" d_daksina_kosala:0 "Daksina Kosala" d_daksina_kosala_adj:0 "Daksina Kosalan" - d_dalir:1 "Upplönd" - d_dalir_adj:0 "Upplender" + d_dalir:1 "Oppland" + d_dalir_adj:0 "Opplander" d_dalmatia:0 "Dalmatia" d_dalmatia_adj:0 "Dalmatian" d_damascus:0 "Damascus" @@ -15615,8 +15615,8 @@ d_gurjara_mandala_adj:0 "Gurjara Mandalan" d_gwynedd:0 "Gwynedd" d_gwynedd_adj:0 "Gwyneddian" - d_halogaland:1 "Hálogaland" - d_halogaland_adj:0 "Háleygjer" + d_halogaland:1 "Nordland" + d_halogaland_adj:0 "Nordlander" d_hamadan:0 "Hamadan" d_hamadan_adj:0 "Hamadani" d_hanseatic_navy:0 "Baltic Cogs" @@ -15977,8 +15977,8 @@ d_osterreich_pre:0 "Austro" d_ostfalen:0 "Ostfalen" d_ostfalen_adj:0 "Ostfaler" - d_ostlandet:0 "Ostlandet" - d_ostlandet_adj:0 "Ostlander" + d_ostlandet:0 "Østlandet" + d_ostlandet_adj:0 "Østlander" d_ostmark:1 "Nordmark" d_ostmark_adj:1 "Nordmarker" d_ostmark_adj_pommeranian:0 "Brennaburgian" @@ -16284,8 +16284,8 @@ d_toscana_adj:0 "Tuscan" d_toulouse:0 "Toulouse" d_toulouse_adj:0 "Toulousan" - d_trandalog:1 "Þrændalög" - d_transjurania:0 "Transjurania" + d_trandalog:1 "Trøndelag" + d_transjurania:0 "Trøndelager" d_transjurania_adj:0 "Transjuranian" d_transylvania:0 "Transylvania" d_transylvania_adj:0 "Transylvanian" @@ -16368,9 +16368,9 @@ d_veps_adj:0 "Vep" d_verona:0 "Verona" d_verona_adj:0 "Veronian" - d_vestlandet:1 "Gulaþingslög" + d_vestlandet:1 "Vestland" d_vestlandet_adj:0 "Vestlander" - d_vestlandi:1 "Gulaþingslög" + d_vestlandi:1 "Vestland" d_vestlandi_adj:0 "Vestlander" d_victual_brothers:0 "Victual Brothers" d_victual_brothers_adj:0 "Victual" @@ -16378,8 +16378,8 @@ d_vidharba_adj:0 "Vidharban" d_vidin:0 "Vidin" d_vidin_adj:0 "Vidinian" - d_viken:1 "Víkin" - d_viken_adj:0 "Víkverer" + d_viken:1 "Austland" + d_viken_adj:0 "Austlander" d_viscaya:0 "Viscaya" d_viscaya_adj:0 "Viscayan" d_vitebsk:0 "Vitebsk" @@ -24342,10 +24342,10 @@ b_paterswalde:1 "Tapiau" b_kulm:1 "Chełmno" - c_sevede:0 "Sevede" - c_sevede_adj:0 "Sevedian" - c_dalabergslagen:0 "Dalabergslagen" - c_dalabergslagen_adj:0 "Dalabergslagen" + c_sevede:0 "Västervik" + c_sevede_adj:0 "Västerviker" + c_dalabergslagen:0 "Dalarna" + c_dalabergslagen_adj:0 "Darlarnan" c_nordmark:0 "Nordmark" c_nordmark_adj:0 "Nordmarkian" c_kinda:0 "Kinda" @@ -24354,7 +24354,7 @@ c_skara_adj:0 "Skaran" b_opensten:0 "Opensten" b_kindaholm:0 "Kindaholm" - b_stegholm:0 "Stegholm" + b_stegholm:0 "Västervik" b_torsas:0 "Torsås" b_leksand:0 "Leksand" b_grebo2:0 "Grebo" @@ -24462,17 +24462,17 @@ d_vuovdisamieana:0 "Vuovdisámieana" d_vuovdisamieana_adj:0 "Vuovdisámi" - c_nordrland:1 "Norðrland" - c_nordrland_adj:1 "Norðrlander" - c_sudurland:1 "Suðrland" - c_sudurland_adj:1 "Suðrlander" + c_nordrland:1 "Norðurland" + c_nordrland_adj:1 "Norðurlander" + c_sudurland:1 "Suðurland" + c_sudurland_adj:1 "Suðurlander" c_pite:0 "Pite" c_pite_adj:0 "Pitean" c_kittila:0 "Kittila" c_kittila_adj:0 "Kittilan" - c_aviovara:0 "Aviovara" - c_aviovara_adj:0 "Aviovaran" + c_aviovara:0 "Hámmerfeasta" + c_aviovara_adj:0 "Hámmerfeastan" c_suondavara:0 "Suondavara" c_suondavara_adj:0 "Suondavaran" c_skolt:0 "Skolt" @@ -24488,10 +24488,10 @@ b_ski:0 "Ski" b_uddevalla:0 "Uddevalla" - b_olafsvik:1 "Borg á Mýrum" + b_olafsvik:1 "Akranes" b_hofn:0 "Höfn" - b_vopnafjordur:1 "Vopnafjörðr" - b_klaustur:1 "Klaustr" + b_vopnafjordur:1 "Húsavík" + b_klaustur:1 "Klaustur" b_glenelg:0 "Glenelg" b_assynt:0 "Assynt" b_wigton:0 "Wigton" @@ -24879,6 +24879,23 @@ b_waldshut:0 "Waldshut" b_tuttlingen:0 "Tuttlingen" + ###NEOW Scandinavian Titles + c_buskerud:0 "Buskerud" + c_buskerud_adj:0 "Buskerudian" + c_ostfold:0 "Østfold" + c_ostfold_adj:0 "Østfolder" + c_stockholm:0 "Stockholm" + c_stockholm_adj:0 "Stockholmer" + c_orkdala:0 "Orkland" + c_orkdala_adj:0 "Orklander" + d_finnmarku:0 "Finnmárku" + d_finnmarku_adj:0 "Finnmárkan" + 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" + ##NEOW special titles k_sevillian_papacy: "Sevillian Papacy" diff --git a/N3OW/map_data/definition.csv b/N3OW/map_data/definition.csv index 425950e8..2d87cb00 100644 --- a/N3OW/map_data/definition.csv +++ b/N3OW/map_data/definition.csv @@ -9775,7 +9775,7 @@ 9774;177;141;87;;x; 9775;9;144;215;;x; 9776;51;147;88;;x; -#9777;93;150;216;;x; +9777;93;150;216;;x; #9778;135;153;89;;x; #9779;177;156;217;;x; #9780;9;159;90;;x; diff --git a/N3OW/map_data/provinces.png b/N3OW/map_data/provinces.png index 0ac6c4d8..696d359b 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:a1d599c347ebb995c37b57c4922539af95160245107c1ed5bdd5875d65d7025b -size 100825561 +oid sha256:798589f21ef2a878ae5f2f87ffb527dc95aa8444d272cb3e5b392175687a494c +size 1920042