From e2686cdbab634ac4739498b4f46457d53d010d50 Mon Sep 17 00:00:00 2001 From: Heidesommer Date: Tue, 19 May 2026 01:49:56 -0400 Subject: [PATCH] Fixing bugs --- .../00_cultural_maa_innovations.txt | 9 +--- .../00_divinity_custom_loc.txt | 16 ++++---- .../00_language_custom_loc.txt | 40 ++++++++---------- common/flavorization/00_title_holders.txt | 20 ++++----- common/on_action/game_start.txt | 4 -- .../peasant_republic_obligations.txt | 22 +++++----- .../portrait_modifiers/01_beards_base.txt | 41 +++++++++++++++++++ history/provinces/e_europa.txt | 2 +- history/provinces/e_germany.txt | 2 + 9 files changed, 92 insertions(+), 64 deletions(-) diff --git a/common/culture/innovations/00_cultural_maa_innovations.txt b/common/culture/innovations/00_cultural_maa_innovations.txt index 1e48785a..5b4f4726 100644 --- a/common/culture/innovations/00_cultural_maa_innovations.txt +++ b/common/culture/innovations/00_cultural_maa_innovations.txt @@ -227,14 +227,12 @@ innovation_repeating_crossbow = { has_dlc = "All Under Heaven" } OR = { - this = culture:tangut has_cultural_parameter = unlock_shenbigong_innovation } } trigger_else = { OR = { has_cultural_pillar = heritage_chinese - this = culture:tangut } } } @@ -259,12 +257,7 @@ innovation_pole_vault = { icon = @weapons_and_armor_01 potential = { - OR = { - this = culture:guanches - any_parent_culture_or_above = { - this = culture:guanches - } - } + always = no } unlock_maa = guanch_vaulter diff --git a/common/customizable_localization/00_divinity_custom_loc.txt b/common/customizable_localization/00_divinity_custom_loc.txt index d807ffce..e82fc608 100644 --- a/common/customizable_localization/00_divinity_custom_loc.txt +++ b/common/customizable_localization/00_divinity_custom_loc.txt @@ -1121,14 +1121,14 @@ GetActualBishopTitle = { highest_held_title_tier >= tier_kingdom faith.religion = faith:folketro.religion } - localization_key = councillor_court_chaplain_folkgerman_religion_kingdom + localization_key = councillor_court_chaplain_germanic_religion_kingdom } text = { trigger = { highest_held_title_tier >= tier_duchy faith.religion = faith:folketro.religion } - localization_key = councillor_court_chaplain_folkgerman_religion_duchy + localization_key = councillor_court_chaplain_germanic_religion_duchy } text = { trigger = { @@ -1140,7 +1140,7 @@ GetActualBishopTitle = { } } } - localization_key = councillor_court_chaplain_folkgerman_religion_county + localization_key = councillor_court_chaplain_germanic_religion_county } text = { trigger = { @@ -1152,7 +1152,7 @@ GetActualBishopTitle = { } } } - localization_key = councillor_court_chaplain_folkgerman_religion_county_female + localization_key = councillor_court_chaplain_germanic_religion_county_female } #Dualism @@ -1984,14 +1984,14 @@ GetActualBishopTitlePossessive = { highest_held_title_tier >= tier_kingdom faith.religion = faith:folketro.religion } - localization_key = councillor_court_chaplain_folkgerman_religion_kingdom_possessive + localization_key = councillor_court_chaplain_germanic_religion_kingdom_possessive } text = { trigger = { highest_held_title_tier >= tier_duchy faith.religion = faith:folketro.religion } - localization_key = councillor_court_chaplain_folkgerman_religion_duchy_possessive + localization_key = councillor_court_chaplain_germanic_religion_duchy_possessive } text = { trigger = { @@ -2003,7 +2003,7 @@ GetActualBishopTitlePossessive = { } } } - localization_key = councillor_court_chaplain_folkgerman_religion_county_possessive + localization_key = councillor_court_chaplain_germanic_religion_county_possessive } text = { trigger = { @@ -2015,7 +2015,7 @@ GetActualBishopTitlePossessive = { } } } - localization_key = councillor_court_chaplain_folkgerman_religion_county_female_possessive + localization_key = councillor_court_chaplain_germanic_religion_county_female_possessive } #Dualism diff --git a/common/customizable_localization/00_language_custom_loc.txt b/common/customizable_localization/00_language_custom_loc.txt index 856a9ee6..14105053 100644 --- a/common/customizable_localization/00_language_custom_loc.txt +++ b/common/customizable_localization/00_language_custom_loc.txt @@ -126,9 +126,9 @@ GetFaithSacredLanguage = { text = { #Could also be Vedic & Old Tamil trigger = { OR = { - religion = religion:hinduism_religion +# religion = religion:hinduism_religion religion = religion:buddhism_religion - religion = religion:jainism_religion +# religion = religion:jainism_religion } } localization_key = language_sanskrit_name #Sanskrit @@ -158,31 +158,27 @@ GetFaithSacredLanguageCharacter = { trigger = { OR = { religion = religion:catholic_religion - faith = faith:conversos - faith = faith:lollard - faith = faith:insular_celtic - faith = faith:mozarabic_church } } localization_key = language_latin_name #Latin } - text = { - trigger = { - faith = faith:cathar - } - localization_key = language_occitano_romance_name #Occitan - } +# text = { +# trigger = { +# faith = faith:cathar +# } +# localization_key = language_occitano_romance_name #Occitan +# } - text = { - trigger = { faith = faith:nestorian } - localization_key = language_aramaic_name #Armaic - } +# text = { +# trigger = { faith = faith:nestorian } +# localization_key = language_aramaic_name #Armaic +# } - text = { - trigger = { faith = faith:armenian_apostolic } - localization_key = language_armenian_name #Armenian - } +# text = { +# trigger = { faith = faith:armenian_apostolic } +# localization_key = language_armenian_name #Armenian +# } text = { trigger = { @@ -241,9 +237,9 @@ GetFaithSacredLanguageCharacter = { text = { #Could also be Vedic & Old Tamil trigger = { OR = { - religion = religion:hinduism_religion +# religion = religion:hinduism_religion religion = religion:buddhism_religion - religion = religion:jainism_religion +# religion = religion:jainism_religion } } localization_key = language_sanskrit_name #Sanskrit diff --git a/common/flavorization/00_title_holders.txt b/common/flavorization/00_title_holders.txt index e6854e47..b198f9fe 100644 --- a/common/flavorization/00_title_holders.txt +++ b/common/flavorization/00_title_holders.txt @@ -921,7 +921,7 @@ empire_theocracy_christianity_religion_orthodox = { # Dualism (same as Christianity) # Germanic -baron_theocracy_male_folkgerman_religion = { +baron_theocracy_male_germanic_religion = { type = character gender = male special = holder @@ -933,7 +933,7 @@ baron_theocracy_male_folkgerman_religion = { governments = { theocracy_government } religions = { folkgerman_religion } } -baron_theocracy_female_folkgerman_religion = { +baron_theocracy_female_germanic_religion = { type = character gender = female special = holder @@ -945,7 +945,7 @@ baron_theocracy_female_folkgerman_religion = { governments = { theocracy_government } religions = { folkgerman_religion } } -barony_theocracy_folkgerman_religion = { +barony_theocracy_germanic_religion = { type = title tier = barony flavourization_rules = { @@ -955,7 +955,7 @@ barony_theocracy_folkgerman_religion = { holding = church_holding religions = { folkgerman_religion hellenism_religion taoism_religion zunism_religion } } -count_theocracy_male_folkgerman_religion = { +count_theocracy_male_germanic_religion = { type = character gender = male special = holder @@ -967,7 +967,7 @@ count_theocracy_male_folkgerman_religion = { governments = { theocracy_government } religions = { folkgerman_religion } } -count_theocracy_female_folkgerman_religion = { +count_theocracy_female_germanic_religion = { type = character gender = female special = holder @@ -979,7 +979,7 @@ count_theocracy_female_folkgerman_religion = { governments = { theocracy_government } religions = { folkgerman_religion } } -county_theocracy_folkgerman_religion = { +county_theocracy_germanic_religion = { type = title tier = county flavourization_rules = { @@ -989,7 +989,7 @@ county_theocracy_folkgerman_religion = { governments = { theocracy_government } religions = { folkgerman_religion hellenism_religion taoism_religion zoroastrianism_religion zunism_religion } } -king_theocracy_male_folkgerman_religion = { +king_theocracy_male_germanic_religion = { type = character gender = male special = holder @@ -1001,7 +1001,7 @@ king_theocracy_male_folkgerman_religion = { governments = { theocracy_government } religions = { folkgerman_religion hellenism_religion } } -king_theocracy_female_folkgerman_religion = { +king_theocracy_female_germanic_religion = { type = character gender = female special = holder @@ -1013,7 +1013,7 @@ king_theocracy_female_folkgerman_religion = { governments = { theocracy_government } religions = { folkgerman_religion hellenism_religion } } -emperor_theocracy_male_folkgerman_religion = { +emperor_theocracy_male_germanic_religion = { type = character gender = male special = holder @@ -1025,7 +1025,7 @@ emperor_theocracy_male_folkgerman_religion = { governments = { theocracy_government } religions = { folkgerman_religion hellenism_religion } } -emperor_theocracy_female_folkgerman_religion = { +emperor_theocracy_female_germanic_religion = { type = character gender = female special = holder diff --git a/common/on_action/game_start.txt b/common/on_action/game_start.txt index b4a871bb..ea01db29 100644 --- a/common/on_action/game_start.txt +++ b/common/on_action/game_start.txt @@ -4256,10 +4256,6 @@ on_game_start_after_lobby = { name = fully_landlocked_nomad_cultures target = culture:kirghiz } - add_to_global_variable_list = { - name = fully_landlocked_nomad_cultures - target = culture:tangut - } add_to_global_variable_list = { name = fully_landlocked_nomad_cultures target = culture:bashkir diff --git a/common/subject_contracts/contracts/peasant_republic_obligations.txt b/common/subject_contracts/contracts/peasant_republic_obligations.txt index 88ce4451..11dc2c63 100644 --- a/common/subject_contracts/contracts/peasant_republic_obligations.txt +++ b/common/subject_contracts/contracts/peasant_republic_obligations.txt @@ -27,7 +27,7 @@ multiply = piety_level } } - scope:liege = { + scope:liege.dynasty = { add = { value = 0.1 multiply = dynasty_prestige_level @@ -64,7 +64,7 @@ multiply = piety_level } } - scope:liege = { + scope:liege.dynasty = { add = { value = 0.1 multiply = dynasty_prestige_level @@ -100,7 +100,7 @@ multiply = piety_level } } - scope:liege = { + scope:liege.dynasty = { add = { value = 0.1 multiply = dynasty_prestige_level @@ -136,7 +136,7 @@ multiply = piety_level } } - scope:liege = { + scope:liege.dynasty = { add = { value = 0.1 multiply = dynasty_prestige_level @@ -219,7 +219,7 @@ multiply = piety_level } } - scope:liege = { + scope:liege.dynasty = { add = { value = 0.1 multiply = dynasty_prestige_level @@ -256,7 +256,7 @@ multiply = piety_level } } - scope:liege = { + scope:liege.dynasty = { add = { value = 0.1 multiply = dynasty_prestige_level @@ -292,7 +292,7 @@ multiply = piety_level } } - scope:liege = { + scope:liege.dynasty = { add = { value = 0.1 multiply = dynasty_prestige_level @@ -354,7 +354,7 @@ multiply = piety_level } } - scope:liege = { + scope:liege.dynasty = { add = { value = 0.1 multiply = dynasty_prestige_level @@ -392,7 +392,7 @@ multiply = piety_level } } - scope:liege = { + scope:liege.dynasty = { add = { value = 0.1 multiply = dynasty_prestige_level @@ -429,7 +429,7 @@ multiply = piety_level } } - scope:liege = { + scope:liege.dynasty = { add = { value = 0.1 multiply = dynasty_prestige_level @@ -465,7 +465,7 @@ multiply = piety_level } } - scope:liege = { + scope:liege.dynasty = { add = { value = 0.1 multiply = dynasty_prestige_level diff --git a/gfx/portraits/portrait_modifiers/01_beards_base.txt b/gfx/portraits/portrait_modifiers/01_beards_base.txt index 92f5988c..d50870aa 100644 --- a/gfx/portraits/portrait_modifiers/01_beards_base.txt +++ b/gfx/portraits/portrait_modifiers/01_beards_base.txt @@ -1778,6 +1778,45 @@ beards = { } } } + ### SP5 Beard ### + + sp5_western_beards = { + dna_modifiers = { + accessory = { + mode = add + gene = beards + template = sp5_western_beards + range = { 0 1 } # For the randomness to work correctly + } + } + weight = { + base = 0 + modifier = { + add = 15 + OR = { + NOT = { exists = this } + has_gene = { + category = gene_hair_type + template = hair_curly + } + has_gene = { + category = gene_hair_type + template = hair_wavy + } + } + OR = { + portrait_western_clothing_trigger = yes + portrait_byzantine_clothing_trigger = yes + } + + has_sp5_dlc_triggers = yes + } + modifier = { + factor = 0 + portrait_western_clothing_trigger = no + } + } + } } @@ -1785,3 +1824,5 @@ beards = { + + diff --git a/history/provinces/e_europa.txt b/history/provinces/e_europa.txt index 6a6067f1..13553c6b 100644 --- a/history/provinces/e_europa.txt +++ b/history/provinces/e_europa.txt @@ -207,7 +207,7 @@ } ###c_terschelling 2412 = { - holding = none + holding = castle_holding culture = frisian religion = mariner } diff --git a/history/provinces/e_germany.txt b/history/provinces/e_germany.txt index 1c6100df..37f3f4e9 100644 --- a/history/provinces/e_germany.txt +++ b/history/provinces/e_germany.txt @@ -1789,6 +1789,8 @@ } ###c_wiesbaden 2693 = { + culture = palatine + religion = einblicker holding = castle_holding } 2854 = {