Skip to content

Commit

Permalink
Merge pull request #93 from ck2plus/bugfix
Browse files Browse the repository at this point in the history 
Bugfix
  • Loading branch information
@schwarherz
schwarherz authored Sep 5, 2021
2 parents b2e321c + 38c35e4 commit 0916e44
Show file tree
Hide file tree
Showing 34 changed files with 1,387 additions and 938 deletions.
108 changes: 79 additions & 29 deletions CleanSlate/common/cb_types/religious_cbs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1339,7 +1339,7 @@ new_crusade = {

# Find a King for Trebizond
e_byzantium = {
owner = {
holder_scope = {
if = {
limit = {
k_trebizond = {
Expand Down Expand Up @@ -1368,9 +1368,9 @@ new_crusade = {

# Set vassals for Trebizond
k_trebizond = {
owner = {
holder_scope = {
e_byzantium = {
owner = {
holder_scope = {
any_vassal = {
limit = { de_jure_liege = k_trebizond }
set_defacto_liege = PREVPREVPREV
Expand All @@ -1384,18 +1384,46 @@ new_crusade = {
if = {
limit = {
c_famagusta = {
owner = {
holder_scope = {
religion = defender
culture = defender
ai = yes

OR = {
any_war = {
using_cb = new_crusade
any_defender = { character = PREVPREV }
}

any_liege = {
any_war = {
using_cb = new_crusade
any_defender = { character = PREVPREV }
}
}
}
}
}

c_limisol = {
owner = {
holder_scope = {
religion = defender
culture = defender
ai = yes

OR = {
any_war = {
using_cb = new_crusade
any_defender = { character = PREVPREV }
}

any_liege = {
any_war = {
using_cb = new_crusade
any_defender = { character = PREVPREV }
}
}
}
}
}

Expand Down Expand Up @@ -1494,9 +1522,25 @@ new_crusade = {

# All Byzantine vassals go independent except those neighboring the old Emperor, and he/she gets an inferior Empire title while the Byzantine title is broken
e_byzantium = {
owner = {
holder_scope = {
any_vassal = {
limit = { higher_real_tier_than = BARON }
limit = {
higher_real_tier_than = BARON

NAND = { # These stay part of the empire
ai = yes
culture = PREV
religion = PREV
lower_real_tier_than = KING

any_demesne_province = {
any_neighbor_province = {
owned_by = PREVPREVPREV
}
}
}
}

set_defacto_liege = THIS
}

Expand Down Expand Up @@ -1525,17 +1569,6 @@ new_crusade = {

destroy_landed_title = THIS
}

any_neighbor_independent_ruler = {
limit = {
ai = yes
culture = PREV
religion = PREV
lower_real_tier_than = KING
}

set_defacto_liege = PREV
}
}
else_if = {
limit = {
Expand Down Expand Up @@ -1566,17 +1599,6 @@ new_crusade = {
destroy_landed_title = THIS
}
}

any_neighbor_independent_ruler = {
limit = {
ai = yes
culture = PREV
religion = PREV
lower_real_tier_than = KING
}

set_defacto_liege = PREV
}
}
}

Expand All @@ -1586,12 +1608,40 @@ new_crusade = {
c_kaneia = {
holder_scope = {
ai = yes

OR = {
any_war = {
using_cb = new_crusade
any_defender = { character = PREVPREV }
}

any_liege = {
any_war = {
using_cb = new_crusade
any_defender = { character = PREVPREV }
}
}
}
}
}

c_chandax = {
holder_scope = {
ai = yes

OR = {
any_war = {
using_cb = new_crusade
any_defender = { character = PREVPREV }
}

any_liege = {
any_war = {
using_cb = new_crusade
any_defender = { character = PREVPREV }
}
}
}
}
}

Expand Down
72 changes: 36 additions & 36 deletions CleanSlate/common/laws/crown_laws.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ de_jure_laws = {
}

pass_effect = {
log = "crown_authority_0 pass ([This.GetFullBaseName])"
revoke_law = crown_authority_1
revoke_law = crown_authority_2
revoke_law = crown_authority_3
revoke_law = crown_authority_4
# log = "crown_authority_0 pass ([This.GetFullBaseName])"
decreased_crown_authority_effect = yes
}

effect = {
log = "crown_authority_0 ([This.GetFullBaseName])"
# log = "crown_authority_0 ([This.GetFullBaseName])"
revoke_law = crown_authority_1
revoke_law = crown_authority_2
revoke_law = crown_authority_3
revoke_law = crown_authority_4
set_the_kings_peace = no
set_the_kings_full_peace = no
set_protected_inheritance = no
Expand Down Expand Up @@ -90,11 +90,7 @@ de_jure_laws = {
}

pass_effect = {
log = "crown_authority_1 pass ([This.GetFullBaseName])"
revoke_law = crown_authority_0
revoke_law = crown_authority_2
revoke_law = crown_authority_3
revoke_law = crown_authority_4
# log = "crown_authority_1 pass ([This.GetFullBaseName])"

if = {
limit = { has_law = crown_authority_0 }
Expand All @@ -106,7 +102,11 @@ de_jure_laws = {
}

effect = {
log = "crown_authority_1 ([This.GetFullBaseName])"
# log = "crown_authority_1 ([This.GetFullBaseName])"
revoke_law = crown_authority_0
revoke_law = crown_authority_2
revoke_law = crown_authority_3
revoke_law = crown_authority_4
set_the_kings_peace = no
set_the_kings_full_peace = no
set_protected_inheritance = no
Expand Down Expand Up @@ -164,11 +164,7 @@ de_jure_laws = {
}

pass_effect = {
log = "crown_authority_2 pass ([This.GetFullBaseName])"
revoke_law = crown_authority_0
revoke_law = crown_authority_1
revoke_law = crown_authority_3
revoke_law = crown_authority_4
# log = "crown_authority_2 pass ([This.GetFullBaseName])"

if = {
limit = { has_law = crown_authority_1 }
Expand All @@ -180,7 +176,11 @@ de_jure_laws = {
}

effect = {
log = "crown_authority_2 ([This.GetFullBaseName])"
# log = "crown_authority_2 ([This.GetFullBaseName])"
revoke_law = crown_authority_0
revoke_law = crown_authority_1
revoke_law = crown_authority_3
revoke_law = crown_authority_4
set_the_kings_peace = yes
set_the_kings_full_peace = no
set_protected_inheritance = no
Expand Down Expand Up @@ -238,11 +238,7 @@ de_jure_laws = {
}

pass_effect = {
log = "crown_authority_3 pass ([This.GetFullBaseName])"
revoke_law = crown_authority_0
revoke_law = crown_authority_1
revoke_law = crown_authority_2
revoke_law = crown_authority_4
# log = "crown_authority_3 pass ([This.GetFullBaseName])"

if = {
limit = { has_law = crown_authority_2 }
Expand All @@ -254,7 +250,11 @@ de_jure_laws = {
}

effect = {
log = "crown_authority_3 ([This.GetFullBaseName])"
# log = "crown_authority_3 ([This.GetFullBaseName])"
revoke_law = crown_authority_0
revoke_law = crown_authority_1
revoke_law = crown_authority_2
revoke_law = crown_authority_4
set_the_kings_peace = yes
set_the_kings_full_peace = no
set_protected_inheritance = yes
Expand Down Expand Up @@ -310,16 +310,16 @@ de_jure_laws = {
}

pass_effect = {
log = "crown_authority_4 pass ([This.GetFullBaseName])"
revoke_law = crown_authority_0
revoke_law = crown_authority_1
revoke_law = crown_authority_2
revoke_law = crown_authority_3
# log = "crown_authority_4 pass ([This.GetFullBaseName])"
increased_crown_authority_effect = yes
}

effect = {
log = "crown_authority_4 ([This.GetFullBaseName])"
# log = "crown_authority_4 ([This.GetFullBaseName])"
revoke_law = crown_authority_0
revoke_law = crown_authority_1
revoke_law = crown_authority_2
revoke_law = crown_authority_3
set_the_kings_peace = yes
set_the_kings_full_peace = yes
set_protected_inheritance = yes
Expand Down Expand Up @@ -366,12 +366,12 @@ de_jure_laws = {
}

pass_effect = {
log = "investiture_law_0 ([This.GetFullBaseName])"
revoke_law = investiture_law_1
# log = "investiture_law_0 ([This.GetFullBaseName])"
}

effect = {
log = "investiture_law_0 pass ([This.GetFullBaseName])"
# log = "investiture_law_0 pass ([This.GetFullBaseName])"
revoke_law = investiture_law_1
set_investiture = head
}

Expand Down Expand Up @@ -401,12 +401,12 @@ de_jure_laws = {
}

pass_effect = {
log = "investiture_law_1 ([This.GetFullBaseName])"
revoke_law = investiture_law_0
# log = "investiture_law_1 ([This.GetFullBaseName])"
}

effect = {
log = "investiture_law_1 pass ([This.GetFullBaseName])"
# log = "investiture_law_1 pass ([This.GetFullBaseName])"
revoke_law = investiture_law_0
set_investiture = any
}

Expand Down
Loading

0 comments on commit 0916e44

Please sign in to comment.