diff --git a/common/council_positions/00_council_positions.txt b/common/council_positions/00_council_positions.txt index 0767195fc..dda52d9e1 100644 --- a/common/council_positions/00_council_positions.txt +++ b/common/council_positions/00_council_positions.txt @@ -1,6 +1,6 @@ councillor_chancellor = { skill = diplomacy - + name = { first_valid = { triggered_desc = { @@ -51,8 +51,8 @@ } valid_position = { - NOR = { - government_has_flag = government_is_landless_adventurer + NOR = { + government_has_flag = government_is_landless_adventurer government_has_flag = government_is_nomadic } } @@ -124,11 +124,8 @@ } on_fired_from_position = { - fired_from_council_position_effect = yes - } - - on_lose_position = { fired_minister_position_effect = yes + fired_from_council_position_effect = yes } portrait_animation = chancellor @@ -141,7 +138,7 @@ councillor_steward = { skill = stewardship - + name = { first_valid = { triggered_desc = { @@ -202,13 +199,10 @@ councillor_steward = { desc = game_concept_steward_desc } } - - auto_fill = { - } - + valid_position = { - NOR = { - government_has_flag = government_is_landless_adventurer + NOR = { + government_has_flag = government_is_landless_adventurer government_has_flag = government_is_nomadic } } @@ -266,11 +260,8 @@ councillor_steward = { } on_fired_from_position = { - fired_from_council_position_effect = yes - } - - on_lose_position = { fired_minister_position_effect = yes + fired_from_council_position_effect = yes } portrait_animation = steward @@ -283,7 +274,7 @@ councillor_steward = { councillor_marshal = { skill = martial - + name = { first_valid = { triggered_desc = { @@ -344,13 +335,10 @@ councillor_marshal = { desc = game_concept_marshal_desc } } - - auto_fill = { - } valid_position = { - NOR = { - government_has_flag = government_is_landless_adventurer + NOR = { + government_has_flag = government_is_landless_adventurer government_has_flag = government_is_nomadic } } @@ -414,11 +402,8 @@ councillor_marshal = { } on_fired_from_position = { - fired_from_council_position_effect = yes - } - - on_lose_position = { fired_minister_position_effect = yes + fired_from_council_position_effect = yes } portrait_animation = marshal @@ -431,7 +416,7 @@ councillor_marshal = { councillor_spymaster = { skill = intrigue - + name = { first_valid = { triggered_desc = { @@ -492,9 +477,6 @@ councillor_spymaster = { desc = game_concept_spymaster_desc } } - - auto_fill = { - } valid_position = { NOT = { government_has_flag = government_is_landless_adventurer } @@ -554,13 +536,10 @@ councillor_spymaster = { } on_fired_from_position = { + fired_minister_position_effect = yes fired_from_council_position_effect = yes } - on_lose_position = { - fired_minister_position_effect = yes - } - use_for_scheme_phase_duration = yes use_for_scheme_resistance = yes @@ -590,8 +569,8 @@ councillor_court_chaplain = { always = no } trigger_else = { - faith = { - NOT = { has_doctrine_parameter = clerical_appointment_ruler } + rite = { + NOT = { rite_has_parameter = clerical_appointment_ruler } } } } @@ -606,52 +585,39 @@ councillor_court_chaplain = { } custom_description = { text = "court_chaplain_cant_fire_doctrines" - faith = { - NOT = { has_doctrine_parameter = clerical_appointment_fixed } - } + can_appoint_own_court_chaplain_trigger = yes } } } - + can_reassign = { trigger_if = { limit = { - NAND = { - government_has_flag = government_has_merit - highest_held_title_tier >= tier_hegemony - } + tgp_has_access_to_ministry_trigger = no } custom_description = { text = "court_chaplain_cant_reassign_doctrines" OR = { - faith = { - NOT = { has_doctrine_parameter = clerical_appointment_fixed } - } + can_appoint_own_court_chaplain_trigger = yes NOT = { exists = cp:councillor_court_chaplain } } } } } - + can_change_once = { - faith = { - has_doctrine_parameter = clerical_appointment_fixed - } - NAND = { - government_has_flag = government_has_merit - highest_held_title_tier >= tier_hegemony - } + can_appoint_own_court_chaplain_trigger = no exists = cp:councillor_court_chaplain } - + inherit = no - + name = { first_valid = { triggered_desc = { trigger = { highest_held_title_tier >= tier_hegemony - government_has_flag = government_has_merit + government_has_flag = government_has_merit } desc = councillor_court_chaplain_celestial_government_imperial } @@ -702,21 +668,46 @@ councillor_court_chaplain = { } triggered_desc = { trigger = { - faith = { - OR = { - has_doctrine = doctrine_theocracy_temporal - religion = { is_in_family = rf_pagan } - } + OR = { + religion = religion:eastern_orthodox_religion + religion = religion:catholic_religion + religion = religion:protestant_religion + } + government_has_flag = government_is_theocracy + exists = scope:councillor + scope:councillor = { + is_ruler = no } } - desc = actual_bishop_title + desc = councillor_court_chaplain_confessor } triggered_desc = { trigger = { - faith = { + exists = scope:councillor + scope:councillor = { + faith.religion = faith:catholic.religion + } + } + desc = councillor_actual_bishop_title + } + triggered_desc = { + trigger = { + exists = scope:councillor + rite = { + OR = { + rite_has_doctrine = doctrine_theocracy_temporal + faith.religion = { is_in_family = rf_pagan } + } + } + } + desc = councillor_actual_bishop_title + } + triggered_desc = { + trigger = { + rite = { NOR = { - has_doctrine = doctrine_theocracy_temporal - religion = { is_in_family = rf_pagan } + rite_has_doctrine = doctrine_theocracy_temporal + faith.religion = { is_in_family = rf_pagan } } } } @@ -724,45 +715,45 @@ councillor_court_chaplain = { first_valid = { #Shia # triggered_desc = { -# trigger = { highest_held_title_tier >= tier_empire faith = faith:ismaili } +# trigger = { highest_held_title_tier >= tier_empire rite = rite:ismaili } # desc = councillor_court_chaplain_ismaili_empire # } # triggered_desc = { -# trigger = { highest_held_title_tier >= tier_kingdom faith = faith:ismaili } +# trigger = { highest_held_title_tier >= tier_kingdom rite = rite:ismaili } # desc = councillor_court_chaplain_ismaili_kingdom # } #Islam triggered_desc = { - trigger = { highest_held_title_tier >= tier_empire faith.religion = faith:aqlani.religion } + trigger = { highest_held_title_tier >= tier_empire faith.religion = faith:sunni.religion } desc = councillor_court_chaplain_islam_empire } triggered_desc = { - trigger = { highest_held_title_tier >= tier_kingdom faith.religion = faith:aqlani.religion } + trigger = { highest_held_title_tier >= tier_kingdom faith.religion = faith:sunni.religion } desc = councillor_court_chaplain_islam_kingdom } triggered_desc = { - trigger = { highest_held_title_tier >= tier_duchy faith.religion = faith:aqlani.religion } + trigger = { highest_held_title_tier >= tier_duchy faith.religion = faith:sunni.religion } desc = councillor_court_chaplain_islam_duchy } triggered_desc = { - trigger = { highest_held_title_tier < tier_duchy faith.religion = faith:aqlani.religion } + trigger = { highest_held_title_tier < tier_duchy faith.religion = faith:sunni.religion } desc = councillor_court_chaplain_islam_county } #Yazidi triggered_desc = { - trigger = { highest_held_title_tier >= tier_empire faith.religion = faith:yazidi.religion } + trigger = { highest_held_title_tier >= tier_empire faith.religion = faith:yazidi_faith.religion } desc = councillor_court_chaplain_yazidi_empire } triggered_desc = { - trigger = { highest_held_title_tier >= tier_kingdom faith.religion = faith:yazidi.religion } + trigger = { highest_held_title_tier >= tier_kingdom faith.religion = faith:yazidi_faith.religion } desc = councillor_court_chaplain_yazidi_kingdom } triggered_desc = { - trigger = { highest_held_title_tier >= tier_duchy faith.religion = faith:yazidi.religion } + trigger = { highest_held_title_tier >= tier_duchy faith.religion = faith:yazidi_faith.religion } desc = councillor_court_chaplain_yazidi_duchy } triggered_desc = { - trigger = { highest_held_title_tier < tier_duchy faith.religion = faith:yazidi.religion } + trigger = { highest_held_title_tier < tier_duchy faith.religion = faith:yazidi_faith.religion } desc = councillor_court_chaplain_yazidi_county } desc = councillor_court_chaplain @@ -783,7 +774,7 @@ councillor_court_chaplain = { } triggered_desc = { trigger = { - faith = { has_doctrine = doctrine_theocracy_temporal } + rite = { rite_has_doctrine = doctrine_theocracy_temporal } } desc = game_concept_realm_priest_desc } @@ -817,9 +808,10 @@ councillor_court_chaplain = { } pool_character_config = pool_court_chaplain - + valid_character = { exists = root.liege_or_court_owner + trigger_if = { # If the liege has a ministry, we check a separate minister trigger limit = { root.liege_or_court_owner = { tgp_has_access_to_ministry_trigger = yes } @@ -831,10 +823,10 @@ councillor_court_chaplain = { } tgp_is_ceremonial_liege_trigger = no } - + valid_position = { - NOR = { - government_has_flag = government_is_landless_adventurer + NOR = { + government_has_flag = government_is_landless_adventurer government_has_flag = government_is_nomadic } } @@ -842,57 +834,28 @@ councillor_court_chaplain = { on_get_position = { got_council_position_effect = yes got_minister_position_effect = { MINISTER_TITLE = e_minister_of_rites MINISTER_POSITION = councillor_court_chaplain } + christian_clergy_learn_liturgical_language_effect = yes + # Only fixes the automatic fill, since a see vacated by death has already been inherited + if = { + limit = { + is_ruler = no + liege = { + rite = { rite_has_parameter = has_clerical_regions } # As at game start. The trigger below, not the doctrine, is what exempts owners who pick their own + can_appoint_own_court_chaplain_trigger = no + } + } + liege = { + assign_landed_realm_priest_effect = yes + } + if = { + limit = { is_councillor = no } + move_to_pool = yes + } + } if = { limit = { years_from_game_start >= 1 } - if = { - limit = { - is_ruler = no - liege = { - faith = { has_doctrine = doctrine_clerical_succession_spiritual_fixed_appointment } - any_vassal = { - is_physically_able_adult = yes - is_councillor = no - government_has_flag = government_is_theocracy - can_be_court_chaplain_trigger = { COURT_OWNER = liege } - faith = liege.faith - } - } - } - liege = { - random_vassal = { - limit = { - is_physically_able_adult = yes - is_councillor = no - government_has_flag = government_is_theocracy - can_be_court_chaplain_trigger = { COURT_OWNER = liege } - faith = liege.faith - } - weight = { - base = 1 - modifier = { - add = 1000 - faith.religious_head ?= this - } - modifier = { - add = learning - } - modifier = { - add = primary_title.tier - } - } - liege = { - assign_councillor_type = { - type = councillor_court_chaplain - remove_existing_councillor = yes - target = prev - } - } - } - } - move_to_pool = yes - } if = { limit = { exists = this @@ -910,9 +873,9 @@ councillor_court_chaplain = { } 5 = { trigger = { - can_start_scheme = { - type = learn_language - target_character = liege + can_start_scheme = { + type = learn_language + target_character = liege } } start_scheme = { @@ -936,11 +899,118 @@ councillor_court_chaplain = { } on_fired_from_position = { + fired_minister_position_effect = yes fired_from_council_position_effect = yes + # We send a toast for the same petition catalyst, because the council UI shows nothing + if = { + limit = { + scope:councillor_liege ?= { + OR = { + religion = religion:eastern_orthodox_religion + religion = religion:catholic_religion + religion = religion:protestant_religion + } + government_is_religious_trigger = no + exists = top_participant_group:the_christian_church + NOT = { has_character_flag = pam_church_replacing_realm_priest } + NOT = { exists = root.clerical_elector_title } + } + situation:the_christian_church ?= { + situation_top_has_catalyst = catalyst_the_christian_church_requested_realm_priest_replacement + } + } + scope:councillor_liege = { + send_interface_toast = { + title = pam_replaced_own_realm_priest_toast + left_icon = this + right_icon = root + custom_tooltip = { + text = pam_replaced_own_realm_priest_catalyst_tt + situation:the_christian_church = { + trigger_situation_catalyst = catalyst_the_christian_church_requested_realm_priest_replacement + } + } + } + } + } + if = { + limit = { + exists = root.faith.religious_head + root.faith.religious_head != root + scope:councillor_liege ?= { + this != root.faith.religious_head + government_is_religious_trigger = no + OR = { + religion = religion:eastern_orthodox_religion + religion = religion:catholic_religion + religion = religion:protestant_religion + } + exists = top_participant_group:the_christian_church + } + } + save_scope_as = pam_dismissed_realm_priest + root.faith.religious_head = { save_scope_as = pam_slighted_religious_head } + scope:councillor_liege = { + send_interface_toast = { + title = pam_fired_realm_priest_toast + left_icon = scope:pam_slighted_religious_head + right_icon = scope:pam_dismissed_realm_priest + scope:pam_slighted_religious_head = { + add_opinion = { + target = scope:councillor_liege + modifier = pam_fired_realm_priest_opinion + } + } + } + } + } } on_lose_position = { - fired_minister_position_effect = yes + # We promote first, because clearing the Realm Priest link first made puppeteer?= fail + if = { + limit = { + is_alive = yes + is_clergy = yes + is_ai = yes + any_held_title = {} + OR = { + NOT = { liege ?= scope:councillor_liege } + puppeteer ?= scope:councillor_liege + } + scope:councillor_liege = { + can_have_theological_agent_puppet_trigger = yes + NOT = { + exists = puppet:external_theological_agent_puppet + } + } + } + if = { + limit = { puppeteer ?= scope:councillor_liege } + hidden_effect = { clear_puppet_status = yes } + } + scope:councillor_liege = { + send_interface_toast = { + type = event_toast_effect_good + title = make_external_clerical_puppet_on_action_notification + left_icon = scope:councillor_liege + right_icon = root + set_puppet = { + target = root + type = external_theological_agent_puppet + } + } + } + } + else_if = { + limit = { + is_alive = yes + is_clergy = yes + puppeteer ?= scope:councillor_liege + is_puppet_of_type = theological_agent_puppet + } + clear_puppet_status = yes + } } portrait_animation = chaplain @@ -1028,7 +1098,7 @@ councillor_spouse = { #Tibetan Feudal/Clan triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire OR = { government_has_flag = government_is_feudal government_has_flag = government_is_clan @@ -1131,7 +1201,7 @@ councillor_spouse = { #Dravidian/Indo-Aryan Feudal/Clan/Tribal triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire OR = { government_has_flag = government_is_feudal government_has_flag = government_is_clan @@ -1218,7 +1288,7 @@ councillor_spouse = { #Mongolic and Turkic All triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire OR = { government_has_flag = government_is_feudal government_has_flag = government_is_clan @@ -1253,7 +1323,7 @@ councillor_spouse = { #Iranian Feudal/Clan triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire OR = { government_has_flag = government_is_feudal government_has_flag = government_is_clan @@ -1310,7 +1380,7 @@ councillor_spouse = { #Turkish Feudal/Clan triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire OR = { government_has_flag = government_is_feudal government_has_flag = government_is_clan @@ -1391,7 +1461,7 @@ councillor_spouse = { #Arabic Feudal/Clan/Tribal triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire OR = { government_has_flag = government_is_feudal government_has_flag = government_is_tribal @@ -1453,7 +1523,7 @@ councillor_spouse = { #Russian Feudal triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire government_has_flag = government_is_feudal culture = { has_name_list = name_list_russian } } @@ -1493,7 +1563,7 @@ councillor_spouse = { #German Feudal/Tribal triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire OR = { government_has_flag = government_is_feudal government_has_flag = government_is_tribal @@ -1522,7 +1592,7 @@ councillor_spouse = { #Greek Feudal triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire government_has_flag = government_is_feudal culture = { has_name_list = name_list_greek } } @@ -1547,7 +1617,7 @@ councillor_spouse = { #Roman Republic triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire government_has_flag = government_is_republic culture = { has_name_list = name_list_roman } } @@ -1588,7 +1658,7 @@ councillor_spouse = { #Roman Feudal triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire government_has_flag = government_is_feudal culture = { has_name_list = name_list_roman } } @@ -1646,7 +1716,7 @@ councillor_spouse = { #Tribal Default triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire government_has_flag = government_is_tribal } desc = emperor_tribal_male @@ -1682,7 +1752,7 @@ councillor_spouse = { #Clan Default triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire government_has_flag = government_is_clan } desc = emperor_clan_male @@ -1718,7 +1788,7 @@ councillor_spouse = { #Republic Default triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire government_has_flag = government_is_republic } desc = emperor_republic_male @@ -1769,14 +1839,14 @@ councillor_spouse = { #Feudal/Default Fallback triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire NOR = { #The following governments have "Spouses" government_has_flag = government_is_theocracy government_has_flag = government_is_mercenary government_has_flag = government_is_holy_order AND = { is_independent_ruler = no - government_allows = administrative + government_has_mechanic = administrative } tgp_is_any_minister = yes } @@ -1792,7 +1862,7 @@ councillor_spouse = { government_has_flag = government_is_holy_order AND = { is_independent_ruler = no - government_allows = administrative + government_has_mechanic = administrative } } } @@ -1807,7 +1877,7 @@ councillor_spouse = { government_has_flag = government_is_holy_order AND = { is_independent_ruler = no - government_allows = administrative + government_has_mechanic = administrative } } } @@ -1822,7 +1892,7 @@ councillor_spouse = { government_has_flag = government_is_holy_order AND = { is_independent_ruler = no - government_allows = administrative + government_has_mechanic = administrative } } } @@ -1837,7 +1907,7 @@ councillor_spouse = { government_has_flag = government_is_holy_order AND = { is_independent_ruler = no - government_allows = administrative + government_has_mechanic = administrative } } } @@ -1868,7 +1938,7 @@ councillor_spouse = { #Tibetan Feudal/Clan triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire OR = { government_has_flag = government_is_feudal government_has_flag = government_is_clan @@ -1971,7 +2041,7 @@ councillor_spouse = { #Dravidian/Indo-Aryan Feudal/Clan/Tribal triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire OR = { government_has_flag = government_is_feudal government_has_flag = government_is_clan @@ -2058,7 +2128,7 @@ councillor_spouse = { #Mongolic and Turkic All triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire OR = { government_has_flag = government_is_feudal government_has_flag = government_is_clan @@ -2093,7 +2163,7 @@ councillor_spouse = { #Iranian non-Muslim Feudal/Clan triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire OR = { government_has_flag = government_is_feudal government_has_flag = government_is_clan @@ -2205,7 +2275,7 @@ councillor_spouse = { #Turkish Feudal/Clan triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire OR = { government_has_flag = government_is_feudal government_has_flag = government_is_clan @@ -2286,7 +2356,7 @@ councillor_spouse = { #Arabic Feudal/Clan/Tribal triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire OR = { government_has_flag = government_is_feudal government_has_flag = government_is_tribal @@ -2348,7 +2418,7 @@ councillor_spouse = { #Russian Feudal triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire government_has_flag = government_is_feudal culture = { has_name_list = name_list_russian } } @@ -2388,7 +2458,7 @@ councillor_spouse = { #German Feudal/Tribal triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire OR = { government_has_flag = government_is_feudal government_has_flag = government_is_tribal @@ -2417,7 +2487,7 @@ councillor_spouse = { #Greek Feudal triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire government_has_flag = government_is_feudal culture = { has_name_list = name_list_greek } } @@ -2434,7 +2504,7 @@ councillor_spouse = { #Roman Republic triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire government_has_flag = government_is_republic culture = { has_name_list = name_list_roman } } @@ -2475,7 +2545,7 @@ councillor_spouse = { #Roman Feudal triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire government_has_flag = government_is_feudal culture = { has_name_list = name_list_roman } } @@ -2533,7 +2603,7 @@ councillor_spouse = { #Tribal Default triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire government_has_flag = government_is_tribal } desc = emperor_tribal_female @@ -2569,7 +2639,7 @@ councillor_spouse = { #Clan Default triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire government_has_flag = government_is_clan } desc = emperor_clan_female @@ -2605,7 +2675,7 @@ councillor_spouse = { #Republic Default triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire government_has_flag = government_is_republic } desc = emperor_republic_female @@ -2658,14 +2728,14 @@ councillor_spouse = { #Feudal/Default Fallback triggered_desc = { trigger = { - highest_held_title_tier = tier_empire + highest_held_title_tier >= tier_empire NOR = { #The following governments have "Spouses" government_has_flag = government_is_theocracy government_has_flag = government_is_mercenary government_has_flag = government_is_holy_order AND = { is_independent_ruler = no - government_allows = administrative + government_has_mechanic = administrative } tgp_is_any_minister = yes } @@ -2681,7 +2751,7 @@ councillor_spouse = { government_has_flag = government_is_holy_order AND = { is_independent_ruler = no - government_allows = administrative + government_has_mechanic = administrative } } } @@ -2696,7 +2766,7 @@ councillor_spouse = { government_has_flag = government_is_holy_order AND = { is_independent_ruler = no - government_allows = administrative + government_has_mechanic = administrative } } } @@ -2711,7 +2781,7 @@ councillor_spouse = { government_has_flag = government_is_holy_order AND = { is_independent_ruler = no - government_allows = administrative + government_has_mechanic = administrative } } } @@ -2726,7 +2796,7 @@ councillor_spouse = { government_has_flag = government_is_holy_order AND = { is_independent_ruler = no - government_allows = administrative + government_has_mechanic = administrative } } } @@ -2783,7 +2853,7 @@ councillor_vizier = { auto_fill = yes can_fire = yes can_reassign = yes - + name = councillor_vizier tooltip = councillor_vizier_desc @@ -2827,14 +2897,14 @@ councillor_kurultai_1 = { valid_character = { exists = root.liege_or_court_owner - can_be_kurultai_trigger = { - COURT_OWNER = root.liege_or_court_owner + can_be_kurultai_trigger = { + COURT_OWNER = root.liege_or_court_owner CP1 = councillor_kurultai_2 CP2 = councillor_kurultai_3 CP3 = councillor_kurultai_4 } } - + council_owner_modifier = { name = learn_on_the_job_modifier diplomacy = 1 @@ -2921,14 +2991,14 @@ councillor_kurultai_2 = { valid_character = { exists = root.liege_or_court_owner - can_be_kurultai_trigger = { - COURT_OWNER = root.liege_or_court_owner + can_be_kurultai_trigger = { + COURT_OWNER = root.liege_or_court_owner CP1 = councillor_kurultai_1 CP2 = councillor_kurultai_3 CP3 = councillor_kurultai_4 } } - + council_owner_modifier = { name = learn_on_the_job_modifier diplomacy = 1 @@ -3015,14 +3085,14 @@ councillor_kurultai_3 = { valid_character = { exists = root.liege_or_court_owner - can_be_kurultai_trigger = { - COURT_OWNER = root.liege_or_court_owner + can_be_kurultai_trigger = { + COURT_OWNER = root.liege_or_court_owner CP1 = councillor_kurultai_1 CP2 = councillor_kurultai_2 CP3 = councillor_kurultai_4 } } - + council_owner_modifier = { name = learn_on_the_job_modifier diplomacy = 1 @@ -3109,14 +3179,14 @@ councillor_kurultai_4 = { valid_character = { exists = root.liege_or_court_owner - can_be_kurultai_trigger = { - COURT_OWNER = root.liege_or_court_owner + can_be_kurultai_trigger = { + COURT_OWNER = root.liege_or_court_owner CP1 = councillor_kurultai_1 CP2 = councillor_kurultai_2 CP3 = councillor_kurultai_3 } } - + council_owner_modifier = { name = learn_on_the_job_modifier diplomacy = 1 diff --git a/common/council_positions/01_ministry_positions.txt b/common/council_positions/01_ministry_positions.txt index e23a84508..2761de674 100644 --- a/common/council_positions/01_ministry_positions.txt +++ b/common/council_positions/01_ministry_positions.txt @@ -1,6 +1,6 @@ minister_personnel = { skill = diplomacy - + name = minister_personnel valid_position = { @@ -8,9 +8,6 @@ } tooltip = game_concept_minister_of_personnel_desc - - auto_fill = { - } modifier = { name = minister_personnel_modifier @@ -55,11 +52,8 @@ } on_fired_from_position = { - fired_from_council_position_effect = yes - } - - on_lose_position = { fired_minister_position_effect = yes + fired_from_council_position_effect = yes } portrait_animation = happy_teacher @@ -72,7 +66,7 @@ minister_justice = { skill = learning - + name = minister_justice valid_position = { @@ -80,9 +74,6 @@ minister_justice = { } tooltip = game_concept_minister_of_justice_desc - - auto_fill = { - } modifier = { name = minister_justice_modifier @@ -127,11 +118,8 @@ minister_justice = { } on_fired_from_position = { - fired_from_council_position_effect = yes - } - - on_lose_position = { fired_minister_position_effect = yes + fired_from_council_position_effect = yes } portrait_animation = page_flipping @@ -144,14 +132,11 @@ minister_justice = { minister_works = { skill = stewardship - + name = minister_works tooltip = game_concept_minister_of_works_desc - - auto_fill = { - } - + valid_position = { tgp_has_access_to_ministry_trigger = yes } @@ -207,11 +192,8 @@ minister_works = { } on_fired_from_position = { - fired_from_council_position_effect = yes - } - - on_lose_position = { fired_minister_position_effect = yes + fired_from_council_position_effect = yes } portrait_animation = minister_works @@ -224,14 +206,11 @@ minister_works = { minister_grand_marshal = { skill = martial - + name = minister_grand_marshal tooltip = game_concept_minister_grand_marshal_desc - - auto_fill = { - } - + valid_position = { tgp_has_access_to_ministry_trigger = yes } @@ -284,11 +263,8 @@ minister_grand_marshal = { } on_fired_from_position = { - fired_from_council_position_effect = yes - } - - on_lose_position = { fired_minister_position_effect = yes + fired_from_council_position_effect = yes } portrait_animation = grand_marshal