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 68fda1b2..baf8b49c 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 @@ -10452,17 +10452,23 @@ quixano_dynasty={ } house_palermo={ - pattern="pattern_diagonal_split_02.dds" + pattern="pattern_solid.dds" color1=red - color2=blue - color3=green + color2=yellow colored_emblem={ color1=red - color2=yellow_light - texture="ce_block_02.dds" + texture="ce_bend_thin.dds" instance={ - position={ 0.750000 0.250000 } - scale={ 0.500000 -0.500000 } + depth=1.010000 + } + + } + + colored_emblem={ + color1=blue_light + texture="ce_bend_thin.dds" + instance={ + position={ 0.480000 0.520000 } depth=3.010000 } @@ -10470,10 +10476,10 @@ house_palermo={ colored_emblem={ color1=yellow_light - color2=blue_light - texture="ce_per_bend.dds" + texture="ce_bend_thin.dds" instance={ - depth=8.010000 + position={ 0.510000 0.470000 } + depth=2.010000 } } @@ -10484,69 +10490,23 @@ house_palermo={ color3=black texture="ce_eagle.dds" instance={ - position={ 0.250000 0.750000 } - scale={ 0.40000 0.40000 } - } - - instance={ - position={ 0.750000 0.250000 } - scale={ 0.40000 0.40000 } - depth=1.010000 - } - - } - - colored_emblem={ - color1=red - color2=red - texture="ce_chief.dds" - instance={ - position={ 0.250000 0.750000 } - scale={ 0.500000 -0.500000 } - depth=2.010000 + position={ 0.500000 0.520000 } + scale={ 1.100000 1.100000 } + depth=4.010000 } } colored_emblem={ color1=white - texture="ce_bend_thin.dds" - instance={ - position={ 0.250000 0.250000 } - scale={ 0.500000 0.500000 } - depth=4.010000 - } - - instance={ - position={ 0.750000 0.750000 } - scale={ 0.500000 0.500000 } - depth=5.010000 - } - - } - - colored_emblem={ - color1=red - texture="ce_mena_bend.dds" - instance={ - position={ 0.250000 0.250000 } - scale={ 0.500000 0.500000 } - depth=6.010000 - } - - instance={ - position={ 0.750000 0.750000 } - scale={ 0.500000 0.500000 } - depth=7.010000 - } - + texture="ce_bendlet.dds" } } house_ajaccio={ - pattern="pattern_diagonal_split_02.dds" + pattern="temp_pattern_bendy_special.dds" color1=blue color2=white color3=green @@ -10555,17 +10515,10 @@ house_ajaccio={ color2=green_light texture="ce_chief.dds" instance={ - position={ 0.250000 0.750000 } - scale={ 0.500000 -0.500000 } + position={ 0.50000 0.50000 } + scale={ 1.00000 -1.000000 } depth=6.010000 } - - instance={ - position={ 0.750000 0.250000 } - scale={ 0.500000 -0.500000 } - depth=7.010000 - } - } colored_emblem={ @@ -10574,28 +10527,16 @@ house_ajaccio={ color3=black texture="ce_lion_rampant_wide_stance.dds" instance={ - position={ 0.850000 0.260000 } - scale={ 0.250000 0.250000 } + position={ 0.7000 0.650000 } + scale={ 0.40000 0.40000 } } instance={ - position={ 0.650000 0.260000 } - scale={ -0.250000 0.250000 } + position={ 0.3000 0.65000 } + scale={ -0.40000 0.40000 } depth=1.010000 } - instance={ - position={ 0.150000 0.760000 } - scale={ -0.250000 0.250000 } - depth=2.010000 - } - - instance={ - position={ 0.350000 0.760000 } - scale={ 0.250000 0.250000 } - depth=3.010000 - } - } colored_emblem={ @@ -10612,54 +10553,25 @@ house_ajaccio={ color1=white color2=black texture="ce_column.dds" + mask = { 1 0 0} instance={ - position={ 0.250000 0.700000 } - scale={ 0.300000 0.300000 } + position={ 0.5000 0.500000 } + scale={ 0.70000 0.70000 } depth=4.010000 } - - instance={ - position={ 0.750000 0.210000 } - scale={ 0.300000 0.300000 } - depth=5.010000 - } - - } - - colored_emblem={ - color1=white - texture="ce_bend_thin.dds" - instance={ - position={ 0.250000 0.250000 } - scale={ 0.500000 0.500000 } - depth=8.010000 - } - - instance={ - position={ 0.750000 0.750000 } - scale={ 0.500000 0.500000 } - depth=9.010000 - } - } colored_emblem={ color1=red - texture="ce_mena_bend.dds" + color2=black + texture="ce_column.dds" + mask = { 0 2 0} instance={ - position={ 0.250000 0.250000 } - scale={ 0.500000 0.500000 } - depth=10.010000 + position={ 0.5000 0.500000 } + scale={ 0.70000 0.70000 } + depth=4.010000 } - - instance={ - position={ 0.750000 0.750000 } - scale={ 0.500000 0.500000 } - depth=11.010000 - } - } - } @@ -10670,48 +10582,27 @@ house_bastia={ color1=white color2=white color3=green - colored_emblem={ - color1=yellow_light - color2=blue_light - texture="ce_per_bend.dds" - instance={ - depth=8.010000 - } - - } - colored_emblem={ color1=white - color2=black - texture="ce_castle.dds" + texture="ce_block_02.dds" instance={ - position={ 0.250000 0.700000 } - scale={ 0.400000 0.400000 } - } - - instance={ - position={ 0.750000 0.210000 } - scale={ 0.400000 0.400000 } + position={ 0.500000 0.320000 } + scale={ 0.020000 0.340000 } depth=1.010000 } } colored_emblem={ - color1=white - texture="ce_bend_thin.dds" + color1=yellow_light + color2=blue_light + texture="ce_per_bend.dds" instance={ - position={ 0.250000 0.250000 } - scale={ 0.500000 0.500000 } + position={ 0.560000 0.200000 } + scale={ 0.100000 0.100000 } depth=4.010000 } - instance={ - position={ 0.750000 0.750000 } - scale={ 0.500000 0.500000 } - depth=5.010000 - } - } colored_emblem={ @@ -10719,15 +10610,19 @@ house_bastia={ color2=green texture="ce_chief.dds" instance={ - position={ 0.250000 0.750000 } - scale={ 0.500000 -0.500000 } - depth=2.010000 + scale={ 1.000000 -1.000000 } + depth=5.010000 } + } + + colored_emblem={ + color1=white + texture="ce_bendlet.dds" instance={ - position={ 0.750000 0.250000 } - scale={ 0.500000 -0.500000 } - depth=3.010000 + position={ 0.550000 0.200000 } + scale={ 0.100000 0.100000 } + depth=2.010000 } } @@ -10736,21 +10631,26 @@ house_bastia={ color1=red texture="ce_mena_bend.dds" instance={ - position={ 0.250000 0.250000 } - scale={ 0.500000 0.500000 } - depth=6.010000 + position={ 0.550000 0.200000 } + scale={ 0.100000 0.100000 } + depth=3.010000 } + } + + colored_emblem={ + color1=grey + color2=black + texture="ce_castle.dds" instance={ - position={ 0.750000 0.750000 } - scale={ 0.500000 0.500000 } - depth=7.010000 + scale={ 0.990000 0.550000 } } } } + bernadotte_dynasty={ pattern="pattern_tricolor_bend_01.dds" color1=blue diff --git a/N3OW/common/landed_titles/britannia.txt b/N3OW/common/landed_titles/britannia.txt index 9f0ca51c..0191e181 100644 --- a/N3OW/common/landed_titles/britannia.txt +++ b/N3OW/common/landed_titles/britannia.txt @@ -2285,7 +2285,6 @@ e_britannia = { d_black_country = { # The Black Country color = { 10 102 86 } capital = c_warwickshire - c_staffordshire = { color = { 12 127 108 } diff --git a/N3OW/common/religion/doctrines/30_core_tenets.txt b/N3OW/common/religion/doctrines/30_core_tenets.txt index 460d1228..8ceba35f 100644 --- a/N3OW/common/religion/doctrines/30_core_tenets.txt +++ b/N3OW/common/religion/doctrines/30_core_tenets.txt @@ -33,7 +33,8 @@ forest_attrition_mult = -0.25 build_gold_cost = 0.1 county_opinion_add = 15 - fertility = 0.15 + #fertility = 0.15 + stress_loss_mult = 0.2 } } diff --git a/N3OW/common/religion/religions/NEOW_catholic.txt b/N3OW/common/religion/religions/NEOW_catholic.txt index 1c76be3c..b2a62b4e 100644 --- a/N3OW/common/religion/religions/NEOW_catholic.txt +++ b/N3OW/common/religion/religions/NEOW_catholic.txt @@ -790,7 +790,7 @@ } } illuminated = { - color = { 204 198 136 } + color = { 184 178 116 } icon = illuminated graphical_faith = "catholic_gfx" diff --git a/N3OW/history/characters/NEOW_e_france.txt b/N3OW/history/characters/NEOW_e_france.txt index 36275398..e0c5abc2 100644 --- a/N3OW/history/characters/NEOW_e_france.txt +++ b/N3OW/history/characters/NEOW_e_france.txt @@ -1312,7 +1312,7 @@ france_bonaparte_boromir ={ } france_bonaparte_faramir ={ - name = "Faramir" + name = "Passepartout" dynasty = bonaparte_dynasty religion = numenorian culture = picard @@ -1334,7 +1334,7 @@ france_bonaparte_faramir ={ } france_bonaparte_arathorn_2={ - name = "Passepartout" + name = "Jean-Luc" dynasty = bonaparte_dynasty religion = numenorian culture = picard diff --git a/N3OW/history/characters/NEOW_e_germania.txt b/N3OW/history/characters/NEOW_e_germania.txt index fa0ee81d..5f5f5cd0 100644 --- a/N3OW/history/characters/NEOW_e_germania.txt +++ b/N3OW/history/characters/NEOW_e_germania.txt @@ -3448,7 +3448,7 @@ albrecht_viii_of_the_upper_palatinate={ dynasty=kreile_dynasty #Kreile father=franz_i_of_the_upper_palatinate culture=franconian - religion=lutheran + religion=illuminated 2468.4.10={birth=yes} 2511.4.29={death=yes} } diff --git a/N3OW/history/provinces/e_germany.txt b/N3OW/history/provinces/e_germany.txt index 049bbfd6..b1b6cea9 100644 --- a/N3OW/history/provinces/e_germany.txt +++ b/N3OW/history/provinces/e_germany.txt @@ -1159,7 +1159,7 @@ ###c_nassau 2692 = { culture = hessian - religion = einblicker + religion = roman_catholic holding = castle_holding } 2852 = { @@ -2031,7 +2031,7 @@ ###c_frankfurt 2855 = { culture = hessian - religion = einblicker + religion = roman_catholic holding = castle_holding 1066.1.1 = { buildings = { diff --git a/N3OW/history/provinces/e_italy.txt b/N3OW/history/provinces/e_italy.txt index f3060780..71f7999f 100644 --- a/N3OW/history/provinces/e_italy.txt +++ b/N3OW/history/provinces/e_italy.txt @@ -68,7 +68,7 @@ 2472 = { holding = castle_holding culture = piedmontese - religion = roman_catholic + religion = genevan } 9713 = { holding = none diff --git a/N3OW/localization/english/titles_cultural_names_l_english.yml b/N3OW/localization/english/titles_cultural_names_l_english.yml index 93e6e221..9fff0e7d 100644 --- a/N3OW/localization/english/titles_cultural_names_l_english.yml +++ b/N3OW/localization/english/titles_cultural_names_l_english.yml @@ -36,7 +36,7 @@ cn_brhombycsddon:0 "Brhombycsddon" cn_brombexddon:0 "Brombexddon" cn_brombicsddon:0 "Brombicsddon" - cn_brombycsddon:0 "Brombycsddon" + cn_brombyksddon:0 "Brombyksddon" cn_eaistendd:0 "Eaistendd" cn_eastyndd:0 "Eastyndd" ## Bedford/North Thames diff --git a/N3OW/localization/english/titles_l_english.yml b/N3OW/localization/english/titles_l_english.yml index 0f8cb027..e37caedf 100644 --- a/N3OW/localization/english/titles_l_english.yml +++ b/N3OW/localization/english/titles_l_english.yml @@ -116,8 +116,8 @@ b_aylesbury:0 "Aylesbury" b_newport:0 "Milton Keynes" ## Canterbury/The Sunk Ports - d_canterbury_article:0 "the " - d_canterbury:0 "Sunk Ports" + #d_canterbury_article:0 "the " + d_canterbury:0 " The Sunk Ports" d_canterbury_adj:0 "Sunkporter" # Kent c_kent:0 "Kent" @@ -226,12 +226,12 @@ c_scilly_adj:0 "Scillian" b_scilly:0 "Scilly" ## Channel Islands - d_channel_islands_article:0 "the" - d_channel_islands:0 "Channel Islands" + #d_channel_islands_article:0 "the" + d_channel_islands:0 "the Channel Islands" d_channel_islands_adj:0 "Channel Islander" # The Channel Islands - c_channel_islands_article:0 "the" - c_channel_islands:0 "Channel Islands" + #c_channel_islands_article:0 "the" + c_channel_islands:0 "the Channel Islands" c_channel_islands_adj:0 "Channeler" b_jersey:0 "Jersey" b_guernsey:0 "Guernsey"