From 30fd7d0d2e6a4b9811cdd73c4886e13e6e86553a Mon Sep 17 00:00:00 2001 From: Magpie490 Date: Fri, 15 Nov 2024 14:22:14 +0000 Subject: [PATCH] AI SLOP IMPROVED --- common/religion/doctrines/00_core_tenets.txt | 61 +++++++++++++++++++ .../doctrines/02_doctrines_special.txt | 11 +++- common/religion/religions/NEOW_calvinist.txt | 2 +- common/religion/religions/NEOW_catholic.txt | 6 ++ common/religion/religions/NEOW_novelist.txt | 8 ++- common/religion/religions/NEOW_thelema.txt | 3 +- common/religion/religions/NEOW_wicca.txt | 3 +- .../one_king_to_rule_them_all.dds | 3 + .../men_at_arms_big/handgonners.dds | 4 +- .../men_at_arms_small/handgonners.dds | 4 +- .../NEOW_religion_core_tenets_l_english.yml | 5 ++ 11 files changed, 100 insertions(+), 10 deletions(-) create mode 100644 gfx/interface/icons/faith_doctrines/one_king_to_rule_them_all.dds diff --git a/common/religion/doctrines/00_core_tenets.txt b/common/religion/doctrines/00_core_tenets.txt index 560afebf..08ba5b4d 100644 --- a/common/religion/doctrines/00_core_tenets.txt +++ b/common/religion/doctrines/00_core_tenets.txt @@ -866,6 +866,67 @@ } } + tenet_people_of_the_book = { + icon = core_tenet_legalism + is_shown = { + religion_tag = novelist_religion + } + can_pick = { + custom_description = { + text = incompatible_tenet_hedonistic_trigger + NOT = { doctrine:tenet_hedonistic = { is_in_list = selected_doctrines } } + } + } + piety_cost = { + value = faith_tenet_cost_low + # Multiplier for keeping same tenet + if = { + limit = { has_doctrine = tenet_universal_scripture } + multiply = faith_unchanged_doctrine_cost_mult + } + } + + parameters = { + mendicant_preachers_conversion_active = yes + pilgrimage_decision_active = yes + unlock_voluntary_laampdom_faith = yes + take_vows_active = yes + hostility_override_special_doctrine_christian = 1 + } + traits = { + virtues = { temperate } + sins = { gluttonous } + } + } + + one_king_to_rule_them_all = { + icon = one_king_to_rule_them_all + is_shown = { + religion_tag = novelist_religion + } + piety_cost = { + value = faith_tenet_cost_low + # Multiplier for keeping same tenet + if = { + limit = { has_doctrine = tenet_universal_scripture } + multiply = faith_unchanged_doctrine_cost_mult + } + } + + traits = { + virtues = { just = 2 } + sins = { arbitrary = 2 } + } + + parameters = { + temporal_condemnation_enabled = yes + legalism_modified_law_costs = yes + legalism_modified_law_costs_2 = yes + legalism_reduced_faction_virtues = yes + legalism_increased_faction_sins = yes + legalism_trust_just_leader_active = yes + } + } tenet_universal_scripture = { icon = core_tenet_literalism is_shown = { diff --git a/common/religion/doctrines/02_doctrines_special.txt b/common/religion/doctrines/02_doctrines_special.txt index 3d75c3f5..e221eef5 100644 --- a/common/religion/doctrines/02_doctrines_special.txt +++ b/common/religion/doctrines/02_doctrines_special.txt @@ -97,7 +97,7 @@ is_gnostic_faith = { special_tolerance = { group = "main_group" - + number_of_picks = 2 is_available_on_create = { always = no # Goes away when creating a new Faith } @@ -112,6 +112,15 @@ special_tolerance = { hostility_override_special_doctrine_catholic_rite = 0 } } + special_doctrine_christian = { + visible = no + } + special_doctrine_novelist = { + visible = no + } + special_doctrine_esoteric_witchcraft = { + visible = no + } special_doctrine_novelist_kinship = { parameters = { hostility_override_special_doctrine_novelist_kinship = 0 diff --git a/common/religion/religions/NEOW_calvinist.txt b/common/religion/religions/NEOW_calvinist.txt index 5e4889a8..f730ca51 100644 --- a/common/religion/religions/NEOW_calvinist.txt +++ b/common/religion/religions/NEOW_calvinist.txt @@ -255,7 +255,7 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - doctrine = special_doctrine_novelist_cousin + doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_catholic_communion diff --git a/common/religion/religions/NEOW_catholic.txt b/common/religion/religions/NEOW_catholic.txt index 33e0f8c8..d983a4c3 100644 --- a/common/religion/religions/NEOW_catholic.txt +++ b/common/religion/religions/NEOW_catholic.txt @@ -256,6 +256,7 @@ #Special Tolerance | placeholder doctrine = special_doctrine_novelist_cousin + doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_catholic_communion @@ -332,6 +333,7 @@ #Special Tolerance | placeholder doctrine = special_doctrine_catholic_rite + doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_catholic_communion @@ -408,6 +410,7 @@ #Special Tolerance | placeholder doctrine = special_doctrine_ecumenical_christian + doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_catholic_communion @@ -484,6 +487,7 @@ #Special Tolerance | placeholder doctrine = special_doctrine_catholic_rite + doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_communion @@ -560,6 +564,7 @@ #Special Tolerance | placeholder doctrine = special_doctrine_catholic_rite + doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_catholic_communion @@ -636,6 +641,7 @@ #Special Tolerance | placeholder doctrine = special_doctrine_catholic_rite + doctrine = special_doctrine_christian #Tenets | placeholder doctrine = tenet_catholic_communion diff --git a/common/religion/religions/NEOW_novelist.txt b/common/religion/religions/NEOW_novelist.txt index c013a2d6..5e4017ed 100644 --- a/common/religion/religions/NEOW_novelist.txt +++ b/common/religion/religions/NEOW_novelist.txt @@ -255,6 +255,7 @@ #Special Tolerance | placeholder doctrine = special_doctrine_novelist_kinship + doctrine = special_doctrine_novelist #Tenets | add unique ones eventually doctrine = tenet_universal_scripture @@ -331,6 +332,7 @@ #Special Tolerance | placeholder doctrine = special_doctrine_novelist_kinship + doctrine = special_doctrine_novelist #Tenets | add unique ones eventually doctrine = tenet_universal_scripture @@ -407,11 +409,12 @@ #Special Tolerance | placeholder doctrine = special_doctrine_novelist_kinship + doctrine = special_doctrine_novelist #Tenets | add unique ones eventually doctrine = tenet_universal_scripture - doctrine = tenet_asceticism - doctrine = tenet_mendicant_preachers + doctrine = tenet_people_of_the_book + doctrine = one_king_to_rule_them_all holy_order_names = { #placeholder { name = "holy_order_knights_templar" coat_of_arms = "ho_knights_templar" } @@ -483,6 +486,7 @@ #Special Tolerance | placeholder doctrine = special_doctrine_novelist_kinship + doctrine = special_doctrine_novelist #Tenets | placeholder doctrine = tenet_communion diff --git a/common/religion/religions/NEOW_thelema.txt b/common/religion/religions/NEOW_thelema.txt index b6f84c43..b6b3827c 100644 --- a/common/religion/religions/NEOW_thelema.txt +++ b/common/religion/religions/NEOW_thelema.txt @@ -254,11 +254,12 @@ #Special Tolerance | placeholder #doctrine = special_doctrine_ecumenical_christian + doctrine = special_doctrine_esoteric_witchcraft #Tenets | WIP doctrine = tenet_carnal_exaltation doctrine = tenet_astrology - doctrine = tenet_esotericism + doctrine = tenet_hedonistic holy_order_names = { #placeholder { name = "holy_order_knights_templar" coat_of_arms = "ho_knights_templar" } diff --git a/common/religion/religions/NEOW_wicca.txt b/common/religion/religions/NEOW_wicca.txt index 484613a3..e3b13dee 100644 --- a/common/religion/religions/NEOW_wicca.txt +++ b/common/religion/religions/NEOW_wicca.txt @@ -253,7 +253,8 @@ #holy_site = segrada_familia #Special Tolerance | placeholder - doctrine = special_doctrine_ecumenical_christian + #doctrine = special_doctrine_ecumenical_christian + doctrine = special_doctrine_esoteric_witchcraft #Tenets | placeholder doctrine = tenet_vows_of_poverty diff --git a/gfx/interface/icons/faith_doctrines/one_king_to_rule_them_all.dds b/gfx/interface/icons/faith_doctrines/one_king_to_rule_them_all.dds new file mode 100644 index 00000000..669538c6 --- /dev/null +++ b/gfx/interface/icons/faith_doctrines/one_king_to_rule_them_all.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90078e0eb1a2985438cab241057a31ff2679bc301acc13e4ce171aa75895b87a +size 416128 diff --git a/gfx/interface/illustrations/men_at_arms_big/handgonners.dds b/gfx/interface/illustrations/men_at_arms_big/handgonners.dds index 96ca05c3..d652656d 100644 --- a/gfx/interface/illustrations/men_at_arms_big/handgonners.dds +++ b/gfx/interface/illustrations/men_at_arms_big/handgonners.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9861a3ee815ca48c6a9c545592d272e0e97430703ee538e0b7e782a2a1fd747e -size 136128 +oid sha256:621e6cd7ef06eb3899f68c181f8991555120391b7115a4d9b7bb84d89a4762eb +size 1088128 diff --git a/gfx/interface/illustrations/men_at_arms_small/handgonners.dds b/gfx/interface/illustrations/men_at_arms_small/handgonners.dds index 55be3f1f..edbfc5c1 100644 --- a/gfx/interface/illustrations/men_at_arms_small/handgonners.dds +++ b/gfx/interface/illustrations/men_at_arms_small/handgonners.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1ba66704d315448af3313396c083ce00707023f4159bce16d27e168d31b3b39 -size 12928 +oid sha256:75dfe843a0d3c000114915a171d86dd2e7dadaf614754d3ca7537be813528370 +size 102528 diff --git a/localization/english/replace/religion/NEOW_religion_core_tenets_l_english.yml b/localization/english/replace/religion/NEOW_religion_core_tenets_l_english.yml index 7c57148d..f57a1c49 100644 --- a/localization/english/replace/religion/NEOW_religion_core_tenets_l_english.yml +++ b/localization/english/replace/religion/NEOW_religion_core_tenets_l_english.yml @@ -6,6 +6,7 @@ tenet_catholic_communion_desc:0 "Our Church has undertaken many reforms througho doctrine_parameter_divine_the_stars_active:0 "Allows adherents to Divine the Stars and predict their future" doctrine_parameter_durandal_restoration_active:0 "Rulers may seek to restore Durendal" doctrine_parameter_novelist_title_replace_active:0 "Replaces most kingdom and empire titles in Western Europe" +doctrine_parameter_hostility_override_special_doctrine_christian:0 "Christian [faiths|E] are considered only [GetHostilityLevelName( TOKEN_PARAMETER.GetIntValue )|V]" tenet_lorekeepers_name:0 "Lorekeepers" tenet_lorekeepers_desc:0 "It is the duty of every Novelist to delve deep into the secrets of the world, seeking to unfold the illustrious Author's hidden meanings." tenet_the_first_age_name:0 "The First Age" @@ -16,3 +17,7 @@ tenet_restore_the_crown_name:0 "Restore the Crown" tenet_restore_the_crown_desc:0 "Our eternal Emperor sought to unite whole world under one banner. We must continue where we left off, restoring the Crowns of Carolingia." tenet_universal_scripture_name:0 "Universal Scripture" tenet_universal_scripture_desc:0 "All people are but misguided followers of the one Author. Our attempts to guide them to the truth has merely led to more hostility from those who cannot see it." +tenet_people_of_the_book_name:0 "People of the Book" +tenet_people_of_the_book_desc:0 "We wish for nothing less than to bring our brothers and sisters back into the fold of our faith. Our preachers travel far and wide, spreading the good word of Aslan to all those willing to listen." +one_king_to_rule_them_all_name:0 "One King to Rule Them All" +one_king_to_rule_them_all_desc:0 "The Lion rules not just over Heaven, but also over Earth and the men he died to save. The least we can do is enforce the laws of Heaven upon our worldly realms"