More fixes

This commit is contained in:
Heidesommer 2026-05-28 07:00:37 -04:00
parent f78dbd4986
commit a6f8acc22f
23 changed files with 5790 additions and 1934 deletions

View file

@ -1372,38 +1372,38 @@
}
# Agenda impact
modifier = {
scope:recipient = {
is_important_or_vip_struggle_character = yes
any_character_struggle = {
involvement = involved
}
}
add = {
value = 0
if = {
limit = {
scope:actor = {
any_character_struggle = {
phase_has_catalyst = catalyst_imprison_important
}
has_character_flag = agenda_towards_escalation
}
}
add = 200
}
else_if = {
limit = {
scope:actor = {
any_character_struggle = {
phase_has_catalyst = catalyst_imprison_important
}
}
}
add = -100
}
}
}
# modifier = {
# scope:recipient = {
# is_important_or_vip_struggle_character = yes
# any_character_struggle = {
# involvement = involved
# }
# }
# add = {
# value = 0
# if = {
# limit = {
# scope:actor = {
# any_character_struggle = {
# phase_has_catalyst = catalyst_imprison_important
# }
# has_character_flag = agenda_towards_escalation
# }
# }
# add = 200
# }
# else_if = {
# limit = {
# scope:actor = {
# any_character_struggle = {
# phase_has_catalyst = catalyst_imprison_important
# }
# }
# }
# add = -100
# }
# }
# }
# modifier = {
# scope:recipient = {
# has_trait = fp3_struggle_supporter
@ -2291,42 +2291,42 @@ ransom_interaction = {
}
# Struggle Agenda
modifier = {
scope:secondary_recipient = {
any_character_struggle = {
involvement = involved
}
}
scope:actor = {
any_character_struggle = {
involvement = involved
}
}
add = {
value = 0
if = {
limit = {
scope:actor = {
any_character_struggle = {
phase_has_catalyst = catalyst_ransom_important
}
has_character_flag = agenda_towards_escalation
}
}
add = -100
}
else_if = {
limit = {
scope:actor = {
any_character_struggle = {
phase_has_catalyst = catalyst_ransom_important
}
}
}
add = 200
}
}
}
# modifier = {
# scope:secondary_recipient = {
# any_character_struggle = {
# involvement = involved
# }
# }
# scope:actor = {
# any_character_struggle = {
# involvement = involved
# }
# }
# add = {
# value = 0
# if = {
# limit = {
# scope:actor = {
# any_character_struggle = {
# phase_has_catalyst = catalyst_ransom_important
# }
# has_character_flag = agenda_towards_escalation
# }
# }
# add = -100
# }
# else_if = {
# limit = {
# scope:actor = {
# any_character_struggle = {
# phase_has_catalyst = catalyst_ransom_important
# }
# }
# }
# add = 200
# }
# }
# }
modifier = { # Do not ransom at war
factor = 0
@ -3385,42 +3385,42 @@ pay_ransom_interaction = {
}
# Struggle Agenda
modifier = {
scope:secondary_recipient = {
any_character_struggle = {
involvement = involved
}
}
scope:actor = {
any_character_struggle = {
involvement = involved
}
}
add = {
value = 0
if = {
limit = {
scope:actor = {
any_character_struggle = {
phase_has_catalyst = catalyst_ransom_important
}
has_character_flag = agenda_towards_escalation
}
}
add = -100
}
else_if = {
limit = {
scope:actor = {
any_character_struggle = {
phase_has_catalyst = catalyst_ransom_important
}
}
}
add = 200
}
}
}
# modifier = {
# scope:secondary_recipient = {
# any_character_struggle = {
# involvement = involved
# }
# }
# scope:actor = {
# any_character_struggle = {
# involvement = involved
# }
# }
# add = {
# value = 0
# if = {
# limit = {
# scope:actor = {
# any_character_struggle = {
# phase_has_catalyst = catalyst_ransom_important
# }
# has_character_flag = agenda_towards_escalation
# }
# }
# add = -100
# }
# else_if = {
# limit = {
# scope:actor = {
# any_character_struggle = {
# phase_has_catalyst = catalyst_ransom_important
# }
# }
# }
# add = 200
# }
# }
# }
evaluate_action_increasing_house_unity = {
VALUE = 100
@ -4718,22 +4718,22 @@ release_from_prison_interaction = {
callous = minor_stress_impact_gain
}
# Struggle impact
if = {
limit = {
any_character_struggle = {
involvement = involved
OR = {
has_struggle_phase_parameter = release_prisoner_diff_culture_gives_prestige
has_struggle_phase_parameter = release_prisoner_diff_faith_gives_prestige
}
}
is_diff_faith_or_culture_trigger = {
CHAR = scope:recipient
STATUS = involved
}
}
add_prestige = medium_prestige_gain
}
# if = {
# limit = {
# any_character_struggle = {
# involvement = involved
# OR = {
# has_struggle_phase_parameter = release_prisoner_diff_culture_gives_prestige
# has_struggle_phase_parameter = release_prisoner_diff_faith_gives_prestige
# }
# }
# is_diff_faith_or_culture_trigger = {
# CHAR = scope:recipient
# STATUS = involved
# }
# }
# add_prestige = medium_prestige_gain
# }
# Struggle Catalyst
# if = {
@ -5928,50 +5928,50 @@ release_from_prison_interaction = {
desc = "DEMAND_ADMIN_NEGATIVE_REASON"
}
# Struggle
modifier = {
trigger = {
scope:demand_conversion = no
scope:renounce_claims = no
scope:banish = no
scope:gain_hook = no
scope:take_vows = no
scope:recruit = no
}
scope:recipient = {
any_character_struggle = {
involvement = involved
}
}
scope:actor = {
any_character_struggle = {
involvement = involved
}
}
add = {
value = 0
if = {
limit = {
scope:recipient = {
any_character_struggle = {
phase_has_catalyst = catalyst_release_important
}
has_character_flag = agenda_towards_escalation
}
}
add = -100
}
else_if = {
limit = {
scope:recipient = {
any_character_struggle = {
phase_has_catalyst = catalyst_release_important
}
}
}
add = 200
}
}
}
# modifier = {
# trigger = {
# scope:demand_conversion = no
# scope:renounce_claims = no
# scope:banish = no
# scope:gain_hook = no
# scope:take_vows = no
# scope:recruit = no
# }
# scope:recipient = {
# any_character_struggle = {
# involvement = involved
# }
# }
# scope:actor = {
# any_character_struggle = {
# involvement = involved
# }
# }
# add = {
# value = 0
# if = {
# limit = {
# scope:recipient = {
# any_character_struggle = {
# phase_has_catalyst = catalyst_release_important
# }
# has_character_flag = agenda_towards_escalation
# }
# }
# add = -100
# }
# else_if = {
# limit = {
# scope:recipient = {
# any_character_struggle = {
# phase_has_catalyst = catalyst_release_important
# }
# }
# }
# add = 200
# }
# }
# }
}
# AI
@ -6139,62 +6139,62 @@ release_from_prison_interaction = {
}
}
# Struggle
modifier = {
trigger = {
scope:demand_conversion = no
scope:renounce_claims = no
scope:banish = no
scope:gain_hook = no
scope:take_vows = no
scope:recruit = no
}
scope:recipient = {
any_character_struggle = {
involvement = involved
}
}
scope:actor = {
any_character_struggle = {
involvement = involved
}
}
add = {
value = 0
if = {
limit = {
scope:actor = {
any_character_struggle = {
phase_has_catalyst = catalyst_release_important
}
has_character_flag = agenda_towards_escalation
}
}
add = -100
}
else_if = {
limit = {
scope:actor = {
any_character_struggle = {
phase_has_catalyst = catalyst_release_important
}
NOT = {
ai_greed >= 25
}
OR = {
ai_compassion > 50
AND = {
ai_compassion > 0
scope:recipient = {
time_in_prison = { years > 1 }
}
}
}
}
}
add = 200
}
}
}
# modifier = {
# trigger = {
# scope:demand_conversion = no
# scope:renounce_claims = no
# scope:banish = no
# scope:gain_hook = no
# scope:take_vows = no
# scope:recruit = no
# }
# scope:recipient = {
# any_character_struggle = {
# involvement = involved
# }
# }
# scope:actor = {
# any_character_struggle = {
# involvement = involved
# }
# }
# add = {
# value = 0
# if = {
# limit = {
# scope:actor = {
# any_character_struggle = {
# phase_has_catalyst = catalyst_release_important
# }
# has_character_flag = agenda_towards_escalation
# }
# }
# add = -100
# }
# else_if = {
# limit = {
# scope:actor = {
# any_character_struggle = {
# phase_has_catalyst = catalyst_release_important
# }
# NOT = {
# ai_greed >= 25
# }
# OR = {
# ai_compassion > 50
# AND = {
# ai_compassion > 0
# scope:recipient = {
# time_in_prison = { years > 1 }
# }
# }
# }
# }
# }
# add = 200
# }
# }
# }
modifier = { # Family Feud
add = -50
scope:actor = {
@ -6364,71 +6364,71 @@ execute_prisoner_interaction = {
}
# Agenda impact
modifier = {
scope:recipient = {
any_character_struggle = {
involvement = involved
}
is_important_or_vip_struggle_character = yes
}
add = {
value = 0
if = {
limit = {
scope:actor = {
any_character_struggle = {
phase_has_catalyst = catalyst_execute_important
}
has_character_flag = agenda_towards_escalation
}
}
add = 200
}
else_if = {
limit = {
scope:actor = {
any_character_struggle = {
phase_has_catalyst = catalyst_execute_important
}
}
}
add = -100
}
}
}
modifier = {
scope:recipient = {
any_character_struggle = {
involvement = involved
}
has_trait = fp3_struggle_supporter
}
add = {
value = 0
if = {
limit = {
scope:actor = {
any_character_struggle = {
phase_has_catalyst = catalyst_execute_supporter
}
has_trait = fp3_struggle_detractor
}
}
add = 200
}
else_if = {
limit = {
scope:actor = {
any_character_struggle = {
phase_has_catalyst = catalyst_execute_supporter
}
}
}
add = -100
}
}
}
# modifier = {
# scope:recipient = {
# any_character_struggle = {
# involvement = involved
# }
# is_important_or_vip_struggle_character = yes
# }
# add = {
# value = 0
# if = {
# limit = {
# scope:actor = {
# any_character_struggle = {
# phase_has_catalyst = catalyst_execute_important
# }
# has_character_flag = agenda_towards_escalation
# }
# }
# add = 200
# }
# else_if = {
# limit = {
# scope:actor = {
# any_character_struggle = {
# phase_has_catalyst = catalyst_execute_important
# }
# }
# }
# add = -100
# }
# }
# }
#
# modifier = {
# scope:recipient = {
# any_character_struggle = {
# involvement = involved
# }
# has_trait = fp3_struggle_supporter
# }
# add = {
# value = 0
# if = {
# limit = {
# scope:actor = {
# any_character_struggle = {
# phase_has_catalyst = catalyst_execute_supporter
# }
# has_trait = fp3_struggle_detractor
# }
# }
# add = 200
# }
# else_if = {
# limit = {
# scope:actor = {
# any_character_struggle = {
# phase_has_catalyst = catalyst_execute_supporter
# }
# }
# }
# add = -100
# }
# }
# }
#Nomads get the special beheading stuff
modifier = {
@ -6560,20 +6560,20 @@ execute_prisoner_interaction = {
}
# Blocked by current struggle phase
custom_tooltip = {
text = struggle_parameter_struggle_cannot_execute_involved_prisoners
NOT = {
scope:actor = {
any_character_struggle = {
involvement = involved
has_struggle_phase_parameter = struggle_cannot_execute_involved_prisoners
is_secondary_character_involvement_involved_trigger = {
CHAR = scope:recipient
}
}
}
}
}
# custom_tooltip = {
# text = struggle_parameter_struggle_cannot_execute_involved_prisoners
# NOT = {
# scope:actor = {
# any_character_struggle = {
# involvement = involved
# has_struggle_phase_parameter = struggle_cannot_execute_involved_prisoners
# is_secondary_character_involvement_involved_trigger = {
# CHAR = scope:recipient
# }
# }
# }
# }
# }
custom_tooltip = {
text = is_currently_being_purged_tt