From 4f15a1c4850e7427f471d74a61ccdff6772210c5 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Wed, 10 Dec 2025 18:59:37 +0000 Subject: [PATCH] Admin fixed republics reverted --- .../N3OW_standard_economy_buildings.txt | 2 +- .../traditions/00_realm_traditions.txt | 4 +- .../00_government_custom_loc.txt | 4 +- .../00_hold_court_custom_joe.txt | 2 +- .../00_regional_custom_localization.txt | 8 +-- .../00_ruler_transition_loc.txt | 2 +- .../00_statecraft_lifestyle_custom_loc.txt | 2 +- .../dlc_decisions/mpo/mpo_decisions.txt | 2 +- .../common/decisions/major_decisions_NEOW.txt | 2 +- .../governments/00_government_types.txt | 67 ++++--------------- N3OW/common/on_action/title_on_actions.txt | 4 +- N3OW/common/on_action/yearly_on_actions.txt | 2 +- .../script_values/02_religion_values.txt | 2 +- .../script_values/04_ep2_wedding_values.txt | 2 +- .../00_diarchy_scripted_triggers.txt | 6 +- .../00_elective_triggers.txt | 2 +- .../scripted_triggers/00_laamp_triggers.txt | 2 +- .../03_fp2_scripted_triggers.txt | 2 +- .../07_frankokratia_triggers.txt | 2 +- 19 files changed, 39 insertions(+), 80 deletions(-) diff --git a/N3OW/common/buildings/N3OW_standard_economy_buildings.txt b/N3OW/common/buildings/N3OW_standard_economy_buildings.txt index 6ef450e8..a94f8d06 100644 --- a/N3OW/common/buildings/N3OW_standard_economy_buildings.txt +++ b/N3OW/common/buildings/N3OW_standard_economy_buildings.txt @@ -51,7 +51,7 @@ tell_mines_01 = { modifier = { factor = 0 scope:holder = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic } NOT = { has_building_or_higher = guild_halls_01 diff --git a/N3OW/common/culture/traditions/00_realm_traditions.txt b/N3OW/common/culture/traditions/00_realm_traditions.txt index 51685916..ed71f0cf 100644 --- a/N3OW/common/culture/traditions/00_realm_traditions.txt +++ b/N3OW/common/culture/traditions/00_realm_traditions.txt @@ -344,7 +344,7 @@ tradition_republican_legacy = { scope:character = { any_vassal = { primary_title.tier > tier_county - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic } } } @@ -2280,7 +2280,7 @@ tradition_parochialism = { scope:character = { any_vassal = { primary_title.tier > tier_county - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic } } } diff --git a/N3OW/common/customizable_localization/00_government_custom_loc.txt b/N3OW/common/customizable_localization/00_government_custom_loc.txt index 7d8d3aa7..289d94e1 100644 --- a/N3OW/common/customizable_localization/00_government_custom_loc.txt +++ b/N3OW/common/customizable_localization/00_government_custom_loc.txt @@ -1097,10 +1097,10 @@ GetGovernmentIcon = { trigger_else = { trigger_if = { limit = { is_ruler = yes } - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic } trigger_else = { - liege ?= { government_has_flag = government_is_special_republic } + liege ?= { government_has_flag = government_is_republic } } } } diff --git a/N3OW/common/customizable_localization/00_hold_court_custom_joe.txt b/N3OW/common/customizable_localization/00_hold_court_custom_joe.txt index 351b318d..07364164 100644 --- a/N3OW/common/customizable_localization/00_hold_court_custom_joe.txt +++ b/N3OW/common/customizable_localization/00_hold_court_custom_joe.txt @@ -57,7 +57,7 @@ get_hold_court_8010_stake = { # Flavor for government type of worried vassal type = character text = { - trigger = { government_has_flag = government_is_special_republic } + trigger = { government_has_flag = government_is_republic } localization_key = hold_court_8010.desc_republic } diff --git a/N3OW/common/customizable_localization/00_regional_custom_localization.txt b/N3OW/common/customizable_localization/00_regional_custom_localization.txt index 6c9299ff..fc3f52db 100644 --- a/N3OW/common/customizable_localization/00_regional_custom_localization.txt +++ b/N3OW/common/customizable_localization/00_regional_custom_localization.txt @@ -178,7 +178,7 @@ ResidenceBuilding = { #Castle, Palace, etc. text = { trigger = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic is_landless_adventurer = no } localization_key = mansion @@ -220,7 +220,7 @@ ResidenceBuilding = { #Castle, Palace, etc. trigger = { is_landless_adventurer = no NOR = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic government_has_flag = government_is_theocracy any_held_title = { is_noble_family_title = yes } is_theocratic_lessee = yes @@ -261,7 +261,7 @@ ResidenceBuildingPlural = { #Castles, Palaces, etc. text = { trigger = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic is_landless_adventurer = no } localization_key = mansions @@ -302,7 +302,7 @@ ResidenceBuildingPlural = { #Castles, Palaces, etc. trigger = { is_landless_adventurer = no NOR = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic government_has_flag = government_is_theocracy any_held_title = { is_noble_family_title = yes } is_theocratic_lessee = yes diff --git a/N3OW/common/customizable_localization/00_ruler_transition_loc.txt b/N3OW/common/customizable_localization/00_ruler_transition_loc.txt index 5382a078..9cda6e91 100644 --- a/N3OW/common/customizable_localization/00_ruler_transition_loc.txt +++ b/N3OW/common/customizable_localization/00_ruler_transition_loc.txt @@ -1686,7 +1686,7 @@ HeirMessageInterface = { trigger = { any_child = { count >= 8 } NOR = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic government_has_flag = government_is_theocracy } } diff --git a/N3OW/common/customizable_localization/00_statecraft_lifestyle_custom_loc.txt b/N3OW/common/customizable_localization/00_statecraft_lifestyle_custom_loc.txt index 30097cd9..3ad8ca67 100644 --- a/N3OW/common/customizable_localization/00_statecraft_lifestyle_custom_loc.txt +++ b/N3OW/common/customizable_localization/00_statecraft_lifestyle_custom_loc.txt @@ -21,7 +21,7 @@ StatecraftGetVassalType = { localization_key = statecraft_ongoing.4010.clergy } text = { - trigger = { government_has_flag = government_is_special_republic} + trigger = { government_has_flag = government_is_republic} localization_key = statecraft_ongoing.4010.citizenry } } diff --git a/N3OW/common/decisions/dlc_decisions/mpo/mpo_decisions.txt b/N3OW/common/decisions/dlc_decisions/mpo/mpo_decisions.txt index dd9cd972..8bb054c2 100644 --- a/N3OW/common/decisions/dlc_decisions/mpo/mpo_decisions.txt +++ b/N3OW/common/decisions/dlc_decisions/mpo/mpo_decisions.txt @@ -679,7 +679,7 @@ leave_confederation_decision = { } modifier = { #Is wrong government type NOR = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic government_has_flag = government_is_feudal government_has_flag = government_is_clan } diff --git a/N3OW/common/decisions/major_decisions_NEOW.txt b/N3OW/common/decisions/major_decisions_NEOW.txt index 03db1c87..acf5f7a9 100644 --- a/N3OW/common/decisions/major_decisions_NEOW.txt +++ b/N3OW/common/decisions/major_decisions_NEOW.txt @@ -27,7 +27,7 @@ restore_european_union_decision = { } OR = { government_has_flag = government_is_feudal - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic government_has_flag = government_is_clan has_government = administrative_government } diff --git a/N3OW/common/governments/00_government_types.txt b/N3OW/common/governments/00_government_types.txt index b427f3d0..5cb8cd75 100644 --- a/N3OW/common/governments/00_government_types.txt +++ b/N3OW/common/governments/00_government_types.txt @@ -42,70 +42,30 @@ feudal_government = { } republic_government = { + primary_holding = city_holding + valid_holdings = { castle_holding } + required_county_holdings = { city_holding castle_holding church_holding } government_rules = { - create_cadet_branches = yes - rulers_should_have_dynasty = yes - dynasty_named_realms = no - landless_playable = yes - legitimacy = yes - administrative = yes - use_as_base_on_landed = yes - use_as_base_on_rank_up = yes inherit_from_dynastic_government = no - sticky_government = yes - house_aspirations = yes - noble_families = yes - admin_allows_holding_multiple_primary_tier_titles = yes - treasury = yes - replace_gold_cost_by_treasury = yes } - - domicile_type = estate - main_administrative_tier = county - min_appointment_tier = county - minimum_provincial_maa_tier = county - - fallback = 2 - - primary_holding = city_holding - valid_holdings = { temple_citadel_holding } - required_county_holdings = { city_holding castle_holding church_holding } + ai = { + arrange_marriage = no + use_goals = no + use_scripted_guis = no + perform_religious_reformation = no + use_legends = no + } vassal_contract_group = republic_vassal - character_modifier = { - # Vassals get Treasury income that is this percentage less than their taxes to their liege - monthly_treasury_from_liege_mult = -0.15 - men_at_arms_maintenance = 0.75 - men_at_arms_recruitment_cost = 0.75 - } - - top_liege_character_modifier = { - # 85% of vassal income goes to the treasury - monthly_treasury_from_vassals = 0.85 - men_at_arms_maintenance = 0.75 - men_at_arms_recruitment_cost = 0.75 - } - # Use flags instead of has_government for moddability if possible (i.e., wherever not visible to the player). flags = { - government_is_administrative - - # These flags only exist for loc and in-game descriptions - government_has_influence - government_has_treasury - government_has_county_tier_noble_families - government_is_special_administrative - government_is_special_republic2 - government_has_title_men_at_arms - government_has_powerful_families + government_is_republic government_is_settled - government_uses_domicile_but_not_adventurer government_uses_domain_limit } - mechanic_type = administrative color = hsv{ 0.00 1.00 0.98 } realm_mask_offset = { 0.0 -0.01 } realm_mask_scale = { 1 1 } @@ -437,7 +397,6 @@ administrative_government = { dynasty_named_realms = no landless_playable = yes legitimacy = yes - state_faith = yes administrative = yes use_as_base_on_landed = yes use_as_base_on_rank_up = yes @@ -454,8 +413,8 @@ administrative_government = { domicile_type = estate main_administrative_tier = duchy - min_appointment_tier = duchy - minimum_provincial_maa_tier = duchy + min_appointment_tier = county + minimum_provincial_maa_tier = county fallback = 3 diff --git a/N3OW/common/on_action/title_on_actions.txt b/N3OW/common/on_action/title_on_actions.txt index 3d64ca62..b712a3a8 100644 --- a/N3OW/common/on_action/title_on_actions.txt +++ b/N3OW/common/on_action/title_on_actions.txt @@ -4095,14 +4095,14 @@ on_vassal_change = { liege = root # I.e. root is independent government_has_flag = government_is_administrative NOT = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic } } # And is not of a high enough rank, change government if = { limit = { NOT = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic } administrative_tier_allows_independence = no } diff --git a/N3OW/common/on_action/yearly_on_actions.txt b/N3OW/common/on_action/yearly_on_actions.txt index e5a38506..c7e62b68 100644 --- a/N3OW/common/on_action/yearly_on_actions.txt +++ b/N3OW/common/on_action/yearly_on_actions.txt @@ -2405,7 +2405,7 @@ five_year_everyone_pulse = { is_married = no is_lowborn = no NOT = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic } can_marry_trigger = yes } diff --git a/N3OW/common/script_values/02_religion_values.txt b/N3OW/common/script_values/02_religion_values.txt index b683ae60..00a25201 100644 --- a/N3OW/common/script_values/02_religion_values.txt +++ b/N3OW/common/script_values/02_religion_values.txt @@ -3508,7 +3508,7 @@ faith_conversion_cost_mult = { else_if = { limit = { scope:character = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic } } multiply = { diff --git a/N3OW/common/script_values/04_ep2_wedding_values.txt b/N3OW/common/script_values/04_ep2_wedding_values.txt index 8e035f68..74081f05 100644 --- a/N3OW/common/script_values/04_ep2_wedding_values.txt +++ b/N3OW/common/script_values/04_ep2_wedding_values.txt @@ -188,7 +188,7 @@ limit = { scope:impress_check = { OR = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic government_has_flag = government_is_theocracy } } diff --git a/N3OW/common/scripted_triggers/00_diarchy_scripted_triggers.txt b/N3OW/common/scripted_triggers/00_diarchy_scripted_triggers.txt index 1c61bba6..6a385b11 100644 --- a/N3OW/common/scripted_triggers/00_diarchy_scripted_triggers.txt +++ b/N3OW/common/scripted_triggers/00_diarchy_scripted_triggers.txt @@ -459,7 +459,7 @@ valid_junior_emperor_candidate_trigger = { } # Prevent weird governments from taking place. NOR = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic government_has_flag = government_is_theocracy government_has_flag = government_is_landless_adventurer } @@ -494,7 +494,7 @@ valid_co_emperor_candidate_trigger = { has_trait = eunuch has_trait = incapable # Prevent weird governments from taking place. - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic government_has_flag = government_is_theocracy government_has_flag = government_is_landless_adventurer } @@ -536,7 +536,7 @@ valid_co_monarch_candidate_trigger = { } # Prevent weird governments from taking place. NOR = { - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic government_has_flag = government_is_theocracy government_has_flag = government_is_landless_adventurer } diff --git a/N3OW/common/scripted_triggers/00_elective_triggers.txt b/N3OW/common/scripted_triggers/00_elective_triggers.txt index e31d0a1e..2a57a888 100644 --- a/N3OW/common/scripted_triggers/00_elective_triggers.txt +++ b/N3OW/common/scripted_triggers/00_elective_triggers.txt @@ -64,7 +64,7 @@ this_is_martial_society_trigger = { this_is_diplomatic_society_trigger = { OR = { government_has_flag = government_is_feudal - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic government_has_flag = government_is_theocracy } OR = { diff --git a/N3OW/common/scripted_triggers/00_laamp_triggers.txt b/N3OW/common/scripted_triggers/00_laamp_triggers.txt index abf1789a..896a9962 100644 --- a/N3OW/common/scripted_triggers/00_laamp_triggers.txt +++ b/N3OW/common/scripted_triggers/00_laamp_triggers.txt @@ -599,7 +599,7 @@ laamp_base_1001_valid_neighbouring_county_trigger = { laamp_base_2001_valid_mayor_trigger = { highest_held_title_tier = tier_barony - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic NOT = { is_close_or_extended_family_of = scope:employer } } diff --git a/N3OW/common/scripted_triggers/03_fp2_scripted_triggers.txt b/N3OW/common/scripted_triggers/03_fp2_scripted_triggers.txt index c67e96ed..246be199 100644 --- a/N3OW/common/scripted_triggers/03_fp2_scripted_triggers.txt +++ b/N3OW/common/scripted_triggers/03_fp2_scripted_triggers.txt @@ -644,7 +644,7 @@ fp2_lyonese_monk_0002_valid_court_trigger = { # Remove non-playables. NOR = { government_has_flag = government_is_theocracy - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic } # Plus, for various reasons, we don't want Lyon _itself_. NOT = { diff --git a/N3OW/common/scripted_triggers/07_frankokratia_triggers.txt b/N3OW/common/scripted_triggers/07_frankokratia_triggers.txt index 6269dfb1..4a0078c7 100644 --- a/N3OW/common/scripted_triggers/07_frankokratia_triggers.txt +++ b/N3OW/common/scripted_triggers/07_frankokratia_triggers.txt @@ -414,7 +414,7 @@ ep3_frankokratia_financier_trigger = { ep3_frankokratia_financier_sub_trigger = { highest_held_title_tier >= tier_county - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic ep3_frankokratia_financier_trigger = yes }