Merge branch 'next-version-dev' of https://forgejo.damimani-alex.org/damimani/N3OW into next-version-dev

common/culture/innovations/00_cultural_maa_innovations.txt

@@ -227,14 +227,12 @@ innovation_repeating_crossbow = {
 				has_dlc = "All Under Heaven"
 			}
 			OR = {
-				this = culture:tangut
 				has_cultural_parameter = unlock_shenbigong_innovation
 			}
 		}
 		trigger_else = {
 			OR = {
 				has_cultural_pillar = heritage_chinese
-				this = culture:tangut
 			}
 		}
 	}
@@ -259,12 +257,7 @@ innovation_pole_vault = {
 	icon = @weapons_and_armor_01
 
 	potential = {
-		OR = {
+		always = no
-			this = culture:guanches
-			any_parent_culture_or_above = {
-				this = culture:guanches
-			}
-		}
 	}
 
 	unlock_maa = guanch_vaulter

common/culture/name_equivalency/00_NEOW_male_names.txt

@@ -21,12 +21,12 @@ abdulwahhab_male = { Abdelwahab }
 abel_male = { Ab_e_grv_l Abel }
 abidin_male = { Abedin }
 abner_male = { Abnar Abneh Abner Abnir Abnuh }
-abraham_male = { _I_dot_brahim Aapo Aavo Abraham Brahim Bram Ibr_e_act_hima Ibrahim Ibrahima Ibrahym }
+abraham_male = { _I_dot_brahim Aapo Aavo Abraham Aabraham Brahim Bram Ibr_e_act_hima Ibrahim Ibrahima Ibrahym }
 abubakr_male = { Aboubakeur Abubakar Boubaker Ebubekir }
 abulqasim_male = { Belkacem }
 acacius_male = { Ac_a_act_cio }
 achilles_male = { Achile Achille }
-adam_male = { _AE_dem Aadu Ad_a_act_n Ad_a_tld_o Adam Add_pst_m Adda Adem Ado Ahdim Ardam Hadam }
+adam_male = { _AE_dem Aadu Aatami Ad_a_act_n Ad_a_tld_o Adam Add_pst_m Adda Adem Ado Ahdim Ardam Hadam }
 adham_male = { Et_pst_hem Ethem }
 adib_male = { Edip }
 adil_male = { Adel Adil }
@@ -46,7 +46,7 @@ alan_male = { Al_pst_un Alain Alan Alen Alin Allan Allen Alun Arlan }
 alauddin_male = { Alaattin }
 albanus_male = { Alb_a_grv_ Alban Albano Auban }
 alberic_male = { Aubrey Aubrhyy }
-albert_male = { _A_hat_lbert Adalbert Adalberto Aelbert Alb_e_crn_r_c_act_ Albeht Alber_pst_ Albert Alberto Albertus Alberzh Albet Albirt Albrecht Aubert }
+albert_male = { _A_hat_lbert Adalbert Adalberto Aelbert Alb_e_crn_r_c_act_ Albeht Alber_pst_ Albert Alberto Albertus Alberzh Albet Albirt Albrecht Alpertti Aubert }
 albinus_male = { Alb_i_act_n Albin Albino Alpo Aubin Bine }
 alcide_male = { Alcides }
 alex_male = { _A_act_lex _A_grv_lex Aahlex Ahl_i_hat_x Alec Alecs Aleks Alex Alick Allex Arlegz }
@@ -275,7 +275,7 @@ elio_male = { _E_act_lio Elio }
 eliseus_male = { El_i_act_sio Eliseo Yelisey }
 elliot_male = { Elliot Ellioth Elliott Ellyot Elywt }
 elros_male = { Elrhos Elros }
-elof_male = { Elof Elov Elow }
+elof_male = { Elof Eluf Elov Elow }
 elouan_male = { Elouan Elouann }
 emeric_male = { Aimery Am_e_act_rico Eimeri Emerich Emich Imre }
 emil_male = { _E_act_mile Eemeli Eemil Em_i_act_lio Emil Emile Emili Emilio Emiliy Milio }
@@ -284,11 +284,12 @@ emmanuel_male = { Emanuel Emanuele Emmanuel Emmanuele Enmanu_e_grv_l Enmanuel Im
 emmanueljesus_male = { Manuel_spc_Jes_u_act_s }
 engelbert_male = { Engelbert Ingebrigt }
 erasmus_male = { Asmus Erasmus Erazmu_s_crn_ Rasmus }
-eric_male = { _E_act_ric _E_grv_ric Eerik Eerikki Eero Eir_i_act_kur Eirik Erhyc Eri Eric Erich Erik Erki Erkki Errico Eryc Eryk Eurico }
+eric_male = { _E_act_ric _E_grv_ric Eerik Eerikki Eero Eir_i_act_kur Eirik Erhyc Eri Eric Erich Erik Erki Erkki Errico Eryc Eryk Eurico Jerrik }
 erlend_male = { Erland Erlend Erlendur }
-ernest_male = { Arno_s_crn_t Ernest Ernesto Ernst Ernyst }
+ernest_male = { Arno_s_crn_t Ernest Ernesto Ernst Ernyst Erno }
 ertughrul_male = { Ertu_g_brv_rul }
 erwin_male = { Erv_i_act_n Ervin Erwein Erwin }
+eskil_male = { Eskil Esko }
 ethan_male = { Ethan Izan }
 eugene_male = { _E_act_ug_e_grv_ni Eug_e_act_nio Eugen Eugene Eugeni Eugenio Eujen Euken Euj_e_crn_n Ev_z_crn_en Evgeniy Ewgyny Ja_u_brv_hien Ja_u_brv_hienij Uchenio Yauhen }
 euphemius_male = { Yufimiy }
@@ -380,7 +381,7 @@ gordon_male = { Gorddon Gorhddon }
 goronwy_male = { Goronwy Gronw }
 gottschalk_male = { Gottschalk Gottsk_a_act_lk }
 graham_male = { Graeme Graham }
-gregory_male = { _R_crn_eho_r_crn_ Greg_o_grv_ri Gregg Gregor Gregori Gregorio Gregory Grhygorhy Grigoriy Grygor Grygory Hrjehor Reijo }
+gregory_male = { _R_crn_eho_r_crn_ Greg_o_grv_ri Gregers Gregg Gregor Gregori Gregorio Gregory Grhygorhy Grigoriy Grygor Grygory Hrjehor Reijo }
 griffith_male = { Grhyffyf Gruffudd Gryffyf }
 gunther_male = { Gontar G_o_act_narj G_u_uml_nter G_u_uml_nther Gunar Gunde Gunnar Gunter Gunther Kunnar }
 guntram_male = { Guntram }
@@ -412,11 +413,11 @@ hector_male = { Ectorh Eitor Ettore H_e_act_ctor H_e_grv_ctor Hector Heitor Hekt
 helgi_male = { Helge Helgi Oleg }
 helmut_male = { Hellmuth Helmut Helmuth }
 hengist_male = { Hehnguhst Hengist Henguhst Hengyst }
-henry_male = { Ain Endika Enn Enno Enri Enric Enrico Enrike Enrique Enzo Hain Harhrhy Harri Harry Heico Heigo Heiki Heikki Heiko Hein Heine Heiner Heinrich Heinz Hajndrich Henddri Hendricus Hendrich Hendrik Hendrikus Henk Henn Henning Henner Henri Henric Henricus Henrik Henrique Henry Henryk Herri Heyo Hinc Hinderk Hindrek Hindrik Hinnerk Hinrich Hinrik Hj_e_crn_nik Hj_e_crn_ni_n_act_g Hync Hynek Hynry Indrek Jind_r_crn_ich Rico }
+henry_male = { Ain Endika Enn Enno Enri Enric Enrico Enrike Enrique Enzo Hain Harhrhy Harri Harry Heico Heigo Heiki Heikki Heiko Hein Heine Heiner Heinrich Heinz Hajndrich Henddri Hendricus Hendrich Hendrik Hendrikus Henk Henn Henning Henner Henri Henric Henricus Henrik Henrikki Henrique Henry Henryk Herri Heyo Hinc Hinderk Hindrek Hindrik Hinnerk Hinrich Hinrik Hj_e_crn_nik Hj_e_crn_ni_n_act_g Hync Hynek Hynry Indrek Jind_r_crn_ich Rico }
 henrywilliam_male = { Heinz-Wilhelm }
 herbert_male = { Herbert Herberto Heribert Hyrbyrt }
 hercules_male = { Ercwlff Hercules }
-hermann_male = { _A_act_rmann Armand Armando Armond Ermanno Harm Harmen Herman Hermann Hermanus }
+hermann_male = { _A_act_rmann Armand Armando Armond Ermanno Harm Harmen Herman Hermann Hermanni Hermanus }
 hermenegildo_male = { Hermenegildo }
 hidayat_male = { Hidayet }
 hieronymus_male = { Geronimo Girolamo J_e_act_r_o_hat_me Jer_o_act_nimo Jeroen Jerko Jirome Yerom }
@@ -455,15 +456,16 @@ inigo_male = {  _I_act__n_tld_igo Eneko I_n_tld_igo }
 innocent_male = { Innocenzo Inoc_e_hat_ncio }
 irenaeus_male = { Erino Ireneo Ireni_e_act_u }
 irfan_male = { _I_dot_rfan Erfan }
-isaac_male = { _I_dot_shak Iikka Iiro Isaac Isaak Isaiaic Isak }
+isaac_male = { _I_dot_shak Iikka Iiro Isaac Isaak Isaiaic Isak Iisakki }
 isaiah_male = { Esa Isa_i_act_as }
+ishmael_male = { Ismo }
 isidore_male = { Isidor Isidoro Isidre Isidro Izidor }
 islam_male = { Islam }
 ismail_male = { Isfael Ishmaiel Ishmayl Isma_e_uml_l Isma_i_uml_l Ismael Ismail }
 ismat_male = { _I_dot_smet Ismet }
 israel_male = { Israel }
 ivanhoe_male = { Ifanhoy Ivainhoe }
-ivar_male = { _AE_irva _I_act_var Aiva Aivar Ifor Ivar Ivari Ivfor Ivor }
+ivar_male = { _AE_irva _I_act_var Aiva Aivar Ifor Ivar Ivari Ivfor Ivor Iivo }
 izzat_male = { _I_dot_zzet Izet }
 izzuddin_male = { Azzedine Yzedin }
 jabir_male = { Jabyr }
@@ -501,10 +503,10 @@ jesusmaria_male = { Ches_u_act_s_spc_Mar_i_act_a Jes_u_act_s_spc_Mar_i_act_a }
 jesusmichael_male = { Ches_u_act_s_spc_Miguel }
 jesusxavier_male = { Ches_u_act_s_spc_Chabier }
 jihad_male = { Cihat }
-joachim_male = { Achim Aki Chuaqu_i_act_n Gioacchino Iokin J_a_act_chym J_o_act_chymj Joachim Joakim Joakin Joaqu_i_act_n Joaquim Jochem Jochen Jochum Jogchum Jokin Jouachin Quim }
+joachim_male = { Achim Aki Chuaqu_i_act_n Gioacchino Iokin J_a_act_chym J_o_act_chymj Jaakkima Joachim Joakim Joakin Joaqu_i_act_n Joaquim Jochem Jochen Jochum Jogchum Jokin Jokum Jouachin Quim }
 job_male = { Ejup Ey_u_uml_p Eyy_u_uml_p Job }
 joel_male = { Choel Jo_e_uml_l Joel Jou_e_grv_l }
-john_male = { _Z_crn_an An_z_crn_e An_z_crn_ej Ants Chuan D_z_crn_oni Efan Evan Giovanni Gjin Gjon Hampus Hanjo Hannes Hanno Hanns Hannu Hans Hanu_s_crn_ Hanzo Hasse Honza Iain Ian Iban Ieuan Ifan Ioan Ion Iv_a_act_n Ivan Iwan J_a_act_n J_o_act_hann J_o_act_hannes J_o_act_n J_o_uml_ns Jaan Jaanus Jac Jack Jak Jake Jaky Jan Jan_z_crn_e Janar Janek Janez Jani Janick Janko Jann Janne_male Jannes Jannick Jaouen Jeen Jean Jehannes Jens Jo_a_tld_o Joan_male Joanes Joannes Johan Johann Johannes John Johnny Jon Joni Jonny Jouni Jowan Juan Juha Juhan Juhana Juhani Juho Jukk Jukka Juku Jussi Manex Sean Shane Shaun Si_o_hat_n Sjon Xhani Xhon Yahya Yan Yann Yannick Yannig Yoan Yoann Yohan Yohann Yon Xon }
+john_male = { _Z_crn_an An_z_crn_e An_z_crn_ej Ants Chuan D_z_crn_oni Efan Evan Giovanni Gjin Gjon Hampus Hanjo Hannes Hanno Hanns Hannu Hans Hanu_s_crn_ Hanzo Hasse Honza Iain Ian Iban Ieuan Ifan Ioan Ion Iv_a_act_n Ivan Iwan J_a_act_n J_o_act_hann J_o_act_hannes J_o_act_n J_o_uml_ns Jaan Jaanus Jac Jack Jak Jake Jaky Jan Jan_z_crn_e Janar Janek Janez Jani Jannik Janick Janko Jann Janne_male Jannes Jannick Jaouen Jeen Jean Jehannes Jens Jo_a_tld_o Joan_male Joanes Joannes Johan Johann Johannes John Johnny Jon Joni Jonny Jouni Jowan Juan Juha Juhan Juhana Juhani Juho Jukk Jukka Juku Jussi Manex Sean Shane Shaun Si_o_hat_n Sjon Xhani Xhon Yahya Yan Yann Yannick Yannig Yoan Yoann Yohan Yohann Yon Xon }
 johnandrew_male = { Ion_spc_Ander Joan_spc_Andreu Jon_spc_Ander }
 johnanthony_male = { Chuan_spc_Ant_o_act_n Giovannantonio Joan_spc_Antoni Jon_spc_Andoni Juan_spc_Antonio }
 johnbaptist_male = { Gianbattista Giovanni_spc_Battista Jan-Batisto Jean-Baptiste Joan_spc_Baptista Johann_spc_Baptist Johann-Baptist Jon_spc_Ugutz Yann-Vadezour }
@@ -601,7 +603,7 @@ leander_male = { Lander Leander Leandre Leandro }
 leif_male = { Leif }
 lenaig_male = { L_e_act_na_i_uml_c Lenaig }
 leo_male = { L_e_act_o L_e_act_on L_e_uml_va Lavon Le_o_act_ Leo Leo_s_crn_ Leon Leoun Lev Llyon Luan }
-leonard_male = { L_e_act_onard Leendert Lennart Leonard Leonardo Leonardus Leonhard Lienard Lienhardt Linnar }
+leonard_male = { L_e_act_onard Leendert Lennart Lenni Leonard Leonardo Leonardus Leonhard Lienard Lienhardt Linnar }
 leonidas_male = { Leanid Leonid Leonit }
 leopold_male = { Leopold Leopoldo Leoupold Luitpold }
 levi_male = { Leevi Levi }
@@ -984,7 +986,7 @@ walid_male = { Walid }
 walter_male = { Gauchi_e_act_ Gauthier Gualter Gwallter Valter Valtteri Wa_l_stk_tar Wailter Walltyr Walt Walter Walther Waltteri Waltyr Waltyrh Wout Wouter }
 wenceslaus_male = { V_a_act_clav V_e_crn_nceslav Viacheslav Viachasla_u_brv_ Vysheslav Wenzel }
 werner_male = { V_a_uml_rner Verner Werner Wessel }
-wilfried_male = { Wilfred Wilfrid Wilfried }
+wilfried_male = { Wilfred Wilfrid Wilfried Vilfred }
 william_male = { Bill Billy Gilen Guilherme Guill_e_act_n Guillaume Guillem Gwilym Liam Llyam Lomig Lyam Guih_e_grv_n Guih_e_grv_ume Guillermo Gwilherm Gwillam Jami Pim Vil_e_act_m Vilhelm Vilhj_a_act_lmur Vilho Vili Viliam Viljami Viljem Viljo Vilko Ville Villem Villi Villu Villy Vilyam Wilhelm Wilhelmus Wiljam Wiljo Wilken Will Wille Willem Willi Williaim William Willm Wilm Willy Wim Wylem Wyli Wyllyam }
 wissam_male = { Wissam Wissem }
 wittekind_male = { Wittekind Witki_n_act_t }

common/culture/name_lists/NEOW_danish.txt

@@ -348,10 +348,11 @@
 			Bent Bjarne Bo Brian 
 			Carl Carsten Casper Christian Claus 
 			Daniel David Dennis 
-			Emil Erik Erling 
+			Emil Erik Erling Eluf Eskil
 			Finn Flemming Frank Frederik 
+			Gregers
 			Hans Henning Henrik 
-			J_o_stk_rgen J_o_stk_rn Jacob Jakob Jan Jens Jeppe Jesper John Jonas 
+			J_o_stk_rgen J_o_stk_rn Jacob Jakob Jan Jens Jeppe Jesper John Jonas Jerrik
 			Kaj Karsten Kasper Keld Kenneth Kim Klaus Knud Kristian Kurt 
 			Lars Lasse Leif 
 			Mads Martin Mathias Michael Mikkel Mogens Morten 
@@ -362,7 +363,7 @@
 			S_o_stk_ren Simon Steen Steffen Stig Svend 
 			Thomas Tom Torben Troels 
 			Ulrik 
-			Vagn 
+			Vagn Vilfred
 		}
 		2 = {
 			Aage Adam Alexander Anton Asbj_o_stk_rn Asger Axel 
@@ -373,8 +374,8 @@
 			Georg Gunnar Gustav 
 			Helge Henry Holger 
 			Ivar 
-			Joachim Johan Johannes Jon Jonathan 
+			Joachim Johan Johannes Jon Jonathan Jannik Jokum
-			Kresten Kristen_male Kristoffer 
+			Kresten Kristen_male Kristoffer Kjeld
 			Magnus Malthe Marcus Mark Mohammad 
 			Nicklas Nicolaj 
 			Oliver Oluf Otto 

common/culture/name_lists/NEOW_finnish.txt

@@ -108,10 +108,10 @@ name_list_NEOW_finnish = {
 
 	male_names = {
 		3 = {
-			Aimo Aki Aleksi Anssi Antero Antti Ari Armas Arto Asko Aulis 
+			Aimo Aki Aleksi Anssi Antero Antti Ari Armas Arto Asko Aulis Aabraham Aatami Alpertti
-			Eemeli Eero Eino Ensio Erkki Esa Esko 
+			Eemeli Eero Eino Ensio Erkki Esa Esko Erno
 			Hannu Harri Heikki Henri 
-			Ilkka Ilmari Ismo 
+			Ilkka Ilmari Ismo Iisakki 
 			Jaakko Jani Janne_male Jari Jarkko Jarmo Jarno Johan Johannes Joni Joonas Jorma Jouko Jouni Juha Juhani Juho Jukka Jussi Jyrki 
 			Kai Kalervo Kalevi Kalle Kari_Makarius Kauko Keijo Kimmo 
 			Lasse Lauri Leo 
@@ -129,9 +129,9 @@ name_list_NEOW_finnish = {
 			Aapo Aarne Aaro Aarre Aatos Ahti Akseli Aku Alexander Allan Alpo Anton Arttu Arvi Arvo Atte 
 			Daniel 
 			Eelis Eemil Eetu Elias Emil Erik
-			Hans Harry Heimo Helge Henrik 
+			Hans Harry Heimo Helge Henrik Hermanni 
 			Iiro Ilari 
-			Jami Jere Jesper Jesse Jimi Joel Joona Jori Juhana Jukka-Pekka Juuso Jyri 
+			Jami Jere Jesper Jesse Jimi Joel Joona Jori Juhana Jukka-Pekka Juuso Jyri Jaakkima
 			Kaarlo Kaj Karl Kasperi Kauno Klaus Konsta Kosti Kristian Kurt Ky_o_uml_sti 
 			Lassi Leevi 
 			Marcus Martin Matias Mauno Max Miika Miikka Mikael Miro Miska 
@@ -149,11 +149,11 @@ name_list_NEOW_finnish = {
 			Casper 
 			Edvard Edvin Eeli Eerikki Elmer Eppu 
 			Feliks 
-			Hasse Herman Hjalmar Hugo 
+			Hasse Herman Hjalmar Hugo Henrikki 
-			Iikka Ilja Ilkka-Eemeli Ilppo 
+			Iikka Ilja Ilkka-Eemeli Ilppo Iivo
 			Jali Jalmari Jalo Jani-Petteri Jasper Jerem Jeri Juha-Veli Justus 
 			Kaarle Kale Kare Kimi Kimi-Matias Kullervo Kustaa 
-			Lauri-Juhani 
+			Lauri-Juhani Lenni
 			Mara Marko-Jussi Masi Matteus Miikko Mikke Misha Mitja 
 			Nestor 
 			Ole Oras Orvo 

common/culture/name_lists/NEOW_norwegian.txt

@@ -214,7 +214,7 @@
 			Bj_o_stk_rn Bjarne 
 			Christian 
 			Dag Daniel 
-			Egil Einar Eirik Erik Erling Espen 
+			Egil Einar Eirik Erik Erling Espen Eskil
 			Finn Fredrik Frode 
 			Geir Gunnar 
 			H_a_rng_kon H_a_rng_vard Hans Harald Helge Henrik 

common/culture/name_lists/NEOW_swedish.txt

@@ -322,7 +322,7 @@
 			Bengt Bernt Bertil Bj_o_uml_rn Bo Bror 
 			Carl Christer Christian Claes 
 			Dan Daniel David Dennis 
-			Emil Eric Erik Elov Elow
+			Emil Eric Erik Elov Elow Eskil
 			Fredrik 
 			G_o_uml_ran Gert Gunnar Gustaf Gustav 
 			H_a_rng_kan Hans Henrik 

common/customizable_localization/00_divinity_custom_loc.txt

@@ -1121,14 +1121,14 @@ GetActualBishopTitle = {
 			highest_held_title_tier >= tier_kingdom
 			faith.religion = faith:folketro.religion
 		}
-		localization_key = councillor_court_chaplain_folkgerman_religion_kingdom
+		localization_key = councillor_court_chaplain_germanic_religion_kingdom
 	}
 	text = {
 		trigger = {
 			highest_held_title_tier >= tier_duchy
 			faith.religion = faith:folketro.religion
 		}
-		localization_key = councillor_court_chaplain_folkgerman_religion_duchy
+		localization_key = councillor_court_chaplain_germanic_religion_duchy
 	}
 	text = {
 		trigger = {
@@ -1140,7 +1140,7 @@ GetActualBishopTitle = {
 				}
 			}
 		}
-		localization_key = councillor_court_chaplain_folkgerman_religion_county
+		localization_key = councillor_court_chaplain_germanic_religion_county
 	}
 	text = {
 		trigger = {
@@ -1152,7 +1152,7 @@ GetActualBishopTitle = {
 				}
 			}
 		}
-		localization_key = councillor_court_chaplain_folkgerman_religion_county_female
+		localization_key = councillor_court_chaplain_germanic_religion_county_female
 	}
 
 	#Dualism
@@ -1984,14 +1984,14 @@ GetActualBishopTitlePossessive = {
 			highest_held_title_tier >= tier_kingdom
 			faith.religion = faith:folketro.religion
 		}
-		localization_key = councillor_court_chaplain_folkgerman_religion_kingdom_possessive
+		localization_key = councillor_court_chaplain_germanic_religion_kingdom_possessive
 	}
 	text = {
 		trigger = {
 			highest_held_title_tier >= tier_duchy
 			faith.religion = faith:folketro.religion
 		}
-		localization_key = councillor_court_chaplain_folkgerman_religion_duchy_possessive
+		localization_key = councillor_court_chaplain_germanic_religion_duchy_possessive
 	}
 	text = {
 		trigger = {
@@ -2003,7 +2003,7 @@ GetActualBishopTitlePossessive = {
 				}
 			}
 		}
-		localization_key = councillor_court_chaplain_folkgerman_religion_county_possessive
+		localization_key = councillor_court_chaplain_germanic_religion_county_possessive
 	}
 	text = {
 		trigger = {
@@ -2015,7 +2015,7 @@ GetActualBishopTitlePossessive = {
 				}
 			}
 		}
-		localization_key = councillor_court_chaplain_folkgerman_religion_county_female_possessive
+		localization_key = councillor_court_chaplain_germanic_religion_county_female_possessive
 	}
 
 	#Dualism

common/customizable_localization/00_language_custom_loc.txt

@@ -126,9 +126,9 @@ GetFaithSacredLanguage = {
 	text = { #Could also be Vedic & Old Tamil
 		trigger = {
 			OR = {
-				religion = religion:hinduism_religion
+#				religion = religion:hinduism_religion
 				religion = religion:buddhism_religion
-				religion = religion:jainism_religion
+#				religion = religion:jainism_religion
 			}
 		}
 		localization_key = language_sanskrit_name #Sanskrit
@@ -158,31 +158,27 @@ GetFaithSacredLanguageCharacter = {
 		trigger = {
 			OR = {
 				religion = religion:catholic_religion
-				faith = faith:conversos
-				faith = faith:lollard
-				faith = faith:insular_celtic
-				faith = faith:mozarabic_church
 			}
 		}
 		localization_key = language_latin_name #Latin
 	}
 
-	text = {
+#	text = {
-		trigger = {
+#		trigger = {
-			faith = faith:cathar
+#			faith = faith:cathar
-		}
+#		}
-		localization_key = language_occitano_romance_name #Occitan
+#		localization_key = language_occitano_romance_name #Occitan
-	}
+#	}
 
-	text = {
+#	text = {
-		trigger = { faith = faith:nestorian }
+#		trigger = { faith = faith:nestorian }
-		localization_key = language_aramaic_name #Armaic
+#		localization_key = language_aramaic_name #Armaic
-	}
+#	}
 
-	text = {
+#	text = {
-		trigger = { faith = faith:armenian_apostolic }
+#		trigger = { faith = faith:armenian_apostolic }
-		localization_key = language_armenian_name #Armenian
+#		localization_key = language_armenian_name #Armenian
-	}
+#	}
 
 	text = {
 		trigger = {
@@ -241,9 +237,9 @@ GetFaithSacredLanguageCharacter = {
 	text = { #Could also be Vedic & Old Tamil
 		trigger = {
 			OR = {
-				religion = religion:hinduism_religion
+#				religion = religion:hinduism_religion
 				religion = religion:buddhism_religion
-				religion = religion:jainism_religion
+#				religion = religion:jainism_religion
 			}
 		}
 		localization_key = language_sanskrit_name #Sanskrit

common/flavorization/00_title_holders.txt

@@ -921,7 +921,7 @@ empire_theocracy_christianity_religion_orthodox = {
 # Dualism (same as Christianity)
 
 # Germanic
-baron_theocracy_male_folkgerman_religion = {
+baron_theocracy_male_germanic_religion = {
 	type = character
 	gender = male
 	special = holder
@@ -933,7 +933,7 @@ baron_theocracy_male_folkgerman_religion = {
 	governments = { theocracy_government }
 	religions = { folkgerman_religion }
 }
-baron_theocracy_female_folkgerman_religion = {
+baron_theocracy_female_germanic_religion = {
 	type = character
 	gender = female
 	special = holder
@@ -945,7 +945,7 @@ baron_theocracy_female_folkgerman_religion = {
 	governments = { theocracy_government }
 	religions = { folkgerman_religion }
 }
-barony_theocracy_folkgerman_religion = {
+barony_theocracy_germanic_religion = {
 	type = title
 	tier = barony
 	flavourization_rules = { 
@@ -955,7 +955,7 @@ barony_theocracy_folkgerman_religion = {
 	holding = church_holding
 	religions = { folkgerman_religion hellenism_religion taoism_religion zunism_religion }
 }
-count_theocracy_male_folkgerman_religion = {
+count_theocracy_male_germanic_religion = {
 	type = character
 	gender = male
 	special = holder
@@ -967,7 +967,7 @@ count_theocracy_male_folkgerman_religion = {
 	governments = { theocracy_government }
 	religions = { folkgerman_religion }
 }
-count_theocracy_female_folkgerman_religion = {
+count_theocracy_female_germanic_religion = {
 	type = character
 	gender = female
 	special = holder
@@ -979,7 +979,7 @@ count_theocracy_female_folkgerman_religion = {
 	governments = { theocracy_government }
 	religions = { folkgerman_religion }
 }
-county_theocracy_folkgerman_religion = {
+county_theocracy_germanic_religion = {
 	type = title
 	tier = county
 	flavourization_rules = { 
@@ -989,7 +989,7 @@ county_theocracy_folkgerman_religion = {
 	governments = { theocracy_government }
 	religions = { folkgerman_religion hellenism_religion taoism_religion zoroastrianism_religion zunism_religion }
 }
-king_theocracy_male_folkgerman_religion = {
+king_theocracy_male_germanic_religion = {
 	type = character
 	gender = male
 	special = holder
@@ -1001,7 +1001,7 @@ king_theocracy_male_folkgerman_religion = {
 	governments = { theocracy_government }
 	religions = { folkgerman_religion hellenism_religion }
 }
-king_theocracy_female_folkgerman_religion = {
+king_theocracy_female_germanic_religion = {
 	type = character
 	gender = female
 	special = holder
@@ -1013,7 +1013,7 @@ king_theocracy_female_folkgerman_religion = {
 	governments = { theocracy_government }
 	religions = { folkgerman_religion hellenism_religion }
 }
-emperor_theocracy_male_folkgerman_religion = {
+emperor_theocracy_male_germanic_religion = {
 	type = character
 	gender = male
 	special = holder
@@ -1025,7 +1025,7 @@ emperor_theocracy_male_folkgerman_religion = {
 	governments = { theocracy_government }
 	religions = { folkgerman_religion hellenism_religion }
 }
-emperor_theocracy_female_folkgerman_religion = {
+emperor_theocracy_female_germanic_religion = {
 	type = character
 	gender = female
 	special = holder

common/on_action/game_start.txt

@@ -4256,10 +4256,6 @@ on_game_start_after_lobby = {
 				name = fully_landlocked_nomad_cultures
 				target = culture:kirghiz
 			}
-			add_to_global_variable_list = {
-				name = fully_landlocked_nomad_cultures
-				target = culture:tangut
-			}
 			add_to_global_variable_list = {
 				name = fully_landlocked_nomad_cultures
 				target = culture:bashkir

common/scripted_triggers/00_religious_triggers.txt

@@ -2002,51 +2002,51 @@ religion_is_broadly_asian_trigger = {
 	OR = {
 		religion_is_east_asian_trigger = yes
 		broadly_dharmic_trigger = yes
-		broadly_chinese_religion_trigger = yes
+#		broadly_chinese_religion_trigger = yes
 	}
 }
 
 religion_is_east_asian_trigger = {
 	OR = {
 		faith.religion = religion:buddhism_religion
-		faith.religion = religion:confucianism_religion
+#		faith.religion = religion:confucianism_religion
-		faith.religion = religion:taoism_religion
+#		faith.religion = religion:taoism_religion
-		faith.religion = religion:shintoism_religion
+#		faith.religion = religion:shintoism_religion
 	}
 }
 
 broadly_dharmic_trigger = {
 	OR = {
 		faith.religion = religion:buddhism_religion
-		faith.religion = religion:hinduism_religion
+#		faith.religion = religion:hinduism_religion
-		faith.religion = religion:jainism_religion
+#		faith.religion = religion:jainism_religion
-		faith.religion = religion:bon_religion
+#		faith.religion = religion:bon_religion
-		faith.religion = religion:dab_qhuas_religion
+#		faith.religion = religion:dab_qhuas_religion
-		faith.religion = religion:aluk_religion
+#		faith.religion = religion:aluk_religion
-		faith.religion = religion:dayawism_religion
+#		faith.religion = religion:dayawism_religion
-		faith.religion = religion:hantuism_religion
+#		faith.religion = religion:hantuism_religion
-		faith.religion = religion:kaharingan_religion
+#		faith.religion = religion:kaharingan_religion
-		faith.religion = religion:satsana_phi_religion
+#		faith.religion = religion:satsana_phi_religion
-		faith.religion = religion:tolotang_religion
+#		faith.religion = religion:tolotang_religion
-		faith.religion = religion:utaki_religion
+#		faith.religion = religion:utaki_religion
-		faith.religion = religion:bimoism_religion
+#		faith.religion = religion:bimoism_religion
-		faith.religion = religion:moism_religion
+#		faith.religion = religion:moism_religion
-		faith.religion = religion:muism_religion
+#		faith.religion = religion:muism_religion
-		faith.religion = religion:qiangic_religion
+#		faith.religion = religion:qiangic_religion
-	}
-}
-
-south_east_asian_pagan_trigger = {
-	OR = {
-		faith.religion = religion:aluk_religion
-		faith.religion = religion:dayawism_religion
-		faith.religion = religion:hantuism_religion
-		faith.religion = religion:kaharingan_religion
-		faith.religion = religion:tolotang_religion
-		faith.religion = religion:biliku_religion
 	}
 }
 
+#south_east_asian_pagan_trigger = {
+#	OR = {
+#		faith.religion = religion:aluk_religion
+#		faith.religion = religion:dayawism_religion
+#		faith.religion = religion:hantuism_religion
+#		faith.religion = religion:kaharingan_religion
+#		faith.religion = religion:tolotang_religion
+#		faith.religion = religion:biliku_religion
+#	}
+#}
+#
 broadly_jungle_dwelling_trigger = {
 	culture = {
 		OR = {
@@ -2062,12 +2062,12 @@ broadly_jungle_dwelling_trigger = {
 	}
 }
 
-broadly_chinese_religion_trigger = {
+#broadly_chinese_religion_trigger = {
-	OR = {
+#	OR = {
-		faith.religion = religion:taoism_religion
+#		faith.religion = religion:taoism_religion
-		faith.religion = religion:confucianism_religion
+#		faith.religion = religion:confucianism_religion
-	}
+#	}
-}
+#}
 
 broadly_mainland_east_asian_heritage_trigger = {
 	culture = {

common/subject_contracts/contracts/peasant_republic_obligations.txt

@@ -27,7 +27,7 @@
 						multiply = piety_level
 					}
 				}
-				scope:liege = {
+				scope:liege.dynasty = {
 					add = {
 						value = 0.1
 						multiply = dynasty_prestige_level
@@ -64,7 +64,7 @@
 						multiply = piety_level
 					}
 				}
-				scope:liege = {
+				scope:liege.dynasty = {
 					add = {
 						value = 0.1
 						multiply = dynasty_prestige_level
@@ -100,7 +100,7 @@
 						multiply = piety_level
 					}
 				}
-				scope:liege = {
+				scope:liege.dynasty = {
 					add = {
 						value = 0.1
 						multiply = dynasty_prestige_level
@@ -136,7 +136,7 @@
 						multiply = piety_level
 					}
 				}
-				scope:liege = {
+				scope:liege.dynasty = {
 					add = {
 						value = 0.1
 						multiply = dynasty_prestige_level
@@ -219,7 +219,7 @@
 						multiply = piety_level
 					}
 				}
-				scope:liege = {
+				scope:liege.dynasty = {
 					add = {
 						value = 0.1
 						multiply = dynasty_prestige_level
@@ -256,7 +256,7 @@
 						multiply = piety_level
 					}
 				}
-				scope:liege = {
+				scope:liege.dynasty = {
 					add = {
 						value = 0.1
 						multiply = dynasty_prestige_level
@@ -292,7 +292,7 @@
 						multiply = piety_level
 					}
 				}
-				scope:liege = {
+				scope:liege.dynasty = {
 					add = {
 						value = 0.1
 						multiply = dynasty_prestige_level
@@ -354,7 +354,7 @@
 						multiply = piety_level
 					}
 				}
-				scope:liege = {
+				scope:liege.dynasty = {
 					add = {
 						value = 0.1
 						multiply = dynasty_prestige_level
@@ -392,7 +392,7 @@
 						multiply = piety_level
 					}
 				}
-				scope:liege = {
+				scope:liege.dynasty = {
 					add = {
 						value = 0.1
 						multiply = dynasty_prestige_level
@@ -429,7 +429,7 @@
 						multiply = piety_level
 					}
 				}
-				scope:liege = {
+				scope:liege.dynasty = {
 					add = {
 						value = 0.1
 						multiply = dynasty_prestige_level
@@ -465,7 +465,7 @@
 						multiply = piety_level
 					}
 				}
-				scope:liege = {
+				scope:liege.dynasty = {
 					add = {
 						value = 0.1
 						multiply = dynasty_prestige_level

gfx/portraits/portrait_modifiers/01_beards_base.txt

@@ -1778,6 +1778,45 @@ beards = {
             }
         }
     }  
+  ### SP5 Beard ###
+
+	sp5_western_beards = {
+		dna_modifiers = {
+			accessory = {
+				mode = add
+				gene = beards
+				template = sp5_western_beards
+				range = { 0 1 } # For the randomness to work correctly
+			}
+		}   
+		weight = {
+			base = 0
+			modifier = {
+				add = 15
+				OR = {
+					NOT = { exists = this }
+					has_gene = {
+						category = gene_hair_type
+						template = hair_curly
+					}
+					has_gene = {
+						category = gene_hair_type
+						template = hair_wavy
+					}
+				}
+				OR = {
+					portrait_western_clothing_trigger = yes
+					portrait_byzantine_clothing_trigger = yes
+				}
+
+				has_sp5_dlc_triggers = yes
+			}
+			modifier = {
+				factor = 0
+				portrait_western_clothing_trigger = no
+			}
+		}
+	}
 
 }
 
@@ -1785,3 +1824,5 @@ beards = {
 
 
 
+
+

history/provinces/e_europa.txt

@@ -207,7 +207,7 @@
 }
 ###c_terschelling
 2412 = {
-	holding = none
+	holding = castle_holding
 	culture = frisian
 	religion = mariner
 }

history/provinces/e_germany.txt

@@ -1789,6 +1789,8 @@
 }
 ###c_wiesbaden
 2693 = {
+	culture = palatine
+	religion = einblicker
 	holding = castle_holding
 }
 2854 = {

history/provinces/e_italy.txt

@@ -260,7 +260,7 @@
 	holding = city_holding
 }
 2533 = {
-	holding = castle
+	holding = castle_holding
 }
 2490 = {
 	holding = none

history/provinces/e_makedon.txt

@@ -1067,7 +1067,7 @@
 3650 = {	#Strumica
 	culture = NEOW_macedonian
 	religion = megalocratic
-	holdin36g = castle_holding
+	holding = castle_holding
 }
 3648 = {	#Shtip
 	holding = city_holding

localization/english/replace/names/NEOW_character_names_l_english.yml

@@ -3193,6 +3193,7 @@
  Elspet:0 "Elspet"
  Elton:0 "Elton"
  Eluned:0 "Eluned"
+ Eluf:0 "Eluf"
  Elva:0 "Elva"
  Elver:0 "Elver"
  Elvi:0 "Elvi"
@@ -4351,6 +4352,7 @@
  Graziella:0 "Graziella"
  Greg_o_grv_ri:0 "Gregòri"
  Gregg:0 "Gregg"
+ Gregers:0 "Gregers"
  Gregor:0 "Gregor"
  Gregori:0 "Gregori"
  Gregoria:0 "Gregoria"
@@ -5504,6 +5506,7 @@
  Janni:0 "Janni"
  Jannick:0 "Jannick"
  Jannicke:0 "Jannicke"
+ Jannik:0 "Jannik"
  Jannie:0 "Jannie"
  Janny:0 "Janny"
  Jano_female:0 "Jano"
@@ -5601,6 +5604,7 @@
  Jerneja:0 "Jerneja"
  Jeroen:0 "Jeroen"
  Jerrel:0 "Jerrel"
+ Jerrik:0 "Jerrik"
  Jerry:0 "Jerry"
  Jes_u_act_s:0 "Jesús"
  Jes_u_act_s_spc__A_act_ngel:0 "Jesús Ángel"
@@ -5706,6 +5710,7 @@
  John-Erik:0 "John-Erik"
  Johnny:0 "Johnny"
  Jokin:0 "Jokin"
+ Jokum:0 "Jokum"
  Jolana:0 "Jolana"
  Jolanda:0 "Jolanda"
  Jon:0 "Jon"
@@ -6189,6 +6194,7 @@
  Kit:0 "Kit"
  Kjartan:0 "Kjartan"
  Kjell:0 "Kjell"
+ Kjeld:0 "Kjeld"
  Kjellaug:0 "Kjellaug"
  Kl_a_act_ra:0 "Klára"
  Kl_a_uml_rchen:0 "Klärchen"
@@ -10521,6 +10527,7 @@
  Vildan:0 "Vildan"
  Vilde:0 "Vilde"
  Vilem_i_act_na:0 "Vilemína"
+ Vilfred:0 "Vilfred"
  Vilfor:0 "Vilfor"
  Vilgot:0 "Vilgot"
  Vilhelm:0 "Vilhelm"