diff --git a/CK2Plus/common/governments/feudal_governments.txt b/CK2Plus/common/governments/feudal_governments.txt index 32ef03eec..3d771d611 100644 --- a/CK2Plus/common/governments/feudal_governments.txt +++ b/CK2Plus/common/governments/feudal_governments.txt @@ -18,9 +18,9 @@ feudal_governments = { feudal_government muslim_feudal_government monastic_feudal_government + bogomilist_imperial_government imperial_government muslim_imperial_government - bogomilist_imperial_government } free_revoke_on_tiers = { DUKE @@ -36,12 +36,10 @@ feudal_governments = { color = { 118 255 163 } potential = { - feudal_group_potential_trigger = yes chinese_imperial_government_potential_trigger = yes } allow = { - feudal_group_allow_trigger = yes chinese_imperial_government_allow_trigger = yes } @@ -82,12 +80,12 @@ feudal_governments = { } accepts_liege_governments = { # Gets the wrong religion modifier instead muslim_feudal_government - muslim_imperial_government + monastic_feudal_government + chinese_imperial_government bogomilist_government bogomilist_imperial_government - monastic_feudal_government imperial_government - chinese_imperial_government + muslim_imperial_government } free_revoke_on_governments_religion = { # Tribal vassals of other religions can have their titles revoked for free tribal_government @@ -100,12 +98,10 @@ feudal_governments = { color = { 91 133 207 } potential = { - feudal_group_potential_trigger = yes feudal_government_potential_trigger = yes } allow = { - feudal_group_allow_trigger = yes feudal_government_allow_trigger = yes } @@ -134,12 +130,12 @@ feudal_governments = { } accepts_liege_governments = { # Gets the wrong religion modifier instead feudal_government - bogomilist_government monastic_feudal_government + chinese_imperial_government + bogomilist_government + bogomilist_imperial_government imperial_government muslim_imperial_government - bogomilist_imperial_government - chinese_imperial_government } free_revoke_on_tiers = { DUKE @@ -155,12 +151,10 @@ feudal_governments = { color = { 10 138 57 } potential = { - feudal_group_potential_trigger = yes muslim_feudal_government_potential_trigger = yes } allow = { - feudal_group_allow_trigger = yes muslim_feudal_government_allow_trigger = yes } @@ -186,6 +180,7 @@ feudal_governments = { } allowed_holdings = { CASTLE + TEMPLE TRIBAL FORT HOSPITAL @@ -212,12 +207,10 @@ feudal_governments = { color = { 169 169 169 } potential = { - feudal_group_potential_trigger = yes order_government_potential_trigger = yes } allow = { - feudal_group_allow_trigger = yes order_government_allow_trigger = yes } @@ -265,12 +258,10 @@ feudal_governments = { color = { 143 12 125 } potential = { - feudal_group_potential_trigger = yes roman_imperial_government_potential_trigger = yes } allow = { - feudal_group_allow_trigger = yes roman_imperial_government_allow_trigger = yes } @@ -309,10 +300,10 @@ feudal_governments = { theocracy_government feudal_government chinese_imperial_government + bogomilist_government + bogomilist_imperial_government imperial_government muslim_imperial_government - bogomilist_imperial_government - bogomilist_government } free_revoke_on_governments_religion = { # Tribal vassals of other religions can have their titles revoked for free tribal_government @@ -325,12 +316,10 @@ feudal_governments = { color = { 207 145 90 } potential = { - feudal_group_potential_trigger = yes monastic_feudal_government_potential_trigger = yes } allow = { - feudal_group_allow_trigger = yes monastic_feudal_government_allow_trigger = yes } diff --git a/CK2Plus/common/governments/plus_feudal_governments.txt b/CK2Plus/common/governments/plus_feudal_governments.txt index 746233570..85460b7b3 100644 --- a/CK2Plus/common/governments/plus_feudal_governments.txt +++ b/CK2Plus/common/governments/plus_feudal_governments.txt @@ -33,11 +33,9 @@ feudal_governments = { color = { 121 103 77 } potential = { - feudal_group_potential_trigger = yes plus_bogomilist_government_potential = yes } allow = { - feudal_group_allow_trigger = yes plus_bogomilist_government_allow = yes } @@ -85,12 +83,10 @@ feudal_governments = { color = { 176 52 253 } potential = { - plus_imperial_group_potential = yes plus_imperial_government_potential = yes } allow = { - plus_imperial_group_allow = yes plus_imperial_government_allow = yes } @@ -139,11 +135,9 @@ feudal_governments = { color = { 76 152 153 } potential = { - plus_imperial_group_potential = yes plus_muslim_imperial_government_potential = yes } allow = { - plus_imperial_group_allow = yes plus_muslim_imperial_government_allow = yes } diff --git a/CK2Plus/common/governments/republic_governments.txt b/CK2Plus/common/governments/republic_governments.txt index 2f0363426..c4249d967 100644 --- a/CK2Plus/common/governments/republic_governments.txt +++ b/CK2Plus/common/governments/republic_governments.txt @@ -33,12 +33,10 @@ republic_governments = { color = { 94 187 185 } potential = { - republic_group_potential_trigger = yes confucian_government_potential_trigger = yes } allow = { - republic_group_allow_trigger = yes confucian_government_allow_trigger = yes } @@ -95,12 +93,10 @@ republic_governments = { color = { 250 0 0 } potential = { - republic_group_potential_trigger = yes merchant_republic_government_potential_trigger = yes } allow = { - republic_group_allow_trigger = yes merchant_republic_government_allow_trigger = yes } @@ -156,11 +152,9 @@ republic_governments = { color = { 209 125 130 } potential = { - republic_group_potential_trigger = yes republic_government_potential_trigger = yes } allow = { - republic_group_allow_trigger = yes republic_government_allow_trigger = yes } diff --git a/CK2Plus/common/governments/tribal_governments.txt b/CK2Plus/common/governments/tribal_governments.txt index 2aff60fb8..8979d2beb 100644 --- a/CK2Plus/common/governments/tribal_governments.txt +++ b/CK2Plus/common/governments/tribal_governments.txt @@ -35,12 +35,10 @@ tribal_governments = { color = { 92 31 23 } potential = { - tribal_group_potential_trigger = yes tribal_government_potential_trigger = yes } allow = { - tribal_group_allow_trigger = yes tribal_government_allow_trigger = yes } diff --git a/CK2Plus/common/scripted_triggers/00_government_triggers.txt b/CK2Plus/common/scripted_triggers/00_government_triggers.txt index 4522290c2..3582a4b6e 100644 --- a/CK2Plus/common/scripted_triggers/00_government_triggers.txt +++ b/CK2Plus/common/scripted_triggers/00_government_triggers.txt @@ -2,12 +2,23 @@ # NOTE: Holdings and Laws are not loaded until after the game starts. EXTREMELY DELICATE, modify at your own risk # Feudal Group -feudal_group_potential_trigger = {} -feudal_group_allow_trigger = {} +feudal_group_potential_trigger = { + could_be_temporal_religious_head_trigger = yes # If holder is a religion head, makes sure they shouldn't be a theocracy instead + is_patrician = no + NOR = { # Special governments that should be prioritized (only feudal by technicality) + is_government_potential = chinese_imperial_government + is_government_potential = order_government + is_government_potential = roman_imperial_government + } +} + +feudal_group_allow_trigger = { plus_imperial_group_allow = no } # Be careful with this as it might break fallbacks # Chinese Imperial -chinese_imperial_government_potential_trigger = { +chinese_imperial_government_potential_trigger = { # Special snowflake government. Doesn't get the group triggers chinese_imperial_government_culture_trigger = yes + is_patrician = no + could_be_temporal_religious_head_trigger = yes # If holder is a religion head, makes sure they shouldn't be a theocracy instead (shouldn't happen, safety check) primary_title = { real_tier = EMPEROR @@ -15,43 +26,33 @@ chinese_imperial_government_potential_trigger = { } } -chinese_imperial_government_allow_trigger = {} +chinese_imperial_government_allow_trigger = {} # Special snowflake government. Doesn't get the group triggers # Feudal feudal_government_potential_trigger = { - is_patrician = no - could_be_temporal_religious_head_trigger = yes + feudal_group_potential_trigger = yes NOR = { is_government_potential = muslim_feudal_government is_government_potential = monastic_feudal_government - is_government_potential = roman_imperial_government - is_government_potential = order_government - is_government_potential = chinese_imperial_government - is_government_potential = imperial_government - is_government_potential = muslim_imperial_government is_government_potential = bogomilist_government - is_government_potential = bogomilist_imperial_government } } -feudal_government_allow_trigger = {} +feudal_government_allow_trigger = { + feudal_group_allow_trigger = yes +} # Iqta muslim_feudal_government_potential_trigger = { + feudal_group_potential_trigger = yes religion_group = muslim - is_patrician = no - - NOR = { - religion = druze # Druze don't consider themselves Islamic and don't practice Iqta - is_government_potential = roman_imperial_government - is_government_potential = order_government - is_government_potential = chinese_imperial_government - is_government_potential = muslim_imperial_government - } + NOT = { religion = druze } } -muslim_feudal_government_allow_trigger = {} +muslim_feudal_government_allow_trigger = { + feudal_group_allow_trigger = yes +} # Holy Orders order_government_potential_trigger = { @@ -66,6 +67,7 @@ order_government_potential_trigger = { } NOT = { is_government_potential = merchant_republic_government } + could_be_temporal_religious_head_trigger = yes # If holder is a religion head, makes sure they shouldn't be a theocracy instead } } @@ -74,6 +76,7 @@ order_government_allow_trigger = {} # Imperial Roman roman_imperial_government_potential_trigger = { always = no # Plus uses various more generalised Imperial government forms + could_be_temporal_religious_head_trigger = yes # If holder is a religion head, makes sure they shouldn't be a theocracy instead primary_title = { OR = { title = e_byzantium @@ -81,7 +84,7 @@ roman_imperial_government_potential_trigger = { title = event_target:alternate_byz } - trigger_if = { + trigger_if = { # so it shows on the title selection screen limit = { NOT = { has_law = succ_byzantine_elective } } @@ -90,78 +93,92 @@ roman_imperial_government_potential_trigger = { has_game_started = no } } - - could_be_temporal_religious_head_trigger = yes } roman_imperial_government_allow_trigger = {} # Theocratic Feudal monastic_feudal_government_potential_trigger = { + feudal_group_potential_trigger = yes culture_group = tibetan_group higher_real_tier_than = BARON - is_patrician = no - could_be_temporal_religious_head_trigger = yes OR = { religion_openly_bon_or_reformed_trigger = yes religion = buddhist } - - NOR = { - is_government_potential = roman_imperial_government - is_government_potential = order_government - is_government_potential = chinese_imperial_government - } } -monastic_feudal_government_allow_trigger = {} +monastic_feudal_government_allow_trigger = { + feudal_group_allow_trigger = yes +} # Nomadic Group # In case someone wants to add more Nomads for some reason nomadic_group_potential_trigger = { - could_be_temporal_religious_head_trigger = yes + could_be_temporal_religious_head_trigger = yes # If holder is a religion head, makes sure they shouldn't be a theocracy instead is_patrician = no mercenary = no holy_order = no } -nomadic_group_allow_trigger = { - trigger_if = { - limit = { has_game_started = no } +nomadic_group_allow_trigger = {} - capital_scope = { has_tribal = no } # To keep Tribals from showing up as Nomads - } +# Nomad Government +nomadic_government_potential_trigger = { + nomadic_group_potential_trigger = yes } -# Nomad Government -nomadic_government_potential_trigger = {} -nomadic_government_allow_trigger = {} +nomadic_government_allow_trigger = { + nomadic_group_allow_trigger = yes +} # Republic Group -republic_group_potential_trigger = {} +republic_group_potential_trigger = { + could_be_temporal_religious_head_trigger = yes # If holder is a religion head, makes sure they shouldn't be a theocracy instead +} + republic_group_allow_trigger = {} # Confucian Bureaucracy -confucian_government_potential_trigger = { +confucian_government_potential_trigger = { # Special snowflake government. Doesn't get the group triggers is_offmap_tag = offmap_china } -confucian_government_allow_trigger = {} +confucian_government_allow_trigger = {} # Special snowflake government. Doesn't get the group triggers # Merchant Republic merchant_republic_government_potential_trigger = { - # Patrician and Doge requirements - OR = { - # Doge requirements - # Does not require being a patrician, to allow creation of new Merchant Republics - AND = { - # Must always be coastal - capital_scope = { is_coastal = yes } + republic_group_potential_trigger = yes - # Require at least one province and be Duke tier or higher - higher_real_tier_than = COUNT - num_of_count_titles >= 1 + trigger_if = { # Established MR requiremends + limit = { + is_merchant_republic = yes + has_game_started = yes + } + + # Require at least one province and be Duke tier or higher + higher_real_tier_than = COUNT + num_of_count_titles >= 1 + + # MR can't be under MR + trigger_if = { + limit = { independent = no } + + liege_before_war = { + is_merchant_republic = no + } + } + } + trigger_else_if = { # Established Patrician requirements + limit = { + is_patrician = yes + has_game_started = yes + } + + # Liege must be MR + liege_before_war = { + is_merchant_republic = yes # MR can't be under MR trigger_if = { @@ -172,51 +189,61 @@ merchant_republic_government_potential_trigger = { } } } - - # Patrician requirements - AND = { + } + trigger_else = { # Pre-game and new MR requirements + OR = { is_patrician = yes - OR = { - # Liege must be MR - liege_before_war = { - is_merchant_republic = yes + trigger_if = { + limit = { capital_scope = { is_coastal = yes } } + + # Require at least one province and be Duke tier or higher + higher_real_tier_than = COUNT + num_of_count_titles >= 1 - # MR can't be under MR - trigger_if = { - limit = { independent = no } + # MR can't be under MR + trigger_if = { + limit = { independent = no } - liege_before_war = { - is_merchant_republic = no - } + liege_before_war = { + is_merchant_republic = no } } - - has_game_started = no } } } - - could_be_temporal_religious_head_trigger = yes } -merchant_republic_government_allow_trigger = {} +merchant_republic_government_allow_trigger = { + republic_group_allow_trigger = yes +} # Republic Government republic_government_potential_trigger = { + republic_group_potential_trigger = yes + # Necessary to keep Merchant Republics from reverting on some successions NOT = { is_government_potential = merchant_republic_government } - could_be_temporal_religious_head_trigger = yes } -republic_government_allow_trigger = {} +republic_government_allow_trigger = { + republic_group_allow_trigger = yes +} # Theocratic Group # In case someone wants to add more Theocracies for some reason theocratic_group_potential_trigger = { holy_order = no is_patrician = no - NOT = { is_government_potential = muslim_feudal_government } + + trigger_if = { + limit = { controls_religion = yes } + + could_be_temporal_religious_head_trigger = no + } + trigger_else = { + NOT = { is_government_potential = muslim_feudal_government } + } trigger_if = { limit = { is_female = yes } @@ -230,12 +257,19 @@ theocratic_group_potential_trigger = { theocratic_group_allow_trigger = {} # Theocracy Government -theocratic_government_potential_trigger = {} -theocratic_government_allow_trigger = {} +theocratic_government_potential_trigger = { + theocratic_group_potential_trigger = yes +} + +theocratic_government_allow_trigger = { + theocratic_group_allow_trigger = yes +} # Tribal Group # In case someone wants to add more Tribals for some reason tribal_group_potential_trigger = { + mercenary = no + is_patrician = no holy_order = no NOT = { is_government_potential = order_government } @@ -244,16 +278,16 @@ tribal_group_potential_trigger = { is_feudal = no } - could_be_temporal_religious_head_trigger = yes + could_be_temporal_religious_head_trigger = yes # If holder is a religion head, makes sure they shouldn't be a theocracy instead } -tribal_group_allow_trigger = { - trigger_if = { - limit = { has_game_started = no } - capital_scope = { has_tribal = yes } # I don't know why this works but it does and I'm not going to question it - } -} +tribal_group_allow_trigger = {} # Tribal Government -tribal_government_potential_trigger = {} -tribal_government_allow_trigger = {} +tribal_government_potential_trigger = { + tribal_group_potential_trigger = yes +} + +tribal_government_allow_trigger = { + tribal_group_allow_trigger = yes +} diff --git a/CK2Plus/common/scripted_triggers/99_CK2Plus_government_triggers.txt b/CK2Plus/common/scripted_triggers/99_CK2Plus_government_triggers.txt index 149341aa7..6f352430f 100644 --- a/CK2Plus/common/scripted_triggers/99_CK2Plus_government_triggers.txt +++ b/CK2Plus/common/scripted_triggers/99_CK2Plus_government_triggers.txt @@ -1,111 +1,81 @@ # Bogomilist Government plus_bogomilist_government_potential = { - is_patrician = no - could_be_temporal_religious_head_trigger = yes + feudal_group_potential_trigger = yes religion = bogomilist - - NOR = { - is_government_potential = chinese_imperial_government - is_government_potential = confucian_bureaucracy - is_government_potential = bogomilist_imperial_government - } } + plus_bogomilist_government_allow = {} # Imperial Type plus_imperial_group_potential = { - trigger_if = { # So it displays on the map before game start - limit = { - has_game_started = no - is_save_game = no - } - top_liege = { - OR = { - has_landed_title = e_byzantium - has_landed_title = e_roman_empire - } - } + could_be_temporal_religious_head_trigger = yes # If holder is a religion head, makes sure they shouldn't be a theocracy instead + is_patrician = no + NOR = { # Special governments that should be prioritized (only feudal by technicality) + is_government_potential = chinese_imperial_government + is_government_potential = order_government } - trigger_else = { - OR = { - # I see dead people - trigger_if = { - limit = { is_alive = no } - OR = { - has_landed_title = e_byzantium - has_landed_title = e_roman_empire - } - } +} - # For everyone inside the empire - top_liege = { - any_demesne_title = { # Just in case - OR = { - # To get the government when enacting imperial law, which is done before the actual law is set - has_title_flag = has_imperial_administration +plus_imperial_group_allow = { + trigger_if = { + limit = { independent = yes } - # General requirement - has_law = imperial_administration - has_law = ze_administration_laws_2 - } - } - } + primary_title = { + OR = { + has_law = imperial_administration + has_law = ze_administration_laws_2 - # For those part of a revolt against (someone in) the empire - top_liege = { # Could be below someone - liege_before_war = { # who is rebelling - top_liege= { # against someone who is below the emperor - any_demesne_title = { # Who could hold another title by fluke - OR = { - has_title_flag = has_imperial_administration - has_law = imperial_administration - has_law = ze_administration_laws_2 - } - } - } + AND = { + has_game_started = no + is_save_game = no + has_imperial_government_trigger = yes } } } } + trigger_else = { + top_liege = { + has_imperial_government_trigger = yes + } + } } -plus_imperial_group_allow = {} # Standard Imperial plus_imperial_government_potential = { - is_patrician = no - could_be_temporal_religious_head_trigger = yes + feudal_group_potential_trigger = yes NOR = { - is_government_potential = chinese_imperial_government - is_government_potential = confucian_bureaucracy is_government_potential = bogomilist_imperial_government is_government_potential = muslim_imperial_government } } -plus_imperial_government_allow = {} + +plus_imperial_government_allow = { + plus_imperial_group_allow = yes +} # Muslim Imperial plus_muslim_imperial_government_potential = { - is_patrician = no + feudal_group_potential_trigger = yes religion_group = muslim - NOR = { - religion = druze # Druze don't consider themselves Islamic and don't practice Iqta - is_government_potential = chinese_imperial_government - is_government_potential = confucian_bureaucracy - } + NOT = { religion = druze } +} + +plus_muslim_imperial_government_allow = { + plus_imperial_group_allow = yes } -plus_muslim_imperial_government_allow = {} # Bogomilist Imperial plus_bogomilist_imperial_government_potential = { - is_patrician = no - could_be_temporal_religious_head_trigger = yes + feudal_group_potential_trigger = yes religion = bogomilist } -plus_bogomilist_imperial_government_allow = {} +plus_bogomilist_imperial_government_allow = { + plus_imperial_group_allow = yes +} # Pseudo-typing has_imperial_government_trigger = { diff --git a/CK2Plus/history/titles/e_byzantium.txt b/CK2Plus/history/titles/e_byzantium.txt index 05aeffd86..615a61561 100644 --- a/CK2Plus/history/titles/e_byzantium.txt +++ b/CK2Plus/history/titles/e_byzantium.txt @@ -43,6 +43,7 @@ law = revoke_title_law_2 law = out_of_realm_inheritance_law_1 holder = 70523 # Constantine I + government = imperial_government } 337.5.22 = { diff --git a/CK2Plus/history/titles/k_africa.txt b/CK2Plus/history/titles/k_africa.txt index 2e276b2e1..35a64a8dc 100644 --- a/CK2Plus/history/titles/k_africa.txt +++ b/CK2Plus/history/titles/k_africa.txt @@ -1,9 +1,6 @@ -100.1.1 = { - pentarch = b_roma -} - # Vandals 435.1.1 = { + pentarch = b_roma holder = 168796 # Genseric } @@ -35,6 +32,7 @@ 768.1.1 = { holder = 210014 de_jure_liege = e_arabia + government = muslim_feudal_government # band-aid fix because it keeps pretending to be a MR and I can't figure out why } #768.1.1 = { @@ -185,4 +183,3 @@ 1318.1.1 = { holder = 33032 } -