diff --git a/CleanSlate/common/scripted_effects/00_scripted_effects.txt b/CleanSlate/common/scripted_effects/00_scripted_effects.txt index 894edf8b..a14111fd 100644 --- a/CleanSlate/common/scripted_effects/00_scripted_effects.txt +++ b/CleanSlate/common/scripted_effects/00_scripted_effects.txt @@ -15,8 +15,6 @@ # transfer_crown_on_abdication_effect -# stable_attribute_improvement_effect - # give_random_character_modifier_effect # assign_random_nickname_effect @@ -448,408 +446,6 @@ transfer_crown_on_abdication_effect = { } } -# Chance of Education trait improvement or burnout case -stable_attribute_improvement_effect = { - hidden_effect = { - event_target:scoped_improvement_target = { - random_list = { - 20 = { # Education improvement - trigger = { - has_character_flag = flag_training_diplomacy_attribute - - # Education Improvement only unlocked by synergy - OR = { - religion_is_meritocratic_trigger = yes - religion_is_matriarchal_trigger = yes - religion_is_patriarchal_trigger = yes - } - - OR = { - trait = naive_appeaser - trait = underhanded_rogue - trait = charismatic_negotiator - } - } - - character_event = { - id = HF.23761 - days = 15 - random = 15 - } - - mult_modifier = { - factor = 1.5 - - event_target:scoped_improvement_ruler = { - attribute_diff = { - attribute = diplomacy - character = event_target:scoped_improvement_target - value >= 3 - } - } - } - - mult_modifier = { - factor = 1.5 - - event_target:scoped_improvement_ruler = { - attribute_diff = { - attribute = diplomacy - character = event_target:scoped_improvement_target - value >= 6 - } - } - } - - mult_modifier = { - factor = 1.75 - - event_target:scoped_improvement_ruler = { - attribute_diff = { - attribute = diplomacy - character = event_target:scoped_improvement_target - value >= 9 - } - } - } - } - - 20 = { - trigger = { - # Education improvement - OR = { - has_character_flag = flag_training_martial_attribute - has_character_flag = flag_training_combat_rating - } - - # Education Improvement only unlocked by synergy - OR = { - religion_is_meritocratic_trigger = yes - religion_is_matriarchal_trigger = yes - religion_is_patriarchal_trigger = yes - } - - OR = { - trait = misguided_warrior - trait = tough_soldier - trait = skilled_tactician - } - } - - character_event = { - id = HF.23761 - days = 15 - random = 15 - } - - mult_modifier = { - factor = 1.5 - - attribute_diff = { - attribute = martial - character = event_target:scoped_improvement_ruler - value <= 3 - } - } - - mult_modifier = { - factor = 1.5 - - attribute_diff = { - attribute = martial - character = event_target:scoped_improvement_ruler - value <= 6 - } - } - - mult_modifier = { - factor = 1.75 - - attribute_diff = { - attribute = martial - character = event_target:scoped_improvement_ruler - value <= 9 - } - } - } - - 20 = { - trigger = { - # Education improvement - has_character_flag = flag_training_stewardship_attribute - - # Education Improvement only unlocked by synergy - OR = { - religion_is_meritocratic_trigger = yes - religion_is_matriarchal_trigger = yes - religion_is_patriarchal_trigger = yes - } - - OR = { - trait = indulgent_wastrel - trait = thrifty_clerk - trait = fortune_builder - } - } - - character_event = { - id = HF.23761 - days = 15 - random = 15 - } - - mult_modifier = { - factor = 1.5 - - attribute_diff = { - attribute = stewardship - character = event_target:scoped_improvement_target - value <= 3 - } - } - - mult_modifier = { - factor = 1.5 - - attribute_diff = { - attribute = stewardship - character = event_target:scoped_improvement_target - value <= 6 - } - } - - mult_modifier = { - factor = 1.75 - - attribute_diff = { - attribute = stewardship - character = event_target:scoped_improvement_target - value <= 9 - } - } - } - - 20 = { - trigger = { - # Education improvement - has_character_flag = flag_training_intrigue_attribute - - # Education Improvement only unlocked by synergy - OR = { - religion_is_meritocratic_trigger = yes - religion_is_matriarchal_trigger = yes - religion_is_patriarchal_trigger = yes - } - - OR = { - trait = amateurish_plotter - trait = flamboyant_schemer - trait = intricate_webweaver - } - } - - character_event = { - id = HF.23761 - days = 15 - random = 15 - } - - mult_modifier = { - factor = 1.5 - - attribute_diff = { - attribute = intrigue - character = event_target:scoped_improvement_target - value <= 3 - } - } - - mult_modifier = { - factor = 1.5 - - attribute_diff = { - attribute = intrigue - character = event_target:scoped_improvement_target - value <= 6 - } - } - - mult_modifier = { - factor = 1.75 - - attribute_diff = { - attribute = intrigue - character = event_target:scoped_improvement_target - value <= 9 - } - } - } - - 20 = { - trigger = { - # Education improvement - has_character_flag = flag_training_learning_attribute - - # Education Improvement only unlocked by synergy - OR = { - religion_is_meritocratic_trigger = yes - religion_is_matriarchal_trigger = yes - religion_is_patriarchal_trigger = yes - } - - OR = { - trait = detached_priest - trait = dutiful_cleric - trait = scholarly_theologian - } - } - - character_event = { - id = HF.23761 - days = 15 - random = 15 - } - - mult_modifier = { - factor = 1.5 - event_target:scoped_improvement_ruler = { - religion_is_meritocratic_trigger = yes # More pressure - } - } - - mult_modifier = { - factor = 1.5 - - attribute_diff = { - attribute = learning - character = event_target:scoped_improvement_target - value <= 3 - } - } - - mult_modifier = { - factor = 1.5 - - attribute_diff = { - attribute = learning - character = event_target:scoped_improvement_target - value <= 6 - } - } - - mult_modifier = { - factor = 1.75 - - attribute_diff = { - attribute = learning - character = event_target:scoped_improvement_target - value <= 9 - } - } - } - - 20 = { # Burnout - trigger = { - check_variable = { - which = burnout_count - value >= 1 # Never first time - } - } - - character_event = { - id = HF.23762 - days = 15 - random = 15 - } - - mult_modifier = { - factor = 1.5 - - check_variable = { - which = burnout_count - value >= 2 - } - } - - mult_modifier = { - factor = 1.5 - - check_variable = { - which = burnout_count - value >= 3 - } - } - - mult_modifier = { - factor = 1.5 - - check_variable = { - which = burnout_count - value >= 4 - } - } - - mult_modifier = { - factor = 1.75 - - check_variable = { - which = burnout_count - value >= 5 - } - } - - mult_modifier = { - factor = 2 - - check_variable = { - which = burnout_count - value >= 8 - } - } - - mult_modifier = { - factor = 2 - - check_variable = { - which = burnout_count - value >= 12 - } - } - - mult_modifier = { - factor = 1.5 - trait = slothful - } - - mult_modifier = { - factor = 1.5 - trait = stressed - } - - mult_modifier = { - factor = 1.75 - trait = depressed - } - - mult_modifier = { - factor = 1.5 - is_ill = yes - } - - mult_modifier = { - factor = 0.75 - trait = diligent - } - } - - 80 = { - # Nothing - } - } - } - } -} - give_random_character_modifier_effect = { random_list = { 100 = { diff --git a/CleanSlate/decisions/HF_coronation_decisions.txt b/CleanSlate/decisions/HF_coronation_decisions.txt index 0a6b4784..acfc620b 100644 --- a/CleanSlate/decisions/HF_coronation_decisions.txt +++ b/CleanSlate/decisions/HF_coronation_decisions.txt @@ -191,7 +191,6 @@ decisions = { text = begin_coronation_tooltip character_event = { id = HF.20200 } # Who to be crowned by? - set_character_flag = do_not_disturb add_character_modifier = { name = coronation_request_cooldown @@ -487,4 +486,4 @@ decisions = { } } } -} \ No newline at end of file +} diff --git a/CleanSlate/events/HF_religious_events.txt b/CleanSlate/events/HF_religious_events.txt index afce607d..d21352c6 100644 --- a/CleanSlate/events/HF_religious_events.txt +++ b/CleanSlate/events/HF_religious_events.txt @@ -14729,20 +14729,21 @@ character_event = { FROM = { save_event_target_as = scoped_improvement_target + change_variable = { + which = burnout_count + value = 1 + } clr_character_flag = flag_training_diplomacy_attribute clr_character_flag = flag_training_martial_attribute clr_character_flag = flag_training_combat_rating clr_character_flag = flag_training_stewardship_attribute clr_character_flag = flag_training_intrigue_attribute clr_character_flag = flag_training_learning_attribute + clr_character_flag = no_burnout } } - # Statemanship (Diplomacy/Stewardship) - # War (Martial/Combat Rating) - # Knowledge (Intrigue/Learning) - # Cancel - + #Statemanship (Diplomacy/Stewardship) option = { name = EVTOPTAHF23760 @@ -14754,18 +14755,27 @@ character_event = { } } - if = { - limit = { character = event_target:scoped_improvement_target } + event_target:scoped_improvement_target = { + show_scope_change = no random_list = { 50 = { + trigger = { + OR = { + diplomacy < event_target:scoped_improvement_ruler + character = event_target:scoped_improvement_ruler + } + } change_diplomacy = 1 set_character_flag = flag_training_diplomacy_attribute if = { limit = { - has_education_diplomacy_trigger = yes - + OR = { + trait = naive_appeaser + trait = underhanded_rogue + trait = charismatic_negotiator + } OR = { religion_is_meritocratic_trigger = yes religion_is_patriarchal_trigger = yes @@ -14773,18 +14783,71 @@ character_event = { } } - custom_tooltip = { text = tooltip_synergic_education_ugrade } + custom_tooltip = { + text = tooltip_synergic_education_ugrade + + random = { + chance = 17 + + character_event = { + id = HF.23761 + days = 15 + random = 15 + } + set_character_flag = no_burnout + + mult_modifier = { + factor = 1.5 + + attribute_diff = { + attribute = diplomacy + character = event_target:scoped_improvement_target + value <= 3 + } + } + + mult_modifier = { + factor = 1.5 + + attribute_diff = { + attribute = diplomacy + character = event_target:scoped_improvement_target + value <= 6 + } + } + + mult_modifier = { + factor = 1.75 + + attribute_diff = { + attribute = diplomacy + character = event_target:scoped_improvement_target + value <= 9 + } + } + } + } } + } 50 = { + trigger = { + OR = { + stewardship < event_target:scoped_improvement_ruler + character = event_target:scoped_improvement_ruler + } + } change_stewardship = 1 set_character_flag = flag_training_stewardship_attribute if = { limit = { - has_education_stewardship_trigger = yes - + OR = { + trait = indulgent_wastrel + trait = thrifty_clerk + trait = fortune_builder + } OR = { religion_is_meritocratic_trigger = yes religion_is_patriarchal_trigger = yes @@ -14792,76 +14855,54 @@ character_event = { } } - custom_tooltip = { text = tooltip_synergic_education_ugrade } - } - } - } - } - else = { - event_target:scoped_improvement_target = { - show_scope_change = no - - random_list = { - 50 = { - trigger = { diplomacy < event_target:scoped_improvement_ruler } - - change_diplomacy = 1 - set_character_flag = flag_training_diplomacy_attribute - - if = { - limit = { - has_education_diplomacy_trigger = yes - - event_target:scoped_improvement_ruler = { - OR = { - religion_is_meritocratic_trigger = yes - religion_is_patriarchal_trigger = yes - religion_is_matriarchal_trigger = yes + custom_tooltip = { + text = tooltip_synergic_education_ugrade + random = { + chance = 17 + + character_event = { + id = HF.23761 + days = 15 + random = 15 + } + set_character_flag = no_burnout + + mult_modifier = { + factor = 1.5 + + attribute_diff = { + attribute = stewardship + character = event_target:scoped_improvement_target + value <= 3 } } - } - - custom_tooltip = { text = tooltip_synergic_education_ugrade } - } - } - 50 = { - trigger = { stewardship < event_target:scoped_improvement_ruler } + mult_modifier = { + factor = 1.5 - change_stewardship = 1 - set_character_flag = flag_training_stewardship_attribute + attribute_diff = { + attribute = stewardship + character = event_target:scoped_improvement_target + value <= 6 + } + } - if = { - limit = { - has_education_stewardship_trigger = yes + mult_modifier = { + factor = 1.75 - event_target:scoped_improvement_ruler = { - OR = { - religion_is_meritocratic_trigger = yes - religion_is_patriarchal_trigger = yes - religion_is_matriarchal_trigger = yes + attribute_diff = { + attribute = stewardship + character = event_target:scoped_improvement_target + value <= 9 } } } - - custom_tooltip = { text = tooltip_synergic_education_ugrade } } } } } } - hidden_effect = { - event_target:scoped_improvement_target = { - change_variable = { - which = burnout_count - value = 1 - } - - stable_attribute_improvement_effect = yes - } - } - ai_chance = { factor = 25 @@ -14877,6 +14918,7 @@ character_event = { } } + #War (Martial/Combat Rating) option = { name = EVTOPTBHF23760 @@ -14888,67 +14930,92 @@ character_event = { } } - if = { - limit = { character = event_target:scoped_improvement_target } - + event_target:scoped_improvement_target = { + show_scope_change = no + random_list = { 50 = { + trigger = { + OR = { + martial < event_target:scoped_improvement_ruler + character = event_target:scoped_improvement_ruler + } + } change_martial = 1 set_character_flag = flag_training_martial_attribute } 50 = { + trigger = { + OR = { + combat_rating < event_target:scoped_improvement_ruler + character = event_target:scoped_improvement_ruler + } + } + add_one_duel_experience_modifier = yes set_character_flag = flag_training_combat_rating } } } - else = { - event_target:scoped_improvement_target = { - random_list = { - 50 = { - trigger = { martial < event_target:scoped_improvement_ruler } - change_martial = 1 - set_character_flag = flag_training_martial_attribute - } + if = { + limit = { + OR = { + trait = misguided_warrior + trait = tough_soldier + trait = skilled_tactician + } + OR = { + religion_is_meritocratic_trigger = yes + religion_is_patriarchal_trigger = yes + religion_is_matriarchal_trigger = yes + } + } - 50 = { - trigger = { combat_rating < event_target:scoped_improvement_ruler } + custom_tooltip = { + text = tooltip_synergic_education_ugrade + + random = { + chance = 17 + + character_event = { + id = HF.23761 + days = 15 + random = 15 + } + set_character_flag = no_burnout + + mult_modifier = { + factor = 1.5 - add_one_duel_experience_modifier = yes - set_character_flag = flag_training_combat_rating + attribute_diff = { + attribute = martial + character = event_target:scoped_improvement_target + value <= 3 + } } - } - } - } - if = { - limit = { - event_target:scoped_improvement_target = { - has_education_martial_trigger = yes - } + mult_modifier = { + factor = 1.5 - event_target:scoped_improvement_ruler = { - OR = { - religion_is_meritocratic_trigger = yes - religion_is_patriarchal_trigger = yes - religion_is_matriarchal_trigger = yes + attribute_diff = { + attribute = martial + character = event_target:scoped_improvement_target + value <= 6 + } } - } - } - custom_tooltip = { text = tooltip_synergic_education_ugrade } - } + mult_modifier = { + factor = 1.75 - hidden_effect = { - event_target:scoped_improvement_target = { - change_variable = { - which = burnout_count - value = 1 + attribute_diff = { + attribute = martial + character = event_target:scoped_improvement_target + value <= 9 + } + } } - - stable_attribute_improvement_effect = yes } } @@ -14962,6 +15029,7 @@ character_event = { } } + #Knowledge (Intrigue/Learning) option = { name = EVTOPTCHF23760 @@ -14973,18 +15041,28 @@ character_event = { } } - if = { - limit = { character = event_target:scoped_improvement_target } + event_target:scoped_improvement_target = { + show_scope_change = no random_list = { 50 = { + trigger = { + OR = { + intrigue < event_target:scoped_improvement_ruler + character = event_target:scoped_improvement_ruler + } + } + change_intrigue = 1 set_character_flag = flag_training_intrigue_attribute if = { limit = { - has_education_intrigue_trigger = yes - + OR = { + trait = amateurish_plotter + trait = flamboyant_schemer + trait = intricate_webweaver + } OR = { religion_is_meritocratic_trigger = yes religion_is_patriarchal_trigger = yes @@ -14992,18 +15070,71 @@ character_event = { } } - custom_tooltip = { text = tooltip_synergic_education_ugrade } + custom_tooltip = { + text = tooltip_synergic_education_ugrade + + random = { + chance = 17 + + character_event = { + id = HF.23761 + days = 15 + random = 15 + } + set_character_flag = no_burnout + + mult_modifier = { + factor = 1.5 + + attribute_diff = { + attribute = intrigue + character = event_target:scoped_improvement_target + value <= 3 + } + } + + mult_modifier = { + factor = 1.5 + + attribute_diff = { + attribute = intrigue + character = event_target:scoped_improvement_target + value <= 6 + } + } + + mult_modifier = { + factor = 1.75 + + attribute_diff = { + attribute = intrigue + character = event_target:scoped_improvement_target + value <= 9 + } + } + } + } } } 50 = { + trigger = { + OR = { + learning < event_target:scoped_improvement_ruler + character = event_target:scoped_improvement_target + } + } + change_learning = 1 set_character_flag = flag_training_learning_attribute if = { limit = { - has_education_learning_trigger = yes - + OR = { + trait = detached_priest + trait = dutiful_cleric + trait = scholarly_theologian + } OR = { religion_is_meritocratic_trigger = yes religion_is_patriarchal_trigger = yes @@ -15011,76 +15142,55 @@ character_event = { } } - custom_tooltip = { text = tooltip_synergic_education_ugrade } - } - } - } - } - else = { - event_target:scoped_improvement_target = { - show_scope_change = no - - random_list = { - 50 = { - trigger = { intrigue < event_target:scoped_improvement_ruler } - - change_intrigue = 1 - set_character_flag = flag_training_intrigue_attribute - - if = { - limit = { - has_education_intrigue_trigger = yes - - event_target:scoped_improvement_ruler = { - OR = { - religion_is_meritocratic_trigger = yes - religion_is_patriarchal_trigger = yes - religion_is_matriarchal_trigger = yes + custom_tooltip = { + text = tooltip_synergic_education_ugrade + + random = { + chance = 17 + + character_event = { + id = HF.23761 + days = 15 + random = 15 + } + set_character_flag = no_burnout + + mult_modifier = { + factor = 1.5 + + attribute_diff = { + attribute = learning + character = event_target:scoped_improvement_target + value <= 3 } } - } - - custom_tooltip = { text = tooltip_synergic_education_ugrade } - } - } - 50 = { - trigger = { learning < event_target:scoped_improvement_ruler } + mult_modifier = { + factor = 1.5 - change_learning = 1 - set_character_flag = flag_training_learning_attribute + attribute_diff = { + attribute = learning + character = event_target:scoped_improvement_target + value <= 6 + } + } - if = { - limit = { - has_education_learning_trigger = yes + mult_modifier = { + factor = 1.75 - event_target:scoped_improvement_ruler = { - OR = { - religion_is_meritocratic_trigger = yes - religion_is_patriarchal_trigger = yes - religion_is_matriarchal_trigger = yes + attribute_diff = { + attribute = learning + character = event_target:scoped_improvement_target + value <= 9 } } } - - custom_tooltip = { text = tooltip_synergic_education_ugrade } } } } } } - hidden_effect = { - event_target:scoped_improvement_target = { - change_variable = { - which = burnout_count - value = 1 - } - - stable_attribute_improvement_effect = yes - } - } - ai_chance = { factor = 25 @@ -15096,6 +15206,7 @@ character_event = { } } + #Cancel option = { name = EVTOPTDHF23760 @@ -15103,7 +15214,7 @@ character_event = { piety = 150 # Refund if = { - limit = { character = FROM } # Used on yourself + limit = { character = event_target:scoped_improvement_ruler } # Used on yourself prestige = 500 } @@ -15111,6 +15222,110 @@ character_event = { event_target:scoped_improvement_target = { remove_character_modifier = stable_attribute_improvement_target_cooldown + subtract_variable = { + which = burnout_count + value = 1 + } + } + } + } + + after = { + random = { #Chance for burnout, won't trigger if cancelled or education improved + chance = 17 + + character_event = { + id = HF.23762 + days = 15 + random = 15 + } + + mult_modifier = { #Don't trigger if its the first time + factor = 0 + + check_variable = { + which = burnout_count + value == 1 + } + } + + mult_modifier = { + factor = 1.5 + + check_variable = { + which = burnout_count + value > 2 + } + } + + mult_modifier = { + factor = 1.5 + + check_variable = { + which = burnout_count + value > 3 + } + } + + mult_modifier = { + factor = 1.5 + + check_variable = { + which = burnout_count + value > 4 + } + } + + mult_modifier = { + factor = 1.75 + + check_variable = { + which = burnout_count + value > 5 + } + } + + mult_modifier = { + factor = 2 + + check_variable = { + which = burnout_count + value > 8 + } + } + + mult_modifier = { + factor = 2 + + check_variable = { + which = burnout_count + value > 12 + } + } + + mult_modifier = { + factor = 1.5 + trait = slothful + } + + mult_modifier = { + factor = 1.5 + trait = stressed + } + + mult_modifier = { + factor = 1.75 + trait = depressed + } + + mult_modifier = { + factor = 1.5 + is_ill = yes + } + + mult_modifier = { + factor = 0.75 + trait = diligent } } } @@ -15239,13 +15454,13 @@ character_event = { } } - is_triggered_only = yes # stable_attribute_improvement_effect + is_triggered_only = yes option = { name = EVTOPTAHF23761 if = { - limit = { character = event_target:scoped_improvement_target } + limit = { NOT = { character = event_target:scoped_improvement_ruler } } opinion = { who = event_target:scoped_improvement_ruler @@ -15253,138 +15468,16 @@ character_event = { years = 5 } } + + upgrade_education_trait_effect = yes - if = { - limit = { has_character_flag = flag_training_diplomacy_attribute } - - trigger_switch = { - on_trigger = trait - - ### Diplomacy ### - naive_appeaser = { - remove_trait = naive_appeaser - add_trait = underhanded_rogue - } - - underhanded_rogue = { - remove_trait = underhanded_rogue - add_trait = charismatic_negotiator - } - - charismatic_negotiator = { - remove_trait = charismatic_negotiator - add_trait = grey_eminence - } - } - - clr_character_flag = flag_training_diplomacy_attribute - } - else_if = { - limit = { - OR = { - has_character_flag = flag_training_martial_attribute - has_character_flag = flag_training_combat_rating - } - } - - trigger_switch = { - on_trigger = trait - - ### Martial ### - misguided_warrior = { - remove_trait = misguided_warrior - add_trait = tough_soldier - } - - tough_soldier = { - remove_trait = tough_soldier - add_trait = skilled_tactician - } - - skilled_tactician = { - remove_trait = skilled_tactician - add_trait = brilliant_strategist - } - } - - clr_character_flag = flag_training_martial_attribute - clr_character_flag = flag_training_combat_rating - } - else_if = { - limit = { has_character_flag = flag_training_stewardship_attribute } - - trigger_switch = { - on_trigger = trait - - ### Stewardship ### - indulgent_wastrel = { - remove_trait = indulgent_wastrel - add_trait = thrifty_clerk - } - - thrifty_clerk = { - remove_trait = thrifty_clerk - add_trait = fortune_builder - } - - fortune_builder = { - remove_trait = fortune_builder - add_trait = midas_touched - } - } - - clr_character_flag = flag_training_stewardship_attribute - } - else_if = { - limit = { has_character_flag = flag_training_intrigue_attribute } - - trigger_switch = { - on_trigger = trait - - ### Intrigue ### - amateurish_plotter = { - remove_trait = amateurish_plotter - add_trait = flamboyant_schemer - } - - flamboyant_schemer = { - remove_trait = flamboyant_schemer - add_trait = intricate_webweaver - } - - intricate_webweaver = { - remove_trait = intricate_webweaver - add_trait = elusive_shadow - } - } - - clr_character_flag = flag_training_intrigue_attribute - } - else_if = { - limit = { has_character_flag = flag_training_learning_attribute } - - trigger_switch = { - on_trigger = trait - - ### Learning ### - detached_priest = { - remove_trait = detached_priest - add_trait = dutiful_cleric - } - - dutiful_cleric = { - remove_trait = dutiful_cleric - add_trait = scholarly_theologian - } - - scholarly_theologian = { - remove_trait = scholarly_theologian - add_trait = mastermind_theologian - } - } - - clr_character_flag = flag_training_learning_attribute - } + clr_character_flag = flag_training_diplomacy_attribute + clr_character_flag = flag_training_martial_attribute + clr_character_flag = flag_training_combat_rating + clr_character_flag = flag_training_stewardship_attribute + clr_character_flag = flag_training_intrigue_attribute + clr_character_flag = flag_training_learning_attribute + clr_character_flag = no_burnout } } @@ -15489,6 +15582,11 @@ character_event = { } is_triggered_only = yes + + trigger = { + NOT = { has_character_flag = no_burnout } + has_character_modifier = stable_attribute_improvement_target_cooldown + } option = { name = EVTOPTAHF23762 @@ -15909,28 +16007,10 @@ character_event = { } } - trigger_switch = { + trigger_switch = { #Downgrade Education on_trigger = trait ### Intrigue ### - amateurish_plotter = { - if = { - limit = { trait = shrewd } - remove_trait = shrewd - } - else_if = { - limit = { NOT = { trait = dull } } - add_trait = dull - } - else_if = { - limit = { NOT = { trait = depressed } } - add_trait = depressed - } - else = { - health = -0.75 - } - } - flamboyant_schemer = { remove_trait = flamboyant_schemer add_trait = amateurish_plotter @@ -15947,24 +16027,6 @@ character_event = { } ### Diplomacy ### - naive_appeaser = { - if = { - limit = { trait = shrewd } - remove_trait = shrewd - } - else_if = { - limit = { NOT = { trait = dull } } - add_trait = dull - } - else_if = { - limit = { NOT = { trait = depressed } } - add_trait = depressed - } - else = { - health = -0.75 - } - } - underhanded_rogue = { remove_trait = underhanded_rogue add_trait = naive_appeaser @@ -15981,24 +16043,6 @@ character_event = { } ### Stewardship ### - indulgent_wastrel = { - if = { - limit = { trait = shrewd } - remove_trait = shrewd - } - else_if = { - limit = { NOT = { trait = dull } } - add_trait = dull - } - else_if = { - limit = { NOT = { trait = depressed } } - add_trait = depressed - } - else = { - health = -0.75 - } - } - thrifty_clerk = { remove_trait = thrifty_clerk add_trait = indulgent_wastrel @@ -16015,24 +16059,6 @@ character_event = { } ### Martial ### - misguided_warrior = { - if = { - limit = { trait = shrewd } - remove_trait = shrewd - } - else_if = { - limit = { NOT = { trait = dull } } - add_trait = dull - } - else_if = { - limit = { NOT = { trait = depressed } } - add_trait = depressed - } - else = { - health = -0.75 - } - } - tough_soldier = { remove_trait = tough_soldier add_trait = misguided_warrior @@ -16049,7 +16075,22 @@ character_event = { } ### Learning ### - detached_priest = { + dutiful_cleric = { + remove_trait = dutiful_cleric + add_trait = detached_priest + } + + scholarly_theologian = { + remove_trait = scholarly_theologian + add_trait = dutiful_cleric + } + + mastermind_theologian = { + remove_trait = mastermind_theologian + add_trait = scholarly_theologian + } + + fallback = { #Has a level 1 education trait if = { limit = { trait = shrewd } remove_trait = shrewd @@ -16065,21 +16106,7 @@ character_event = { else = { health = -0.75 } - } - - dutiful_cleric = { - remove_trait = dutiful_cleric - add_trait = detached_priest - } - - scholarly_theologian = { - remove_trait = scholarly_theologian - add_trait = dutiful_cleric - } - - mastermind_theologian = { - remove_trait = mastermind_theologian - add_trait = scholarly_theologian + } } } @@ -16091,6 +16118,7 @@ character_event = { clr_character_flag = flag_training_stewardship_attribute clr_character_flag = flag_training_intrigue_attribute clr_character_flag = flag_training_learning_attribute + clr_character_flag = no_burnout } } @@ -16496,6 +16524,7 @@ character_event = { clr_character_flag = flag_training_stewardship_attribute clr_character_flag = flag_training_intrigue_attribute clr_character_flag = flag_training_learning_attribute + clr_character_flag = no_burnout } } @@ -17093,4 +17122,4 @@ character_event = { immediate = { set_high_god_name = string_reformer_god } -} \ No newline at end of file +} diff --git a/CleanSlate/events/ze_introduce_heir.txt b/CleanSlate/events/ze_introduce_heir.txt index 2265d598..85343d97 100644 --- a/CleanSlate/events/ze_introduce_heir.txt +++ b/CleanSlate/events/ze_introduce_heir.txt @@ -808,7 +808,7 @@ character_event = { add_trait = depressed character_event = { - id = 38314 # Notify: Lose depression, TODO: Actually remove trait too? + id = 6051 days = 1000 random = 800 } @@ -932,4 +932,4 @@ character_event = { } } } -} \ No newline at end of file +} diff --git a/CleanSlate/events/ze_various_events.txt b/CleanSlate/events/ze_various_events.txt index bfea5329..e3f5eaad 100644 --- a/CleanSlate/events/ze_various_events.txt +++ b/CleanSlate/events/ze_various_events.txt @@ -551,11 +551,10 @@ character_event = { has_character_flag = disobedient_daughter_unhappy has_character_flag = disobedient_daughter is_female = yes - vassal_of = ROOT + liege = { character = ROOT } is_ruler = no is_ill = no - is_incapable = no - is_inaccessible_trigger = no + is_inaccessible_or_incapable_trigger = no } } @@ -565,11 +564,10 @@ character_event = { has_character_flag = disobedient_daughter_unhappy has_character_flag = disobedient_daughter is_female = yes - vassal_of = ROOT + liege = { character = ROOT } is_ruler = no is_ill = no - is_incapable = no - is_inaccessible_trigger = no + is_inaccessible_or_incapable_trigger = no } character_event = { id = ZE.1101 } @@ -1197,7 +1195,7 @@ character_event = { any_child = { has_character_flag = disobedient_daughter is_female = yes - vassal_of = ROOT + liege = { character = ROOT } any_lover = { is_female = no @@ -1216,7 +1214,7 @@ character_event = { limit = { has_character_flag = disobedient_daughter is_female = yes - vassal_of = ROOT + liege = { character = ROOT } any_lover = { is_female = no @@ -1249,7 +1247,7 @@ character_event = { show_scope_change = no clr_character_flag = disobedient_daughter_unhappy - add_spouse = event_target:target_daughter_wants_to_marry # TODO: shouldn't this marry matrillineally under some circumstances? Perhaps even all the time, since their parent is a player? + add_spouse_matrilineal = event_target:target_daughter_wants_to_marry opinion = { name = opinion_grateful @@ -1274,4 +1272,4 @@ character_event = { } } } -} \ No newline at end of file +}