From 240f4d01ae98c76ad809517f616bae77825ab1ea Mon Sep 17 00:00:00 2001 From: Heidesommer Date: Mon, 25 May 2026 21:37:55 -0400 Subject: [PATCH] Fixes --- common/artifacts/features/00_features.txt | 4 +- common/culture/name_lists/NEOW_dutch.txt | 8 +- common/culture/name_lists/NEOW_limburgish.txt | 8 +- common/epidemics/00_epidemics.txt | 1 + events/dlc/fp2/fp2_yearly_events.txt | 598 +++++++++--------- .../portrait_modifiers/01_headgear_base.txt | 2 +- 6 files changed, 311 insertions(+), 310 deletions(-) diff --git a/common/artifacts/features/00_features.txt b/common/artifacts/features/00_features.txt index 22362851..93624e74 100644 --- a/common/artifacts/features/00_features.txt +++ b/common/artifacts/features/00_features.txt @@ -1939,12 +1939,12 @@ # regalia_accessory regalia_accessory_orb = { group = regalia_accessory - trigger = { OR = { scope:owner = { religion = religion:eastern_orthodox_religion scope:owner = { religion = religion:catholic_religion scope:owner = { religion = religion:protestant_religion } } } + trigger = { scope:owner = { NEOW_religion_is_broadly_christian_trigger = yes } } weight = 100 } regalia_accessory_necklace = { group = regalia_accessory - trigger = { NOT = { OR = { scope:owner = { religion = religion:eastern_orthodox_religion scope:owner = { religion = religion:catholic_religion scope:owner = { religion = religion:protestant_religion } } } } + trigger = { NOT = { scope:owner = { NEOW_religion_is_broadly_christian_trigger = yes } } } weight = 100 } diff --git a/common/culture/name_lists/NEOW_dutch.txt b/common/culture/name_lists/NEOW_dutch.txt index 18c32662..37db6dd4 100644 --- a/common/culture/name_lists/NEOW_dutch.txt +++ b/common/culture/name_lists/NEOW_dutch.txt @@ -208,13 +208,13 @@ "dynn_van_spc_Gaelen" "dynn_van_spc_Gaesbeeck" "dynn_van_spc_Gelder" - "dynn_van_spc_Gemert + "dynn_van_spc_Gemert" "dynn_van_spc_Genk" "dynn_van_spc_Gherwen" "dynn_van_spc_Glinstra" - "dynn_van_spc_Haanen - "dynn_van_spc_Haensbergen - "dynn_van_spc_Hasselt + "dynn_van_spc_Haanen" + "dynn_van_spc_Haensbergen" + "dynn_van_spc_Hasselt" "dynn_van_spc_Klaveren" "dynn_van_spc_Leeuwen" "dynn_van_spc_Leur" diff --git a/common/culture/name_lists/NEOW_limburgish.txt b/common/culture/name_lists/NEOW_limburgish.txt index 1cf35b6a..50421d08 100644 --- a/common/culture/name_lists/NEOW_limburgish.txt +++ b/common/culture/name_lists/NEOW_limburgish.txt @@ -208,13 +208,13 @@ "dynn_van_spc_Gaelen" "dynn_van_spc_Gaesbeeck" "dynn_van_spc_Gelder" - "dynn_van_spc_Gemert + "dynn_van_spc_Gemert" "dynn_van_spc_Genk" "dynn_van_spc_Gherwen" "dynn_van_spc_Glinstra" - "dynn_van_spc_Haanen - "dynn_van_spc_Haensbergen - "dynn_van_spc_Hasselt + "dynn_van_spc_Haanen" + "dynn_van_spc_Haensbergen" + "dynn_van_spc_Hasselt" "dynn_van_spc_Klaveren" "dynn_van_spc_Leeuwen" "dynn_van_spc_Leur" diff --git a/common/epidemics/00_epidemics.txt b/common/epidemics/00_epidemics.txt index 06b025bf..66b7d7cd 100644 --- a/common/epidemics/00_epidemics.txt +++ b/common/epidemics/00_epidemics.txt @@ -2346,6 +2346,7 @@ ergotism = { #dancing plague - not contagious religion = religion:catholic_religion religion = religion:eastern_orthodox_religion religion = religion:protestant_religion + } } } } diff --git a/events/dlc/fp2/fp2_yearly_events.txt b/events/dlc/fp2/fp2_yearly_events.txt index 1ea0d96a..1d9020f6 100644 --- a/events/dlc/fp2/fp2_yearly_events.txt +++ b/events/dlc/fp2/fp2_yearly_events.txt @@ -6102,305 +6102,305 @@ scripted_effect fp2_polish_should_heritage_israelite_get_upset_effect = { } } } - -# Suspect Conversos of secretly praciticing Judaism -fp2_yearly.9001 = { - type = character_event - title = fp2_james.0002.t - desc = fp2_james.0002.desc - theme = secret - override_background = { - reference = temple - } - left_portrait = { - character = root - animation = paranoia - } - right_portrait = { - character = scope:fp2_james_0002_conversos_character - animation = personality_cynical - } - - trigger = { - root.religion = { - OR = { - this = religion:eastern_orthodox_religion - this = religion:catholic_religion - this = religion:protestant_religion - } - is_landed = yes - } - - weight_multiplier = { - base = 1 - modifier = { - add = 1 - any_character_struggle = { - is_struggle_type = iberian_struggle - is_struggle_phase = struggle_iberia_phase_hostility - } - } - } - - immediate = { - every_sub_realm_county = { - limit = { - faith = faith:conversos - holder = { - liege = { # Don't convert player-Conversos territory - OR = { - is_ai = yes - NOT = { faith = faith:conversos } - } - } - } - } - add_to_list = fp2_james_0002_conversos_county - } - # Try to find a Conversos vassal if one exists - if = { - limit = { - any_vassal = { - faith = faith:conversos - is_available_ai = yes - } - } - random_vassal = { - limit = { - faith = faith:conversos - is_available_ai = yes - } - save_scope_as = fp2_james_0002_conversos_character - } - } - # Otherwise find a pool character - else_if = { - limit = { - any_pool_character = { - province = root.capital_province - faith = faith:conversos - } - } - random_pool_character = { - province = root.capital_province - limit = { - faith = faith:conversos - } - save_scope_as = fp2_james_0002_conversos_character - } - } - # Otherwise create one - else = { - create_character = { - template = spanish_conversos_character - location = root.capital_province - save_scope_as = fp2_james_0002_conversos_character - } - } - scope:fp2_james_0002_conversos_character = { - random_list = { - 50 = { - add_character_flag = is_secretly_jewish_flag - } - 50 = { - } - } - } - # Get a religion for them to potentially be secretly praciticing - religion:judaism_religion = { - random_faith = { - limit = { is_mainstream_jewish_faith = yes } - save_scope_as = fp2_james_0002_jewish_faith - } - } - } - - option = { - name = fp2_james.0002.a - custom_tooltip = fp2_james.0002.a.tt - hidden_effect = { - if = { - limit = { - scope:fp2_james_0002_conversos_character = { has_character_flag = is_secretly_jewish_flag } - } - send_interface_toast = { - type = event_toast_effect_good - title = fp2_james.0002.a.jewish_communities_thrive - every_in_list = { - list = fp2_james_0002_conversos_county - set_county_faith = scope:fp2_james_0002_jewish_faith - } - scope:fp2_james_0002_conversos_character = { - set_character_faith = scope:fp2_james_0002_jewish_faith - every_vassal = { - limit = { - faith = faith:conversos - is_available_ai = yes - } - set_character_faith = scope:fp2_james_0002_jewish_faith - } - } - } - } - else = { - send_interface_toast = { - type = event_toast_effect_good - title = fp2_james.0002.a.nothing_happened_toast - } - } - fp2_polish_should_heritage_israelite_get_upset_effect = yes - } - - stress_impact = { - zealous = medium_stress_impact_gain - } - ai_chance = { - base = 10 - ai_value_modifier = { - ai_honor = -0.5 - ai_zeal = 1.5 - } - } - } - - option = { - name = fp2_james.0002.b - duel = { - skill = intrigue - target = scope:fp2_james_0002_conversos_character - - 50 = { - compare_modifier = { - value = scope:duel_value - multiplier = 3.5 - } - desc = fp2_james.0002.b.succesful_interrogation - - if = { - limit = { scope:fp2_james_0002_conversos_character = { has_character_flag = is_secretly_jewish_flag } } - - send_interface_message = { # Begrudgingly added "unecessary" polish - type = event_prison_good - title = fp2_james.0002.t - right_icon = scope:fp2_james_0002_conversos_character - - rightfully_imprison_character_effect = { - TARGET = scope:fp2_james_0002_conversos_character - IMPRISONER = root - } - fp2_polish_should_heritage_israelite_get_upset_effect = yes - } - } - else = { - send_interface_message = { - type = event_intrigue_bad - title = fp2_james.0002.a.offended_conversos - right_icon = scope:fp2_james_0002_conversos_character - - reverse_add_opinion = { - target = scope:fp2_james_0002_conversos_character - modifier = hate_opinion - opinion = -30 - } - fp2_polish_should_heritage_israelite_get_upset_effect = yes - } - } - } - 50 = { - compare_modifier = { - value = scope:duel_value - multiplier = -3.5 - } - desc = fp2_james.0002.b.failed_interrogation - send_interface_message = { - type = event_intrigue_bad - title = fp2_james.0002.a.offended_conversos - right_icon = scope:fp2_james_0002_conversos_character - - every_sub_realm_county = { - custom = fp2_james_0002.b.failed_interrogation.tt - limit = { - faith = { - religion = { - OR = { - this = religion:eastern_orthodox_religion - this = religion:catholic_religion - this = religion:protestant_religion - this = religion:judaism_religion - } - } - } - } - add_county_modifier = { - modifier = fp2_conversos_persecution_modifier - years = 10 - } - } - reverse_add_opinion = { - target = scope:fp2_james_0002_conversos_character - modifier = hate_opinion - opinion = -30 - } - fp2_polish_should_heritage_israelite_get_upset_effect = yes - } - } - } - - stress_impact = { compassionate = medium_stress_impact_gain } - ai_chance = { - base = 10 - ai_value_modifier = { - ai_zeal = 0.5 - } - } - } - - option = { # Imprison the suspect without trial - name = fp2_james.0002.c - - send_interface_message = { - type = event_prison_neutral - title = fp2_james.0002.t - right_icon = scope:fp2_james_0002_conversos_character - - imprison_character_effect = { - TARGET = scope:fp2_james_0002_conversos_character - IMPRISONER = root - } - fp2_polish_should_heritage_israelite_get_upset_effect = yes - - stress_impact = { - compassionate = medium_stress_impact_gain - diligent = medium_stress_impact_gain - just = medium_stress_impact_gain - callous = minor_stress_impact_loss - sadistic = minor_stress_impact_loss - zealous = minor_stress_impact_loss - } - } - - ai_chance = { - base = 10 - modifier = { - factor = 0 - OR = { - has_trait = compassionate - has_trait = diligent - has_trait = just - } - } - modifier = { - factor = 2 - OR = { - has_trait = callous - has_trait = sadistic - } - has_trait = zealous - } - } - } -} - +# +## Suspect Conversos of secretly praciticing Judaism +#fp2_yearly.9001 = { +# type = character_event +# title = fp2_james.0002.t +# desc = fp2_james.0002.desc +# theme = secret +# override_background = { +# reference = temple +# } +# left_portrait = { +# character = root +# animation = paranoia +# } +# right_portrait = { +# character = scope:fp2_james_0002_conversos_character +# animation = personality_cynical +# } +# +# trigger = { +# root.religion = { +# OR = { +# this = religion:eastern_orthodox_religion +# this = religion:catholic_religion +# this = religion:protestant_religion +# } +# is_landed = yes +# } +# +# weight_multiplier = { +# base = 1 +# modifier = { +# add = 1 +# any_character_struggle = { +# is_struggle_type = iberian_struggle +# is_struggle_phase = struggle_iberia_phase_hostility +# } +# } +# } +# +# immediate = { +# every_sub_realm_county = { +# limit = { +# faith = faith:conversos +# holder = { +# liege = { # Don't convert player-Conversos territory +# OR = { +# is_ai = yes +# NOT = { faith = faith:conversos } +# } +# } +# } +# } +# add_to_list = fp2_james_0002_conversos_county +# } +# # Try to find a Conversos vassal if one exists +# if = { +# limit = { +# any_vassal = { +# faith = faith:conversos +# is_available_ai = yes +# } +# } +# random_vassal = { +# limit = { +# faith = faith:conversos +# is_available_ai = yes +# } +# save_scope_as = fp2_james_0002_conversos_character +# } +# } +# # Otherwise find a pool character +# else_if = { +# limit = { +# any_pool_character = { +# province = root.capital_province +# faith = faith:conversos +# } +# } +# random_pool_character = { +# province = root.capital_province +# limit = { +# faith = faith:conversos +# } +# save_scope_as = fp2_james_0002_conversos_character +# } +# } +# # Otherwise create one +# else = { +# create_character = { +# template = spanish_conversos_character +# location = root.capital_province +# save_scope_as = fp2_james_0002_conversos_character +# } +# } +# scope:fp2_james_0002_conversos_character = { +# random_list = { +# 50 = { +# add_character_flag = is_secretly_jewish_flag +# } +# 50 = { +# } +# } +# } +# # Get a religion for them to potentially be secretly praciticing +# religion:judaism_religion = { +# random_faith = { +# limit = { is_mainstream_jewish_faith = yes } +# save_scope_as = fp2_james_0002_jewish_faith +# } +# } +# } +# +# option = { +# name = fp2_james.0002.a +# custom_tooltip = fp2_james.0002.a.tt +# hidden_effect = { +# if = { +# limit = { +# scope:fp2_james_0002_conversos_character = { has_character_flag = is_secretly_jewish_flag } +# } +# send_interface_toast = { +# type = event_toast_effect_good +# title = fp2_james.0002.a.jewish_communities_thrive +# every_in_list = { +# list = fp2_james_0002_conversos_county +# set_county_faith = scope:fp2_james_0002_jewish_faith +# } +# scope:fp2_james_0002_conversos_character = { +# set_character_faith = scope:fp2_james_0002_jewish_faith +# every_vassal = { +# limit = { +# faith = faith:conversos +# is_available_ai = yes +# } +# set_character_faith = scope:fp2_james_0002_jewish_faith +# } +# } +# } +# } +# else = { +# send_interface_toast = { +# type = event_toast_effect_good +# title = fp2_james.0002.a.nothing_happened_toast +# } +# } +# fp2_polish_should_heritage_israelite_get_upset_effect = yes +# } +# +# stress_impact = { +# zealous = medium_stress_impact_gain +# } +# ai_chance = { +# base = 10 +# ai_value_modifier = { +# ai_honor = -0.5 +# ai_zeal = 1.5 +# } +# } +# } +# +# option = { +# name = fp2_james.0002.b +# duel = { +# skill = intrigue +# target = scope:fp2_james_0002_conversos_character +# +# 50 = { +# compare_modifier = { +# value = scope:duel_value +# multiplier = 3.5 +# } +# desc = fp2_james.0002.b.succesful_interrogation +# +# if = { +# limit = { scope:fp2_james_0002_conversos_character = { has_character_flag = is_secretly_jewish_flag } } +# +# send_interface_message = { # Begrudgingly added "unecessary" polish +# type = event_prison_good +# title = fp2_james.0002.t +# right_icon = scope:fp2_james_0002_conversos_character +# +# rightfully_imprison_character_effect = { +# TARGET = scope:fp2_james_0002_conversos_character +# IMPRISONER = root +# } +# fp2_polish_should_heritage_israelite_get_upset_effect = yes +# } +# } +# else = { +# send_interface_message = { +# type = event_intrigue_bad +# title = fp2_james.0002.a.offended_conversos +# right_icon = scope:fp2_james_0002_conversos_character +# +# reverse_add_opinion = { +# target = scope:fp2_james_0002_conversos_character +# modifier = hate_opinion +# opinion = -30 +# } +# fp2_polish_should_heritage_israelite_get_upset_effect = yes +# } +# } +# } +# 50 = { +# compare_modifier = { +# value = scope:duel_value +# multiplier = -3.5 +# } +# desc = fp2_james.0002.b.failed_interrogation +# send_interface_message = { +# type = event_intrigue_bad +# title = fp2_james.0002.a.offended_conversos +# right_icon = scope:fp2_james_0002_conversos_character +# +# every_sub_realm_county = { +# custom = fp2_james_0002.b.failed_interrogation.tt +# limit = { +# faith = { +# religion = { +# OR = { +# this = religion:eastern_orthodox_religion +# this = religion:catholic_religion +# this = religion:protestant_religion +# this = religion:judaism_religion +# } +# } +# } +# } +# add_county_modifier = { +# modifier = fp2_conversos_persecution_modifier +# years = 10 +# } +# } +# reverse_add_opinion = { +# target = scope:fp2_james_0002_conversos_character +# modifier = hate_opinion +# opinion = -30 +# } +# fp2_polish_should_heritage_israelite_get_upset_effect = yes +# } +# } +# } +# +# stress_impact = { compassionate = medium_stress_impact_gain } +# ai_chance = { +# base = 10 +# ai_value_modifier = { +# ai_zeal = 0.5 +# } +# } +# } +# +# option = { # Imprison the suspect without trial +# name = fp2_james.0002.c +# +# send_interface_message = { +# type = event_prison_neutral +# title = fp2_james.0002.t +# right_icon = scope:fp2_james_0002_conversos_character +# +# imprison_character_effect = { +# TARGET = scope:fp2_james_0002_conversos_character +# IMPRISONER = root +# } +# fp2_polish_should_heritage_israelite_get_upset_effect = yes +# +# stress_impact = { +# compassionate = medium_stress_impact_gain +# diligent = medium_stress_impact_gain +# just = medium_stress_impact_gain +# callous = minor_stress_impact_loss +# sadistic = minor_stress_impact_loss +# zealous = minor_stress_impact_loss +# } +# } +# +# ai_chance = { +# base = 10 +# modifier = { +# factor = 0 +# OR = { +# has_trait = compassionate +# has_trait = diligent +# has_trait = just +# } +# } +# modifier = { +# factor = 2 +# OR = { +# has_trait = callous +# has_trait = sadistic +# } +# has_trait = zealous +# } +# } +# } +#} +# # Jewish people come fleeing persecution from a nearby realm fp2_yearly.9002 = { type = character_event diff --git a/gfx/portraits/portrait_modifiers/01_headgear_base.txt b/gfx/portraits/portrait_modifiers/01_headgear_base.txt index 4bebc652..c89334b6 100644 --- a/gfx/portraits/portrait_modifiers/01_headgear_base.txt +++ b/gfx/portraits/portrait_modifiers/01_headgear_base.txt @@ -1958,7 +1958,7 @@ headgear_base = { # portrait_era4_trigger = yes # } # } -# } + } } ep3_byzantine_era1_imperial = {