variety of fixes again
This commit is contained in:
parent
7d3ffa90aa
commit
efbcadee2c
5 changed files with 186 additions and 36 deletions
|
|
@ -767,42 +767,50 @@ is_preferred_heresy = {
|
|||
HERETICAL_FAITH = $HERETICAL_FAITH$
|
||||
}
|
||||
|
||||
# OR = {
|
||||
# #If we're Chistian, pick a heretical faiths which is in the same regional group as our origin faith (i.e., Lollards for Catholics, Iconoclasts for Orthodox, etc.)
|
||||
# AND = {
|
||||
# OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion }
|
||||
# OR = {
|
||||
# faiths_are_in_western_christianity_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ }
|
||||
# faiths_are_in_orthodox_christianity_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ }
|
||||
# faiths_are_in_eastern_christianity_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ }
|
||||
# }
|
||||
# }
|
||||
#
|
||||
# #If we're Muslim, we want to stay within our 'branch' of Islam:
|
||||
# AND = {
|
||||
# religion_tag = islam_religion
|
||||
# OR = {
|
||||
# faiths_are_in_sunni_islam_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
|
||||
# faiths_are_in_shia_islam_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
|
||||
# faiths_are_in_muhakkima_islam_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
|
||||
# }
|
||||
# }
|
||||
# #If we're Zoroastrian, we don't want Sogdian faith in Armenia and vice versa
|
||||
# AND = {
|
||||
# religion_tag = zoroastrianism_religion
|
||||
# OR = {
|
||||
# faiths_are_eastern_zoroastrian = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
|
||||
# faiths_are_western_zoroastrian = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
|
||||
# }
|
||||
# }
|
||||
#
|
||||
# #Otherwise, we don't have any special preferences.
|
||||
# NOT = {
|
||||
# religion_tag = islam_religion
|
||||
# OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion }
|
||||
# religion_tag = zoroastrianism_religion
|
||||
# }
|
||||
# }
|
||||
OR = {
|
||||
#If we're Chistian, pick a heretical faiths which is in the same regional group as our origin faith
|
||||
AND = {
|
||||
$ORIGIN_FAITH$ = {
|
||||
OR = {
|
||||
religion_tag = eastern_orthodox_religion
|
||||
religion_tag = catholic_religion
|
||||
religion_tag = protestant_religion
|
||||
}
|
||||
}
|
||||
OR = {
|
||||
faiths_are_in_western_christianity_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ }
|
||||
faiths_are_in_orthodox_christianity_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ }
|
||||
faiths_are_in_eastern_christianity_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ }
|
||||
}
|
||||
}
|
||||
|
||||
# If we are British
|
||||
AND = {
|
||||
$ORIGIN_FAITH$ = {
|
||||
OR = {
|
||||
religion_tag = thelema_religion
|
||||
religion_tag = britannic_religion
|
||||
religion_tag = wicca_religion
|
||||
religion_tag = druidic_religion
|
||||
this = faith:celtic
|
||||
this = faith:presbyterian
|
||||
this = faith:anglican
|
||||
}
|
||||
}
|
||||
OR = {
|
||||
faiths_are_in_british_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ }
|
||||
}
|
||||
}
|
||||
|
||||
#Otherwise, we don't have any special preferences.
|
||||
NOR = {
|
||||
religion_tag = islam_religion
|
||||
religion_tag = eastern_orthodox_religion
|
||||
religion_tag = catholic_religion
|
||||
religion_tag = protestant_religion
|
||||
religion_tag = zoroastrianism_religion
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
is_valid_heresy = {
|
||||
|
|
@ -878,6 +886,50 @@ no_heretical_hof_faith_trigger = { #Head of Faith shouldn't convert.
|
|||
}
|
||||
}
|
||||
|
||||
#British Heresies
|
||||
|
||||
faiths_are_in_british_group = { # Britannic religion, Thelema religion, Wicca religion, Druidic, Anglican, Presbyterian, Celtic Church
|
||||
OR = {
|
||||
$FAITH_1$.religion = religion:thelema_religion
|
||||
$FAITH_1$.religion = religion:britannic_religion
|
||||
$FAITH_1$.religion = religion:wicca_religion
|
||||
$FAITH_1$.religion = religion:druidic_religion
|
||||
$FAITH_1$ = faith:anglican
|
||||
$FAITH_1$ = faith:presbyterian
|
||||
$FAITH_1$ = faith:celtic
|
||||
}
|
||||
OR = { # these are all heresies of each other
|
||||
$FAITH_2$.religion = religion:thelema_religion
|
||||
$FAITH_2$.religion = religion:britannic_religion
|
||||
$FAITH_2$.religion = religion:wicca_religion
|
||||
$FAITH_2$.religion = religion:druidic_religion
|
||||
$FAITH_2$ = faith:anglican
|
||||
$FAITH_2$ = faith:presbyterian
|
||||
$FAITH_2$ = faith:celtic
|
||||
}
|
||||
}
|
||||
|
||||
faiths_are_in_french_group = { # Novelist religion, Pantheonic religion
|
||||
OR = {
|
||||
$FAITH_1$.religion = religion:thelema_religion
|
||||
$FAITH_1$.religion = religion:britannic_religion
|
||||
$FAITH_1$.religion = religion:wicca_religion
|
||||
$FAITH_1$.religion = religion:druidic_religion
|
||||
$FAITH_1$ = faith:anglican
|
||||
$FAITH_1$ = faith:presbyterian
|
||||
$FAITH_1$ = faith:celtic
|
||||
}
|
||||
OR = { # these are all heresies of each other
|
||||
$FAITH_2$.religion = religion:thelema_religion
|
||||
$FAITH_2$.religion = religion:britannic_religion
|
||||
$FAITH_2$.religion = religion:wicca_religion
|
||||
$FAITH_2$.religion = religion:druidic_religion
|
||||
$FAITH_2$ = faith:anglican
|
||||
$FAITH_2$ = faith:presbyterian
|
||||
$FAITH_2$ = faith:celtic
|
||||
}
|
||||
}
|
||||
|
||||
##Christian Heresy Groups
|
||||
#faiths_are_in_western_christianity_group = {
|
||||
# OR = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue