From f6ef743d52232575bfc9723d5ee92cee73587471 Mon Sep 17 00:00:00 2001 From: trashmasteruni Date: Tue, 10 Feb 2026 00:41:31 +0100 Subject: [PATCH] Fremch --- common/religion/doctrines/30_core_tenets.txt | 6 +-- common/religion/religions/NEOW_pantheonic.txt | 24 +++++---- common/religion/religions/NEOW_wicca.txt | 2 +- gfx/interface/icons/faith/ascensionist.dds | 3 ++ gfx/interface/icons/faith/girondin.dds | 3 -- history/characters/NEOW_e_france.txt | 18 +++---- history/provinces/e_alps.txt | 4 +- history/provinces/e_europa.txt | 4 +- history/provinces/e_france.txt | 26 +++++----- ...z_NEOW_religion_core_tenets_l_english .yml | 2 +- .../zz_NEOW_religion_pantheonic_l_english.yml | 50 +++++++++---------- 11 files changed, 69 insertions(+), 73 deletions(-) create mode 100644 gfx/interface/icons/faith/ascensionist.dds delete mode 100644 gfx/interface/icons/faith/girondin.dds diff --git a/common/religion/doctrines/30_core_tenets.txt b/common/religion/doctrines/30_core_tenets.txt index 79242b26..8f482adc 100644 --- a/common/religion/doctrines/30_core_tenets.txt +++ b/common/religion/doctrines/30_core_tenets.txt @@ -424,15 +424,11 @@ # Multiplier for keeping same tenet if = { - limit = { has_doctrine = tenet_sacred_destruction } + limit = { has_doctrine = tenet_righteous_fury } multiply = faith_unchanged_doctrine_cost_mult } } - is_shown = { - religion_tag = adonist_religion - } - can_pick = { custom_description = { text = incompatible_tenet_pacifism_trigger diff --git a/common/religion/religions/NEOW_pantheonic.txt b/common/religion/religions/NEOW_pantheonic.txt index ec304ebf..fe415449 100644 --- a/common/religion/religions/NEOW_pantheonic.txt +++ b/common/religion/religions/NEOW_pantheonic.txt @@ -224,9 +224,9 @@ piety_icon_group = "christian" faiths = { - girondin = { - color = { 36 82 163} - icon = girondin + ascensionist = { + color = { 26 41 178 } + icon = ascensionist # religious_head = k_papal_state @@ -243,9 +243,9 @@ doctrine = special_doctrine_people_of_the_book #Tenets | placeholder - doctrine = tenet_liberte - doctrine = tenet_egalite - doctrine = tenet_fraternite + doctrine = tenet_pursuit_of_power + doctrine = tenet_adaptive + doctrine = tenet_ancestor_worship #Special/virtue | placeholder doctrine = special_doctrine_liberty @@ -256,7 +256,7 @@ } jacobin = { - color = { 22 133 229 } + color = { 22 91 229 } icon = jacobin # religious_head = k_papal_state @@ -274,9 +274,13 @@ doctrine = special_doctrine_people_of_the_book #Tenets | placeholder - doctrine = tenet_human_sacrifice - doctrine = tenet_warmonger - doctrine = tenet_false_conversion_sanction + doctrine = tenet_righteous_fury + doctrine = tenet_legalism + doctrine_selection_pair = { + requires_dlc_flag = legacy_of_persia + doctrine = tenet_fp3_fedayeen + fallback_doctrine = tenet_struggle_submission + } #Special/virtue | placeholder doctrine = special_doctrine_fraternity diff --git a/common/religion/religions/NEOW_wicca.txt b/common/religion/religions/NEOW_wicca.txt index 07d9ed8b..bf1fd4ed 100644 --- a/common/religion/religions/NEOW_wicca.txt +++ b/common/religion/religions/NEOW_wicca.txt @@ -252,7 +252,7 @@ #Tenets | placeholder doctrine = tenet_divine_opulence - doctrine = king_of_winter + doctrine = tenet_unrelenting_faith doctrine = tenet_chivalric_ideals doctrine = doctrine_witchcraft_accepted diff --git a/gfx/interface/icons/faith/ascensionist.dds b/gfx/interface/icons/faith/ascensionist.dds new file mode 100644 index 00000000..f40d1e0f --- /dev/null +++ b/gfx/interface/icons/faith/ascensionist.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97b4b0a1a94bc7b3e1a97fdde9f832b3824cf0cfa12b26c26e149158573ca410 +size 40128 diff --git a/gfx/interface/icons/faith/girondin.dds b/gfx/interface/icons/faith/girondin.dds deleted file mode 100644 index 56da5647..00000000 --- a/gfx/interface/icons/faith/girondin.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8938463cbd55f5d3d465bf5e824f5c8fb76f79506ccbcbf0da553264cffd9930 -size 40128 diff --git a/history/characters/NEOW_e_france.txt b/history/characters/NEOW_e_france.txt index 31b43e03..afbaec37 100644 --- a/history/characters/NEOW_e_france.txt +++ b/history/characters/NEOW_e_france.txt @@ -36,7 +36,7 @@ france0003 = { france0004 = { name = "Éric" dynasty = leroux_dynasty - religion = "girondin" + religion = "ascensionist" culture = bourguignon trait = education_intrigue_3 trait = chaste @@ -94,7 +94,7 @@ france0006 = { france_dain_gaillard = { name = "Daín" dynasty = gaillard_dynasty - religion = "girondin" + religion = "ascensionist" culture = bourguignon trait = calm trait = greedy @@ -111,7 +111,7 @@ france_dain_gaillard = { france_marc_dumont = { name = "Marc" dynasty = dumont_dynasty - religion = "girondin" + religion = "ascensionist" culture = bourguignon trait = gluttonous trait = greedy @@ -129,7 +129,7 @@ france_marc_dumont = { france_raymonde_laurent = { name = "Raymonde" dynasty = laurent_dynasty - religion = "girondin" + religion = "ascensionist" culture = bourguignon female = yes trait = temperate @@ -147,7 +147,7 @@ france_raymonde_laurent = { france_abraracourcix_leclerc = { name = "Abraracourcix" dynasty = leclerc_dynasty - religion = "girondin" + religion = "ascensionist" culture = bourguignon trait = temperate trait = arbitrary @@ -538,7 +538,7 @@ france_edmond_daunte = { france_joachim_murat = { name = "Joachim" dynasty = murat_dynasty - religion = "girondin" + religion = "ascensionist" culture = "axiton" trait = education_martial_3 trait = ambitious @@ -977,7 +977,7 @@ france_nicephore_clemence = { france_robur_amouroux = { name = "Robur" dynasty = amouroux_dynasty - religion = "girondin" + religion = "ascensionist" culture = axiton trait = education_stewardship_1 trait = greedy @@ -1232,7 +1232,7 @@ france_belasko_agurto = { france_adelberth_de_bourbon_naundorff = { name = "Adelberth" dynasty_house = house_bourbon_naundorff - religion = girondin + religion = ascensionist culture = metropolitain trait = education_learning_3 trait = ambitious @@ -1249,7 +1249,7 @@ france_adelberth_de_bourbon_naundorff = { france_guy_loup_chitteaux={ name ="Guy-Loup" dynasty=chitteaux_dynasty - religion=girondin + religion=ascensionist culture=bourguignon 2519.4.18={birth=yes} 2600.1.1={death =yes} diff --git a/history/provinces/e_alps.txt b/history/provinces/e_alps.txt index db6edbb5..768e16b6 100644 --- a/history/provinces/e_alps.txt +++ b/history/provinces/e_alps.txt @@ -115,7 +115,7 @@ ###c_vesoul 2077 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 2383 = { @@ -123,7 +123,7 @@ } 2076 = { culture = pelonais - religion = girondin + religion = ascensionist holding = castle_holding } 2192 = { diff --git a/history/provinces/e_europa.txt b/history/provinces/e_europa.txt index 5ac4773b..83440d27 100644 --- a/history/provinces/e_europa.txt +++ b/history/provinces/e_europa.txt @@ -624,7 +624,7 @@ ###c_neufchateau 2715 = { culture = lorin - religion = girondin + religion = ascensionist holding = city_holding } 2384 = { @@ -638,7 +638,7 @@ ###c_nancy 2709 = { culture = lorin - religion = girondin + religion = ascensionist holding = castle_holding } 2713 = { diff --git a/history/provinces/e_france.txt b/history/provinces/e_france.txt index 4ee25619..8ec66693 100644 --- a/history/provinces/e_france.txt +++ b/history/provinces/e_france.txt @@ -318,7 +318,7 @@ ###c_tourraine 2274 = { culture = metropolitain - religion = girondin + religion = ascensionist holding = castle_holding 1066.1.1 = { buildings = { @@ -569,7 +569,7 @@ ###c_loir_et_cher 2319 = { culture = metropolitain - religion = girondin + religion = ascensionist holding = castle_holding } 2283 = { @@ -652,7 +652,7 @@ ###c_langres 2374 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 9750 = { @@ -674,7 +674,7 @@ ###c_dijon 2380 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 2375 = { @@ -691,7 +691,7 @@ ###c_autun 2347 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 2304 = { @@ -703,7 +703,7 @@ ###c_beaune 2376 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = city_holding } 2377 = { @@ -718,12 +718,12 @@ ###c_macon 2302 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 2348 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 2458 = { @@ -732,7 +732,7 @@ ###c_auxerre 2346 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 2350 = { @@ -760,7 +760,7 @@ ###c_nievre 2343 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 2344 = { @@ -1052,7 +1052,7 @@ ###c_bellac 2247 = { culture = axiton - religion = girondin + religion = ascensionist holding = castle_holding } 2240 = { @@ -1240,7 +1240,7 @@ ###c_auvergne 2294 = { culture = axiton - religion = girondin + religion = ascensionist holding = castle_holding } 2293 = { @@ -1255,7 +1255,7 @@ ###c_clermont_sur_allier 2289 = { culture = axiton - religion = girondin + religion = ascensionist holding = castle_holding special_building_slot = generic_university } 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 5fbf6ffd..50f6e3e5 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 @@ -2,7 +2,7 @@ #Adonist Tenets tenet_righteous_fury_name:0 "Righteous Fury" - tenet_righteous_fury_desc:0 "It is our holy duty to ride forth against the forces of Moloch, in the name of our true chosen creator." + tenet_righteous_fury_desc:0 "It is our holy duty to ride forth against the forces of [ROOT.Faith.DevilName], and burn them and their temples down to the foundation." #Hermetic Tenets tenet_scientific_discourse_name:0 "Scientific Discourse" diff --git a/localization/english/replace/religion/zz_NEOW_religion_pantheonic_l_english.yml b/localization/english/replace/religion/zz_NEOW_religion_pantheonic_l_english.yml index e3e1ff36..39acce8c 100644 --- a/localization/english/replace/religion/zz_NEOW_religion_pantheonic_l_english.yml +++ b/localization/english/replace/religion/zz_NEOW_religion_pantheonic_l_english.yml @@ -10,10 +10,10 @@ french_pantheon_high_god_name_possessive:0 "The Supreme Being's" french_pantheon_high_god_name_alternate:0 "The Creator" french_pantheon_high_god_name_alternate_possessive:0 "The Creator's" - french_pantheon_devil_name:0 "Madame Guillotine" - french_pantheon_devil_name_possessive:0 "Madame Guillotine's" - french_pantheon_death_deity_name:0 "$french_pantheon_devil_name$" - french_pantheon_death_deity_name_possessive:0 "$french_pantheon_devil_name_possessive$" + french_pantheon_devil_name:0 "Satan" + french_pantheon_devil_name_possessive:0 "Satan's" + french_pantheon_death_deity_name:0 "Madame Guillotine" + french_pantheon_death_deity_name_possessive:0 "Madame Guillotine's" french_pantheon_house_of_worship:0 "convention" french_pantheon_house_of_worship_plural:0 "conventions" french_pantheon_religious_symbol:0 "tricolour" @@ -26,18 +26,18 @@ french_pantheon_priest_plural:0 "speakers" french_pantheon_bishop:0 "proclamator" french_pantheon_bishop_plural:0 "proclamators" - french_pantheon_positive_afterlife:0 "the Enlightenment" + french_pantheon_positive_afterlife:0 "Sa Cour" french_pantheon_negative_afterlife:0 "the Bastille" - french_pantheon_witch_god_name:0 "$french_pantheon_devil_name$" - french_pantheon_witch_god_name_possessive:0 "$french_pantheon_devil_name_possessive$" + french_pantheon_witch_god_name:0 "$french_pantheon_death_name$" + french_pantheon_witch_god_name_possessive:0 "$french_pantheon_death_name_possessive$" french_pantheon_creator_god_name:0 "$french_pantheon_high_god_name$" french_pantheon_creator_god_name_possessive:0 "$french_pantheon_high_god_name_possessive$" - french_pantheon_health_god_name:0 "Notre-Seigneur" - french_pantheon_health_god_name_possessive:0 "Notre-Seigneur's" + french_pantheon_health_god_name:0 "Liberté" + french_pantheon_health_god_name_possessive:0 "Liberté's" french_pantheon_fertility_god_name:0 "Notre-Dame" french_pantheon_fertility_god_name_possessive:0 "Notre-Dame's" - french_pantheon_wealth_god_name:0 "Liberté" - french_pantheon_wealth_god_name_possessive:0 "Liberté's" + french_pantheon_wealth_god_name:0 "le Roi Soleil" + french_pantheon_wealth_god_name_possessive:0 "le Roi Soleil's" french_pantheon_household_god_name:0 "Fraternité" french_pantheon_household_god_name_possessive:0 "Fraternité's" french_pantheon_fate_god_name:0 "le Prophète" @@ -46,31 +46,27 @@ french_pantheon_knowledge_god_name_possessive:0 "Marianne's" french_pantheon_war_god_name:0 "l'Empereur" french_pantheon_war_god_name_possessive:0 "l'Empereur's" - french_pantheon_trickster_god_name:0 "le Roi Soleil" - french_pantheon_trickster_god_name_possessive:0 "le Roi Soleil's" - french_pantheon_night_god_name:0 "$french_pantheon_devil_name$" - french_pantheon_night_god_name_possessive:0 "$french_pantheon_devil_name_possessive$" + french_pantheon_trickster_god_name:0 "$french_pantheon_death_name$" + french_pantheon_trickster_god_name_possessive:0 "$french_pantheon_death_name_possessive$" + french_pantheon_night_god_name:0 "$french_pantheon_death_name$" + french_pantheon_night_god_name_possessive:0 "$french_pantheon_death_name_possessive$" french_pantheon_water_god_name:0 "Egalité" french_pantheon_water_god_name_possessive:0 "Egalité's" - girondin:0 "Girondin Convention" - girondin_adj:0 "Girondin" - girondin_adherent:0 "Girondin" - girondin_adherent_plural:0 "Girondins" - girondin_desc:0 "The Girondins are a deistic faith that believes the many gods of Europe are merely individual facets of a single great, incomprehensible Architect of Creation, who made man in his image spiritually, but not physically. Because man is of the Creator, it is also man who is to rule over other men, with those of the First Estate being chosen by the Creator to rule. However, should a monarch fall to his basal desires, and fail to uphold the duties and virtues bestowed upon him by God, it is the duty of the Third Estate to dethrone him and feed him to Madame Guillotine. It is in this way that Girondists uphold the balance of the universe, for it was Madame Guillotine who brought the [Concept('neow_the_event','Event')|E] once every ruler on Earth was a corrupt tyrant. The three archangels of God - Liberty, Equality, and Fraternity, embody the principles a just and righteous ruler is to live by, and are also those who bring the Third Estate to depose a tyrant." - girondin_religious_head_title:0 "WIP" - girondin_religious_head_title_name:0 "WIP" + ascensionist:0 "Panthéon de l'Ascension" + ascensionist_adj:0 "Ascensionist" + ascensionist_adherent:0 "Ascensionist" + ascensionist_adherent_plural:0 "Ascensionists" + ascensionist_desc:0 "The Ascensionists consider themselves the instrument of mankind's apotheosis at the hands of Marianne, the Angel of Liberation. They hold that through heroic and virtuous deeds in life, anyone - from king to commoner - may be 'pantheonised', inducted into the great Panthéon of the French people. This most often includes great warriors, philosophers, and leaders, who were instrumental in shaping and defending their homes. Their bodies are interred in great mausoleums where the faithful come to leaving offerings and pray for their blessing, and the goal of every Ascensionist is to one day be buried amongst the greats, guarding their homeland from the heavens." special_doctrine_liberty_name: "Liberté Focus" special_doctrine_liberty_desc: "Identifying itself primarily by its commitment to the virtue and archangel known as "Liberté", this sect of Estatist religion emphasizes independence and freedom above the two other causes." - jacobin:0 "Jacobin Convention" + jacobin:0 "Jacobinism" jacobin_adj:0 "Jacobin" jacobin_adherent:0 "Jacobin" jacobin_adherent_plural:0 "Jacobins" - jacobin_desc:0 "The Jacobins, members of a secret society in the highest echelons of European academia, are those who live to placate the eternal hunger of Madame Guillotine. Jacobins believe that many years before the [Concept('neow_the_event','Event')|E], the prophet Robespierre was given this sacred duty by the Madame herself, but was soon killed by those unbelievers who considered him a madman. With Madame Guillotine left unfed, it was humanity that paid the price, the Madame taking back all the lives owed to her in the Event. With rivers of blood painting the streets of Europe red, the Jacobins slowly reemerged and reorganised, seeking to right the wrongs of their ancestors. Though denounced by the rest of the Third Estatists and driven underground by the many other faiths of the continent, the Jacobins have slowly built up a web of informants and volunteers in Europe's universities, and only need the right time to strike." - jacobin_religious_head_title:0 "WIP" - jacobin_religious_head_title_name:0 "WIP" + jacobin_desc:0 "Jacobins hold that, many years ago, France was home to the magnificent Republic, in which gods walked among men as equals. However, in their hunger for power and tyranny, the supporters of the Ancien Régime returned and destroyed the Republic, for which they were smited down by Madame Guillotine. Now, in this new world, the Jacobins have taken up arms and reorganised, seeking to restore the utopia of the old world. They believe that through the steady guidance of the angels Liberty, Equality and Fraternity the Republic will rise again, and all of its enemies will be fed to the Guillotine to ensure that oneness of the earth and the Panthéon is eternal." special_doctrine_fraternity_name: "Fraternité Focus" special_doctrine_fraternity_desc: "Identifying itself primarily by its commitment to the virtue and archangel known as "Fraternité", this sect of Estatist religion emphasizes brotherhood and unity of mankind above the two other causes." @@ -79,7 +75,7 @@ communard_adj:0 "Communard" communard_adherent:0 "Communard" communard_adherent_plural:0 "Communards" - communard_desc:0 "The Communards are those Girondins who reject the First Estate as the one given mandate by God. Instead, they believe a ruler cannot uphold his duties if he isn't even of the same Estate, and as such they believe the only Estate capable of ruling over the Third Estate is itself. Only the lowest echelons of society can uphold Liberty, Equality, and Fraternity, for they are the only ones who know what life is like without them. They also insist that Madame Guillotine will never be satisfied if she is fed the lives of those who have nothing to give, for it is the fat and the rich she yearns for. Thus, the Communards haven't only given themselves the noble goal of peasant liberation, but also believe it is their divine right to feed the whole of the First Estate to Madame Guillotine. As such, the Communards are heavily demonised and feared by the rulers and faiths of Europe, and rightfully so - for they have no compassion for the ruling classes and ask for none in return. When their turn comes, they will make no excuse for the terror to be unleashed." + communard_desc:0 "The Communards are those ascensionists who reject the First Estate as the one given mandate by God. Instead, they believe a ruler cannot uphold his duties if he isn't even of the same Estate, and as such they believe the only Estate capable of ruling over the Third Estate is itself. Only the lowest echelons of society can uphold Liberty, Equality, and Fraternity, for they are the only ones who know what life is like without them. They also insist that Madame Guillotine will never be satisfied if she is fed the lives of those who have nothing to give, for it is the fat and the rich she yearns for. Thus, the Communards haven't only given themselves the noble goal of peasant liberation, but also believe it is their divine right to feed the whole of the First Estate to Madame Guillotine. As such, the Communards are heavily demonised and feared by the rulers and faiths of Europe, and rightfully so - for they have no compassion for the ruling classes and ask for none in return. When their turn comes, they will make no excuse for the terror to be unleashed." communard_religious_head_title:0 "WIP" communard_religious_head_title_name:0 "WIP"