diff --git a/common/activities/activity_types/coronation.txt b/common/activities/activity_types/coronation.txt index 70508f9a..50fc944c 100644 --- a/common/activities/activity_types/coronation.txt +++ b/common/activities/activity_types/coronation.txt @@ -3969,11 +3969,7 @@ } } scope:host = { - OR = { - faith.religion = religion:eastern_orthodox_religion - faith.religion = religion:catholic_religion - faith.religion = religion:protestant_religion - } + religion = religion:christianity_religion } } texture = "gfx/interface/illustrations/event_scenes/ep2_holysite_western.dds" @@ -3985,13 +3981,7 @@ scope:activity ?= { has_current_phase = coronation_phase_coronation } - scope:host = { - OR = { - faith.religion = religion:eastern_orthodox_religion - faith.religion = religion:catholic_religion - faith.religion = religion:protestant_religion - } - } + scope:host = { religion = religion:christianity_religion } } texture = "gfx/interface/illustrations/event_scenes/church.dds" environment = "environment_event_church" diff --git a/common/character_interactions/NEOW_modified_interactions.txt b/common/character_interactions/NEOW_modified_interactions.txt index 07d16769..22741fff 100644 --- a/common/character_interactions/NEOW_modified_interactions.txt +++ b/common/character_interactions/NEOW_modified_interactions.txt @@ -503,13 +503,13 @@ ep3_hof_ask_for_influence_interaction = { value = 0 if = { limit = { - scope:actor.house ?= { has_house_aspiration_parameter= increased_clerical_influence_acceptance_3 } + scope:actor.house ?= { has_house_power_parameter = increased_clerical_influence_acceptance_3 } } add = increased_clerical_influence_acceptance_3_value } else_if = { limit = { - scope:actor.house ?= { has_house_aspiration_parameter= increased_clerical_influence_acceptance_2 } + scope:actor.house ?= { has_house_power_parameter = increased_clerical_influence_acceptance_2 } } add = increased_clerical_influence_acceptance_2_value } @@ -519,9 +519,9 @@ ep3_hof_ask_for_influence_interaction = { } scope:actor.house ?= { OR = { - has_house_aspiration_parameter= increased_clerical_influence_acceptance_1 - has_house_aspiration_parameter= increased_clerical_influence_acceptance_2 - has_house_aspiration_parameter= increased_clerical_influence_acceptance_3 + has_house_power_parameter = increased_clerical_influence_acceptance_1 + has_house_power_parameter = increased_clerical_influence_acceptance_2 + has_house_power_parameter = increased_clerical_influence_acceptance_3 } } desc = you_have_faithful_nobles_attribute_with_value_desc diff --git a/common/council_tasks/00_spymaster_tasks.txt b/common/council_tasks/00_spymaster_tasks.txt index 9ecfcdc0..9663457c 100644 --- a/common/council_tasks/00_spymaster_tasks.txt +++ b/common/council_tasks/00_spymaster_tasks.txt @@ -39,7 +39,7 @@ } triggered_desc = { trigger = { - scope:councillor_liege.house = { has_house_aspiration_parameter= determination_spymaster_task_disrupt_schemes_efficiency } + scope:councillor_liege.house = { has_house_power_parameter = determination_spymaster_task_disrupt_schemes_efficiency } } desc = determination_spymaster_hostile_scheme_resistance_task_disrupt_schemes } @@ -69,7 +69,7 @@ } triggered_desc = { trigger = { - scope:councillor_liege.house = { has_house_aspiration_parameter= determination_spymaster_task_disrupt_schemes_efficiency } + scope:councillor_liege.house = { has_house_power_parameter = determination_spymaster_task_disrupt_schemes_efficiency } } desc = determination_spymaster_discovery_task_disrupt_schemes } @@ -250,7 +250,7 @@ task_support_schemes = { # Determination House Aspiration - Hostile Scheme Phase Length triggered_desc = { trigger = { - scope:councillor_liege.house = { has_house_aspiration_parameter= determination_spymaster_task_support_schemes_efficiency } + scope:councillor_liege.house = { has_house_power_parameter = determination_spymaster_task_support_schemes_efficiency } } desc = determination_spymaster_task_support_schemes_bonus } @@ -282,7 +282,7 @@ task_support_schemes = { # Determination House Aspiration - Hostile Scheme Success Chance triggered_desc = { trigger = { - scope:councillor_liege.house = { has_house_aspiration_parameter= determination_spymaster_task_support_schemes_efficiency } + scope:councillor_liege.house = { has_house_power_parameter = determination_spymaster_task_support_schemes_efficiency } } desc = determination_spymaster_task_support_schemes_success_chance_bonus } @@ -559,7 +559,7 @@ task_find_secrets = { # Determination House Aspiration if = { limit = { - scope:councillor_liege.house ?= { has_house_aspiration_parameter= determination_spymaster_task_find_secrets_efficiency } + scope:councillor_liege.house ?= { has_house_power_parameter = determination_spymaster_task_find_secrets_efficiency } } add = { value = spymaster_determination_house_aspiration_find_secrets_total diff --git a/common/culture/cultures/NEOW_west_slavic.txt b/common/culture/cultures/NEOW_west_slavic.txt index 484c3870..2d03ba78 100644 --- a/common/culture/cultures/NEOW_west_slavic.txt +++ b/common/culture/cultures/NEOW_west_slavic.txt @@ -127,7 +127,7 @@ NEOW_slovak = { ethos = ethos_egalitarian heritage = heritage_west_slavic - language = NEOW_language_slovak + language = language_czech_slovak martial_custom = martial_custom_male_only head_determination = head_determination_domain traditions = { diff --git a/common/culture/pillars/NEOW_language.txt b/common/culture/pillars/NEOW_language.txt index ab376689..5bc5978a 100644 --- a/common/culture/pillars/NEOW_language.txt +++ b/common/culture/pillars/NEOW_language.txt @@ -31,7 +31,7 @@ language_frisian = { } } - color = { 226 141 56 } + color = { 229 168 45 } } NEOW_language_latvian = { @@ -54,7 +54,7 @@ NEOW_language_latvian = { } } - color = latvian + color = { 0.5 0.5 0.1 } } NEOW_language_lithuanian = { type = language @@ -97,7 +97,7 @@ NEOW_language_irish = { } } - color = irish + color = { 64 105 65 } } NEOW_language_manx = { type = language @@ -635,7 +635,7 @@ NEOW_language_slovene = { } } - color = slovene + color = { 0.5 0.1 0.08 } } NEOW_language_north_helvetic = { type = language @@ -1120,7 +1120,7 @@ NEOW_language_catalan = { } } - color = catalan + color = { 204 54 40 } } NEOW_language_occitan = { type = language @@ -1163,7 +1163,7 @@ NEOW_language_aragonese = { } } - color = aragonese + color = { 204 54 40 } } NEOW_language_asturleonese = { type = language @@ -1185,7 +1185,7 @@ NEOW_language_asturleonese = { } } - color = asturleonese + color = { 204 54 40 } } NEOW_language_balearic = { type = language @@ -1206,7 +1206,7 @@ NEOW_language_balearic = { } } - color = balearic + color = { 204 54 40 } } NEOW_language_basque = { type = language @@ -1228,7 +1228,7 @@ NEOW_language_basque = { } } - color = basque + color = { 204 54 40 } } NEOW_language_castillian = { type = language @@ -1249,7 +1249,7 @@ NEOW_language_castillian = { } } - color = castilian + color = { 204 54 40 } } NEOW_language_valencian = { type = language @@ -1271,7 +1271,7 @@ NEOW_language_valencian = { } } - color = valencian + color = { 204 54 40 } } NEOW_language_portuguese = { type = language @@ -1292,7 +1292,7 @@ NEOW_language_portuguese = { } } - color = portuguese + color = { 204 54 40 } } NEOW_language_canarian = { type = language @@ -1313,7 +1313,7 @@ NEOW_language_canarian = { } } - color = canarian + color = { 204 54 40 } } NEOW_language_andalusian = { type = language @@ -1335,7 +1335,7 @@ NEOW_language_andalusian = { } } - color = andalusian + color = { 204 54 40 } } NEOW_language_llanito = { type = language @@ -1358,7 +1358,7 @@ NEOW_language_llanito = { } } - color = llanito + color = { 204 54 40 } } NEOW_language_galician = { type = language @@ -1380,7 +1380,7 @@ NEOW_language_galician = { } } - color = galician + color = { 204 54 40 } } NEOW_language_extremeno = { type = language @@ -1402,7 +1402,7 @@ NEOW_language_extremeno = { } } - color = extremeno + color = { 204 54 40 } } NEOW_language_weslander = { type = language @@ -1595,7 +1595,7 @@ NEOW_language_swabian = { } } - color = swabian + color = { 204 54 40 } } NEOW_language_saxon = { type = language @@ -1829,7 +1829,7 @@ NEOW_language_bavarian = { } } - color = bavarian + color = { 204 54 40 } } NEOW_language_alpine_bavarian = { type = language @@ -2203,7 +2203,7 @@ language_hispanophonic = { } } - color = castilian + color = { 229 45 45 } } language_kipchak_bulgar = { type = language @@ -2277,7 +2277,7 @@ language_lusophonic = { } } - color = portuguese + color = { 19 127 19 } } language_nordic = { type = language @@ -2806,7 +2806,7 @@ NEOW_language_slovak = { } } - color = slovak + color = { 0.35 0.8 0.8 } } NEOW_language_polish = { type = language diff --git a/common/customizable_localization/00_artifact_court_custom_loc.txt b/common/customizable_localization/00_artifact_court_custom_loc.txt index 26cd5e6b..feebfe24 100644 --- a/common/customizable_localization/00_artifact_court_custom_loc.txt +++ b/common/customizable_localization/00_artifact_court_custom_loc.txt @@ -900,22 +900,14 @@ PredeterminedSaintName = { # Used for icons and any future artifacts that uses t text = { trigger = { var:saint ?= flag:fallback - OR = { - faith.religion = religion:eastern_orthodox_religion - faith.religion = religion:catholic_religion - faith.religion = religion:protestant_religion - } + religion = religion:christianity_religion } localization_key = west_christian_fallback_god_name } text = { trigger = { var:saint ?= flag:fallback - NOR = { - faith.religion = religion:eastern_orthodox_religion - faith.religion = religion:catholic_religion - faith.religion = religion:protestant_religion - } + religion != religion:christianity_religion } localization_key = generic_religious_figure_fallback_name fallback = yes diff --git a/common/customizable_localization/00_divinity_custom_loc.txt b/common/customizable_localization/00_divinity_custom_loc.txt index ed427c62..e82fc608 100644 --- a/common/customizable_localization/00_divinity_custom_loc.txt +++ b/common/customizable_localization/00_divinity_custom_loc.txt @@ -2426,12 +2426,7 @@ GetReligiousRite = { text = { localization_key = rite_mass - trigger = { OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } - } + trigger = { faith = { religion = religion:christianity_religion } } } text = { localization_key = rite_prayer diff --git a/common/customizable_localization/00_insult_custom_loc.txt b/common/customizable_localization/00_insult_custom_loc.txt index 83749c31..4ad995a0 100644 --- a/common/customizable_localization/00_insult_custom_loc.txt +++ b/common/customizable_localization/00_insult_custom_loc.txt @@ -1009,11 +1009,7 @@ InsultAdjective = { trigger = { scope:second = { knows_language = language_greek - OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } + religion = religion:christianity_religion } } } @@ -1424,11 +1420,7 @@ InsultAdjectiveArticle = { trigger = { scope:second = { knows_language = language_greek - OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } + religion = religion:christianity_religion } } } diff --git a/common/customizable_localization/00_language_custom_loc.txt b/common/customizable_localization/00_language_custom_loc.txt index 89f1f0dc..14105053 100644 --- a/common/customizable_localization/00_language_custom_loc.txt +++ b/common/customizable_localization/00_language_custom_loc.txt @@ -71,11 +71,11 @@ GetFaithSacredLanguage = { text = { trigger = { - OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } + OR = { + faith = faith:orthodox + faith = faith:coptic + religion = religion:christianity_religion #fallback for all Christian Faiths + } } localization_key = language_greek_name #Greek } @@ -182,11 +182,11 @@ GetFaithSacredLanguageCharacter = { text = { trigger = { - OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } + OR = { + faith = faith:orthodox + faith = faith:coptic + religion = religion:christianity_religion #fallback for all Christian Faiths + } } localization_key = language_greek_name #Greek } diff --git a/common/customizable_localization/00_roaming_loc.txt b/common/customizable_localization/00_roaming_loc.txt index ec582a63..04e363e0 100644 --- a/common/customizable_localization/00_roaming_loc.txt +++ b/common/customizable_localization/00_roaming_loc.txt @@ -525,11 +525,7 @@ RoamingGraveVariants = { text = { trigger = { - OR = { - faith.religion = religion:eastern_orthodox_religion - faith.religion = religion:catholic_religion - faith.religion = religion:protestant_religion - } + religion = religion:christianity_religion } localization_key = roaming_grave_variant_cross } diff --git a/common/customizable_localization/10_ach_custom_loc.txt b/common/customizable_localization/10_ach_custom_loc.txt index ed7e6ae5..55307256 100644 --- a/common/customizable_localization/10_ach_custom_loc.txt +++ b/common/customizable_localization/10_ach_custom_loc.txt @@ -745,11 +745,7 @@ GetCoronationSite = { text = { # Palatine Chapel in Aachen trigger = { - OR = { - faith.religion = religion:eastern_orthodox_religion - faith.religion = religion:catholic_religion - faith.religion = religion:protestant_religion - } + religion = religion:christianity_religion has_special_building = yes has_building_or_higher = palace_of_aachen_01 } diff --git a/common/decisions/NEOW_artifact_decisions.txt b/common/decisions/NEOW_artifact_decisions.txt index ce7b5b9e..1f6c9c04 100644 --- a/common/decisions/NEOW_artifact_decisions.txt +++ b/common/decisions/NEOW_artifact_decisions.txt @@ -25,7 +25,7 @@ reforge_crown_wenceslas_decision = { custom_tooltip = { text = must_have_crown_wenceslas any_character_artifact = { - has_variable = crown_wenceslas + has_name = crown_wenceslas_name } } } @@ -38,14 +38,12 @@ reforge_crown_wenceslas_decision = { effect = { if = { limit = { - any_character_artifact = { - has_variable = crown_wenceslas - } + has_name = crown_wenceslas_name } every_character_artifact = { - limit = { - has_variable = crown_wenceslas - } + limit = { + has_name = crown_wenceslas_name + } destroy_artifact = this } set_artifact_rarity_illustrious = yes diff --git a/common/flavorization/00_title_holders.txt b/common/flavorization/00_title_holders.txt index ff823aa4..b198f9fe 100644 --- a/common/flavorization/00_title_holders.txt +++ b/common/flavorization/00_title_holders.txt @@ -680,7 +680,7 @@ baron_theocracy_male_christianity_religion = { tier = barony priority = 7 governments = { theocracy_government } - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } flavourization_rules = { top_liege = no } @@ -692,7 +692,7 @@ baron_theocracy_female_christianity_religion = { tier = barony priority = 7 governments = { theocracy_government } - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } flavourization_rules = { top_liege = no } @@ -702,7 +702,7 @@ barony_theocracy_christianity_religion = { tier = barony priority = 7 holding = church_holding - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } flavourization_rules = { top_liege = no } @@ -714,7 +714,7 @@ count_theocracy_male_christianity_religion = { tier = county priority = 18 governments = { theocracy_government } - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } flavourization_rules = { top_liege = no } @@ -726,7 +726,7 @@ count_theocracy_female_christianity_religion = { tier = county priority = 18 governments = { theocracy_government } - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } flavourization_rules = { top_liege = no } @@ -736,7 +736,7 @@ county_theocracy_christianity_religion = { tier = county priority = 18 governments = { theocracy_government } - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } flavourization_rules = { top_liege = no } @@ -748,7 +748,7 @@ duke_theocracy_male_christianity_religion = { tier = duchy priority = 27 governments = { theocracy_government } - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } flavourization_rules = { top_liege = no } @@ -760,7 +760,7 @@ duke_theocracy_female_christianity_religion = { tier = duchy priority = 27 governments = { theocracy_government } - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } flavourization_rules = { top_liege = no } @@ -770,7 +770,7 @@ duchy_theocracy_christianity_religion = { tier = duchy priority = 27 governments = { theocracy_government } - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } flavourization_rules = { top_liege = no } @@ -785,7 +785,7 @@ king_theocracy_male_christianity_religion = { top_liege = no } governments = { theocracy_government } - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } } king_theocracy_female_christianity_religion = { type = character @@ -797,7 +797,7 @@ king_theocracy_female_christianity_religion = { top_liege = no } governments = { theocracy_government } - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } } kingdom_theocracy_christianity_religion = { type = title @@ -807,7 +807,7 @@ kingdom_theocracy_christianity_religion = { } priority = 47 governments = { theocracy_government } - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } } emperor_theocracy_male_christianity_religion = { type = character @@ -819,7 +819,7 @@ emperor_theocracy_male_christianity_religion = { top_liege = no } governments = { theocracy_government } - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } } emperor_theocracy_female_christianity_religion = { type = character @@ -831,7 +831,7 @@ emperor_theocracy_female_christianity_religion = { top_liege = no } governments = { theocracy_government } - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } } empire_theocracy_christianity_religion = { type = title @@ -841,7 +841,7 @@ empire_theocracy_christianity_religion = { top_liege = no } governments = { theocracy_government } - religions = { eastern_orthodox_religion catholic_religion protestant_religion dualism_religion } + religions = { christianity_religion dualism_religion } } #Eastern Christians @@ -855,7 +855,7 @@ king_theocracy_male_christianity_religion_orthodox = { top_liege = no } governments = { theocracy_government } - religions = { eastern_orthodox_religion } + faiths = { orthodox armenian_apostolic coptic nestorian bogomilist iconoclast paulician messalian } } king_theocracy_female_christianity_religion_orthodox = { type = character @@ -868,7 +868,7 @@ king_theocracy_female_christianity_religion_orthodox = { } governments = { theocracy_government } religions = { christianity_religion } - religions = { eastern_orthodox_religion } + faiths = { orthodox armenian_apostolic coptic nestorian bogomilist iconoclast paulician messalian } } kingdom_theocracy_christianity_religion_orthodox = { type = title @@ -878,7 +878,8 @@ kingdom_theocracy_christianity_religion_orthodox = { } priority = 60 governments = { theocracy_government } - religions = { eastern_orthodox_religion } + religions = { christianity_religion } + faiths = { orthodox armenian_apostolic coptic nestorian bogomilist iconoclast paulician messalian } } emperor_theocracy_male_christianity_religion_orthodox = { type = character @@ -889,7 +890,8 @@ emperor_theocracy_male_christianity_religion_orthodox = { flavourization_rules = { top_liege = no } - religions = { eastern_orthodox_religion } + governments = { theocracy_government } + faiths = { orthodox armenian_apostolic coptic nestorian bogomilist iconoclast paulician messalian } } emperor_theocracy_female_christianity_religion_orthodox = { type = character @@ -901,7 +903,8 @@ emperor_theocracy_female_christianity_religion_orthodox = { top_liege = no } governments = { theocracy_government } - religions = { eastern_orthodox_religion } + religions = { christianity_religion } + faiths = { orthodox armenian_apostolic coptic nestorian bogomilist iconoclast paulician messalian } } empire_theocracy_christianity_religion_orthodox = { type = title @@ -911,7 +914,8 @@ empire_theocracy_christianity_religion_orthodox = { } priority = 107 governments = { theocracy_government } - religions = { eastern_orthodox_religion } + religions = { christianity_religion } + faiths = { orthodox armenian_apostolic coptic nestorian bogomilist iconoclast paulician messalian } } # Dualism (same as Christianity) diff --git a/common/landed_titles/iberia.txt b/common/landed_titles/iberia.txt index 718b23f1..81b8c7c6 100644 --- a/common/landed_titles/iberia.txt +++ b/common/landed_titles/iberia.txt @@ -2986,6 +2986,7 @@ e_iberia = { } k_canarias = { # The Canaries color = { 242 231 125 } + cultural_names = { capital = c_canarias # Las Palmas definite_form = yes diff --git a/common/landed_titles/religious_titles.txt b/common/landed_titles/religious_titles.txt index 8349536c..1b33b660 100644 --- a/common/landed_titles/religious_titles.txt +++ b/common/landed_titles/religious_titles.txt @@ -1,9 +1,4 @@  -@correct_culture_primary_score = 100 -@better_than_the_alternatives_score = 50 -@always_primary_score = 1000 -@never_primary_score = -1000 - # special titles k_papal_state = { color = { 255 249 198 } diff --git a/common/landed_titles/russia.txt b/common/landed_titles/russia.txt index 273a3692..fd471775 100644 --- a/common/landed_titles/russia.txt +++ b/common/landed_titles/russia.txt @@ -1,10 +1,4 @@ - -@correct_culture_primary_score = 100 -@better_than_the_alternatives_score = 50 -@always_primary_score = 1000 -@never_primary_score = -1000 - -e_zapadnorussia = { #Western Russia like westslavia +e_zapadnorussia = { #Western Russia like westslavia color = { 44 81 44 } capital = c_moskva diff --git a/common/landed_titles/visegrad.txt b/common/landed_titles/visegrad.txt index b33604bf..ba5ead14 100644 --- a/common/landed_titles/visegrad.txt +++ b/common/landed_titles/visegrad.txt @@ -1,5 +1,4 @@ - -@correct_culture_primary_score = 100 +@correct_culture_primary_score = 100 @better_than_the_alternatives_score = 50 @always_primary_score = 1000 @never_primary_score = -1000 diff --git a/common/named_colors/culture_colors.txt b/common/named_colors/culture_colors.txt index bc54ddc8..2576332b 100644 --- a/common/named_colors/culture_colors.txt +++ b/common/named_colors/culture_colors.txt @@ -2,13 +2,10 @@ colors = { # used by cultures and languages english = { 0.8 0.2 0.2 } bedouin = { 0.1 0.75 0.1 } + swabian = { 0.7 0.7 0.7 } polish = { 0.3 0.6 0.6 } assyrian = { 0.82 0.83 0.53 } - #Baltic - lithuanian = { 153 96 22 } - latvian = { 76 19 36 } - #British - irish = { 64 105 65 } + lithuanian = { 0.56 0.55 0.2 } basque = { 0.55 0.42 0.04 } baranis = { 161 67 0 } welsh = hsv{ 0.68 0.6 0.72 } @@ -25,6 +22,7 @@ colors = { french = { 0.1 0.1 0.6 } gaelic = hsv{ 0.50 0.90 0.57 } gur = hsv{ 0.62 0.9 0.7 } + castilian = { 0.95 0.82 0.09 } hindustani = { 1.0 0.0 0.0 } marathi = { 0.8 0.2 0.0 } bengali = { 0.45 0.0 0.0 } @@ -62,27 +60,6 @@ colors = { yoruba = hsv{ 0.45 0.7 0.7 } armenian = hsv{ 0.01 0.95 0.7 } greek = { 0.8 0.3 0.8 } - #Germanic #################################################### - swabian = { 54 86 43 } - bavarian = { 0 187 255 } - #South Slavic #################################################### - slovene = { 43 118 216 } - #Iberian #################################################### - andalusian = { 221 239 119 } - aragonese = { 193 152 29 } - asturleonese = { 255 241 89 } - balearic = { 255 241 89 } - basque = { 153 71 30 } - canarian = { 221 239 89 } - castilian = { 0.95 0.82 0.09 } - catalan = { 193 107 20 } - extremeno = { 163 163 32 } - galician = { 177 211 63 } - llanito = { 229 95 68 } - portuguese = { 65 102 10 } - valencian = { 232 160 61 } - #West Slavic #################################################### - slovak = { 0.3 0.6 0.5 } afghan = { 0.6 0.6 0.1 } georgian = hsv{ 0.01 0.8 0.88 } occitan = { 0.1 0.7 0.8 } diff --git a/common/on_action/game_start.txt b/common/on_action/game_start.txt index 0db78796..920e5fae 100644 --- a/common/on_action/game_start.txt +++ b/common/on_action/game_start.txt @@ -646,97 +646,97 @@ on_game_start = { } } } -# religion:shintoism_religion = { -# every_faith = { -# every_holy_site = { -# limit = { -# title_province = { -# has_special_building_slot = no -# } -# } -# title_province = { -# add_special_building_slot = holy_site_japanese_temple_01 -# } -# } -# } -# } -# religion:taoism_religion = { -# every_faith = { -# every_holy_site = { -# limit = { -# title_province = { -# has_special_building_slot = no -# } -# } -# title_province = { -# add_special_building_slot = holy_site_chinese_temple_01 -# } -# } -# } -# } -# religion:confucianism_religion = { -# every_faith = { -# every_holy_site = { -# limit = { -# title_province = { -# has_special_building_slot = no -# } -# } -# title_province = { -# add_special_building_slot = holy_site_chinese_temple_01 -# } -# } -# } -# } -# every_religion_global = { -# limit = { -# OR = { -# this = religion:hinduism_religion -# this = religion:jainism_religion -# this = religion:tani_religion -# this = religion:bon_religion -# } -# } -# every_faith = { -# every_holy_site = { -# limit = { -# title_province = { -# has_special_building_slot = no -# } -# } -# title_province = { -# add_special_building_slot = holy_site_indian_grand_temple_01 -# } -# } -# } -# } -# every_religion_global = { -# limit = { -# OR = { -# this = religion:satsana_phi_religion -# this = religion:dayawism_religion -# this = religion:hantuism_religion -# this = religion:satsana_phi_religion -# this = religion:kaharingan_religion -# this = religion:tolotang_religion -# this = religion:aluk_religion -# this = religion:dab_qhuas_religion -# this = religion:biliku_religion -# } -# } -# every_faith = { -# every_holy_site = { -# limit = { -# title_province = { -# has_special_building_slot = no -# } -# } -# title_province = { -# add_special_building_slot = holy_site_se_asia_pagan_temple_01 -# } -# } -# } -# } + religion:shintoism_religion = { + every_faith = { + every_holy_site = { + limit = { + title_province = { + has_special_building_slot = no + } + } + title_province = { + add_special_building_slot = holy_site_japanese_temple_01 + } + } + } + } + religion:taoism_religion = { + every_faith = { + every_holy_site = { + limit = { + title_province = { + has_special_building_slot = no + } + } + title_province = { + add_special_building_slot = holy_site_chinese_temple_01 + } + } + } + } + religion:confucianism_religion = { + every_faith = { + every_holy_site = { + limit = { + title_province = { + has_special_building_slot = no + } + } + title_province = { + add_special_building_slot = holy_site_chinese_temple_01 + } + } + } + } + every_religion_global = { + limit = { + OR = { + this = religion:hinduism_religion + this = religion:jainism_religion + this = religion:tani_religion + this = religion:bon_religion + } + } + every_faith = { + every_holy_site = { + limit = { + title_province = { + has_special_building_slot = no + } + } + title_province = { + add_special_building_slot = holy_site_indian_grand_temple_01 + } + } + } + } + every_religion_global = { + limit = { + OR = { + this = religion:satsana_phi_religion + this = religion:dayawism_religion + this = religion:hantuism_religion + this = religion:satsana_phi_religion + this = religion:kaharingan_religion + this = religion:tolotang_religion + this = religion:aluk_religion + this = religion:dab_qhuas_religion + this = religion:biliku_religion + } + } + every_faith = { + every_holy_site = { + limit = { + title_province = { + has_special_building_slot = no + } + } + title_province = { + add_special_building_slot = holy_site_se_asia_pagan_temple_01 + } + } + } + } every_religion_global = { limit = { is_in_family = rf_pagan diff --git a/common/script_values/00_culture_values.txt b/common/script_values/00_culture_values.txt index eb2a166d..9d51979d 100644 --- a/common/script_values/00_culture_values.txt +++ b/common/script_values/00_culture_values.txt @@ -692,16 +692,8 @@ court_language_ai_score = { } else_if = { #Christian cares about other Christians - especially of the same faith limit = { - OR = { - faith.religion = religion:eastern_orthodox_religion - faith.religion = religion:catholic_religion - faith.religion = religion:protestant_religion - } - OR = { - scope:target.faith.religion = religion:eastern_orthodox_religion - scope:target.faith.religion = religion:catholic_religion - scope:target.faith.religion = religion:protestant_religion - } + faith.religion = religion:christianity_religion + scope:target.faith.religion = religion:christianity_religion } add = { value = scope:target.court_grandeur_current @@ -740,9 +732,7 @@ court_language_ai_score = { limit = { OR = { faith.religion = religion:islam_religion - faith.religion = religion:eastern_orthodox_religion - faith.religion = religion:catholic_religion - faith.religion = religion:protestant_religion + faith.religion = religion:christianity_religion } faith.religion != scope:target.faith.religion } diff --git a/common/script_values/01_starting_values.txt b/common/script_values/01_starting_values.txt index f9d910f9..0dcf9ecb 100644 --- a/common/script_values/01_starting_values.txt +++ b/common/script_values/01_starting_values.txt @@ -503,28 +503,28 @@ starting_merit = { # root = culture 1 # scope:culture = culture 2 starting_culture_acceptance = { -# # Cultures start with the baseline as their default acceptance -# value = culture_acceptance_baseline -# -# # Historical one-time increases to Cultural Acceptance (added on top of the baseline) -# # Note: List the cultures in the same order as they appear in script in common\culture\cultures. -# if = { -# limit = { current_date >= 1060.1.1 } # Changes for the 1066 bookmark -# if = { -# limit = { # The Ghaznavids have ruled over Afghan land for a few generations - Let's help them keep it -# this = culture:afghan -# scope:culture = culture:turkish -# } -# add = 25 -# } -# if = { -# limit = { # The Ghaznavids have ruled over Punjabi land for some time - We don't want them to revolt too quickly -# this = culture:punjabi -# scope:culture = culture:turkish -# } -# add = 20 -# } -# } + # Cultures start with the baseline as their default acceptance + value = culture_acceptance_baseline + + # Historical one-time increases to Cultural Acceptance (added on top of the baseline) + # Note: List the cultures in the same order as they appear in script in common\culture\cultures. + if = { + limit = { current_date >= 1060.1.1 } # Changes for the 1066 bookmark + if = { + limit = { # The Ghaznavids have ruled over Afghan land for a few generations - Let's help them keep it + this = culture:afghan + scope:culture = culture:turkish + } + add = 25 + } + if = { + limit = { # The Ghaznavids have ruled over Punjabi land for some time - We don't want them to revolt too quickly + this = culture:punjabi + scope:culture = culture:turkish + } + add = 20 + } + } } # What cultural acceptance should two cultures drift down towards if above? diff --git a/common/scripted_character_templates/00_scripted_character_templates.txt b/common/scripted_character_templates/00_scripted_character_templates.txt index 10c42ecf..475f2e88 100644 --- a/common/scripted_character_templates/00_scripted_character_templates.txt +++ b/common/scripted_character_templates/00_scripted_character_templates.txt @@ -2,8 +2,8 @@ age = { 20 40 } dynasty = none random_traits = yes - culture = culture:metropolitain - faith = faith:carolingian + culture = culture:frankish + religion = religion:catholic_religion martial = { min_template_high_skill max_template_high_skill diff --git a/common/scripted_triggers/00_available_for_events_triggers.txt b/common/scripted_triggers/00_available_for_events_triggers.txt index 8f607a7d..3301213f 100644 --- a/common/scripted_triggers/00_available_for_events_triggers.txt +++ b/common/scripted_triggers/00_available_for_events_triggers.txt @@ -922,9 +922,7 @@ roman_restoration_is_valid_roman_empire_trigger = { is_ai = no is_roman_emperor_trigger = yes OR = { - faith.religion = religion:eastern_orthodox_religion - faith.religion = religion:catholic_religion - faith.religion = religion:protestant_religion + religion = religion:christianity_religion #Either Christian religion = religion:hellenism_religion #Or Hellenic } NOT = { has_ep3_dlc_trigger = yes } diff --git a/common/scripted_triggers/00_building_requirement_triggers.txt b/common/scripted_triggers/00_building_requirement_triggers.txt index 2617338f..4640b2e8 100644 --- a/common/scripted_triggers/00_building_requirement_triggers.txt +++ b/common/scripted_triggers/00_building_requirement_triggers.txt @@ -868,11 +868,7 @@ religious_special_building_exclusion_trigger = { # checks if any special buildin islamic_special_building_trigger = yes } AND = { # Christian - NOR = { - barony.holder.religion:eastern_orthodox_religion - barony.holder.religion:catholic_religion - barony.holder.religion:protestant_religion - } + NOT = { barony.holder.religion = religion:christianity_religion } christian_special_building_trigger = yes } AND = { # Islamic/Zoroastrian diff --git a/common/scripted_triggers/00_clothing_triggers.txt b/common/scripted_triggers/00_clothing_triggers.txt index aa5f5ce4..c6a4a914 100644 --- a/common/scripted_triggers/00_clothing_triggers.txt +++ b/common/scripted_triggers/00_clothing_triggers.txt @@ -437,19 +437,11 @@ portrait_wear_no_crown_trigger = { # Rulers should be coronated to wear a crown portrait_wear_christian_holy_order_trigger = { # Christian holy order members/vassals should wear different armor OR = { AND = { # Is a Christian holy order member - OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } + religion = religion:christianity_religion government_has_flag = government_is_holy_order } AND = { # Is a Christian holy order vassal - OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } + religion = religion:christianity_religion is_playable_character = no portrait_wear_armor_trigger = yes liege ?= { government_has_flag = government_is_holy_order } @@ -731,11 +723,7 @@ portrait_fp2_iberian_christian_clothing_trigger = { trigger_if = { limit = { exists = this } AND = { - OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } + religion = religion:christianity_religion capital_province ?= { geographical_region = world_europe_west_iberia } @@ -752,11 +740,7 @@ portrait_fp2_iberian_christian_clothing_spouse_trigger = { CULTURE_FLAG = iberian_christian } AND = { - OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } + religion = religion:christianity_religion capital_province ?= { geographical_region = world_europe_west_iberia } @@ -2624,19 +2608,11 @@ portrait_war_nobles_helmet_trigger = { portrait_$CULTURE_INPUT$_clothing_trigger = yes NOR = { AND = { - OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } + religion = religion:christianity_religion government_has_flag = government_is_holy_order } AND = { - OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } + religion = religion:christianity_religion is_playable_character = no portrait_wear_armor_trigger = yes liege ?= { @@ -2644,11 +2620,7 @@ portrait_war_nobles_helmet_trigger = { } } AND = { - OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } + religion = religion:christianity_religion portrait_wear_armor_trigger = yes OR = { any_character_war = { @@ -2697,19 +2669,11 @@ portrait_western_crusades_trigger = { exists = this OR = { AND = { - OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } + religion = religion:christianity_religion government_has_flag = government_is_holy_order } AND = { - OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } + religion = religion:christianity_religion is_playable_character = no portrait_wear_armor_trigger = yes liege ?= { @@ -2717,11 +2681,7 @@ portrait_western_crusades_trigger = { } } AND = { - OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion - } + religion = religion:christianity_religion portrait_wear_armor_trigger = yes OR = { any_character_war = { @@ -2997,6 +2957,7 @@ portrait_religious_head_popes_trigger = { faith = faith:roman_catholic } is_adult = yes + religion = religion:christianity_religion primary_title ?= { is_head_of_faith = yes } diff --git a/common/scripted_triggers/00_religious_triggers.txt b/common/scripted_triggers/00_religious_triggers.txt index 89a6c777..34df912b 100644 --- a/common/scripted_triggers/00_religious_triggers.txt +++ b/common/scripted_triggers/00_religious_triggers.txt @@ -1161,9 +1161,7 @@ barony_is_valid_for_holy_order_lease_cancellation_trigger = { religion_has_angels_trigger = { OR = { - religion = religion:eastern_orthodox_religion - religion = religion:catholic_religion - religion = religion:protestant_religion + religion = religion:christianity_religion religion = religion:islam_religion religion = religion:zoroastrianism_religion religion = religion:dualism_religion @@ -2038,8 +2036,7 @@ broadly_dharmic_trigger = { } } -south_east_asian_pagan_trigger = { - always = no +#south_east_asian_pagan_trigger = { # OR = { # faith.religion = religion:aluk_religion # faith.religion = religion:dayawism_religion @@ -2048,8 +2045,8 @@ south_east_asian_pagan_trigger = { # faith.religion = religion:tolotang_religion # faith.religion = religion:biliku_religion # } -} - +#} +# broadly_jungle_dwelling_trigger = { culture = { OR = { @@ -2065,13 +2062,12 @@ broadly_jungle_dwelling_trigger = { } } -broadly_chinese_religion_trigger = { - always = no +#broadly_chinese_religion_trigger = { # OR = { # faith.religion = religion:taoism_religion # faith.religion = religion:confucianism_religion # } -} +#} broadly_mainland_east_asian_heritage_trigger = { culture = { diff --git a/gui/portraits.gui b/gui/portraits.gui index d206a016..bbbcfee0 100644 --- a/gui/portraits.gui +++ b/gui/portraits.gui @@ -1302,7 +1302,7 @@ types PortraitTypes portrait_texture = "[Character.GetAnimatedPortrait(Illustration.GetEnvironment(Character.Self), 'camera_character_view_main', 'idle', PdxGetWidgetScreenSize(PdxGuiWidget.Self))]" mask = "gfx/portraits/portrait_mask_character_view.dds" effectname = "NoHighlight" - visible = "[And(Character.Character.GetGovernment.HasGovernmentFlag( 'government_is_herder', Character.HasLandedTitles) )]" + visible = "[And(Character.Character.GetGovernment.HasGovernmentFlag( 'government_is_herder', Character.HasLandedTitles)]" block "prison_bars" { highlight_icon = { diff --git a/localization/english/replace/zz_NEOW_decisions_l_english.yml b/localization/english/replace/zz_NEOW_decisions_l_english.yml index 815ed1e5..c3c77b8a 100644 --- a/localization/english/replace/zz_NEOW_decisions_l_english.yml +++ b/localization/english/replace/zz_NEOW_decisions_l_english.yml @@ -1567,7 +1567,7 @@ set_de_jure_capital_warning: "$set_de_jure_capital_effect_tooltip$\n@warning_icon! #color_red Will destroy current [duchy_building|E]#!" reforge_crown_wenceslas_decision: "Reforge the Crown of St. Wenceslas" - reforge_crown_wenceslas_decision_desc: "Reforge the Crown of St. Wenceslas, which has been dismantled and ashamed for far too long." + reforge_crown_wenceslas_decision_desc: "Reforge the Crown of St. Wenceslas, which has been dismanteled and ashamed for far too long." reforge_crown_wenceslas_decision_tooltip: "Reforge the Crown of St. Wenceslas" reforge_crown_wenceslas_decision_confirm: "To the forge!" must_have_crown_wenceslas:0 "You must possess the #color_white $crown_wenceslas_name$" \ No newline at end of file