Skip to content

council: fix effect and notification #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schwarherz merged 3 commits into from
Jul 12, 2023
Merged

council: fix effect and notification #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b779d41
councillor: fix effect and notification
nbmsc Jul 8, 2023
463e197
faction: fix independence and claimant requirement
nbmsc Jul 8, 2023
60e3cad
succession: fix feudal elective candidate score
nbmsc Jul 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions CleanSlate/common/job_titles/00_job_titles.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ job_chancellor = {
practical_age < 65
health >= 3
is_sick_or_injured_trigger = no
can_be_councilmember_king_trigger = yes
can_be_chancellor_trigger = yes
}

FROM = {
Expand Down Expand Up @@ -273,7 +273,7 @@ job_marshal = {
practical_age < 65
health >= 3
is_sick_or_injured_trigger = no
can_be_councilmember_king_trigger = yes
can_be_marshal_trigger = yes
}

FROM = {
Expand Down Expand Up @@ -369,7 +369,7 @@ job_treasurer = {
practical_age < 65
health >= 3
is_sick_or_injured_trigger = no
can_be_councilmember_king_trigger = yes
can_be_treasurer_trigger = yes
}

FROM = {
Expand Down Expand Up @@ -462,7 +462,7 @@ job_spymaster = {
practical_age < 65
health >= 3
is_sick_or_injured_trigger = no
can_be_councilmember_king_trigger = yes
can_be_spymaster_trigger = yes
}

FROM = {
Expand Down Expand Up @@ -562,7 +562,7 @@ job_spiritual = {
practical_age < 65
health >= 3
is_sick_or_injured_trigger = no
can_be_councilmember_king_trigger = yes
can_be_spiritual_trigger = yes
}

FROM = {
Expand Down
6 changes: 3 additions & 3 deletions CleanSlate/common/minor_titles/00_minor_titles.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3956,7 +3956,7 @@ title_councilmember_king = {
retire_effect = {
if = {
limit = {
age < 65
practical_age < 65
health >= 3
is_sick_or_injured_trigger = no
can_be_councilmember_king_trigger = yes
Expand Down Expand Up @@ -4042,10 +4042,10 @@ title_councilmember_emperor = {
retire_effect = {
if = {
limit = {
age < 65
practical_age < 65
health >= 3
is_sick_or_injured_trigger = no
can_be_councilmember_king_trigger = yes
can_be_councilmember_emperor_trigger = yes
}

FROM = {
Expand Down
37 changes: 21 additions & 16 deletions CleanSlate/common/objectives/00_factions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4409,11 +4409,13 @@ faction_independence = {
}

# Not allowed to start factions like this if our capital borders the liege's capital
capital_scope = {
any_neighbor_province = {
ROOT = {
capital_scope = {
NOT = { province = PREVPREV }
NOT = {
capital_scope = {
any_neighbor_province = {
ROOT = {
capital_scope = {
province = PREVPREV
}
}
}
}
Expand Down Expand Up @@ -5902,18 +5904,18 @@ faction_claimant = {
NOT = { character = FROM }
}

FROM = {
NOR = {
has_religion_feature = religion_matriarchal
has_religion_feature = religion_equal
has_religion_feature = religion_feature_bon
}
}

trigger_if = {
limit = { has_dlc = "Conclave" }

NOR = {
FROM = {
OR = {
has_religion_feature = religion_matriarchal
has_religion_feature = religion_equal
has_religion_feature = religion_feature_bon
}
}

has_law = status_of_women_4

has_game_rule = {
Expand Down Expand Up @@ -6413,14 +6415,17 @@ faction_claimant = {
NOT = { character = ROOT }
}

NOR = {
has_religion_feature = religion_equal
has_religion_feature = religion_matriarchal
has_religion_feature = religion_feature_bon
}

trigger_if = {
limit = { has_dlc = "Conclave" }

NOR = {
has_law = status_of_women_4
has_religion_feature = religion_equal
has_religion_feature = religion_matriarchal
has_religion_feature = religion_feature_bon

has_game_rule = {
name = gender
Expand Down
5 changes: 3 additions & 2 deletions CleanSlate/common/succession_voting/00_succession_voting_feudal_elective.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,10 @@ feudal_elective = {

# Family relations
trigger_if = {
limit = { is_close_relative = ROOT }
limit = { dynasty = ROOT }

OR = {
dynasty = ROOT
is_close_relative = ROOT

AND = {
is_landed = yes
Expand Down Expand Up @@ -377,6 +377,7 @@ feudal_elective = {

# Ageism
elector_candidate_age_vote = yes
elector_candidate_age_children_vote = yes

# Culturism
elector_candidate_culture_vote = yes
Expand Down
5 changes: 3 additions & 2 deletions CleanSlate/common/succession_voting/01_succession_voting_hre_feudal_elective.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,10 @@ hre_feudal_elective = {
has_claim = ROOT_FROMFROM

trigger_if = {
limit = { is_close_relative = ROOT }
limit = { dynasty = ROOT }

OR = {
dynasty = ROOT
is_close_relative = ROOT

AND = {
is_landed = yes
Expand Down Expand Up @@ -524,6 +524,7 @@ hre_feudal_elective = {

# Ageism
elector_candidate_age_vote = yes
elector_candidate_age_children_vote = yes

# Culturism
elector_candidate_culture_vote = yes
Expand Down
2 changes: 1 addition & 1 deletion CleanSlate/decisions/rip_various_decisions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,7 +1248,7 @@ decisions = {

if = { # Notify employer that councillor is going into seclusion
limit = {
is_voter = yes
is_councillor = yes
liege = { ai = no }
}

Expand Down
13 changes: 12 additions & 1 deletion CleanSlate/events/base_job_chancellor.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@ character_event = {

location = {
any_province_lord = {
# No reason to improve relations with irrelevant barons
trigger_if = {
limit = { real_tier = BARON }
same_liege = ROOT
}

is_priest = no

NOR = {
Expand All @@ -172,6 +178,11 @@ character_event = {
location = {
random_province_lord = {
limit = {
trigger_if = {
limit = { real_tier = BARON }
same_liege = ROOT
}

is_priest = no

NOR = {
Expand Down Expand Up @@ -1380,7 +1391,7 @@ letter_event = {
years = 2
}

letter_event = { id = chancellor.506 }
letter_event = { id = chancellor.508 }
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions CleanSlate/events/hl_silk_route_events.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1283,9 +1283,9 @@ province_event = {
factor = 2 # 20%
combat_rating < 10
}
}

death = { death_reason = death_battle }
death = { death_reason = death_battle }
}
}

character_event = {
Expand Down
2 changes: 1 addition & 1 deletion CleanSlate/events/rip_seclusion_events.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ character_event = {
# Notify employer that councillor is going into seclusion
if = {
limit = {
is_voter = yes
is_councillor = yes
liege = { ai = no }
}

Expand Down