diff --git a/common/coat_of_arms/coat_of_arms/01_landed_titles.txt b/common/coat_of_arms/coat_of_arms/01_landed_titles.txt index 9835e334e..a150e999a 100644 --- a/common/coat_of_arms/coat_of_arms/01_landed_titles.txt +++ b/common/coat_of_arms/coat_of_arms/01_landed_titles.txt @@ -22538,6 +22538,120 @@ c_nottinghamshire = { } +c_birmingham = { + pattern="pattern_horizontal_split_01.dds" + color1=yellow + color2=yellow + color3=black + colored_emblem={ + color1=black + texture="ce_block_05.dds" + instance={ + position={ 0.500000 0.150000 } + scale={ 1.000000 0.500000 } + } + + instance={ + position={ 0.500000 0.850000 } + scale={ 1.000000 0.500000 } + depth=1.010000 + } + + instance={ + position={ 0.500000 0.750000 } + scale={ 1.000000 0.500000 } + depth=2.010000 + } + + instance={ + position={ 0.500000 0.250000 } + scale={ 1.000000 0.500000 } + depth=3.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_block_02.dds" + instance={ + position={ 0.100000 0.500000 } + scale={ 0.130000 0.130000 } + depth=4.010000 + rotation=45 + } + + instance={ + position={ 0.300000 0.500000 } + scale={ 0.130000 0.130000 } + depth=5.010000 + rotation=45 + } + + instance={ + position={ 0.700000 0.500000 } + scale={ 0.130000 0.130000 } + depth=6.010000 + rotation=45 + } + + instance={ + position={ 0.900000 0.500000 } + scale={ 0.130000 0.130000 } + depth=7.010000 + rotation=45 + } + + instance={ + scale={ 0.130000 0.130000 } + depth=8.010000 + rotation=45 + } + + } + + colored_emblem={ + color1=black + texture="ce_block_02.dds" + instance={ + position={ 0.100000 0.500000 } + scale={ 0.250000 0.250000 } + depth=9.010000 + rotation=45 + } + + instance={ + position={ 0.905000 0.500000 } + scale={ 0.250000 0.250000 } + depth=10.010000 + rotation=45 + } + + instance={ + position={ 0.300000 0.500000 } + scale={ 0.250000 0.250000 } + depth=11.010000 + rotation=45 + } + + instance={ + position={ 0.700000 0.500000 } + scale={ 0.250000 0.250000 } + depth=12.010000 + rotation=45 + } + + instance={ + scale={ 0.250000 0.250000 } + depth=13.010000 + rotation=45 + } + + } + +} + + c_derby={ pattern="pattern_horizontal_split_02.dds" color1=yellow @@ -22551,7 +22665,17 @@ c_derby={ instance={ position={ 0.500000 0.640000 } scale={ 0.750000 0.750000 } - depth=1.010000 + depth=2.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_circle_mask.dds" + instance={ + position={ 0.500000 0.645000 } + scale={ 0.120000 0.120000 } } } @@ -22562,19 +22686,19 @@ c_derby={ instance={ position={ 0.800000 0.140000 } scale={ 0.333000 0.273000 } - depth=2.010000 + depth=3.010000 } instance={ position={ 0.200000 0.140000 } scale={ 0.333000 0.270000 } - depth=3.010000 + depth=4.010000 } instance={ position={ 0.500000 0.140000 } scale={ 0.323000 0.273000 } - depth=4.010000 + depth=5.010000 } } @@ -22587,19 +22711,19 @@ c_derby={ instance={ position={ 0.200000 0.230000 } scale={ 0.220000 0.220000 } - depth=5.010000 + depth=6.010000 } instance={ position={ 0.800000 0.230000 } scale={ 0.220000 0.220000 } - depth=6.010000 + depth=7.010000 } instance={ position={ 0.500000 0.230000 } scale={ 0.220000 0.220000 } - depth=7.010000 + depth=8.010000 } } @@ -22610,7 +22734,7 @@ c_derby={ instance={ position={ 0.500000 0.000000 } scale={ 1.000000 0.700000 } - depth=8.010000 + depth=9.010000 } } @@ -22621,8 +22745,9 @@ c_derby={ color3=yellow texture="ce_flower.dds" instance={ - position={ 0.500000 0.620000 } - scale={ 0.520000 -0.520000 } + position={ 0.500000 0.640000 } + scale={ 0.550000 -0.550000 } + depth=1.010000 } } @@ -22630,7 +22755,6 @@ c_derby={ } - c_lincolnshire = { pattern="pattern_horizontal_split_02.dds" color1=white diff --git a/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt b/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt index afa1c8be7..a1c00e4c6 100644 --- a/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt +++ b/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt @@ -13749,28 +13749,28 @@ dynn_britannia_wellesley={ color1=red texture="ce_block_05.dds" instance={ - position={ 0.460000 0.230000 } - scale={ 0.190000 0.190000 } - rotation=49 + position={ 0.450000 0.210000 } + scale={ 0.160000 0.160000 } + rotation=50 } instance={ - position={ 0.540000 0.320000 } - scale={ 0.110000 0.110000 } + position={ 0.535000 0.320000 } + scale={ 0.120000 0.120000 } depth=1.010000 rotation=48 } instance={ - position={ 0.450000 0.330000 } - scale={ 0.130000 0.130000 } + position={ 0.455000 0.330000 } + scale={ 0.110000 0.110000 } depth=2.010000 rotation=130 } instance={ - position={ 0.560000 0.200000 } - scale={ 0.110000 0.110000 } + position={ 0.560000 0.205000 } + scale={ 0.160000 0.160000 } depth=3.010000 rotation=130 } @@ -14163,8 +14163,8 @@ dynn_britannia_wellesley={ color1=white texture="ce_bendlet.dds" instance={ - position={ 0.510000 0.260000 } - scale={ 0.210000 -0.210000 } + position={ 0.515000 0.260000 } + scale={ 0.200000 -0.210000 } depth=7.010000 rotation=175 } @@ -14180,6 +14180,7 @@ dynn_britannia_wellesley={ } + dynn_britannia_cartney={ pattern="pattern__solid_designer.dds" color1=rgb { 52 49 45 } @@ -14267,7 +14268,7 @@ dynn_britannia_watts={ color1=red texture="ce_block_01.dds" instance={ - position={ 0.500000 0.030000 } + position={ 0.500000 0.075000 } depth=3.010000 } @@ -14293,8 +14294,19 @@ dynn_britannia_watts={ color1=black texture="ce_ermine_pattern.dds" instance={ - position={ 0.500000 0.600000 } - scale={ 1.000000 0.680000 } + position={ 0.500000 0.920000 } + scale={ 1.000000 0.500000 } + depth=5.010000 + } + + } + + colored_emblem={ + color1=black + color2=black + texture="ce_ermine_pattern.dds" + instance={ + scale={ 1.000000 0.500000 } depth=4.010000 } @@ -24349,3 +24361,57 @@ goldflower_dynasty={ } } + +dynn_britannia_kimber ={ + pattern="pattern_horizontal_split_02.dds" + color1=white + color2=black + color3=blue + colored_emblem={ + color1=red + color2=black + color3=yellow + texture="ce_owl.dds" + instance={ + position={ 0.500000 0.830000 } + scale={ 0.350000 0.350000 } + } + + instance={ + position={ 0.710000 0.530000 } + scale={ 0.350000 0.350000 } + depth=1.010000 + } + + instance={ + position={ 0.290000 0.530000 } + scale={ 0.350000 0.350000 } + depth=2.010000 + } + + } + + colored_emblem={ + color1=white + texture="ce_star_05.dds" + instance={ + position={ 0.760000 0.180000 } + scale={ 0.300000 0.300000 } + depth=3.010000 + } + + instance={ + position={ 0.500000 0.180000 } + scale={ 0.300000 0.300000 } + depth=4.010000 + } + + instance={ + position={ 0.240000 0.180000 } + scale={ 0.300000 0.300000 } + depth=5.010000 + } + + } + +} diff --git a/common/dynasties/NEOW_dynasties.txt b/common/dynasties/NEOW_dynasties.txt index f561714f9..d2be4431a 100644 --- a/common/dynasties/NEOW_dynasties.txt +++ b/common/dynasties/NEOW_dynasties.txt @@ -314,6 +314,11 @@ dynn_britannia_cyflymarhyan = { culture = soueyrneg } +dynn_britannia_kimber = { + name = dynn_kimber + culture = soueyrneg +} + dynn_britannia_said = { name = dynn_said prefix = "dynnp_al-" diff --git a/common/genes/07_genes_special_accessories_misc.txt b/common/genes/07_genes_special_accessories_misc.txt index a9f8bfd6d..e5ef83d81 100644 --- a/common/genes/07_genes_special_accessories_misc.txt +++ b/common/genes/07_genes_special_accessories_misc.txt @@ -1982,6 +1982,33 @@ special_genes = { boy = male girl = female } + coronation_crown_nistrenia_imperial_gene = { + index = 150 + male = { + 1 = coronation_crown_nistrenia_imperial + } + female = male + boy = male + girl = female + } + coronation_crown_britannia_imperial_gene = { + index = 151 + male = { + 1 = coronation_crown_britannia_imperial + } + female = male + boy = male + girl = female + } + coronation_crown_doggerland_royal_gene = { + index = 152 + male = { + 1 = coronation_crown_doggerland_royal + } + female = male + boy = male + girl = female + } } ##################################### @@ -3209,6 +3236,15 @@ special_genes = { boy = male girl = female } + neow_ak_mace_gene = { + index = 150 + male = { + 1 = ak_mace + } + female = male + boy = male + girl = female + } } diff --git a/common/landed_titles/britannia.txt b/common/landed_titles/britannia.txt index 1843a0827..e5dce9c0d 100644 --- a/common/landed_titles/britannia.txt +++ b/common/landed_titles/britannia.txt @@ -487,6 +487,9 @@ e_britannia = { # Great Britain name_list_strafclideg = cn_mairch } } + } + c_huntingdonshire = { + color = { 178 55 44 } b_leightonstone = { #Huntingdon province = 1543 color = { 175 40 55 } @@ -508,8 +511,8 @@ e_britannia = { # Great Britain name_list_prytoneg = cn_pytyrhborhough name_list_scouseg = cn_pytyrborough } - } - } + } + } c_suffolk = { color = { 178 55 44 } @@ -617,6 +620,8 @@ e_britannia = { # Great Britain name_list_scouseg = cn_myllton } } + } + c_rutland = { b_rutland = { province = 1613 color = { 130 5 25 } @@ -628,7 +633,7 @@ e_britannia = { # Great Britain name_list_strafclideg = cn_rutlaindd } } - } + } c_northamptonshire = { color = { 153 44 22 } @@ -1930,21 +1935,6 @@ e_britannia = { # Great Britain name_list_strafclideg = cn_rotburi } } - b_lindisfarne = { #Berwick-upon-Tweed - province = 1610 - color = { 245 0 0 } - - cultural_names = { - name_list_NEOW_welsh = cn_caerferwig - name_list_NEOW_goidelic = cn_bearaig_a_deas - name_list_NEOW_highlander = cn_bearaig - name_list_NEOW_scottish = cn_berrucj - name_list_brittannic = cn_byrwyk_upon_twyydd - name_list_prytoneg = cn_byrhwyc_upon_twyydd - name_list_scouseg = cn_byrwyc_upon_twyydd - name_list_strafclideg = cn_berwick_upon_tweedd - } - } b_hexham = { province = 1611 color = { 245 0 0 } @@ -2167,6 +2157,16 @@ e_britannia = { # Great Britain name_list_strafclideg = cn_blaickpool } } + b_furness = { + province = 1642 + color = { 240 25 25 } + + cultural_names = { + name_list_brittannic = cn_ffurnyss + name_list_prytoneg = cn_ffurhnyss + name_list_scouseg = cn_ffurnyss + } + } } c_cheshire = { #Manchester color = { 229 148 34 } @@ -2315,16 +2315,6 @@ e_britannia = { # Great Britain name_list_strafclideg = cn_aipplebi } } - b_furness = { - province = 1642 - color = { 240 25 25 } - - cultural_names = { - name_list_brittannic = cn_ffurnyss - name_list_prytoneg = cn_ffurhnyss - name_list_scouseg = cn_ffurnyss - } - } b_alston_moor = { province = 9717 color = { 240 25 25 } @@ -2397,6 +2387,17 @@ e_britannia = { # Great Britain name_list_NEOW_cypriot = cn_new_constantinopoli } } + b_ripon = { # Selby + province = 1599 + color = { 255 120 35 } + + cultural_names = { + name_list_brittannic = cn_sylby + name_list_prytoneg = cn_sylby + name_list_scouseg = cn_syllby + name_list_strafclideg = cn_selbi + } + } b_scarborough = { province = 1596 color = { 255 95 20 } @@ -2550,17 +2551,6 @@ e_britannia = { # Great Britain name_list_strafclideg = cn_hairrogate } } - b_ripon = { # Selby - province = 1599 - color = { 255 120 35 } - - cultural_names = { - name_list_brittannic = cn_sylby - name_list_prytoneg = cn_sylby - name_list_scouseg = cn_syllby - name_list_strafclideg = cn_selbi - } - } } c_doncaster = { # South Yorkshire color = { 153 101 0 } @@ -3263,7 +3253,39 @@ e_britannia = { # Great Britain name_list_scouseg = cn_fy_bllac_country name_list_strafclideg = cn_te_blaick_country } + c_birmingham= { + color = { 12 127 108 } + b_birmingham = { + province = 1605 + color = { 190 30 30 } + cultural_names = { + name_list_brittannic = cn_byrmyngham + name_list_prytoneg = cn_byrhmyngham + name_list_scouseg = cn_byrmyngham + name_list_strafclideg = cn_birminghaim + } + } + b_wolverhampton = { # Gnosall + province = 1628 + color = { 210 90 65 } + + cultural_names = { + name_list_strafclideg = cn_gnosaill + } + } + b_bromsgrove = { + province = 9724 + color = { 160 20 5 } + + cultural_names = { + name_list_NEOW_welsh = cn_swydd_warwick + name_list_brittannic = cn_bromsgrofy + name_list_prytoneg = cn_brhomsgrhofy + name_list_scouseg = cn_bromsgrofy + } + } + } c_staffordshire = { color = { 12 127 108 } @@ -3297,14 +3319,7 @@ e_britannia = { # Great Britain name_list_strafclideg = cn_staiffordd } } - b_wolverhampton = { # Gnosall - province = 1628 - color = { 210 90 65 } - - cultural_names = { - name_list_strafclideg = cn_gnosaill - } - } + b_lichfield = { province = 9726 color = { 210 90 65 } @@ -3329,17 +3344,6 @@ e_britannia = { # Great Britain name_list_strafclideg = cn_wairwickshire } - b_birmingham = { - province = 1605 - color = { 190 30 30 } - - cultural_names = { - name_list_brittannic = cn_byrmyngham - name_list_prytoneg = cn_byrhmyngham - name_list_scouseg = cn_byrmyngham - name_list_strafclideg = cn_birminghaim - } - } b_warwick = { province = 1603 color = { 190 30 30 } @@ -3405,17 +3409,6 @@ e_britannia = { # Great Britain name_list_scouseg = cn_cyddyrmynstyr } } - b_bromsgrove = { - province = 9724 - color = { 160 20 5 } - - cultural_names = { - name_list_NEOW_welsh = cn_swydd_warwick - name_list_brittannic = cn_bromsgrofy - name_list_prytoneg = cn_brhomsgrhofy - name_list_scouseg = cn_bromsgrofy - } - } b_redditch = { province = 9725 color = { 160 20 5 } @@ -4145,6 +4138,18 @@ e_britannia = { # Great Britain name_list_strafclideg = cn_haimilton } } + b_biggar = { + province = 1739 + color = { 195 100 35 } + + cultural_names = { + name_list_NEOW_goidelic = cn_bigear + name_list_NEOW_manx = cn_bigear + name_list_NEOW_highlander = cn_bigear + name_list_prytoneg = cn_biggarh + name_list_strafclideg = cn_bigair + } + } } c_ayrshire = { color = { 38 95 153 } @@ -4279,19 +4284,6 @@ e_britannia = { # Great Britain name_list_strafclideg = cn_kirkcuddbright } } - b_sanquhar = { - province = 1683 - color = { 230 120 65 } - - cultural_names = { - name_list_NEOW_goidelic = cn_an_t_seann_chathair - name_list_NEOW_manx = cn_an_t_seann_chathair - name_list_NEOW_highlander = cn_an_t_seann_chathair - name_list_NEOW_scottish = cn_sanchar - name_list_prytoneg = cn_sanquharh - name_list_strafclideg = cn_sainquhair - } - } b_wigtown = { province = 1684 color = { 230 120 65 } @@ -4346,6 +4338,19 @@ e_britannia = { # Great Britain name_list_strafclideg = cn_ddumfries } } + b_sanquhar = { + province = 1683 + color = { 230 120 65 } + + cultural_names = { + name_list_NEOW_goidelic = cn_an_t_seann_chathair + name_list_NEOW_manx = cn_an_t_seann_chathair + name_list_NEOW_highlander = cn_an_t_seann_chathair + name_list_NEOW_scottish = cn_sanchar + name_list_prytoneg = cn_sanquharh + name_list_strafclideg = cn_sainquhair + } + } } } @@ -4975,7 +4980,21 @@ e_britannia = { # Great Britain name_list_prytoneg = cn_byrwycshyrhy name_list_scouseg = cn_byrwycshyry } + b_lindisfarne = { #Berwick-upon-Tweed + province = 1610 + color = { 245 0 0 } + cultural_names = { + name_list_NEOW_welsh = cn_caerferwig + name_list_NEOW_goidelic = cn_bearaig_a_deas + name_list_NEOW_highlander = cn_bearaig + name_list_NEOW_scottish = cn_berrucj + name_list_brittannic = cn_byrwyk_upon_twyydd + name_list_prytoneg = cn_byrhwyc_upon_twyydd + name_list_scouseg = cn_byrwyc_upon_twyydd + name_list_strafclideg = cn_berwick_upon_tweedd + } + } b_berwick = { # Duns province = 1675 color = { 190 75 30 } @@ -5060,19 +5079,7 @@ e_britannia = { # Great Britain name_list_scouseg = cn_sylcyrhc name_list_strafclideg = cn_syllcyrc } - } - b_biggar = { - province = 1739 - color = { 195 100 35 } - - cultural_names = { - name_list_NEOW_goidelic = cn_bigear - name_list_NEOW_manx = cn_bigear - name_list_NEOW_highlander = cn_bigear - name_list_prytoneg = cn_biggarh - name_list_strafclideg = cn_bigair - } - } + } } } diff --git a/common/scripted_triggers/00_clothing_triggers.txt b/common/scripted_triggers/00_clothing_triggers.txt index a9659ac48..80817386e 100644 --- a/common/scripted_triggers/00_clothing_triggers.txt +++ b/common/scripted_triggers/00_clothing_triggers.txt @@ -5,7 +5,22 @@ # Character must have a valid reasion to be naked. OR = { has_character_modifier = diplomacy_majesty_4090_no_raiment_modifier # Lunatic event where character goes naked instead of buying new clothes. + has_character_modifier = natural_primitivism_court_naturism_modifier has_character_flag = is_naked # Special flag used in certain events. + rite = { rite_has_parameter = naked_adherents_active } + culture = { has_cultural_parameter = naked_culture_active } + trigger_if = { + limit = { + rite = { rite_has_parameter = naked_priests_active } + } + OR = { + government_has_flag = government_is_theocracy + has_council_position = councillor_court_chaplain + has_trait = devoted + has_trait = zealous + ai_zeal >= 50 + } + } } } @@ -272,12 +287,7 @@ portrait_wear_helmet_trigger = { # Different from Armor, as (crowned) Kings and exists = this trigger_if = { limit = { exists = involved_activity } - NOR = { - has_activity_type = activity_hunt - has_activity_type = activity_pilgrimage - has_activity_type = activity_roaming - } - } + involved_activity = { has_activity_type = activity_tournament } } is_incapable = no is_imprisoned = no diff --git a/gfx/models/portraits/female_body/female_body.asset b/gfx/models/portraits/female_body/female_body.asset index 7401fd8d5..4786f1da7 100644 --- a/gfx/models/portraits/female_body/female_body.asset +++ b/gfx/models/portraits/female_body/female_body.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:749d86f7a0925ec1a8660b0248a6a04cbab09e43ced6c204042a8214dc486c97 -size 171416 +oid sha256:1c3375deec63ff7bb6a61986b1880bd800e188af8571050b1ae3ba6da8685121 +size 179127 diff --git a/gfx/models/portraits/female_body/girl_body.asset b/gfx/models/portraits/female_body/girl_body.asset index a9f625779..169242077 100644 --- a/gfx/models/portraits/female_body/girl_body.asset +++ b/gfx/models/portraits/female_body/girl_body.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd3cd0b61105c30476f9b8c54467c056e5036ef637ca21bc569310ca7f032ec5 -size 170010 +oid sha256:02f2963bc9c6104ecbbf1a9960b9499727005f02f8d3378afd4248050138645c +size 177515 diff --git a/gfx/models/portraits/male_body/boy_body.asset b/gfx/models/portraits/male_body/boy_body.asset index 984a621f6..86cd13133 100644 --- a/gfx/models/portraits/male_body/boy_body.asset +++ b/gfx/models/portraits/male_body/boy_body.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:353c98ddfe85259fb9888478ea8ba4154f2de25ff008b6be15a32a8c9271ea51 -size 159085 +oid sha256:a8599cb8b12ba70fd3e1cb5ee4f558c2b829b5bba1661a2b9e39482924b9fda5 +size 165670 diff --git a/gfx/models/portraits/male_body/male_body.asset b/gfx/models/portraits/male_body/male_body.asset index 439eb6690..700d9641a 100644 --- a/gfx/models/portraits/male_body/male_body.asset +++ b/gfx/models/portraits/male_body/male_body.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:711475fa8a647100702509ad78b080507c9bc375fa8ce9461940c27a00bb49fe -size 224385 +oid sha256:3877ea61a280fd1b8a43b47442b32ee93d6f77b01b3d62d74f7235236234346b +size 234629 diff --git a/gfx/portraits/portrait_modifiers/00_animation_props.txt b/gfx/portraits/portrait_modifiers/00_animation_props.txt index 0fb4f537e..1530f395a 100644 --- a/gfx/portraits/portrait_modifiers/00_animation_props.txt +++ b/gfx/portraits/portrait_modifiers/00_animation_props.txt @@ -3499,52 +3499,7 @@ } } } -### N3OW - Coronation Props - coronation_crown_prop_nistrenia_imperial = { - dna_modifiers = { - accessory = { - mode = add - gene = props_left - template = coronation_crown_nistrenia_imperial_gene - value = 1 - } - } - } - - coronation_crown_prop_britannia_imperial = { - dna_modifiers = { - accessory = { - mode = add - gene = props_left - template = coronation_crown_britannia_imperial_gene - value = 1 - } - } - } - - coronation_crown_prop_doggerland_royal = { - dna_modifiers = { - accessory = { - mode = add - gene = props_left - template = coronation_crown_doggerland_royal_gene - value = 1 - } - } - } - - # N3OW - Other Props - ak_mace_prop = { - dna_modifiers = { - accessory = { - mode = add - gene = props_right - template = neow_ak_mace_gene - range = {0 1} - } - } - } gdp_dromedary = { dna_modifiers = { accessory = { @@ -3786,4 +3741,52 @@ } } } + + ### N3OW - Coronation Props + + coronation_crown_prop_nistrenia_imperial = { + dna_modifiers = { + accessory = { + mode = add + gene = props_left + template = coronation_crown_nistrenia_imperial_gene + value = 1 + } + } + } + + coronation_crown_prop_britannia_imperial = { + dna_modifiers = { + accessory = { + mode = add + gene = props_left + template = coronation_crown_britannia_imperial_gene + value = 1 + } + } + } + + coronation_crown_prop_doggerland_royal = { + dna_modifiers = { + accessory = { + mode = add + gene = props_left + template = coronation_crown_doggerland_royal_gene + value = 1 + } + } + } + + ### N3OW - Other Props + + ak_mace_prop = { + dna_modifiers = { + accessory = { + mode = add + gene = props_right + template = neow_ak_mace_gene + range = {0 1} + } + } + } } diff --git a/history/characters/NEOW_e_britannia.txt b/history/characters/NEOW_e_britannia.txt index 36e7a800b..aa88920fa 100644 --- a/history/characters/NEOW_e_britannia.txt +++ b/history/characters/NEOW_e_britannia.txt @@ -446,10 +446,13 @@ britannia_starr_anise = { culture = scouseg trait = education_intrigue_4 trait = intellect_good_3 + trait = beauty_bad_3 trait = callous trait = gluttonous trait = greedy trait = strong + trait = witch + give_nickname = nick_the_wicked father = britannia_starr_cory female = yes 2528.1.1 = { @@ -1213,9 +1216,8 @@ britannia_blackwood_theodore = { culture = easlander trait = education_learning_3 trait = brave - trait = humble trait = diligent - trait = gallant + trait = eccentric trait = lifestyle_traveler trait = lifestyle_voyager 2514.6.7 = { @@ -3258,7 +3260,7 @@ britannia_david_attenborough= { rite = victorian_rite culture = soueyrneg dna = dna_david_attenborough - trait = trait = education_martial_4 + trait = trait = education_learning_4 trait = erudite trait = generous trait = calm @@ -3402,3 +3404,46 @@ britannia_zarg_o_thrax = { } 2600.1.1 = { death = yes } } + +britannia_kimber_edward = { + name="Iorweth" + dynasty = dynn_britannia_kimber + rite = victorian_rite + culture = soueyrneg + trait = education_diplomacy_3 + trait = forgiving + trait = irritable + trait = wrathful + trait = deceitful + trait = physique_good_2 + trait = intellect_good_1 + trait = dwarf + give_nickname = nick_elbow_high + sexuality = heterosexual + 2496.1.27 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} + +britannia_manners_john = { + name="John" + dynasty = dynn_britannia_manners + rite = victorian_rite + culture = soueyrneg + trait = education_martial_4 + trait = generous + trait = brave + trait = calm + trait = athletic + trait = intellect_good_1 + sexuality = heterosexual + 2521.1.2 = { + birth = yes + } + 2600.1.1 = { + death = yes + } +} \ No newline at end of file diff --git a/history/provinces/e_britannia.txt b/history/provinces/e_britannia.txt index de8edeceb..91adfcffe 100644 --- a/history/provinces/e_britannia.txt +++ b/history/provinces/e_britannia.txt @@ -52,7 +52,6 @@ culture = soueyrneg rite = arcane_rite holding = castle_holding - special_building = krowfymply_castle_01 1100.11.11 = { culture = soueyrneg } @@ -238,6 +237,7 @@ culture = soueyrneg rite = victorian_rite holding = castle_holding + special_building = krowfymply_castle_01 } 1554 = { culture = soueyrneg diff --git a/history/titles/k_england.txt b/history/titles/k_england.txt index 12c0cc467..27ef95524 100644 --- a/history/titles/k_england.txt +++ b/history/titles/k_england.txt @@ -36,18 +36,6 @@ c_avon = { } -d_black_country = { - 2524.10.22 = { - holder = britannia_alex_duleep - } - 2554.10.22 = { - holder = britannia_adam_duleep - government = japan_administrative_government - liege = e_britannia - } -} - - d_london = { 2498.1.1 = { holder = britannia_cyflymarhyan_elyan #Elyan Cyflymarhyan @@ -65,12 +53,83 @@ c_london = { 2505.1.1 = { change_prosperity_level = 15 } + 2498.1.1 = { + holder = britannia_cyflymarhyan_elyan #Elyan Cyflymarhyan + } + 2527.1.1 = { + holder = britannia_cyflymarhyan_islymo #Isylmo Cyflymarhyan + } + 2530.1.1 = { + holder = britannia_cyflymarhyan_frydyryk #Frydyryk Cyflymarhyan + government = japan_administrative_government + } } + +c_buckinghamshire = { + 2498.1.1 = { + holder = britannia_cyflymarhyan_elyan #Elyan Cyflymarhyan + } + 2527.1.1 = { + holder = britannia_cyflymarhyan_islymo #Isylmo Cyflymarhyan + } + 2530.1.1 = { + holder = britannia_cyflymarhyan_frydyryk #Frydyryk Cyflymarhyan + government = japan_administrative_government + } +} + +c_berkshire = { + 2505.1.1 = { + change_prosperity_level = 9 + } + 2539.1.1 = { + holder = britannia_windsor_george #George Windsor + government = japan_administrative_government + liege = e_britannia + } +} + +c_surrey = { + 2505.1.1 = { + change_prosperity_level = 9 + } + 2539.1.1 = { + holder = britannia_windsor_george #George Windsor + government = japan_administrative_government + liege = e_britannia + } +} + +c_avon = { + 2510.1.1 = { + holder = britannia_solomonid_arthur + government = japan_administrative_government + liege = e_britannia + } + 2538.5.19 = { + change_prosperity_level = 9 + } +} + + +c_suffolk = { + 2524.10.22 = { + change_prosperity_level = 6 + holder = britannia_alex_duleep + government = japan_administrative_government + } + 2554.10.22 = { + holder = britannia_adam_duleep + liege = e_britannia + } +} + + d_solent = { 2543.1.1 = { holder = britannia_said_palamedes #Palamedes Al-Said - government = japan_administrative_government + government = japan_feudal_government liege = e_britannia } } @@ -81,7 +140,15 @@ c_isle_of_wight = { } } -d_somerset = { +c_somerset = { + 2550.1.1 = { + holder = britannia_wellesley_oliver #Oliver Wellesley + government = japan_administrative_government + liege = e_britannia + } +} + +c_wiltshire = { 2550.1.1 = { holder = britannia_wellesley_oliver #Oliver Wellesley government = japan_administrative_government @@ -98,14 +165,17 @@ c_cornwall = { c_scilly = { 2554.1.1 = { holder = britannia_paleologus_theodore - #government = japan_administrative_government + government = japan_feudal_government liege = d_cornwall } } c_devon = { 2538.5.19 = { + holder = britannia_blackwood_theodore + government = japan_administrative_government change_prosperity_level = 9 + liege = e_britannia } } @@ -128,10 +198,40 @@ d_cornwall = { c_oxfordshire = { 2505.1.1 = { - change_prosperity_level = 9 + government = japan_administrative_government + holder = britannia_cyflymarhyan_pytyr + change_prosperity_level = 6 + liege = e_britannia } } +c_huntingdonshire = { + 2549.1.1 = { + government = japan_administrative_government + holder = britannia_cyflymarhyan_scarlett + liege = e_britannia + change_prosperity_level = 3 + } +} + +c_leicestershire = { + 2553.1.1 = { + government = japan_administrative_government + holder = britannia_cyflymarhyan_ellyzabyf + liege = e_britannia + change_prosperity_level = 4 + } +} + +c_northamptonshire = { + 2540.1.1 = { + government = japan_feudal_government + holder = britannia_watts_thomas + liege = e_britannia + change_prosperity_level = 5 + } +} + c_norfolk = { 2547.1.1 = { holder = britannia_nelson_boudica #Boudica Nelson @@ -151,6 +251,9 @@ d_channel_islands = { c_cambridgeshire = { 2542.1.1 = { holder = britannia_nelson_boudica #Boudica Nelson + } + 2533.1.1 = { + holder = britannia_newton_margaret # Margaret Newton change_prosperity_level = 8 liege = e_britannia } @@ -177,13 +280,34 @@ c_kent = { 2505.1.1 = { change_prosperity_level = 9 } + 2554.1.1 = { + holder = britannia_windsor_george_1 + government = japan_administrative_government + liege = e_britannia + } } c_east_sussex = { 2505.1.1 = { - change_prosperity_level = 9 + change_prosperity_level = 8 } + 2552.1.1 = { + holder = britannia_starr_cwmfwrt + government = japan_administrative_government + liege = e_britannia + } +} + +c_west_sussex = { + 2505.1.1 = { + change_prosperity_level = 4 + } + 2552.1.1 = { + holder = britannia_said_palamedes + government = japan_feudal_government + liege = e_britannia + } } @@ -191,6 +315,11 @@ c_essex = { 2505.1.1 = { change_prosperity_level = 9 } + 2526.1.1 = { + holder = britannia_kimber_edward + government = japan_administrative_government + liege = e_britannia + } } @@ -198,6 +327,11 @@ c_hertfordshire = { 2505.1.1 = { change_prosperity_level = 9 } + 2526.1.1 = { + holder = britannia_kimber_edward + government = japan_administrative_government + liege = e_britannia + } } c_buckinghamshire = { @@ -207,6 +341,16 @@ c_buckinghamshire = { } +c_rutland = { + 2505.1.1 = { + change_prosperity_level = 3 + holder = britannia_manners_john + government = japan_feudal_government + liege = e_britannia + } +} + + c_hampton = { 2505.1.1 = { change_prosperity_level = 9 @@ -217,6 +361,10 @@ c_dorset = { 2505.1.1 = { change_prosperity_level = 9 } + 2533.1.1 = { + holder = britannia_fitsosbern_horatio #Horatio de Normandy + liege = e_britannia + } } c_surrey = { @@ -225,32 +373,6 @@ c_surrey = { } } - -b_brentford = { - 2530.1.1 = { - holder = britannia_cyflymarhyan_frydyryk - } -} -b_woxbrigge = { - 2530.1.1 = { - holder = britannia_cyflymarhyan_frydyryk - } -} -b_east_end = { - 2530.1.1 = { - holder = britannia_cyflymarhyan_frydyryk - } -} -b_kingston = { - 2530.1.1 = { - holder = britannia_cyflymarhyan_frydyryk - } -} -b_southwark= { - 2530.1.1 = { - holder = britannia_cyflymarhyan_frydyryk - } -} d_united_grand_lodge = { 2547.1.1 = { holder = britannia_harhman_alan diff --git a/history/titles/k_northumberland.txt b/history/titles/k_northumberland.txt index 712799492..12baa8a7e 100644 --- a/history/titles/k_northumberland.txt +++ b/history/titles/k_northumberland.txt @@ -7,20 +7,16 @@ # } #} -d_lancaster = { +c_liverpool = { + 2520.1.1 = { + change_prosperity_level = 14 + } 2499.1.1 = { holder = britannia_starr_cory #Cory Starr government = japan_feudal_government liege = e_britannia } } -d_cumbria= { - 2545.1.1 = { - holder = britannia_cartney_hamish - government = japan_feudal_government - liege = e_britannia - } -} d_northumberland = { 2549.1.1 = { @@ -41,12 +37,13 @@ c_durham = { d_york = { 2520.1.1 = { - holder = britannia_jacob_colin # Fredrick Jagher - government = japan_feudal_government + holder = britannia_windsor_albert + government = japan_administrative_government liege = e_britannia } } + c_liverpool = { 2520.1.1 = { government = japan_feudal_government @@ -60,6 +57,11 @@ c_lancashire = { government = japan_feudal_government change_prosperity_level = 9 } + 2554.1.1 = { + holder = britannia_cyflymarhyan_ddwrwthy + government = japan_administrative_government + liege = e_britannia + } } @@ -70,21 +72,24 @@ c_northumberland = { } } -#c_cumberland = { -# 2520.1.1 = { -# holder = britannia_cartney_hamish -# government = japan_administrative_government -# liege = e_britannia -# } -#} +c_cumberland = { + 2545.1.1 = { + holder = britannia_watts_thomas + government = japan_administrative_government + liege = e_britannia + } +} -#c_westmorland = { -# 2520.1.1 = { -# holder = britannia_harriswn_hwyll -# government = japan_administrative_government -# liege = e_britannia -# } -#} +c_westmorland = { + 2545.1.1 = { + government = japan_feudal_government + } + 2554.1.1 = { + holder = britannia_starr_anise + government = japan_administrative_government + liege = e_britannia + } +} d_lincoln = { 2533.1.1 = { @@ -93,35 +98,38 @@ d_lincoln = { } } -c_east_riding = { +c_west_riding = { 2520.1.1 = { - holder = britannia_watts_thomas + holder = britannia_wood_richard government = japan_feudal_government liege = d_york - change_prosperity_level = 11 - } -} - -c_west_riding = { - 2505.1.1 = { - government = japan_feudal_government change_prosperity_level = 10 } } + + +c_east_riding = { + 2540.1.1 = { + government = japan_feudal_government + holder = britannia_watts_thomas + liege = e_britannia + change_prosperity_level = 9 + } +} + c_north_riding = { 2520.1.1 = { - holder = britannia_wood_richard - government = japan_feudal_government + holder = britannia_windsor_albert + government = japan_administrative_government liege = d_york change_prosperity_level = 9 } } c_cheshire = { - 2520.1.1 = { - government = japan_feudal_government - holder = britannia_jacob_colin + 2539.1.1 = { + holder = britannia_starr_john liege = e_britannia change_prosperity_level = 9 } @@ -129,15 +137,15 @@ c_cheshire = { c_richmond = { 2533.1.1 = { - holder = britannia_richards_james - government = japan_feudal_government - liege = d_york + holder = britannia_tudorh_hynrhy #Hynrhy Tudorh + government = japan_administrative_government + liege = e_britannia } } c_nottinghamshire = { 2533.1.1 = { - holder = britannia_newton_margaret # Margaret Newton + holder = britannia_fitsosbern_horatio #Horatio de Normandy liege = e_britannia change_prosperity_level = 10 } @@ -166,14 +174,12 @@ c_cumberland = { } } -c_westmorland = { - 2545.1.1 = { +c_doncaster = { + 2520.1.1 = { + holder = britannia_wood_richard government = japan_feudal_government + liege = d_york + change_prosperity_level = 10 } } -c_doncaster = { - 2520.1.1 = { - government = japan_feudal_government - } -} diff --git a/history/titles/k_scotland.txt b/history/titles/k_scotland.txt index bbb471653..cd2d1a877 100644 --- a/history/titles/k_scotland.txt +++ b/history/titles/k_scotland.txt @@ -9,7 +9,10 @@ # } } -d_strathclyde = { +c_lennox = { + 2520.1.1 = { + change_prosperity_level = 10 + } 2540.1.1 = { holder = britannia_wall_williaim # Williaim Wall government = japan_feudal_government @@ -38,22 +41,22 @@ c_inverness = { } d_highlands = { 2539.1.1 = { - holder = britannia_brus_raibeart # Raibeart Brus - } -} -c_ross = { - 2539.1.1 = { - holder = britannia_brus_raibeart # Raibeart Brus - } -} -c_sutherland = { - 2539.1.1 = { - holder = britannia_brus_raibeart # Raibeart Brus + holder = britannia_hendderswn_ddaiwyis # Ddaiwyis Hendderswn } } +#c_ross = { +# 2539.1.1 = { +# holder = britannia_brus_raibeart # Raibeart Brus +# } +#} +#c_sutherland = { +# 2539.1.1 = { +# holder = britannia_brus_raibeart # Raibeart Brus +# } +#} c_caithness = { 2539.1.1 = { - holder = britannia_brus_raibeart # Raibeart Brus + holder = britannia_hendderswn_ddaiwyis # Ddaiwyis Hendderswn } } @@ -70,16 +73,16 @@ c_buchan = { } } -d_galloway = { +c_annandale = { 2540.1.1 = { - holder = britannia_hendderswn_ddaiwyis # Ddaiwyis Hendderswn + holder = britannia_brus_raibeart # Raibeart Brus government = japan_feudal_government liege = e_britannia } } c_dunbar = { - 2551.11.19 = { - holder = britannia_walcyr_dduddlyy #Duddley Walker + 2545.1.1 = { + holder = britannia_cartney_hamish liege = d_lothian change_prosperity_level = 11 } @@ -87,7 +90,7 @@ c_dunbar = { c_teviotdale = { 2549.1.1 = { - holder = britannia_hatfield_simon #Simon Hatfield + holder = britannia_walcyr_dduddlyy #Duddley Walker } } @@ -151,6 +154,7 @@ d_albany = { holder = britannia_stuart_mary # Mary Stuart } } + c_atholl = { 2539.1.1 = { holder = britannia_stuart_mary # Mary Stuart @@ -181,7 +185,8 @@ c_mearns = { } c_fife = { 2540.1.1 = { - holder = britannia_knwcks_jwhn # Jwhn Knwcks + holder = britannia_carnegie_ramsey # Ramsey Carnegie + #holder = britannia_knwcks_jwhn # Jwhn Knwcks liege = d_lothian } } @@ -189,6 +194,9 @@ c_strathearn = { 2540.1.1 = { holder = britannia_carnegie_ramsey # Ramsey Carnegie liege = d_lothian + holder = britannia_wall_williaim # Williaim Wall + government = japan_feudal_government + liege = e_britannia change_prosperity_level = 10 } } @@ -199,6 +207,9 @@ c_lanarkshire = { } c_ayrshire = { + 2539.1.1 = { + holder = britannia_stuart_mary # Mary Stuart + } 2540.1.1 = { government = japan_feudal_government } @@ -210,8 +221,3 @@ c_galloway = { } } -c_annandale = { - 2540.1.1 = { - government = japan_feudal_government - } -} diff --git a/history/titles/k_wales.txt b/history/titles/k_wales.txt index 47a2d151e..037f8679d 100644 --- a/history/titles/k_wales.txt +++ b/history/titles/k_wales.txt @@ -1,5 +1,8 @@  -d_gwent = { +c_monmouthshire = { + 2520.1.1 = { + change_prosperity_level = 10 + } 2539.1.1 = { holder = britannia_rholls_rhoycy_bynjamyn #Bynjamyn Rolls-Rhoycy government = japan_administrative_government @@ -7,7 +10,7 @@ d_gwent = { } } -d_hereford = { +c_anglesey = { 2554.1.1 = { holder = britannia_tudorh_hynrhy #Hynrhy Tudorh government = japan_administrative_government @@ -115,6 +118,11 @@ c_worcestershire = { 2520.1.1 = { change_prosperity_level = 10 } + 2525.1.1 = { + holder = britannia_starr_kenneth #Cory Starr + government = japan_feudal_government + liege = e_britannia + } } c_shropshire = { @@ -127,4 +135,22 @@ c_staffordshire= { 2520.1.1 = { change_prosperity_level = 9 } +} +c_gloucestershire= { + 2520.1.1 = { + change_prosperity_level = 4 + } + 2554.1.1 = { + holder = britannia_windsor_henry + government = japan_administrative_government + liege = e_britannia + } +} + +c_birmingham = { + 2554.1.1 = { + holder = britannia_cyflymarhyan_symrhathon #Frydyryk Cyflymarhyan + government = japan_administrative_government + liege = e_britannia + } } \ No newline at end of file diff --git a/localization/english/replace/zz_NEOW_dynasty_names_l_english.yml b/localization/english/replace/zz_NEOW_dynasty_names_l_english.yml index 2e469de06..6244e8bbd 100644 --- a/localization/english/replace/zz_NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/zz_NEOW_dynasty_names_l_english.yml @@ -4837,6 +4837,7 @@ dynn_Kildey_a_uml_rov:0 "Kildeyärov" dynn_Killinen:0 "Killinen" dynn_Kim:0 "Kim" + dynn_kimber:0 "Kimber" dynn_Kimpezi_act_s:0 "Kimpezís" dynn_Kimpizi_act_s:0 "Kimpizís" dynn_King:0 "King"