diff --git a/N3OW.mod b/N3OW/N3OW.mod similarity index 84% rename from N3OW.mod rename to N3OW/N3OW.mod index bbfe10d2..c6c92f9a 100644 --- a/N3OW.mod +++ b/N3OW/N3OW.mod @@ -4,10 +4,10 @@ tags={ } name="New Era Old World" picture="thumbnail.png" -path="mod/N3OW" +path="mod/funny N3OW" replace_path="common/landed_titles" replace_path="history/characters" replace_path="history/cultures" replace_path="history/provinces" replace_path="history/titles" -supported_version="1.16.*" \ No newline at end of file +supported_version="1.18.*" \ No newline at end of file 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 f415c797..ccfca161 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 @@ -4611,13 +4611,26 @@ d_canterbury = { color1=blue color2=red color3=blue + colored_emblem={ + color1=yellow + color2=yellow + texture="ce_waves_03.dds" + instance={ + position={ 0.500000 0.240000 } + scale={ 1.000000 0.230000 } + depth=7.010000 + rotation=134 + } + + } + colored_emblem={ color1=blue texture="ce_block_02.dds" instance={ position={ 0.500000 0.000000 } scale={ 1.000000 0.510000 } - depth=8.010000 + depth=10.010000 } } @@ -4628,7 +4641,7 @@ d_canterbury = { texture="ce_checky_06.dds" instance={ position={ 0.500000 0.480000 } - depth=9.010000 + depth=11.010000 } } @@ -4639,49 +4652,55 @@ d_canterbury = { color3=yellow texture="ce_martlet.dds" instance={ - position={ 0.500000 0.100000 } + position={ 0.400000 0.100000 } + scale={ 0.150000 0.150000 } + depth=1.010000 + } + + instance={ + position={ 0.600000 0.100000 } scale={ 0.150000 0.150000 } depth=2.010000 } instance={ - position={ 0.650000 0.150000 } + position={ 0.720000 0.150000 } scale={ 0.150000 0.150000 } depth=3.010000 } instance={ - position={ 0.350000 0.150000 } + position={ 0.285000 0.150000 } scale={ 0.150000 0.150000 } depth=4.010000 } instance={ - position={ 0.800000 0.100000 } + position={ 0.830000 0.100000 } scale={ 0.150000 0.150000 } depth=5.010000 } instance={ - position={ 0.500000 0.100000 } + position={ 0.150000 0.100000 } scale={ 0.150000 0.150000 } depth=6.010000 } - instance={ - position={ 0.200000 0.100000 } - scale={ 0.150000 0.150000 } - depth=7.010000 - } - } colored_emblem={ color1=red texture="ce_block_02.dds" + instance={ + position={ 0.000000 0.060000 } + scale={ 1.000000 0.390000 } + depth=8.010000 + } + instance={ position={ 0.500000 1.000000 } - depth=1.010000 + depth=9.010000 } } @@ -4701,6 +4720,8 @@ d_canterbury = { } + + d_leinster = { pattern="pattern_horizontal_split_02.dds" color1=red @@ -5247,7 +5268,7 @@ d_muwalladi = { d_bedford = { pattern="pattern_horizontal_split_01.dds" - color1=blue + color1=red color2=yellow color3=black colored_emblem={ @@ -5256,95 +5277,77 @@ d_bedford = { color3=white texture="ce_stag.dds" instance={ - position={ 0.250000 0.230000 } + position={ 0.250000 0.250000 } scale={ 0.300000 0.300000 } - depth=2.010000 - } - instance={ - position={ 0.760000 0.760000 } - scale={ 0.300000 0.300000 } - depth=2.010000 - } - - } - - colored_emblem={ - color1=white - texture="ce_waves_04.dds" - instance={ - position={ 0.900000 0.470000 } depth=5.010000 } instance={ - position={ 0.500000 0.530000 } + position={ 0.750000 0.750000 } + scale={ 0.300000 0.300000 } depth=6.010000 } } colored_emblem={ - color1=blue - texture="ce_block_02.dds" - instance={ - position={ 1.000000 0.000000 } - scale={ 0.800000 0.800000 } - depth=7.010000 - } - - instance={ - position={ 0.140000 0.870000 } - scale={ 0.550000 0.550000 } - depth=8.010000 - } - - } - - colored_emblem={ - color1=yellow + color1=grey color2=yellow - texture="ce_crown_head.dds" + color3=grey + texture="ce_sabres.dds" instance={ - position={ 0.760000 0.220000 } - scale={ 0.260000 0.260000 } - depth=1.010000 - } - instance={ - position={ 0.220000 0.760000 } - scale={ 0.260000 0.260000 } - depth=1.010000 - } - - } - - colored_emblem={ - color1=blue - texture="ce_waves_04.dds" - instance={ - position={ 0.900000 0.530000 } + position={ 0.250000 0.750000 } + scale={ 0.370000 0.370000 } depth=4.010000 } + } + + colored_emblem={ + color1=red + texture="ce_block_02.dds" instance={ - position={ 0.500000 0.470000 } + position={ 1.000000 0.000000 } + depth=8.010000 + } + + instance={ + position={ 0.000000 1.000000 } depth=9.010000 } } + colored_emblem={ + color1=grey + color2=yellow + color3=brown + texture="ce_sabres.dds" + instance={ + position={ 0.750000 0.250000 } + scale={ 0.320000 0.320000 } + depth=3.010000 + } + + } + colored_emblem={ color1=white texture="ce_clam.dds" instance={ scale={ 0.240000 -0.240000 } } + instance={ - scale={ 0.240000 -0.240000 } position={ 0.500000 0.250000 } - } - instance={ scale={ 0.240000 -0.240000 } + depth=1.010000 + } + + instance={ position={ 0.500000 0.750000 } + scale={ 0.240000 -0.240000 } + depth=2.010000 } } @@ -5363,12 +5366,13 @@ d_bedford = { texture="ce_block_02.dds" instance={ scale={ 0.200000 1.000000 } - depth=3.010000 + depth=7.010000 } } } + d_svealand = { pattern = "pattern_solid.dds" color1 = "blue" @@ -13224,7 +13228,7 @@ d_york = { d_gloucester = { pattern="pattern_horizontal_split_01.dds" color1=green_light - color2=blue_light + color2=blue color3=black colored_emblem={ color1=white @@ -13232,20 +13236,7 @@ d_gloucester = { instance={ position={ 0.170000 0.290000 } scale={ 0.660000 0.660000 } - depth=4.010000 - } - - } - - colored_emblem={ - color1=blue_light - color2=white - texture="ce_african_pattern_undy_02.dds" - instance={ - position={ 0.170000 0.460000 } - scale={ 0.470000 0.470000 } - depth=6.010000 - rotation=90 + depth=9.010000 } } @@ -13254,6 +13245,50 @@ d_gloucester = { color1=blue_light texture="ce_ordinary_cross_thinnest.dds" instance={ + depth=7.010000 + } + + } + + colored_emblem={ + color1=blue + texture="ce_block_02.dds" + instance={ + depth=11.010000 + } + + } + + colored_emblem={ + color1=blue + color2=white + texture="ce_african_pattern_undy_02.dds" + instance={ + position={ 0.170000 0.460000 } + scale={ 0.470000 0.470000 } + depth=12.010000 + rotation=90 + } + + } + + colored_emblem={ + color1=brown + texture="ce_ibis.dds" + instance={ + position={ 0.230000 0.780000 } + scale={ -0.320000 0.320000 } + } + + } + + colored_emblem={ + color1=red + color2=red + color3=blue + texture="ce_bull_head.dds" + instance={ + scale={ 0.460000 0.460000 } depth=2.010000 } @@ -13263,7 +13298,7 @@ d_gloucester = { color1=white texture="ce_ordinary_cross_5.dds" instance={ - depth=3.010000 + depth=8.010000 } } @@ -13274,7 +13309,7 @@ d_gloucester = { instance={ position={ 0.000000 0.000000 } scale={ 0.830000 0.510000 } - depth=5.010000 + depth=10.010000 } } @@ -13287,6 +13322,7 @@ d_gloucester = { instance={ position={ 0.240000 0.150000 } scale={ 0.260000 0.260000 } + depth=5.010000 } } @@ -13297,19 +13333,52 @@ d_gloucester = { instance={ position={ 0.000000 1.000000 } scale={ 0.810000 0.790000 } - depth=1.010000 + depth=6.010000 } instance={ - depth=7.010000 + depth=13.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_shrub.dds" + instance={ + position={ 0.760000 0.220000 } + scale={ 0.340000 0.340000 } + depth=4.010000 + } + + } + + colored_emblem={ + color1=yellow + color2=yellow + texture="ce_grain.dds" + instance={ + position={ 0.780000 0.800000 } + scale={ 0.320000 0.320000 } + depth=3.010000 + } + + } + + colored_emblem={ + color1=white + color2=green_light + texture="ce_african_pattern_undy.dds" + instance={ + position={ 0.210000 0.800000 } + scale={ 0.390000 0.390000 } + depth=1.010000 } } } - - d_somerset = { pattern="pattern_cross_02.dds" color1=yellow @@ -20753,8 +20822,8 @@ c_ulster = { d_munster = { pattern="pattern_horizontal_split_01.dds" - color1=rgb { 19 22 102 } - color2=rgb { 19 22 102 } + color1=blue + color2=blue color3=red colored_emblem={ color1=yellow 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 fa2eac4e..8bab9af3 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 @@ -543,11 +543,72 @@ dynn_britannia_windsor = { dynn_britannia_cyflymarhyan ={ pattern="pattern_vertical_split_01.dds" - color1=blue - color2=blue + color1=purple + color2=purple color3=blue colored_emblem={ - color1=yellow_light + color1=purple + texture="ce_ordinary_pale_5.dds" + instance={ + position={ 0.250000 0.250000 } + scale={ 0.050000 0.050000 } + } + + instance={ + position={ 0.750000 0.250000 } + scale={ 0.050000 0.050000 } + depth=1.010000 + } + + instance={ + position={ 0.500000 0.830000 } + scale={ 0.050000 0.050000 } + depth=2.010000 + } + + } + + colored_emblem={ + color1=purple + color2=purple + texture="ce_tamgha_artabanos.dds" + instance={ + position={ 0.250000 0.170000 } + scale={ -0.170000 0.170000 } + depth=6.010000 + } + + instance={ + position={ 0.750000 0.170000 } + scale={ -0.170000 0.170000 } + depth=7.010000 + } + + instance={ + position={ 0.500000 0.750000 } + scale={ -0.170000 0.170000 } + depth=8.010000 + } + + } + + colored_emblem={ + color1=purple + texture="ce_chevron_in_chief.dds" + instance={ + position={ 0.500000 0.600000 } + depth=10.010000 + } + + instance={ + position={ 0.500000 0.700000 } + depth=11.010000 + } + + } + + colored_emblem={ + color1=purple texture="ce_crescent_random.dds" instance={ position={ 0.250000 0.090000 } @@ -570,29 +631,7 @@ dynn_britannia_cyflymarhyan ={ } colored_emblem={ - color1=yellow_light - texture="ce_ordinary_pale_5.dds" - instance={ - position={ 0.250000 0.250000 } - scale={ 0.050000 0.050000 } - } - - instance={ - position={ 0.750000 0.250000 } - scale={ 0.050000 0.050000 } - depth=1.010000 - } - - instance={ - position={ 0.500000 0.830000 } - scale={ 0.050000 0.050000 } - depth=2.010000 - } - - } - - colored_emblem={ - color1=red + color1=grey texture="ce_chevron_in_chief.dds" instance={ position={ 0.500000 0.650000 } @@ -602,40 +641,10 @@ dynn_britannia_cyflymarhyan ={ } colored_emblem={ - color1=yellow_light - texture="ce_chevron_in_chief.dds" + color1=grey + texture="ce_block_02.dds" instance={ - position={ 0.500000 0.600000 } - depth=10.010000 - } - - instance={ - position={ 0.500000 0.700000 } - depth=11.010000 - } - - } - - colored_emblem={ - color1=yellow_light - color2=yellow_light - texture="ce_tamgha_artabanos.dds" - instance={ - position={ 0.250000 0.170000 } - scale={ -0.170000 0.170000 } - depth=6.010000 - } - - instance={ - position={ 0.750000 0.170000 } - scale={ -0.170000 0.170000 } - depth=7.010000 - } - - instance={ - position={ 0.500000 0.750000 } - scale={ -0.170000 0.170000 } - depth=8.010000 + depth=12.010000 } } @@ -644,6 +653,7 @@ dynn_britannia_cyflymarhyan ={ + dynn_britannia_flamank = { pattern="pattern_solid.dds" color1=white @@ -820,7 +830,7 @@ dynn_britannia_leigh ={ } -spatstony_dynasty = { +house_spatstony = { custom=yes pattern="pattern__solid_designer.dds" color1=black @@ -1001,11 +1011,11 @@ dynn_britannia_starr = { dynn_britannia_said = { custom=yes pattern="pattern_solid.dds" - color1=rgb { 220 52 47 } + color1=red color2=yellow color3=black colored_emblem={ - color1=rgb { 241 238 62 } + color1=yellow texture="NEOW_ce_zanzibar.dds" instance={ position={ 0.500000 0.520000 } @@ -1015,7 +1025,7 @@ dynn_britannia_said = { } colored_emblem={ - color1=rgb { 29 154 61 } + color1=green texture="ce_circle_mask.dds" instance={ scale={ 0.590000 0.590000 } @@ -1028,14 +1038,14 @@ dynn_britannia_said = { dynn_britannia_primrose = { pattern="pattern_solid.dds" - color1=green_light + color1=green color2=yellow color3=red colored_emblem={ color1=yellow texture="ce_double_tressure.dds" instance={ - scale={ 0.960000 0.960000 } + position={ 0.500000 0.530000 } depth=3.010000 } @@ -1043,12 +1053,9 @@ dynn_britannia_primrose = { colored_emblem={ color1=yellow - texture="ce_cinquefoil_01.dds" - instance={ - position={ 0.400000 0.370000 } - scale={ 0.230000 0.230000 } - } - + color2=green + color3=yellow + texture="ce_flower.dds" instance={ position={ 0.600000 0.370000 } scale={ 0.240000 0.240000 } @@ -1063,6 +1070,27 @@ dynn_britannia_primrose = { } + colored_emblem={ + color1=yellow + color2=green_light + color3=yellow + texture="ce_flower.dds" + instance={ + position={ 0.400000 0.370000 } + scale={ 0.230000 0.230000 } + } + + } + + colored_emblem={ + color1=green + texture="ce_block_02.dds" + instance={ + depth=4.010000 + } + + } + } dynn_britannia_giray = { @@ -1123,7 +1151,7 @@ house_britannia_juny = { dynn_britannia_newton={ pattern="pattern__solid_designer.dds" - color1=green_light + color1=black color2=black color3=black colored_emblem={ @@ -2572,6 +2600,447 @@ dynn_britannia_dev={ } + +dynn_britannia_wellesley={ + pattern="pattern_checkers_02.dds" + color1=yellow + color2=red + color3=blue + colored_emblem={ + color1=red + texture="ce_block_05.dds" + instance={ + position={ 0.460000 0.230000 } + scale={ 0.190000 0.190000 } + rotation=49 + } + + instance={ + position={ 0.540000 0.320000 } + scale={ 0.110000 0.110000 } + depth=1.010000 + rotation=48 + } + + instance={ + position={ 0.450000 0.330000 } + scale={ 0.130000 0.130000 } + depth=2.010000 + rotation=130 + } + + instance={ + position={ 0.560000 0.200000 } + scale={ 0.110000 0.110000 } + depth=3.010000 + rotation=130 + } + + } + + colored_emblem={ + color1=white + texture="ce_cross_09.dds" + instance={ + position={ 0.500000 0.280000 } + scale={ 0.280000 0.350000 } + depth=6.010000 + } + + instance={ + position={ 0.760000 0.750000 } + scale={ 0.680000 0.680000 } + depth=61.010002 + } + + instance={ + position={ 0.240000 0.250000 } + scale={ 0.670000 0.670000 } + depth=62.010002 + } + + } + + colored_emblem={ + color1=white + texture="ce_circle_mask.dds" + instance={ + position={ 0.350000 0.350000 } + scale={ 0.050000 0.050000 } + depth=10.010000 + } + + instance={ + position={ 0.450000 0.350000 } + scale={ 0.050000 0.050000 } + depth=11.010000 + } + + instance={ + position={ 0.400000 0.400000 } + scale={ 0.050000 0.050000 } + depth=12.010000 + } + + instance={ + position={ 0.350000 0.450000 } + scale={ 0.050000 0.050000 } + depth=13.010000 + } + + instance={ + position={ 0.450000 0.450000 } + scale={ 0.050000 0.050000 } + depth=14.010000 + } + + instance={ + position={ 0.350000 0.150000 } + scale={ 0.050000 0.050000 } + depth=15.010000 + } + + instance={ + position={ 0.450000 0.150000 } + scale={ 0.050000 0.050000 } + depth=16.010000 + } + + instance={ + position={ 0.400000 0.100000 } + scale={ 0.050000 0.050000 } + depth=17.010000 + } + + instance={ + position={ 0.350000 0.050000 } + scale={ 0.050000 0.050000 } + depth=18.010000 + } + + instance={ + position={ 0.150000 0.050000 } + scale={ 0.050000 0.050000 } + depth=19.010000 + } + + instance={ + position={ 0.050000 0.050000 } + scale={ 0.050000 0.050000 } + depth=20.010000 + } + + instance={ + position={ 0.050000 0.150000 } + scale={ 0.050000 0.050000 } + depth=21.010000 + } + + instance={ + position={ 0.100000 0.100000 } + scale={ 0.050000 0.050000 } + depth=22.010000 + } + + instance={ + position={ 0.150000 0.150000 } + scale={ 0.050000 0.050000 } + depth=23.010000 + } + + instance={ + position={ 0.150000 0.350000 } + scale={ 0.050000 0.050000 } + depth=24.010000 + } + + instance={ + position={ 0.050000 0.350000 } + scale={ 0.050000 0.050000 } + depth=25.010000 + } + + instance={ + position={ 0.100000 0.400000 } + scale={ 0.050000 0.050000 } + depth=26.010000 + } + + instance={ + position={ 0.050000 0.450000 } + scale={ 0.050000 0.050000 } + depth=27.010000 + } + + instance={ + position={ 0.150000 0.450000 } + scale={ 0.050000 0.050000 } + depth=28.010000 + } + + instance={ + position={ 0.450000 0.050000 } + scale={ 0.050000 0.050000 } + depth=29.010000 + } + + instance={ + position={ 0.450000 0.350000 } + scale={ 0.050000 0.050000 } + depth=30.010000 + } + + instance={ + position={ 0.400000 0.400000 } + scale={ 0.050000 0.050000 } + depth=31.010000 + } + + instance={ + position={ 0.350000 0.450000 } + scale={ 0.050000 0.050000 } + depth=32.010002 + } + + instance={ + position={ 0.450000 0.450000 } + scale={ 0.050000 0.050000 } + depth=33.010002 + } + + instance={ + position={ 0.650000 0.650000 } + scale={ 0.050000 0.050000 } + depth=34.010002 + } + + instance={ + position={ 0.550000 0.550000 } + scale={ 0.050000 0.050000 } + depth=35.010002 + } + + instance={ + position={ 0.600000 0.600000 } + scale={ 0.050000 0.050000 } + depth=36.010002 + } + + instance={ + position={ 0.650000 0.550000 } + scale={ 0.050000 0.050000 } + depth=37.010002 + } + + instance={ + position={ 0.550000 0.650000 } + scale={ 0.050000 0.050000 } + depth=38.010002 + } + + instance={ + position={ 0.650000 0.650000 } + scale={ 0.050000 0.050000 } + depth=39.010002 + } + + instance={ + position={ 0.850000 0.550000 } + scale={ 0.050000 0.050000 } + depth=40.010002 + } + + instance={ + position={ 0.900000 0.600000 } + scale={ 0.050000 0.050000 } + depth=41.010002 + } + + instance={ + position={ 0.950000 0.550000 } + scale={ 0.050000 0.050000 } + depth=42.010002 + } + + instance={ + position={ 0.850000 0.650000 } + scale={ 0.050000 0.050000 } + depth=43.010002 + } + + instance={ + position={ 0.950000 0.650000 } + scale={ 0.050000 0.050000 } + depth=44.010002 + } + + instance={ + position={ 0.550000 0.550000 } + scale={ 0.050000 0.050000 } + depth=45.010002 + } + + instance={ + position={ 0.600000 0.600000 } + scale={ 0.050000 0.050000 } + depth=46.010002 + } + + instance={ + position={ 0.550000 0.850000 } + scale={ 0.050000 0.050000 } + depth=47.010002 + } + + instance={ + position={ 0.550000 0.950000 } + scale={ 0.050000 0.050000 } + depth=48.010002 + } + + instance={ + position={ 0.600000 0.900000 } + scale={ 0.050000 0.050000 } + depth=49.010002 + } + + instance={ + position={ 0.650000 0.850000 } + scale={ 0.050000 0.050000 } + depth=50.010002 + } + + instance={ + position={ 0.650000 0.950000 } + scale={ 0.050000 0.050000 } + depth=51.010002 + } + + instance={ + position={ 0.850000 0.850000 } + scale={ 0.050000 0.050000 } + depth=52.010002 + } + + instance={ + position={ 0.850000 0.950000 } + scale={ 0.050000 0.050000 } + depth=53.010002 + } + + instance={ + position={ 0.900000 0.900000 } + scale={ 0.050000 0.050000 } + depth=54.010002 + } + + instance={ + position={ 0.950000 0.850000 } + scale={ 0.050000 0.050000 } + depth=55.010002 + } + + instance={ + position={ 0.950000 0.950000 } + scale={ 0.050000 0.050000 } + depth=56.010002 + } + + } + + colored_emblem={ + color1=yellow + color2=yellow + texture="ce_crown.dds" + instance={ + position={ 0.300000 0.630000 } + scale={ 0.200000 0.070000 } + depth=57.010002 + rotation=27 + } + + instance={ + position={ 0.780000 0.150000 } + scale={ 0.200000 0.070000 } + depth=58.010002 + rotation=27 + } + + } + + colored_emblem={ + color1=red + texture="ce_block_02.dds" + instance={ + position={ 0.500000 0.280000 } + scale={ 0.220000 0.030000 } + depth=4.010000 + } + + instance={ + position={ 0.500000 0.280000 } + scale={ 0.030000 0.270000 } + depth=5.010000 + } + + instance={ + position={ 0.000000 0.000000 } + depth=63.010002 + } + + } + + colored_emblem={ + color1=blue + texture="ce_inescutcheon.dds" + instance={ + position={ 0.500000 0.280000 } + scale={ 0.550000 0.550000 } + depth=9.010000 + } + + } + + colored_emblem={ + color1=red + color2=red + color3=red + texture="ce_lion_rampant_wide_stance.dds" + instance={ + position={ 0.270000 0.750000 } + scale={ 0.560000 0.560000 } + depth=59.010002 + } + + instance={ + position={ 0.750000 0.270000 } + scale={ 0.560000 0.560000 } + depth=60.010002 + } + + } + + colored_emblem={ + color1=white + texture="ce_bendlet.dds" + instance={ + position={ 0.510000 0.260000 } + scale={ 0.210000 -0.210000 } + depth=7.010000 + rotation=175 + } + + instance={ + position={ 0.490000 0.260000 } + scale={ 0.210000 0.210000 } + depth=8.010000 + rotation=5 + } + + } + +} + dynn_britannia_cartney={ pattern="pattern__solid_designer.dds" color1=rgb { 52 49 45 } 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 91882d3a..afacefc5 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 @@ -20,6 +20,69 @@ } +d_cumbria={ + pattern="pattern_horizontal_split_01.dds" + color1=green_light + color2=blue + color3=red + colored_emblem={ + color1=white + texture="ce_block_02.dds" + instance={ + position={ 0.500000 1.000000 } + depth=6.010000 + } + + } + + colored_emblem={ + color1=blue + texture="ce_waves_04.dds" + instance={ + position={ 0.500000 1.000000 } + depth=3.010000 + } + + instance={ + position={ 0.500000 0.790000 } + depth=4.010000 + } + + instance={ + position={ 0.500000 0.560000 } + depth=5.010000 + } + + } + + colored_emblem={ + color1=red + texture="ce_block_05.dds" + instance={ + position={ 0.500000 0.180000 } + depth=1.010000 + } + + instance={ + position={ 0.500000 0.320000 } + depth=2.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_shrub.dds" + instance={ + position={ 0.500000 0.250000 } + scale={ 0.340000 0.340000 } + } + + } + +} + + e_european_union = { pattern = "pattern_solid.dds" color1 = "red" @@ -2044,41 +2107,32 @@ d_black_country={ d_buckingham={ - pattern="pattern_tricolor_horizontal_01.dds" + pattern="pattern_vertical_split_01.dds" color1=red - color2=blue - color3=red + color2=yellow_light + color3=orange colored_emblem={ color1=brown - color2=black + color2=yellow color3=white texture="ce_stag.dds" instance={ - position={ 0.320000 0.290000 } - scale={ 0.450000 0.450000 } - depth=5.010000 - } - - } - - colored_emblem={ - color1=yellow - texture="ce_yggdrasil_ockelbo.dds" - instance={ - position={ 0.310000 0.710000 } - scale={ 0.440000 0.440000 } - depth=2.010000 + position={ 0.740000 0.550000 } + scale={ 0.510000 0.510000 } + depth=1.010000 } } colored_emblem={ color1=white - texture="ce_byzantine_eagle.dds" + color2=orange + color3=yellow_light + texture="ce_swan.dds" instance={ - position={ 0.680000 0.680000 } - scale={ 0.330000 0.330000 } - depth=3.010000 + position={ 0.280000 0.520000 } + scale={ -0.510000 0.510000 } + depth=2.010000 } } @@ -2088,48 +2142,39 @@ d_buckingham={ color2=yellow texture="ce_crown_head.dds" instance={ - position={ 0.670000 0.640000 } + position={ 0.370000 0.490000 } scale={ 0.080000 0.080000 } - rotation=347 + rotation=11 } } colored_emblem={ - color1=yellow - color2=blue - texture="ce_quarterly.dds" + color1=yellow_light + color2=green + texture="ce_chief.dds" instance={ - depth=6.010000 + position={ 1.000000 0.500000 } + scale={ 1.000000 -1.000000 } + depth=3.010000 } } colored_emblem={ color1=red - texture="ce_block_02.dds" + color2=black + texture="ce_barry_04.dds" instance={ - position={ 1.000000 1.000000 } + position={ 0.000000 0.500000 } depth=4.010000 - } - - } - - colored_emblem={ - color1=yellow - color2=yellow - texture="ce_grain.dds" - instance={ - position={ 0.680000 0.290000 } - scale={ 0.430000 0.430000 } - depth=1.010000 + rotation=90 } } } - d_zanzibar={ pattern="pattern_horizontal_split_01.dds" color1=green diff --git a/N3OW/common/culture/cultures/00_brythonic.txt b/N3OW/common/culture/cultures/00_brythonic.txt index efee893a..baf702aa 100644 --- a/N3OW/common/culture/cultures/00_brythonic.txt +++ b/N3OW/common/culture/cultures/00_brythonic.txt @@ -59,35 +59,6 @@ welsh = { } } -breton = { - color = hsv { 0.72 0.6 0.76 } - - ethos = ethos_spiritual - heritage = heritage_french - language = language_brythonic - martial_custom = martial_custom_male_only - traditions = { - tradition_fishermen - tradition_storytellers - tradition_swords_for_hire - tradition_chanson_de_geste - } - - name_list = name_list_NEOW_breton - - coa_gfx = { breton_coa_gfx western_coa_gfx } - building_gfx = { western_building_gfx } - clothing_gfx = { western_clothing_gfx } - unit_gfx = { western_unit_gfx } - - ethnicities = { - 5 = caucasian_blond - 30 = caucasian_ginger - 35 = caucasian_brown_hair - 30 = caucasian_dark_hair - } -} - cornish = { color = hsv { 0.72 0.6 0.72 } diff --git a/N3OW/common/culture/cultures/NEOW_french.txt b/N3OW/common/culture/cultures/NEOW_french.txt index 04576147..5253bd3b 100644 --- a/N3OW/common/culture/cultures/NEOW_french.txt +++ b/N3OW/common/culture/cultures/NEOW_french.txt @@ -45,9 +45,9 @@ normaund = { martial_custom = martial_custom_equal traditions = { tradition_chanson_de_geste - tradition_castle_keepers + tradition_legalistic tradition_chivalry - tradition_fishermen + tradition_maritime_mercantilism } name_list = name_list_NEOW_french @@ -126,7 +126,6 @@ axiton = { tradition_castle_keepers tradition_chivalry tradition_brewery - tradition_gardening } name_list = name_list_NEOW_french @@ -163,7 +162,7 @@ provencal = { tradition_chanson_de_geste tradition_maritime_mercantilism tradition_chivalry - tradition_brewery + tradition_welcoming } name_list = name_list_NEOW_provencal @@ -235,9 +234,9 @@ picard = { traditions = { tradition_chanson_de_geste tradition_warrior_culture - tradition_chivalry + tradition_brewery tradition_reverence_for_veterans - tradition_staunch_traditionalists + tradition_esteemed_hospitality } name_list = name_list_NEOW_french @@ -277,7 +276,7 @@ galo = { tradition_chanson_de_geste tradition_swords_for_hire tradition_chivalry - tradition_fp2_malleable_subjects + tradition_fishermen } name_list = name_list_NEOW_french @@ -312,9 +311,9 @@ poitevin = { martial_custom = martial_custom_equal traditions = { tradition_chanson_de_geste - tradition_castle_keepers + tradition_zealous_people tradition_chivalry - tradition_brewery + tradition_staunch_traditionalists } name_list = name_list_NEOW_french @@ -349,9 +348,10 @@ gascon = { martial_custom = martial_custom_equal traditions = { tradition_chanson_de_geste - tradition_stalwart_defenders + tradition_castle_keepers tradition_chivalry tradition_brewery + tradition_agrarian } name_list = name_list_NEOW_french @@ -408,4 +408,41 @@ beur = { 5 = african 10 = mediterranean } +} + +breton = { + color = hsv { 0.72 0.6 0.76 } + + ethos = ethos_spiritual + heritage = heritage_french + language = language_brythonic + martial_custom = martial_custom_male_only + traditions = { + tradition_fishermen + tradition_hereditary_bards + tradition_swords_for_hire + tradition_seafaring + } + + name_list = name_list_NEOW_breton + + coa_gfx = { breton_coa_gfx french_coa_gfx western_coa_gfx } + building_gfx = { western_building_gfx } + clothing_gfx = { western_clothing_gfx } + unit_gfx = { western_unit_gfx } + + ethnicities = { + 6 = caucasian_blond + 3 = caucasian_ginger + 31 = caucasian_brown_hair + 25 = caucasian_dark_hair + 6 = slavic_blond + 5 = slavic_brown_hair + 1 = slavic_dark_hair + 11 = arab + 4 = african + 7 = mediterranean + 1 = asian + 1 = south_indian + } } \ No newline at end of file diff --git a/N3OW/common/culture/cultures/NEOW_rhaeto_helvetic.txt b/N3OW/common/culture/cultures/NEOW_rhaeto_helvetic.txt index 6b8fad01..66922bf8 100644 --- a/N3OW/common/culture/cultures/NEOW_rhaeto_helvetic.txt +++ b/N3OW/common/culture/cultures/NEOW_rhaeto_helvetic.txt @@ -13,7 +13,7 @@ pelonais = { tradition_parochialism tradition_hard_working tradition_chivalry - tradition_brewery + tradition_culinary_artists } name_list = name_list_french diff --git a/N3OW/common/culture/name_lists/NEOW_french.txt b/N3OW/common/culture/name_lists/NEOW_french.txt index c4c7e38b..3b80a47e 100644 --- a/N3OW/common/culture/name_lists/NEOW_french.txt +++ b/N3OW/common/culture/name_lists/NEOW_french.txt @@ -74,6 +74,7 @@ name_list_NEOW_french = { "dynn_Morel" "dynn_Morin" "dynn_Muller" + "dynn_Nguyen" "dynn_Nicolas" "dynn_No_e_uml_l" "dynn_Olivier" @@ -178,6 +179,7 @@ name_list_NEOW_french = { "dynn_Morel" "dynn_Morin" "dynn_Muller" + "dynn_Nguyen" "dynn_Nicolas" "dynn_No_e_uml_l" "dynn_Olivier" diff --git a/N3OW/common/culture/traditions/00_ritual_traditions.txt b/N3OW/common/culture/traditions/00_ritual_traditions.txt index e9e0bebb..16f394c0 100644 --- a/N3OW/common/culture/traditions/00_ritual_traditions.txt +++ b/N3OW/common/culture/traditions/00_ritual_traditions.txt @@ -1693,7 +1693,7 @@ tradition_runestones = { culture = prev primary_title.tier >= tier_county OR = { - has_trait = poet + has_trait = lifestyle_poet has_trait = arrogant has_trait = journaller } diff --git a/N3OW/common/culture/traditions/00_societal_traditions.txt b/N3OW/common/culture/traditions/00_societal_traditions.txt index f6c90dcc..14d2a667 100644 --- a/N3OW/common/culture/traditions/00_societal_traditions.txt +++ b/N3OW/common/culture/traditions/00_societal_traditions.txt @@ -1145,7 +1145,7 @@ tradition_storytellers = { count >= 3 culture = prev primary_title.tier >= tier_county - has_trait = poet + has_trait = lifestyle_poet } } } @@ -1389,7 +1389,7 @@ tradition_poetry = { count >= 3 culture = prev primary_title.tier >= tier_county - has_trait = poet + has_trait = lifestyle_poet } } } diff --git a/N3OW/common/culture/traditions/01_fp1_traditions.txt b/N3OW/common/culture/traditions/01_fp1_traditions.txt index ed8936c3..cce3beb5 100644 --- a/N3OW/common/culture/traditions/01_fp1_traditions.txt +++ b/N3OW/common/culture/traditions/01_fp1_traditions.txt @@ -330,7 +330,7 @@ tradition_fp1_northern_stories = { count >= 3 culture = prev primary_title.tier >= tier_county - has_trait = poet + has_trait = lifestyle_poet } } } diff --git a/N3OW/common/culture/traditions/03_fp3_traditions.txt b/N3OW/common/culture/traditions/03_fp3_traditions.txt index dc1cde0e..8bc46542 100644 --- a/N3OW/common/culture/traditions/03_fp3_traditions.txt +++ b/N3OW/common/culture/traditions/03_fp3_traditions.txt @@ -497,7 +497,7 @@ tradition_fp3_enlightened_magnates = { count >= 3 culture = prev primary_title.tier >= tier_county - has_trait = poet + has_trait = lifestyle_poet } } } diff --git a/N3OW/common/customizable_localization/00_diarchy_custom_loc.txt b/N3OW/common/customizable_localization/00_diarchy_custom_loc.txt index ff2ddcc6..4c787b2b 100644 --- a/N3OW/common/customizable_localization/00_diarchy_custom_loc.txt +++ b/N3OW/common/customizable_localization/00_diarchy_custom_loc.txt @@ -1159,7 +1159,7 @@ VizierExtravagance_T2_Activities = { weight_multiplier = { modifier = { add = 10 - diarch = { has_trait = poet } + diarch = { has_trait = lifestyle_poet } } } } diff --git a/N3OW/common/customizable_localization/00_historical_character_loc.txt b/N3OW/common/customizable_localization/00_historical_character_loc.txt index e290d09e..48538e96 100644 --- a/N3OW/common/customizable_localization/00_historical_character_loc.txt +++ b/N3OW/common/customizable_localization/00_historical_character_loc.txt @@ -804,7 +804,7 @@ HistoricalCharacterJobDesc = { NOR = { has_trait = devoted has_trait = theologian - has_trait = poet + has_trait = lifestyle_poet AND = { faith = faith:norse_pagan has_trait = lifestyle_mystic @@ -817,7 +817,7 @@ HistoricalCharacterJobDesc = { text = { trigger = { - has_trait = poet + has_trait = lifestyle_poet NOT = { has_trait = berserker } } localization_key = historical_character.poet @@ -825,7 +825,7 @@ HistoricalCharacterJobDesc = { text = { trigger = { - has_trait = poet + has_trait = lifestyle_poet has_trait = berserker } localization_key = historical_character.warrior_poet @@ -863,7 +863,7 @@ HistoricalCharacterJobDesc = { text = { trigger = { - has_trait = poet + has_trait = lifestyle_poet NOT = { has_trait = theologian } } localization_key = historical_character.author diff --git a/N3OW/common/customizable_localization/00_rich_presence_flavor_status.txt b/N3OW/common/customizable_localization/00_rich_presence_flavor_status.txt index 9805eff5..103d3ef8 100644 --- a/N3OW/common/customizable_localization/00_rich_presence_flavor_status.txt +++ b/N3OW/common/customizable_localization/00_rich_presence_flavor_status.txt @@ -477,7 +477,7 @@ text = { # Poet trigger = { - has_trait = poet + has_trait = lifestyle_poet } localization_key = rich_presence_poet } diff --git a/N3OW/common/dynasties/NEOW_dynasties.txt b/N3OW/common/dynasties/NEOW_dynasties.txt index 53d5e793..d15e1434 100644 --- a/N3OW/common/dynasties/NEOW_dynasties.txt +++ b/N3OW/common/dynasties/NEOW_dynasties.txt @@ -56,11 +56,6 @@ delunsch_dynasty = { culture = lorin } -spatstony_dynasty = { - name = dynn_spatstony - culture = english #change to soufyrneg later -} - millardet_dynasty = { name = dynn_millardet culture = normaund diff --git a/N3OW/common/dynasty_houses/NEOW_dynasty_houses.txt b/N3OW/common/dynasty_houses/NEOW_dynasty_houses.txt index c6069cc6..e95c4752 100644 --- a/N3OW/common/dynasty_houses/NEOW_dynasty_houses.txt +++ b/N3OW/common/dynasty_houses/NEOW_dynasty_houses.txt @@ -21,4 +21,9 @@ house_jimena_zaragoza = { house_jimena = { name = dynn_jimena dynasty = dias_dynasty #Dias +} + +house_spatstony = { + name = dynn_spatstony + dynasty = dynn_britannia_crowtemple } \ No newline at end of file diff --git a/N3OW/common/governments/00_government_types.txt b/N3OW/common/governments/00_government_types.txt index ec7321b2..4651fefa 100644 --- a/N3OW/common/governments/00_government_types.txt +++ b/N3OW/common/governments/00_government_types.txt @@ -452,9 +452,9 @@ administrative_government = { royal_court = top_liege domicile_type = estate - main_administrative_tier = county - min_appointment_tier = county - minimum_provincial_maa_tier = county + main_administrative_tier = duchy + min_appointment_tier = duchy + minimum_provincial_maa_tier = duchy fallback = 3 diff --git a/N3OW/common/landed_titles/britannia.txt b/N3OW/common/landed_titles/britannia.txt index f25b6892..53c76b7f 100644 --- a/N3OW/common/landed_titles/britannia.txt +++ b/N3OW/common/landed_titles/britannia.txt @@ -127,33 +127,43 @@ e_britannia = { color = { 205 20 15 } } } - c_cambridgeshire = { - color = { 151 85 77 } + c_essex = { + color = { 246 1 1 } - b_cambridge = { - province = 1534 - - color = { 205 145 5 } + cultural_names = { + name_list_anglo_saxon = cn_east_seaxe + name_list_old_saxon = cn_east_seaxe } - b_papworth = { - province = 1536 - color = { 205 145 5 } + b_colchester = { + province = 1514 + + cultural_names = { + name_list_anglo_saxon = cn_colenceaster + name_list_old_saxon = cn_colenceaster + } + + color = { 220 20 30 } } - b_hurstingstone = { - province = 1541 + b_maldon = { + province = 1515 - color = { 175 40 55 } + color = { 220 20 30 } } - b_leightonstone = { - province = 1543 + b_dunmow = { + province = 1517 - color = { 175 40 55 } + color = { 220 20 30 } } - b_peterborough = { - province = 1542 + b_chelmsford = { + province = 1516 - color = { 125 5 5 } + color = { 220 20 30 } + } + b_thurrock = { + province = 9733 + + color = { 220 20 30 } } } c_hertfordshire = { @@ -236,43 +246,33 @@ e_britannia = { } } } - c_essex = { - color = { 246 1 1 } + c_cambridgeshire = { + color = { 151 85 77 } - cultural_names = { - name_list_anglo_saxon = cn_east_seaxe - name_list_old_saxon = cn_east_seaxe + b_cambridge = { + province = 1534 + + color = { 205 145 5 } } + b_papworth = { + province = 1536 - b_colchester = { - province = 1514 - - cultural_names = { - name_list_anglo_saxon = cn_colenceaster - name_list_old_saxon = cn_colenceaster - } - - color = { 220 20 30 } + color = { 205 145 5 } } - b_maldon = { - province = 1515 + b_hurstingstone = { + province = 1541 - color = { 220 20 30 } + color = { 175 40 55 } } - b_dunmow = { - province = 1517 + b_leightonstone = { + province = 1543 - color = { 220 20 30 } + color = { 175 40 55 } } - b_chelmsford = { - province = 1516 + b_peterborough = { + province = 1542 - color = { 220 20 30 } - } - b_thurrock = { - province = 9733 - - color = { 220 20 30 } + color = { 125 5 5 } } } c_suffolk = { @@ -379,32 +379,30 @@ e_britannia = { province = 9730 } } - c_avon = { - color = { 180 86 38 } + c_wiltshire = { + color = { 229 1 49 } - b_bristol = { - province = 1581 + b_salisbury = { + province = 1561 - color = { 245 85 20 } + color = { 250 55 15 } } - b_winterstoke = { - province = 1577 + b_wilton = { + province = 1562 - color = { 241 30 75 } + color = { 250 55 15 } } - b_bath = { - province = 1576 + b_ramsbury = { + province = 1563 - color = { 241 30 75 } + color = { 250 55 15 } + } + b_malmesbury = { + province = 1564 + + color = { 250 55 15 } } } - } - - d_buckingham = { # Buckingham - color = { 200 1 1 } - - capital = c_berkshire# Windsor/Reading - c_oxfordshire = { color = { 248 1 65 } @@ -423,12 +421,14 @@ e_britannia = { color = { 255 115 15 } } - b_abingdon = { - province = 1557 - - color = { 255 100 25 } - } } + } + + d_buckingham = { # Buckingham + color = { 200 1 1 } + + capital = c_berkshire# Windsor/Reading + c_berkshire = { color = { 216 72 91 } @@ -440,6 +440,11 @@ e_britannia = { b_newbury = { province = 1556 + color = { 255 100 25 } + } + b_abingdon = { + province = 1557 + color = { 255 100 25 } } } @@ -607,29 +612,23 @@ e_britannia = { add = @better_than_the_alternatives_score } } + c_avon = { + color = { 180 86 38 } - c_wiltshire = { - color = { 229 1 49 } + b_bristol = { + province = 1581 - b_salisbury = { - province = 1561 - - color = { 250 55 15 } + color = { 245 85 20 } } - b_wilton = { - province = 1562 + b_winterstoke = { + province = 1577 - color = { 250 55 15 } + color = { 241 30 75 } } - b_ramsbury = { - province = 1563 + b_bath = { + province = 1576 - color = { 250 55 15 } - } - b_malmesbury = { - province = 1564 - - color = { 250 55 15 } + color = { 241 30 75 } } } c_dorset = { @@ -808,7 +807,7 @@ e_britannia = { k_northumberland = { color = { 216 21 41 } - capital = c_liverpool + capital = c_westriding cultural_names = { name_list_brittannic = cn_norfumbyrhlandd @@ -962,7 +961,7 @@ e_britannia = { d_lancaster = { color = { 250 1 1 } - capital = c_lancashire # Lancaster + capital = c_liverpool # Lancaster cultural_names = { name_list_breton = cn_rheged @@ -980,11 +979,6 @@ e_britannia = { color = { 250 55 5 } } - b_salford = { - province = 1640 - - color = { 250 55 5 } - } b_west_derby = { province = 1641 @@ -996,6 +990,47 @@ e_britannia = { color = { 250 55 5 } } } + c_cheshire = { + color = { 253 1 26 } + + b_manchester = { + province = 9721 + + color = { 253 1 26 } + } + b_northwich = { + province = 1645 + + color = { 255 127 15 } + } + b_salford = { + province = 1640 + + color = { 250 55 5 } + } + } + c_liverpool = { + color = { 253 1 26 } + + b_liverpool = { + province = 9720 + + color = { 253 1 26 } + } + b_chester = { + province = 1643 + + color = { 255 152 50 } + } + b_macclesfield = { + province = 1644 + + color = { 255 127 15 } + } + } + } + d_cumbria = { + color = { 254 1 73 } c_cumberland = { color = { 216 71 21 } @@ -1070,41 +1105,7 @@ e_britannia = { color = { 240 25 25 } } } - c_cheshire = { - color = { 253 1 26 } - - b_manchester = { - province = 9721 - - color = { 253 1 26 } - } - b_northwich = { - province = 1645 - - color = { 255 127 15 } - } - b_macclesfield = { - province = 1644 - - color = { 255 127 15 } - } - } - c_liverpool = { - color = { 253 1 26 } - - b_liverpool = { - province = 9720 - - color = { 253 1 26 } - } - b_chester = { - province = 1643 - - color = { 255 152 50 } - } - } } - d_york = { color = { 254 1 73 } @@ -1542,30 +1543,6 @@ e_britannia = { b_evesham = { province = 1624 - color = { 160 20 5 } - } - } - c_worcestershire = { - color = { 1 178 131 } - - b_worcester = { - province = 1625 - - color = { 160 20 5 } - } - b_kidderminster = { - province = 1626 - - color = { 160 20 5 } - } - b_bromsgrove = { - province = 9724 - - color = { 160 20 5 } - } - b_redditch = { - province = 9725 - color = { 160 20 5 } } } @@ -1725,6 +1702,30 @@ e_britannia = { color = { 190 30 30 } } } + c_worcestershire = { + color = { 1 178 131 } + + b_worcester = { + province = 1625 + + color = { 160 20 5 } + } + b_kidderminster = { + province = 1626 + + color = { 160 20 5 } + } + b_bromsgrove = { + province = 9724 + + color = { 160 20 5 } + } + b_redditch = { + province = 9725 + + color = { 160 20 5 } + } + } } d_powys = { color = { 1 139 70 } @@ -2039,6 +2040,11 @@ e_britannia = { color = { 210 115 5 } } + b_clackmannan = { + province = 1736 + + color = { 245 130 0 } + } } c_strathearn = { color = { 1 51 173 } @@ -2053,10 +2059,15 @@ e_britannia = { color = { 245 130 0 } } - b_clackmannan = { - province = 1736 + b_falkirk = { + province = 1733 - color = { 245 130 0 } + color = { 185 115 25 } + } + b_meneith = { + province = 1697 + + color = { 230 150 50 } } } c_atholl = { @@ -2072,30 +2083,6 @@ e_britannia = { color = { 225 155 20 } } - b_badenoch = { - province = 1710 - - color = { 240 160 45 } - } - } - c_angus = { - color = { 1 35 192 } - - b_dundee = { - province = 1720 - - color = { 225 125 20 } - } - b_kirriemuir = { - province = 1721 - - color = { 225 125 20 } - } - b_kincardine = { - province = 1719 - - color = { 230 140 10 } - } } } @@ -2123,7 +2110,16 @@ e_britannia = { name_list_cumbrian = cn_alt_clut name_list_welsh = cn_alt_clut } + b_glasgow = { + province = 1696 + color = { 230 150 50 } + } + b_strathgryte = { + province = 1687 + + color = { 230 145 50 } + } b_dumbarton = { province = 1695 @@ -2137,15 +2133,24 @@ e_britannia = { name_list_welsh = cn_alclud } } - b_glasgow = { - province = 1696 + } + c_lanarkshire = { + color = { 52 98 233 } - color = { 230 150 50 } + b_lanark = { + province = 1737 + + color = { 195 100 35 } } - b_meneith = { - province = 1697 + b_cadyou = { + province = 1738 - color = { 230 150 50 } + color = { 195 100 35 } + } + b_biggar = { + province = 1739 + + color = { 195 100 35 } } } c_ayrshire = { @@ -2164,59 +2169,35 @@ e_britannia = { color = { 230 145 50 } } - b_strathgryte = { - province = 1687 - - color = { 230 145 50 } - } b_cunningham = { province = 1688 color = { 230 145 50 } } - } - c_argyll = { - color = { 1 62 104 } + b_arran = { + province = 1690 - cultural_names = { - name_list_norse = cn_argjall - name_list_norwegian = cn_argjall - } - - b_kilmarten = { - province = 1700 - - color = { 215 200 15 } + color = { 255 200 10 } cultural_names = { - name_list_norse = cn_kjarbarey - name_list_norwegian = cn_kjarbarey + name_list_norse = cn_hereyjar + name_list_norwegian = cn_hereyjar } } - b_glencoe = { - province = 1701 + b_maybole = { + province = 1680 - color = { 215 200 15 } - - cultural_names = { - name_list_norse = cn_dysjarstadr - name_list_norwegian = cn_dysjarstadr - } + color = { 250 105 70 } } - b_lomond = { - province = 1702 + b_girvan = { + province = 1685 - color = { 215 200 15 } - - cultural_names = { - name_list_norse = cn_lokolofni - name_list_norwegian = cn_lokolofni - } + color = { 250 105 70 } } - b_helensburg = { - province = 9695 + b_cumnock = { + province = 9694 - color = { 215 200 15 } + color = { 250 105 70 } } } } @@ -2250,25 +2231,6 @@ e_britannia = { } } - c_lanarkshire = { - color = { 52 98 233 } - - b_lanark = { - province = 1737 - - color = { 195 100 35 } - } - b_cadyou = { - province = 1738 - - color = { 195 100 35 } - } - b_biggar = { - province = 1739 - - color = { 195 100 35 } - } - } c_galloway = { cultural_names = { name_list_pictish = cn_galwyddel @@ -2297,25 +2259,6 @@ e_britannia = { color = { 230 120 65 } } } - c_carrick = { - color = { 61 114 167 } - - b_maybole = { - province = 1680 - - color = { 250 105 70 } - } - b_girvan = { - province = 1685 - - color = { 250 105 70 } - } - b_cumnock = { - province = 9694 - - color = { 250 105 70 } - } - } c_annandale = { color = { 91 51 239 } @@ -2379,21 +2322,21 @@ e_britannia = { color = { 240 160 45 } } - b_glenelg = { - province = 8776 - - color = { 240 160 45 } - } - b_ardnamurchon = { - province = 35 + b_glencoe = { + province = 1701 color = { 215 200 15 } cultural_names = { - name_list_norse = cn_mylarsund - name_list_norwegian = cn_mylarsund + name_list_norse = cn_dysjarstadr + name_list_norwegian = cn_dysjarstadr } } + b_badenoch = { + province = 1710 + + color = { 240 160 45 } + } } c_ross = { color = { 1 59 179 } @@ -2413,6 +2356,11 @@ e_britannia = { color = { 250 210 85 } } + b_glenelg = { + province = 8776 + + color = { 240 160 45 } + } b_tain = { province = 8777 @@ -2501,7 +2449,40 @@ e_britannia = { name_list_norse = cn_sudreyjar name_list_norwegian = cn_sudreyjar } + c_argyll = { + color = { 1 62 104 } + cultural_names = { + name_list_norse = cn_argjall + name_list_norwegian = cn_argjall + } + + b_kilmarten = { + province = 1700 + + color = { 215 200 15 } + + cultural_names = { + name_list_norse = cn_kjarbarey + name_list_norwegian = cn_kjarbarey + } + } + b_lomond = { + province = 1702 + + color = { 215 200 15 } + + cultural_names = { + name_list_norse = cn_lokolofni + name_list_norwegian = cn_lokolofni + } + } + b_helensburg = { + province = 9695 + + color = { 215 200 15 } + } + } c_inner_hebrides = { color = { 64 89 125 } @@ -2520,14 +2501,14 @@ e_britannia = { name_list_norwegian = cn_il } } - b_arran = { - province = 1690 + b_ardnamurchon = { + province = 35 - color = { 255 200 10 } + color = { 215 200 15 } cultural_names = { - name_list_norse = cn_hereyjar - name_list_norwegian = cn_hereyjar + name_list_norse = cn_mylarsund + name_list_norwegian = cn_mylarsund } } b_mull = { @@ -2664,11 +2645,6 @@ e_britannia = { c_linlithgowshire = { # Falkirk color = { 52 74 254 } - b_falkirk = { - province = 1733 - - color = { 185 115 25 } - } b_linlithgow = { province = 1731 @@ -2711,6 +2687,25 @@ e_britannia = { color = { 255 180 60 } } } + c_angus = { + color = { 1 35 192 } + + b_dundee = { + province = 1720 + + color = { 225 125 20 } + } + b_kirriemuir = { + province = 1721 + + color = { 225 125 20 } + } + b_kincardine = { + province = 1719 + + color = { 230 140 10 } + } + } c_buchan = { # Peterhead color = { 1 42 130 } diff --git a/N3OW/common/religion/doctrines/30_core_tenets.txt b/N3OW/common/religion/doctrines/30_core_tenets.txt index 88b3b8e6..e10da1e5 100644 --- a/N3OW/common/religion/doctrines/30_core_tenets.txt +++ b/N3OW/common/religion/doctrines/30_core_tenets.txt @@ -779,7 +779,7 @@ traits = { virtues = { gallant - poet + lifestyle_poet } } } diff --git a/N3OW/common/script_values/00_scheme_values.txt b/N3OW/common/script_values/00_scheme_values.txt index 9088f2f8..9fac7690 100644 --- a/N3OW/common/script_values/00_scheme_values.txt +++ b/N3OW/common/script_values/00_scheme_values.txt @@ -4695,7 +4695,7 @@ odds_romance_scheme_misc_value = { if = { # Tradition limit = { scope:owner = { - has_trait = poet + has_trait = lifestyle_poet culture = { has_cultural_parameter = poet_trait_romance_bonuses } diff --git a/N3OW/common/script_values/04_ep2_tournament_values.txt b/N3OW/common/script_values/04_ep2_tournament_values.txt index 43cc6a07..1b11cec3 100644 --- a/N3OW/common/script_values/04_ep2_tournament_values.txt +++ b/N3OW/common/script_values/04_ep2_tournament_values.txt @@ -492,7 +492,7 @@ contest_type_aptitude_wit = { if = { limit = { involved_activity ?= { has_current_phase = tournament_phase_recital } - has_trait = poet + has_trait = lifestyle_poet } add = { value = 1 diff --git a/N3OW/common/script_values/destiny_score_interest_value.txt b/N3OW/common/script_values/destiny_score_interest_value.txt index 087da7cf..0615fdb6 100644 --- a/N3OW/common/script_values/destiny_score_interest_value.txt +++ b/N3OW/common/script_values/destiny_score_interest_value.txt @@ -994,7 +994,7 @@ destiny_score_interesting_traits = { } if = { limit = { - has_trait = poet + has_trait = lifestyle_poet } add = { value = 25 diff --git a/N3OW/descriptor.mod b/N3OW/descriptor.mod index 2f03be36..6b02c990 100644 --- a/N3OW/descriptor.mod +++ b/N3OW/descriptor.mod @@ -9,4 +9,4 @@ replace_path="history/cultures" replace_path="history/provinces" replace_path="history/titles" supported_version="1.16.*" -path="mod/N3OW" \ No newline at end of file +path="C:/Users/pkkim/Documents/Paradox Interactive/Crusader Kings III/mod/N3OW/N3OW" \ No newline at end of file diff --git a/N3OW/events/dlc/mpo/mpo_decisions_events.txt b/N3OW/events/dlc/mpo/mpo_decisions_events.txt index 730b93fc..f4919187 100644 --- a/N3OW/events/dlc/mpo/mpo_decisions_events.txt +++ b/N3OW/events/dlc/mpo/mpo_decisions_events.txt @@ -531,8 +531,8 @@ scripted_effect mpo_decisions_events_0020_bonuses_tooltips_effect = { scope:heir = { has_trait = lifestyle_physician } } AND = { - has_trait = poet - scope:heir = { has_trait = poet } + has_trait = lifestyle_poet + scope:heir = { has_trait = lifestyle_poet } } AND = { has_trait = lifestyle_gardener @@ -1926,10 +1926,10 @@ mpo_decisions_events.0021 = { } 1 = { trigger = { - has_trait = poet - scope:heir = { has_trait = poet } + has_trait = lifestyle_poet + scope:heir = { has_trait = lifestyle_poet } } - trait:poet = { + trait:lifestyle_poet = { save_scope_as = lifestyle_trait } } diff --git a/N3OW/history/characters/NEOW_e_britannia.txt b/N3OW/history/characters/NEOW_e_britannia.txt index 1cfb4b00..f5a42e67 100644 --- a/N3OW/history/characters/NEOW_e_britannia.txt +++ b/N3OW/history/characters/NEOW_e_britannia.txt @@ -10,7 +10,7 @@ britannia_cyflymarhyan_frydyryk = { trait = lustful trait = compassionate trait = brave - trait = poet + trait = lifestyle_poet sexuality = bisexual 2509.1.1 = { birth = yes @@ -98,7 +98,7 @@ britannia_cyflymarhyan_ellyzabyf = { #fquicksilver descen trait = paranoid trait = intellect_good_2 trait = theologian - trait = poet + trait = lifestyle_poet trait = reclusive trait = depressed_1 sexuality = heterosexual @@ -195,13 +195,13 @@ britannia_said_palamedes = { britannia_starr_cory = { name = "Cory" dynasty = dynn_britannia_starr - religion = "anglican_england" + religion = "victorian" culture = scouseg trait = education_learning_3 trait = zealous trait = brave trait = gluttonous - trait = poet + trait = lifestyle_poet 2476.1.1 = { birth = yes } @@ -213,7 +213,7 @@ britannia_starr_cory = { britannia_starr_kenneth = { name = "Kenneth" dynasty = dynn_britannia_starr - religion = "anglican_england" + religion = "victorian" culture = strafclideg trait = education_learning_3 trait = just @@ -232,7 +232,7 @@ britannia_starr_kenneth = { britannia_starr_cwmfwrt = { name = "Cwmfwrt" dynasty = dynn_britannia_starr - religion = "anglican_england" + religion = "victorian" culture = strafclideg trait = education_learning_3 trait = lifestyle_physician @@ -254,13 +254,13 @@ britannia_starr_cwmfwrt = { britannia_starr_kevyn = { name = "Kyvyn" dynasty = dynn_britannia_starr - religion = "anglican_england" + religion = "victorian" culture = scouseg trait = education_learning_4 trait = shy trait = diligent trait = patient - trait = poet + trait = lifestyle_poet father = britannia_starr_cory 2502.1.1 = { birth = yes @@ -273,7 +273,7 @@ britannia_starr_kevyn = { britannia_starr_thwmys = { name = "Thomys" dynasty = dynn_britannia_starr - religion = "anglican_england" + religion = "victorian" culture = strafclideg trait = education_learning_3 trait = lifestyle_scholar @@ -292,7 +292,7 @@ britannia_starr_thwmys = { britannia_starr_rwshy = { name = "Rwshy" dynasty = dynn_britannia_starr - religion = "anglican_england" + religion = "victorian" culture = scouseg trait = education_diplomacy_2 trait = beauty_good_3 @@ -379,7 +379,7 @@ britannia_giray_basenzhabu = { trait = gregarious trait = just trait = ambitious - trait = poet + trait = lifestyle_poet 2530.1.1 = { birth = yes } @@ -391,7 +391,7 @@ britannia_giray_basenzhabu = { britannia_flamank_tristan = { name = "Tristan" dynasty = dynn_britannia_flamank - religion = "avalonian" + religion = "victorian" culture = weslander trait = education_martial_2 trait = trusting @@ -565,7 +565,7 @@ britannia_nelson_boudica = { name = "Boudica" female = yes dynasty = dynn_britannia_nelson - religion = "victorian" + religion = "anglican_england" culture = easlander trait = education_martial_4 trait = zealous @@ -587,7 +587,7 @@ britannia_nelson_hannah = { name = "Hannah" female = yes dynasty = dynn_britannia_nelson - religion = "victorian" + religion = "anglican_england" culture = easlander trait = rowdy trait = stubborn @@ -667,7 +667,7 @@ britannia_solomonid_arthur = { trait = gregarious trait = lustful trait = compassionate - trait = poet + trait = lifestyle_poet trait = lifestyle_blademaster 2500.1.1 = { birth = yes @@ -699,8 +699,8 @@ britannia_colbrugha_michael = { britannia_lawrence_owain = { name = "Owain" dynasty = dynn_britannia_lawrence - religion = "gorsedd" - culture = welsh + religion = "victorian" + culture = scouseg trait = education_martial_2 trait = arbitrary trait = patient @@ -717,8 +717,8 @@ britannia_lawrence_owain = { britannia_montgomyrhy_fodorh = { name = "Ffrhagan" dynasty = dynn_britannia_montgomyrhy - religion = "arcane" - culture = prytoneg + religion = "gorsedd" + culture = welsh trait = education_martial_2 trait = chaste trait = humble @@ -794,8 +794,8 @@ britannia_aurelian_ambrose = { britannia_fitsosbern_horatio = { name = "Horatio" dynasty = dynn_britannia_fitsosbern - religion = "jack_tar" - culture = angler + religion = "victorian" + culture = soueyrneg trait = education_martial_3 trait = ambitious trait = temperate @@ -1078,7 +1078,7 @@ britannia_fitzgibbon_tiernan = { britannia_hendderswn_ddaiwyis = { #fix later, also check if reference name = "Ddaiwyis" dynasty = dynn_britannia_hendderswn - religion = "old_thelema" + religion = "victorian" culture = strafclideg trait = education_learning_3 trait = cynical @@ -1293,8 +1293,8 @@ britannia_carnegie_ramsey = { britannia_windsor_george = { name = "George" dynasty = dynn_britannia_windsor - religion = "anglican_england" - culture = norflander + religion = "victorian" + culture = soueyrneg trait = education_diplomacy_4 trait = brave trait = honest @@ -1304,9 +1304,9 @@ britannia_windsor_george = { } 2525.1.1 = { add_spouse = britannia_windsor_mary - effect = { - make_character_crypto_religionist_effect = { CRYPTO_RELIGION = faith:anglican_england } - } + #effect = { + # make_character_crypto_religionist_effect = { CRYPTO_RELIGION = faith:anglican_england } + #} } 2600.1.1 = { death = yes @@ -1317,7 +1317,7 @@ britannia_windsor_edward = { name = "Edward" dynasty = dynn_britannia_windsor religion = "victorian" - culture = norflander + culture = soueyrneg trait = education_martial_3 trait = brave trait = stubborn @@ -1336,9 +1336,9 @@ britannia_windsor_edward = { effect = { set_relation_soulmate = character:britannia_wall_symwny } - effect = { - make_character_crypto_religionist_effect = { CRYPTO_RELIGION = faith:anglican_england } - } + #effect = { + # make_character_crypto_religionist_effect = { CRYPTO_RELIGION = faith:anglican_england } + # } } 2600.1.1 = { death = yes @@ -1348,8 +1348,8 @@ britannia_windsor_edward = { britannia_windsor_albert = { name = "Albert" dynasty = dynn_britannia_windsor - religion = "anglican_england" - culture = norflander + religion = "victorian" + culture = soueyrneg trait = education_diplomacy_4 trait = shy trait = brave @@ -1370,8 +1370,8 @@ britannia_windsor_albert = { britannia_windsor_mary_1 = { name = "Mary" dynasty = dynn_britannia_windsor - religion = "anglican_england" - culture = norflander + religion = "victorian" + culture = soueyrneg female = yes trait = education_stewardship_3 trait = generous @@ -1392,8 +1392,8 @@ britannia_windsor_mary_1 = { britannia_windsor_henry = { name = "Henry" dynasty = dynn_britannia_windsor - religion = "anglican_england" - culture = norflander + religion = "victorian" + culture = soueyrneg trait = education_martial_3 trait = brave trait = humble @@ -1413,8 +1413,8 @@ britannia_windsor_henry = { britannia_windsor_george_1 = { name = "George" dynasty = dynn_britannia_windsor - religion = "anglican_england" - culture = norflander + religion = "victorian" + culture = soueyrneg trait = education_learning_4 trait = lustful trait = hashishiyah @@ -1437,7 +1437,7 @@ britannia_windsor_john = { name = "John" dynasty = dynn_britannia_windsor religion = "victorian" - culture = norflander + culture = soueyrneg trait = education_learning_1 trait = beauty_good_1 trait = possessed_1 @@ -1459,8 +1459,8 @@ britannia_windsor_john = { britannia_windsor_mary = { name = "Mary" dynasty = dynn_britannia_windsor - religion = "anglican_england" - culture = norflander + religion = "victorian" + culture = soueyrneg female = yes trait = education_diplomacy_4 trait = beauty_good_1 @@ -1718,7 +1718,7 @@ britannia_newton_margaret = { name = "Margaret" female = yes dynasty = dynn_britannia_newton - religion = "victorian" + religion = "anglican_england" culture = easlander trait = education_diplomacy_4 trait = ambitious @@ -1790,7 +1790,7 @@ britannia_lennon_shaun = { britannia_cartney_hamish = { name = "Eddmund" dynasty = dynn_britannia_cartney - religion = "old_thelema" + religion = "victorian" culture = strafclideg trait = education_intrigue_3 trait = diligent @@ -1883,8 +1883,8 @@ britannia_watts_thomas = { britannia_wellesley_oliver = { #Duke of Wellington family name = "Oliver" dynasty = dynn_britannia_wellesley - religion = "avalonian" - culture = weslander + religion = "victorian" + culture = soueyrneg trait = education_martial_4 trait = wrathful trait = honest @@ -1900,7 +1900,7 @@ britannia_wellesley_oliver = { #Duke of Wellington family britannia_adam_duleep = { #Claims to be relative of the last Maharaja, ruler of birmingham name = "Arhshyyr" dynasty = dynn_britannia_duleep_singh - religion = "amritdhari" + religion = "victorian" culture = prytoneg trait = education_stewardship_4 trait = trusting diff --git a/N3OW/history/characters/NEOW_e_france.txt b/N3OW/history/characters/NEOW_e_france.txt index b3594bb0..943c5499 100644 --- a/N3OW/history/characters/NEOW_e_france.txt +++ b/N3OW/history/characters/NEOW_e_france.txt @@ -10,6 +10,17 @@ trait = wrathful 2500.1.1 = { birth = yes + effect= { + if = { has_mpo_dlc_trigger = no } + vassal_contract_set_obligation_level = { + type = religious_rights + level = 1 + } + vassal_contract_set_obligation_level = { + type = title_revocation_rights + level = 1 + } + } } 2600.1.1 = { death = yes @@ -43,7 +54,7 @@ france0004 = { trait = chaste trait = arrogant trait = honest - trait = poet + trait = lifestyle_poet trait = disfigured 2512.1.1 = { birth = yes @@ -113,7 +124,7 @@ france0007 = { france0008 = { name = "Robyrt" - dynasty = spatstony_dynasty + dynasty_house = house_spatstony religion = "victorian" culture = soueyrneg trait = education_martial_1 @@ -184,6 +195,17 @@ france0011 = { 2517.1.1 = { birth = yes + effect= { + if = { has_mpo_dlc_trigger = no } + vassal_contract_set_obligation_level = { + type = religious_rights + level = 1 + } + vassal_contract_set_obligation_level = { + type = title_revocation_rights + level = 1 + } + } } 2600.1.1 = { death = yes @@ -202,6 +224,17 @@ france0012 = { 2509.1.1 = { birth = yes + effect= { + if = { has_mpo_dlc_trigger = no } + vassal_contract_set_obligation_level = { + type = religious_rights + level = 1 + } + vassal_contract_set_obligation_level = { + type = title_revocation_rights + level = 1 + } + } } 2600.1.1 = { death = yes @@ -220,6 +253,17 @@ france0013 = { 2528.1.1 = { birth = yes + effect= { + if = { has_mpo_dlc_trigger = no } + vassal_contract_set_obligation_level = { + type = religious_rights + level = 1 + } + vassal_contract_set_obligation_level = { + type = title_revocation_rights + level = 1 + } + } } 2600.1.1 = { death = yes @@ -228,7 +272,7 @@ france0013 = { france0014 = { name = "Jamys" - dynasty = spatstony_dynasty + dynasty_house = house_spatstony religion = "victorian" culture = soueyrneg trait = education_martial_3 diff --git a/N3OW/history/provinces/e_britannia.txt b/N3OW/history/provinces/e_britannia.txt index 824db515..3dab7e58 100644 --- a/N3OW/history/provinces/e_britannia.txt +++ b/N3OW/history/provinces/e_britannia.txt @@ -563,7 +563,7 @@ ###c_cumberland 1635 = { culture = strafclideg - religion = old_thelema + religion = victorian holding = castle_holding 122.1.1 = { special_building = hadrians_wall_01 @@ -617,7 +617,7 @@ ###c_liverpool 9720 = { culture = scouseg - religion = celtic + religion = victorian holding = city_holding } 1643 = { @@ -881,8 +881,8 @@ } ###c_denbighshire 1670 = { - culture = welsh - religion = gorsedd + culture = scouseg + religion = victorian holding = castle_holding } 1671 = { @@ -959,7 +959,7 @@ ##d_deheubarth ###c_carmarthenshire 1652 = { - culture = prytoneg + culture = welsh religion = avalonian holding = castle_holding } @@ -1072,6 +1072,9 @@ 1735 = { holding = church_holding } +1733 = { + holding = church_holding +} 1736 = { holding = none } @@ -1102,20 +1105,20 @@ ##d_stratclyde ###c_lennox 1695 = { - culture = strafclideg - religion = presbyterian - holding = castle_holding + holding = castle_holding } 1696 = { - holding = church_holding + holding = city_holding + culture = strafclideg + religion = victorian } 1697 = { - holding = none + holding = castle_holding } ###c_ayrshire 1686 = { culture = strafclideg - religion = presbyterian + religion = victorian holding = castle_holding } 1687 = { @@ -1143,7 +1146,7 @@ ###c_lanarkshire 1737 = { culture = strafclideg - religion = victorian + religion = old_thelema holding = castle_holding } 1738 = { @@ -1158,7 +1161,7 @@ ###c_galloway 1682 = { culture = strafclideg - religion = old_thelema + religion = victorian holding = castle_holding } 1683 = { @@ -1182,7 +1185,7 @@ ###c_annandale 1679 = { culture = strafclideg - religion = old_thelema + religion = victorian holding = castle_holding } 1681 = { @@ -1285,8 +1288,8 @@ ##d_lothian ###c_lothian 1727 = { - culture = strafclideg - religion = victorian + culture = scottish + religion = old_thelema holding = castle_holding 1066.1.1 = { buildings = { @@ -1307,17 +1310,17 @@ } ###c_dunbar 1675 = { - holding = city_holding - culture = strafclideg - religion = victorian + holding = castle_holding + culture = scottish + religion = old_thelema } 1729 = { holding = city_holding } ###c_teviotdale 1677 = { - culture = strafclideg - religion = victorian + culture = scottish + religion = old_thelema holding = castle_holding } 1678 = { @@ -1327,19 +1330,12 @@ holding = none } ###c_linlithgowshire -1733 = { - holding = church_holding - culture = strafclideg - religion = victorian -} 1731 = { - culture = anglo_saxon - religion = presbyterian + culture = scottish + religion = old_thelema holding = tribal_holding 935.1.1 = { - holding = castle_holding - } - 1000.1.1 = { + holding = castle_holding } } 1732 = { diff --git a/N3OW/history/provinces/e_scandinavia.txt b/N3OW/history/provinces/e_scandinavia.txt index a604a6f6..b7b9a4c4 100644 --- a/N3OW/history/provinces/e_scandinavia.txt +++ b/N3OW/history/provinces/e_scandinavia.txt @@ -137,7 +137,7 @@ religion = norse_pagan } 1000.1.1 = { - religion = lutheran + religion = jack_tar holding = castle_holding } 1066.1.1 = { culture = vestsk } diff --git a/N3OW/history/titles/k_england.txt b/N3OW/history/titles/k_england.txt index 05518156..3c64e956 100644 --- a/N3OW/history/titles/k_england.txt +++ b/N3OW/history/titles/k_england.txt @@ -31,18 +31,18 @@ d_bedford = { d_buckingham = { 2553.1.1 = { - holder = britannia_windsor_edward + holder = britannia_windsor_george #George Windsor government = administrative_government liege = e_britannia } } -c_essex = { - 2530.1.1 = { - holder = britannia_cyflymarhyan_frydyryk - government = administrative_government - } -} +#c_essex = { +# 2530.1.1 = { +# holder = britannia_cyflymarhyan_frydyryk +# government = administrative_government +# } +#} d_leicester = { 2553.1.1 = { @@ -52,29 +52,29 @@ d_leicester = { } } -c_staffordshire = { - 2553.1.1 = { - holder = britannia_starr_thwmys - government = administrative_government - liege = k_wales - } -} +#c_staffordshire = { +# 2553.1.1 = { +# holder = britannia_starr_thwmys +# government = administrative_government +# liege = k_wales +# } +#} -c_warwickshire = { +d_black_country = { 2554.10.22 = { holder = britannia_adam_duleep government = administrative_government - liege = k_wales + liege = e_britannia } } -c_bedford = { - 2507.1.1 = { - holder = britannia_juny_bryan #Bryan Juny - government = administrative_government - liege = d_bedford - } -} +#c_bedford = { +# 2507.1.1 = { +# holder = britannia_juny_bryan #Bryan Juny +# government = administrative_government +# liege = d_bedford +# } +#} d_london = { 2498.1.1 = { @@ -103,13 +103,13 @@ d_zanzibar = { } } -c_isle_of_wight = { - 2550.12.12 = { - holder = britannia_tabb_ian #Ian Tabb - government = administrative_government - liege = e_britannia - } -} +#c_isle_of_wight = { +# 2550.12.12 = { +# holder = britannia_tabb_ian #Ian Tabb +# government = administrative_government +# liege = e_britannia +# } +#} d_somerset = { 2536.1.1 = { @@ -119,13 +119,13 @@ d_somerset = { } } -c_avon = { - 2538.5.19 = { - holder = britannia_blackwood_theodore #Theodore Blackwood - government = administrative_government - liege = d_somerset - } -} +#c_avon = { +# 2538.5.19 = { +# holder = britannia_blackwood_theodore #Theodore Blackwood +# government = administrative_government +# liege = d_somerset +# } +#} c_wiltshire = { 2536.1.1 = { @@ -137,8 +137,9 @@ c_wiltshire = { d_nottingham = { 2552.1.1 = { - holder = britannia_jacob_edwin - liege = k_northumberland + holder = britannia_starr_thwmys + government = administrative_government + liege = e_britannia } } @@ -173,19 +174,18 @@ d_gloucester = { liege = e_britannia } } -c_oxfordshire = { - 2554.1.1 = { - holder = britannia_primrose_isaac #Isaac Primrose - government = administrative_government - liege = d_buckingham - } -} +#c_oxfordshire = { +# 2554.1.1 = { +# holder = britannia_primrose_isaac #Isaac Primrose +# government = administrative_government +# liege = d_buckingham +# } +#} d_norfolk = { 2547.1.1 = { - liege = e_britannia + liege = k_northumberland holder = britannia_nelson_boudica #Boudica Nelson - government = administrative_government } } diff --git a/N3OW/history/titles/k_france.txt b/N3OW/history/titles/k_france.txt index c1687979..f249b9f1 100644 --- a/N3OW/history/titles/k_france.txt +++ b/N3OW/history/titles/k_france.txt @@ -9,12 +9,10 @@ k_france = { change_development_level = 7 holder = france0014 #Jamys Spatstony government = administrative_government - liege = e_britannia } 2548.1.1 = { holder = france0008 #Robyrt Spatstony - government = administrative_government - liege = e_britannia + government = feudal_government } 2555.1.1 = { change_development_level = 5 } } @@ -35,6 +33,13 @@ c_compiegne = { holder = benelux_oranje_nassau_weilburg_guillem #Guillem BONW } } + +c_avranches = { + 2554.1.1 = { + holder = britannia_fitsosbern_horatio + } +} + c_vermandois = { 2554.1.1 = { holder = france_aragorn_vassal_1 #gandalf lmao @@ -53,6 +58,7 @@ c_amiens = { liege = d_valois } } + c_ile_de_france = { 2555.1.1 = { change_development_level = 22 } diff --git a/N3OW/history/titles/k_ireland.txt b/N3OW/history/titles/k_ireland.txt index ace5c120..b5df93c2 100644 --- a/N3OW/history/titles/k_ireland.txt +++ b/N3OW/history/titles/k_ireland.txt @@ -21,7 +21,7 @@ c_tyrone = { } c_ailech = { 2538.1.1 = { - holder = britannia_trimble_david #David Trimble + holder = britannia_leigh_iain # Iain MacLeigh } } c_cavan = { @@ -35,7 +35,7 @@ c_fermanagh = { } } -d_munster = { +k_ireland = { 2538.1.1 = { holder = britannia_colbrugha_michael #Mícheál Colbrugha } diff --git a/N3OW/history/titles/k_northumberland.txt b/N3OW/history/titles/k_northumberland.txt index 4c7a3e17..f1c0b85f 100644 --- a/N3OW/history/titles/k_northumberland.txt +++ b/N3OW/history/titles/k_northumberland.txt @@ -1,6 +1,6 @@ k_northumberland = { 2499.1.1 = { - holder = britannia_starr_cory #Cory Starr + holder = britannia_jacob_colin #Cory Starr } 2505.1.1 = { change_development_level = 7 @@ -10,12 +10,21 @@ d_lancaster = { 2499.1.1 = { holder = britannia_starr_cory #Cory Starr + government = administrative_government + liege = e_britannia + } +} +d_cumbria= { + 2499.1.1 = { + holder = britannia_cartney_hamish + government = administrative_government + liege = e_britannia } } d_northumberland = { 2549.1.1 = { - holder = britannia_windsor_george #George Windsor + holder = britannia_primrose_isaac #Isaac Primrose liege = k_northumberland } } @@ -34,26 +43,28 @@ d_york = { } } -c_liverpool = { - 2520.1.1 = { - holder = britannia_lennon_shaun - government = republic_government - } -} +#c_liverpool = { +# 2520.1.1 = { +# holder = britannia_lennon_shaun +# government = republic_government +# } +#} -c_cumberland = { - 2520.1.1 = { - holder = britannia_cartney_hamish - liege = k_mann - } -} +#c_cumberland = { +# 2520.1.1 = { +# holder = britannia_cartney_hamish +# government = administrative_government +# liege = e_britannia +# } +#} -c_westmorland = { - 2520.1.1 = { - holder = britannia_harriswn_hwyll - liege = k_northumberland - } -} +#c_westmorland = { +# 2520.1.1 = { +# holder = britannia_harriswn_hwyll +# government = administrative_government +# liege = e_britannia +# } +#} d_lincoln = { 2533.1.1 = { @@ -65,28 +76,28 @@ d_lincoln = { c_east_riding = { 2520.1.1 = { holder = britannia_watts_thomas - liege = d_york + liege = k_northumberland } } c_west_riding = { 2520.1.1 = { holder = britannia_wood_richard - liege = d_york + liege = k_northumberland } } c_richmond = { 2533.1.1 = { holder = britannia_richards_james - liege = d_york + liege = k_northumberland } } -c_derby = { - 2553.1.1 = { - holder = britannia_starr_thwmys - government = administrative_government - liege = k_wales - } -} \ No newline at end of file +#c_derby = { +# 2553.1.1 = { +# holder = britannia_starr_thwmys +# government = administrative_government +# liege = e_britannia +# } +#} \ No newline at end of file diff --git a/N3OW/history/titles/k_scotland.txt b/N3OW/history/titles/k_scotland.txt index 98cf942b..822fcb7f 100644 --- a/N3OW/history/titles/k_scotland.txt +++ b/N3OW/history/titles/k_scotland.txt @@ -1,9 +1,19 @@ -k_scotland = { - 2505.1.1 = { - change_development_level = 7 - } +#k_scotland = { +# 2505.1.1 = { +# change_development_level = 7 +# } +# 2540.1.1 = { +# holder = britannia_wall_williaim # Williaim Wall +# government = administrative_government +# liege = e_britannia +# } +#} + +d_stratclyde = { 2540.1.1 = { holder = britannia_wall_williaim # Williaim Wall + government = administrative_government + liege = e_britannia } } @@ -49,7 +59,8 @@ c_caithness = { d_lothian = { 2540.1.1 = { - holder = britannia_wall_williaim # Williaim Wall + holder = britannia_primrose_isaac # Williaim Wall + liege = k_northumberland } } c_buchan = { @@ -62,20 +73,21 @@ c_buchan = { d_galloway = { 2540.1.1 = { holder = britannia_hendderswn_ddaiwyis # Ddaiwyis Hendderswn - liege = k_scotland + government = administrative_government + liege = e_britannia } } -c_lennox = { + c_linlithgowshire = { 2540.1.1 = { holder = britannia_knwcks_jwhn # Jwhn Knwcks - liege = d_galloway + liege = d_lothian } } -c_ayrshire = { +c_teviotdale = { 2551.11.19 = { holder = britannia_walcyr_dduddlyy #Duddley Walker - liege = k_scotland + liege = d_lothian } } @@ -138,12 +150,12 @@ c_mearns = { c_fife = { 2540.1.1 = { holder = britannia_drummond_frazier # Frazier Drummond - liege = k_scotland + liege = d_lothian } } c_strathearn = { 2540.1.1 = { holder = britannia_carnegie_ramsey # Ramsey Carnegie - liege = k_scotland + liege = d_lothian } } \ No newline at end of file diff --git a/N3OW/history/titles/k_wales.txt b/N3OW/history/titles/k_wales.txt index 07f44ea8..76a0ffc2 100644 --- a/N3OW/history/titles/k_wales.txt +++ b/N3OW/history/titles/k_wales.txt @@ -1,13 +1,3 @@ -k_wales = { - 2505.1.1 = { - change_development_level = 7 - } - 2539.1.1 = { - holder = britannia_rholls_rhoycy_bynjamyn #Bynjamyn Rolls-Rhoycy - government = administrative_government - liege = e_britannia - } -} d_gwent = { 2539.1.1 = { @@ -21,34 +11,29 @@ d_hereford = { 2540.1.1 = { holder = britannia_elgarh_robyrt #Robert Elgarh government = administrative_government - liege = k_wales + government = administrative_government + liege = e_britannia } } -k_gwynedd = { +k_wales = { 2535.1.1 = { - holder = britannia_lawrence_owain #Owain Lawrence + holder = britannia_montgomyrhy_fodorh #Fodorh Montgomyrhy } } d_gwynedd = { - 2535.1.1 = { + 2540.1.1 = { holder = britannia_lawrence_owain #Owain Lawrence + government = administrative_government + liege = e_britannia } } d_powys = { 2549.1.1 = { holder = britannia_montgomyrhy_fodorh #Fodorh Montgomyrhy - liege = k_gwynedd - } -} - -c_brecknockshire = { - 2551.1.1 = { - holder = britannia_rholls_rhoycy_bynjamyn #Bynjamyn Rolls-Rhoycy - government = administrative_government - liege = e_britannia + liege = k_wales } } @@ -56,12 +41,30 @@ d_deheubarth = { 2554.1.1 = { holder = britannia_squyrhys_grhufydd #Grhufydd Squyrhys government = administrative_government - liege = k_wales + liege = e_britannia } } c_cardiganshire = { 2549.1.1 = { holder = britannia_gwilym_sawyl #Sawyl Gwilym - liege = k_gwynedd + liege = k_wales + } +} +c_carmarthenshire = { + 2549.1.1 = { + holder = britannia_gwilym_sawyl #Sawyl Gwilym + liege = k_wales + } +} +c_caernarfonshire = { + 2549.1.1 = { + holder = britannia_montgomyrhy_fodorh #Sawyl Gwilym + liege = k_wales + } +} +c_anglesey= { + 2549.1.1 = { + holder = britannia_montgomyrhy_fodorhl #Sawyl Gwilym + liege = k_wales } } \ No newline at end of file diff --git a/N3OW/localization/english/dynasties/NEOW_dynasty_names_l_english.yml b/N3OW/localization/english/dynasties/NEOW_dynasty_names_l_english.yml index ca32cce1..9c4164c9 100644 --- a/N3OW/localization/english/dynasties/NEOW_dynasty_names_l_english.yml +++ b/N3OW/localization/english/dynasties/NEOW_dynasty_names_l_english.yml @@ -420,3 +420,4 @@ dynn_Madi:0 "Madi" dynn_Djailani:0 "Djailani" dynn_Attoumani:0 "Attoumani" + dynn_Nguyen:0 "Nguyen" diff --git a/N3OW/localization/english/titles_l_english.yml b/N3OW/localization/english/titles_l_english.yml index 70f5f290..50f0ba6b 100644 --- a/N3OW/localization/english/titles_l_english.yml +++ b/N3OW/localization/english/titles_l_english.yml @@ -19621,6 +19621,8 @@ k_kipchak:0 "Kipchak" k_kipchak_adj:0 "Kipchak" # + d_cumbria:0 "Cumbria" + d_cumbria_adj:0 "Cumbrian" d_cuman_WIP:0 "WIP" d_cuman_WIP_adj:0 "WIP" d_pecheneg:0 "Pecheneg" diff --git a/descriptor.mod b/descriptor.mod deleted file mode 100644 index b8fe71ea..00000000 --- a/descriptor.mod +++ /dev/null @@ -1,6 +0,0 @@ -version="0.1" -tags={ - "Alternative History" -} -name="n3ow dev work" -supported_version="1.17.1" \ No newline at end of file