diff --git a/common/culture/cultures/NEOW_balto_finnic.txt b/common/culture/cultures/NEOW_balto_finnic.txt index 59f5e16d..f80242b3 100644 --- a/common/culture/cultures/NEOW_balto_finnic.txt +++ b/common/culture/cultures/NEOW_balto_finnic.txt @@ -8,10 +8,8 @@ head_determination = head_determination_domain traditions = { tradition_forest_wardens - tradition_winter_warriors + tradition_isolationist tradition_fishermen - tradition_wetlanders - tradition_adaptive_skirmishing } name_list = name_list_NEOW_finnish @@ -44,7 +42,6 @@ sami = { tradition_adaptive_skirmishing tradition_forest_wardens tradition_midnight_herders - tradition_isolationist } name_list = name_list_sami diff --git a/common/culture/cultures/NEOW_north_germanic.txt b/common/culture/cultures/NEOW_north_germanic.txt index f205f887..b6e47f0e 100644 --- a/common/culture/cultures/NEOW_north_germanic.txt +++ b/common/culture/cultures/NEOW_north_germanic.txt @@ -188,7 +188,6 @@ smalandsk = { tradition_forest_folk tradition_staunch_traditionalists tradition_religious_patronage - tradition_zealous_people } # FP1 Traditions @@ -324,11 +323,11 @@ ostsk = { martial_custom = martial_custom_equal head_determination = head_determination_domain traditions = { - tradition_landstinget - tradition_british_meritocracy - tradition_astute_diplomats - tradition_seafaring - tradition_african_tolerance + tradition_agrarian + tradition_things + tradition_mountaineers + tradition_philosopher_culture + tradition_religious_patronage } name_list = name_list_norwegian @@ -357,17 +356,15 @@ trondheimer = { martial_custom = martial_custom_equal head_determination = head_determination_domain traditions = { - tradition_fishermen + tradition_seafaring tradition_staunch_traditionalists - tradition_mountaineers - tradition_winter_warriors - tradition_landstinget + tradition_maritime_mercantilism + } + dlc_tradition = { + trait = tradition_fp1_northern_stories + requires_dlc_flag = the_northern_lords + fallback = tradition_runestones } - #dlc_tradition = { - # trait = tradition_fp1_northern_stories - # requires_dlc_flag = the_northern_lords - # fallback = tradition_runestones - #} name_list = name_list_norwegian coa_gfx = { norwegian_coa_gfx western_coa_gfx } @@ -570,9 +567,8 @@ vestsk = { traditions = { tradition_hard_working tradition_fishermen - tradition_landstinget + tradition_things tradition_maritime_mercantilism - tradition_seafaring } name_list = name_list_norwegian diff --git a/common/province_terrain/00_province_terrain.txt b/common/province_terrain/00_province_terrain.txt index 397f4947..a7b161c1 100644 --- a/common/province_terrain/00_province_terrain.txt +++ b/common/province_terrain/00_province_terrain.txt @@ -172,7 +172,7 @@ default_coastal_sea=coastal_sea 169=tells 170=plains 171=plains -172=wetlands +172=taiga 173=taiga 174=taiga 175=plains @@ -181,20 +181,20 @@ default_coastal_sea=coastal_sea 178=taiga 179=plains 180=taiga -181=wetlands -182=wetlands +181=taiga +182=taiga 183=taiga 184=taiga 185=taiga 186=taiga -187=wetlands -188=wetlands -189=wetlands -190=wetlands +187=taiga +188=taiga +189=taiga +190=taiga 191=taiga 192=taiga 193=taiga -194=wetlands +194=taiga 195=taiga 196=taiga 197=plains @@ -205,20 +205,20 @@ default_coastal_sea=coastal_sea 202=taiga 203=wetlands 204=wetlands -205=wetlands +205=taiga 206=taiga 207=wetlands -208=wetlands +208=taiga 209=wetlands 210=taiga -211=wetlands +211=taiga 212=taiga 213=plains 214=plains 215=plains 216=plains 217=plains -218=wetlands +218=taiga 219=taiga 220=wetlands 221=plains @@ -387,11 +387,11 @@ default_coastal_sea=coastal_sea 384=taiga 385=taiga 386=taiga -387=wetlands +387=taiga 388=taiga 389=taiga 390=taiga -391=wetlands +391=taiga 392=taiga 393=mountains 394=taiga @@ -410,7 +410,7 @@ default_coastal_sea=coastal_sea 407=taiga 408=taiga 409=taiga -410=wetlands +410=taiga 411=taiga 412=taiga 413=taiga @@ -419,7 +419,7 @@ default_coastal_sea=coastal_sea 416=taiga 417=taiga 418=taiga -419=wetlands +419=taiga 420=hills 421=taiga 422=taiga @@ -447,15 +447,15 @@ default_coastal_sea=coastal_sea 444=taiga 445=taiga 446=taiga -447=wetlands -448=wetlands -449=wetlands -450=wetlands -451=wetlands +447=taiga +448=taiga +449=taiga +450=taiga +451=taiga 452=taiga 453=taiga -454=wetlands -455=wetlands +454=taiga +455=taiga 456=plains 457=plains 458=plains @@ -632,8 +632,7 @@ default_coastal_sea=coastal_sea 629=plains 630=plains 631=desert -650=wetlands -651=wetlands +651=plains 652=plains 653=plains 654=plains @@ -5393,7 +5392,7 @@ default_coastal_sea=coastal_sea 5805=taiga 5806=taiga 5807=taiga -5808=wetlands +5808=taiga 5809=taiga 5810=taiga 5811=taiga @@ -8040,8 +8039,8 @@ default_coastal_sea=coastal_sea 8784=taiga #Kangos 8785=taiga #Roavvenjarga 8786=taiga #Kuusama -8787=wetlands #Kaddlhutt -8788=wetlands #Suenekele +8787=taiga #Kaddlhutt +8788=taiga #Suenekele 8789=taiga #Skolt 8790=taiga #Peliza 8791=taiga #Varsiga diff --git a/common/religion/doctrine_types/30_core_tenets.txt b/common/religion/doctrine_types/30_core_tenets.txt index 4585130f..1b5a1fe2 100644 --- a/common/religion/doctrine_types/30_core_tenets.txt +++ b/common/religion/doctrine_types/30_core_tenets.txt @@ -590,9 +590,9 @@ forest_advantage = 5 forest_development_growth_factor = 0.2 forest_levy_size = 0.33 - wetlands_advantage = 5 - wetlands_development_growth_factor = 0.2 - wetlands_levy_size = 0.33 + taiga_advantage = 5 + taiga_development_growth_factor = 0.2 + taiga_levy_size = 0.33 holding_build_gold_cost = 0.25 holding_build_speed = 0.25 county_opinion_add = 5 @@ -1022,62 +1022,7 @@ tyranny_gain_mult = 0.50 } } - ###Christian Adjacent non-christians### - tenet_christian_hermeticism = { - icon = core_tenet_christian_syncretism - - piety_cost = { - if = { - limit = { - OR = { - religion_tag = islam_religion - religion_tag = chronicler_religion -# religion_tag = dualism_religion - } - } - value = faith_tenet_cost_low - } - else = { - value = faith_tenet_cost_mid - } - - # Multiplier for keeping same tenet - if = { - limit = { has_doctrine = tenet_christian_hermeticism } - multiply = faith_unchanged_doctrine_cost_mult - } - } - - is_shown = { - NOT = { OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion } } - } - can_pick = { - custom_description = { - text = incompatible_tenet_other_syncretism_trigger - NOR = { - doctrine:tenet_eastern_syncretism = { is_in_list = selected_doctrines } - doctrine:tenet_unreformed_syncretism = { is_in_list = selected_doctrines } - doctrine:tenet_islamic_syncretism = { is_in_list = selected_doctrines } - doctrine:tenet_jewish_syncretism = { is_in_list = selected_doctrines } - } - } - } - - parameters = { - hostility_override_special_doctrine_is_christian_faith = 1 - #For loc: - is_christian_faith_bilateral_loc_override = 1 - # This parameter is empty; the syncretic religious trigger checks against the doctrine, as that's much clearer in tooltips and allows us to use a unified syncretic trigger per-religion rather than having bitty situational triggers. - can_use_christian_artefacts = yes - christian_syncretic_actor_opinion_active = yes - opinion_of_christian_syncretic_recipient_opinion_active = 30 #Sync this to syncretic_mutual_opinion_bonus_value - } - - traits = { - virtues = { compassionate } - sins = { callous sadistic } - } - } + ###CATHOLICS### diff --git a/common/religion/religion_types/NEOW_finnic.txt b/common/religion/religion_types/NEOW_finnic.txt index 6ca2800e..eba14586 100644 --- a/common/religion/religion_types/NEOW_finnic.txt +++ b/common/religion/religion_types/NEOW_finnic.txt @@ -259,7 +259,7 @@ finnic_religion = { #placeholder #Tenets doctrine = tenet_ritual_celebrations - doctrine = tenet_wandering_bards + doctrine = tenet_wandering_bards doctrine_selection_pair = { requires_dlc_flag = all_under_heaven doctrine = tenet_takamin @@ -440,8 +440,8 @@ finnic_religion = { #placeholder #Tenets doctrine = tenet_adorcism - doctrine = tenet_ancestor_worship - doctrine = tenet_sanctity_of_nature + doctrine = tenet_astrology + doctrine = tenet_druidry #doctrine_selection_pair = { # requires_dlc_flag = all_under_heaven # doctrine = tenet_takamin diff --git a/common/religion/religion_types/NEOW_folkgerman.txt b/common/religion/religion_types/NEOW_folkgerman.txt index de98487e..886c7eec 100644 --- a/common/religion/religion_types/NEOW_folkgerman.txt +++ b/common/religion/religion_types/NEOW_folkgerman.txt @@ -236,7 +236,7 @@ } - piety_icon_group = "pagan" + piety_icon_group = "christian" faiths = { volksmarchen = { @@ -256,7 +256,7 @@ doctrine = unreformed_faith_doctrine - doctrine = tenet_wandering_bards + doctrine = tenet_sanctity_of_nature doctrine = tenet_ancestor_worship doctrine = tenet_adorcism diff --git a/common/religion/religion_types/NEOW_novelist.txt b/common/religion/religion_types/NEOW_novelist.txt index c9cbf770..84360055 100644 --- a/common/religion/religion_types/NEOW_novelist.txt +++ b/common/religion/religion_types/NEOW_novelist.txt @@ -1242,7 +1242,7 @@ doctrine = doctrine_adultery_women_accepted #Tenets - doctrine = tenet_ritual_cannibalism + doctrine = tenet_ritual_ritual_cannibalism doctrine = tenet_esotericism doctrine = tenet_inner_journey diff --git a/common/religion/religion_types/NEOW_wicca.txt b/common/religion/religion_types/NEOW_wicca.txt index 9b94208d..81153f11 100644 --- a/common/religion/religion_types/NEOW_wicca.txt +++ b/common/religion/religion_types/NEOW_wicca.txt @@ -354,7 +354,7 @@ #Tenets | placeholder doctrine = tenet_inner_journey - doctrine = tenet_esotericism + doctrine = tenet_druidry doctrine = tenet_scientific_discourse doctrine = doctrine_witchcraft_accepted }