Fixing the Fixes

This commit is contained in:
Heidesommer 2026-05-26 03:31:58 -04:00
parent 066ca149c5
commit 54423c926c
19 changed files with 1022 additions and 914 deletions

View file

@ -885,38 +885,38 @@ on_raid_action_completion = {
}
## Struggles
if = {
limit = {
scope:raider = {
any_character_struggle = {
activate_struggle_catalyst_secondary_character_involvement_involved_trigger = {
CATALYST = catalyst_raided_involved
CHAR = scope:county.holder
}
}
}
scope:county.holder = { # Theoretical edge case where X is from one struggle, Y from another one and they trigger catalysts. But unlikely to be an issue.
any_character_struggle = {
involvement = involved
phase_has_catalyst = catalyst_raided_involved
}
}
}
scope:raider = {
every_character_struggle = {
limit = {
activate_struggle_catalyst_secondary_character_involvement_involved_trigger = {
CATALYST = catalyst_raided_involved
CHAR = scope:county.holder
}
}
activate_struggle_catalyst = {
catalyst = catalyst_raided_involved
character = scope:raider
}
log_debug_variable_for_persian_struggle_effect = { VAR = concession_catalyst_raided_involved }
}
}
# if = {
# limit = {
# scope:raider = {
# any_character_struggle = {
# activate_struggle_catalyst_secondary_character_involvement_involved_trigger = {
# CATALYST = catalyst_raided_involved
# CHAR = scope:county.holder
# }
# }
# }
# scope:county.holder = { # Theoretical edge case where X is from one struggle, Y from another one and they trigger catalysts. But unlikely to be an issue.
# any_character_struggle = {
# involvement = involved
# phase_has_catalyst = catalyst_raided_involved
# }
# }
# }
# scope:raider = {
# every_character_struggle = {
# limit = {
# activate_struggle_catalyst_secondary_character_involvement_involved_trigger = {
# CATALYST = catalyst_raided_involved
# CHAR = scope:county.holder
# }
# }
# activate_struggle_catalyst = {
# catalyst = catalyst_raided_involved
# character = scope:raider
# }
# log_debug_variable_for_persian_struggle_effect = { VAR = concession_catalyst_raided_involved }
# }
# }
}
# Commander trait leveling

View file

