From 8f21b4f62700bc59c329b403fb54a73844947e63 Mon Sep 17 00:00:00 2001 From: Thakia Date: Thu, 19 Nov 2026 17:30:29 -0300 Subject: [PATCH] Fixing the clothing (again) --- .../07_genes_special_accessories_misc.txt | 36 +++++++ .../00_clothing_triggers.txt | 22 +++-- .../portraits/female_body/female_body.asset | 4 +- .../portraits/female_body/girl_body.asset | 4 +- gfx/models/portraits/male_body/boy_body.asset | 4 +- .../portraits/male_body/male_body.asset | 4 +- .../portrait_modifiers/00_animation_props.txt | 93 ++++++++++--------- 7 files changed, 108 insertions(+), 59 deletions(-) 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/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} + } + } + } }