diff --git a/common/customizable_localization/00_divinity_custom_loc.txt b/common/customizable_localization/00_divinity_custom_loc.txt index 1823e492..6fe1f151 100644 --- a/common/customizable_localization/00_divinity_custom_loc.txt +++ b/common/customizable_localization/00_divinity_custom_loc.txt @@ -38,18 +38,18 @@ ToleranceValue = { } } } - text = { - localization_key = tolerance_evil - - trigger = { - faith = { - faith_hostility_level = { - target = scope:second.faith - value = faith_evil_level - } - } - } - } +# text = { +# localization_key = tolerance_evil +# +# trigger = { +# faith = { +# faith_hostility_level = { +# target = scope:second.faith +# value = faith_evil_level +# } +# } +# } +# } } ToleranceValueConcept = { @@ -702,62 +702,112 @@ GetActualBishopTitle = { localization_key = councillor_court_chaplain_zunism_religion_duchy } - # Zoroastrianism + #Thelema text = { trigger = { - highest_held_title_tier >= tier_kingdom - NOT = { # Required formatting to include male/female check as well as vacancy - cp:councillor_court_chaplain ?= { - is_female = yes - } + highest_held_title_tier >= tier_empire + OR = { + faith.religion = faith:victorian.religion + faith.religion = faith:royal_thelema.religion + faith.religion = faith:old_thelema.religion + faith.religion = faith:carcosan.religion } - fp3_custom_divinity_for_zoroastrianism_faiths = yes } - localization_key = councillor_court_chaplain_zoroastrianism_religion_kingdom + localization_key = councillor_court_chaplain_thelema_religion_empire } text = { trigger = { highest_held_title_tier >= tier_kingdom - NOT = { # Required formatting to include male/female check as well as vacancy - cp:councillor_court_chaplain ?= { - is_female = no - } + OR = { + faith.religion = faith:victorian.religion + faith.religion = faith:royal_thelema.religion + faith.religion = faith:old_thelema.religion + faith.religion = faith:carcosan.religion } - fp3_custom_divinity_for_zoroastrianism_faiths = yes } - localization_key = councillor_court_chaplain_zoroastrianism_religion_kingdom_female + localization_key = councillor_court_chaplain_thelema_religion_kingdom } text = { trigger = { highest_held_title_tier >= tier_duchy - NOT = { # Required formatting to include male/female check as well as vacancy - cp:councillor_court_chaplain ?= { - is_female = yes - } + OR = { + faith.religion = faith:victorian.religion + faith.religion = faith:royal_thelema.religion + faith.religion = faith:old_thelema.religion + faith.religion = faith:carcosan.religion } - fp3_custom_divinity_for_zoroastrianism_faiths = yes } - localization_key = councillor_court_chaplain_zoroastrianism_religion_duchy - } - text = { - trigger = { - highest_held_title_tier >= tier_duchy - NOT = { # Required formatting to include male/female check as well as vacancy - cp:councillor_court_chaplain ?= { - is_female = no - } - } - fp3_custom_divinity_for_zoroastrianism_faiths = yes - } - localization_key = councillor_court_chaplain_zoroastrianism_religion_duchy_female + localization_key = councillor_court_chaplain_thelema_religion_duchy } text = { trigger = { highest_held_title_tier < tier_duchy - fp3_custom_divinity_for_zoroastrianism_faiths = yes + OR = { + faith.religion = faith:victorian.religion + faith.religion = faith:royal_thelema.religion + faith.religion = faith:old_thelema.religion + faith.religion = faith:carcosan.religion + } } - localization_key = councillor_court_chaplain_zoroastrianism_religion_county + localization_key = councillor_court_chaplain_thelema_religion_county } + +# # Zoroastrianism +# text = { +# trigger = { +# highest_held_title_tier >= tier_kingdom +# NOT = { # Required formatting to include male/female check as well as vacancy +# cp:councillor_court_chaplain ?= { +# is_female = yes +# } +# } +# #fp3_custom_divinity_for_zoroastrianism_faiths = yes +# } +# localization_key = councillor_court_chaplain_zoroastrianism_religion_kingdom +# } +# text = { +# trigger = { +# highest_held_title_tier >= tier_kingdom +# NOT = { # Required formatting to include male/female check as well as vacancy +# cp:councillor_court_chaplain ?= { +# is_female = no +# } +# } +# #fp3_custom_divinity_for_zoroastrianism_faiths = yes +# } +# localization_key = councillor_court_chaplain_zoroastrianism_religion_kingdom_female +# } +# text = { +# trigger = { +# highest_held_title_tier >= tier_duchy +# NOT = { # Required formatting to include male/female check as well as vacancy +# cp:councillor_court_chaplain ?= { +# is_female = yes +# } +# } +# #fp3_custom_divinity_for_zoroastrianism_faiths = yes +# } +# localization_key = councillor_court_chaplain_zoroastrianism_religion_duchy +# } +# text = { +# trigger = { +# highest_held_title_tier >= tier_duchy +# NOT = { # Required formatting to include male/female check as well as vacancy +# cp:councillor_court_chaplain ?= { +# is_female = no +# } +# } +# #fp3_custom_divinity_for_zoroastrianism_faiths = yes +# } +# localization_key = councillor_court_chaplain_zoroastrianism_religion_duchy_female +# } +# text = { +# trigger = { +# highest_held_title_tier < tier_duchy +# fp3_custom_divinity_for_zoroastrianism_faiths = yes +# } +# localization_key = councillor_court_chaplain_zoroastrianism_religion_county +# } # African Roog text = { trigger = { @@ -982,28 +1032,28 @@ GetActualBishopTitle = { text = { trigger = { highest_held_title_tier >= tier_empire - faith.religion = faith:rabbinism.religion + faith.religion = faith:congregationist.religion } localization_key = councillor_court_chaplain_judaism_religion_empire } text = { trigger = { highest_held_title_tier >= tier_kingdom - faith.religion = faith:rabbinism.religion + faith.religion = faith:congregationist.religion } localization_key = councillor_court_chaplain_judaism_religion_kingdom } text = { trigger = { highest_held_title_tier >= tier_duchy - faith.religion = faith:rabbinism.religion + faith.religion = faith:congregationist.religion } localization_key = councillor_court_chaplain_judaism_religion_duchy } text = { trigger = { highest_held_title_tier < tier_duchy - faith.religion = faith:rabbinism.religion + faith.religion = faith:congregationist.religion } localization_key = councillor_court_chaplain_judaism_religion_county } @@ -1497,57 +1547,6 @@ GetActualBishopTitle = { } localization_key = councillor_court_chaplain_paganism_religion_county } - - #Thelema - text = { - trigger = { - highest_held_title_tier >= tier_empire - OR = { - faith.religion = faith:victorian.religion - faith.religion = faith:royal_thelema.religion - faith.religion = faith:old_thelema.religion - faith.religion = faith:carcosan.religion - } - } - localization_key = councillor_court_chaplain_thelema_religion_empire - } - text = { - trigger = { - highest_held_title_tier >= tier_kingdom - OR = { - faith.religion = faith:victorian.religion - faith.religion = faith:royal_thelema.religion - faith.religion = faith:old_thelema.religion - faith.religion = faith:carcosan.religion - } - } - localization_key = councillor_court_chaplain_thelema_religion_kingdom - } - text = { - trigger = { - highest_held_title_tier >= tier_duchy - OR = { - faith.religion = faith:victorian.religion - faith.religion = faith:royal_thelema.religion - faith.religion = faith:old_thelema.religion - faith.religion = faith:carcosan.religion - } - } - localization_key = councillor_court_chaplain_thelema_religion_duchy - } - text = { - trigger = { - highest_held_title_tier < tier_duchy - OR = { - faith.religion = faith:victorian.religion - faith.religion = faith:royal_thelema.religion - faith.religion = faith:old_thelema.religion - faith.religion = faith:carcosan.religion - } - } - localization_key = councillor_court_chaplain_thelema_religion_county - } - #Fallback text = { trigger = { @@ -1896,28 +1895,28 @@ GetActualBishopTitlePossessive = { text = { trigger = { highest_held_title_tier >= tier_empire - faith.religion = faith:rabbinism.religion + faith.religion = faith:congregationist.religion } localization_key = councillor_court_chaplain_judaism_religion_empire_possessive } text = { trigger = { highest_held_title_tier >= tier_kingdom - faith.religion = faith:rabbinism.religion + faith.religion = faith:congregationist.religion } localization_key = councillor_court_chaplain_judaism_religion_kingdom_possessive } text = { trigger = { highest_held_title_tier >= tier_duchy - faith.religion = faith:rabbinism.religion + faith.religion = faith:congregationist.religion } localization_key = councillor_court_chaplain_judaism_religion_duchy_possessive } text = { trigger = { highest_held_title_tier < tier_duchy - faith.religion = faith:rabbinism.religion + faith.religion = faith:congregationist.religion } localization_key = councillor_court_chaplain_judaism_religion_county_possessive } @@ -2088,7 +2087,7 @@ GetActualBishopTitlePossessive = { } localization_key = councillor_court_chaplain_thelema_religion_county_possessive } - + #Buddhism/Hinduism/Jainism text = { trigger = { diff --git a/common/religion/religions/NEOW_thelema.txt b/common/religion/religions/NEOW_thelema.txt index eedfc801..207108ad 100644 --- a/common/religion/religions/NEOW_thelema.txt +++ b/common/religion/religions/NEOW_thelema.txt @@ -323,6 +323,8 @@ WitchGodHerHim = CHARACTER_HERHIM_HER WitchGodMistressMaster = mistress WitchGodMotherFather = mother + ReligiousHeadName = victorian_religious_head_title + ReligiousHeadTitleName = victorian_religious_head_title_name } } diff --git a/localization/english/council_l_english.yml b/localization/english/replace/council_l_english.yml similarity index 98% rename from localization/english/council_l_english.yml rename to localization/english/replace/council_l_english.yml index f734bd2d..3fc507f0 100644 --- a/localization/english/council_l_english.yml +++ b/localization/english/replace/council_l_english.yml @@ -83,7 +83,7 @@ councillor_court_chaplain_theocrat_county_possessive:1 "Suffragan Bishop's" councillor_court_chaplain_theocrat_duchy:1 "Bishop" councillor_court_chaplain_theocrat_duchy_possessive:1 "Bishop's" - councillor_court_chaplain_theocrat_kingdom:1 "Archbishop" + councillor_court_chaplain_theocrat_kingdom:1 "PArchbishop" councillor_court_chaplain_theocrat_kingdom_possessive:1 "Archbishop's" councillor_court_chaplain_theocrat_empire:0 "Patriarch" councillor_court_chaplain_theocrat_empire_female:0 "Matriarch" @@ -161,17 +161,16 @@ councillor_court_chaplain_buddhism_religion_empire_possessive:0 "Marajpurohit's" # Thelema - councillor_court_chaplain_thelema_religion_county:0 "Magi" - councillor_court_chaplain_thelema_religion_county_female:0 "Magi" - councillor_court_chaplain_thelema_religion_county_possessive:0 "Magi's" + councillor_court_chaplain_thelema_religion_county:0 "Court Magus" + councillor_court_chaplain_thelema_religion_county_female:0 "Court Magus" + councillor_court_chaplain_thelema_religion_county_possessive:0 "Court Magi's" councillor_court_chaplain_thelema_religion_county_female_possessive:0 "Magi's" - councillor_court_chaplain_thelema_religion_duchy:0 "Wizard" - councillor_court_chaplain_thelema_religion_duchy_possessive:0 "Wizard's" - councillor_court_chaplain_thelema_religion_kingdom:0 "Archmagister's" - councillor_court_chaplain_thelema_religion_kingdom_possessive:0 "Archmagister's" - councillor_court_chaplain_thelema_religion_empire:0 "Grandmaster" - councillor_court_chaplain_thelema_religion_empire_possessive:0 "Grandmaster'" - + councillor_court_chaplain_thelema_religion_duchy:0 "Magus" + councillor_court_chaplain_thelema_religion_duchy_possessive:0 "Magus's" + councillor_court_chaplain_thelema_religion_kingdom:0 "Archmagus" + councillor_court_chaplain_thelema_religion_kingdom_possessive:0 "Archmagus's" + councillor_court_chaplain_thelema_religion_empire:0 "Grandmagus" + councillor_court_chaplain_thelema_religion_empire_possessive:0 "Grandmagus'" # Dualism (Didaskalos) (Ecclesiarch) (Patriarch/Matriarch) councillor_court_chaplain_dualism_religion_county:0 "Didaskalos" diff --git a/localization/english/replace/religion/zz_NEOW_religion_thelema_l_english.yml b/localization/english/replace/religion/zz_NEOW_religion_thelema_l_english.yml index 73c2e127..252c56a5 100644 --- a/localization/english/replace/religion/zz_NEOW_religion_thelema_l_english.yml +++ b/localization/english/replace/religion/zz_NEOW_religion_thelema_l_english.yml @@ -18,8 +18,8 @@ thelema_house_of_worship_plural:0 "lodges" thelema_religious_symbol:0 "Hexagram" thelema_religious_text:0 "Book of the Law" - thelema_religious_head_title:0 "Grandmaster" - thelema_religious_head_title_name:0 "Grand Lodge of Britannia" + thelema_religious_head_title:0 "Supreme Grandmaster" + thelema_religious_head_title_name:0 "United Grand Lodge" thelema_devotee:0 "occultist" thelema_devotee_plural:0 "occultists" thelema_priest:0 "mage" @@ -62,18 +62,18 @@ royal_thelema_religious_head_title:0 "WIP" royal_thelema_religious_head_title_name:0 "WIP" - victorian:0 "Victorianism" + victorian:0 "United Grand Lodge of Victoria Gloriana" victorian_adj:0 "Victorian" victorian_adherent:0 "Victorian" victorian_adherent_plural:0 "Victorians" victorian_desc:0 "Victorian Thelemites worship Victoria Gloriana, the Queen of the Heavens. Long ago, the Queen ruled all the seas of the earth from the Golden Throne, which was granted to her by the sea goddess Britannia. However, during the final days of the Empire, the great Queen ascended to the Heavens, leaving behind her regents - the Lord Protectors - to care for her mortal subjects. The Queen's ascension heralded the beginning of the Aeon of Ma'at, in which the spiritual world bleeds through to the material one. And so, those initiated into the faith's secretive magical Lodges seek harmony with the faeries and living gods of their world, while the royal cadres of holy knights fulfil their oaths to the ancient empire with unwavering loyalty." victorian_religious_head_title:0 "Supreme Headmaster" - victorian_religious_head_title_name:0 "Supreme Headmaster" + victorian_religious_head_title_name:0 "United Grand Lodge" victorian_high_god_name:0 "Victoria Gloriana" victorian_high_god_name_possessive:0 "Victoria Gloriana's" - victorian_house_of_worship:0 "temple" - victorian_house_of_worship_plural:0 "temples" + victorian_house_of_worship:0 "lodge" + victorian_house_of_worship_plural:0 "lodges" victorian_priest:0 "magus" victorian_priest_plural:0 "magi" victorian_bishop:0 "archimagus" diff --git a/localization/english/titles_l_english.yml b/localization/english/titles_l_english.yml index 9700b734..75fc8e1d 100644 --- a/localization/english/titles_l_english.yml +++ b/localization/english/titles_l_english.yml @@ -25382,7 +25382,7 @@ d_anglican_hof_adj:0 "Anglican" d_lutheran_hof:0 "Archprimacy of Lund" d_lutheran_hof_adj:0 "Liturgical" - d_united_grand_lodge:0 "United Victorian Lodges" + d_united_grand_lodge:0 "United Grand Lodge" d_united_grand_lodge_adj:0 "Victorian" #### Spain ####