diff --git a/N3OW/common/scripted_triggers/00_clothing_triggers.txt b/N3OW/common/scripted_triggers/00_clothing_triggers.txt index 38eadd67..ee0b63c3 100644 --- a/N3OW/common/scripted_triggers/00_clothing_triggers.txt +++ b/N3OW/common/scripted_triggers/00_clothing_triggers.txt @@ -449,11 +449,19 @@ portrait_wear_no_crown_trigger = { # Rulers should be coronated to wear a crown portrait_wear_christian_holy_order_trigger = { # Christian holy order members/vassals should wear different armor OR = { AND = { # Is a Christian holy order member - religion = religion:christianity_religion + OR = { + religion = religion:catholic_religion + religion = religion:eastern_orthodox_religion + religion = religion:protestant_religion + } government_has_flag = government_is_holy_order } AND = { # Is a Christian holy order vassal - religion = religion:christianity_religion + OR = { + religion = religion:catholic_religion + religion = religion:eastern_orthodox_religion + religion = religion:protestant_religion + } is_playable_character = no portrait_wear_armor_trigger = yes liege ?= { government_has_flag = government_is_holy_order } @@ -1174,73 +1182,73 @@ portrait_ainu_clothing_spouse_trigger = { ### General clothing triggers ### portrait_era1_trigger = { # Intended to primarily cover the years 850 to 1000 - scope:year_of_birth < 1000 + scope:year_of_birth < 2550 NAND = { # People from 16 to 25 will be the first to adopt new fashion - current_year >= 1000 - scope:year_of_birth >= 975 - scope:year_of_birth < 1125 + current_year >= 2550 + scope:year_of_birth >= 2525 + scope:year_of_birth < 2675 scope:age >= 16 } } portrait_era2_trigger = { # Intended to primarily cover the years 1000 to 1150 - current_year >= 1000 + current_year >= 2550 OR = { AND = { # People from 16 to 25 will be the first to adopt new fashion - scope:year_of_birth >= 975 - scope:year_of_birth < 1125 + scope:year_of_birth >= 2525 + scope:year_of_birth < 2675 scope:age >= 16 } AND = { - scope:year_of_birth >= 1010 - scope:year_of_birth < 1150 + scope:year_of_birth >= 2560 + scope:year_of_birth < 2700 OR = { - current_year < 1150 + current_year < 2700 is_alive = no } } AND = { # Children under 16 will not be early adopters - scope:year_of_birth >= 1010 - scope:year_of_birth < 1166 + scope:year_of_birth >= 2560 + scope:year_of_birth < 2716 scope:age < 16 } } } portrait_era3_trigger = { # Intended to primarily cover the years 1150 to 1300 - current_year >= 1150 + current_year >= 2700 OR = { AND = { # People from 16 to 25 will be the first to adopt new fashion - scope:year_of_birth >= 1125 - scope:year_of_birth < 1275 + scope:year_of_birth >= 2675 + scope:year_of_birth < 2825 scope:age >= 16 } AND = { - scope:year_of_birth >= 1160 - scope:year_of_birth < 1300 + scope:year_of_birth >= 2710 + scope:year_of_birth < 2850 OR = { - current_year < 1300 + current_year < 2850 is_alive = no } } AND = { # Children under 16 will not be early adopters - scope:year_of_birth >= 1160 - scope:year_of_birth < 1316 + scope:year_of_birth >= 2710 + scope:year_of_birth < 2866 scope:age < 16 } } } portrait_era4_trigger = { # Intended to primarily cover the years 1300 to 1450 - current_year >= 1300 + current_year >= 2850 OR = { AND = { # People from 16 to 25 will be the first to adopt new fashion - scope:year_of_birth >= 1275 - scope:year_of_birth < 1425 + scope:year_of_birth >= 2825 + scope:year_of_birth < 3000 scope:age >= 16 } AND = { - scope:year_of_birth >= 1310 + scope:year_of_birth >= 2860 #scope:year_of_birth < 1425 } } @@ -1248,21 +1256,21 @@ portrait_era4_trigger = { # Intended to primarily cover the years 1300 to 1450 portrait_era1_armor_trigger = { current_year >= 0 - current_year < 1020 + current_year < 2570 } portrait_era2_armor_trigger = { - current_year >= 1000 - current_year < 1130 # 1170 + current_year >= 2550 + current_year < 2680 # 1170 } portrait_era3_armor_trigger = { - current_year >= 1065 # This is anachronistic and should historically be around 1150 (armor with surcoat) - current_year < 1270 # 1320 + current_year >= 2615 # This is anachronistic and should historically be around 1150 (armor with surcoat) + current_year < 2820 # 1320 } portrait_era4_armor_trigger = { - current_year >= 1240 # This is anachronistic and should historically be around 1300 (transitional mail and plate armor) + current_year >= 2790 # This is anachronistic and should historically be around 1300 (transitional mail and plate armor) } @@ -2268,11 +2276,19 @@ portrait_western_crusades_trigger = { exists = this OR = { AND = { - religion = religion:christianity_religion + OR = { + religion = religion:catholic_religion + religion = religion:eastern_orthodox_religion + religion = religion:protestant_religion + } government_has_flag = government_is_holy_order } AND = { - religion = religion:christianity_religion + OR = { + religion = religion:catholic_religion + religion = religion:eastern_orthodox_religion + religion = religion:protestant_religion + } is_playable_character = no portrait_wear_armor_trigger = yes liege ?= { @@ -2280,7 +2296,11 @@ portrait_western_crusades_trigger = { } } AND = { - religion = religion:christianity_religion + OR = { + religion = religion:catholic_religion + religion = religion:eastern_orthodox_religion + religion = religion:protestant_religion + } portrait_wear_armor_trigger = yes OR = { any_character_war = { @@ -2551,15 +2571,10 @@ portrait_religious_head_popes_trigger = { exists = this OR = { AND = { - faith = faith:sevillian - is_adult = yes - religion = religion:catholic_religion - primary_title ?= { - is_head_of_faith = yes + OR = { + faith = faith:sevillian + faith = faith:roman_catholic } - } - AND = { - faith = faith:roman_catholic is_adult = yes religion = religion:catholic_religion primary_title ?= { @@ -2618,15 +2633,7 @@ portrait_religious_catholic_trigger = { portrait_religious_orthodox_trigger = { faith = { - OR = { - portrait_religious_faith_or_foundational_trigger = { FAITH = faith:orthodox } - portrait_religious_faith_or_foundational_trigger = { FAITH = faith:armenian_apostolic } - portrait_religious_faith_or_foundational_trigger = { FAITH = faith:coptic } - portrait_religious_faith_or_foundational_trigger = { FAITH = faith:messalian } - portrait_religious_faith_or_foundational_trigger = { FAITH = faith:bogomilist } - portrait_religious_faith_or_foundational_trigger = { FAITH = faith:paulician } - portrait_religious_faith_or_foundational_trigger = { FAITH = faith:nestorian } - } + religion = religion:eastern_orthodox_religion } } @@ -2649,6 +2656,7 @@ portrait_religious_norse_trigger = { religion = religion:finno_ugric_religion religion = religion:paganism_religion religion = religion:slavic_religion + religion = religion:folkgerman_religion } }