@ -2381,6 +2381,9 @@ on_game_start_after_lobby = {
every_held_title = {
limit = {
tier >= tier_county
NOT = {
has_title_law = saxon_elective_succession_law
}
}
add_title_law = saxon_elective_succession_law
}
@ -2415,6 +2418,9 @@ on_game_start_after_lobby = {
every_held_title = {
limit = {
tier >= tier_county
NOT = {
has_title_law = urban_elective_succession_law
}
}
add_title_law = urban_elective_succession_law
}

View file

@ -450,100 +450,100 @@ on_character_faith_change = {
}
}
# ## Struggle Effects
# ### persian_struggle: switching faith to anything that isn't an orthodox Sunni creed'll flip you to detractor.
## ### persian_struggle: switching faith to anything that isn't an orthodox Sunni creed'll flip you to detractor.
## if = {
## limit = {
## # Gotta be in the appropriate struggle.
## any_character_struggle = { this = struggle:persian_struggle }
## # Filter out pre-existing detractors.
## NOT = { has_trait = fp3_struggle_detractor }
## # Now, check the new faith.
## exists = title:d_sunni.holder
## OR = {
## NOT = { exists = faith.religious_head }
## NOT = { faith.religious_head = title:d_sunni.holder }
## }
## }
## send_interface_toast = {
## type = event_toast_effect_neutral
## title = persian_struggle.tt.converted_away_from_sunni_orthodoxy
## left_icon = root
## hidden_effect = { remove_trait = fp3_struggle_supporter }
## add_trait_force_tooltip = fp3_struggle_detractor
## }
## }
#
# # Local conversion
# if = {
# limit = {
# # Gotta be in the appropriate struggle.
# any_character_struggle = { this = struggle:persian_struggle }
# # Filter out pre-existing detractors.
# NOT = { has_trait = fp3_struggle_detractor }
# # Now, check the new faith.
# exists = title:d_sunni.holder
# OR = {
# NOT = { exists = faith.religious_head }
# NOT = { faith.religious_head = title:d_sunni.holder }
# exists = root.capital_province
# root.capital_province.faith = root.faith
# any_character_struggle = {
# involvement = involved
# phase_has_catalyst = catalyst_convert_local_culture_faith
# is_faith_involved_in_struggle = root.faith
# }
# }
# send_interface_toast = {
# type = event_toast_effect_neutral
# title = persian_struggle.tt.converted_away_from_sunni_orthodoxy
# left_icon = root
# hidden_effect = { remove_trait = fp3_struggle_supporter }
# add_trait_force_tooltip = fp3_struggle_detractor
# every_character_struggle = {
# involvement = involved
# activate_struggle_catalyst = {
# catalyst = catalyst_convert_local_culture_faith
# character = root
# }
# }
# }
# else_if = { # Forced conversion
# limit = {
# any_character_struggle = {
# involvement = involved
# is_faith_involved_in_struggle = root.faith
# phase_has_catalyst = catalyst_forced_conversion
# }
# }
# every_character_struggle = {
# involvement = involved
# activate_struggle_catalyst = {
# catalyst = catalyst_forced_conversion
# character = root
# }
# }
# }
# else_if = {
# limit = {
# has_trait = fp3_struggle_supporter
# any_character_struggle = {
# involvement = involved
# is_faith_involved_in_struggle = root.faith
# phase_has_catalyst = catalyst_supporter_forced_conversion
# }
# }
# every_character_struggle = {
# involvement = involved
# activate_struggle_catalyst = {
# catalyst = catalyst_supporter_forced_conversion
# character = root
# }
# log_debug_variable_for_persian_struggle_effect = { VAR = unrest_catalyst_supporter_forced_conversion }
# }
# }
# else_if = {
# limit = {
# has_trait = fp3_struggle_detractor
# any_character_struggle = {
# involvement = involved
# is_faith_involved_in_struggle = root.faith
# phase_has_catalyst = catalyst_detractor_forced_conversion
# }
# }
# every_character_struggle = {
# involvement = involved
# activate_struggle_catalyst = {
# catalyst = catalyst_detractor_forced_conversion
# character = root
# }
# log_debug_variable_for_persian_struggle_effect = { VAR = stabil_catalyst_detractor_forced_conversion }
# }
# }
# Local conversion
if = {
limit = {
exists = root.capital_province
root.capital_province.faith = root.faith
any_character_struggle = {
involvement = involved
phase_has_catalyst = catalyst_convert_local_culture_faith
is_faith_involved_in_struggle = root.faith
}
}
every_character_struggle = {
involvement = involved
activate_struggle_catalyst = {
catalyst = catalyst_convert_local_culture_faith
character = root
}
}
}
else_if = { # Forced conversion
limit = {
any_character_struggle = {
involvement = involved
is_faith_involved_in_struggle = root.faith
phase_has_catalyst = catalyst_forced_conversion
}
}
every_character_struggle = {
involvement = involved
activate_struggle_catalyst = {
catalyst = catalyst_forced_conversion
character = root
}
}
}
else_if = {
limit = {
has_trait = fp3_struggle_supporter
any_character_struggle = {
involvement = involved
is_faith_involved_in_struggle = root.faith
phase_has_catalyst = catalyst_supporter_forced_conversion
}
}
every_character_struggle = {
involvement = involved
activate_struggle_catalyst = {
catalyst = catalyst_supporter_forced_conversion
character = root
}
log_debug_variable_for_persian_struggle_effect = { VAR = unrest_catalyst_supporter_forced_conversion }
}
}
else_if = {
limit = {
has_trait = fp3_struggle_detractor
any_character_struggle = {
involvement = involved
is_faith_involved_in_struggle = root.faith
phase_has_catalyst = catalyst_detractor_forced_conversion
}
}
every_character_struggle = {
involvement = involved
activate_struggle_catalyst = {
catalyst = catalyst_detractor_forced_conversion
character = root
}
log_debug_variable_for_persian_struggle_effect = { VAR = stabil_catalyst_detractor_forced_conversion }
}
}
# Achievements

View file

@ -258,6 +258,9 @@ on_title_gain = {
limit = {
tier >= tier_county
is_nomad_title = no
NOT = {
has_title_law = saxon_elective_succession_law
}
}
add_title_law = saxon_elective_succession_law
}
@ -296,6 +299,9 @@ on_title_gain = {
limit = {
tier >= tier_county
is_nomad_title = no
NOT = {
has_title_law = urban_elective_succession_law
}
}
add_title_law = urban_elective_succession_law
}
@ -2927,6 +2933,9 @@ on_title_gain_inheritance = {
limit = {
tier >= tier_county
is_nomad_title = no
NOT = {
has_title_law = saxon_elective_succession_law
}
}
add_title_law = saxon_elective_succession_law
}
@ -2964,6 +2973,9 @@ on_title_gain_inheritance = {
limit = {
tier >= tier_county
is_nomad_title = no
NOT = {
has_title_law = urban_elective_succession_law
}
}
add_title_law = urban_elective_succession_law
}
@ -3116,6 +3128,9 @@ on_title_gain_usurpation = {
limit = {
title_tier > barony
is_nomad_title = no
NOT = {
has_title_law = saxon_elective_succession_law
}
}
add_title_law = saxon_elective_succession_law
}
@ -3153,6 +3168,9 @@ on_title_gain_usurpation = {
limit = {
title_tier > barony
is_nomad_title = no
NOT = {
has_title_law = urban_elective_succession_law
}
}
add_title_law = urban_elective_succession_law
}

View file

@ -788,6 +788,9 @@ yearly_playable_pulse = {
limit = {
tier >= tier_county
is_nomad_title = no
NOT = {
has_title_law = saxon_elective_succession_law
}
}
add_title_law = saxon_elective_succession_law
}
@ -825,6 +828,9 @@ yearly_playable_pulse = {
limit = {
tier >= tier_county
is_nomad_title = no
NOT = {
has_title_law = urban_elective_succession_law
}
}
add_title_law = urban_elective_succession_law
}
@ -2782,6 +2788,9 @@ quarterly_playable_pulse = {
limit = {
tier >= tier_county
is_nomad_title = no
NOT = {
has_title_law = saxon_elective_succession_law
}
}
add_title_law = saxon_elective_succession_law
}
@ -2819,6 +2828,9 @@ quarterly_playable_pulse = {
limit = {
tier >= tier_county
is_nomad_title = no
NOT = {
has_title_law = urban_elective_succession_law
}
}
add_title_law = urban_elective_succession_law
}