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 8506b596..28331194 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 @@ -28729,52 +28729,27 @@ k_poland = { # } # } -# Finland improved to better design (earlier + standardized for blending) +# Finland k_finland = { - pattern = "pattern_solid.dds" - color1 = "red" - color2 = "yellow" - colored_emblem = { - texture = "ce_flower.dds" - color1 = "white" - color2 = "red" - instance = { position = { 0.190 0.100 } scale = { 0.1 0.1 } } - instance = { position = { 0.190 0.750 } scale = { 0.1 0.1 } } - instance = { position = { 0.190 0.500 } scale = { 0.1 0.1 } } - instance = { position = { 0.470 0.750 } scale = { 0.1 0.1 } } - instance = { position = { 0.340 0.470 } scale = { 0.1 0.1 } } - instance = { position = { 0.230 0.240 } scale = { 0.1 0.1 } } - instance = { position = { 0.800 0.100 } scale = { 0.1 0.1 } } - instance = { position = { 0.800 0.680 } scale = { 0.1 0.1 } } - instance = { position = { 0.680 0.770 } scale = { 0.1 0.1 } } - instance = { position = { 0.650 0.550 } scale = { 0.1 0.1 } } - instance = { position = { 0.650 0.320 } scale = { 0.1 0.1 } } + pattern="pattern_horizontal_split_01.dds" + color1=white + color2=white + color3=red + colored_emblem={ + color1=white + texture="ce_block_02.dds" + instance={ + depth=1.010000 + } + } - colored_emblem = { - texture = "ce_sword_simple.dds" - color1 = "yellow" - color2 = "white" - instance = { position = { 0.485 0.094 } rotation = 90 scale = { 0.62 0.62 } } - } - colored_emblem = { - texture = "ce_sabre.dds" - color1 = "yellow" - color2 = "white" - instance = { position = { 0.400 0.795 } rotation = 35 scale = { 0.53 0.53 } } - } - colored_emblem = { - texture = "ce_lion_rampant_holding_sword.dds" - color1 = "yellow" - color2 = "yellow" - color3 = "black" - instance = { position = { 0.5 0.48 } scale = { 1.0 1.0 } } - } - colored_emblem = { - texture = "ce_crown_small.dds" - color1 = "yellow" - color2 = "yellow" - instance = { position = { 0.480 0.064 } rotation = -10 scale = { 0.128 0.128 } } + + colored_emblem={ + color1=white + color2=blue_light + texture="NEOW_ce_cross_nordic.dds" } + } # Proper CE 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 ecf2e5d0..9a569963 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 @@ -397,119 +397,160 @@ house_britannia_rholls_rhoycy = { dynn_britannia_crowtemple={ pattern="pattern_horizontal_split_01.dds" - color1=black - color2=black + color1=white + color2=yellow color3=black colored_emblem={ color1=black color2=black color3=white - texture="NEOW_ce_spatstone.dds" + texture="ce_eagle_small.dds" instance={ position={ 0.280000 0.260000 } scale={ 0.550000 0.550000 } - depth=1.010000 + depth=14.010000 } + instance={ position={ 0.720000 0.740000 } scale={ 0.550000 0.550000 } - depth=1.010000 + depth=15.010000 } + } colored_emblem={ color1=yellow + color2=white + texture="ce_quarterly.dds" + instance={ + depth=18.010000 + } + + } + + colored_emblem={ + color1=black color2=yellow texture="ce_pales_02.dds" instance={ position={ 1.000000 0.270000 } scale={ 1.000000 0.470000 } - depth=2.010000 + depth=16.010000 rotation=90 } + instance={ position={ 0.000000 0.730000 } scale={ 1.000000 0.470000 } - depth=2.010000 + depth=17.010000 rotation=90 } + } colored_emblem={ color1=yellow - color2=black - texture="ce_quarterly.dds" + texture="NEOW_ce_spatstone.dds" instance={ - depth=3.010000 + scale={ 0.260000 0.260000 } } } colored_emblem={ - color1=black - color2=black + color1=yellow + color2=yellow color3=black texture="ce_falcon.dds" instance={ position={ 0.580000 0.340000 } scale={ 0.060000 0.060000 } + depth=2.010000 } + instance={ - position={ 0.70000 0.340000 } + position={ 0.700000 0.340000 } scale={ 0.060000 0.060000 } + depth=3.010000 } + instance={ position={ 0.820000 0.340000 } scale={ 0.060000 0.060000 } + depth=4.010000 } + instance={ - position={ 0.580000 0.20000 } + position={ 0.580000 0.200000 } scale={ 0.060000 0.060000 } + depth=5.010000 } + instance={ - position={ 0.70000 0.20000 } + position={ 0.700000 0.200000 } scale={ 0.060000 0.060000 } + depth=6.010000 } + instance={ - position={ 0.820000 0.20000 } + position={ 0.820000 0.200000 } scale={ 0.060000 0.060000 } + depth=7.010000 } - } - - colored_emblem={ - color1=black - color2=black - color3=black - texture="ce_falcon.dds" + instance={ position={ 0.420000 0.660000 } scale={ 0.060000 0.060000 } + depth=8.010000 } + instance={ - position={ 0.30000 0.660000 } + position={ 0.300000 0.660000 } scale={ 0.060000 0.060000 } + depth=9.010000 } + instance={ position={ 0.180000 0.660000 } scale={ 0.060000 0.060000 } + depth=10.010000 } + instance={ - position={ 0.420000 0.80000 } + position={ 0.420000 0.800000 } scale={ 0.060000 0.060000 } + depth=11.010000 } + instance={ - position={ 0.30000 0.80000 } + position={ 0.300000 0.800000 } scale={ 0.060000 0.060000 } + depth=12.010000 } + instance={ - position={ 0.180000 0.80000 } + position={ 0.180000 0.800000 } scale={ 0.060000 0.060000 } + depth=13.010000 } + + } + + colored_emblem={ + color1=black + texture="ce_inescutcheon.dds" + instance={ + scale={ 0.510000 0.510000 } + depth=1.010000 + } + } } + dynn_britannia_duleep_singh={ pattern="pattern_horizontal_split_01.dds" color1=yellow @@ -2269,13 +2310,11 @@ dynn_britannia_cyflymarhyan ={ color2=purple color3=red colored_emblem={ - color1=yellow - color2=yellow - texture="ce_circle_mask.dds" + color1=yellow_light + texture="NEOW_ce_spatstone.dds" instance={ - position={ 0.500000 0.170000 } - scale={ 0.260000 0.260000 } - depth=1.010000 + position={ 0.500000 0.180000 } + scale={ 0.210000 0.210000 } } } @@ -2291,16 +2330,6 @@ dynn_britannia_cyflymarhyan ={ } - colored_emblem={ - color1=black - texture="NEOW_ce_spatstone.dds" - instance={ - position={ 0.500000 0.180000 } - scale={ 0.210000 0.210000 } - } - - } - colored_emblem={ color1=purple texture="ce_polish_leliwa.dds" @@ -2312,6 +2341,18 @@ dynn_britannia_cyflymarhyan ={ } + colored_emblem={ + color1=black + color2=yellow + texture="ce_circle_mask.dds" + instance={ + position={ 0.500000 0.170000 } + scale={ 0.270000 0.260000 } + depth=1.010000 + } + + } + colored_emblem={ color1=grey color2=white @@ -2414,89 +2455,43 @@ menhir_dynasty={ } dynn_britannia_wall ={ - pattern="pattern_solid.dds" + pattern="pattern_checkers_06.dds" color1=white - color2=yellow + color2=blue_light + color3=black colored_emblem={ - color1=blue_light - texture="ce_block_02.dds" + color1=white + color2=white + color3=orange + texture="ce_lion_rampant_per_pale.dds" instance={ - position={ 0.750000 0.540000 } - scale={ 0.150000 0.150000 } - depth=2.010000 + scale={ 0.730000 0.730000 } } - + } - + colored_emblem={ - color1=rgb { 154 38 22 } - texture="ce_shield_01.dds" + color1=red + texture="ce_escutcheon.dds" instance={ - position={ 0.500000 0.520000 } - scale={ 0.780000 0.810000 } depth=1.010000 } - + } - - colored_emblem={ - color1=white - color2=blue_light - texture="ce_checkers_06.dds" - instance={ - position={ 0.020000 0.170000 } - scale={ 0.350000 1.000000 } - depth=4.010000 - } - - instance={ - position={ 0.350000 0.000000 } - scale={ 1.000000 0.400000 } - depth=5.010000 - } - - instance={ - position={ 0.680000 0.880000 } - scale={ 0.530000 0.810000 } - depth=7.010000 - rotation=319 - } - - } - - colored_emblem={ - color1=white - color2=white - color3=white - texture="ce_lion_rampant_wide_stance.dds" - instance={ - position={ 0.500000 0.470000 } - scale={ 0.540000 0.690000 } - } - - } - + colored_emblem={ color1=blue_light color2=white - texture="ce_checkers_06.dds" + texture="ce_gironny_12.dds" instance={ - position={ 1.000000 0.330000 } - scale={ 0.380000 1.000000 } - depth=3.010000 + depth=2.010000 } - - instance={ - position={ 0.160000 1.000000 } - scale={ 0.530000 0.720000 } - depth=6.010000 - rotation=38 - } - + } - + } + dynn_britannia_leigh ={ custom=yes pattern="pattern_solid.dds" @@ -10251,3 +10246,224 @@ house_bastia={ } +bernadotte_dynasty={ + pattern="pattern_tricolor_bend_01.dds" + color1=blue + color2=white + color3=red + colored_emblem={ + color1=brown + texture="ce_block_02.dds" + instance={ + scale={ 0.020000 1.000000 } + depth=10.010000 + } + + } + + colored_emblem={ + color1=blue + texture="ce_block_02.dds" + instance={ + position={ 1.000000 0.000000 } + scale={ 0.980000 0.430000 } + depth=8.010000 + } + + instance={ + position={ 1.000000 0.500000 } + depth=15.010000 + } + + } + + colored_emblem={ + color1=white + color2=grey + texture="NEOW_ce_tower_02.dds" + instance={ + position={ 0.900000 0.550000 } + scale={ 0.180000 0.180000 } + depth=13.010000 + } + + instance={ + position={ 0.600000 0.550000 } + scale={ 0.180000 0.180000 } + depth=14.010000 + } + + } + + colored_emblem={ + color1=white + texture="ce_mena_bend.dds" + instance={ + position={ 0.500000 0.680000 } + depth=17.010000 + } + + } + + colored_emblem={ + color1=red + texture="ce_block_02.dds" + instance={ + position={ 0.000000 1.000000 } + depth=18.010000 + } + + } + + colored_emblem={ + color1=yellow_light + texture="NEOW_ce_nap_eagle.dds" + instance={ + position={ 0.740000 0.350000 } + scale={ 0.380000 0.380000 } + depth=7.010000 + } + + } + + colored_emblem={ + color1=white + texture="NEOW_ce_bridge_3.dds" + instance={ + position={ 0.750000 0.650000 } + scale={ 0.670000 0.560000 } + depth=12.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_star_05.dds" + instance={ + position={ 0.680000 0.150000 } + scale={ 0.080000 0.080000 } + } + + instance={ + position={ 0.580000 0.150000 } + scale={ 0.080000 0.080000 } + depth=1.010000 + } + + instance={ + position={ 0.630000 0.120000 } + scale={ 0.080000 0.080000 } + depth=2.010000 + } + + instance={ + position={ 0.740000 0.160000 } + scale={ 0.080000 0.080000 } + depth=3.010000 + } + + instance={ + position={ 0.780000 0.190000 } + scale={ 0.080000 0.080000 } + depth=4.010000 + } + + instance={ + position={ 0.850000 0.120000 } + scale={ 0.080000 0.080000 } + depth=5.010000 + } + + instance={ + position={ 0.850000 0.180000 } + scale={ 0.080000 0.080000 } + depth=6.010000 + } + + } + + colored_emblem={ + color1=yellow + color2=yellow + texture="ce_grain.dds" + instance={ + position={ 0.300000 0.510000 } + scale={ 0.480000 0.680000 } + depth=9.010000 + } + + } + + colored_emblem={ + color1=blue + texture="ce_mena_bend.dds" + instance={ + position={ 0.500000 0.290000 } + depth=16.010000 + } + + } + + colored_emblem={ + color1=white + color2=blue + texture="NEOW_ce_waves_05.dds" + instance={ + position={ 0.900000 0.710000 } + scale={ 0.780000 1.000000 } + depth=11.010000 + } + + } + +} + +roda_ulven_dynasty={ + pattern="pattern_horizontal_split_01.dds" + color1=yellow_light + color2=red + color3=red + colored_emblem={ + color1=red + color2=red + color3=yellow_light + texture="ce_wolf_passant.dds" + instance={ + position={ 0.500000 0.280000 } + scale={ -0.700000 0.700000 } + } + + } + +} + + +kruger_dynasty={ + pattern="pattern_horizontal_split_01.dds" + color1=black + color2=black + color3=red + colored_emblem={ + color1=white + texture="ce_mena_lamp.dds" + instance={ + position={ 0.750000 0.630000 } + scale={ 0.300000 0.300000 } + } + + instance={ + position={ 0.500000 0.340000 } + scale={ 0.300000 0.300000 } + depth=1.010000 + } + + instance={ + position={ 0.250000 0.620000 } + scale={ 0.300000 0.300000 } + depth=2.010000 + } + + } + +} diff --git a/N3OW/common/coat_of_arms/coat_of_arms/NEOW_laamp_coas.txt b/N3OW/common/coat_of_arms/coat_of_arms/NEOW_laamp_coas.txt index 9341692e..40b9db12 100644 --- a/N3OW/common/coat_of_arms/coat_of_arms/NEOW_laamp_coas.txt +++ b/N3OW/common/coat_of_arms/coat_of_arms/NEOW_laamp_coas.txt @@ -1 +1 @@ -d_laamp_vlad = carstana_dynasty \ No newline at end of file +#d_laamp_vlad = carstana_dynasty \ No newline at end of file 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 66924d0d..15dd8671 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 @@ -280,7 +280,6 @@ k_tirol = { } k_sapmi={ - custom=yes pattern="pattern_vertical_split_01.dds" color1=red color2=blue @@ -312,6 +311,7 @@ k_sapmi={ instance={ position={ 0.470000 0.500000 } scale={ 0.220000 1.000000 } + depth=2.010000 } } diff --git a/N3OW/common/coat_of_arms/coat_of_arms/italia.txt b/N3OW/common/coat_of_arms/coat_of_arms/italia.txt index 90ff565a..963e6557 100644 --- a/N3OW/common/coat_of_arms/coat_of_arms/italia.txt +++ b/N3OW/common/coat_of_arms/coat_of_arms/italia.txt @@ -1277,7 +1277,7 @@ c_lucca={ color2=red color3=white mask = { 1 0 0} - texture="ce_panther.dds" + texture="ce_tiger_rampant.dds" instance={ scale={ 0.930000 0.930000 } } @@ -1287,7 +1287,7 @@ c_lucca={ color1=black color2=red color3=white - texture="ce_panther.dds" + texture="ce_tiger_rampant.dds" mask = { 0 2 0} instance={ scale={ 0.930000 0.930000 } diff --git a/N3OW/common/culture/cultures/NEOW_hispanic.txt b/N3OW/common/culture/cultures/NEOW_hispanic.txt index f678bd58..fff4da9b 100644 --- a/N3OW/common/culture/cultures/NEOW_hispanic.txt +++ b/N3OW/common/culture/cultures/NEOW_hispanic.txt @@ -28,7 +28,7 @@ aragonese = { #Aragonés color = { 0.80 0.67 0.24 } - ethos = ethos_communal + ethos = ethos_stoic heritage = heritage_hispanic language = language_hispanophonic martial_custom = martial_custom_male_only @@ -56,7 +56,7 @@ aragonese = { #Aragonés asturleonese = { #Asturlleonés color = { 0.98 0.85 0.36 } - ethos = ethos_egalitarian + ethos = ethos_stoic heritage = heritage_hispanic language = language_hispanophonic martial_custom = martial_custom_male_only @@ -110,7 +110,7 @@ balearic = { #Balear basque = { #Euskal color = basque - ethos = ethos_egalitarian + ethos = ethos_stoic heritage = heritage_hispanic language = language_basque martial_custom = martial_custom_male_only @@ -138,7 +138,7 @@ basque = { #Euskal castilian = { #Castellano color = castilian - ethos = ethos_courtly + ethos = ethos_bellicose heritage = heritage_hispanic language = language_hispanophonic martial_custom = martial_custom_male_only @@ -165,8 +165,8 @@ castilian = { #Castellano catalan = { #Català color = { 0.76 0.42 0.08 } - ethos = ethos_courtly - heritage = heritage_hispanic + ethos = ethos_bureaucratic + heritage = heritage_hispanic language = language_occitano_romance martial_custom = martial_custom_male_only traditions = { @@ -198,10 +198,10 @@ extremeno = { #Estremeñu language = language_hispanophonic martial_custom = martial_custom_male_only traditions = { - tradition_fp1_performative_honour + tradition_pastoralists tradition_fp2_ritualised_friendship tradition_talent_acquisition - tradition_martial_admiration + tradition_swords_for_hire tradition_zealous_people } @@ -279,7 +279,7 @@ llanito = { NEOW_andalusian = { #Andalûh color = { 0.89 0.92 0.67 } - ethos = ethos_spiritual + ethos = ethos_courtly heritage = heritage_hispanic language = language_hispanophonic martial_custom = martial_custom_male_only @@ -306,7 +306,7 @@ NEOW_andalusian = { #Andalûh portuguese = { #Português color = { 0.75 0.67 0.07 } - ethos = ethos_courtly + ethos = ethos_spiritual heritage = heritage_hispanic language = language_lusophonic martial_custom = martial_custom_male_only @@ -333,7 +333,7 @@ portuguese = { #Português valencian = { #Valencià color = { 0.91 0.63 0.24 } - ethos = ethos_egalitarian + ethos = ethos_bureaucratic heritage = heritage_hispanic language = language_occitano_romance martial_custom = martial_custom_male_only diff --git a/N3OW/common/dna_data/NEOW_dna.txt b/N3OW/common/dna_data/NEOW_dna.txt index c24cf9d9..1cadede8 100644 --- a/N3OW/common/dna_data/NEOW_dna.txt +++ b/N3OW/common/dna_data/NEOW_dna.txt @@ -1261,7 +1261,6 @@ dna_duleep_mary={ dna_duleep_vyktor_1={ - type=male portrait_info = { genes={ hair_color={ 4 245 4 245 } skin_color={ 93 146 93 146 } @@ -1374,3 +1373,118 @@ dna_duleep_vyktor_1={ } enabled=yes } + +dna_george_windsor={ + portrait_info = { + genes={ + hair_color={ 209 193 182 144 } + skin_color={ 14 94 14 94 } + eye_color={ 234 184 234 184 } + gene_chin_forward={ "chin_forward_neg" 107 "chin_forward_neg" 107 } + gene_chin_height={ "chin_height_neg" 90 "chin_height_neg" 90 } + gene_chin_width={ "chin_width_pos" 133 "chin_width_pos" 133 } + gene_eye_angle={ "eye_angle_pos" 159 "eye_angle_pos" 159 } + gene_eye_depth={ "eye_depth_pos" 134 "eye_depth_pos" 134 } + gene_eye_height={ "eye_height_pos" 129 "eye_height_pos" 138 } + gene_eye_distance={ "eye_distance_neg" 93 "eye_distance_neg" 81 } + gene_eye_shut={ "eye_shut_pos" 146 "eye_shut_pos" 146 } + gene_forehead_angle={ "forehead_angle_neg" 102 "forehead_angle_neg" 102 } + gene_forehead_brow_height={ "forehead_brow_height_pos" 140 "forehead_brow_height_pos" 140 } + gene_forehead_roundness={ "forehead_roundness_pos" 170 "forehead_roundness_pos" 170 } + gene_forehead_width={ "forehead_width_neg" 116 "forehead_width_neg" 116 } + gene_forehead_height={ "forehead_height_pos" 161 "forehead_height_pos" 161 } + gene_head_height={ "head_height_pos" 124 "head_height_pos" 136 } + gene_head_width={ "head_width_neg" 126 "head_width_neg" 114 } + gene_head_profile={ "head_profile_neg" 160 "head_profile_neg" 87 } + gene_head_top_height={ "head_top_height_pos" 127 "head_top_height_pos" 135 } + gene_head_top_width={ "head_top_width_pos" 157 "head_top_width_pos" 136 } + gene_jaw_angle={ "jaw_angle_neg" 104 "jaw_angle_neg" 104 } + gene_jaw_forward={ "jaw_forward_pos" 139 "jaw_forward_pos" 139 } + gene_jaw_height={ "jaw_height_pos" 186 "jaw_height_pos" 186 } + gene_jaw_width={ "jaw_width_pos" 128 "jaw_width_pos" 128 } + gene_mouth_corner_depth={ "mouth_corner_depth_pos" 127 "mouth_corner_depth_pos" 127 } + gene_mouth_corner_height={ "mouth_corner_height_neg" 124 "mouth_corner_height_neg" 124 } + gene_mouth_forward={ "mouth_forward_pos" 133 "mouth_forward_pos" 133 } + gene_mouth_height={ "mouth_height_pos" 113 "mouth_height_pos" 163 } + gene_mouth_width={ "mouth_width_pos" 135 "mouth_width_pos" 135 } + gene_mouth_upper_lip_size={ "mouth_upper_lip_size_neg" 114 "mouth_upper_lip_size_neg" 114 } + gene_mouth_lower_lip_size={ "mouth_lower_lip_size_pos" 109 "mouth_lower_lip_size_pos" 128 } + gene_mouth_open={ "mouth_open_neg" 0 "mouth_open_neg" 0 } + gene_neck_length={ "neck_length_neg" 117 "neck_length_neg" 106 } + gene_neck_width={ "neck_width_neg" 140 "neck_width_neg" 125 } + gene_bs_cheek_forward={ "cheek_forward_pos" 47 "cheek_forward_pos" 47 } + gene_bs_cheek_height={ "cheek_height_pos" 2 "cheek_height_pos" 2 } + gene_bs_cheek_width={ "cheek_width_neg" 16 "cheek_width_neg" 16 } + gene_bs_ear_angle={ "ear_angle_pos" 9 "ear_angle_pos" 121 } + gene_bs_ear_inner_shape={ "ear_inner_shape_pos" 116 "ear_inner_shape_pos" 116 } + gene_bs_ear_bend={ "ear_lower_bend_pos" 1 "ear_lower_bend_pos" 15 } + gene_bs_ear_outward={ "ear_outward_pos" 90 "ear_outward_pos" 90 } + gene_bs_ear_size={ "ear_size_neg" 45 "ear_size_neg" 45 } + gene_bs_eye_corner_depth={ "eye_corner_depth_pos" 35 "eye_corner_depth_pos" 43 } + gene_bs_eye_fold_shape={ "eye_fold_shape_pos" 125 "eye_fold_shape_pos" 15 } + gene_bs_eye_size={ "eye_size_neg" 39 "eye_size_neg" 39 } + gene_bs_eye_upper_lid_size={ "eye_upper_lid_size_pos" 21 "eye_upper_lid_size_pos" 21 } + gene_bs_forehead_brow_curve={ "forehead_brow_curve_neg" 88 "forehead_brow_curve_neg" 88 } + gene_bs_forehead_brow_forward={ "forehead_brow_forward_neg" 111 "forehead_brow_forward_neg" 111 } + gene_bs_forehead_brow_inner_height={ "forehead_brow_inner_height_neg" 97 "forehead_brow_inner_height_neg" 97 } + gene_bs_forehead_brow_outer_height={ "forehead_brow_outer_height_neg" 35 "forehead_brow_outer_height_neg" 35 } + gene_bs_forehead_brow_width={ "forehead_brow_width_neg" 45 "forehead_brow_width_neg" 45 } + gene_bs_jaw_def={ "jaw_def_neg" 15 "jaw_def_neg" 15 } + gene_bs_mouth_lower_lip_def={ "mouth_lower_lip_def_pos" 255 "mouth_lower_lip_def_pos" 61 } + gene_bs_mouth_lower_lip_full={ "mouth_lower_lip_full_neg" 75 "mouth_lower_lip_full_neg" 100 } + gene_bs_mouth_lower_lip_pad={ "mouth_lower_lip_pad_neg" 57 "mouth_lower_lip_pad_pos" 13 } + gene_bs_mouth_lower_lip_width={ "mouth_lower_lip_width_neg" 82 "mouth_lower_lip_width_neg" 82 } + gene_bs_mouth_philtrum_def={ "mouth_philtrum_def_pos" 100 "mouth_philtrum_def_pos" 100 } + gene_bs_mouth_philtrum_shape={ "mouth_philtrum_shape_neg" 35 "mouth_philtrum_shape_neg" 35 } + gene_bs_mouth_philtrum_width={ "mouth_philtrum_width_neg" 48 "mouth_philtrum_width_neg" 48 } + gene_bs_mouth_upper_lip_def={ "mouth_upper_lip_def_pos" 15 "mouth_upper_lip_def_pos" 15 } + gene_bs_mouth_upper_lip_full={ "mouth_upper_lip_full_pos" 32 "mouth_upper_lip_full_pos" 32 } + gene_bs_mouth_upper_lip_profile={ "mouth_upper_lip_profile_neg" 13 "mouth_upper_lip_profile_neg" 13 } + gene_bs_mouth_upper_lip_width={ "mouth_upper_lip_width_neg" 95 "mouth_upper_lip_width_neg" 95 } + gene_bs_nose_forward={ "nose_forward_neg" 9 "nose_forward_neg" 21 } + gene_bs_nose_height={ "nose_height_pos" 75 "nose_height_pos" 139 } + gene_bs_nose_length={ "nose_length_pos" 36 "nose_length_pos" 36 } + gene_bs_nose_nostril_height={ "nose_nostril_height_neg" 10 "nose_nostril_height_neg" 10 } + gene_bs_nose_nostril_width={ "nose_nostril_width_neg" 47 "nose_nostril_width_neg" 47 } + gene_bs_nose_profile={ "nose_profile_hawk" 79 "nose_profile_hawk" 9 } + gene_bs_nose_ridge_angle={ "nose_ridge_angle_neg" 17 "nose_ridge_angle_neg" 26 } + gene_bs_nose_ridge_width={ "nose_ridge_width_neg" 45 "nose_ridge_width_neg" 45 } + gene_bs_nose_size={ "nose_size_pos" 26 "nose_size_pos" 26 } + gene_bs_nose_tip_angle={ "nose_tip_angle_neg" 15 "nose_tip_angle_neg" 15 } + gene_bs_nose_tip_forward={ "nose_tip_forward_neg" 15 "nose_tip_forward_neg" 15 } + gene_bs_nose_tip_width={ "nose_tip_width_neg" 33 "nose_tip_width_neg" 33 } + face_detail_cheek_def={ "cheek_def_01" 160 "cheek_def_01" 160 } + face_detail_cheek_fat={ "cheek_fat_02_pos" 7 "cheek_fat_02_pos" 7 } + face_detail_chin_cleft={ "chin_dimple" 22 "chin_dimple" 22 } + face_detail_chin_def={ "chin_def" 235 "chin_def" 235 } + face_detail_eye_lower_lid_def={ "eye_lower_lid_def_02" 172 "eye_lower_lid_def_02" 172 } + face_detail_eye_socket={ "eye_socket_02" 102 "eye_socket_02" 13 } + face_detail_nasolabial={ "nasolabial_03" 10 "nasolabial_03" 10 } + face_detail_nose_ridge_def={ "nose_ridge_def_pos" 78 "nose_ridge_def_pos" 13 } + face_detail_nose_tip_def={ "nose_tip_def" 255 "nose_tip_def" 255 } + face_detail_temple_def={ "temple_def" 58 "temple_def" 58 } + expression_brow_wrinkles={ "brow_wrinkles_02" 237 "brow_wrinkles_02" 237 } + expression_eye_wrinkles={ "eye_wrinkles_01" 34 "eye_wrinkles_01" 34 } + expression_forehead_wrinkles={ "forehead_wrinkles_01" 88 "forehead_wrinkles_01" 88 } + expression_other={ "cheek_wrinkles_both_01" 0 "cheek_wrinkles_both_01" 0 } + complexion={ "complexion_1" 143 "complexion_1" 180 } + gene_height={ "normal_height" 147 "normal_height" 147 } + gene_bs_body_type={ "body_fat_head_fat_full" 114 "body_fat_head_fat_full" 114 } + gene_bs_body_shape={ "body_shape_hourglass_full" 25 "body_shape_hourglass_full" 0 } + gene_bs_bust={ "bust_clothes" 64 "bust_shape_1_full" 81 } + gene_age={ "old_4" 251 "old_4" 251 } + gene_eyebrows_shape={ "far_spacing_lower_thickness" 182 "far_spacing_lower_thickness" 182 } + gene_eyebrows_fullness={ "layer_2_avg_thickness" 77 "layer_2_avg_thickness" 77 } + gene_body_hair={ "body_hair_sparse" 131 "body_hair_sparse" 131 } + gene_hair_type={ "hair_wavy" 93 "hair_wavy" 93 } + gene_baldness={ "male_pattern_baldness" 165 "male_pattern_baldness" 165 } + eye_accessory={ "normal_eyes" 7 "normal_eyes" 7 } + teeth_accessory={ "normal_teeth" 0 "normal_teeth" 0 } + eyelashes_accessory={ "normal_eyelashes" 35 "normal_eyelashes" 35 } + hairstyles={ "indian_hairstyles_wavy" 170 "all_hairstyles" 0 } + beards={ "fp2_beards_straight" 42 "no_beard" 0 } + clothes={ "western_bedchamber" 79 "most_clothes" 0 } + } + } + enabled=yes +} \ No newline at end of file diff --git a/N3OW/common/dynasties/NEOW_dynasties.txt b/N3OW/common/dynasties/NEOW_dynasties.txt index 5eaf460e..817bae01 100644 --- a/N3OW/common/dynasties/NEOW_dynasties.txt +++ b/N3OW/common/dynasties/NEOW_dynasties.txt @@ -1425,7 +1425,23 @@ dynn_britannia_harhman = { # e_scandinavia + +bernadotte_dynasty = { + name = dynn_Bernadotte + culture = svealandsk +} + +roda_ulven_dynasty = { + name = dynn_Ulven + culture = svealandsk +} + +kruger_dynasty = { + name = dynn_Krueger + culture = svealandsk + loon_dynasty = { name = dynn_loon culture = frisian + } \ No newline at end of file diff --git a/N3OW/common/landed_titles/noble_families.txt b/N3OW/common/landed_titles/noble_families.txt index 3efeacdd..4d235d60 100644 --- a/N3OW/common/landed_titles/noble_families.txt +++ b/N3OW/common/landed_titles/noble_families.txt @@ -299,5 +299,20 @@ d_nf_spatstony = { #Spatstony noble_family = yes destroy_if_invalid_heir = yes + ai_primary_priority = { add = @never_primary_score } +} + +d_nf_juny = { #Mountbatten + color = { 100 100 100 } + capital = c_london + + definite_form = yes + landless = yes + ruler_uses_title_name = no + always_follows_primary_heir = yes + no_automatic_claims = yes + noble_family = yes + destroy_if_invalid_heir = yes + ai_primary_priority = { add = @never_primary_score } } \ No newline at end of file diff --git a/N3OW/common/landed_titles/scandinavia.txt b/N3OW/common/landed_titles/scandinavia.txt index eb3ac3c4..f7dda6c1 100644 --- a/N3OW/common/landed_titles/scandinavia.txt +++ b/N3OW/common/landed_titles/scandinavia.txt @@ -316,23 +316,6 @@ e_scandinavia = { color = { 50 110 230 } } } - c_aland = { - color = { 28 56 199 } - - cultural_names = { - name_list_swedish = cn_aland_SWE - name_list_norse = cn_ahvenanmaa - } - - b_sund = { - province = 216 - color = { 28 56 199 } - } - b_jomala = { - province = 217 - color = { 28 56 199 } - } - } } d_jamtland = { @@ -876,7 +859,7 @@ e_scandinavia = { d_norrland = { color = { 40 70 220 } - capital = c_medelpad + capital = c_angermanland c_medelpad = { color = { 55 65 215 } @@ -904,7 +887,11 @@ e_scandinavia = { } c_angermanland = { #Angermannaland color = { 30 55 185 } + b_neteru = { #(Nätra) + province = 367 + color = { 30 55 185 } + } b_solatumum = { #(Sollefteå) province = 366 @@ -913,11 +900,6 @@ e_scandinavia = { b_sioboradh = { #(Säbrå) province = 365 - color = { 30 55 185 } - } - b_neteru = { #(Nätra) - province = 367 - color = { 30 55 185 } } } diff --git a/N3OW/common/religion/religions/NEOW_thelema.txt b/N3OW/common/religion/religions/NEOW_thelema.txt index 7c12b023..5e1356e3 100644 --- a/N3OW/common/religion/religions/NEOW_thelema.txt +++ b/N3OW/common/religion/religions/NEOW_thelema.txt @@ -21,7 +21,7 @@ doctrine = doctrine_adultery_women_accepted doctrine = doctrine_kinslaying_shunned doctrine = doctrine_deviancy_virtuous - doctrine = doctrine_witchcraft_virtuous + doctrine = doctrine_witchcraft_accepted #Clerical Functions | placeholder doctrine = doctrine_clerical_function_recruitment @@ -39,7 +39,7 @@ doctrine = doctrine_no_anointment traits = { - virtues = { lustful lifestyle_mystic hashishiyah } + virtues = { lustful lifestyle_mystic hashishiyah arbitrary} sins = { craven content } } @@ -244,7 +244,8 @@ doctrine = the_queen_of_summer doctrine = tenet_do_what_thou_wilt doctrine = tenet_rule_the_waves - + doctrine = doctrine_witchcraft_virtuous + #Special/virtue | placeholder doctrine = special_doctrine_base_thelema doctrine = doctrine_pluralism_pluralistic diff --git a/N3OW/common/religion/religions/NEOW_wicca.txt b/N3OW/common/religion/religions/NEOW_wicca.txt index 0136a95f..018d39ca 100644 --- a/N3OW/common/religion/religions/NEOW_wicca.txt +++ b/N3OW/common/religion/religions/NEOW_wicca.txt @@ -22,7 +22,7 @@ doctrine = doctrine_adultery_women_shunned doctrine = doctrine_kinslaying_close_kin_crime doctrine = doctrine_deviancy_accepted - doctrine = doctrine_witchcraft_virtuous + doctrine = doctrine_witchcraft_accepted #Clerical Functions | placeholder doctrine = doctrine_clerical_function_alms_and_pacification @@ -252,6 +252,8 @@ doctrine = the_queen_of_summer doctrine = king_of_winter doctrine = the_book_of_shadows + + doctrine = doctrine_witchcraft_accepted localization = { #HealthGod | placeholder @@ -350,7 +352,7 @@ doctrine = tenet_druidry doctrine = the_book_of_shadows - + doctrine = doctrine_witchcraft_virtuous } } } diff --git a/N3OW/history/characters/NEOW_e_britannia.txt b/N3OW/history/characters/NEOW_e_britannia.txt index 8c1f7584..be73c385 100644 --- a/N3OW/history/characters/NEOW_e_britannia.txt +++ b/N3OW/history/characters/NEOW_e_britannia.txt @@ -177,6 +177,24 @@ britannia_cyflymarhyan_elyan = { } } +britannia_said_omar = { + name = "Omar" + dynasty = dynn_britannia_said + religion = "victorian" + culture = souflander + trait = education_intrigue_3 + #trait = scarred + trait = callous + trait = diligent + trait = patient + 2497.1.1 = { + birth = yes + } + 2547.1.1 = { + death = yes + } +} + britannia_said_palamedes = { name = "Palamedes" dynasty = dynn_britannia_said @@ -187,6 +205,7 @@ britannia_said_palamedes = { trait = arrogant trait = diligent trait = chaste + father = britannia_said_omar 2527.1.1 = { birth = yes } @@ -205,6 +224,7 @@ britannia_said_barry = { trait = shrewd trait = diligent trait = compassionate + father = britannia_said_omar 2531.1 = { birth = yes } @@ -218,7 +238,12 @@ britannia_said_edward = { dynasty = dynn_britannia_said religion = "victorian" culture = souflander - trait = education_diplomacy_1 + trait = education_diplomacy_3 + trait = arrogant + trait = lifestyle_poet + trait = compassionate + trait = calm + father = britannia_said_omar 2531.1 = { birth = yes } @@ -247,7 +272,7 @@ britannia_starr_cory = { } britannia_starr_kenneth = { - name = "Kenneth" + name = "Kynnyth" dynasty = dynn_britannia_starr religion = "victorian" culture = strafclideg @@ -365,7 +390,7 @@ britannia_starr_anise = { } britannia_starr_john = { - name = "John" + name = "Evan" dynasty = dynn_britannia_starr religion = "victorian" culture = scouseg @@ -404,10 +429,36 @@ britannia_starr_hynrhy = { } } +britannia_giray_arslan = { + name = "Arslan" + dynasty = dynn_britannia_giray + dna = dna_giray_basenzhabu + religion = "victorian" + culture = soueyrneg + trait = education_martial_4 + trait = brave + trait = calm + trait = diligent + trait = strong + trait = holy_warrior + portrait_override={ + portrait_modifier_overrides={ + custom_beards=male_empty + custom_hair=m_hair_ep3_byzantine_03 + } + } + 2468.1.1 = { + birth = yes + } + 2550.1.1 = { + death = yes + } +} + britannia_giray_basenzhabu = { name = "Basynzhabu" dynasty = dynn_britannia_giray - dna = dna_giray_basenzhabu + #dna = dna_giray_basenzhabu religion = "victorian" culture = soueyrneg trait = education_diplomacy_1 @@ -416,6 +467,7 @@ britannia_giray_basenzhabu = { trait = diligent trait = beauty_good_1 trait = lifestyle_poet + father = britannia_giray_arslan portrait_override={ portrait_modifier_overrides={ custom_beards=male_empty @@ -440,6 +492,7 @@ britannia_giray_selim = { trait = brave trait = lazy trait = fickle + father = britannia_giray_arslan portrait_override={ portrait_modifier_overrides={ custom_beards=male_empty @@ -464,6 +517,7 @@ britannia_giray_qirim = { trait = wrathful trait = generous trait = callous + father = britannia_giray_arslan portrait_override={ portrait_modifier_overrides={ custom_beards=male_empty @@ -554,7 +608,7 @@ britannia_elgarh_robyrt = { name = "Robyrt" dynasty = dynn_britannia_elgarh religion = "victorian" - culture = prytoneg + culture = soueyrneg trait = education_stewardship_3 trait = military_engineer trait = eccentric @@ -1512,6 +1566,7 @@ britannia_carnegie_ramsey = { #Windsor Dynasty britannia_windsor_george = { name = "Siôr" + dna = dna_george_windsor dynasty = dynn_britannia_windsor religion = "victorian" culture = soueyrneg diff --git a/N3OW/history/characters/NEOW_e_scandinavia.txt b/N3OW/history/characters/NEOW_e_scandinavia.txt index 2b866e11..98e1021f 100644 --- a/N3OW/history/characters/NEOW_e_scandinavia.txt +++ b/N3OW/history/characters/NEOW_e_scandinavia.txt @@ -22,13 +22,11 @@ scandinavia0002 = { dynasty = sanger_dynasty religion = "lutheran" culture = ostsk - trait = education_learning_4 + trait = education_stewardship_4 trait = beauty_bad_3 trait = gluttonous trait = generous trait = humble - trait = comfort_eater - trait = architect trait = weak trait = shrewd 2525.1.1 = { @@ -44,7 +42,7 @@ scandinavia0003 = { name = "Adolph" dynasty = lundgren_dynasty religion = "folketro" - culture = svealandsk + culture = gotsk trait = education_martial_2 trait = beauty_good_3 trait = physique_good_3 @@ -86,9 +84,8 @@ scandinavia0005 = { culture = skansk trait = education_martial_3 trait = gregarious - trait = scholar + trait = cynical trait = generous - trait = chaste 2527.1.1 = { birth = yes } @@ -132,6 +129,81 @@ scandinavia0007 = { } scandinavia0008 = { + name = "Oskar" + dynasty = roda_ulven_dynasty + religion = "folketro" + culture = vestsk + trait = education_martial_3 + trait = sadistic + trait = gregarious + trait = gluttonous + trait = physique_good_3 + 2526.1.1 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + +scandinavia0009 = { + name = "Ivar" + dynasty = kruger_dynasty + religion = "lutheran" + culture = gotsk + trait = education_stewardship_4 + trait = callous + trait = stubborn + trait = calm + 2506.1.1 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + +scandinavia0010 = { + name = "Frederick" + dynasty = kruger_dynasty + religion = "lutheran" + culture = gotsk + trait = education_intrigue_4 + trait = sadistic + trait = stubborn + trait = vengeful + trait = physique_good_3 + trait = strong + trait = beauty_bad_3 + trait = scaly + father = scandinavia0009 + 2539.1.1 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + +scandinavia0011 = { + name = "Olaf" + dynasty = cederstrom_dynasty + religion = "lutheran" + culture = gutnsk + trait = education_martial_4 + trait = calm + trait = diligent + trait = callous + 2522.3.13 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + + +scandinavia0012 = { name = "Douwe" dynasty = loon_dynasty religion = "lutheran" @@ -140,10 +212,11 @@ scandinavia0008 = { trait = paranoid trait = arrogant trait = craven - 2522.3.13 = { + 2526.1.1 = { birth = yes } 2600.1.1 = { death = yes } -} \ No newline at end of file +} + diff --git a/N3OW/history/titles/NEOW_admin_titles.txt b/N3OW/history/titles/NEOW_admin_titles.txt index 3bc6da94..4ee4ad27 100644 --- a/N3OW/history/titles/NEOW_admin_titles.txt +++ b/N3OW/history/titles/NEOW_admin_titles.txt @@ -189,6 +189,16 @@ d_nf_wellesley = { # Wellesley } } +d_nf_juny = { # Wellesley + 2554.1.1 = { + liege = e_britannia + holder = britannia_juny_bryan #Arthur Solomonid + government = administrative_government + succession_laws = { noble_family_succession_law } + } +} + + #old britania, keep for future potential changes #d_nf_jacob = { # Solomonid diff --git a/N3OW/history/titles/k_sweden.txt b/N3OW/history/titles/k_sweden.txt index 1a0add3c..9f97c1bb 100644 --- a/N3OW/history/titles/k_sweden.txt +++ b/N3OW/history/titles/k_sweden.txt @@ -36,7 +36,7 @@ d_jamtland = { d_norrland= { 2552.1.1 = { - holder = scandinavia0006 + holder = scandinavia0008 } } @@ -57,3 +57,19 @@ d_gavleborg= { } } +d_smaland = { + 2552.1.1 = { + holder = scandinavia0009 + } +} + +d_gotland= { + 2552.1.1 = { + holder = scandinavia0011 + } +} +c_oland= { + 2552.1.1 = { + holder = scandinavia0011 + } +} \ No newline at end of file diff --git a/N3OW/holder for later/common/landed_titles/finland.txt b/N3OW/holder for later/common/landed_titles/finland.txt index 0a756f2d..00d5f3f4 100644 --- a/N3OW/holder for later/common/landed_titles/finland.txt +++ b/N3OW/holder for later/common/landed_titles/finland.txt @@ -587,7 +587,23 @@ e_finland = { } } } + c_aland = { + color = { 28 56 199 } + cultural_names = { + name_list_swedish = cn_aland_SWE + name_list_norse = cn_ahvenanmaa + } + + b_sund = { + province = 216 + color = { 28 56 199 } + } + b_jomala = { + province = 217 + color = { 28 56 199 } + } + } c_satakunta = { color = { 200 190 25 } 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 a3c0aac1..f534c10f 100644 --- a/N3OW/localization/english/dynasties/NEOW_dynasty_names_l_english.yml +++ b/N3OW/localization/english/dynasties/NEOW_dynasty_names_l_english.yml @@ -18,6 +18,7 @@ dynn_Batar_e_grv_u:0 "Batarèu" dynn_Bec_a_grv_ris:0 "Becàris" dynn_Belissen:0 "Belissen" + dynn_Bernadotte:0 "Bernadotte" dynn_Berno:0 "Berno" dynn_B_e_grv_uves_e_act_:0 "Bèuvesé" dynn_Bonac_u_grv_rsi:0 "Bonacùrsi" @@ -790,3 +791,5 @@ dynn_Zipperer:0 "Zipperer" dynn_Zoller:0 "Zoller" dynn_Zwick:0 "Zwick" + dynn_Ulven:0 "Roda Ulven" + dynn_Krueger:0 "Krueger" diff --git a/N3OW/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml b/N3OW/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml index dab76ccc..7249d20a 100644 --- a/N3OW/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml +++ b/N3OW/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml @@ -26,7 +26,7 @@ dynn_belpois:0 "Belpois" dynn_giry:0 "Giry" dynn_eiffel:0 "Eiffel" - dynn_spatstony:0 "Spatstony" + dynn_spatstony:0 "Spatstone" dynn_millardet:0 "Millardet" dynn_beaumont:0 "Beaumont" dynn_orleans:0 "Orleans" @@ -255,9 +255,9 @@ dynn_said:0 "Said-Zanzibar" dynn_starr:0 "Starhrh" dynn_tudorh:0 "Tuddorh" - dynn_elgarh:0 "Elgarh" + dynn_elgarh:0 "Roycy" dynn_wall:0 "Waillaice" - dynn_rholls_rhoycy:0 "Rholls-Rhoycy" + dynn_rholls_rhoycy:0 "Hyndry" dynn_nelson:0 "Nelson" dynn_solomonid:0 "Solomonid" dynn_colbrugha:0 "Colburgha" @@ -290,9 +290,9 @@ dynn_keith:0 "Keith" dynn_drummond:0 "Drummond" dynn_carnegie:0 "Carnegie" - dynn_jacob:0 "Jäger" + dynn_jacob:0 "Jakobs" dynn_newton:0 "Newton" - dynn_juny:0 "Juny" + dynn_juny:0 "Mountbatten" dynn_gibb:0 "Gibb" dynn_lennon:0 "Lennon" dynn_harriswn:0 "Harriswn" diff --git a/N3OW/localization/english/titles_l_english.yml b/N3OW/localization/english/titles_l_english.yml index 516d0652..cf3cc3f8 100644 --- a/N3OW/localization/english/titles_l_english.yml +++ b/N3OW/localization/english/titles_l_english.yml @@ -24386,6 +24386,8 @@ d_nf_lawrence_article: "$DEFAULT_TITLE_NAME_ARTICLE$" d_nf_cartney: "$dynn_cartney$ Family" d_nf_cartney_article: "$DEFAULT_TITLE_NAME_ARTICLE$" + d_nf_juny: "$dynn_juny$ Family" + d_nf_juny_article: "$DEFAULT_TITLE_NAME_ARTICLE$" ###### d_nf_ampelas: "$dynn_Ampelas$ Family" d_nf_ampelas_article: "$DEFAULT_TITLE_NAME_ARTICLE$"