diff --git a/common/landed_titles/alps.txt b/common/landed_titles/alps.txt index 5bfd62b8..c1ead4c3 100644 --- a/common/landed_titles/alps.txt +++ b/common/landed_titles/alps.txt @@ -1,5 +1,5 @@ e_alps = { - color={ 218 234 242 } + color={ 193 226 242 } capital = c_bern can_be_named_after_dynasty = no diff --git a/common/religion/doctrines/30_core_tenets.txt b/common/religion/doctrines/30_core_tenets.txt index 809ef257..bee29940 100644 --- a/common/religion/doctrines/30_core_tenets.txt +++ b/common/religion/doctrines/30_core_tenets.txt @@ -493,40 +493,6 @@ better_study_scheme = yes } } - tenet_wandering_bards = { - icon = tenet_wandering_bards - - is_shown = { - religion_tag = europeanist_religion - } - piety_cost = { - value = faith_tenet_cost_low - # Multiplier for keeping same tenet - if = { - limit = { has_doctrine = tenet_wandering_bards } - multiply = faith_unchanged_doctrine_cost_mult - } - } - - can_pick = { - custom_description = { - text = doctrine_pluralism_fundamentalist_trigger - NOT = { doctrine:doctrine_pluralism_fundamentalist = { is_in_list = selected_doctrines } } - } - } - parameters = { - mendicant_preachers_conversion_active = yes - unlock_voluntary_laampdom_faith = yes - } - traits = { - virtues = { - lifestyle_poet = { - scale = 2 - weight = 1 - } - } - } - } ###TRENCHSINGER### @@ -1181,6 +1147,40 @@ # } # } + ###### GENERIC ##### + + tenet_wandering_bards = { + icon = tenet_wandering_bards + + piety_cost = { + value = faith_tenet_cost_low + # Multiplier for keeping same tenet + if = { + limit = { has_doctrine = tenet_wandering_bards } + multiply = faith_unchanged_doctrine_cost_mult + } + } + + can_pick = { + custom_description = { + text = doctrine_pluralism_fundamentalist_trigger + NOT = { doctrine:doctrine_pluralism_fundamentalist = { is_in_list = selected_doctrines } } + } + } + parameters = { + mendicant_preachers_conversion_active = yes + unlock_voluntary_laampdom_faith = yes + } + traits = { + virtues = { + lifestyle_poet = { + scale = 2 + weight = 1 + } + } + } + } + ###### VANILLA TENETS ###### diff --git a/common/religion/religions/NEOW_druidic.txt b/common/religion/religions/NEOW_druidic.txt index 22bec904..8dc001ed 100644 --- a/common/religion/religions/NEOW_druidic.txt +++ b/common/religion/religions/NEOW_druidic.txt @@ -282,7 +282,7 @@ doctrine = tenet_druidry doctrine = tenet_ancestor_worship - doctrine = tenet_ritual_celebrations + doctrine = tenet_wandering_bards doctrine = special_doctrine_fae_and_folklore } diff --git a/common/religion/religions/NEOW_protestant.txt b/common/religion/religions/NEOW_protestant.txt index f35d4d29..ae04d9b4 100644 --- a/common/religion/religions/NEOW_protestant.txt +++ b/common/religion/religions/NEOW_protestant.txt @@ -420,7 +420,7 @@ #Tenets | placeholder doctrine = tenet_communal_possessions doctrine = tenet_alexandrian_catechism - doctrine = tenet_ritual_celebrations + doctrine = tenet_tenet_wandering_bards doctrine = doctrine_no_head doctrine = doctrine_theocracy_lay_clergy diff --git a/gfx/interface/icons/faith/celtic.dds b/gfx/interface/icons/faith/celtic.dds index d1250637..97e75889 100644 --- a/gfx/interface/icons/faith/celtic.dds +++ b/gfx/interface/icons/faith/celtic.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ed5e540d62f8090236494e0d9fb6fd8df74f75bc1bb12b9cd84ccb95de6c0ea +oid sha256:401836742099fce9df51b55e3b643ea08634ade3b73bddf35b2db08e5c0a37b8 size 40128 diff --git a/gfx/interface/icons/faith/presbyterian.dds b/gfx/interface/icons/faith/presbyterian.dds index 68d7c8b8..c10a37aa 100644 --- a/gfx/interface/icons/faith/presbyterian.dds +++ b/gfx/interface/icons/faith/presbyterian.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8186d21c7bacb1e399a62d2e70ecc91ff3d38b2ae674d83c16dbbe0480c1079 +oid sha256:eeb3c4273c0e48d70e2d9987abe28c09b715558d283a2f86ab6edff478194d2d size 40128 diff --git a/localization/english/replace/religion/doctrines/zz_NEOW_religion_core_tenets_l_english .yml b/localization/english/replace/religion/doctrines/zz_NEOW_religion_core_tenets_l_english .yml index 545e97de..06edfca1 100644 --- a/localization/english/replace/religion/doctrines/zz_NEOW_religion_core_tenets_l_english .yml +++ b/localization/english/replace/religion/doctrines/zz_NEOW_religion_core_tenets_l_english .yml @@ -8,8 +8,6 @@ tenet_scientific_discourse_name:0 "Scientific Discourse" tenet_scientific_discourse_desc:0 "Our faith is fundamentally built on the logical pursuit of truth. Only through rigorous study can we seek to understand the failures of the old world." #Europeanist Tenets - tenet_wandering_bards_name:0 "Wandering Bards" - tenet_wandering_bards_desc:0 "The glory days of our Europa have long since passed. We must reignite the spirit of pan-Europeanism if we wish to herald a second Belle Époque." tenet_five_maxims_name:0 "Five Maxims" tenet_five_maxims_desc:0 "All nobles are expected to adhere to the maxims laid down by our greatest thinkers - Placeholder, Placeholder, Placeholder, Placeholder, and Placeholder. Only through great effort can we seek to understand our great Creator, and they lay the foundations of the path to wisdom." @@ -29,6 +27,11 @@ tenet_communal_possessions_oceanic_name:0 "All Hands on Deck" tenet_communal_possessions_oceanic_desc:0 "As life on water is difficult, everyone is expected to contribute as much as they can to their community. Taking more than one's fair share of plunder and hoarding wealth while others suffer is greatly frowned upon, and mob justice is a frequent form of punishment for the rich and avaricious." + #GENERIC + + tenet_wandering_bards_name:0 "Sacred Poetry" + tenet_wandering_bards_desc:0 "Our faith's religious narratives are shaped by the handiwork of our finest bards and poets. This storytelling tradition will allow our beliefs to persist for thousands of years." + #Abrahamic Tenets rf_antediluvianist:0 "Antediluvianist" @@ -39,7 +42,7 @@ tenet_islamic_rationalism_desc: "$tenet_alexandrian_catechism_desc$" tenet_love_under_will_name:0 "Love Under Will" tenet_do_what_thou_wilt_name:0 "Do What Thou Wilt" - tenet_rule_the_waves_name:0 "Rule The Waves" + tenet_rule_the_waves_name:0 "Rule the Waves" tenet_true_will_name:0 "True Will" tenet_love_under_will_desc:0 "One of the core tenets of Thelema is that of love. To love, and to love freely, is one of the greatest freedoms that man can experience." tenet_do_what_thou_wilt_desc:0 ""Do what thou wilt shall be the whole of the Law" are the words spoken by the prophet Crowley. Thus, all Thelemites are to act according to their True Will, their spiritual destiny." @@ -63,7 +66,7 @@ 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" + tenet_the_first_age_name:0 "Scions of Atlantis" tenet_the_first_age_desc:0 "We must strive to restore the balance of order as it was during the golden age of man. Though many years have passed, our resolve has not yet been lost." tenet_songs_of_roland_name:0 "Songs of Roland" tenet_songs_of_roland_desc:0 "Just as during the gallant knights of yore, our court bards and wandering troubadours recite the songs of heroic knights, inspiring many to seek faith and fortune in distant lands." @@ -81,11 +84,11 @@ 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" - the_book_of_shadows_name:0 "The Book of Shadows" + the_book_of_shadows_name:0 "Book of Shadows" the_book_of_shadows_desc:0 "Since time immemorial, our high priests and grand wizards have always been chosen from among the best. Only through diligent study and practice may one master our Craft." king_of_winter_name:0 "King of Winter" king_of_winter_desc:0 "Our King protects us from the harshness of the winter, and all our priests and laymen value the honourable knight's protection more than any fat king's laws." - the_queen_of_summer_name:0 "The Queen of Summer" + the_queen_of_summer_name:0 "Queen of Summer" the_queen_of_summer_desc:0 "Our Queen gave us all the wonders of the world to enjoy, and enjoy it we will in her name." last_knights_of_britain_name:0 "Last Knights of Britain" last_knights_of_britain_desc:0 "Our brave knights have valiantly held on to the last Christian forts in England for many years. Letting them fall would be our death." diff --git a/localization/english/replace/religion/zz_NEOW_religion_druidic_l_english.yml b/localization/english/replace/religion/zz_NEOW_religion_druidic_l_english.yml index aadb456a..708d2528 100644 --- a/localization/english/replace/religion/zz_NEOW_religion_druidic_l_english.yml +++ b/localization/english/replace/religion/zz_NEOW_religion_druidic_l_english.yml @@ -6,7 +6,7 @@ druidic_religion_adherent_plural:1 "Druids" druidic_religion_desc:1 "The Druidics are the inheritors of an ancient tradition of Celtic folklore and magic. Druids function as the priestly class within society, also serving as lawmakers, physicians, and on occasion rulers themselves." - druidic:0 "Druids of the Cliffs" + druidic:0 "Draíocht" druidic_adj:0 "Draíocht" druidic_adherent:0 "Draíocht" druidic_adherent_plural:0 "Draíochts" @@ -14,7 +14,7 @@ druidic_religious_head_title:0 "WIP" druidic_religious_head_title_name:0 "WIP" - gorsedd:0 "Throne of Britain" + gorsedd:0 "Gorsedd Prydain" gorsedd_adj:0 "Gorsedd" gorsedd_adherent:0 "Gorsedd" gorsedd_adherent_plural:0 "Gorsedds" diff --git a/localization/english/replace/religion/zz_NEOW_religion_oceanic_l_english.yml b/localization/english/replace/religion/zz_NEOW_religion_oceanic_l_english.yml index 43e54354..58f2d950 100644 --- a/localization/english/replace/religion/zz_NEOW_religion_oceanic_l_english.yml +++ b/localization/english/replace/religion/zz_NEOW_religion_oceanic_l_english.yml @@ -62,7 +62,7 @@ corsair_water_god_name:0 "Neptune" corsair_water_god_name_possessive:0 "Neptune's" - viking:0 "Children of Ragnarök" + viking:0 "Vikings of Ragnarök" viking_adj:0 "Víkingur" viking_adherent:0 "Viking" viking_adherent_plural:0 "Vikings" diff --git a/localization/english/replace/religion/zz_NEOW_religion_protestant_l_english.yml b/localization/english/replace/religion/zz_NEOW_religion_protestant_l_english.yml index 93323400..3d410411 100644 --- a/localization/english/replace/religion/zz_NEOW_religion_protestant_l_english.yml +++ b/localization/english/replace/religion/zz_NEOW_religion_protestant_l_english.yml @@ -6,13 +6,13 @@ protestant_religion_adherent_plural:1 "Protestants" protestant_religion_desc:1 "Protestant Christianity is based on the teachings of John Protestant, who founded Protestantism during the Protestant Reformation, hence the name." - moravian:0 "Unity of the Brethren" + moravian:0 "Unitas Fratrum" moravian_adj:0 "Unitas Fratrum" moravian_adherent:0 "Moravian" moravian_adherent_plural:0 "Moravians" moravian_desc:0 "Claiming to be one of the oldest Protestant churches in the world, the Moravian Church was founded hundreds of years ago before the Event after the Bohemian Reformation. Adhering strongly to doctrines of evangelism, pietism, and most notably Christian pacifism, the Moravian Church is organised into an extensive hierarchy led by the President of the Church. The organisation itself puts a lot of emphasis on missionary and hospital work, believing Christianity to be a religion of the soul, meant to bring joy and fulfilment into the hearts of its people." - utraquist:0 "Calixtine Neo-Hussite Church" + utraquist:0 "Calixtine Church" utraquist_adj:0 "Calixtine" utraquist_adherent:0 "Calixtine" utraquist_adherent_plural:0 "Calixtines" @@ -32,7 +32,7 @@ grundtvigian_adherent_plural:0 "Grundtvigians" grundtvigian_desc:0 "Once the faith of humble farmers and scholars, the followers of Grundtvigianism have preserved their traditions of enlightenment and communal piety in the centuries since the Event. Rejecting rigid dogma and clerical authority, they instead embrace a "living Christianity,” where faith is nurtured through song, fellowship, and the wisdom of the common folk. Education is sacred, and their folk high schools serve as both houses of learning and places of worship. Though others see them as impractical dreamers, the Grundtvigians hold firm in their belief that knowledge, freedom, and faith must always walk hand in hand." - anglican_england:0 "Church of England" + anglican_england:0 "Anglican Church" anglican_england_adj:0 "Anglican" anglican_england_adherent:0 "Anglican" anglican_england_adherent_plural:0 "Anglicans" @@ -43,11 +43,11 @@ special_doctrine_english_anglican_name: "Manners Maketh Man" special_doctrine_english_anglican_desc: "Since the [Concept('neow_the_event','Event')|E], most of the British Anglican identity centers around the religion's connection to the Crown and its chivalric heritage." - presbyterian:0 "Presbyterian Reformed Churches" + presbyterian:0 "Presbyterianism" presbyterian_adj:0 "Presbyterian" presbyterian_adherent:0 "Presbyterian" presbyterian_adherent_plural:0 "Presbyterians" - presbyterian_desc:0 "The Presbyterian Churches are named for their adherence to presbyterian church polity, as they are governed by councils of presbyters, also called elders. Theologically, they follow the same traditions as other Calvinists, with less emphasis on ritual and more emphasis on faith. The Presbyterian Churches, however, have little to no desire to enforce their control on the realms they are present in, which led to disagreements with and eventual radio silence from the Continental Churches in the Alps following the Council of Geneva. The largest, if not only Presbyterian Church in Europe now is the Church of Scotland, which stands alone to face the greatest existential threat it has ever known - the pagan British Empire." + presbyterian_desc:0 "Presbyterians are named for their adherence to presbyterian church polity, as they are governed by councils of presbyters, also called elders. Theologically, they follow the same traditions as other Calvinists, with less emphasis on ritual and more emphasis on faith. Presbyterian churches, however, have little to no desire to enforce their control on the realms they are present in, which led to disagreements with and eventual radio silence from the Helvetic churches in the Alps following the Council of Geneva. The largest, if not only Presbyterian Church in Europe now is the Church of Scotland, which stands alone to face the greatest existential threat it has ever known - the pagan British Empire." presbyterian_religious_head_title:0 "Elder" presbyterian_religious_head_title_name:0 "Elder"