diff --git a/CleanSlate/common/on_actions/11_conclave.txt b/CleanSlate/common/on_actions/11_conclave.txt index 74fcf9f05..d2d007ab9 100644 --- a/CleanSlate/common/on_actions/11_conclave.txt +++ b/CleanSlate/common/on_actions/11_conclave.txt @@ -66,8 +66,6 @@ on_five_year_pulse = { # Character scope on_adulthood = { events = { - ZE.13998 # Clear adolescence trait event chain flags on adulthood - # Childhood Traits mature if they haven't yet ZE.13000 # Haughty ZE.13010 # Affectionate @@ -82,6 +80,9 @@ on_adulthood = { ZE.13100 # Curious ZE.13110 # Idolizer + ZE.13998 # Clear adolescence trait event chain flags on adulthood + ZE.40000 # Extra clean up of childhood traits, for incapable etc characters + # Resolve education and add trait ZE.14100 # Diplomacy ZE.14200 # Martial @@ -89,7 +90,6 @@ on_adulthood = { ZE.14400 # Intrigue ZE.14500 # Learning ZE.14700 # Lack of focus - ZE.40000 # Extra clean up of childhood traits, for incapable etc characters } } diff --git a/CleanSlate/events/ze_adolescence_events.txt b/CleanSlate/events/ze_adolescence_events.txt index b6b3dbca5..4e0999b99 100644 --- a/CleanSlate/events/ze_adolescence_events.txt +++ b/CleanSlate/events/ze_adolescence_events.txt @@ -932,9 +932,9 @@ character_event = { ai = no is_ironman = yes } - } - set_character_flag = achievement_follow_me + set_character_flag = achievement_follow_me + } } } @@ -1221,9 +1221,9 @@ character_event = { ai = no is_ironman = yes } - } - set_character_flag = achievement_follow_me + set_character_flag = achievement_follow_me + } } } @@ -1309,8 +1309,10 @@ character_event = { 10 = { trigger = { - is_dumb_trigger = no - NOT = { has_character_flag = child_became_smarter } + NOR = { + is_dumb_trigger = yes + has_character_flag = child_became_smarter + } } mult_modifier = { @@ -1630,6 +1632,10 @@ character_event = { clr_character_flag = rowdy_to_honest clr_character_flag = rowdy_to_imbecile clr_character_flag = rowdy_to_uncouth + clr_character_flag = rowdy_genius_to_quick + clr_character_flag = rowdy_quick_to_normal + clr_character_flag = rowdy_normal_to_slow + clr_character_flag = rowdy_slow_to_imbecile educator = { if = { @@ -1637,9 +1643,9 @@ character_event = { ai = no is_ironman = yes } - } - set_character_flag = achievement_follow_me + set_character_flag = achievement_follow_me + } } } @@ -1958,9 +1964,9 @@ character_event = { ai = no is_ironman = yes } - } - set_character_flag = achievement_follow_me + set_character_flag = achievement_follow_me + } } } @@ -2296,9 +2302,9 @@ character_event = { ai = no is_ironman = yes } - } - set_character_flag = achievement_follow_me + set_character_flag = achievement_follow_me + } } } @@ -2766,9 +2772,9 @@ character_event = { ai = no is_ironman = yes } - } - set_character_flag = achievement_follow_me + set_character_flag = achievement_follow_me + } } } @@ -3111,9 +3117,9 @@ character_event = { ai = no is_ironman = yes } - } - set_character_flag = achievement_follow_me + set_character_flag = achievement_follow_me + } } } @@ -3366,9 +3372,9 @@ character_event = { ai = no is_ironman = yes } - } - set_character_flag = achievement_follow_me + set_character_flag = achievement_follow_me + } } } @@ -3646,9 +3652,9 @@ character_event = { ai = no is_ironman = yes } - } - set_character_flag = achievement_follow_me + set_character_flag = achievement_follow_me + } } } @@ -4114,9 +4120,9 @@ character_event = { ai = no is_ironman = yes } - } - set_character_flag = achievement_follow_me + set_character_flag = achievement_follow_me + } } } @@ -4494,9 +4500,9 @@ character_event = { ai = no is_ironman = yes } - } - set_character_flag = achievement_follow_me + set_character_flag = achievement_follow_me + } } } @@ -6325,7 +6331,10 @@ character_event = { immediate = { if = { - limit = { trait = indolent } + limit = { + trait = indolent + NOT = { has_character_flag = was_indolent } + } remove_trait = indolent @@ -6337,7 +6346,10 @@ character_event = { } if = { - limit = { trait = playful } + limit = { + trait = playful + NOT = { has_character_flag = was_playful } + } remove_trait = playful @@ -6349,7 +6361,10 @@ character_event = { } if = { - limit = { trait = affectionate} + limit = { + trait = affectionate + NOT = { has_character_flag = was_affectionate } + } remove_trait = affectionate @@ -6361,7 +6376,10 @@ character_event = { } if = { - limit = { trait = timid } + limit = { + trait = timid + NOT = { has_character_flag = was_timid } + } remove_trait = timid @@ -6373,7 +6391,10 @@ character_event = { } if = { - limit = { trait = brooding } + limit = { + trait = brooding + NOT = { has_character_flag = was_brooding } + } remove_trait = brooding @@ -6385,7 +6406,10 @@ character_event = { } if = { - limit = { trait = haughty } + limit = { + trait = haughty + NOT = { has_character_flag = was_haughty } + } remove_trait = haughty @@ -6397,7 +6421,10 @@ character_event = { } if = { - limit = { trait = rowdy } + limit = { + trait = rowdy + NOT = { has_character_flag = was_rowdy } + } remove_trait = rowdy @@ -6409,7 +6436,10 @@ character_event = { } if = { - limit = { trait = willful } + limit = { + trait = willful + NOT = { has_character_flag = was_willful } + } remove_trait = willful @@ -6421,7 +6451,10 @@ character_event = { } if = { - limit = { trait = conscientious } + limit = { + trait = conscientious + NOT = { has_character_flag = was_conscientious } + } remove_trait = conscientious @@ -6432,7 +6465,10 @@ character_event = { } if = { - limit = { trait = curious } + limit = { + trait = curious + NOT = { has_character_flag = was_curious } + } remove_trait = curious @@ -6443,7 +6479,10 @@ character_event = { } if = { - limit = { trait = fussy } + limit = { + trait = fussy + NOT = { has_character_flag = was_fussy } + } remove_trait = fussy @@ -6455,7 +6494,10 @@ character_event = { } if = { - limit = { trait = idolizer } + limit = { + trait = idolizer + NOT = { has_character_flag = was_idolizer } + } remove_trait = idolizer diff --git a/CleanSlate/events/ze_introduce_heir.txt b/CleanSlate/events/ze_introduce_heir.txt index 036f05571..641686c7d 100644 --- a/CleanSlate/events/ze_introduce_heir.txt +++ b/CleanSlate/events/ze_introduce_heir.txt @@ -50,9 +50,9 @@ character_event = { fail_trigger_effect = { clr_character_flag = ZE_evt_heir_1 clr_character_flag = ZE_evt_heir_2 - clr_character_flag = ZE_evt_heir_2B + clr_character_flag = ZE_evt_heir_2_B clr_character_flag = ZE_evt_heir_3 - clr_character_flag = ZE_evt_heir_3B + clr_character_flag = ZE_evt_heir_3_B clr_character_flag = ZE_evt_heir_4 clr_character_flag = ZE_evt_heir_5 clr_character_flag = ZE_evt_heir_6 @@ -68,9 +68,9 @@ character_event = { has_character_flag = ZE_evt_heir_1 has_character_flag = ZE_evt_heir_2 - has_character_flag = ZE_evt_heir_2B + has_character_flag = ZE_evt_heir_2_B has_character_flag = ZE_evt_heir_3 - has_character_flag = ZE_evt_heir_3B + has_character_flag = ZE_evt_heir_3_B has_character_flag = ZE_evt_heir_4 has_character_flag = ZE_evt_heir_5 has_character_flag = ZE_evt_heir_6 @@ -486,9 +486,9 @@ character_event = { fail_trigger_effect = { clr_character_flag = ZE_evt_heir_1 clr_character_flag = ZE_evt_heir_2 - clr_character_flag = ZE_evt_heir_2B + clr_character_flag = ZE_evt_heir_2_B clr_character_flag = ZE_evt_heir_3 - clr_character_flag = ZE_evt_heir_3B + clr_character_flag = ZE_evt_heir_3_B clr_character_flag = ZE_evt_heir_4 clr_character_flag = ZE_evt_heir_5 clr_character_flag = ZE_evt_heir_6 @@ -510,9 +510,9 @@ character_event = { clr_character_flag = ZE_evt_heir_1 clr_character_flag = ZE_evt_heir_2 - clr_character_flag = ZE_evt_heir_2B + clr_character_flag = ZE_evt_heir_2_B clr_character_flag = ZE_evt_heir_3 - clr_character_flag = ZE_evt_heir_3B + clr_character_flag = ZE_evt_heir_3_B clr_character_flag = ZE_evt_heir_4 clr_character_flag = ZE_evt_heir_5 clr_character_flag = ZE_evt_heir_6