From 95df26b1dadf9c5eee33117b759efcc0d622b4cc Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Wed, 11 Mar 2026 22:50:02 +0000 Subject: [PATCH] fixes --- .../00_clothing_triggers.txt | 430 +++++++++++++++++- .../religion_events/great_holy_war_events.txt | 13 +- .../animations.modifierpack | 115 +++++ .../portrait_modifiers/00_custom_headgear.txt | 148 +++++- .../portrait_modifiers/01_beards_base.txt | 133 +++++- 5 files changed, 808 insertions(+), 31 deletions(-) diff --git a/common/scripted_triggers/00_clothing_triggers.txt b/common/scripted_triggers/00_clothing_triggers.txt index 17de25b0..f4d225ed 100644 --- a/common/scripted_triggers/00_clothing_triggers.txt +++ b/common/scripted_triggers/00_clothing_triggers.txt @@ -937,6 +937,284 @@ portrait_ugro_permian_clothing_spouse_trigger = { #AKA Khanty } } + +### CCP5 ### + +portrait_ccp5_english_culture_group_low_nobles_trigger = { + OR = { + AND = { + portrait_war_nobles_helmet_ccp5_trigger = { + CULTURE_INPUT = english + } + portrait_low_nobles_armor_trigger = { + CULTURE_INPUT = english + } + } + AND = { + portrait_war_nobles_helmet_ccp5_trigger = { + CULTURE_INPUT = welsh + } + portrait_low_nobles_armor_trigger = { + CULTURE_INPUT = welsh + } + } + AND = { + portrait_war_nobles_helmet_ccp5_trigger = { + CULTURE_INPUT = cornish + } + portrait_low_nobles_armor_trigger = { + CULTURE_INPUT = cornish + } + } + } +} + +portrait_ccp5_english_culture_group_high_nobles_trigger = { + OR = { + AND = { + portrait_war_nobles_helmet_ccp5_trigger = { + CULTURE_INPUT = english + } + portrait_high_nobles_armor_trigger = { + CULTURE_INPUT = english + } + } + AND = { + portrait_war_nobles_helmet_ccp5_trigger = { + CULTURE_INPUT = welsh + } + portrait_high_nobles_armor_trigger = { + CULTURE_INPUT = welsh + } + } + AND = { + portrait_war_nobles_helmet_ccp5_trigger = { + CULTURE_INPUT = cornish + } + portrait_high_nobles_armor_trigger = { + CULTURE_INPUT = cornish + } + } + } +} + +portrait_ccp5_french_culture_group_low_nobles_trigger = { + OR = { + AND = { + portrait_war_nobles_helmet_ccp5_trigger = { + CULTURE_INPUT = french + } + portrait_low_nobles_armor_trigger = { + CULTURE_INPUT = french + } + } + AND = { + portrait_war_nobles_helmet_ccp5_trigger = { + CULTURE_INPUT = norman + } + portrait_low_nobles_armor_trigger = { + CULTURE_INPUT = norman + } + } + AND = { + portrait_war_nobles_helmet_ccp5_trigger = { + CULTURE_INPUT = breton + } + portrait_high_nobles_armor_trigger = { + CULTURE_INPUT = breton + } + } + } +} + +portrait_ccp5_french_culture_group_high_nobles_trigger = { + OR = { + AND = { + portrait_war_nobles_helmet_ccp5_trigger = { + CULTURE_INPUT = french + } + portrait_high_nobles_armor_trigger = { + CULTURE_INPUT = french + } + } + AND = { + portrait_war_nobles_helmet_ccp5_trigger = { + CULTURE_INPUT = norman + } + portrait_high_nobles_armor_trigger = { + CULTURE_INPUT = norman + } + } + AND = { + portrait_war_nobles_helmet_ccp5_trigger = { + CULTURE_INPUT = breton + } + portrait_high_nobles_armor_trigger = { + CULTURE_INPUT = breton + } + } + } +} + +portrait_ccp5_is_any_war_noble_trigger = { + portrait_war_nobles_helmet_ccp5_trigger = { + CULTURE_INPUT = $CULTURE_INPUT$ + } + OR = { + portrait_commoner_armor_trigger = { + CULTURE_INPUT = $CULTURE_INPUT$ + } + portrait_low_nobles_armor_trigger = { + CULTURE_INPUT = $CULTURE_INPUT$ + } + portrait_high_nobles_armor_trigger = { + CULTURE_INPUT = $CULTURE_INPUT$ + } + } +} + +portrait_english_clothing_trigger = { + has_cp5_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = english + } +} + +portrait_welsh_clothing_trigger = { + has_cp5_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = welsh + } +} + +portrait_cornish_clothing_trigger = { + has_cp5_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = cornish + } +} + +portrait_swabian_clothing_trigger = { + has_cp5_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = swabian + } +} + +portrait_breton_clothing_trigger = { + has_cp5_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = breton + } +} + +portrait_norman_clothing_trigger = { + has_cp5_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = norman + } +} + +portrait_pommeranian_clothing_trigger = { + has_cp5_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = pommeranian + } +} + +portrait_english_clothing_spouse_trigger = { + has_cp5_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = english + } +} + +portrait_swabian_clothing_spouse_trigger = { + has_cp5_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = swabian + } +} + +portrait_breton_clothing_spouse_trigger = { + has_cp5_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = breton + } +} +portrait_norman_clothing_spouse_trigger = { + has_cp5_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = norman + } +} +portrait_welsh_clothing_spouse_trigger = { + has_cp5_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = welsh + } +} +portrait_cornish_clothing_spouse_trigger = { + has_cp5_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = cornish + } +} +portrait_pommeranian_clothing_spouse_trigger = { + has_cp5_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = pommeranian + } +} + +### CCP7 EMISHI AINU / NIVKH NANAI ### + +portrait_emishi_clothing_trigger = { + has_cp7_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = emishi + } +} + +portrait_emishi_clothing_spouse_trigger = { + has_cp7_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = culture + CULTURE_FLAG = emishi + } +} + +portrait_nivkh_clothing_trigger = { + has_cp7_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = nivkh + } +} + +portrait_nivkh_clothing_spouse_trigger = { + has_cp7_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = culture + CULTURE_FLAG = nivkh + } +} + ### FP1 ### portrait_fp1_norse_clothing_trigger = { @@ -1218,6 +1496,88 @@ portrait_ainu_clothing_spouse_trigger = { } } +### CCP9 ### + +portrait_khitan_clothing_trigger = { + #has_cp9_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = khitan + } +} + +portrait_khitan_clothing_spouse_trigger = { + #has_cp9_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = culture + CULTURE_FLAG = khitan + } +} + +portrait_dali_clothing_trigger = { #DALI DYNASTY + #has_cp9_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = scope:culture + CULTURE_FLAG = dali + } +} + +portrait_dali_clothing_spouse_trigger = { + #has_cp9_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = culture + CULTURE_FLAG = dali + } +} + +portrait_uyghur_clothing_trigger = { #UYGHR DYNASTY + #has_cp9_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = culture + CULTURE_FLAG = uyghur + } +} + +portrait_uyghur_clothing_spouse_trigger = { + #has_cp9_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = culture + CULTURE_FLAG = uyghur + } +} + +portrait_tangut_clothing_trigger = { #TANGUT DYNASTY + #has_cp9_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = culture + CULTURE_FLAG = tangut + } +} + +portrait_tangut_clothing_spouse_trigger = { + #has_cp9_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = culture + CULTURE_FLAG = tangut + } +} + +portrait_jurchen_clothing_trigger = { #TANGUT DYNASTY + #has_cp9_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = culture + CULTURE_FLAG = jurchen + } +} + +portrait_jurchen_clothing_spouse_trigger = { + #has_cp9_dlc_trigger = yes + portrait_shared_clothing_contents_trigger = { + CULTURE_SCOPE = culture + CULTURE_FLAG = jurchen + } +} + ### General clothing triggers ### portrait_era1_trigger = { # Intended to primarily cover the years 850 to 1000 @@ -1309,7 +1669,24 @@ portrait_era3_armor_trigger = { } portrait_era4_armor_trigger = { - current_year >= 2790 # This is anachronistic and should historically be around 1300 (transitional mail and plate armor) + current_year >= 1240 # This is anachronistic and should historically be around 1300 (transitional mail and plate armor) +} + +##Meant to cover 1270 - 1325 +portrait_late_era3_trigger = { + current_year >= 1220 # This is anachronistic and should historically be around 1300 + current_year < 1340 # 1300 +} + + +## This is so characters wear their cool helmets if they own the DLC helmets +portrait_war_nobles_helmet_ccp5_trigger = { + exists = this + OR = { + has_character_flag = need_military_outfit + portrait_wear_helmet_trigger = yes + } + portrait_$CULTURE_INPUT$_clothing_trigger = yes } @@ -1463,7 +1840,7 @@ portrait_commoner_no_mayors_trigger = { trigger_if = { limit = { exists = this } # To check if this is an actual character NOR = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic primary_spouse ?= { AND = { highest_held_title_tier > tier_county @@ -1570,7 +1947,7 @@ portrait_low_nobles_trigger = { NOR = { government_has_flag = government_is_herder AND = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic primary_title.tier > tier_barony } AND = { @@ -1602,7 +1979,7 @@ portrait_low_nobles_trigger = { } NOR = { AND = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic primary_title.tier > tier_barony } AND = { @@ -1654,7 +2031,7 @@ portrait_high_nobles_trigger = { # Most cultures do not have specific clothes for royalty and imperial tier, so we use the high nobility for anything from duke/duchess and up trigger_else = { highest_held_title_tier >= tier_duchy } AND = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic primary_title.tier > tier_barony } AND = { @@ -1693,7 +2070,7 @@ portrait_high_nobles_trigger = { # Most cultures do not have specific clothes for royalty and imperial tier, so we use the high nobility for anything from duke/duchess and up trigger_else = { highest_held_title_tier >= tier_duchy } AND = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic primary_title.tier > tier_barony } AND = { @@ -1775,7 +2152,7 @@ portrait_high_nobles_headgear_trigger = { } trigger_else = { highest_held_title_tier >= tier_duchy } AND = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic primary_title.tier > tier_county } AND = { @@ -1813,7 +2190,7 @@ portrait_high_nobles_headgear_trigger = { } trigger_else = { highest_held_title_tier >= tier_duchy } AND = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic primary_title.tier > tier_county } AND = { @@ -1876,7 +2253,7 @@ portrait_high_nobles_headgear_trigger = { highest_held_title_tier >= tier_kingdom NOR = { AND = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic primary_title.tier > tier_barony } AND = { @@ -1899,7 +2276,7 @@ portrait_royalty_trigger = { tgp_portrait_liege_or_ceremonial_liege_king_trigger = yes NOR = { AND = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic primary_title.tier > tier_barony } AND = { @@ -1920,7 +2297,7 @@ portrait_royalty_trigger = { tgp_portrait_liege_or_ceremonial_liege_king_trigger = yes NOR = { AND = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic primary_title.tier > tier_barony } AND = { @@ -1939,7 +2316,7 @@ portrait_royalty_trigger = { highest_held_title_tier >= tier_kingdom NOR = { AND = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic primary_title.tier > tier_barony } AND = { @@ -1991,7 +2368,7 @@ portrait_royalty_african_headgear_trigger = { } } } - NOT = { government_has_flag = government_is_special_republic } + NOT = { government_has_flag = government_is_republic } OR = { portrait_african_clothing_trigger = yes AND = { @@ -2029,7 +2406,7 @@ portrait_royalty_african_headgear_trigger = { has_realm_law = camp_purpose_legitimists } } - NOT = { government_has_flag = government_is_special_republic } + NOT = { government_has_flag = government_is_republic } OR = { portrait_african_clothing_spouse_trigger = yes AND = { @@ -2061,7 +2438,7 @@ portrait_imperial_trigger = { tgp_portrait_liege_or_ceremonial_liege_emperor_trigger = yes NOR = { AND = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic primary_title.tier > tier_barony } AND = { @@ -2083,7 +2460,7 @@ portrait_imperial_trigger = { tgp_portrait_liege_or_ceremonial_liege_emperor_trigger = yes NOR = { AND = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic primary_title.tier > tier_barony } AND = { @@ -2123,7 +2500,7 @@ portrait_imperial_nobles_headgear_trigger = { is_ruler = yes government_has_flag = government_is_landless_adventurer } - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic AND = { is_ruler = yes government_has_flag = government_is_theocracy @@ -2437,7 +2814,7 @@ portrait_mayor_trigger = { portrait_mayor_headgear_trigger = { exists = this highest_held_title_tier < tier_county - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic portrait_$CULTURE_INPUT$_clothing_trigger = yes } @@ -2710,6 +3087,22 @@ portrait_religious_sami_trigger = { portrait_sami_clothing_trigger = yes } +## CCP7 EMISHI AINU / NIVKH NANAI ## + +portrait_religious_emishi_trigger = { + has_cp7_dlc_trigger = yes + religion = religion:kamuyism_religion +} +portrait_religious_shamanism_trigger = { + # technically this just makes it so shamanists wear vanilla steppe religious clothing so probably doesn't need a dlc check + religion = religion:shamanism_religion +} +portrait_religious_shamanism_nivkh_trigger = { # same as above but shamanists with nivkh aesthetics will sometimes wear ainu sapanpe headgear + has_cp7_dlc_trigger = yes + portrait_nivkh_clothing_trigger = yes + religion = religion:shamanism_religion +} + portrait_religious_steppe_trigger = { OR = { @@ -2775,6 +3168,7 @@ portrait_religious_african_trigger = { ### DDE HRE ### portrait_reichskrone_trigger = { + exists = this OR = { has_primary_title = title:e_european_union } diff --git a/events/religion_events/great_holy_war_events.txt b/events/religion_events/great_holy_war_events.txt index 3bb1d391..93f3f3a7 100644 --- a/events/religion_events/great_holy_war_events.txt +++ b/events/religion_events/great_holy_war_events.txt @@ -2067,7 +2067,7 @@ great_holy_war.0092 = { } } random_list = { - 20 = { #Pledge. + 15 = { #Pledge. trigger = { OR = { # Either be independent, or have no liege above you of the defending Faith, to avoid messy situations of vassals and lieges fighting against each other. top_liege = this @@ -2089,10 +2089,12 @@ great_holy_war.0092 = { } } } - 80 = { #Do not pledge. + 45 = { + } + 40 = { #Do not pledge. random = { #When not pledging, there is still a chance that the AI will donate money. - chance = 35 + chance = 15 modifier = { factor = 0.75 has_trait = greedy @@ -2273,7 +2275,7 @@ great_holy_war.0021 = { } } random_list = { - 15 = { #Pledge. + 10 = { #Pledge. trigger = { OR = { # Either be independent, or have no liege above you of the attacking Faith, to avoid messy situations of vassals and lieges fighting against each other. top_liege = this @@ -2285,7 +2287,8 @@ great_holy_war.0021 = { } scope:the_faith.great_holy_war = { pledge_defender = root } } - 85 = { #Do not pledge. + 45 + 45 = { #Do not pledge. modifier = { #More pledging happening at start of preparation phase. factor = 0.75 NOT = { exists = scope:the_faith.great_holy_war.ghw_war } diff --git a/gfx/portraits/portrait_animations/animations.modifierpack b/gfx/portraits/portrait_animations/animations.modifierpack index 375e8e48..9ae9ded4 100644 --- a/gfx/portraits/portrait_animations/animations.modifierpack +++ b/gfx/portraits/portrait_animations/animations.modifierpack @@ -313,6 +313,29 @@ one_handed_sword = { animations = female_prop_fix_additive } + portrait_modifier = { # CCP5 + trigger = { + AND = { + has_dlc_feature = high_medieval_warfare_attire + OR = { + portrait_commoner_armor_trigger = { + CULTURE_INPUT = french + } + portrait_commoner_armor_trigger = { + CULTURE_INPUT = norman + } + portrait_commoner_armor_trigger = { + CULTURE_INPUT = breton + } + } + portrait_era3_trigger = yes + } + } + animations_props = marshal_ccp5_french_prop + animations = council_marshal_decal + animations = cloak_additive + } + portrait_modifier = { # POL trigger = { AND = { @@ -724,6 +747,29 @@ lefthanded_one_handed_sword = { animations = female_prop_fix_additive } + portrait_modifier = { # CCP5 + trigger = { + AND = { + has_dlc_feature = high_medieval_warfare_attire + OR = { + portrait_commoner_armor_trigger = { + CULTURE_INPUT = french + } + portrait_commoner_armor_trigger = { + CULTURE_INPUT = norman + } + portrait_commoner_armor_trigger = { + CULTURE_INPUT = breton + } + } + portrait_era3_trigger = yes + } + } + animations_props = marshal_ccp5_french_prop_left + animations = council_marshal_decal + animations = cloak_additive + } + portrait_modifier = { # POL trigger = { AND = { @@ -1382,6 +1428,29 @@ council_marshal = { animations = female_prop_fix_additive } + portrait_modifier = { # CCP5 + trigger = { + AND = { + has_dlc_feature = high_medieval_warfare_attire + OR = { + portrait_commoner_armor_trigger = { + CULTURE_INPUT = french + } + portrait_commoner_armor_trigger = { + CULTURE_INPUT = norman + } + portrait_commoner_armor_trigger = { + CULTURE_INPUT = breton + } + } + portrait_era3_trigger = yes + } + } + animations_props = marshal_ccp5_french_prop + animations = council_marshal_decal + animations = cloak_additive + } + portrait_modifier = { # POL trigger = { AND = { @@ -1717,6 +1786,29 @@ council_marshal_shield = { animations = dwarf_additive } + portrait_modifier = { # CCP5 + trigger = { + AND = { + has_dlc_feature = high_medieval_warfare_attire + OR = { + portrait_commoner_armor_trigger = { + CULTURE_INPUT = french + } + portrait_commoner_armor_trigger = { + CULTURE_INPUT = norman + } + portrait_commoner_armor_trigger = { + CULTURE_INPUT = breton + } + } + portrait_era3_trigger = yes + } + } + animations_props = marshal_ccp5_french_prop + animations = council_marshal_decal + animations = cloak_additive + } + portrait_modifier = { # POL trigger = { has_dlc_feature = west_slavic_attire @@ -1973,6 +2065,29 @@ throneRoom_one_handed_passive_1 = { animations = female_prop_fix_additive } + portrait_modifier = { # CCP5 + trigger = { + AND = { + has_dlc_feature = high_medieval_warfare_attire + OR = { + portrait_commoner_armor_trigger = { + CULTURE_INPUT = french + } + portrait_commoner_armor_trigger = { + CULTURE_INPUT = norman + } + portrait_commoner_armor_trigger = { + CULTURE_INPUT = breton + } + } + portrait_era3_trigger = yes + } + } + animations_props = marshal_ccp5_french_prop + animations = council_marshal_decal + animations = cloak_additive + } + portrait_modifier = { # POL trigger = { culture = { has_clothing_gfx = west_slavic_clothing_gfx } diff --git a/gfx/portraits/portrait_modifiers/00_custom_headgear.txt b/gfx/portraits/portrait_modifiers/00_custom_headgear.txt index 5197b9b7..4b757076 100644 --- a/gfx/portraits/portrait_modifiers/00_custom_headgear.txt +++ b/gfx/portraits/portrait_modifiers/00_custom_headgear.txt @@ -7,6 +7,150 @@ template = no_headgear } + ##ccp9 + + add_accessory_modifiers = { + gene = headgear + template = ccp9_liao_high_nobility_headgear + is_valid_custom = { + has_cp9_dlc_trigger = yes + } + } + + add_accessory_modifiers = { + gene = headgear + template = ccp9_liao_commoner_headgear + is_valid_custom = { + has_cp9_dlc_trigger = yes + } + } + + add_accessory_modifiers = { + gene = headgear + template = ccp9_dali_low_nobility_headgear + is_valid_custom = { + has_cp9_dlc_trigger = yes + } + } + + add_accessory_modifiers = { + gene = headgear + template = ccp9_dali_high_nobility_headgear + is_valid_custom = { + has_cp9_dlc_trigger = yes + } + } + + add_accessory_modifiers = { + gene = headgear + template = ccp9_silla_royalty_headgear + is_valid_custom = { + has_cp9_dlc_trigger = yes + } + } + + add_accessory_modifiers = { + gene = headgear + template = ccp9_uyghur_low_nobility_headgear + is_valid_custom = { + has_cp9_dlc_trigger = yes + } + } + + add_accessory_modifiers = { + gene = headgear + template = ccp9_uyghur_royalty_headgear + is_valid_custom = { + has_cp9_dlc_trigger = yes + } + } + add_accessory_modifiers = { + gene = headgear + template = ccp9_uyghur_high_nobility_headgear + is_valid_custom = { + has_cp9_dlc_trigger = yes + } + } + add_accessory_modifiers = { + gene = headgear + template = ccp9_tangut_high_nobility_headgear + is_valid_custom = { + has_cp9_dlc_trigger = yes + } + } + + add_accessory_modifiers = { + gene = headgear + template = ccp9_tangut_royalty_headgear + is_valid_custom = { + has_cp9_dlc_trigger = yes + } + } + + add_accessory_modifiers = { + gene = headgear + template = ccp9_jurchen_nobility_headgear + is_valid_custom = { + has_cp9_dlc_trigger = yes + } + } + + add_accessory_modifiers = { + gene = headgear + template = ccp9_ming_nobility_headgear + is_valid_custom = { + has_cp9_dlc_trigger = yes + } + } + + ## CCP7 Emishi Ainu ## + + add_accessory_modifiers = { + gene = headgear + template = ccp7_emishi_com + is_valid_custom = { + has_cp7_dlc_trigger = yes + } + } + add_accessory_modifiers = { + gene = headgear + template = ccp7_emishi_lo_nob + is_valid_custom = { + has_cp7_dlc_trigger = yes + } + } + add_accessory_modifiers = { + gene = headgear + template = ccp7_emishi_hi_nob + is_valid_custom = { + has_cp7_dlc_trigger = yes + } + } + add_accessory_modifiers = { + gene = headgear + template = ccp7_ainu_sapanpe + is_valid_custom = { + has_cp7_dlc_trigger = yes + } + } + add_accessory_modifiers = { + gene = headgear + template = ccp7_emishi_war_nob + is_valid_custom = { + has_cp7_dlc_trigger = yes + } + } + + ## CCP7 Nivkh ## + + add_accessory_modifiers = { + gene = headgear + template = ccp7_nivkh_com + is_valid_custom = { + has_cp7_dlc_trigger = yes + } + } + ## TGP Chinese ## add_accessory_modifiers = { @@ -1489,5 +1633,5 @@ gene = special_headgear_spectacles template = spectacles } - -} + +} \ No newline at end of file diff --git a/gfx/portraits/portrait_modifiers/01_beards_base.txt b/gfx/portraits/portrait_modifiers/01_beards_base.txt index d9cb3d06..92f5988c 100644 --- a/gfx/portraits/portrait_modifiers/01_beards_base.txt +++ b/gfx/portraits/portrait_modifiers/01_beards_base.txt @@ -48,12 +48,6 @@ beards = { exists = character:easteregg_daan_broekhof this = character:easteregg_daan_broekhof } - modifier = { - add = 2000 - exists = this - exists = character:france_bonaparte_isildur_i - this = character:france_bonaparte_isildur_i - } modifier = { add = 1000 exists = this @@ -1656,6 +1650,133 @@ beards = { portrait_ainu_clothing_trigger = yes } } + } + + cp7_beards_emishi_straight = { # very similar to tgp ainu stuff above but checks for hair type genes - i made this before the gene tgp gene was added so i consolidated them together for cp7 --aj + dna_modifiers = { + accessory = { + mode = add + gene = beards + template = cp7_emishi_ainu_beards_straight + range = { 0 1 } # For the randomness to work correctly + } + } + weight = { + base = 0 + modifier = { + add = 170 + exists = this + portrait_emishi_clothing_trigger = yes + has_gene = { + category = gene_hair_type + template = hair_straight + } + } + modifier = { # Muslims should always have a beard + add = 200 + OR = { + scope:faith.religion = religion:islam_religion + is_culture_or_descended_from_trigger = { CULTURE = culture:emishi } + } + portrait_emishi_clothing_trigger = yes + } + } + } + cp7_beards_emishi_wavy = { + dna_modifiers = { + accessory = { + mode = add + gene = beards + template = cp7_emishi_ainu_beards_wavy + range = { 0 1 } # For the randomness to work correctly + } + } + weight = { + base = 0 + modifier = { + add = 170 + exists = this + portrait_emishi_clothing_trigger = yes + has_gene = { + category = gene_hair_type + template = hair_wavy + } + } + modifier = { # Muslims should always have a beard + add = 200 + OR = { + scope:faith.religion = religion:islam_religion + is_culture_or_descended_from_trigger = { CULTURE = culture:emishi } + } + portrait_emishi_clothing_trigger = yes + } + } + } + cp7_beards_emishi_curly = { + dna_modifiers = { + accessory = { + mode = add + gene = beards + template = cp7_emishi_ainu_beards_curly + range = { 0 1 } # For the randomness to work correctly + } + } + weight = { + base = 0 + modifier = { + add = 170 + exists = this + portrait_emishi_clothing_trigger = yes + OR = { + has_gene = { + category = gene_hair_type + template = hair_curly + } + has_gene = { + category = gene_hair_type + template = hair_afro + } + } + } + modifier = { # Muslims should always have a beard + add = 200 + OR = { + scope:faith.religion = religion:islam_religion + is_culture_or_descended_from_trigger = { CULTURE = culture:emishi } + } + portrait_emishi_clothing_trigger = yes + } + } + } + cp7_beards_emishi_straight_thin = { + dna_modifiers = { + accessory = { + mode = add + gene = beards + template = tgp_chinese_beards + range = { 0 1 } # For the randomness to work correctly + } + } + weight = { + base = 0 + modifier = { + add = 170 + exists = this + portrait_emishi_clothing_trigger = yes + has_gene = { + category = gene_hair_type + template = hair_straight_thin_beard + } + } + modifier = { # Muslims should always have a beard + add = 200 + OR = { + scope:faith.religion = religion:islam_religion + is_culture_or_descended_from_trigger = { CULTURE = culture:emishi } + } + portrait_emishi_clothing_trigger = yes + } + } } }