fixes big evebts abd on actions plus mroe
This commit is contained in:
parent
c9d520e5a1
commit
bce2aa31a1
207 changed files with 100377 additions and 9296 deletions
|
|
@ -2419,7 +2419,6 @@ ep2_tournament_events.0021 = {
|
|||
any_close_family_member = {
|
||||
OR = {
|
||||
has_relation_lover = root
|
||||
has_relation_soulmate = root
|
||||
is_spouse_of = root
|
||||
}
|
||||
}
|
||||
|
|
@ -2430,7 +2429,6 @@ ep2_tournament_events.0021 = {
|
|||
any_close_family_member = {
|
||||
OR = {
|
||||
has_relation_lover = root
|
||||
has_relation_soulmate = root
|
||||
is_spouse_of = root
|
||||
}
|
||||
}
|
||||
|
|
@ -2448,7 +2446,6 @@ ep2_tournament_events.0021 = {
|
|||
limit = {
|
||||
OR = {
|
||||
has_relation_lover = root
|
||||
has_relation_soulmate = root
|
||||
is_spouse_of = root
|
||||
}
|
||||
}
|
||||
|
|
@ -3633,19 +3630,15 @@ ep2_tournament_events.1006 = {
|
|||
first_valid = {
|
||||
triggered_desc = {
|
||||
trigger = {
|
||||
OR = {
|
||||
has_relation_rival = scope:surrendering_knight
|
||||
has_relation_nemesis = scope:surrendering_knight
|
||||
}
|
||||
has_relation_rival = scope:surrendering_knight
|
||||
}
|
||||
desc = ep2_tournament_events.1006.rival
|
||||
}
|
||||
triggered_desc = {
|
||||
trigger = {
|
||||
AND = {
|
||||
NOR = {
|
||||
NOT = {
|
||||
has_relation_rival = scope:surrendering_knight
|
||||
has_relation_nemesis = scope:surrendering_knight
|
||||
}
|
||||
scope:surrendering_knight.gold < 5
|
||||
}
|
||||
|
|
@ -3657,9 +3650,8 @@ ep2_tournament_events.1006 = {
|
|||
}
|
||||
triggered_desc = {
|
||||
trigger = {
|
||||
NOR = {
|
||||
NOT = {
|
||||
has_relation_rival = scope:surrendering_knight
|
||||
has_relation_nemesis = scope:surrendering_knight
|
||||
}
|
||||
}
|
||||
desc = ep2_tournament_events.1006.normal
|
||||
|
|
@ -3770,10 +3762,7 @@ ep2_tournament_events.1006 = {
|
|||
name = ep2_tournament_events.1006.a
|
||||
|
||||
trigger = {
|
||||
OR = {
|
||||
has_relation_rival = scope:surrendering_knight
|
||||
has_relation_nemesis = scope:surrendering_knight
|
||||
}
|
||||
has_relation_rival = scope:surrendering_knight
|
||||
}
|
||||
|
||||
add_internal_flag = special
|
||||
|
|
@ -5905,7 +5894,6 @@ ep2_tournament_events.1015 = {
|
|||
OR = { #Ensure it's someone meaningful to you
|
||||
is_close_family_or_spouse_of_root_trigger = yes
|
||||
has_relation_lover = root
|
||||
has_relation_soulmate = root
|
||||
has_character_modifier = ignores_gender_army_rules #In case Mulan ends up really good!
|
||||
}
|
||||
}
|
||||
|
|
@ -5921,7 +5909,6 @@ ep2_tournament_events.1015 = {
|
|||
OR = { #Ensure it's someone meaningful to you
|
||||
is_close_family_or_spouse_of_root_trigger = yes
|
||||
has_relation_lover = root
|
||||
has_relation_soulmate = root
|
||||
has_character_modifier = ignores_gender_army_rules #In case Mulan ends up really good!
|
||||
}
|
||||
}
|
||||
|
|
@ -5947,7 +5934,6 @@ ep2_tournament_events.1015 = {
|
|||
contest_event_general_contestant_valid_trigger = yes
|
||||
OR = {
|
||||
is_close_family_or_spouse_of_root_trigger = yes
|
||||
has_relation_soulmate = root
|
||||
has_relation_lover = root
|
||||
has_character_modifier = ignores_gender_army_rules
|
||||
}
|
||||
|
|
@ -5962,7 +5948,6 @@ ep2_tournament_events.1015 = {
|
|||
contest_event_general_contestant_valid_trigger = yes
|
||||
OR = {
|
||||
is_close_family_or_spouse_of_root_trigger = yes
|
||||
has_relation_soulmate = root
|
||||
has_relation_lover = root
|
||||
has_character_modifier = ignores_gender_army_rules
|
||||
}
|
||||
|
|
@ -6163,7 +6148,6 @@ ep2_tournament_events.1016 = {
|
|||
OR = { #Catchall for relations
|
||||
is_close_family_or_spouse_of_root_trigger = yes
|
||||
has_relation_lover = root
|
||||
has_relation_soulmate = root
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -7942,10 +7926,7 @@ ep2_tournament_events.2003 = {
|
|||
this = scope:versus_matchee
|
||||
this = scope:versus_matcher
|
||||
}
|
||||
OR = {
|
||||
has_relation_friend = root
|
||||
has_relation_best_friend = root
|
||||
}
|
||||
has_relation_friend = root
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -7961,10 +7942,7 @@ ep2_tournament_events.2003 = {
|
|||
this = scope:versus_matchee
|
||||
this = scope:versus_matcher
|
||||
}
|
||||
OR = {
|
||||
has_relation_friend = root
|
||||
has_relation_best_friend = root
|
||||
}
|
||||
has_relation_friend = root
|
||||
}
|
||||
save_scope_as = friend
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue