diff --git a/common/landed_titles/france.txt b/common/landed_titles/france.txt index 68a98d2c..24d1b137 100644 --- a/common/landed_titles/france.txt +++ b/common/landed_titles/france.txt @@ -40,7 +40,7 @@ e_france = { k_brittany = { color = { 182 182 214 } - capital = c_rennes + capital = c_nantes cultural_names = { name_list_brittannic = cn_brytanna diff --git a/common/religion/doctrine_types/00_1_neow_universal_tolerance_doctrines.txt b/common/religion/doctrine_types/00_1_neow_universal_tolerance_doctrines.txt index 7d05e55a..7925660d 100644 --- a/common/religion/doctrine_types/00_1_neow_universal_tolerance_doctrines.txt +++ b/common/religion/doctrine_types/00_1_neow_universal_tolerance_doctrines.txt @@ -749,8 +749,8 @@ special_doctrine_crowleyan_magic = { #Crowleyan hostility_override_special_doctrine_fae_and_folklore = 1 hostility_override_special_doctrine_might_and_magick = 1 hostility_override_special_doctrine_goddesses_and_glory = 1 - hostility_override_special_doctrine_crowleyan_magic = 1 - hostility_override_special_doctrine_loyal_servants_of_the_queen = 1 + hostility_override_special_doctrine_crowleyan_magic = 2 + hostility_override_special_doctrine_loyal_servants_of_the_queen = 3 hostility_override_special_doctrine_servants_of_the_regency = 1 hostility_override_special_doctrine_dionysian = 1 @@ -788,7 +788,7 @@ special_doctrine_loyal_servants_of_the_queen = { hostility_override_special_doctrine_might_and_magick = 1 hostility_override_special_doctrine_goddesses_and_glory = 1 - hostility_override_special_doctrine_crowleyan_magic = 1 + hostility_override_special_doctrine_crowleyan_magic = 2 hostility_override_special_doctrine_fae_and_folklore = 2 diff --git a/common/religion/doctrine_types/30_core_tenets.txt b/common/religion/doctrine_types/30_core_tenets.txt index 8d1c039c..00d2a6d9 100644 --- a/common/religion/doctrine_types/30_core_tenets.txt +++ b/common/religion/doctrine_types/30_core_tenets.txt @@ -199,19 +199,13 @@ parameters = { unlock_voluntary_laampdom_faith = yes can_travel_along_rivers = yes - #great_holy_wars_active = yes - #ghw_no_hof_conversion_buffs_active = yes - #bonus_holy_war_piety_active = yes - #pilgrimage_decision_active = yes - clergy_can_fight = yes conquest_cb_enabled = yes invasion_cb_enabled = yes } character_modifier = { - #embarkation_cost_mult = -0.5 - naval_movement_speed_mult = 0.25 - #sea_travel_danger = medium_sea_danger_reduction - #accolade_glory_gain_mult = 0.2 + title_creation_cost_mult = -0.25 + naval_movement_speed_mult = 0.15 + sea_travel_danger = medium_sea_danger_reduction } traits = { virtues = { brave loyal } @@ -297,11 +291,6 @@ tyranny_gain_mult = 1 stress_gain_mult = -0.25 stress_loss_mult = 0.25 - defender_advantage = 5 - controlled_province_advantage = 5 - } - province_modifier = { - garrison_size = 0.33 } } tenet_love_under_will = { @@ -342,6 +331,19 @@ is_shown = { religion_tag = thelema_religion } + + desc = { + first_valid = { + triggered_desc = { + trigger = { + has_doctrine = special_doctrine_base_thelema + } + desc = tenet_do_what_thou_wilt_kismetic + } + desc = tenet_do_what_thou_wilt_desc + } + } + piety_cost = { value = faith_tenet_cost_low # Multiplier for keeping same tenet @@ -356,14 +358,6 @@ has_access_to_runestones = yes divine_the_stars_active = yes can_build_pyramids = yes - } - traits = { - virtues = { - brave - } - sins = { - content - } } } @@ -502,7 +496,7 @@ holy_wars_forbidden = yes pacifist_opinion_active = yes opinion_of_pacifist_opinion_active = 20 - piety_from_long_peace = 1 + #piety_from_long_peace = 1 mendicant_preachers_conversion_active = yes unlock_voluntary_laampdom_faith = yes } diff --git a/common/religion/doctrine_types/NEOW_virtue_doctrines.txt b/common/religion/doctrine_types/NEOW_virtue_doctrines.txt index 19b0f1e0..937f0933 100644 --- a/common/religion/doctrine_types/NEOW_virtue_doctrines.txt +++ b/common/religion/doctrine_types/NEOW_virtue_doctrines.txt @@ -115,8 +115,8 @@ special_doctrine_base_thelema = { special_doctrine_old_thelema = { traits = { - virtues = { ambitious disloyal } - sins = { content loyal } + virtues = { ambitious arbitrary } + sins = { content chaste } } } diff --git a/common/religion/holy_site_types/00_holy_site_types.txt b/common/religion/holy_site_types/00_holy_site_types.txt index 649cbbe6..949ea5f7 100644 --- a/common/religion/holy_site_types/00_holy_site_types.txt +++ b/common/religion/holy_site_types/00_holy_site_types.txt @@ -2447,8 +2447,7 @@ ranaheim = { } jorvik = { - county = c_richmond - barony = b_yarlestre + county = c_north_riding character_modifier = { name = holy_site_jorvik_effect_name diff --git a/common/religion/religion_types/NEOW_folkgerman.txt b/common/religion/religion_types/NEOW_folkgerman.txt index e481fb0d..2078faac 100644 --- a/common/religion/religion_types/NEOW_folkgerman.txt +++ b/common/religion/religion_types/NEOW_folkgerman.txt @@ -430,6 +430,7 @@ holy_site = wittenberg holy_site = lund holy_site = lejre + holy_site = jorvik #Special Doctrine doctrine = special_doctrine_cult_of_saints @@ -449,7 +450,7 @@ holy_site = ranaheim holy_site = jorvik holy_site = uppsala - holy_site = jorvik + #holy_site = jorvik holy_site = paderborn #Special Doctrine diff --git a/common/religion/religion_types/NEOW_novelist.txt b/common/religion/religion_types/NEOW_novelist.txt index 48009a23..be4a2d89 100644 --- a/common/religion/religion_types/NEOW_novelist.txt +++ b/common/religion/religion_types/NEOW_novelist.txt @@ -138,7 +138,7 @@ #Tenets | add unique ones eventually doctrine = tenet_universal_scripture - doctrine = tenet_sanctity_of_nature + doctrine = tenet_legalism doctrine = tenet_chivalric_ideals #Special/virtue diff --git a/common/religion/religion_types/NEOW_thelema.txt b/common/religion/religion_types/NEOW_thelema.txt index 9718da07..778abead 100644 --- a/common/religion/religion_types/NEOW_thelema.txt +++ b/common/religion/religion_types/NEOW_thelema.txt @@ -349,13 +349,13 @@ #doctrine = special_doctrine_esoteric_witchcraft #Tenets | WIP - doctrine = tenet_love_under_will + doctrine = tenet_struggle_submission doctrine = tenet_do_what_thou_wilt doctrine = tenet_rule_the_waves #Special/virtue | placeholder doctrine = special_doctrine_base_thelema - doctrine = special_doctrine_loyal_servants_of_the_queen + doctrine = special_doctrine_servants_of_the_regency holy_order_names = { #placeholder @@ -413,16 +413,17 @@ #Special Tolerance | placeholder- #doctrine = special_doctrine_esoteric_witchcraft doctrine = doctrine_no_head - doctrine = doctrine_pluralism_righteous - doctrine = doctrine_clerical_succession_temporal_appointment + doctrine = doctrine_pluralism_fundamentalist + doctrine = doctrine_theocracy_lay_clergy + doctrine = doctrine_clerical_succession_temporal_appointment #Tenets | WIP - doctrine = tenet_astrology + doctrine = tenet_do_what_thou_wilt doctrine = tenet_adorcism doctrine = tenet_human_sacrifice #Special/virtue | placeholder doctrine = special_doctrine_old_thelema - doctrine = special_doctrine_crowleyan_magic + doctrine = special_doctrine_regicidal doctrine = doctrine_witchcraft_virtuous holy_order_names = { #placeholder } diff --git a/common/religion/religion_types/NEOW_wicca.txt b/common/religion/religion_types/NEOW_wicca.txt index 3a1d2c71..b9177300 100644 --- a/common/religion/religion_types/NEOW_wicca.txt +++ b/common/religion/religion_types/NEOW_wicca.txt @@ -252,7 +252,7 @@ doctrine = doctrine_clerical_gender_female_only #Tenets | placeholder - doctrine = tenet_divine_opulence + doctrine = tenet_ritual_celebrations doctrine = tenet_natural_primitivism doctrine = tenet_chivalric_ideals doctrine = doctrine_theocracy_lay_clergy diff --git a/history/titles/k_brittany.txt b/history/titles/k_brittany.txt index 1874965c..dd7bfb9e 100644 --- a/history/titles/k_brittany.txt +++ b/history/titles/k_brittany.txt @@ -99,6 +99,20 @@ c_nantes = { 2545.3.13={holder=nolwenn_of_brittany} 2548.3.21={holder=france_menhir_obelix} } +b_fougeres = { + 2344.10.21={holder=per_of_brittany} + 2374.12.26={holder=gweltaz_of_brittany} + 2414.7.19={holder=loic_i_of_brittany} + 2420.1.10={holder=yann_fanch_of_brittany} + 2444.3.16={holder=jili_of_brittany} + 2466.11.18={holder=yann_loeiz_of_brittany} + 2468.3.28={holder=yann_of_brittany} + 2481.9.11={holder=yann_baol_of_brittany} + 2498.3.17={holder=loic_ii_of_brittany} + 2518.11.23={holder=alan_of_brittany} + 2545.3.13={holder=nolwenn_of_brittany} + 2548.3.21={holder=france_menhir_obelix} +} c_saint_malo = { 10.1.1={change_development_level=8} 2454.9.25={holder=hugues_morand} diff --git a/history/titles/k_bulgaria.txt b/history/titles/k_bulgaria.txt index ceaa01cd..ee904b04 100644 --- a/history/titles/k_bulgaria.txt +++ b/history/titles/k_bulgaria.txt @@ -14,6 +14,9 @@ k_bulgaria = { 2530.1.1 = { holder = yugoslavia0003 change_development_level = 7 + succession_laws = { + feudal_elective_succession_law + } } } diff --git a/history/titles/k_france.txt b/history/titles/k_france.txt index 6985d87e..6e1bd74e 100644 --- a/history/titles/k_france.txt +++ b/history/titles/k_france.txt @@ -174,7 +174,7 @@ c_anjou = { 10.1.1 = { change_development_level = 9 } 2545.1.1 = { holder = france0017 #jean tarrou - liege = d_anjou + liege = d_poitou } } c_saumur = { @@ -195,9 +195,19 @@ c_sable = { 10.1.1 = { change_development_level = 9 } 2550.1.1 = { holder = france0015 #bernard rieux + holder = france0012 #bernard rieux + liege = d_anjou liege = d_anjou } } + +b_mortain = { + 2550.1.1 = { + holder = france0012 #bernard rieux + liege = d_anjou + } +} + d_normandy = { 2222.1.1 = { holder = france_bonaparte_isildur_i #Isildur I Bonaparte 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 21c8df5b..2a569843 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 @@ -78,13 +78,14 @@ tenet_takamin_name: "Bear Worship" tenet_takamin_desc: "Believing bears as manifestations of gods, the sanctity of these animals must be respected, and the killing of one during hunts should be done with utmost respect." tenet_love_under_will_name:0 "Love Under Will" - tenet_do_what_thou_wilt_name:0 "Do What Thou Wilt" + tenet_do_what_thou_wilt_name:0 "Do What thou Wilt" tenet_rule_the_waves_name:0 "Rule the Waves" - tenet_true_will_name:0 "True Will" + tenet_true_will_name:0 "A Will of Our Own" 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." + tenet_do_what_thou_wilt_kismetic:0 ""Do what thou wilt shall be the whole of the Law" are the words spoken by the prophet Crowley.[ROOT.Faith.HighGodNameAlternate] ordained each human their holy duty long before they were born, and through subservience to fate written can we find our True Will." tenet_rule_the_waves_desc:0 "[ROOT.Faith.HighGodNameAlternate] has given us the right to rule the earth in [ROOT.Faith.HighGodHerHis|U] stead. As such, it is our duty to plant our flag in all corners of the globe." - tenet_true_will_desc:0 "The Thelemite is beholden to no liege or empire, only himself and the stars." + tenet_true_will_desc:0 "We reject the imperialist and predeterminist creed of the Kismetics. The true Thelemite is beholden to no liege or empire, only himself and the stars." tenet_catholic_communion_name:0 "Reformed Communion" tenet_catholic_communion_desc:0 "Our Church has undertaken many reforms throughout its history in order to keep up with the times, from the days of the Reformation to the post-Event era." doctrine_parameter_next_level_fortification: "The #V Fortification#! lines of [buildings|E] can be built one [era|E] earlier" 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 35eb4092..4172fa96 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 @@ -97,19 +97,19 @@ old_thelema_adj:0 "Old Thelema" old_thelema_adherent:0 "Old Thelemic" old_thelema_adherent_plural:0 "Old Thelemics" - old_thelema_desc:0 "The Old Thelema faith was abandoned many years ago by most inhabitants of the British Empire in favour of Victorianism. Old Thelemites claim to be practising their faith as originally dictated by the prophet Crowley. They reject the position of the First Lord as regents of the Queen, considering mainstream Thelemite beliefs to be a perversion of the goddess Nuit. Old Thelemites do not believe Nuit is to return to Earth to rule Britannia, and instead consider the British Empire to be a theologically oppressive state, hellbent on spreading their faith and state to all corners of the Earth, making them no different than the Church. This stance was cause for a massive civil war in Britain in the 23rd century, which led to their marginalisation from society. As such, Old Thelemites only persist in the fringes of Britain, and instead focus their practice on the personal will of the individual, acting to discover their True Will." + old_thelema_desc:0 "The Old Thelema faith was abandoned many years ago by most inhabitants of the British Empire in favour of the Kismetic and later Victorian creeds. Old Thelemites claim to be practising their faith as originally dictated by the prophet Crowley. They reject worship of teh God-Queen Britannia, considering 'Royal Thelemite' beliefs to be a perversion of the goddess Nuit. Instead they consider the British Empire to be a theologically oppressive state, hellbent on spreading their perversion of Crowlylian teaching and state to all corners of the Earth, making them no different than the Church. This stance was cause for a massive civil war in Britain in the 23rd century, which led to their marginalisation from society. As such, Old Thelemites only persist in the fringes of Britain, and instead focus their practice on the personal will of the individual, acting to discover their True Will." old_thelema_religious_head_title:0 "WIP" old_thelema_religious_head_title_name:0 "WIP" - carcosan:0 "Carcosan Thelema" - carcosan_adj:0 "Carcosan" - carcosan_adherent:0 "Carcosan" - carcosan_adherent_plural:0 "Carcosans" - carcosan_desc:0 "Carcosan Thelemites worship not the light, but the abyss in which it dwells. They hold that all of creation — including the earth and the stars — is formed from that primordial darkness, guided by the Yellow King that has ruled over it since time immemorial. In praise of their shadowy god, the Carcosans delve into what is considered 'dark magic' by other occultists, including summoning malevolent beings and harmful hexes, all in the hopes of bringing the mist of creation to earth, where it may be manipulated to their heart's desire." + carcosan:0 "Apophite Thelema" + carcosan_adj:0 "Apophite" + carcosan_adherent:0 "Apophite" + carcosan_adherent_plural:0 "Apophite" + carcosan_desc:0 "Apophite Thelemites worship not the light, but the abyss in which it dwells. They hold that all of creation — including the earth and the stars — is formed from that primordial darkness, guided by the Yellow Serpent that has ruled over it since time immemorial. In praise of their serpentine god, the Carcosans delve into what is considered 'dark magic' by other occultists, including summoning malevolent beings and harmful hexes, all in the hopes of bringing the mist of creation to earth, where it may be manipulated to their heart's desire - and the obliteration of the false Queen of the Heavens" carcosan_religious_head_title:0 "WIP" carcosan_religious_head_title_name:0 "WIP" - special_doctrine_old_thelema_name: "Nuit Thelema" - special_doctrine_old_thelema_desc: "Distinguishing itself from Royal Thelema, those who honor the goddess Nuit categorically reject the Imperial religious hierarchy and the authoritarian influence of the British Empire." + special_doctrine_old_thelema_name: "True Thelema" + special_doctrine_old_thelema_desc: "Distinguishing itself from Royal Thelema, and those who categorically reject the Imperial religious hierarchy and the authoritarian influence of the British Empire."