From 7cde42050413801ef02c8a7c79485e623a79982d Mon Sep 17 00:00:00 2001 From: edwardtheelbowhigh <73761109+edwardtheelbowhigh@users.noreply.github.com> Date: Wed, 26 Nov 2025 13:56:47 +0000 Subject: [PATCH] locators --- .../coat_of_arms/01_landed_titles.txt | 677 +++++++++++++++--- .../coat_of_arms/NEOW_dynasties.txt | 51 ++ .../coat_of_arms/NEOW_landed_titles.txt | 156 +++- N3OW/common/landed_titles/alps.txt | 301 ++++---- N3OW/common/landed_titles/france.txt | 5 + .../men_at_arms_types/07_ep3_maa_types.txt | 20 +- .../province_terrain/00_province_terrain.txt | 2 +- .../map/map_object_data/building_locators.txt | 406 ++++++----- N3OW/history/characters/NEOW_e_italia.txt | 4 +- N3OW/history/provinces/e_britannia.txt | 2 +- N3OW/history/titles/k_lombardy_venetio.txt | 2 +- N3OW/history/titles/k_rhodania.txt | 18 +- .../english/regiment_l_english.yml | 346 +++++++++ .../localization/english/titles_l_english.yml | 8 +- 14 files changed, 1539 insertions(+), 459 deletions(-) create mode 100644 N3OW/localization/english/regiment_l_english.yml diff --git a/N3OW/common/coat_of_arms/coat_of_arms/01_landed_titles.txt b/N3OW/common/coat_of_arms/coat_of_arms/01_landed_titles.txt index a58d015b..6ad102ab 100644 --- a/N3OW/common/coat_of_arms/coat_of_arms/01_landed_titles.txt +++ b/N3OW/common/coat_of_arms/coat_of_arms/01_landed_titles.txt @@ -7655,25 +7655,132 @@ k_wales = { } +k_bavaria={ + pattern="pattern_shield_01.dds" + color1=white + color2=blue_light + color3=red + colored_emblem={ + color1=white + texture="ce_block_02.dds" + instance={ + position={ 0.750000 0.480000 } + scale={ 0.510000 0.040000 } + depth=6.010000 + } + instance={ + position={ 0.000000 1.000000 } + depth=9.010000 + } -k_bavaria = { - pattern = "pattern_solid.dds" - color1 = "white" - color2 = "blue" - colored_emblem = { - texture = "ce_panther.dds" - color1 = "blue" - color2 = "red" - color3 = "white" - instance = { position = { 0.5 0.49 } scale = { 0.9 1.0 } } } - colored_emblem = { - texture = "ce_crown_small.dds" - color1 = "yellow" - color2 = "yellow" - instance = { position = { 0.531 0.088 } rotation = 5 scale = { 0.161 0.161 } } + + colored_emblem={ + color1=blue_light + color2=white + texture="ce_lozengy_bend.dds" + mask { 0 2 0 } + instance={ + position={ 0.500000 0.510000 } + scale={ 0.390000 0.450000 } + } + } + + colored_emblem={ + color1=blue_light + color2=yellow + color3=black + texture="ce_panther.dds" + instance={ + position={ 0.290000 0.720000 } + scale={ 0.470000 0.470000 } + depth=5.010000 + } + + } + + colored_emblem={ + color1=yellow_light + color2=red + texture="ce_lion_rampant_holding_sword.dds" + instance={ + position={ 0.290000 0.320000 } + scale={ 0.370000 0.370000 } + depth=4.010000 + } + + } + + colored_emblem={ + color1=white + color2=red + texture="ce_lozengy.dds" + instance={ + position={ 0.860000 0.000000 } + scale={ 0.770000 1.000000 } + depth=11.010000 + } + + } + + colored_emblem={ + color1=red + texture="ce_block_02.dds" + instance={ + position={ 1.000000 0.000000 } + scale={ 1.000000 0.500000 } + depth=10.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_block_02.dds" + instance={ + position={ 1.000000 1.000000 } + depth=7.010000 + } + + } + + colored_emblem={ + color1=black + texture="ce_block_02.dds" + instance={ + position={ 0.000000 0.000000 } + depth=8.010000 + } + + } + + colored_emblem={ + color1=black + color2=red + color3=white + texture="ce_leopard_passant_guardant.dds" + instance={ + position={ 0.710000 0.850000 } + scale={ 0.440000 0.440000 } + depth=1.010000 + } + + instance={ + position={ 0.710000 0.590000 } + scale={ 0.440000 0.440000 } + depth=2.010000 + } + + instance={ + position={ 0.710000 0.720000 } + scale={ 0.440000 0.440000 } + depth=3.010000 + } + + } + } k_bohemia = { @@ -9264,33 +9371,113 @@ k_macedonia={ } k_transylvania={ - custom=yes - pattern="pattern_tricolor_horizontal_01.dds" - color1=blue - color2=red - color3=yellow + pattern="pattern__solid_designer.dds" + color1=rgb { 32 75 115 } + color2=yellow + color3=red + colored_emblem={ + color1=red + texture="ce_block_03.dds" + instance={ + position={ 0.500000 0.480000 } + scale={ 1.000000 0.480000 } + depth=7.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_sun.dds" + instance={ + position={ 0.170000 0.190000 } + scale={ 0.330000 0.330000 } + depth=11.010000 + } + + } + + colored_emblem={ + color1=red + texture="ce_tower.dds" + instance={ + position={ 0.740000 0.650000 } + scale={ 0.230000 0.210000 } + } + + instance={ + position={ 0.260000 0.650000 } + scale={ 0.230000 0.210000 } + depth=1.010000 + } + + instance={ + position={ 0.580000 0.650000 } + scale={ 0.230000 0.210000 } + depth=2.010000 + } + + instance={ + position={ 0.420000 0.650000 } + scale={ 0.230000 0.210000 } + depth=3.010000 + } + + instance={ + position={ 0.660000 0.830000 } + scale={ 0.230000 0.210000 } + depth=4.010000 + } + + instance={ + position={ 0.340000 0.830000 } + scale={ 0.230000 0.210000 } + depth=5.010000 + } + + instance={ + position={ 0.500000 0.830000 } + scale={ 0.230000 0.210000 } + depth=6.010000 + } + + } + + colored_emblem={ + color1=white + texture="ce_crescent.dds" + instance={ + position={ 0.810000 0.170000 } + scale={ 0.300000 0.300000 } + depth=10.010000 + rotation=85 + } + + } + colored_emblem={ color1=black color2=yellow color3=white - texture="ce_eagle.dds" + texture="ce_eagle_small.dds" instance={ - depth=1.010000 + position={ 0.500000 0.400000 } + scale={ 0.810000 0.810000 } + depth=9.010000 } - + } - + colored_emblem={ - color1=red - color2=yellow - texture="ce_per_fess.dds" + color1=yellow + texture="ce_block_02.dds" instance={ - position={ 0.500000 0.665000 } - scale={ 1.000000 0.660000 } + position={ 0.500000 0.940000 } + depth=8.010000 } - + } - + } @@ -15079,18 +15266,91 @@ k_punjab = { } k_dacia = { - pattern = "pattern_solid.dds" - color1 = "red" - color2 = "yellow" - colored_emblem = { - texture = "ce_falcon.dds" - color1 = "yellow" - color2 = "yellow" - color3 = "black" - instance = { position = { 0.5 0.46 } scale = { 0.95 0.95 } } + pattern="pattern_horizontal_split_01.dds" + color1=yellow + color2=blue + color3=black + colored_emblem={ + color1=black + color2=black + color3=white + texture="ce_byzantine_eagle.dds" + instance={ + position={ 0.500000 0.670000 } + scale={ 0.670000 0.700000 } + depth=2.010000 + } + } + + colored_emblem={ + color1=blue + texture="ce_block_02.dds" + instance={ + depth=6.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_circle_mask.dds" + instance={ + position={ 0.470000 0.480000 } + scale={ 0.040000 0.040000 } + depth=3.010000 + } + + } + + colored_emblem={ + color1=green + texture="ce_circle_mask.dds" + instance={ + position={ 0.500000 1.000000 } + scale={ 1.000000 0.400000 } + depth=5.010000 + } + + } + + colored_emblem={ + color1=yellow + color2=yellow + texture="ce_sun.dds" + instance={ + position={ 0.180000 0.220000 } + scale={ 0.220000 0.220000 } + } + + } + + colored_emblem={ + color1=white + texture="ce_crescent.dds" + instance={ + position={ 0.830000 0.220000 } + scale={ 0.290000 0.290000 } + depth=1.010000 + rotation=269 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_cross_patriarchal.dds" + instance={ + position={ 0.410000 0.420000 } + scale={ 0.230000 0.280000 } + depth=4.010000 + } + + } + } + ### d_nyitra = { @@ -18739,15 +18999,102 @@ c_alencon = { } c_rouen = { - pattern = "pattern_solid.dds" - color1 = "red" - color2 = "yellow" - colored_emblem = { - texture = "ce_ordinary_bars_2.dds" - color1 = "yellow" - color2 = "yellow" - instance = { position = { 0.5 0.5 } scale = { 1.0 1.0 } } + pattern="pattern_vertical_split_01.dds" + color1=red + color2=blue + color3=green + colored_emblem={ + color1=yellow + color2=white + texture="ce_gotland_banner.dds" + mask= { 0 2 0 } + instance={ + position={ 0.410000 0.660000 } + scale={ 0.890000 -0.890000 } + rotation=221 + } + } + + colored_emblem={ + color1=blue + texture="ce_block_02.dds" + instance={ + position={ 0.500000 0.160000 } + depth=8.010000 + } + + } + + colored_emblem={ + color1=yellow + color2=yellow + texture="ce_gotland_banner.dds" + instance={ + position={ 0.410000 0.660000 } + scale={ 0.890000 -0.890000 } + depth=2.010000 + rotation=221 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_pagan_circle_frame.dds" + instance={ + position={ 0.290000 0.530000 } + scale={ 0.350000 0.300000 } + depth=3.010000 + } + + } + + colored_emblem={ + color1=white + color2=black + texture="ce_sheep.dds" + instance={ + position={ 0.500000 0.770000 } + scale={ 0.770000 0.770000 } + depth=1.010000 + } + + } + + colored_emblem={ + color1=red + texture="ce_block_02.dds" + instance={ + position={ 0.500000 0.810000 } + depth=7.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_fleur.dds" + instance={ + position={ 0.770000 0.180000 } + scale={ 0.290000 0.290000 } + depth=4.010000 + } + + instance={ + position={ 0.500000 0.180000 } + scale={ 0.290000 0.290000 } + depth=5.010000 + } + + instance={ + position={ 0.230000 0.180000 } + scale={ 0.270000 0.270000 } + depth=6.010000 + } + + } + } c_boulogne = { @@ -32731,91 +33078,189 @@ c_austisland_norse = { } e_nistrenia={ - pattern="pattern_solid.dds" - color1=purple - color2=white - color3=purple - colored_emblem={ - color1=white - texture="ce_waves_04.dds" - instance={ - depth=5.010000 - } + pattern="pattern_solid.dds" + color1=purple + color2=purple + color3=purple + colored_emblem={ + color1=yellow + texture="NEOW_ce_tryzub.dds" + instance={ + position={ 0.540000 0.230000 } + scale={ 0.050000 0.050000 } + depth=2.010000 + } - } + } - colored_emblem={ - color1=blue - texture="ce_block_03.dds" - instance={ - scale={ 1.000000 0.475000 } - depth=6.010000 - } + colored_emblem={ + color1=white + texture="ce_waves_04.dds" + instance={ + depth=13.010000 + } - } + } - colored_emblem={ - color1=red - texture="ce_block_02.dds" - instance={ - position={ 0.500000 1.000000 } - depth=7.010000 - } + colored_emblem={ + color1=black + color2=black + color3=black + texture="ce_bull_head.dds" + instance={ + position={ 0.530000 0.170000 } + scale={ 0.040000 0.040000 } + depth=6.010000 + } - } + } - colored_emblem={ - color1=yellow - texture="ce_chi_rho.dds" - instance={ - position={ 0.200000 0.200000 } - scale={ 0.335000 0.335000 } - } + colored_emblem={ + color1=blue + texture="ce_block_03.dds" + instance={ + scale={ 1.000000 0.475000 } + depth=14.010000 + } - instance={ - position={ 0.800000 0.200000 } - scale={ 0.335000 0.335000 } - depth=1.010000 - } + } - } + colored_emblem={ + color1=grey + color2=grey + color3=grey + texture="ce_flower.dds" + instance={ + position={ 0.510000 0.180000 } + scale={ 0.010000 0.010000 } + depth=5.010000 + } - colored_emblem={ - color1=green - texture="ce_ordinary_pile_inverted.dds" - instance={ - position={ 0.500000 0.240000 } - scale={ 0.115000 0.075000 } - depth=2.010000 - } + } - } + colored_emblem={ + color1=white + texture="ce_cinquefoil_02.dds" + instance={ + position={ 0.500000 0.240000 } + scale={ 0.040000 0.040000 } + depth=1.010000 + } - colored_emblem={ - color1=yellow - color2=blue_light - color3=red - texture="NEOW_ce_eagle_romania.dds" - instance={ - position={ 0.500000 0.210000 } - scale={ 0.355000 0.355000 } - depth=3.010000 - } + } - } + colored_emblem={ + color1=yellow_light + color2=yellow_light + texture="ce_star_05_pierced.dds" + instance={ + position={ 0.530000 0.150000 } + scale={ 0.020000 0.020000 } + depth=4.010000 + } - colored_emblem={ - color1=yellow - texture="ce_star_16.dds" - instance={ - position={ 0.500000 0.995000 } - depth=4.010000 - } + } - } + colored_emblem={ + color1=red + texture="ce_block_02.dds" + instance={ + position={ 0.500000 1.000000 } + depth=15.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_chi_rho.dds" + instance={ + position={ 0.200000 0.200000 } + scale={ 0.335000 0.335000 } + depth=8.010000 + } + + instance={ + position={ 0.800000 0.200000 } + scale={ 0.335000 0.335000 } + depth=9.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_fleur.dds" + instance={ + position={ 0.500000 0.260000 } + scale={ 0.040000 -0.040000 } + } + + } + + colored_emblem={ + color1=green + texture="ce_ordinary_pile_inverted.dds" + instance={ + position={ 0.500000 0.240000 } + scale={ 0.115000 0.075000 } + depth=10.010000 + } + + } + + colored_emblem={ + color1=yellow + color2=red + color3=black + texture="ce_eagle_small.dds" + instance={ + position={ 0.470000 0.170000 } + scale={ 0.050000 0.050000 } + depth=7.010000 + } + + } + + colored_emblem={ + color1=yellow + color2=blue_light + color3=red + texture="NEOW_ce_eagle_romania.dds" + instance={ + position={ 0.500000 0.210000 } + scale={ 0.355000 0.355000 } + depth=11.010000 + } + + } + + colored_emblem={ + color1=white + color2=white + color3=white + texture="ce_knight.dds" + instance={ + position={ 0.460000 0.230000 } + scale={ 0.050000 0.050000 } + depth=3.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_star_16.dds" + instance={ + position={ 0.500000 0.995000 } + depth=12.010000 + } + + } } + k_nikaea={ custom=yes pattern="pattern_solid.dds" diff --git a/N3OW/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt b/N3OW/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt index 3ecde520..e39e2c7d 100644 --- a/N3OW/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt +++ b/N3OW/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt @@ -519,6 +519,30 @@ dynn_britannia_guinness ={ } +belgium_dynasty={ + pattern="pattern_horizontal_split_01.dds" + color1=red + color2=red + color3=red + colored_emblem={ + color1=yellow + color2=red + texture="ce_lion_rampant.dds" + } + + colored_emblem={ + color1=black + texture="ce_block_02.dds" + instance={ + depth=1.010000 + } + + } + +} + + + house_belgium_oranje_nassau_weilburg = { pattern="pattern_barruly_12.dds" color1=blue @@ -7511,6 +7535,33 @@ angelis_dynasty={ } +mose_dynasty ={ + pattern="pattern_checkers_06.dds" + color1=red + color2=white + color3=red + colored_emblem={ + color1=yellow + texture="ce_chief_random.dds" + instance={ + depth=1.010000 + } + + } + + colored_emblem={ + color1=red + color2=white + texture="ce_checkers_06.dds" + instance={ + position={ 0.500000 0.670000 } + scale={ 1.000000 0.720000 } + } + + } + +} + dynn_britannia_harhman={ pattern="pattern_horizontal_split_02.dds" diff --git a/N3OW/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt b/N3OW/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt index f8328366..6058f930 100644 --- a/N3OW/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt +++ b/N3OW/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt @@ -2327,7 +2327,7 @@ d_ardennes={ color1=red texture="ce_chief_random.dds" instance={ - depth=2.010000 + depth=5.010000 } } @@ -2337,9 +2337,31 @@ d_ardennes={ texture="ce_inescutcheon.dds" instance={ position={ 0.500000 0.620000 } + depth=4.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_rake.dds" + instance={ + position={ 0.750000 0.160000 } + scale={ 0.290000 0.290000 } + } + + instance={ + position={ 0.250000 0.150000 } + scale={ 0.290000 0.290000 } depth=1.010000 } + instance={ + position={ 0.500000 0.250000 } + scale={ 0.290000 0.290000 } + depth=2.010000 + } + } colored_emblem={ @@ -2347,7 +2369,7 @@ d_ardennes={ color2=blue_light texture="ce_bendy_06.dds" instance={ - depth=3.010000 + depth=6.010000 } } @@ -2360,6 +2382,7 @@ d_ardennes={ instance={ position={ 0.490000 0.620000 } scale={ 0.480000 0.480000 } + depth=3.010000 } } @@ -2367,6 +2390,7 @@ d_ardennes={ } + d_channel_islands={ pattern="pattern_horizontal_split_01.dds" color1=red @@ -3917,20 +3941,134 @@ e_germany = { } -k_bavaria = { - custom=yes - pattern="pattern_solid.dds" - color1=black - color2=white - color3=blue +k_bavaria={ + pattern="pattern_shield_01.dds" + color1=white + color2=blue_light + color3=red colored_emblem={ color1=white - color2=blue_light + texture="ce_block_02.dds" + instance={ + position={ 0.750000 0.480000 } + scale={ 0.510000 0.040000 } + depth=7.010000 + } + + instance={ + position={ 0.000000 1.000000 } + depth=10.010000 + } + + } + + colored_emblem={ + color1=blue_light + color2=white texture="ce_lozengy_bend.dds" + mask = { 0 2 0 } + instance={ + position={ 0.500000 0.510000 } + scale={ 0.390000 0.450000 } + } + + } + + colored_emblem={ + color1=blue_light + color2=yellow + color3=black + texture="ce_panther.dds" + instance={ + position={ 0.290000 0.720000 } + scale={ 0.470000 0.470000 } + depth=6.010000 + } + + } + + colored_emblem={ + color1=yellow_light + color2=red + texture="ce_lion_rampant_holding_sword.dds" + instance={ + position={ 0.290000 0.320000 } + scale={ 0.370000 0.370000 } + depth=5.010000 + } + + } + + colored_emblem={ + color1=red + texture="ce_block_02.dds" + instance={ + position={ 1.000000 0.000000 } + scale={ 1.000000 0.730000 } + depth=11.010000 + } + + } + + colored_emblem={ + color1=white + texture="ce_fess_dancetty.dds" + instance={ + position={ 1.000000 0.340000 } + scale={ 1.000000 -1.000000 } + depth=1.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_block_02.dds" + instance={ + position={ 1.000000 1.000000 } + depth=8.010000 + } + + } + + colored_emblem={ + color1=black + texture="ce_block_02.dds" + instance={ + position={ 0.000000 0.000000 } + depth=9.010000 + } + + } + + colored_emblem={ + color1=black + color2=red + color3=white + texture="ce_leopard_passant_guardant.dds" + instance={ + position={ 0.710000 0.850000 } + scale={ 0.440000 0.440000 } + depth=2.010000 + } + + instance={ + position={ 0.710000 0.590000 } + scale={ 0.440000 0.440000 } + depth=3.010000 + } + + instance={ + position={ 0.710000 0.720000 } + scale={ 0.440000 0.440000 } + depth=4.010000 + } + } } + e_scandinavia = { pattern="pattern_solid.dds" color1=yellow diff --git a/N3OW/common/landed_titles/alps.txt b/N3OW/common/landed_titles/alps.txt index a1734480..d90c7227 100644 --- a/N3OW/common/landed_titles/alps.txt +++ b/N3OW/common/landed_titles/alps.txt @@ -22,11 +22,6 @@ e_alps = { color = { 255 215 205 } } - b_konstanz = { - province = 2054 - - color = { 230 205 205 } - } b_schwyz = { province = 2461 @@ -35,10 +30,14 @@ e_alps = { } c_basel = { color = { 255 215 205 } - b_basel = { province = 2050 + color = { 255 215 205 } + } + b_aargau = { + province = 9784 + color = { 255 215 205 } } b_delemont = { @@ -50,8 +49,8 @@ e_alps = { province = 9783 color = { 255 215 205 } - } - } + } + } c_aargau = { color = { 150 70 15 } @@ -63,11 +62,6 @@ e_alps = { b_engelberg = { province = 3107 - color = { 255 215 205 } - } - b_aargau = { - province = 9784 - color = { 255 215 205 } } } @@ -76,7 +70,6 @@ e_alps = { color = { 159 40 10 } capital = c_bern - c_bern = { color = { 139 30 10 } @@ -85,11 +78,6 @@ e_alps = { color = { 139 30 10 } } - b_morteau = { - province = 2074 - - color = { 139 10 38 } - } b_biel = { province = 2049 @@ -105,8 +93,12 @@ e_alps = { color = { 135 55 45 } } + b_fribourg = { + province = 9782 - } + color = { 90 5 15 } + } + } c_geneva = { b_geneva = { province = 2035 @@ -121,27 +113,9 @@ e_alps = { b_martigny = { province = 2038 - color = { 90 5 15 } - } - b_fribourg = { - province = 9782 - color = { 90 5 15 } } } - c_ticino = { - color = { 139 30 10 } - b_bellinzona = { - province = 2478 - - color = { 240 175 255 } - } - b_davos = { - province = 9701 - - color = { 139 30 10 } - } - } c_sion = { color = { 139 30 10 } b_thusis = { @@ -165,23 +139,11 @@ e_alps = { } } } - } - k_lichtenstein = { - color = { 3 55 245 } + d_rhaetia = { + color = { 215 190 220 } - capital = c_farduzes - d_lictenstein = { - color = { 3 55 245 } - - capital = c_farduzes - c_farduzes = { - color = { 255 220 220 } - b_farduzes = { - province = 2052 - - color = { 255 220 220 } - } - } + capital = c_chur + c_chur = { color = { 255 220 220 } b_chur = { @@ -200,6 +162,19 @@ e_alps = { color = { 170 150 190 } } } + c_ticino = { + color = { 139 30 10 } + b_bellinzona = { + province = 2478 + + color = { 240 175 255 } + } + b_davos = { + province = 9701 + + color = { 139 30 10 } + } + } c_sankt_gallen = { color = { 230 205 205 } @@ -216,6 +191,124 @@ e_alps = { b_werdenburg = { province = 2788 + color = { 255 220 220 } + } + b_konstanz = { + province = 2054 + + color = { 230 205 205 } + } + } + } + d_savoie = { + color = { 213 214 148 } + color2 = { 255 255 255 } + + capital = c_savoy + cultural_names = { + name_list_occitan=cn_sav_o_grv_ia + name_list_NEOW_provencal=cn_savoio + name_list_NEOW_french=cn_savoie + name_list_arpitan=cn_savou_e_grv_ + } + + c_savoy = { + color = { 225 233 154 } + color2 = { 255 255 255 } + cultural_names = { + name_list_occitan=cn_sav_o_grv_ia + name_list_NEOW_provencal=cn_savoio + name_list_NEOW_french=cn_savoie + name_list_arpitan=cn_savou_e_grv_ + } + + b_chambery = { + province = 8721 + color = { 225 233 154 } + color2 = { 255 255 255 } + cultural_names = { + name_list_arpitan=cn_chamb_e_grv_ri + name_list_NEOW_provencal=cn_chamberi + name_list_occitan=cn_chamber_i_act_ + } + } + b_albertville = { + province = 9711 + color = { 225 133 154 } + color2 = { 255 255 255 } + cultural_names = { + name_list_arpitan=cn_arb_e_grv_rtvela + } + } + b_saint_jean_de_maurienne = { + province = 9712 + color = { 225 133 154 } + color2 = { 255 255 255 } + cultural_names = { + name_list_arpitan=cn_sent_jian_de_m_o_hat_ri_e_grv_na + } + } + b_bourg_saint_maurice = { + province = 9797 + color = { 225 133 154 } + color2 = { 255 255 255 } + cultural_names = { + name_list_arpitan=cn_le_b_o_hat_rg + } + } + } + c_upper_savoy = { + color = { 226 218 92 } + color2 = { 255 255 255 } + cultural_names = { + name_list_occitan=cn_nauta_savoia + name_list_arpitan=cn_savou_e_grv__d_amont + name_list_NEOW_french=cn_haute_savoi + name_list_NEOW_provencal=cn_auto_savoio + } + + b_annecy = { + province = 13276 + color = { 226 118 92 } + color2 = { 255 255 255 } + cultural_names = { + name_list_occitan=cn_aneci + name_list_NEOW_provencal=cn_aneci + name_list_arpitan=cn__e_grv_neci + } + } + b_thonon_les_bains = { + province = 13277 + color = { 226 118 92 } + color2 = { 255 255 255 } + cultural_names = { + name_list_arpitan=cn_tonon + } + } + b_bonneville = { + province = 13278 + color = { 226 118 92 } + color2 = { 255 255 255 } + cultural_names = { + name_list_arpitan=cn_b_o_hat_navela + } + } + } + } + } + k_lichtenstein = { + color = { 3 55 245 } + + capital = c_farduzes + d_lictenstein = { + color = { 3 55 245 } + + capital = c_farduzes + c_farduzes = { + color = { 255 220 220 } + b_farduzes = { + province = 2052 + color = { 255 220 220 } } } @@ -232,8 +325,9 @@ e_alps = { color = { 45 40 45 } } - } + } } + } k_tirol = { color = { 163 155 155 } @@ -321,7 +415,7 @@ e_alps = { d_south_tyrol = { color = { 195 5 5 } - capital = c_innsbruck #De-facto only, actually Tirol + capital = c_bozan #De-facto only, actually Tirol c_trent = { color = { 250 150 220 } @@ -1190,100 +1284,5 @@ e_alps = { } } } - d_savoy = { - color = { 213 214 148 } - color2 = { 255 255 255 } - - capital = c_savoy - cultural_names = { - name_list_occitan=cn_sav_o_grv_ia - name_list_NEOW_provencal=cn_savoio - name_list_NEOW_french=cn_savoie - name_list_arpitan=cn_savou_e_grv_ - } - - c_savoy = { - color = { 225 233 154 } - color2 = { 255 255 255 } - cultural_names = { - name_list_occitan=cn_sav_o_grv_ia - name_list_NEOW_provencal=cn_savoio - name_list_NEOW_french=cn_savoie - name_list_arpitan=cn_savou_e_grv_ - } - - b_chambery = { - province = 8721 - color = { 225 233 154 } - color2 = { 255 255 255 } - cultural_names = { - name_list_arpitan=cn_chamb_e_grv_ri - name_list_NEOW_provencal=cn_chamberi - name_list_occitan=cn_chamber_i_act_ - } - } - b_albertville = { - province = 9711 - color = { 225 133 154 } - color2 = { 255 255 255 } - cultural_names = { - name_list_arpitan=cn_arb_e_grv_rtvela - } - } - b_saint_jean_de_maurienne = { - province = 9712 - color = { 225 133 154 } - color2 = { 255 255 255 } - cultural_names = { - name_list_arpitan=cn_sent_jian_de_m_o_hat_ri_e_grv_na - } - } - b_bourg_saint_maurice = { - province = 9797 - color = { 225 133 154 } - color2 = { 255 255 255 } - cultural_names = { - name_list_arpitan=cn_le_b_o_hat_rg - } - } - } - c_upper_savoy = { - color = { 226 218 92 } - color2 = { 255 255 255 } - cultural_names = { - name_list_occitan=cn_nauta_savoia - name_list_arpitan=cn_savou_e_grv__d_amont - name_list_NEOW_french=cn_haute_savoi - name_list_NEOW_provencal=cn_auto_savoio - } - - b_annecy = { - province = 13276 - color = { 226 118 92 } - color2 = { 255 255 255 } - cultural_names = { - name_list_occitan=cn_aneci - name_list_NEOW_provencal=cn_aneci - name_list_arpitan=cn__e_grv_neci - } - } - b_thonon_les_bains = { - province = 13277 - color = { 226 118 92 } - color2 = { 255 255 255 } - cultural_names = { - name_list_arpitan=cn_tonon - } - } - b_bonneville = { - province = 13278 - color = { 226 118 92 } - color2 = { 255 255 255 } - cultural_names = { - name_list_arpitan=cn_b_o_hat_navela - } - } - } - } } } \ No newline at end of file diff --git a/N3OW/common/landed_titles/france.txt b/N3OW/common/landed_titles/france.txt index de6d0895..8d59310e 100644 --- a/N3OW/common/landed_titles/france.txt +++ b/N3OW/common/landed_titles/france.txt @@ -1378,6 +1378,11 @@ e_france = { color = { 139 10 38 } } + b_morteau = { + province = 2074 + + color = { 139 10 38 } + } } c_dole = { color = { 170 35 70 } diff --git a/N3OW/common/men_at_arms_types/07_ep3_maa_types.txt b/N3OW/common/men_at_arms_types/07_ep3_maa_types.txt index 247423c7..8c635038 100644 --- a/N3OW/common/men_at_arms_types/07_ep3_maa_types.txt +++ b/N3OW/common/men_at_arms_types/07_ep3_maa_types.txt @@ -66,16 +66,15 @@ ayrudzi = { conrois = { type = heavy_cavalry - damage = 100 - toughness = 25 + damage = 125 + toughness = 35 pursuit = 10 screen = 0 - terrain_bonus = { - plains = { damage = 30 } + plains = { damage = 30 toughness = 5 } drylands = { damage = 30 } farmlands = { damage = 30 } - hills = { damage = -20 } + hills = { damage = -10 } mountains = { damage = -75 } desert_mountains = { damage = -75 } wetlands = { damage = -75 toughness = -10 pursuit = -10 } @@ -83,8 +82,9 @@ conrois = { } counters = { - archers = 1 + heavy_infantry = 1 light_cavalry = 1 + peasant_militia = 3 } can_recruit = { @@ -99,10 +99,10 @@ conrois = { harsh_winter = { damage = -25 toughness = -10 } } - buy_cost = { gold = conrois_recruitment_cost } - low_maintenance_cost = { gold = conrois_low_maint_cost } - high_maintenance_cost = { gold = conrois_high_maint_cost } - provision_cost = @provisions_cost_cavalry_cheap + buy_cost = { gold = cataphract_recruitment_cost } + low_maintenance_cost = { gold = cataphract_low_maint_cost } + high_maintenance_cost = { gold = cataphract_high_maint_cost } + provision_cost = @provisions_cost_cavalry_bankrupting stack = 50 ai_quality = { value = @[cultural_maa_extra_ai_score + 35 ] } diff --git a/N3OW/common/province_terrain/00_province_terrain.txt b/N3OW/common/province_terrain/00_province_terrain.txt index 9ad114b4..c06461b7 100644 --- a/N3OW/common/province_terrain/00_province_terrain.txt +++ b/N3OW/common/province_terrain/00_province_terrain.txt @@ -8949,7 +8949,7 @@ default_coastal_sea=coastal_sea 9720=farmlands 9721=hills 9722=farmlands -9723=terraced_hills +9723=plains 9724=forest 9725=forest 9726=farmlands diff --git a/N3OW/gfx/map/map_object_data/building_locators.txt b/N3OW/gfx/map/map_object_data/building_locators.txt index be035a1f..84599d38 100644 --- a/N3OW/gfx/map/map_object_data/building_locators.txt +++ b/N3OW/gfx/map/map_object_data/building_locators.txt @@ -61,7 +61,7 @@ } { id=10 - position={ 568.077637 0.000000 3599.085449 } + position={ 570.077637 0.000000 3592.085449 } rotation={ -0.000000 -0.942645 -0.000000 -0.333796 } scale={ 1.000000 1.000000 1.000000 } } @@ -79,7 +79,7 @@ } { id=13 - position={ 639.077637 0.000000 3593.085449 } + position={ 642.077637 0.000000 3583.085449 } rotation={ -0.000000 -0.932206 -0.000000 0.361929 } scale={ 1.000000 1.000000 1.000000 } } @@ -139,7 +139,7 @@ } { id=23 - position={ 510.050232 0.000000 3469.396973 } + position={ 506.050232 0.000000 3466.396973 } rotation={ -0.000000 -0.759288 -0.000000 0.650755 } scale={ 1.000000 1.000000 1.000000 } } @@ -157,7 +157,7 @@ } { id=26 - position={ 561.701172 0.000000 3517.486816 } + position={ 560.701172 0.000000 3502.486816 } rotation={ -0.000000 -0.695041 -0.000000 -0.718970 } scale={ 1.000000 1.000000 1.000000 } } @@ -181,25 +181,25 @@ } { id=30 - position={ 598.077637 0.000000 3454.085449 } + position={ 593.077637 0.000000 3446.085449 } rotation={ -0.000000 -0.802677 -0.000000 -0.596413 } scale={ 1.000000 1.000000 1.000000 } } { id=31 - position={ 593.077637 0.000000 3470.085449 } + position={ 593.077637 0.000000 3488.085449 } rotation={ -0.000000 -0.994298 -0.000000 0.106636 } scale={ 0.999736 1.000000 0.999736 } } { id=32 - position={ 620.123596 0.000000 3483.348145 } + position={ 617.123596 0.000000 3482.348145 } rotation={ -0.000000 -0.666744 -0.000000 0.745287 } scale={ 1.000369 1.000000 1.000369 } } { id=33 - position={ 553.077637 0.000000 3474.085449 } + position={ 558.077637 0.000000 3482.085449 } rotation={ -0.000000 -0.291994 -0.000000 0.956420 } scale={ 1.000000 1.000000 1.000000 } } @@ -217,7 +217,7 @@ } { id=36 - position={ 585.077637 0.000000 3487.085449 } + position={ 602.077637 0.000000 3470.085449 } rotation={ -0.000000 -0.804918 -0.000000 -0.593387 } scale={ 1.000000 1.000000 1.000000 } } @@ -229,25 +229,25 @@ } { id=38 - position={ 596.746887 0.000000 3404.849609 } + position={ 617.746887 0.000000 3404.849609 } rotation={ -0.000000 -0.438713 -0.000000 -0.898627 } scale={ 1.000000 1.000000 1.000000 } } { id=39 - position={ 604.304199 0.000000 3421.362793 } + position={ 621.304199 0.000000 3422.362793 } rotation={ -0.000000 -0.831416 -0.000000 -0.555651 } scale={ 1.000000 1.000000 1.000000 } } { id=40 - position={ 601.077637 0.000000 3440.085449 } + position={ 611.077637 0.000000 3440.085449 } rotation={ -0.000000 -0.982502 -0.000000 0.186254 } scale={ 1.000000 1.000000 1.000000 } } { id=41 - position={ 550.497681 0.000000 3425.575195 } + position={ 555.497681 0.000000 3425.575195 } rotation={ -0.000000 -0.990707 -0.000000 0.136014 } scale={ 1.000000 1.000000 1.000000 } } @@ -259,19 +259,19 @@ } { id=43 - position={ 576.077637 0.000000 3424.085449 } + position={ 583.077637 0.000000 3409.085449 } rotation={ -0.000000 -0.606154 -0.000000 0.795348 } scale={ 1.000000 1.000000 1.000000 } } { id=44 - position={ 574.077637 0.000000 3400.085449 } + position={ 566.077637 0.000000 3407.085449 } rotation={ -0.000000 -0.396818 -0.000000 -0.917897 } scale={ 1.000000 1.000000 1.000000 } } { id=45 - position={ 464.511353 0.000000 3407.317383 } + position={ 500.511353 0.000000 3421.317383 } rotation={ -0.000000 0.645693 -0.000000 0.763597 } scale={ 1.000000 1.000000 1.000000 } } @@ -283,7 +283,7 @@ } { id=47 - position={ 510.077637 0.000000 3419.085449 } + position={ 520.077637 0.000000 3437.085449 } rotation={ -0.000000 -0.239503 -0.000000 0.970896 } scale={ 1.000000 1.000000 1.000000 } } @@ -301,7 +301,7 @@ } { id=50 - position={ 522.077698 0.000000 3391.086426 } + position={ 522.077698 0.000000 3360.086426 } rotation={ -0.000000 -0.934573 -0.000000 -0.355772 } scale={ 1.000000 1.000000 1.000000 } } @@ -313,19 +313,19 @@ } { id=52 - position={ 429.076477 0.000000 3374.857910 } + position={ 441.076477 0.000000 3402.857910 } rotation={ -0.000000 -0.024724 -0.000000 -0.999694 } scale={ 1.000000 1.000000 1.000000 } } { id=53 - position={ 518.087891 0.000000 3364.270020 } + position={ 495.087891 0.000000 3349.270020 } rotation={ -0.000000 -0.990862 -0.000000 0.134880 } scale={ 1.000000 1.000000 1.000000 } } { id=54 - position={ 485.429047 0.000000 3350.476562 } + position={ 490.429047 0.000000 3375.476562 } rotation={ -0.000000 -0.986391 -0.000000 -0.164415 } scale={ 1.000000 1.000000 1.000000 } } @@ -6625,7 +6625,7 @@ } { id=1513 - position={ 942.379395 0.000000 3277.809570 } + position={ 959.379395 0.000000 3274.809570 } rotation={ -0.000000 -0.365903 -0.000000 0.930653 } scale={ 1.000000 1.000000 1.000000 } } @@ -6643,7 +6643,7 @@ } { id=1516 - position={ 974.791016 0.000000 3305.053223 } + position={ 977.791016 0.000000 3316.053223 } rotation={ -0.000000 -0.977024 -0.000000 0.213127 } scale={ 1.000000 1.000000 1.000000 } } @@ -6697,7 +6697,7 @@ } { id=1525 - position={ 996.077637 0.000000 3391.085449 } + position={ 996.077637 0.000000 3387.085449 } rotation={ -0.000000 -0.862766 -0.000000 -0.505603 } scale={ 1.000000 1.000000 1.000000 } } @@ -6775,7 +6775,7 @@ } { id=1538 - position={ 926.060181 0.000000 3371.805664 } + position={ 928.060181 0.000000 3358.805664 } rotation={ -0.000000 -0.610812 -0.000000 0.791775 } scale={ 1.000000 1.000000 1.000000 } } @@ -6811,7 +6811,7 @@ } { id=1544 - position={ 864.987671 0.000000 3264.020996 } + position={ 890.987671 0.000000 3260.020996 } rotation={ -0.000000 -0.036680 -0.000000 -0.999327 } scale={ 1.000000 1.000000 1.000000 } } @@ -6823,7 +6823,7 @@ } { id=1546 - position={ 889.004761 0.000000 3257.043457 } + position={ 879.004761 0.000000 3251.043457 } rotation={ -0.000000 -0.912017 -0.000000 0.410152 } scale={ 1.000000 1.000000 1.000000 } } @@ -6835,7 +6835,7 @@ } { id=1548 - position={ 840.550964 0.000000 3246.133789 } + position={ 837.550964 0.000000 3239.133789 } rotation={ -0.000000 -0.189968 -0.000000 0.981790 } scale={ 1.000000 1.000000 1.000000 } } @@ -6895,7 +6895,7 @@ } { id=1559 - position={ 863.531189 0.000000 3347.993652 } + position={ 870.531189 0.000000 3345.993652 } rotation={ -0.000000 0.591392 -0.000000 0.806384 } scale={ 1.000000 1.000000 1.000000 } } @@ -7021,7 +7021,7 @@ } { id=1580 - position={ 837.916992 0.000000 3339.460449 } + position={ 826.916992 0.000000 3340.460449 } rotation={ -0.000000 -0.947174 -0.000000 -0.320721 } scale={ 1.000000 1.000000 1.000000 } } @@ -7033,7 +7033,7 @@ } { id=1582 - position={ 841.077637 0.000000 3331.085449 } + position={ 830.077637 0.000000 3325.085449 } rotation={ -0.000000 -0.211494 -0.000000 0.977379 } scale={ 1.000000 1.000000 1.000000 } } @@ -7063,7 +7063,7 @@ } { id=1587 - position={ 937.077637 0.000000 3462.085449 } + position={ 953.077637 0.000000 3470.085449 } rotation={ -0.000000 -0.991343 -0.000000 -0.131295 } scale={ 1.000000 1.000000 1.000000 } } @@ -7099,7 +7099,7 @@ } { id=1593 - position={ 859.234436 0.000000 3499.402344 } + position={ 859.234436 0.000000 3490.402344 } rotation={ -0.000000 -0.234258 -0.000000 -0.972174 } scale={ 1.000000 1.000000 1.000000 } } @@ -7117,13 +7117,13 @@ } { id=1596 - position={ 932.077637 0.000000 3525.085449 } + position={ 944.077637 0.000000 3532.085449 } rotation={ -0.000000 -0.869999 -0.000000 0.493053 } scale={ 1.000000 1.000000 1.000000 } } { id=1597 - position={ 918.077637 0.000000 3534.085449 } + position={ 921.077637 0.000000 3539.085449 } rotation={ -0.000000 -0.279146 -0.000000 -0.960249 } scale={ 1.000000 1.000000 1.000000 } } @@ -7135,7 +7135,7 @@ } { id=1599 - position={ 892.153137 0.000000 3504.414551 } + position={ 904.153137 0.000000 3495.414551 } rotation={ -0.000000 -0.516104 -0.000000 0.856526 } scale={ 1.000000 1.000000 1.000000 } } @@ -7147,19 +7147,19 @@ } { id=1601 - position={ 938.077637 0.000000 3402.085449 } + position={ 947.077637 0.000000 3402.085449 } rotation={ -0.000000 -0.735341 -0.000000 -0.677697 } scale={ 1.000000 1.000000 1.000000 } } { id=1602 - position={ 909.771973 0.000000 3380.780762 } + position={ 925.771973 0.000000 3374.780762 } rotation={ -0.000000 -0.815335 -0.000000 0.578990 } scale={ 1.000000 1.000000 1.000000 } } { id=1603 - position={ 852.077637 0.000000 3370.085449 } + position={ 859.077637 0.000000 3370.085449 } rotation={ -0.000000 -0.566173 -0.000000 0.824286 } scale={ 1.000000 1.000000 1.000000 } } @@ -7171,13 +7171,13 @@ } { id=1605 - position={ 845.077637 0.000000 3392.085449 } + position={ 843.077637 0.000000 3397.085449 } rotation={ -0.000000 -0.561203 -0.000000 0.827678 } scale={ 1.000000 1.000000 1.000000 } } { id=1606 - position={ 887.992004 0.000000 3570.596680 } + position={ 898.992004 0.000000 3572.596680 } rotation={ -0.000000 -0.812209 -0.000000 -0.583366 } scale={ 1.000000 1.000000 1.000000 } } @@ -7369,7 +7369,7 @@ } { id=1639 - position={ 806.077637 0.000000 3498.085449 } + position={ 834.077637 0.000000 3504.085449 } rotation={ -0.000000 -0.161493 -0.000000 0.986874 } scale={ 1.000000 1.000000 1.000000 } } @@ -7381,7 +7381,7 @@ } { id=1641 - position={ 819.077637 0.000000 3475.085449 } + position={ 812.077637 0.000000 3477.085449 } rotation={ -0.000000 -0.693016 -0.000000 0.720923 } scale={ 1.000000 1.000000 1.000000 } } @@ -7585,7 +7585,7 @@ } { id=1675 - position={ 849.077637 0.000000 3639.085449 } + position={ 860.077637 0.000000 3644.085449 } rotation={ -0.000000 -0.004931 -0.000000 -0.999988 } scale={ 1.000000 1.000000 1.000000 } } @@ -7615,7 +7615,7 @@ } { id=1680 - position={ 736.077637 0.000000 3605.085449 } + position={ 733.077637 0.000000 3620.085449 } rotation={ -0.000000 -0.938390 -0.000000 -0.345578 } scale={ 1.000000 1.000000 1.000000 } } @@ -7675,7 +7675,7 @@ } { id=1690 - position={ 694.077637 0.000000 3653.085449 } + position={ 700.077637 0.000000 3636.085449 } rotation={ -0.000000 -0.355785 -0.000000 -0.934568 } scale={ 1.000000 1.000000 1.000000 } } @@ -7693,7 +7693,7 @@ } { id=1693 - position={ 644.418152 0.000000 3819.746094 } + position={ 666.418152 0.000000 3840.746094 } rotation={ -0.000000 -0.916185 -0.000000 -0.400756 } scale={ 1.000000 1.000000 1.000000 } } @@ -7705,19 +7705,19 @@ } { id=1695 - position={ 728.077637 0.000000 3670.085449 } + position={ 741.077637 0.000000 3667.085449 } rotation={ -0.000000 -0.999758 -0.000000 -0.022018 } scale={ 1.000000 1.000000 1.000000 } } { id=1696 - position={ 753.029846 0.000000 3666.854492 } + position={ 754.029846 0.000000 3661.854492 } rotation={ -0.000000 -0.620903 -0.000000 -0.783888 } scale={ 1.000000 1.000000 1.000000 } } { id=1697 - position={ 752.077637 0.000000 3684.085449 } + position={ 754.077637 0.000000 3678.085449 } rotation={ -0.000000 -0.996400 -0.000000 -0.084773 } scale={ 1.000378 1.000000 1.000378 } } @@ -7897,25 +7897,25 @@ } { id=1727 - position={ 809.992493 0.000000 3652.386230 } + position={ 815.992493 0.000000 3659.386230 } rotation={ -0.000000 -0.302573 -0.000000 0.953126 } scale={ 1.000000 1.000000 1.000000 } } { id=1728 - position={ 832.077637 0.000000 3657.085449 } + position={ 833.077637 0.000000 3662.085449 } rotation={ -0.000000 -0.999277 -0.000000 0.038032 } scale={ 0.999892 1.000000 0.999892 } } { id=1729 - position={ 831.281494 0.000000 3644.779785 } + position={ 833.281494 0.000000 3640.779785 } rotation={ -0.000000 -0.676985 -0.000000 -0.735997 } scale={ 1.000000 1.000000 1.000000 } } { id=1730 - position={ 799.878662 0.000000 3643.521973 } + position={ 810.878662 0.000000 3643.521973 } rotation={ -0.000000 0.240168 -0.000000 -0.970731 } scale={ 1.000000 1.000000 1.000000 } } @@ -7927,13 +7927,13 @@ } { id=1732 - position={ 798.377075 0.000000 3660.571777 } + position={ 795.377075 0.000000 3654.571777 } rotation={ -0.000000 -0.999958 -0.000000 -0.009213 } scale={ 1.000000 1.000000 1.000000 } } { id=1733 - position={ 769.077637 0.000000 3665.085449 } + position={ 784.077637 0.000000 3665.085449 } rotation={ -0.000000 -0.801714 -0.000000 -0.597708 } scale={ 1.000000 1.000000 1.000000 } } @@ -7951,13 +7951,13 @@ } { id=1736 - position={ 785.655212 0.000000 3686.876953 } + position={ 792.655212 0.000000 3686.876953 } rotation={ -0.000000 -0.710985 -0.000000 0.703207 } scale={ 1.000060 1.000000 1.000060 } } { id=1737 - position={ 768.829163 0.000000 3624.453125 } + position={ 778.829163 0.000000 3618.453125 } rotation={ -0.000000 -0.453342 -0.000000 -0.891337 } scale={ 1.000000 1.000000 1.000000 } } @@ -9811,7 +9811,7 @@ } { id=2046 - position={ 1341.975098 0.000000 2892.298340 } + position={ 1360.975098 0.000000 2894.298340 } rotation={ -0.000000 -0.961812 -0.000000 -0.273709 } scale={ 1.000000 1.000000 1.000000 } } @@ -9823,13 +9823,13 @@ } { id=2048 - position={ 1381.077637 0.000000 2889.085449 } + position={ 1389.077637 0.000000 2909.085449 } rotation={ -0.000000 -0.301777 -0.000000 -0.953379 } scale={ 1.000000 1.000000 1.000000 } } { id=2049 - position={ 1367.245850 0.000000 2907.534668 } + position={ 1363.245850 0.000000 2915.534668 } rotation={ -0.000000 -0.308521 -0.000000 -0.951218 } scale={ 1.000000 1.000000 1.000000 } } @@ -9859,7 +9859,7 @@ } { id=2054 - position={ 1440.077637 0.000000 2937.085449 } + position={ 1448.077637 0.000000 2945.085449 } rotation={ -0.000000 -0.986286 -0.000000 -0.165048 } scale={ 1.000000 1.000000 1.000000 } } @@ -10129,7 +10129,7 @@ } { id=2099 - position={ 1258.077637 0.000000 3238.085449 } + position={ 1275.077637 0.000000 3236.085449 } rotation={ -0.000000 -0.205447 -0.000000 0.978668 } scale={ 1.000000 1.000000 1.000000 } } @@ -10165,7 +10165,7 @@ } { id=2105 - position={ 1214.077637 0.000000 3224.085449 } + position={ 1224.077637 0.000000 3239.085449 } rotation={ -0.000000 -0.976169 -0.000000 -0.217013 } scale={ 1.000000 1.000000 1.000000 } } @@ -10309,19 +10309,19 @@ } { id=2129 - position={ 1069.538330 0.000000 3233.657715 } + position={ 1043.538330 0.000000 3237.657715 } rotation={ 0.000000 0.536156 0.000000 0.844119 } scale={ 0.999825 1.000000 0.999825 } } { id=2130 - position={ 1053.077637 0.000000 3231.085449 } + position={ 1071.077637 0.000000 3243.085449 } rotation={ -0.000000 -0.057135 -0.000000 -0.998366 } scale={ 1.000000 1.000000 1.000000 } } { id=2131 - position={ 1088.538330 0.000000 3234.657715 } + position={ 1094.538330 0.000000 3243.657715 } rotation={ 0.000000 -0.604551 0.000000 0.796566 } scale={ 0.999865 1.000000 0.999865 } } @@ -10333,7 +10333,7 @@ } { id=2133 - position={ 1078.550903 0.000000 3211.882812 } + position={ 1077.550903 0.000000 3222.882812 } rotation={ -0.000000 -0.501178 -0.000000 0.865344 } scale={ 1.000000 1.000000 1.000000 } } @@ -10345,13 +10345,13 @@ } { id=2135 - position={ 1058.642456 0.000000 3191.005371 } + position={ 1062.642456 0.000000 3202.005371 } rotation={ -0.000000 -0.063696 -0.000000 0.997969 } scale={ 1.000000 1.000000 1.000000 } } { id=2136 - position={ 1041.092651 0.000000 3190.837402 } + position={ 1033.092651 0.000000 3183.837402 } rotation={ -0.000000 -0.657647 -0.000000 -0.753326 } scale={ 1.000000 1.000000 1.000000 } } @@ -10441,7 +10441,7 @@ } { id=2151 - position={ 832.077637 0.000000 2947.085449 } + position={ 855.077637 0.000000 2951.085449 } rotation={ -0.000000 -0.521222 -0.000000 -0.853421 } scale={ 1.000000 1.000000 1.000000 } } @@ -10555,7 +10555,7 @@ } { id=2170 - position={ 900.077637 0.000000 3106.085449 } + position={ 898.077637 0.000000 3125.085449 } rotation={ -0.000000 -0.156338 -0.000000 0.987704 } scale={ 1.000000 1.000000 1.000000 } } @@ -10573,7 +10573,7 @@ } { id=2173 - position={ 924.425049 0.000000 3093.195312 } + position={ 899.425049 0.000000 3095.195312 } rotation={ -0.000000 -0.997627 -0.000000 -0.068854 } scale={ 1.000000 1.000000 1.000000 } } @@ -10597,7 +10597,7 @@ } { id=2177 - position={ 994.267029 0.000000 3151.776855 } + position={ 1004.267029 0.000000 3160.776855 } rotation={ -0.000000 -0.013111 -0.000000 -0.999914 } scale={ 1.000000 1.000000 1.000000 } } @@ -11917,19 +11917,19 @@ } { id=2397 - position={ 1155.667847 0.000000 3140.850098 } + position={ 1154.667847 0.000000 3152.850098 } rotation={ -0.000000 -0.669383 -0.000000 -0.742917 } scale={ 1.000000 1.000000 1.000000 } } { id=2398 - position={ 1110.077637 0.000000 3123.085449 } + position={ 1121.077637 0.000000 3124.085449 } rotation={ -0.000000 -0.072619 -0.000000 0.997360 } scale={ 1.000000 1.000000 1.000000 } } { id=2399 - position={ 1137.381226 0.000000 3128.288086 } + position={ 1141.381226 0.000000 3133.288086 } rotation={ -0.000000 -0.188442 -0.000000 -0.982085 } scale={ 1.000000 1.000000 1.000000 } } @@ -12157,7 +12157,7 @@ } { id=2437 - position={ 1402.077637 0.000000 3433.085449 } + position={ 1413.077637 0.000000 3440.085449 } rotation={ -0.000000 -0.730219 -0.000000 0.683213 } scale={ 1.000000 1.000000 1.000000 } } @@ -12223,7 +12223,7 @@ } { id=2448 - position={ 1283.077637 0.000000 3178.085449 } + position={ 1277.077637 0.000000 3200.085449 } rotation={ -0.000000 -0.231013 -0.000000 0.972951 } scale={ 1.000000 1.000000 1.000000 } } @@ -12301,7 +12301,7 @@ } { id=2461 - position={ 1415.077637 0.000000 2911.085449 } + position={ 1427.077637 0.000000 2909.085449 } rotation={ -0.000000 -0.999998 -0.000000 0.001911 } scale={ 1.000000 1.000000 1.000000 } } @@ -12403,7 +12403,7 @@ } { id=2478 - position={ 1453.077637 0.000000 2841.085449 } + position={ 1442.077637 0.000000 2830.085449 } rotation={ -0.000000 -0.360345 -0.000000 0.932819 } scale={ 1.000000 1.000000 1.000000 } } @@ -13795,7 +13795,7 @@ } { id=2720 - position={ 1329.077637 0.000000 2967.085449 } + position={ 1337.077637 0.000000 2983.085449 } rotation={ -0.000000 -0.156795 -0.000000 0.987631 } scale={ 1.000000 1.000000 1.000000 } } @@ -14197,7 +14197,7 @@ } { id=2790 - position={ 1522.077637 0.000000 2909.085449 } + position={ 1507.077637 0.000000 2907.085449 } rotation={ -0.000000 -0.718397 -0.000000 0.695633 } scale={ 1.000000 1.000000 1.000000 } } @@ -47155,13 +47155,13 @@ } { id=8741 - position={ 651.077637 0.000000 3555.085449 } + position={ 665.077637 0.000000 3558.085449 } rotation={ 0.000000 0.673438 0.000000 0.739244 } scale={ 1.000000 1.000000 1.000000 } } { id=8742 - position={ 598.077637 0.000000 3539.085449 } + position={ 598.077637 0.000000 3563.085449 } rotation={ 0.000000 0.028252 0.000000 -0.999601 } scale={ 1.000000 1.000000 1.000000 } } @@ -47173,13 +47173,13 @@ } { id=8744 - position={ 555.077637 0.000000 3499.085449 } + position={ 567.077637 0.000000 3533.085449 } rotation={ 0.000000 0.194819 0.000000 0.980839 } scale={ 1.000000 1.000000 1.000000 } } { id=8745 - position={ 532.077637 0.000000 3509.085449 } + position={ 538.077637 0.000000 3509.085449 } rotation={ 0.000000 0.999615 0.000000 -0.027753 } scale={ 1.000000 1.000000 1.000000 } } @@ -47191,7 +47191,7 @@ } { id=8747 - position={ 532.077637 0.000000 3482.085449 } + position={ 535.077637 0.000000 3482.085449 } rotation={ 0.000000 0.964582 0.000000 0.263783 } scale={ 1.000000 1.000000 1.000000 } } @@ -50311,7 +50311,7 @@ } { id=9271 - position={ 5834.077637 0.000000 2152.085449 } + position={ 833.077637 0.000000 3468.085449 } rotation={ 0.000000 0.373556 0.000000 0.927608 } scale={ 1.000000 1.000000 1.000000 } } @@ -52543,7 +52543,7 @@ } { id=9648 - position={ 5407.077637 0.000000 1520.085571 } + position={ 435.077637 0.000000 3370.085571 } rotation={ 0.000000 0.400196 0.000000 0.916429 } scale={ 1.000000 1.000000 1.000000 } } @@ -52597,7 +52597,7 @@ } { id=9657 - position={ 5775.077637 0.000000 1816.085571 } + position={ 575.077637 0.000000 3604.085571 } rotation={ 0.000000 0.790032 0.000000 -0.613065 } scale={ 1.000000 1.000000 1.000000 } } @@ -52614,62 +52614,140 @@ scale={ 1.000000 1.000000 1.000000 } } { - id=9669 - position={ 7062.077637 0.000000 2289.085449 } + id=9662 + position={ 597.077637 0.000000 3199.085449 } + rotation={ 0.000000 0.440934 0.000000 0.897540 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9663 + position={ 824.077637 0.000000 3120.085449 } + rotation={ 0.000000 0.440934 0.000000 0.897540 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9664 + position={ 798.077637 0.000000 3142.085449 } + rotation={ 0.000000 0.440934 0.000000 0.897540 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9665 + position={ 808.077637 0.000000 3139.085449 } + rotation={ 0.000000 0.440934 0.000000 0.897540 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9666 + position={ 820.077637 0.000000 3163.085449 } + rotation={ 0.000000 0.440934 0.000000 0.897540 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9667 + position={ 600.077637 0.000000 3540.085449 } + rotation={ 0.000000 0.440934 0.000000 0.897540 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9668 + position={ 650.077637 0.000000 3526.085449 } rotation={ 0.000000 0.099425 0.000000 -0.995045 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9669 + position={ 575.077637 0.000000 3570.085449 } + rotation={ 0.000000 0.099425 0.000000 -0.995045 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9670 + position={ 590.077637 0.000000 3582.085449 } + rotation={ 0.000000 0.099425 0.000000 -0.995045 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9671 + position={ 585.077637 0.000000 3543.085449 } + rotation={ 0.000000 0.711894 0.000000 0.702287 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9672 + position={ 614.077637 0.000000 3600.085449 } + rotation={ 0.000000 0.711894 0.000000 0.702287 } + scale={ 1.000000 1.000000 1.000000 } + } { id=9673 - position={ 7050.077637 0.000000 2268.085449 } + position={ 644.077637 0.000000 3602.085449 } rotation={ 0.000000 0.711894 0.000000 0.702287 } scale={ 1.000000 1.000000 1.000000 } } { id=9674 - position={ 7103.077637 0.000000 2280.085449 } + position={ 645.077637 0.000000 3555.085449 } rotation={ 0.000000 0.077218 0.000000 -0.997014 } scale={ 1.000000 1.000000 1.000000 } } { id=9675 - position={ 7090.077637 0.000000 2240.085449 } + position={ 574.077637 0.000000 3611.085449 } rotation={ 0.000000 0.709051 0.000000 -0.705157 } scale={ 1.000000 1.000000 1.000000 } } { id=9676 - position={ 5928.077637 0.000000 1117.085571 } + position={ 552.077637 0.000000 3524.085571 } rotation={ 0.000000 0.455445 0.000000 0.890264 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9677 + position={ 583.077637 0.000000 3524.085571 } + rotation={ 0.000000 0.455445 0.000000 0.890264 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=9678 + position={ 500.077637 0.000000 3517.085571 } + rotation={ 0.000000 0.455445 0.000000 0.890264 } + scale={ 1.000000 1.000000 1.000000 } + } { id=9679 - position={ 7157.077637 0.000000 2330.085449 } + position={ 636.077637 0.000000 3479.085449 } rotation={ 0.000000 0.999892 0.000000 0.014724 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9680 + position={ 594.077637 0.000000 3419.085449 } + rotation={ 0.000000 0.999892 0.000000 0.014724 } + scale={ 1.000000 1.000000 1.000000 } + } { id=9681 - position={ 6616.077637 0.000000 1019.085571 } + position={ 573.077637 0.000000 3467.085571 } rotation={ 0.000000 0.935039 0.000000 -0.354546 } scale={ 1.000000 1.000000 1.000000 } } { id=9682 - position={ 7102.077637 0.000000 2306.085449 } + position={ 552.077637 0.000000 3443.085449 } rotation={ 0.000000 0.430103 0.000000 0.902780 } scale={ 1.000000 1.000000 1.000000 } } { id=9683 - position={ 7129.077637 0.000000 2314.085449 } + position={ 476.077637 0.000000 3416.085449 } rotation={ 0.000000 0.917461 0.000000 0.397826 } scale={ 1.000000 1.000000 1.000000 } } { id=9684 - position={ 7091.077637 0.000000 2338.085449 } + position={ 437.077637 0.000000 3367.085449 } rotation={ 0.000000 0.291007 0.000000 0.956721 } scale={ 1.000000 1.000000 1.000000 } } @@ -52729,91 +52807,91 @@ } { id=9694 - position={ 7065.593750 0.000000 2997.133789 } + position={ 748.593750 0.000000 3619.133789 } rotation={ 0.000000 0.873233 0.000000 0.487303 } scale={ 1.000000 1.000000 1.000000 } } { id=9695 - position={ 7008.077637 0.000000 2978.085449 } + position={ 733.077637 0.000000 3672.085449 } rotation={ 0.000000 0.245242 0.000000 0.969462 } scale={ 1.000000 1.000000 1.000000 } } { id=9696 - position={ 7035.077637 0.000000 2955.085449 } + position={ 608.077637 0.000000 3770.085449 } rotation={ 0.000000 0.161431 0.000000 -0.986884 } scale={ 1.000000 1.000000 1.000000 } } { id=9697 - position={ 6990.077637 0.000000 2947.085449 } + position={ 639.077637 0.000000 3816.085449 } rotation={ 0.000000 0.956371 0.000000 0.292156 } scale={ 1.000000 1.000000 1.000000 } } { id=9698 - position={ 6954.077637 0.000000 2969.085449 } + position={ 1277.077637 0.000000 3348.085449 } rotation={ 0.000000 0.822731 0.000000 -0.568431 } scale={ 1.000000 1.000000 1.000000 } } { id=9699 - position={ 6911.077637 0.000000 2970.085449 } + position={ 1288.077637 0.000000 3366.085449 } rotation={ 0.000000 0.626362 0.000000 -0.779533 } scale={ 1.000000 1.000000 1.000000 } } { id=9700 - position={ 6933.077637 0.000000 2951.085449 } + position={ 1391.077637 0.000000 2845.085449 } rotation={ 0.000000 0.518448 0.000000 -0.855109 } scale={ 1.000000 1.000000 1.000000 } } { id=9701 - position={ 6959.077637 0.000000 2937.085449 } + position={ 1452.077637 0.000000 2842.085449 } rotation={ 0.000000 0.807692 0.000000 0.589604 } scale={ 1.000000 1.000000 1.000000 } } { id=9702 - position={ 6886.077637 0.000000 2960.085449 } + position={ 1492.077637 0.000000 2830.085449 } rotation={ 0.000000 0.900017 0.000000 0.435854 } scale={ 1.000000 1.000000 1.000000 } } { id=9703 - position={ 6873.077637 0.000000 2935.085449 } + position={ 1520.077637 0.000000 2835.085449 } rotation={ 0.000000 0.972349 0.000000 0.233532 } scale={ 1.000000 1.000000 1.000000 } } { id=9704 - position={ 6895.077637 0.000000 2922.085449 } + position={ 1512.077637 0.000000 2875.085449 } rotation={ 0.000000 0.857455 0.000000 -0.514560 } scale={ 1.000000 1.000000 1.000000 } } { id=9705 - position={ 6903.077637 0.000000 2943.085449 } + position={ 1528.077637 0.000000 2910.085449 } rotation={ 0.000000 0.784113 0.000000 0.620618 } scale={ 1.000000 1.000000 1.000000 } } { id=9706 - position={ 6911.077637 0.000000 2903.085449 } + position={ 1546.077637 0.000000 2891.085449 } rotation={ 0.000000 0.987788 0.000000 0.155802 } scale={ 1.000000 1.000000 1.000000 } } { id=9707 - position={ 7140.077637 0.000000 2576.085449 } + position={ 1639.077637 0.000000 2844.085449 } rotation={ 0.000000 0.732367 0.000000 -0.680910 } scale={ 1.000000 1.000000 1.000000 } } { id=9708 - position={ 6858.077637 0.000000 2887.085449 } + position={ 1694.077637 0.000000 2844.085449 } rotation={ 0.000000 0.954186 0.000000 -0.299214 } scale={ 1.000000 1.000000 1.000000 } } @@ -52825,7 +52903,7 @@ } { id=9710 - position={ 6883.077637 0.000000 2874.085449 } + position={ 1517.077637 0.000000 2809.085449 } rotation={ 0.000000 0.395034 0.000000 -0.918666 } scale={ 1.000000 1.000000 1.000000 } } @@ -52843,157 +52921,163 @@ } { id=9713 - position={ 6298.929199 0.000000 2349.758301 } + position={ 1419.929199 0.000000 2830.758301 } rotation={ 0.000000 0.835271 0.000000 -0.549838 } scale={ 1.000000 1.000000 1.000000 } } { id=9714 - position={ 6331.286133 0.000000 2357.026855 } + position={ 895.286133 0.000000 3585.026855 } rotation={ 0.000000 0.688588 0.000000 -0.725153 } scale={ 1.000000 1.000000 1.000000 } } { id=9715 - position={ 6349.077637 0.000000 2330.085449 } + position={ 871.077637 0.000000 3589.085449 } rotation={ 0.000000 0.771145 0.000000 0.636660 } scale={ 1.000000 1.000000 1.000000 } } { id=9716 - position={ 6344.077637 0.000000 2348.085449 } + position={ 880.077637 0.000000 3555.085449 } rotation={ 0.000000 0.987898 0.000000 -0.155103 } scale={ 1.000000 1.000000 1.000000 } } { id=9717 - position={ 6369.077637 0.000000 2362.085449 } + position={ 843.077637 0.000000 3560.085449 } rotation={ 0.000000 0.990929 0.000000 0.134385 } scale={ 1.000000 1.000000 1.000000 } } { id=9718 - position={ 6363.077637 0.000000 2339.085449 } + position={ 821.077637 0.000000 3555.085449 } rotation={ 0.000000 0.453538 0.000000 0.891237 } scale={ 1.000000 1.000000 1.000000 } } { id=9719 - position={ 6383.077637 0.000000 2343.085449 } + position={ 806.077637 0.000000 3491.085449 } rotation={ 0.000000 0.571240 0.000000 -0.820783 } scale={ 1.000000 1.000000 1.000000 } } { id=9720 - position={ 6398.077637 0.000000 2322.085449 } + position={ 806.077637 0.000000 3460.085449 } rotation={ 0.000000 0.807493 0.000000 -0.589878 } scale={ 1.000000 1.000000 1.000000 } } { id=9721 - position={ 6349.077637 0.000000 2311.085449 } + position={ 832.077637 0.000000 3465.085449 } rotation={ 0.000000 0.999241 0.000000 0.038944 } scale={ 1.000000 1.000000 1.000000 } } { id=9722 - position={ 6406.077637 0.000000 2273.085449 } + position={ 925.077637 0.000000 3519.085449 } rotation={ 0.000000 0.440934 0.000000 0.897540 } scale={ 1.000000 1.000000 1.000000 } } + { + id=9723 + position={ 823.077637 0.000000 3408.085449 } + rotation={ 0.000000 0.440934 0.000000 0.897540 } + scale={ 1.000000 1.000000 1.000000 } + } { id=9724 - position={ 6405.077637 0.000000 2248.085449 } + position={ 843.077637 0.000000 3377.085449 } rotation={ 0.000000 0.928496 0.000000 0.371343 } scale={ 1.000000 1.000000 1.000000 } } { id=9725 - position={ 6369.077637 0.000000 2276.085449 } + position={ 844.077637 0.000000 3360.085449 } rotation={ 0.000000 0.741812 0.000000 -0.670608 } scale={ 1.000000 1.000000 1.000000 } } { id=9726 - position={ 6343.077637 0.000000 2270.085449 } + position={ 855.077637 0.000000 3405.085449 } rotation={ 0.000000 0.571796 0.000000 0.820396 } scale={ 1.000000 1.000000 1.000000 } } { id=9727 - position={ 6347.077637 0.000000 2249.085449 } + position={ 861.077637 0.000000 3355.085449 } rotation={ 0.000000 0.968313 0.000000 0.249740 } scale={ 1.000000 1.000000 1.000000 } } { id=9728 - position={ 6364.077637 0.000000 2232.085449 } + position={ 812.077637 0.000000 3284.085449 } rotation={ 0.000000 0.386590 0.000000 0.922252 } scale={ 1.000000 1.000000 1.000000 } } { id=9729 - position={ 6395.077637 0.000000 2231.085449 } + position={ 787.077637 0.000000 3285.085449 } rotation={ 0.000000 0.125588 0.000000 -0.992082 } scale={ 1.000000 1.000000 1.000000 } } { id=9730 - position={ 6406.077637 0.000000 2213.085449 } + position={ 848.077637 0.000000 3338.085449 } rotation={ 0.000000 0.000104 0.000000 -1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=9731 - position={ 6400.077637 0.000000 2196.085449 } + position={ 866.077637 0.000000 3260.085449 } rotation={ 0.000000 0.033861 0.000000 0.999427 } scale={ 1.000000 1.000000 1.000000 } } { id=9732 - position={ 6418.077637 0.000000 2250.085449 } + position={ 900.077637 0.000000 3381.085449 } rotation={ 0.000000 0.789600 0.000000 0.613622 } scale={ 1.000000 1.000000 1.000000 } } { id=9733 - position={ 6436.077637 0.000000 2237.085449 } + position={ 977.077637 0.000000 3303.085449 } rotation={ 0.000000 0.931467 0.000000 -0.363825 } scale={ 1.000000 1.000000 1.000000 } } { id=9734 - position={ 6408.077637 0.000000 2302.085449 } + position={ 963.077637 0.000000 3308.085449 } rotation={ 0.000000 0.338587 0.000000 0.940935 } scale={ 1.000000 1.000000 1.000000 } } { id=9735 - position={ 6430.077637 0.000000 2278.085449 } + position={ 933.077637 0.000000 3276.085449 } rotation={ 0.000000 0.982389 0.000000 0.186845 } scale={ 1.000000 1.000000 1.000000 } } { id=9736 - position={ 6449.077637 0.000000 2275.085449 } + position={ 1259.077637 0.000000 3238.085449 } rotation={ 0.000000 0.879198 0.000000 -0.476457 } scale={ 1.000000 1.000000 1.000000 } } { id=9737 - position={ 6456.077637 0.000000 2299.085449 } + position={ 1223.077637 0.000000 3183.085449 } rotation={ 0.000000 0.402249 0.000000 0.915530 } scale={ 1.000000 1.000000 1.000000 } } { id=9738 - position={ 6481.077637 0.000000 2379.085449 } + position={ 1212.077637 0.000000 3223.085449 } rotation={ 0.000000 0.999167 0.000000 -0.040809 } scale={ 1.000000 1.000000 1.000000 } } { id=9739 - position={ 6433.077637 0.000000 2299.085449 } + position={ 1169.077637 0.000000 3238.085449 } rotation={ 0.000000 0.730274 0.000000 -0.683154 } scale={ 1.000000 1.000000 1.000000 } } @@ -53005,7 +53089,7 @@ } { id=9741 - position={ 6426.077637 0.000000 2383.085449 } + position={ 830.077637 0.000000 2949.085449 } rotation={ 0.000000 0.615540 0.000000 0.788105 } scale={ 1.000000 1.000000 1.000000 } } @@ -53047,7 +53131,7 @@ } { id=9748 - position={ 6524.077637 0.000000 2373.085449 } + position={ 1809.077637 0.000000 2133.085449 } rotation={ 0.000000 0.998535 0.000000 0.054110 } scale={ 1.000000 1.000000 1.000000 } } @@ -53071,13 +53155,13 @@ } { id=9752 - position={ 6503.077637 0.000000 2392.085449 } + position={ 1799.077637 0.000000 2171.085449 } rotation={ 0.000000 0.634058 0.000000 -0.773285 } scale={ 1.000000 1.000000 1.000000 } } { id=9753 - position={ 6490.077637 0.000000 2398.085449 } + position={ 1805.077637 0.000000 2988.085449 } rotation={ 0.000000 0.998892 0.000000 0.047065 } scale={ 1.000000 1.000000 1.000000 } } @@ -53101,7 +53185,7 @@ } { id=9757 - position={ 6725.620117 0.000000 1905.276855 } + position={ 1823.620117 0.000000 2246.276855 } rotation={ -0.000000 0.434566 -0.000000 0.900640 } scale={ 1.000000 1.000000 1.000000 } } @@ -53131,13 +53215,13 @@ } { id=9762 - position={ 6706.077637 0.000000 1964.085571 } + position={ 1355.077637 0.000000 3055.085571 } rotation={ 0.000000 0.466486 0.000000 -0.884528 } scale={ 1.000000 1.000000 1.000000 } } { id=9763 - position={ 6593.077637 0.000000 2373.085449 } + position={ 1346.077637 0.000000 2940.085449 } rotation={ 0.000000 0.669807 0.000000 0.742535 } scale={ 1.000000 1.000000 1.000000 } } @@ -53155,19 +53239,19 @@ } { id=9766 - position={ 6488.077637 0.000000 2472.085449 } + position={ 1891.077637 0.000000 2393.085449 } rotation={ 0.000000 0.185879 0.000000 -0.982573 } scale={ 1.000000 1.000000 1.000000 } } { id=9767 - position={ 6455.077637 0.000000 2462.085449 } + position={ 1867.077637 0.000000 2357.085449 } rotation={ 0.000000 0.889502 0.000000 -0.456932 } scale={ 1.000000 1.000000 1.000000 } } { id=9768 - position={ 6435.077637 0.000000 2459.085449 } + position={ 1326.077637 0.000000 2964.085449 } rotation={ 0.000000 0.936860 0.000000 -0.349706 } scale={ 1.000000 1.000000 1.000000 } } @@ -53185,7 +53269,7 @@ } { id=9771 - position={ 6459.077637 0.000000 2417.085449 } + position={ 1507.077637 0.000000 3419.085449 } rotation={ 0.000000 0.999671 0.000000 -0.025635 } scale={ 1.000000 1.000000 1.000000 } } @@ -53203,7 +53287,7 @@ } { id=9774 - position={ 6399.077637 0.000000 2418.085449 } + position={ 1565.077637 0.000000 2925.085449 } rotation={ 0.000000 0.418293 0.000000 0.908312 } scale={ 1.000000 1.000000 1.000000 } } @@ -53221,7 +53305,7 @@ } { id=9777 - position={ 6368.077637 0.000000 2394.085449 } + position={ 1890.077637 0.000000 3832.085449 } rotation={ 0.000000 0.673210 0.000000 -0.739451 } scale={ 1.000000 1.000000 1.000000 } } @@ -53251,19 +53335,19 @@ } { id=9782 - position={ 6737.077637 0.000000 2616.085449 } + position={ 1343.077637 0.000000 2892.085449 } rotation={ 0.000000 0.945888 0.000000 0.324492 } scale={ 1.000000 1.000000 1.000000 } } { id=9783 - position={ 6632.077637 0.000000 1907.085571 } + position={ 1373.077637 0.000000 2929.085571 } rotation={ 0.000000 0.956689 0.000000 0.291111 } scale={ 1.000000 1.000000 1.000000 } } { id=9784 - position={ 6640.077637 0.000000 1939.085571 } + position={ 1394.077637 0.000000 2933.085571 } rotation={ 0.000000 0.315154 0.000000 -0.949041 } scale={ 1.000000 1.000000 1.000000 } } @@ -53275,7 +53359,7 @@ } { id=9786 - position={ 6765.077637 0.000000 2602.085449 } + position={ 1463.077637 0.000000 2865.085449 } rotation={ 0.000000 0.842628 0.000000 -0.538496 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/N3OW/history/characters/NEOW_e_italia.txt b/N3OW/history/characters/NEOW_e_italia.txt index 83205c89..9d9374d0 100644 --- a/N3OW/history/characters/NEOW_e_italia.txt +++ b/N3OW/history/characters/NEOW_e_italia.txt @@ -401,9 +401,9 @@ italy0023 = { } } #add lamborghini and Odescalchi later -italy_cornelio_colonna = { +italy_cornelio_angelis = { name = "Cornelio" - dynasty = colonna_dynasty + dynasty = angelis_dynasty religion = "roman_catholic" culture = "venetian" trait = education_stewardship_3 diff --git a/N3OW/history/provinces/e_britannia.txt b/N3OW/history/provinces/e_britannia.txt index 3fc8a824..5d96fec2 100644 --- a/N3OW/history/provinces/e_britannia.txt +++ b/N3OW/history/provinces/e_britannia.txt @@ -812,7 +812,7 @@ } } 9723 = { - holding = none + holding = city_holding } ###c_hereford 1632 = { diff --git a/N3OW/history/titles/k_lombardy_venetio.txt b/N3OW/history/titles/k_lombardy_venetio.txt index a7bf7ca7..90d08153 100644 --- a/N3OW/history/titles/k_lombardy_venetio.txt +++ b/N3OW/history/titles/k_lombardy_venetio.txt @@ -12,7 +12,7 @@ d_verona = { } c_treviso = { 2550.1.1 = { - holder = italy_cornelio_colonna + holder = italy_cornelio_angelis liege = d_verona } } diff --git a/N3OW/history/titles/k_rhodania.txt b/N3OW/history/titles/k_rhodania.txt index 3a5cb107..c907ca99 100644 --- a/N3OW/history/titles/k_rhodania.txt +++ b/N3OW/history/titles/k_rhodania.txt @@ -1,5 +1,17 @@ -d_lyonnais={2554.1.1={holder=germany0002 #Franz Klosters}} +d_lyonnais={ + 2554.1.1={ + holder=germany0002 #Franz Klosters + } +} -d_savoy={2554.1.1={holder=germany0002 #Franz Klosters}} +d_savoie = { + 2554.1.1 = { + holder=germany0002 #Franz Klosters + } +} -c_bouches_du_rhone={2540.1.1={holder = france_marouane_atika #Marouane Atika}} \ No newline at end of file +c_bouches_du_rhone={ + 2540.1.1 = { + holder = france_marouane_atika #Marouane Atika + } +} \ No newline at end of file diff --git a/N3OW/localization/english/regiment_l_english.yml b/N3OW/localization/english/regiment_l_english.yml new file mode 100644 index 00000000..aec91fcb --- /dev/null +++ b/N3OW/localization/english/regiment_l_english.yml @@ -0,0 +1,346 @@ +l_english: + #Reasons + + MAA_TOUGHNESS:0 "$EFFECT_LIST_BULLET$[toughness|E]: $VALUE|0V$" + MAA_DAMAGE:0 "$EFFECT_LIST_BULLET$[damage|E]: $VALUE|0V$" + MAA_SIEGE_VALUE:0 "$EFFECT_LIST_BULLET$[siege_progress|E]: $VALUE|1=V$/day" + MAA_SIEGE_TIER:1 "$EFFECT_LIST_BULLET$Siege Tier: $VALUE|0V$" + MAA_PURSUIT:0 "$EFFECT_LIST_BULLET$[pursuit|E]: $VALUE|0V$" + MAA_SCREEN:0 "$EFFECT_LIST_BULLET$[screen|E]: $VALUE|0V$" + MAA_TOUGHNESS_DIFF:0 "$EFFECT_LIST_BULLET$[toughness|E]: $VALUE|0+=$" + MAA_DAMAGE_DIFF:0 "$EFFECT_LIST_BULLET$[damage|E]: $VALUE|0+=$" + MAA_SIEGE_VALUE_DIFF:0 "$EFFECT_LIST_BULLET$[siege_progress|E]: $VALUE|1=V$/day" + MAA_SIEGE_TIER_DIFF:1 "$EFFECT_LIST_BULLET$Siege Tier: $VALUE|0V$" + MAA_PURSUIT_DIFF:0 "$EFFECT_LIST_BULLET$[pursuit|E]: $VALUE|0+=$" + MAA_SCREEN_DIFF:0 "$EFFECT_LIST_BULLET$[screen|E]: $VALUE|0+=$" + MAA_COUNTERS_EFFECT:0 "$EFFECT_LIST_BULLET$Counters $TYPE|V$" + MAA_COUNTERS_EFFECT_SHORT:0 "$TYPE|V$" + MAA_COUNTERS_LABEL:1 "[MenAtArmsType.GetNameNoTooltip] [counters|E] these Types:\n[MenAtArmsType.GetCountersString]" + MAA_COUNTER_SHORT_LIST:1 "$LIST$" + MAA_COUNTER_NONE:0 "#weak None#!" + MAA_TERRAIN_EFFECT_FORMAT:0 "$EFFECT_LIST_BULLET$In $TERRAIN_TYPE|V$: $LIST$" + MAA_TERRAIN_EFFECT_DAMAGE:1 "$VALUE|+=0$ [damage|E]" + MAA_TERRAIN_EFFECT_TOUGHNESS:1 "$VALUE|+=0$ [toughness|E]" + MAA_TERRAIN_EFFECT_PURSUIT:1 "$VALUE|+=0$ [pursuit|E]" + MAA_TERRAIN_EFFECT_SCREEN:1 "$VALUE|+=0$ [screen|E]" + MAA_TERRAIN_EFFECT_SIEGE_VALUE:0 "$VALUE|+=0$/day [siege_progress|E]" + MAA_HOLDING_EFFECT_FORMAT: "$EFFECT_LIST_BULLET$In $HOLDING_TYPE|V$: $LIST$" + MAA_HOLDING_EFFECT_DAMAGE: "$VALUE|+=0$ [damage|E]" + MAA_HOLDING_EFFECT_TOUGHNESS: "$VALUE|+=0$ [toughness|E]" + MAA_HOLDING_EFFECT_PURSUIT: "$VALUE|+=0$ [pursuit|E]" + MAA_HOLDING_EFFECT_SCREEN: "$VALUE|+=0$ [screen|E]" + MAA_HOLDING_EFFECT_SIEGE_VALUE: "$VALUE|+=0$/day [siege_progress|E]" + MAA_DOES_NOT_FIGHT_IN_MAIN_PHASE:0 "Siege Weapons do not attack in combat" + MEN_AT_ARMS_TYPE_TOOLTIP_CREATION_COST: "Creation cost: [MenAtArmsType.GetCostString(GetPlayer)]" + TITLE_MEN_AT_ARMS_TYPE_TOOLTIP_CREATION_COST: "Creation cost: [MenAtArmsType.GetTitleRegimentCostString(GetPlayer)]" + SIEGE_TIER_MAX_FORT_LEVEL:0 "$EFFECT_LIST_BULLET$Max [fort_level|E]: $VALUE|V$" + SIEGE_TIER_BEATS_ALL_FORTS:0 "$EFFECT_LIST_BULLET$Beats all [fort_level|E]" + REGIMENT_TERRAIN_MODIFIER_TOOLTIP:0 "#T In [RegimentTerrainModifier.GetTerrain.GetName]#!\n[RegimentTerrainModifier.GetEffectString]" + REGIMENT_TERRAIN_BONUS_HEADER:0 "[terrain|E] Effects:" + REGIMENT_TERRAIN_BONUS_NONE:0 "#weak No terrain effects#!" + REGIMENT_HOLDING_BONUS_HEADER: "[holding_type|E] Effects:" + REGIMENT_HOLDING_MODIFIER_TOOLTIP: "#T In [RegimentHoldingModifier.GetHolding.GetName]#!\n[RegimentHoldingModifier.GetEffectString]" + REGIMENT_WINTER_EFFECT_HEADER:0 "Winter Effects:" + + REGIMENT_DAMAGE_TT:3 "#T [damage|E]: [MenAtArmsType.GetStat( GetPlayer, Province.Self, Title.Self, 'damage' )|1V]#!\n[MenAtArmsType.GetStatDesc( GetPlayer, Province.Self, Title.Self, 'damage' )]" + REGIMENT_TOUGHNESS_TT:3 "#T [toughness|E]: [MenAtArmsType.GetStat( GetPlayer, Province.Self, Title.Self, 'toughness' )|1V]#!\n[MenAtArmsType.GetStatDesc( GetPlayer, Province.Self, Title.Self, 'toughness' )]" + REGIMENT_PURSUIT_TT:3 "#T [pursuit|E]: [MenAtArmsType.GetStat( GetPlayer, Province.Self, Title.Self, 'pursuit' )|1V]#!\n[MenAtArmsType.GetStatDesc( GetPlayer, Province.Self, Title.Self, 'pursuit' )]" + REGIMENT_SCREEN_TT:3 "#T [screen|E]: [MenAtArmsType.GetStat( GetPlayer, Province.Self, Title.Self, 'screen' )|1V]#!\n[MenAtArmsType.GetStatDesc( GetPlayer, Province.Self, Title.Self, 'screen' )]" + REGIMENT_SIEGE:3 "#V +[MenAtArmsType.GetStat( GetPlayer, Province.Self, Title.Self, 'siege_value' )|1V]#!/day" + REGIMENT_SIEGE_TT:3 "#T [siege_progress|E]: [MenAtArmsType.GetStat( GetPlayer, Province.Self, Title.Self, 'siege_value' )|1V]/day#!\n[MenAtArmsType.GetStatDesc( GetPlayer, Province.Self, Title.Self, 'siege_value' )]" + + REGIMENT_PROVINCE_DAMAGE:0 "[MenAtArmsType.GetProvinceStat( GetPlayer, Province.Self, Title.Self, 'damage' )|1=+^]" + REGIMENT_PROVINCE_TOUGHNESS:0 "[MenAtArmsType.GetProvinceStat( GetPlayer, Province.Self, Title.Self, 'toughness' )|1=+^]" + REGIMENT_PROVINCE_PURSUIT:0 "[MenAtArmsType.GetProvinceStat( GetPlayer, Province.Self, Title.Self, 'pursuit' )|1=+^]" + REGIMENT_PROVINCE_SCREEN:0 "[MenAtArmsType.GetProvinceStat( GetPlayer, Province.Self, Title.Self, 'screen' )|1=+^]" + REGIMENT_PROVINCE_SIEGE:0 "[MenAtArmsType.GetProvinceStat( GetPlayer, Province.Self, Title.Self, 'siege_value' )|2=+^]/day" + REGIMENT_PROVINCE_DAMAGE_TT:0 "#T Additional [damage|E]: $REGIMENT_PROVINCE_DAMAGE$#!\n[MenAtArmsType.GetProvinceStatDesc( GetPlayer, Province.Self, 'damage' )]" + REGIMENT_PROVINCE_TOUGHNESS_TT:0 "#T Additional [toughness|E]: $REGIMENT_PROVINCE_TOUGHNESS$#!\n[MenAtArmsType.GetProvinceStatDesc( GetPlayer, Province.Self, 'toughness' )]" + REGIMENT_PROVINCE_PURSUIT_TT:0 "#T Additional [pursuit|E]: $REGIMENT_PROVINCE_PURSUIT$#!\n[MenAtArmsType.GetProvinceStatDesc( GetPlayer, Province.Self, 'pursuit' )]" + REGIMENT_PROVINCE_SCREEN_TT:0 "#T Additional [screen|E]: $REGIMENT_PROVINCE_SCREEN$#!\n[MenAtArmsType.GetProvinceStatDesc( GetPlayer, Province.Self, 'screen' )]" + REGIMENT_PROVINCE_SIEGE_TT:0 "#T Additional [siege_progress|E]: $REGIMENT_PROVINCE_SIEGE$#!\n[MenAtArmsType.GetProvinceStatDesc( GetPlayer, Province.Self, 'siege_value' )]" + REGIMENT_ORIGIN_LOCATION:0 "[stationed|E] in: [Province.GetBaronyNameExplicitly]" + REGIMENT_NO_ORIGIN_LOCATION:0 "@warning_icon! #X Not [stationed|E] in any [holding|E]#!" + OPEN_MAA_ORIGIN_SELECT_VIEW:0 "#T Change [stationed_holding|E]#!" + CLEAR_MAA_ORIGIN:0 "#I Right-click to remove stationed holding#!" + SELECT_MEN_AT_ARMS_LOCATION:0 "[station_regiment|E]" + SELECT_REGIMENT_ORIGIN_INVALID_REGIMENT:0 "@warning_icon! #X Invalid [regiment|E]#!" + SELECT_REGIMENT_ORIGIN_INVALID_MAA:0 "@warning_icon! #X [regiment|E] is #bold not#! [men_at_arms|E]#!" + SELECT_REGIMENT_ORIGIN_RAISED_REGIMENT:0 "@warning_icon! #X [regiment|E] is raised#!" + SELECT_REGIMENT_ORIGIN_RAISING_REGIMENT:0 "@warning_icon! #X [regiment|E] is being raised#!" + SELECT_REGIMENT_ORIGIN_INVALID_PROVINCE:0 "@warning_icon! #X Invalid [holding|E]#!" + SELECT_REGIMENT_ORIGIN_ALREADY_AT_PROVINCE:0 "@warning_icon! #X [REGIMENT.GetNameNoTooltip] is already [stationed|E] in [PROVINCE.GetBaronyNameExplicitlyNoTooltip]#!" + SELECT_REGIMENT_ORIGIN_PROVINCE_NOT_OWNED:0 "@warning_icon! #X [PROVINCE.GetBaronyNameExplicitlyNoTooltip] is #bold not#! in your [domain|E]#!" + SELECT_REGIMENT_ORIGIN_PROVINCE_OCCUPIED:0 "@warning_icon! #X [PROVINCE.GetBaronyNameExplicitlyNoTooltip] is [occupied|E] by [PROVINCE.GetController.GetShortUIName]#!" + REGIMENT_ORIGIN_LOCATION_MAP:0 "Stationed in: [Province.GetBaronyNameExplicitlyNoTooltip]" + REGIMENT_ORIGIN_NEW_LOCATION_MAP:0 "Station in: [Province.GetBaronyNameExplicitlyNoTooltip]" + REPLACE_MAA_ORIGIN_TITLE:0 "Replace [stationed_regiment|E]" + REPLACE_MAA_ORIGIN_BODY:0 "Replace the [stationed|E] [Province.GetMaaOriginHere.GetName] in [Province.GetBaronyNameExplicitly] with [Regiment.GetName]" + REPLACE_MAA_ORIGIN_ACCEPT:0 "Replace" + VIEW_MAA_ORIGIN_TT:0 "#T View [stationed_regiment|E]#!" + SHOW_MAA_ORIGIN_TT:0 "#T [stationed_regiment|E]#!\n[Province.GetTitle.GetHolder.GetShortUIName|U] [Province.GetTitle.GetHolder.LocalPlayerString( 'have', 'has' )] [stationed|E] a [regiment|E] of [Province.GetMaaOriginHere.GetName] #weak ([Province.GetMaaOriginHere.GetMAAType.GetBaseTypeName])#! in this [holding|E]." + MAA_UNSTATIONED:0 "Unstationed" + + REGIMENT_SIEGE_MAX_FORT_LEVEL:1 "Effective up to [fort_level|E] #high [MenAtArmsType.GetMaxFortLevel]#!" + REGIMENT_STAT_ENTRY:0 "$KEY$: $VALUE|+=0$" + REGIMENT_ORIGIN_STAT_ENTRY_ADD:0 "From [stationed_holding|E]: $VALUE|+=0$" + REGIMENT_ORIGIN_STAT_ENTRY_MULT:0 "From [stationed_holding|E]: $VALUE|+=%0$" + BASE_VALUE_SIEGE:0 "Base: $VALUE|V1$" + REGIMENT_WINTER_NORMAL_MODIFIER_TOOLTIP:2 "#T In Normal Winter#!\n[MenAtArmsType.GetWinterNormalModifier.GetEffectString]" + REGIMENT_WINTER_HARSH_MODIFIER_TOOLTIP:2 "#T In Harsh Winter#!\n[MenAtArmsType.GetWinterHarshModifier.GetEffectString]" + + TRANSFER_TITLE_MAA_NOT_TITLE_MAA: "@warning_icon! Only title [men_at_arms|E] regiments can be transferred between titles." + TRANSFER_TITLE_MAA_NOT_ADMINISTRATIVE: "@warning_icon! [TITLE.GetNameNoTooltip] is #bold not#! under a [GetGovernment( 'administrative_government' ).GetName]" + TRANSFER_TITLE_MAA_ALREADY_CONTROLS_MAA: "@warning_icon! [TITLE.GetName] already controls one or more of the target men-at-arms regiments." + TRANSFER_TITLE_MAA_ALREADY_OWNS_MAA: "@warning_icon! [TITLE.GetName] already controls one or more of the target men-at-arms regiments." + + #MaA types + skirmishers:2 "[skirmishers|E]" + archers:2 "[archers|E]" + light_cavalry:2 "[light_cavalry|E]" + heavy_cavalry:2 "[heavy_cavalry|E]" + pikemen:2 "[spearmen|E]" + heavy_infantry:2 "[heavy_infantry|E]" + archer_cavalry:0 "[archer_cavalry|E]" + camel_cavalry:0 "[camel_cavalry|E]" + elephant_cavalry:0 "[elephant_cavalry|E]" + gunpowder: "[gunpowder|E]" + peasant_militia: "[peasant_militia|E]" + + #Base MaA + light_footmen:0 "Light Footmen" + bowmen:0 "Bowmen" + light_horsemen:0 "Light Horsemen" + pikemen_unit:0 "Pikemen" + armored_footmen:0 "Armored Footmen" + armored_horsemen:0 "Armored Horsemen" + crossbowmen:0 "Crossbowmen" + handgunners: "Handgunners" + pikemen_militia: "Pikemen Militia" + + #Siege MaA + siege_weapon:2 "[siege_weapons|E]" + onager:0 "Onagers" + mangonel:0 "Mangonels" + trebuchet:0 "Trebuchets" + bombard:0 "Bombards" + + #TGP Siege MaA + ballista: "Siege Crossbows" + cloud_ladder: "Cloud Ladders" + siege_tower: "Mobile Towers" + cannon: "Fire Dragon Engines" + + #Regional MaA + war_elephant:0 "War Elephants" + camel_rider:0 "Camel Riders" + + #Cultural MaA + huscarl:0 "Huscarls" + landsknecht:0 "Landsknechts" + longbowmen:0 "Longbowmen" + goedendag:0 "Goedendag Militia" + gendarme:0 "Gendarmes" + chasseur:0 "Chasseurs" + picchieri:0 "Picchieri" + praetorian:1 "Palatini" + caballero:0 "Caballeros" + cataphract:0 "Kataphraktoi" + monaspa:0 "Monaspa" + hobelar:0 "Hobelars" + schiltron:0 "Schiltron" + metsanvartija:0 "Metsänvartija" + horse_archers:0 "Horse Archers" + mubarizun:0 "Mubarizun" + ayyar:0 "Ayyar" + druzhina:0 "Druzhina" + hussar:1 "Konni" + horn_warrior:0 "Horn Warriors" + bush_hunter:0 "Bush Hunters" + shomer:0 "Shomer" + khandayat:0 "Khandayat" + garudas:1 "Lenkas" + mountaineer:0 "Mountaineers" + sahel_horsemen:0 "Sahel Horsemen" + guinea_warrior:0 "Guinean Uplanders" + sarawit:0 "Sarawit" + abudrar:0 "Abudrar" + zbrojnosh:0 "Zbrojnosh" + palace_guards:0 "Palace Guards" + shenbigong:0 "Shenbigong" # 神臂弓 + mulaththamun:0 "Mulathamūn" + archers_of_the_nile:0 "Nile Archers" + paiks:0 "Paiks" + guanch_vaulter:0 "Vaulter Infantry" + ayrudzi: "Ayrudzi" + conrois: "Life Guards" + akritai: "Akritai" + ballistrai: "Ballistrai" + skoutatoi: "Skoutatoi" + varangian_guards: "Varangian Guards" + handpicked_faithful: "Handpicked Faithful" + fire_lancers: "Fire Lancers" + gakgung_archers: "Gakgung Archers" + ballista_elephant: "Ballista Elephants" + pesilat_warriors: "Pesilat Warriors" + samurai: "Samurai" + japanese_horse_archers: "Mounted Samurai" + emishi_horse_archers: "Emishi Riders" + warrior_monks: "Warrior Monks" + zhanmadao_infantry: "Zhanmadao Infantry" + tiefutu: "Tiefutu Cavalry" + burenjia: "Burenjia Infantry" + rocket_carts: "Rocket Carts" + ordo_riders_horse_archers: "Ordo Riders" + #Special MaA + house_guard:0 "House Guard" + house_guard_flavor:0 "#F This elite regiment is in the service of a specific Dynasty. The warriors are hand-picked from the most loyal subjects.#!" + + #MaA Descriptions + bowmen_flavor:1 "#F Professional archers fill the air with arrows, devastating the foremost enemy troops.#!" + light_footmen_flavor:1 "#F Veteran skirmishers are invaluable harriers, disrupting enemy flanks and chipping away at morale.#!" + light_horsemen_flavor:0 "#F Light and swift, these horsemen are excellent at flanking, and devastating when pursuing routing enemies.#!" + armored_footmen_flavor:1 "#F Heavily armed and well-trained, these troops specialize in smashing massed infantry.#!" + pikemen_unit_flavor:0 "#F Long pikes allow these regiments to form walls of spikes that can stop a cavalry charge dead.#!" + armored_horsemen_flavor:0 "#F Heavily armed and armored, these horsemen dominate warfare in the open plains.#!" + crossbowmen_flavor:0 "#F Though slow to reload, crossbows are easy to use and fire bolts which can pierce through most armor at a good range.#!" + handgunners_flavor: "#F Expensive and explosive in equal measure, these crude firearms are incredibly effective weapons.#!\n#help Enabled by the [GetBuilding('powder_magazine_01').GetName].#!" + fire_lancers_flavor: "#F Using experimental formulas, men armed with strange polearms are able to rain fire down upon terrified enemies.#!\n#help Enabled by the [GetBuilding('powder_magazine_01').GetName].#!" + gakgung_archers_flavor: "#F Equipped with powerful reflex bows and thumb rings to strengthen their draw, these archers can fire arrows over an incredible range." + pesilat_warriors_flavor: "#F Although they are often armed with a #italic kris#!, a #italic golok#!, or a myriad array of other melee weapons, silat practitioners are equally well-versed in unarmed combat.#!" + samurai_flavor: "#F #italic Bushi#! retainers attend to the needs of nobility and the highest levels of society, armed with a sword and protected with lacquered leather or metal armor.#!" + zhanmadao_infantry_flavor: "#F Equipped with enormous two-handed swords, these soldiers are trained to use their blades to counter cavalry with a dazzling array of thrusts, slashes, and feints.#!" + tiefutu_flavor: "Known as Iron Pagodas these heavily armed cavalrymen were introduced to China by the Jurchen Jin dynasty in great numbers. The superior horsemanship together with heavy and all encompassing armor made them fierce enemies on any battlefield." + burenjia_flavor: "#F Deployed in great numbers, in tight formations, this infantry make up the backbone of Imperial armies. Composed of up to 1000 lamelar pieces the heavy armor of these soldiers allow them to stand up to almost any invader.#!" + rocket_carts_flavor: "#F A handful of men can hit the enemy with the force of a hundred archers with a single spark of flame, although it might be worth keeping an eye on the kind of men who would willing work with this sort of device.#!" + ordo_riders_horse_archers_flavor: "#F The steppe has created some hardened warriors, serving their khan and collecting tributes from various neighbors. These riders, organized in an Ordo, create the backbone of any elite nomadic force.#!" + + onager_flavor:0 "#F These small torsion catapults can tear down enemy fortifications by hurling stone projectiles over a distance.#!" + mangonel_flavor:0 "#F The traction-powered mangonel is easier to operate than the onager while also boasting a faster rate-of-fire.#!" + trebuchet_flavor:0 "#F The counterweight trebuchet can hurl large projectiles with much greater force than mangonels or onagers.#!" + bombard_flavor:0 "#F No longer constrained by the limits of levers and pulleys, these cannons can blast through fortifications with ease.#!" + + ballista_flavor: "#F Large crossbows mounted on a wheeled platform that can launch steel-tipped bolts to impressive distances#!" + cloud_ladder_flavor: "#F A hinged folding ladder with a simple pulling mechanism to unfold once within reach of the enemy walls.#!" + siege_tower_flavor: "#F A large wooden tower on wheels that can be pushed up to enemy walls, offering more protection and stability than siege ladders.#!" + cannon_flavor: "#F These relatively small but deadly guns were propped up at the muzzle end and pinned to the ground to deaden the recoil.#!" + + war_elephant_flavor:0 "#F A charging elephant is almost impossible to stop, making them excellent shock troops.#!" + ballista_elephant_flavor: "#F A charging elephant is alarming enough, but a charging elephant equipped with a powerful ballista on its back is sure to unnerve even the most battle-hardened foes.#!" + camel_rider_flavor:0 "#F Better suited to desert warfare than traditional cavalry, these riders dominate the sands.#!" + + huscarl_flavor:1 "#F Germanic Huscarls are masters of using shield walls to block incoming volleys of arrows.#!" + landsknecht_flavor:1 "#F German Landsknechts can use their massive zweihanders to tear through the massed ranks of enemy spearmen.#!" + longbowmen_flavor:2 "#F Though they require a lifetime to properly master, the longbows of England and Wales are powerful enough to pierce plate and can loose volleys at an almost-unequaled rate.#!" + goedendag_flavor:0 "#F The Flemish goedendag is a spiked club which can be braced against cavalry charges.#!" + gendarme_flavor:0 "#F French Gendarmes are the shining pinnacle of heavy cavalry, inspiring awe around the world.#!" + chasseur_flavor:0 "#F Outremer knights have mastered both European horsemenship and Levantine desert tactics.#!" + picchieri_flavor:0 "#F The mobile formations used by Latin Picchieri make them more deadly than traditional pikemen.#!" + praetorian_flavor:1 "#F The best of the best, Palatini are elite Roman soldiers who serve the Emperor directly.#!" + caballero_flavor:0 "#F Unlike most cavalry, Iberian Caballeros are at home both on flat plains and in rough hilly terrain.#!" + cataphract_flavor:0 "#F Armored in coats of iron, Greek cataphracts can break almost any defensive line with their charge.#!" + monaspa_flavor:0 "#F Formed from the core of the bodyguards of the Georgian kings the Monaspa are a fearsome heavy cavalry force that is well at home in the undulating terrain of the Caucasus.#!" + hobelar_flavor:0 "#F Fast and agile, Celtic Hobelars can easily raid the forests and hills other cavalry avoid.#!" + schiltron_flavor:0 "#F The incredible discipline of Scottish pikemen lets them easily break enemy charges, even on open plains.#!" + metsanvartija_flavor:0 "#F Uralic Metsänvartija can ambush invaders with a hail of arrows before melting back into the trees.#!" + horse_archers_flavor:0 "#F Horse archers are used by nomadic tribes to unleash hails of arrows while being almost impossible to catch.#!" + ayyar_flavor:0 "#F Young and eager, members of the Ayyar fighting clubs serve as willing and able soldiers ready to be called upon at a moment's notice.#!" + mubarizun_flavor:0 "#F Trained in both formation fighting and single combat, Arabic Mubarizun can crush most other infantry in battle.#!" + druzhina_flavor:0 "#F Russian Druzhina are skilled bodyguards who have devoted themselves to protecting their allies.#!" + hussar_flavor:1 "#F Masters of raiding, the infamous $hussar$ light cavalry of Eastern Europe can make short work of a fleeing enemy army.#!" + horn_warrior_flavor:0 "#F Practiced in mountainous warfare, warriors from the Horn of Africa are not to be underestimated.#!" + bush_hunter_flavor:0 "#F These West African archers turn the difficult terrain of the bush to their advantage.#!" + shomer_flavor:0 "#F Devoted to protecting their kin, Jewish shomer are adept at covering for their fellows in battle.#!" + khandayat_flavor:0 "#F Indian Khandayats are master swordsmen who can easily cut down both men and horse alike.#!" + garudas_flavor:0 "#F Garuda Warriors are famous for their loyalty, and for fighting to the death. Once a Garuda warrior fall his entire retinue of Lenka warriors are expected to die with him.#!" + mountaineer_flavor:0 "#F Intense training at high altitudes makes Tibetan soldiers the undisputed champions of their domain.#!" + sahel_horsemen_flavor:0 "#F Sahel Riders are mounted warriors who use light quilted armor and javelins to devastate their enemies#!" + guinea_warrior_flavor:0 "#F Warriors of the uplands of Guinea move fast, and their javelins are precise and deadly.#!" + sarawit_flavor:0 "#F The Sarawit is a well-trained army at home in the Ethiopian highlands.#!" + zbrojnosh_flavor:0 "#F At home in the hills and forests of Central Europe, the Zbrojnosh are feared far and wide.#!" + abudrar_flavor:0 "#F The Abudrar mountaineers know every gorge and wadi of their homeland.#!" + palace_guards_flavor:0 "#F Usually standing guard and keeping the peace, these versatile warriors can form the backbone of any army.#!" + shenbigong_flavor:1 "#F These elite crossbowmen are armed with the mighty Shenbigong, the "Divine Arm Bow". Each bolt loosed can punch through armor and formations with unnerving accuracy.#!" + mulaththamun_flavor:0 "#F These riders have honed their skills during a lifetime in close connection with the desert and cover their faces with the Litham veil, protecting them from the sand and from recognition by the enemy.#!" + archers_of_the_nile_flavor:0 "#F For thousands of years the Nubians have protected their homeland by mastering the bow from a young age, fighting off the raids from surrounding desert peoples and invaders alike.#!" + paiks_flavor:0 "#F Footmen have been the mainstay of Indian armies for centuries, and no weapon is as common as the simple bamboo bow which many Indian commoners practice through hunting from young age.#!" + guanch_vaulter_flavor:0 "#F Armed with long vaulting poles, these nimble warriors are able to navigate craggy and mountainous terrain with ease and can even vault over some fortifications.#!" + ayrudzi_flavor: "#F Fast-riding and clever in their use of harsh terrain, yet clad in solid armor, these fierce nobles can serve as both harassing cavalry and a formidable vanguard.#!" + conrois_flavor: "#F Stiff blooded sons of minor nobility, clad in thick steel, these heavy horsemen smash into and through all but the most determined of resistance.#!" + akritai_flavor: "#F Veteran rural conscripts, defenders of the rocky passes, who use careful timing and local knowledge to harass even the mightiest of hosts.#!" + ballistrai_flavor: "#F Spear-sized bolts soar from these torsion-based machines into besieged settlements and enemy formations alike, causing fear and disorder.#!" + skoutatoi_flavor: "#F The tall #EMP skouton#! shields these infantry array against the foe is their namesake. Yet their chief virtue in battle is discipline, which affords them good order in both advance and retreat.#!" + varangian_guards_flavor: "#F These famed axe-wielding Germanic mercenaries are the unwavering core of the imperial host.\n\n@warning_icon! #X They will claim some [gold|E] after the Basileus's death.#!" + handpicked_faithful_flavor: "#F Individually outstanding in valor, loyalty, and talent, these fighters are ready to lay down their lives to protect their leader.#!" + emishi_horse_archers_flavor: "#F Forced to defend themselves from stronger threats, Emishi horse archers are masters of hit-and-run tactics, raiding, and ambushes.#!" + japanese_horse_archers_flavor: "#F Adopting the techniques of the northern Emishi but using heavier armor, samurai take to the saddle, yumi in hand, and harry their foes with arrows." + warrior_monks_flavor: "#F Defending the faithful and serving their patrons, these monks' lives of devotion give plentiful time for training, and strong convictions.#!" + pikemen_militia_flavor: "#F Ready to fight for their land and dignity. Pushed to the brink of desperation, they will target any noble landlord to take what's due.#!" + + #Religious MaA + teutonic_knights:1 "Order Knights" + teutonic_knights_flavor:1 "#F Heavily armored and zealous knights, specializing in massed infantry battles in addition to their heavy cavalry charges.#!" + + skirmishers_lowercase:0 "skirmishers" + light_cavalry_lowercase:0 "light horsemen" + heavy_cavalry_lowercase:0 "heavy horsemen" + archers_lowercase:0 "archers" + pikemen_lowercase:0 "pikemen" + heavy_infantry_lowercase:0 "armored footmen" + elephant_cavalry_lowercase:0 "war elephants" + camel_cavalry_lowercase:0 "camel cavalry" + horse_archers_lowercase:0 "horse archers" + levies_lowercase:0 "levies" + gunpowder_lowercase: "handgunners" + + # Accolade MaA + accolade_maa_archers:0 "Retinue Archers" + accolade_maa_archers_flavor:1 "[retinue_maa|E]\n#F These elite archers are no rabble of poachers: they are relentlessly drilled to rain arrows accurately and at great speed.#!" + accolade_maa_skirmishers:0 "Retinue Skirmishers" + accolade_maa_skirmishers_flavor:1 "[retinue_maa|E]\n#F A mix of lightly-equipped elite warriors and seasoned mercenary raiders, feared for their skill at ambushes and unconventional warfare.#!" + accolade_maa_pikes:0 "Retinue Pikemen" + accolade_maa_pikes_flavor:1 "[retinue_maa|E]\n#F Bedecked in fine armor and bearing long pikes, these infantrymen form the unbreakable core of their liege's army.#!" + accolade_maa_outriders:0 "Retinue Outriders" + accolade_maa_outriders_flavor:1 "[retinue_maa|E]\n#F Atop swift steeds, these elite horsemen can outrun any foe and strike always where least expected and least welcome.#!" + accolade_maa_vanguards:0 "Retinue Vanguard" + accolade_maa_vanguards_flavor:1 "[retinue_maa|E]\n#F Afforded pride of place in the thick of the fight, these disciplined and resplendent heavy infantry are a force few foes can withstand.#!" + accolade_maa_lancers:0 "Retinue Lancers" + accolade_maa_lancers_flavor:1 "[retinue_maa|E]\n#F Coursing into the fray with thunderous clamor and true nobility, the serried ranks of these horsemen inspire a terrible awe on any battlefield.#!" + accolade_maa_crossbowers:0 "Retinue Crossbowmen" + accolade_maa_crossbowers_flavor:1 "[retinue_maa|E]\n#F Knight or knave: any can be pierced through by the carefully-placed iron bolts of these highly-trained crossbow-wielders.#!" + accolade_maa_cameliers:0 "Retinue Camel Riders" + accolade_maa_cameliers_flavor:1 "[retinue_maa|E]\n#F Feared across the Middle East and North Africa, the world boasts scarce-few such skilled camelry.#!" + accolade_maa_elephantiers:0 "Retinue War Elephants" + accolade_maa_elephantiers_flavor:1 "[retinue_maa|E]\n#F From towering howdahs, these beasts' skilled mahouts prove the only thing harder to stop than a charging elephant is another, #EMP larger#! elephant.#!" + accolade_maa_horse_archers:0 "Retinue Horse Archers" + accolade_maa_horse_archers_flavor:1 "[retinue_maa|E]\n#F Common steppe riders possess a lifetime of skill: these veteran horsemen, yet more. To stand against them is pain; to chase after them is death.#!" + accolade_maa_handgunners: "Retinue Handgunners" + accolade_maa_handgunners_flavor: "[retinue_maa|E]\n#F Steadily advancing through the gunpowder smoke, these highly drilled handgunners can shatter the enemy ranks with their master-crafted guns.#!" + + #MPO + nomadic_riders: "Horde Riders" + nomadic_riders_flavor: "#F Born on a saddle, $nomadic_riders$ are trained from birth to ride into battle.#!" + kheshig: "Kheshig" + kheshig_flavor: "#F The elite guard of a nomadic ruler, the $kheshig$ guarantee the safety of their liege, day and night. The #EMP khorchin#!, their battle division, extends this guard onto the field of battle.#!" + nomadic_horde: "[horde|E]" + + steppe_raiders: "Steppe Raiders" + steppe_raiders_flavor: "#F Though outfitted as scouts, these outriders rarely hesitate to charge isolated enemies and wreak swift violence on the unwary.#!" + + torch_bearers: "Torch-Bearers" + torch_bearers_flavor: "#F On the boundless steppe, there's no need for siege towers or catapults — just a blazing torch and a swift horse, enough to set every yurt aflame.#!" + +heavy_horse_archers: "Heavy Horse Archers" +heavy_horse_archers_flavor: "#F Armored riders carrying strong bows. As each leads a string of fine horses, these nomads can fight tirelessly on the open field.#!" + +nomad_lancers: "Nomad Lancers" +nomad_lancers_flavor: "#F Hook-bearing lances and horsehair banners rise above this gleaming battle-line of elite, ferocious nomadic cavalry.#!" + +mangudai: "Mangudai" +mangudai_flavor: "#F Brave volunteer riders — 'those already dead' — are the very first to crash into the enemy and, by their ruin, draw the foe into reckless disorder.#!" + +cataphract_archers: "Cataphract Archers" +cataphract_archers_flavor: "#F Arrows and blades ping harmlessly off the lamellar coats of these horsemen and their steeds. Meanwhile, their bows deal death and misery.#!" + +maturkan_warriors: "Maturkan Warriors" +maturkan_warriors_flavor: "#F These war-princes are the defenders of the cold taiga, and fight well where horses and raiding-parties can scarcely go.#!" diff --git a/N3OW/localization/english/titles_l_english.yml b/N3OW/localization/english/titles_l_english.yml index 995c4c4d..b086c69d 100644 --- a/N3OW/localization/english/titles_l_english.yml +++ b/N3OW/localization/english/titles_l_english.yml @@ -11435,8 +11435,8 @@ c_aalborg_adj:0 "Aalborger" c_aanaarjavri:0 "Aanaarjävri" c_aanaarjavri_adj:0 "Aanaarjävrian" - c_aargau:0 "Aargau" - c_aargau_adj:0 "Aargaunian" + c_aargau:0 "Lucerne" + c_aargau_adj:0 "Lucernian" c_aarhus:0 "Aarhus" c_aarhus_adj:0 "Aarhuser" c_abauj:0 "Abauj" @@ -24973,8 +24973,8 @@ b_avignon:0 "Avignon" b_carpentras:0 "Carpentras" b_apt:0 "Apt" - d_savoy:0 "Savoy" - d_savoy_adj:0 "Savoisian" + d_savoie:0 "Savoy" + d_savoie_adj:0 "Savoisian" c_savoy:0 "Savoy" c_savoy_adj:0 "Savoisian" b_chambery:0 "Chambéry"